From bb33862fa49d397d3b6a1e1587d3bab2bbb8b84d Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Sun, 30 Jun 2024 23:49:34 +0800
Subject: [PATCH 01/20] POC

---
 package.json                         |  4 ++
 src/compile/build.ts                 |  9 +++-
 src/core/file.ts                     | 14 ++++++
 src/liveshare/liveshare.ts           | 65 ++++++++++++++++++++++++++++
 src/lw.ts                            |  2 +
 src/preview/server.ts                | 18 +++++---
 src/preview/viewer/pdfviewerhook.ts  | 24 +++++++++-
 src/preview/viewer/pdfviewerpanel.ts | 24 ++++++----
 8 files changed, 144 insertions(+), 16 deletions(-)
 create mode 100644 src/liveshare/liveshare.ts

diff --git a/package.json b/package.json
index de49dbf47..62b6b1e54 100644
--- a/package.json
+++ b/package.json
@@ -2541,6 +2541,9 @@
           {
             "filenamePattern": "*.pdf"
           },
+          {
+            "filenamePattern": "*.pdf.liveshare"
+          },
           {
             "filenamePattern": "*.PDF"
           }
@@ -2570,6 +2573,7 @@
     "micromatch": "4.0.5",
     "pdfjs-dist": "4.3.136",
     "tmp": "0.2.3",
+    "vsls": "^1.0.4753",
     "workerpool": "9.1.1",
     "ws": "8.17.1"
   },
diff --git a/src/compile/build.ts b/src/compile/build.ts
index 76fe35629..78666c19b 100644
--- a/src/compile/build.ts
+++ b/src/compile/build.ts
@@ -420,7 +420,14 @@ async function afterSuccessfulBuilt(lastStep: Step, skipped: boolean) {
     if (!lastStep.isExternal && skipped) {
         return
     }
-    lw.viewer.refresh(lw.file.getPdfPath(lastStep.rootFile))
+    const pdfFilePath = lw.file.getPdfPath(lastStep.rootFile)
+    lw.viewer.refresh(pdfFilePath)
+    if (lw.liveshare.isHost) {
+        const pdfFileUri = vscode.Uri.file(pdfFilePath)
+        const encodedPdfPath = await lw.server.encodePathWithPrefix(pdfFileUri)
+        const pdfLiveShareFile = vscode.Uri.file(lw.file.getPdfLiveSharePath(lastStep.rootFile))
+        await vscode.workspace.fs.writeFile(pdfLiveShareFile, Buffer.from(encodedPdfPath))
+    }
     lw.completion.reference.setNumbersFromAuxFile(lastStep.rootFile)
     await lw.cache.loadFlsFile(lastStep.rootFile ?? '')
     const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(lastStep.rootFile))
diff --git a/src/core/file.ts b/src/core/file.ts
index a5f01cf17..fc2adf105 100644
--- a/src/core/file.ts
+++ b/src/core/file.ts
@@ -14,6 +14,7 @@ export const file = {
     getJobname,
     getBibPath,
     getPdfPath,
+    getPdfLiveSharePath,
     getFlsPath,
     hasBinaryExt,
     hasTeXExt,
@@ -311,6 +312,19 @@ function getPdfPath(texPath: string): string {
     return path.resolve(path.dirname(texPath), getOutDir(texPath), path.basename(`${getJobname(texPath)}.pdf`))
 }
 
+/**
+ * Construct the absolute path to the pdf.liveshare file to a given TeX file.
+ *
+ * This the content of a pdf.liveshare file is the encoded link to be embded
+ * in the viewer.
+ *
+ * @param texPath - The path to the TeX file.
+ * @returns - The absolute path to the corresponding pdf.liveshare file.
+ */
+function getPdfLiveSharePath(texPath: string): string {
+    return `${getPdfPath(texPath)}.liveshare`
+}
+
 /**
  * Retrieves the .fls file path associated with a given .tex file.
  *
diff --git a/src/liveshare/liveshare.ts b/src/liveshare/liveshare.ts
new file mode 100644
index 000000000..f194b867b
--- /dev/null
+++ b/src/liveshare/liveshare.ts
@@ -0,0 +1,65 @@
+import * as vsls from 'vsls/vscode'
+import * as vscode from 'vscode'
+import { lw } from '../lw'
+import * as url from 'url'
+
+export class LiveShare {
+    private liveshare: vsls.LiveShare | undefined | null
+    private role: vsls.Role = vsls.Role.None
+
+    private hostServerPort: number | undefined | null
+
+    constructor() {
+        void this.init()
+    }
+
+    private async init() {
+        this.liveshare = await vsls.getApi()
+        if (!this.liveshare) {
+            return
+        }
+        this.sessionRole = this.liveshare.session.role
+        this.liveshare.onDidChangeSession(e => this.sessionRole = e.session.role, null)
+    }
+
+    private set sessionRole(role: vsls.Role) {
+        this.role = role
+        if (this.role === vsls.Role.Guest) {
+            void this.initGuest()
+        } else if (this.role === vsls.Role.Host) {
+            void this.initHost()
+        }
+    }
+
+    get isGuest(): boolean {
+        return this.role === vsls.Role.Guest
+    }
+
+    get isHost(): boolean {
+        return this.role === vsls.Role.Host
+    }
+
+    private initGuest() {
+        setTimeout(async () => {
+            await vscode.commands.executeCommand('liveshare.listServers')
+            const hostUrl = await vscode.env.clipboard.readText()
+            this.hostServerPort = Number(url.parse(hostUrl).port)
+        }, 1000)
+    }
+
+    public async getHostServerPort(): Promise<number> {
+        if (this.hostServerPort !== undefined && this.hostServerPort !== null) {
+            return this.hostServerPort
+        }
+        else {
+            await vscode.commands.executeCommand('liveshare.listServers')
+            const hostUrl = await vscode.env.clipboard.readText()
+            this.hostServerPort = Number(url.parse(hostUrl).port)
+            return this.hostServerPort
+        }
+    }
+
+    private async initHost() {
+        await this.liveshare?.shareServer({ port: lw.server.getPort(), displayName: 'latex-workshop-server' })
+    }
+}
diff --git a/src/lw.ts b/src/lw.ts
index aa690ed3e..940440ad6 100644
--- a/src/lw.ts
+++ b/src/lw.ts
@@ -17,6 +17,7 @@ import type { parser } from './parse'
 import type { extra } from './extras'
 
 import type * as commands from './core/commands'
+import { LiveShare } from './liveshare/liveshare'
 
 const wrapper = <T extends Array<any>, U>(fn: (...args: T) => U) => {
     return (...args: T): U => fn(...args)
@@ -43,6 +44,7 @@ export const lw = {
     lint: {} as typeof lint,
     outline: {} as typeof outline,
     extra: {} as typeof extra,
+    liveshare: new LiveShare(),
     commands: Object.create(null) as typeof commands,
     external: {
         spawn: wrapper(cs.spawn),
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 657cecd14..2eef0ee47 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -10,9 +10,12 @@ const logger = lw.log('Server')
 
 export {
     getPort,
+    urlFromPortAndEncodedUri,
     getUrl,
     setHandler,
     initialize,
+    encodePathWithPrefix,
+    decodePathWithPrefix
     // initialized
 }
 
@@ -30,10 +33,10 @@ class WsServer extends ws.Server {
     // - https://github.com/websockets/ws/blob/master/doc/ws.md#servershouldhandlerequest
     //
     shouldHandle(req: http.IncomingMessage): boolean {
-        if (!this.validOrigin.includes('127.0.0.1')) {
+        const reqOrigin = req.headers['origin']
+        if (!this.validOrigin.includes('127.0.0.1') || reqOrigin?.includes('127.0.0.1')) {
             return true
         }
-        const reqOrigin = req.headers['origin']
         if (reqOrigin !== undefined && reqOrigin !== this.validOrigin) {
             logger.log(`Origin in WebSocket upgrade request is invalid: ${JSON.stringify(req.headers)}`)
             logger.log(`Valid origin: ${this.validOrigin}`)
@@ -73,11 +76,16 @@ function getPort(): number {
 }
 
 async function getUrl(pdfUri?: vscode.Uri): Promise<{url: string, uri: vscode.Uri}> {
+    const res = await urlFromPortAndEncodedUri(lw.server.getPort(), pdfUri ? encodePathWithPrefix(pdfUri) : '')
+    return res
+}
+
+async function urlFromPortAndEncodedUri(port: number, encodedUri: string): Promise<{url: string, uri: vscode.Uri}> {
     // viewer/viewer.js automatically requests the file to server.ts, and server.ts decodes the encoded path of PDF file.
-    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${lw.server.getPort()}`, true))
+    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${port}`, true))
     const url =
         (origUrl.toString().endsWith('/') ? origUrl.toString().slice(0, -1) : origUrl.toString()) +
-        (pdfUri ? ('/viewer.html?file=' + encodePathWithPrefix(pdfUri)) : '')
+        ('/viewer.html?file=' + encodedUri)
     return { url, uri: vscode.Uri.parse(url, true) }
 }
 
@@ -149,7 +157,7 @@ function initializeWsServer(httpServer: http.Server, validOrigin: string) {
 //
 function checkHttpOrigin(req: http.IncomingMessage, response: http.ServerResponse): boolean {
     const validOrigin = getValidOrigin()
-    if (!validOrigin.includes('127.0.0.1')) {
+    if (!validOrigin.includes('127.0.0.1') || req.headers['origin']?.includes('127.0.0.1')) {
         return true
     }
     const reqOrigin = req.headers['origin']
diff --git a/src/preview/viewer/pdfviewerhook.ts b/src/preview/viewer/pdfviewerhook.ts
index 8d69008b7..a87ae1c9b 100644
--- a/src/preview/viewer/pdfviewerhook.ts
+++ b/src/preview/viewer/pdfviewerhook.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import { lw } from '../../lw'
 import type { ViewerMode } from '../../types'
 import { insert } from './pdfviewermanager'
-import { populate } from './pdfviewerpanel'
+import { populate, getPDFViewerContentHelper, PdfViewerPanel } from './pdfviewerpanel'
 
 export {
     hook
@@ -19,6 +19,28 @@ class PdfViewerHookProvider implements vscode.CustomReadonlyEditorProvider {
     async resolveCustomEditor(document: vscode.CustomDocument, webviewPanel: vscode.WebviewPanel) {
         const configuration = vscode.workspace.getConfiguration('latex-workshop')
         const viewerLocation = configuration.get<ViewerMode>('view.pdf.viewer', 'tab')
+
+        if (document.uri.fsPath.toLocaleLowerCase().endsWith('.pdf.liveshare')) {
+            const encodedPdfPath = (await vscode.workspace.fs.readFile(document.uri)).toString()
+            const decodedPdfUri = lw.server.decodePathWithPrefix(encodedPdfPath)
+            if (lw.liveshare.isGuest) {
+                if (viewerLocation === 'tab') {
+                    webviewPanel.webview.options = {
+                        ...webviewPanel.webview.options,
+                        enableScripts: true
+                    }
+                    const uri = (await lw.server.urlFromPortAndEncodedUri(await lw.liveshare.getHostServerPort(), encodedPdfPath)).uri
+                    const htmlContent = await getPDFViewerContentHelper(uri)
+                    webviewPanel.webview.html = htmlContent
+                    const pdfPanel = new PdfViewerPanel(uri, webviewPanel)
+                    void insert(pdfPanel)
+                }
+            }
+            else {
+                await this.resolveCustomEditor({ uri: decodedPdfUri, dispose: () => { } }, webviewPanel)
+            }
+            return
+        }
         if (viewerLocation === 'tab') {
             webviewPanel.webview.options = {
                 ...webviewPanel.webview.options,
diff --git a/src/preview/viewer/pdfviewerpanel.ts b/src/preview/viewer/pdfviewerpanel.ts
index 03e51cf8e..8b0236861 100644
--- a/src/preview/viewer/pdfviewerpanel.ts
+++ b/src/preview/viewer/pdfviewerpanel.ts
@@ -7,8 +7,9 @@ import { escapeHtml, sleep } from '../../utils/utils'
 const logger = lw.log('Viewer', 'Panel')
 
 export {
-    type PdfViewerPanel,
+    PdfViewerPanel,
     serializer,
+    getPDFViewerContentHelper,
     populate
 }
 
@@ -107,20 +108,14 @@ function getKeyboardEventConfig(): boolean {
     }
 }
 
-/**
- * Returns the HTML content of the internal PDF viewer.
- *
- * @param pdfUri The path of a PDF file to be opened.
- */
-async function getPDFViewerContent(pdfUri: vscode.Uri): Promise<string> {
-    const uri = (await lw.server.getUrl(pdfUri)).uri
+async function getPDFViewerContentHelper(uri: vscode.Uri): Promise<string> {
     const iframeSrcOrigin = `${uri.scheme}://${uri.authority}`
     const iframeSrcUrl = uri.toString(true)
     await patchCodespaces(uri)
     logger.log(`Internal PDF viewer at ${iframeSrcUrl} .`)
     const rebroadcast: boolean = getKeyboardEventConfig()
     return `
-    <!DOCTYPE html><html><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; base-uri 'none'; frame-src ${iframeSrcOrigin}; script-src 'unsafe-inline'; style-src 'unsafe-inline';"></head>
+    <!DOCTYPE html><html><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; base-uri 'none'; frame-src *; script-src 'unsafe-inline'; style-src 'unsafe-inline';"></head>
     <body><iframe id="preview-panel" class="preview-panel" src="${iframeSrcUrl}" style="position:absolute; border: none; left: 0; top: 0; width: 100%; height: 100%;">
     </iframe>
     <script>
@@ -177,3 +172,14 @@ async function getPDFViewerContent(pdfUri: vscode.Uri): Promise<string> {
     </body></html>
     `
 }
+
+
+/**
+ * Returns the HTML content of the internal PDF viewer.
+ *
+ * @param pdfUri The path of a PDF file to be opened.
+ */
+async function getPDFViewerContent(pdfUri: vscode.Uri): Promise<string> {
+    const res = await getPDFViewerContentHelper((await lw.server.getUrl(pdfUri)).uri)
+    return res
+}

From 931d1b6a6dcb448f257d43af85870059909a5aba Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Sun, 30 Jun 2024 23:51:04 +0800
Subject: [PATCH 02/20] updated package-lock.json

---
 package-lock.json | 91 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 86 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f3223186..ce18e54ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
         "micromatch": "4.0.5",
         "pdfjs-dist": "4.3.136",
         "tmp": "0.2.3",
+        "vsls": "^1.0.4753",
         "workerpool": "9.1.1",
         "ws": "8.17.1"
       },
@@ -574,6 +575,18 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@microsoft/servicehub-framework": {
+      "version": "2.6.74",
+      "resolved": "https://registry.npmjs.org/@microsoft/servicehub-framework/-/servicehub-framework-2.6.74.tgz",
+      "integrity": "sha512-QJ//zzvxffupIkzupnVbMYY5YDOP+g5FlG6x0Pl7svRyq8pAouiibckJJcZlMtsMypKWwAnVBKb9/sonEOsUxw==",
+      "dependencies": {
+        "await-semaphore": "^0.1.3",
+        "msgpack-lite": "^0.1.26",
+        "nerdbank-streams": "2.5.60",
+        "strict-event-emitter-types": "^2.0.0",
+        "vscode-jsonrpc": "^4.0.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1678,6 +1691,11 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
+    "node_modules/await-semaphore": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/await-semaphore/-/await-semaphore-0.1.3.tgz",
+      "integrity": "sha512-d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="
+    },
     "node_modules/azure-devops-node-api": {
       "version": "12.5.0",
       "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-12.5.0.tgz",
@@ -1899,6 +1917,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cancellationtoken": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cancellationtoken/-/cancellationtoken-2.2.0.tgz",
+      "integrity": "sha512-uF4sHE5uh2VdEZtIRJKGoXAD9jm7bFY0tDRCzH4iLp262TOJ2lrtNHjMG2zc8H+GICOpELIpM7CGW5JeWnb3Hg=="
+    },
     "node_modules/canvas": {
       "version": "2.11.2",
       "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
@@ -1920,6 +1943,11 @@
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true
     },
+    "node_modules/caught": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/caught/-/caught-0.1.3.tgz",
+      "integrity": "sha512-DTWI84qfoqHEV5jHRpsKNnEisVCeuBDscXXaXyRLXC+4RD6rFftUNuTElcQ7LeO7w622pfzWkA1f6xu5qEAidw=="
+    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -2800,6 +2828,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/event-lite": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.3.tgz",
+      "integrity": "sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw=="
+    },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -3457,7 +3490,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3471,8 +3503,7 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "optional": true
+      ]
     },
     "node_modules/ignore": {
       "version": "5.3.1",
@@ -3537,6 +3568,11 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/int64-buffer": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz",
+      "integrity": "sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA=="
+    },
     "node_modules/is-arrayish": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
@@ -3678,8 +3714,7 @@
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
     "node_modules/isexe": {
       "version": "2.0.0",
@@ -4577,6 +4612,20 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "devOptional": true
     },
+    "node_modules/msgpack-lite": {
+      "version": "0.1.26",
+      "resolved": "https://registry.npmjs.org/msgpack-lite/-/msgpack-lite-0.1.26.tgz",
+      "integrity": "sha512-SZ2IxeqZ1oRFGo0xFGbvBJWMp3yLIY9rlIJyxy8CGrwZn1f0ZK4r6jV/AM1r0FZMDUkWkglOk/eeKIL9g77Nxw==",
+      "dependencies": {
+        "event-lite": "^0.1.1",
+        "ieee754": "^1.1.8",
+        "int64-buffer": "^0.1.9",
+        "isarray": "^1.0.0"
+      },
+      "bin": {
+        "msgpack": "bin/msgpack"
+      }
+    },
     "node_modules/mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
@@ -4602,6 +4651,17 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
+    "node_modules/nerdbank-streams": {
+      "version": "2.5.60",
+      "resolved": "https://registry.npmjs.org/nerdbank-streams/-/nerdbank-streams-2.5.60.tgz",
+      "integrity": "sha512-saQaMyTtVDAEc+S+BPXKM6K1AF3FyrorFSDzaCkdmtDe2kZzu1aYPQZNLmnxJhxbTcghYrEmYFFoaDxBDVadCw==",
+      "dependencies": {
+        "await-semaphore": "^0.1.3",
+        "cancellationtoken": "^2.0.1",
+        "caught": "^0.1.3",
+        "msgpack-lite": "^0.1.26"
+      }
+    },
     "node_modules/nise": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/nise/-/nise-6.0.0.tgz",
@@ -5526,6 +5586,11 @@
         "npm": ">=6"
       }
     },
+    "node_modules/strict-event-emitter-types": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz",
+      "integrity": "sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA=="
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -6092,6 +6157,22 @@
         "node": ">=16"
       }
     },
+    "node_modules/vscode-jsonrpc": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
+      "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==",
+      "engines": {
+        "node": ">=8.0.0 || >=10.0.0"
+      }
+    },
+    "node_modules/vsls": {
+      "version": "1.0.4753",
+      "resolved": "https://registry.npmjs.org/vsls/-/vsls-1.0.4753.tgz",
+      "integrity": "sha512-hmrsMbhjuLoU8GgtVfqhbV4ZkGvDpLV2AFmzx+cCOGNra2qk0Q36dYkfwENqy/vJVQ/2/lhxcn+69FYnKQRhgg==",
+      "dependencies": {
+        "@microsoft/servicehub-framework": "^2.6.74"
+      }
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",

From 53ce764d5829fbe3769416a28b7f8b08ed5c853c Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Mon, 1 Jul 2024 23:54:59 +0800
Subject: [PATCH 03/20] New guest pdf loading strategy: no pdf.liveshare file
 generated

---
 package.json                        |  3 ---
 src/compile/build.ts                |  9 +--------
 src/core/file.ts                    | 14 --------------
 src/liveshare/liveshare.ts          |  4 +++-
 src/preview/server.ts               |  5 ++++-
 src/preview/viewer.ts               |  8 ++++++++
 src/preview/viewer/pdfviewerhook.ts | 27 ++++++++++-----------------
 7 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index 62b6b1e54..2c04f1c19 100644
--- a/package.json
+++ b/package.json
@@ -2541,9 +2541,6 @@
           {
             "filenamePattern": "*.pdf"
           },
-          {
-            "filenamePattern": "*.pdf.liveshare"
-          },
           {
             "filenamePattern": "*.PDF"
           }
diff --git a/src/compile/build.ts b/src/compile/build.ts
index 78666c19b..76fe35629 100644
--- a/src/compile/build.ts
+++ b/src/compile/build.ts
@@ -420,14 +420,7 @@ async function afterSuccessfulBuilt(lastStep: Step, skipped: boolean) {
     if (!lastStep.isExternal && skipped) {
         return
     }
-    const pdfFilePath = lw.file.getPdfPath(lastStep.rootFile)
-    lw.viewer.refresh(pdfFilePath)
-    if (lw.liveshare.isHost) {
-        const pdfFileUri = vscode.Uri.file(pdfFilePath)
-        const encodedPdfPath = await lw.server.encodePathWithPrefix(pdfFileUri)
-        const pdfLiveShareFile = vscode.Uri.file(lw.file.getPdfLiveSharePath(lastStep.rootFile))
-        await vscode.workspace.fs.writeFile(pdfLiveShareFile, Buffer.from(encodedPdfPath))
-    }
+    lw.viewer.refresh(lw.file.getPdfPath(lastStep.rootFile))
     lw.completion.reference.setNumbersFromAuxFile(lastStep.rootFile)
     await lw.cache.loadFlsFile(lastStep.rootFile ?? '')
     const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(lastStep.rootFile))
diff --git a/src/core/file.ts b/src/core/file.ts
index fc2adf105..a5f01cf17 100644
--- a/src/core/file.ts
+++ b/src/core/file.ts
@@ -14,7 +14,6 @@ export const file = {
     getJobname,
     getBibPath,
     getPdfPath,
-    getPdfLiveSharePath,
     getFlsPath,
     hasBinaryExt,
     hasTeXExt,
@@ -312,19 +311,6 @@ function getPdfPath(texPath: string): string {
     return path.resolve(path.dirname(texPath), getOutDir(texPath), path.basename(`${getJobname(texPath)}.pdf`))
 }
 
-/**
- * Construct the absolute path to the pdf.liveshare file to a given TeX file.
- *
- * This the content of a pdf.liveshare file is the encoded link to be embded
- * in the viewer.
- *
- * @param texPath - The path to the TeX file.
- * @returns - The absolute path to the corresponding pdf.liveshare file.
- */
-function getPdfLiveSharePath(texPath: string): string {
-    return `${getPdfPath(texPath)}.liveshare`
-}
-
 /**
  * Retrieves the .fls file path associated with a given .tex file.
  *
diff --git a/src/liveshare/liveshare.ts b/src/liveshare/liveshare.ts
index f194b867b..f9e344378 100644
--- a/src/liveshare/liveshare.ts
+++ b/src/liveshare/liveshare.ts
@@ -4,11 +4,12 @@ import { lw } from '../lw'
 import * as url from 'url'
 
 export class LiveShare {
-    private liveshare: vsls.LiveShare | undefined | null
     private role: vsls.Role = vsls.Role.None
 
     private hostServerPort: number | undefined | null
 
+    liveshare: vsls.LiveShare | undefined | null
+
     constructor() {
         void this.init()
     }
@@ -24,6 +25,7 @@ export class LiveShare {
 
     private set sessionRole(role: vsls.Role) {
         this.role = role
+        this.hostServerPort = null
         if (this.role === vsls.Role.Guest) {
             void this.initGuest()
         } else if (this.role === vsls.Role.Host) {
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 2eef0ee47..5427de8fd 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -202,7 +202,10 @@ async function handler(request: http.IncomingMessage, response: http.ServerRespo
     }
     if (hasPrefix(request.url) && !request.url.includes('viewer.html')) {
         const s = request.url.replace('/', '')
-        const fileUri = decodePathWithPrefix(s)
+        let fileUri = decodePathWithPrefix(s)
+        if (fileUri.scheme === 'vsls' && lw.liveshare.isHost) {
+            fileUri = lw.liveshare.liveshare?.convertSharedUriToLocal(fileUri) ?? fileUri
+        }
         if (!lw.viewer.isViewing(fileUri)) {
             logger.log(`Invalid PDF request: ${fileUri.toString(true)}`)
             return
diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index 6bad370ef..6bae2e807 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -65,6 +65,11 @@ function refresh(pdfFile?: string): void {
         logger.log(`Not found PDF viewers to refresh: ${pdfFile}`)
         return
     }
+    if (lw.liveshare.isHost && lw.liveshare.liveshare !== null && pdfFile !== undefined) {
+        const sharedUri = lw.liveshare.liveshare?.convertLocalUriToShared(vscode.Uri.file(pdfFile))
+        const guestClients = manager.getClients(sharedUri)
+        guestClients?.forEach(client => clientSet.add(client))
+    }
     logger.log(`Refresh PDF viewer: ${pdfFile}`)
     clientSet.forEach(client => {
         client.send({type: 'refresh'})
@@ -274,6 +279,9 @@ function handler(websocket: ws, msg: string): void {
     switch (data.type) {
         case 'open': {
             const pdfUri = vscode.Uri.parse(data.pdfFileUri, true)
+            if (pdfUri.scheme === 'vsls' && lw.liveshare.isHost) {
+                manager.create(pdfUri)
+            }
             const clientSet = manager.getClients(pdfUri)
             if (clientSet === undefined) {
                 break
diff --git a/src/preview/viewer/pdfviewerhook.ts b/src/preview/viewer/pdfviewerhook.ts
index a87ae1c9b..a3362cdd7 100644
--- a/src/preview/viewer/pdfviewerhook.ts
+++ b/src/preview/viewer/pdfviewerhook.ts
@@ -20,24 +20,17 @@ class PdfViewerHookProvider implements vscode.CustomReadonlyEditorProvider {
         const configuration = vscode.workspace.getConfiguration('latex-workshop')
         const viewerLocation = configuration.get<ViewerMode>('view.pdf.viewer', 'tab')
 
-        if (document.uri.fsPath.toLocaleLowerCase().endsWith('.pdf.liveshare')) {
-            const encodedPdfPath = (await vscode.workspace.fs.readFile(document.uri)).toString()
-            const decodedPdfUri = lw.server.decodePathWithPrefix(encodedPdfPath)
-            if (lw.liveshare.isGuest) {
-                if (viewerLocation === 'tab') {
-                    webviewPanel.webview.options = {
-                        ...webviewPanel.webview.options,
-                        enableScripts: true
-                    }
-                    const uri = (await lw.server.urlFromPortAndEncodedUri(await lw.liveshare.getHostServerPort(), encodedPdfPath)).uri
-                    const htmlContent = await getPDFViewerContentHelper(uri)
-                    webviewPanel.webview.html = htmlContent
-                    const pdfPanel = new PdfViewerPanel(uri, webviewPanel)
-                    void insert(pdfPanel)
+        if (lw.liveshare.isGuest) {
+            if (viewerLocation === 'tab') {
+                webviewPanel.webview.options = {
+                    ...webviewPanel.webview.options,
+                    enableScripts: true
                 }
-            }
-            else {
-                await this.resolveCustomEditor({ uri: decodedPdfUri, dispose: () => { } }, webviewPanel)
+                const uri = (await lw.server.urlFromPortAndEncodedUri(await lw.liveshare.getHostServerPort(), lw.server.encodePathWithPrefix(document.uri))).uri
+                const htmlContent = await getPDFViewerContentHelper(uri)
+                webviewPanel.webview.html = htmlContent
+                const pdfPanel = new PdfViewerPanel(uri, webviewPanel)
+                void insert(pdfPanel)
             }
             return
         }

From 9367c9d262752cdd504ff8b46a2d5e5585992ee3 Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Tue, 2 Jul 2024 09:35:40 +0800
Subject: [PATCH 04/20] Refinements re. obtaining host port + allowing viewing
 pdfs from guest first

---
 src/liveshare/liveshare.ts | 23 +++++++++++++----------
 src/preview/server.ts      |  5 +++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/liveshare/liveshare.ts b/src/liveshare/liveshare.ts
index f9e344378..2ab7efd19 100644
--- a/src/liveshare/liveshare.ts
+++ b/src/liveshare/liveshare.ts
@@ -24,8 +24,7 @@ export class LiveShare {
     }
 
     private set sessionRole(role: vsls.Role) {
-        this.role = role
-        this.hostServerPort = null
+        this.reset(role)
         if (this.role === vsls.Role.Guest) {
             void this.initGuest()
         } else if (this.role === vsls.Role.Host) {
@@ -33,6 +32,11 @@ export class LiveShare {
         }
     }
 
+    private reset(role: vsls.Role) {
+        this.role = role
+        this.hostServerPort = null
+    }
+
     get isGuest(): boolean {
         return this.role === vsls.Role.Guest
     }
@@ -41,12 +45,8 @@ export class LiveShare {
         return this.role === vsls.Role.Host
     }
 
-    private initGuest() {
-        setTimeout(async () => {
-            await vscode.commands.executeCommand('liveshare.listServers')
-            const hostUrl = await vscode.env.clipboard.readText()
-            this.hostServerPort = Number(url.parse(hostUrl).port)
-        }, 1000)
+    private async initGuest() {
+        await this.getHostServerPort()
     }
 
     public async getHostServerPort(): Promise<number> {
@@ -54,10 +54,13 @@ export class LiveShare {
             return this.hostServerPort
         }
         else {
+            const savedClipboard = await vscode.env.clipboard.readText()
             await vscode.commands.executeCommand('liveshare.listServers')
             const hostUrl = await vscode.env.clipboard.readText()
-            this.hostServerPort = Number(url.parse(hostUrl).port)
-            return this.hostServerPort
+            await vscode.env.clipboard.writeText(savedClipboard)
+            const hostServerPort = Number(url.parse(hostUrl).port)
+            this.hostServerPort = hostServerPort
+            return hostServerPort
         }
     }
 
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 5427de8fd..4e2b1e44b 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -203,10 +203,11 @@ async function handler(request: http.IncomingMessage, response: http.ServerRespo
     if (hasPrefix(request.url) && !request.url.includes('viewer.html')) {
         const s = request.url.replace('/', '')
         let fileUri = decodePathWithPrefix(s)
-        if (fileUri.scheme === 'vsls' && lw.liveshare.isHost) {
+        const isVsls = fileUri.scheme === 'vsls'
+        if (isVsls && lw.liveshare.isHost) {
             fileUri = lw.liveshare.liveshare?.convertSharedUriToLocal(fileUri) ?? fileUri
         }
-        if (!lw.viewer.isViewing(fileUri)) {
+        if (!lw.viewer.isViewing(fileUri) && !isVsls) {
             logger.log(`Invalid PDF request: ${fileUri.toString(true)}`)
             return
         }

From 7451b0561f5caffdabaed53ac44f96deb8ce84a1 Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Tue, 2 Jul 2024 11:54:43 +0800
Subject: [PATCH 05/20] Added commands to share and acquire ports on hosts and
 guests

---
 package.json               | 10 ++++++++++
 src/core/commands.ts       | 20 ++++++++++++++++++++
 src/liveshare/liveshare.ts | 17 ++++++++++++-----
 src/main.ts                |  2 ++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2c04f1c19..6f93bde2a 100644
--- a/package.json
+++ b/package.json
@@ -285,6 +285,16 @@
       }
     ],
     "commands": [
+      {
+        "command": "latex-workshop.acquireHostPort",
+        "title": "Acquire Live Share host port",
+        "category": "LaTeX Workshop"
+      },
+      {
+        "command": "latex-workshop.shareHostPort",
+        "title": "Share Live Share host port",
+        "category": "LaTeX Workshop"
+      },
       {
         "command": "latex-workshop.navigate-envpair",
         "title": "%command.navigate-envpair%",
diff --git a/src/core/commands.ts b/src/core/commands.ts
index a835e3d95..42b8a7eda 100644
--- a/src/core/commands.ts
+++ b/src/core/commands.ts
@@ -5,6 +5,26 @@ import { getSurroundingMacroRange, stripText } from '../utils/utils'
 
 const logger = lw.log('Commander')
 
+export async function acquireHostPort() {
+    logger.log('ACQUIREHOSTPORT command invoked.')
+    if (lw.liveshare.isGuest) {
+        await lw.liveshare.getHostServerPort(true)
+    }
+    else {
+        void vscode.window.showInformationMessage('This command only works for guests in a Live Share session.')
+    }
+}
+
+export async function shareHostPort() {
+    logger.log('SHAREHOSTPORT command invoked.')
+    if (lw.liveshare.isHost) {
+        await lw.liveshare.shareServer()
+    }
+    else {
+        void vscode.window.showInformationMessage('This command only works for a host in a Live Share session.')
+    }
+}
+
 export async function build(skipSelection: boolean = false, rootFile: string | undefined = undefined, languageId: string | undefined = undefined, recipe: string | undefined = undefined) {
     logger.log('BUILD command invoked.')
     await lw.compile.build(skipSelection, rootFile, languageId, recipe)
diff --git a/src/liveshare/liveshare.ts b/src/liveshare/liveshare.ts
index 2ab7efd19..496f2673f 100644
--- a/src/liveshare/liveshare.ts
+++ b/src/liveshare/liveshare.ts
@@ -5,8 +5,8 @@ import * as url from 'url'
 
 export class LiveShare {
     private role: vsls.Role = vsls.Role.None
-
     private hostServerPort: number | undefined | null
+    private shareServerDisposable: vscode.Disposable | undefined
 
     liveshare: vsls.LiveShare | undefined | null
 
@@ -49,22 +49,29 @@ export class LiveShare {
         await this.getHostServerPort()
     }
 
-    public async getHostServerPort(): Promise<number> {
-        if (this.hostServerPort !== undefined && this.hostServerPort !== null) {
+    public async getHostServerPort(reset: boolean = false): Promise<number> {
+        if (!reset && this.hostServerPort !== undefined && this.hostServerPort !== null) {
             return this.hostServerPort
         }
         else {
             const savedClipboard = await vscode.env.clipboard.readText()
             await vscode.commands.executeCommand('liveshare.listServers')
             const hostUrl = await vscode.env.clipboard.readText()
-            await vscode.env.clipboard.writeText(savedClipboard)
             const hostServerPort = Number(url.parse(hostUrl).port)
             this.hostServerPort = hostServerPort
+            await vscode.env.clipboard.writeText(savedClipboard)
             return hostServerPort
         }
     }
 
+    public async shareServer() {
+        if (this.shareServerDisposable !== null) {
+            this.shareServerDisposable?.dispose()
+        }
+        this.shareServerDisposable = await this.liveshare?.shareServer({ port: lw.server.getPort(), displayName: 'latex-workshop-server' })
+    }
+
     private async initHost() {
-        await this.liveshare?.shareServer({ port: lw.server.getPort(), displayName: 'latex-workshop-server' })
+        await this.shareServer()
     }
 }
diff --git a/src/main.ts b/src/main.ts
index 6e34d2f0c..65c869a24 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -156,6 +156,8 @@ export function activate(extensionContext: vscode.ExtensionContext) {
 
 function registerLatexWorkshopCommands(extensionContext: vscode.ExtensionContext) {
     extensionContext.subscriptions.push(
+        vscode.commands.registerCommand('latex-workshop.acquireHostPort', () => lw.commands.acquireHostPort()),
+        vscode.commands.registerCommand('latex-workshop.shareHostPort', () => lw.commands.shareHostPort()),
         vscode.commands.registerCommand('latex-workshop.saveWithoutBuilding', () => lw.commands.saveActive()),
         vscode.commands.registerCommand('latex-workshop.build', () => lw.commands.build()),
         vscode.commands.registerCommand('latex-workshop.recipes', (recipe: string | undefined) => lw.commands.recipes(recipe)),

From bedc98ab589ae82db4393702cb9cb28a906ef6f0 Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Tue, 2 Jul 2024 12:26:22 +0800
Subject: [PATCH 06/20] Fixed pdf reload on guest

---
 src/preview/viewer.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index 6bae2e807..bbd035ccf 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -60,15 +60,18 @@ function refresh(pdfFile?: string): void {
         })
         return
     }
-    const clientSet = manager.getClients(pdfUri)
-    if (!clientSet) {
-        logger.log(`Not found PDF viewers to refresh: ${pdfFile}`)
-        return
-    }
+    let clientSet = manager.getClients(pdfUri)
     if (lw.liveshare.isHost && lw.liveshare.liveshare !== null && pdfFile !== undefined) {
         const sharedUri = lw.liveshare.liveshare?.convertLocalUriToShared(vscode.Uri.file(pdfFile))
         const guestClients = manager.getClients(sharedUri)
-        guestClients?.forEach(client => clientSet.add(client))
+        if (guestClients) {
+            clientSet?.forEach(client => guestClients.add(client))
+            clientSet = guestClients
+        }
+    }
+    if (!clientSet) {
+        logger.log(`Not found PDF viewers to refresh: ${pdfFile}`)
+        return
     }
     logger.log(`Refresh PDF viewer: ${pdfFile}`)
     clientSet.forEach(client => {

From 8094edb95ac77cfd7b78729bc09319c8604e8c7b Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Wed, 3 Jul 2024 09:06:20 +0800
Subject: [PATCH 07/20] Minimize changes and improve port acquisition

---
 src/liveshare/liveshare.ts           | 14 ++++++++++++--
 src/preview/math-preview-panel.ts    | 16 ++++++++--------
 src/preview/server.ts                | 16 +++++++---------
 src/preview/viewer/pdfviewerhook.ts  | 17 +----------------
 src/preview/viewer/pdfviewerpanel.ts | 22 ++++++++--------------
 5 files changed, 36 insertions(+), 49 deletions(-)

diff --git a/src/liveshare/liveshare.ts b/src/liveshare/liveshare.ts
index 496f2673f..631a3bbfc 100644
--- a/src/liveshare/liveshare.ts
+++ b/src/liveshare/liveshare.ts
@@ -35,6 +35,7 @@ export class LiveShare {
     private reset(role: vsls.Role) {
         this.role = role
         this.hostServerPort = null
+        this.shareServerDisposable?.dispose()
     }
 
     get isGuest(): boolean {
@@ -55,7 +56,9 @@ export class LiveShare {
         }
         else {
             const savedClipboard = await vscode.env.clipboard.readText()
-            await vscode.commands.executeCommand('liveshare.listServers')
+            void vscode.commands.executeCommand('liveshare.listServers')
+            // delay here instead of doing await vscode.commands.executeCommand acquires the port more reliably because await vscode.commands.executeCommand does not return until the user closes the info box of the command or clicks copy again.
+            await this.delay(500)
             const hostUrl = await vscode.env.clipboard.readText()
             const hostServerPort = Number(url.parse(hostUrl).port)
             this.hostServerPort = hostServerPort
@@ -65,10 +68,17 @@ export class LiveShare {
     }
 
     public async shareServer() {
+        if (!this.isHost) {
+            return
+        }
         if (this.shareServerDisposable !== null) {
             this.shareServerDisposable?.dispose()
         }
-        this.shareServerDisposable = await this.liveshare?.shareServer({ port: lw.server.getPort(), displayName: 'latex-workshop-server' })
+        this.shareServerDisposable = await this.liveshare?.shareServer({ port: await lw.server.getPort(), displayName: 'latex-workshop-server' })
+    }
+
+    private async delay(t: number) {
+        return new Promise(resolve => setTimeout(resolve, t))
     }
 
     private async initHost() {
diff --git a/src/preview/math-preview-panel.ts b/src/preview/math-preview-panel.ts
index 393aadbe4..863308fdb 100644
--- a/src/preview/math-preview-panel.ts
+++ b/src/preview/math-preview-panel.ts
@@ -27,13 +27,13 @@ function resourcesFolder(extensionRoot: string) {
 }
 
 class MathPreviewPanelSerializer implements vscode.WebviewPanelSerializer {
-    deserializeWebviewPanel(panel: vscode.WebviewPanel) {
+    async deserializeWebviewPanel(panel: vscode.WebviewPanel) {
         initializePanel(panel)
         panel.webview.options = {
             enableScripts: true,
             localResourceRoots: [resourcesFolder(lw.extensionRoot)]
         }
-        panel.webview.html = getHtml()
+        panel.webview.html = await getHtml()
         logger.log('Math preview panel: restored')
         return Promise.resolve()
     }
@@ -48,7 +48,7 @@ const state = {
     prevMacros: undefined as string | undefined,
 }
 
-function open() {
+async function open() {
     const activeDocument = vscode.window.activeTextEditor?.document
     if (state.panel) {
         if (!state.panel.visible) {
@@ -67,7 +67,7 @@ function open() {
         }
     )
     initializePanel(panel)
-    panel.webview.html = getHtml()
+    panel.webview.html = await getHtml()
     const configuration = vscode.workspace.getConfiguration('latex-workshop')
     const editorGroup = configuration.get('mathpreviewpanel.editorGroup') as string
     if (activeDocument) {
@@ -113,14 +113,14 @@ function close() {
 function toggle(action?: 'open' | 'close') {
     if (action) {
         if (action === 'open') {
-            open()
+            void open()
         } else {
             close()
         }
     } else if (state.panel) {
         close()
     } else {
-        open()
+        void open()
     }
 }
 
@@ -132,7 +132,7 @@ function clearCache() {
 }
 
 let serverHandlerInserted = false
-function getHtml() {
+async function getHtml() {
     if (serverHandlerInserted === false) {
         lw.server.setHandler((url: string) => {
             if (url.startsWith('/mathpreviewpanel/')) {
@@ -157,7 +157,7 @@ function getHtml() {
                 padding-left: 50px;
             }
         </style>
-        <script src='http://127.0.0.1:${lw.server.getPort().toString()}/mathpreviewpanel/mathpreview.js' defer></script>
+        <script src='http://127.0.0.1:${(await lw.server.getPort()).toString()}/mathpreviewpanel/mathpreview.js' defer></script>
     </head>
     <body>
         <div id="mathBlock"><img src="" id="math" /></div>
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 4e2b1e44b..267279ecb 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -10,7 +10,6 @@ const logger = lw.log('Server')
 
 export {
     getPort,
-    urlFromPortAndEncodedUri,
     getUrl,
     setHandler,
     initialize,
@@ -66,7 +65,11 @@ const state: {
 
 lw.onDispose({ dispose: () => state.httpServer.close() })
 
-function getPort(): number {
+async function getPort(): Promise<number> {
+    if (lw.liveshare.isGuest) {
+        const portNum = await lw.liveshare.getHostServerPort()
+        return portNum
+    }
     const portNum = state.address?.port
     if (portNum === undefined) {
         logger.log('Server port number is undefined.')
@@ -76,16 +79,11 @@ function getPort(): number {
 }
 
 async function getUrl(pdfUri?: vscode.Uri): Promise<{url: string, uri: vscode.Uri}> {
-    const res = await urlFromPortAndEncodedUri(lw.server.getPort(), pdfUri ? encodePathWithPrefix(pdfUri) : '')
-    return res
-}
-
-async function urlFromPortAndEncodedUri(port: number, encodedUri: string): Promise<{url: string, uri: vscode.Uri}> {
     // viewer/viewer.js automatically requests the file to server.ts, and server.ts decodes the encoded path of PDF file.
-    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${port}`, true))
+    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${await lw.server.getPort()}`, true))
     const url =
         (origUrl.toString().endsWith('/') ? origUrl.toString().slice(0, -1) : origUrl.toString()) +
-        ('/viewer.html?file=' + encodedUri)
+        (pdfUri ? ('/viewer.html?file=' + encodePathWithPrefix(pdfUri)) : '')
     return { url, uri: vscode.Uri.parse(url, true) }
 }
 
diff --git a/src/preview/viewer/pdfviewerhook.ts b/src/preview/viewer/pdfviewerhook.ts
index a3362cdd7..8d69008b7 100644
--- a/src/preview/viewer/pdfviewerhook.ts
+++ b/src/preview/viewer/pdfviewerhook.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import { lw } from '../../lw'
 import type { ViewerMode } from '../../types'
 import { insert } from './pdfviewermanager'
-import { populate, getPDFViewerContentHelper, PdfViewerPanel } from './pdfviewerpanel'
+import { populate } from './pdfviewerpanel'
 
 export {
     hook
@@ -19,21 +19,6 @@ class PdfViewerHookProvider implements vscode.CustomReadonlyEditorProvider {
     async resolveCustomEditor(document: vscode.CustomDocument, webviewPanel: vscode.WebviewPanel) {
         const configuration = vscode.workspace.getConfiguration('latex-workshop')
         const viewerLocation = configuration.get<ViewerMode>('view.pdf.viewer', 'tab')
-
-        if (lw.liveshare.isGuest) {
-            if (viewerLocation === 'tab') {
-                webviewPanel.webview.options = {
-                    ...webviewPanel.webview.options,
-                    enableScripts: true
-                }
-                const uri = (await lw.server.urlFromPortAndEncodedUri(await lw.liveshare.getHostServerPort(), lw.server.encodePathWithPrefix(document.uri))).uri
-                const htmlContent = await getPDFViewerContentHelper(uri)
-                webviewPanel.webview.html = htmlContent
-                const pdfPanel = new PdfViewerPanel(uri, webviewPanel)
-                void insert(pdfPanel)
-            }
-            return
-        }
         if (viewerLocation === 'tab') {
             webviewPanel.webview.options = {
                 ...webviewPanel.webview.options,
diff --git a/src/preview/viewer/pdfviewerpanel.ts b/src/preview/viewer/pdfviewerpanel.ts
index 8b0236861..160c4370c 100644
--- a/src/preview/viewer/pdfviewerpanel.ts
+++ b/src/preview/viewer/pdfviewerpanel.ts
@@ -7,9 +7,8 @@ import { escapeHtml, sleep } from '../../utils/utils'
 const logger = lw.log('Viewer', 'Panel')
 
 export {
-    PdfViewerPanel,
+    type PdfViewerPanel,
     serializer,
-    getPDFViewerContentHelper,
     populate
 }
 
@@ -108,7 +107,13 @@ function getKeyboardEventConfig(): boolean {
     }
 }
 
-async function getPDFViewerContentHelper(uri: vscode.Uri): Promise<string> {
+/**
+ * Returns the HTML content of the internal PDF viewer.
+ *
+ * @param pdfUri The path of a PDF file to be opened.
+ */
+async function getPDFViewerContent(pdfUri: vscode.Uri): Promise<string> {
+    const uri = (await lw.server.getUrl(pdfUri)).uri
     const iframeSrcOrigin = `${uri.scheme}://${uri.authority}`
     const iframeSrcUrl = uri.toString(true)
     await patchCodespaces(uri)
@@ -172,14 +177,3 @@ async function getPDFViewerContentHelper(uri: vscode.Uri): Promise<string> {
     </body></html>
     `
 }
-
-
-/**
- * Returns the HTML content of the internal PDF viewer.
- *
- * @param pdfUri The path of a PDF file to be opened.
- */
-async function getPDFViewerContent(pdfUri: vscode.Uri): Promise<string> {
-    const res = await getPDFViewerContentHelper((await lw.server.getUrl(pdfUri)).uri)
-    return res
-}

From ebc16b6b3b63397c988f6443197b2257714feff0 Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Thu, 4 Jul 2024 04:44:13 +0000
Subject: [PATCH 08/20] Allowed vsls as an appropriate scheme for uri

---
 package.json                         | 15 ++++-----
 src/compile/build.ts                 | 12 +++----
 src/compile/queue.ts                 |  3 +-
 src/compile/recipe.ts                |  8 ++---
 src/completion/completer/citation.ts |  2 +-
 src/completion/completer/input.ts    |  2 +-
 src/completion/completer/macro.ts    |  4 +--
 src/completion/latex.ts              |  2 +-
 src/core/commands.ts                 |  8 ++---
 src/core/file.ts                     | 50 ++++++++++++++++++++--------
 src/core/root.ts                     | 13 +++++---
 src/core/watcher.ts                  |  4 +--
 src/extras/cleaner.ts                |  6 ++--
 src/language/definition.ts           | 12 +++----
 src/language/symbol-document.ts      |  3 +-
 src/language/symbol-project.ts       |  2 +-
 src/lint/duplicate-label.ts          |  2 +-
 src/lint/latex-linter/chktex.ts      |  8 ++---
 src/lint/latex-linter/lacheck.ts     |  4 +--
 src/main.ts                          |  9 ++---
 src/outline/structure/bibtex.ts      |  2 +-
 src/parse/parser/parserutils.ts      |  2 +-
 src/preview/hover/ongraphics.ts      | 10 +++---
 src/preview/math-preview-panel.ts    |  2 +-
 src/preview/viewer.ts                | 14 ++++----
 src/preview/viewer/pdfviewerpanel.ts |  2 +-
 src/utils/quick-pick.ts              |  3 +-
 src/utils/utils.ts                   |  3 +-
 viewer/components/utils.ts           |  2 +-
 29 files changed, 120 insertions(+), 89 deletions(-)

diff --git a/package.json b/package.json
index 6f93bde2a..7578d4506 100644
--- a/package.json
+++ b/package.json
@@ -367,8 +367,7 @@
         "command": "latex-workshop.view",
         "title": "%command.view%",
         "category": "LaTeX Workshop",
-        "icon": "$(open-preview)",
-        "enablement": "!virtualWorkspace"
+        "icon": "$(open-preview)"
       },
       {
         "command": "latex-workshop.tab",
@@ -378,8 +377,7 @@
       {
         "command": "latex-workshop.viewInBrowser",
         "title": "%command.viewInBrowser%",
-        "category": "LaTeX Workshop",
-        "enablement": "!virtualWorkspace"
+        "category": "LaTeX Workshop"
       },
       {
         "command": "latex-workshop.viewExternal",
@@ -413,8 +411,7 @@
       {
         "command": "latex-workshop.citation",
         "title": "%command.citation%",
-        "category": "LaTeX Workshop",
-        "enablement": "!virtualWorkspace"
+        "category": "LaTeX Workshop"
       },
       {
         "command": "latex-workshop.addtexroot",
@@ -551,7 +548,7 @@
         "key": "ctrl+l alt+v",
         "mac": "cmd+l alt+v",
         "command": "latex-workshop.view",
-        "when": "editorLangId =~ /^latex$|^latex-expl3$|^doctex$|^rsweave$|^jlweave$|^pweave$/ && config.latex-workshop.bind.altKeymap.enabled && !virtualWorkspace"
+        "when": "editorLangId =~ /^latex$|^latex-expl3$|^doctex$|^rsweave$|^jlweave$|^pweave$/ && config.latex-workshop.bind.altKeymap.enabled"
       },
       {
         "key": "ctrl+l alt+j",
@@ -587,7 +584,7 @@
         "key": "ctrl+alt+v",
         "mac": "cmd+alt+v",
         "command": "latex-workshop.view",
-        "when": "editorLangId =~ /^latex$|^latex-expl3$|^doctex$|^rsweave$|^jlweave$|^pweave$/ && !config.latex-workshop.bind.altKeymap.enabled && !virtualWorkspace"
+        "when": "editorLangId =~ /^latex$|^latex-expl3$|^doctex$|^rsweave$|^jlweave$|^pweave$/ && !config.latex-workshop.bind.altKeymap.enabled"
       },
       {
         "key": "ctrl+alt+j",
@@ -2503,7 +2500,7 @@
       ],
       "editor/title": [
         {
-          "when": "editorLangId =~ /^latex$|^latex-expl3$|^doctex$|^rsweave$|^jlweave$|^pweave$/ && !virtualWorkspace",
+          "when": "editorLangId =~ /^latex$|^latex-expl3$|^doctex$|^rsweave$|^jlweave$|^pweave$/",
           "command": "latex-workshop.view",
           "group": "navigation@2"
         },
diff --git a/src/compile/build.ts b/src/compile/build.ts
index 76fe35629..0ea32aacd 100644
--- a/src/compile/build.ts
+++ b/src/compile/build.ts
@@ -30,7 +30,7 @@ lw.watcher.bib.onChange(filePath => autoBuild(filePath, 'onFileChange', true))
  * changed.
  */
 function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: boolean = false) {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(file))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(file))
     if (configuration.get('latex.autoBuild.run') as string !== type) {
         return
     }
@@ -57,7 +57,7 @@ function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: bo
  * @returns {boolean} - True if auto-build can be triggered, false otherwise.
  */
 function canAutoBuild(): boolean {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.file.path ? vscode.Uri.file(lw.root.file.path) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.file.path ? lw.file.fileUriFromPath(lw.root.file.path) : undefined)
     return Date.now() - lw.compile.lastAutoBuildTime >= (configuration.get('latex.autoBuild.interval', 1000) as number)
 }
 
@@ -91,7 +91,7 @@ async function build(skipSelection: boolean = false, rootFile: string | undefine
 
     logger.log(`The document of the active editor: ${activeEditor.document.uri.toString(true)}`)
     logger.log(`The languageId of the document: ${activeEditor.document.languageId}`)
-    const workspace = rootFile ? vscode.Uri.file(rootFile) : activeEditor.document.uri
+    const workspace = rootFile ? lw.file.fileUriFromPath(rootFile) : activeEditor.document.uri
     const configuration = vscode.workspace.getConfiguration('latex-workshop', workspace)
     const externalBuildCommand = configuration.get('latex.external.build.command') as string
     const externalBuildArgs = configuration.get('latex.external.build.args') as string[]
@@ -187,7 +187,7 @@ async function buildLoop() {
  * process.
  */
 function spawnProcess(step: Step): ProcessEnv {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? vscode.Uri.file(step.rootFile) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.fileUriFromPath(step.rootFile) : undefined)
     if (step.index === 0 || configuration.get('latex.build.clearLog.everyRecipeStep.enabled') as boolean) {
         logger.clearCompilerMessage()
     }
@@ -332,7 +332,7 @@ function handleExitCodeError(step: Step, env: ProcessEnv, stderr: string, code:
         logger.log(`${stderr}`)
     }
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? vscode.Uri.file(step.rootFile) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.fileUriFromPath(step.rootFile) : undefined)
     if (!step.isExternal && signal !== 'SIGTERM' && !step.isRetry && configuration.get('latex.autoBuild.cleanAndRetry.enabled')) {
         handleRetryError(step)
     } else if (!step.isExternal && signal !== 'SIGTERM') {
@@ -423,7 +423,7 @@ async function afterSuccessfulBuilt(lastStep: Step, skipped: boolean) {
     lw.viewer.refresh(lw.file.getPdfPath(lastStep.rootFile))
     lw.completion.reference.setNumbersFromAuxFile(lastStep.rootFile)
     await lw.cache.loadFlsFile(lastStep.rootFile ?? '')
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(lastStep.rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(lastStep.rootFile))
     // If the PDF viewer is internal, we call SyncTeX in src/components/viewer.ts.
     if (configuration.get('view.pdf.viewer') === 'external' && configuration.get('synctex.afterBuild.enabled')) {
         const pdfFile = lw.file.getPdfPath(lastStep.rootFile)
diff --git a/src/compile/queue.ts b/src/compile/queue.ts
index c028dd01f..a06bff6a3 100644
--- a/src/compile/queue.ts
+++ b/src/compile/queue.ts
@@ -1,5 +1,6 @@
 import vscode from 'vscode'
 import type { ExternalStep, RecipeStep, Step, StepQueue, Tool } from '../types'
+import { lw } from '../lw'
 
 const stepQueue: StepQueue = { steps: [], nextSteps: [] }
 
@@ -99,7 +100,7 @@ function getStepString(step: Step): string {
 
     // Determine the format of the stepString based on timestamp and index
     if(step.rootFile) {
-        const rootFileUri = vscode.Uri.file(step.rootFile)
+        const rootFileUri = lw.file.fileUriFromPath(step.rootFile)
         const configuration = vscode.workspace.getConfiguration('latex-workshop', rootFileUri)
         const showFilename = configuration.get<boolean>('latex.build.rootfileInStatus', false)
         if(showFilename) {
diff --git a/src/compile/recipe.ts b/src/compile/recipe.ts
index 1e7b50415..be3a227a5 100644
--- a/src/compile/recipe.ts
+++ b/src/compile/recipe.ts
@@ -120,7 +120,7 @@ function createOutputSubFolders(rootFile: string) {
 function createBuildTools(rootFile: string, langId: string, recipeName?: string): Tool[] | undefined {
     let buildTools: Tool[] = []
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
     const magic = findMagicComments(rootFile)
 
     if (recipeName === undefined && magic.tex && !configuration.get('latex.build.forceRecipeUsage')) {
@@ -233,7 +233,7 @@ function findMagicComments(rootFile: string): {tex?: Tool, bib?: Tool, recipe?:
  * @returns {Tool[]} - An array of Tool objects representing the build tools.
  */
 function createBuildMagic(rootFile: string, magicTex: Tool, magicBib?: Tool): Tool[] {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
 
     if (!magicTex.args) {
         magicTex.args = configuration.get('latex.magic.args') as string[]
@@ -261,7 +261,7 @@ function createBuildMagic(rootFile: string, magicTex: Tool, magicBib?: Tool): To
  * provided parameters.
  */
 function findRecipe(rootFile: string, langId: string, recipeName?: string): Recipe | undefined {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
 
     const recipes = configuration.get('latex.recipes') as Recipe[]
     const defaultRecipeName = configuration.get('latex.recipe.default') as string
@@ -317,7 +317,7 @@ function findRecipe(rootFile: string, langId: string, recipeName?: string): Reci
  * @returns {Tool[]} - An array of Tool objects with expanded values.
  */
 function populateTools(rootFile: string, buildTools: Tool[]): Tool[] {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
     const docker = configuration.get('docker.enabled')
 
     buildTools.forEach(tool => {
diff --git a/src/completion/completer/citation.ts b/src/completion/completer/citation.ts
index cef247709..b4ec3a97b 100644
--- a/src/completion/completer/citation.ts
+++ b/src/completion/completer/citation.ts
@@ -238,7 +238,7 @@ function updateAll(bibFiles?: string[]): CitationItem[] {
  */
 async function parseBibFile(fileName: string) {
     logger.log(`Parsing .bib entries from ${fileName}`)
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(fileName))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(fileName))
     if (fs.statSync(fileName).size >= (configuration.get('bibtex.maxFileSize') as number) * 1024 * 1024) {
         logger.log(`Bib file is too large, ignoring it: ${fileName}`)
         data.bibEntries.delete(fileName)
diff --git a/src/completion/completer/input.ts b/src/completion/completer/input.ts
index 5d2896074..fbe15257a 100644
--- a/src/completion/completer/input.ts
+++ b/src/completion/completer/input.ts
@@ -148,7 +148,7 @@ class Input extends InputAbstract {
         if (['includegraphics', 'includesvg'].includes(macro) && this.graphicsPath.size > 0) {
             baseDir = Array.from(this.graphicsPath).map(dir => path.join(rootDir, dir))
         } else {
-            const baseConfig = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(currentFile)).get('intellisense.file.base')
+            const baseConfig = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(currentFile)).get('intellisense.file.base')
             const baseDirCurrentFile = path.dirname(currentFile)
             switch (baseConfig) {
                 case 'root relative':
diff --git a/src/completion/completer/macro.ts b/src/completion/completer/macro.ts
index 0f63d5725..49ec68c31 100644
--- a/src/completion/completer/macro.ts
+++ b/src/completion/completer/macro.ts
@@ -289,7 +289,7 @@ function parseAst(node: Ast.Node, filePath: string, defined?: Set<string>): CmdE
         data.definedCmds.set(cmd.signatureAsString(), {
             filePath,
             location: new vscode.Location(
-                vscode.Uri.file(filePath),
+                lw.file.fileUriFromPath(filePath),
                 new vscode.Position(
                     (node.position?.start.line ?? 1) - 1,
                     (node.position?.start.column ?? 1) - 1))
@@ -387,7 +387,7 @@ function parseContent(content: string, filePath: string): CmdEnvSuggestion[] {
         data.definedCmds.set(result[1], {
             filePath,
             location: new vscode.Location(
-                vscode.Uri.file(filePath),
+                lw.file.fileUriFromPath(filePath),
                 new vscode.Position(content.substring(0, result.index).split('\n').length - 1, 0))
         })
     }
diff --git a/src/completion/latex.ts b/src/completion/latex.ts
index 5d0bd7be0..1598c4bfa 100644
--- a/src/completion/latex.ts
+++ b/src/completion/latex.ts
@@ -57,7 +57,7 @@ export class Provider implements vscode.CompletionItemProvider {
     async resolveCompletionItem(item: vscode.CompletionItem, ctoken: vscode.CancellationToken): Promise<vscode.CompletionItem> {
         const configuration = vscode.workspace.getConfiguration('latex-workshop')
         if (item.kind === vscode.CompletionItemKind.Reference) {
-            if (!('file' in item) || !configuration.get('hover.ref.enabled')) {
+            if (!('file' in item || 'vsls' in item) || !configuration.get('hover.ref.enabled')) {
                 return item
             }
             const refItem = item as ReferenceItem
diff --git a/src/core/commands.ts b/src/core/commands.ts
index 42b8a7eda..7d374e720 100644
--- a/src/core/commands.ts
+++ b/src/core/commands.ts
@@ -36,13 +36,13 @@ export async function revealOutputDir() {
         const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
         const rootDir = lw.root.dir.path || workspaceFolder?.uri.fsPath
         if (rootDir === undefined) {
-            logger.log(`Cannot reveal ${vscode.Uri.file(outDir)}: no root dir can be identified.`)
+            logger.log(`Cannot reveal ${lw.file.fileUriFromPath(outDir)}: no root dir can be identified.`)
             return
         }
         outDir = path.resolve(rootDir, outDir)
     }
-    logger.log(`Reveal ${vscode.Uri.file(outDir)}`)
-    await vscode.commands.executeCommand('revealFileInOS', vscode.Uri.file(outDir))
+    logger.log(`Reveal ${lw.file.fileUriFromPath(outDir)}`)
+    await vscode.commands.executeCommand('revealFileInOS', lw.file.fileUriFromPath(outDir))
 }
 
 export function recipes(recipe?: string) {
@@ -482,7 +482,7 @@ export function toggleMathPreviewPanel() {
 }
 
 async function quickPickRootFile(rootFile: string, localRootFile: string, verb: string): Promise<string | undefined> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
     const doNotPrompt = configuration.get('latex.rootFile.doNotPrompt') as boolean
     if (doNotPrompt) {
         if (configuration.get('latex.rootFile.useSubFile')) {
diff --git a/src/core/file.ts b/src/core/file.ts
index a5f01cf17..0f39e5842 100644
--- a/src/core/file.ts
+++ b/src/core/file.ts
@@ -24,6 +24,8 @@ export const file = {
     exists,
     read,
     kpsewhich,
+    getUriScheme,
+    fileUriFromPath,
     _test: {
         createTmpDir
     }
@@ -176,7 +178,7 @@ function hasDtxLangId(langId: string): boolean {
  *
  * @type {Object.<string, {out?: string, aux?: string}>}
  */
-const texDirs: {[tex: string]: {out?: string, aux?: string}} = {}
+const texDirs: { [tex: string]: { out?: string, aux?: string } } = {}
 /**
  * Sets the output and auxiliary files directory for a root TeX file.
  *
@@ -199,7 +201,7 @@ function setTeXDirs(tex: string, out?: string, aux?: string) {
     if (!tex.endsWith('.tex')) {
         tex += '.tex'
     }
-    texDirs[tex] = {out, aux}
+    texDirs[tex] = { out, aux }
 }
 
 /**
@@ -237,7 +239,7 @@ function getOutDir(texPath?: string): string {
         return './'
     }
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(texPath))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(texPath))
     const outDir = configuration.get('latex.outDir') as string || './'
     const out = utils.replaceArgumentPlaceholders(texPath, file.tmpDirPath)(outDir)
     let result = undefined
@@ -290,7 +292,7 @@ function getLangId(filename: string): string | undefined {
  * configuration or derived from the file name.
  */
 function getJobname(texPath: string): string {
-    const jobname = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(texPath)).get('latex.jobname') as string
+    const jobname = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(texPath)).get('latex.jobname') as string
     return jobname || path.parse(texPath).name
 }
 
@@ -350,7 +352,7 @@ async function getFlsPath(texPath: string): Promise<string | undefined> {
  * avoiding redundant executions of the `kpsewhich` command by returning
  * previously computed results quickly.
  */
-const kpsecache: {[query: string]: string} = {}
+const kpsecache: { [query: string]: string } = {}
 /**
  * Resolves the path to a given LaTeX target using the `kpsewhich` command.
  *
@@ -380,7 +382,7 @@ function kpsewhich(target: string, isBib: boolean = false): string | undefined {
 
     try {
         const args = isBib ? ['-format=.bib', target] : [target]
-        const kpsewhichReturn = lw.external.sync(command, args, {cwd: lw.root.dir.path || vscode.workspace.workspaceFolders?.[0].uri.path})
+        const kpsewhichReturn = lw.external.sync(command, args, { cwd: lw.root.dir.path || vscode.workspace.workspaceFolders?.[0].uri.path })
         if (kpsewhichReturn.status === 0) {
             const output = kpsewhichReturn.stdout.toString().replace(/\r?\n/, '')
             logger.log(`kpsewhich returned with '${output}'.`)
@@ -431,7 +433,7 @@ function getBibPath(bib: string, baseDir: string): string[] {
     if (bibPath === undefined || bibPath.length === 0) {
         if (configuration.get('kpsewhich.bibtex.enabled')) {
             const kpsePath = kpsewhich(bib, true)
-            return kpsePath ? [ kpsePath ] : []
+            return kpsePath ? [kpsePath] : []
         } else {
             logger.log(`Cannot resolve bib path: ${bib} .`)
             return []
@@ -440,9 +442,9 @@ function getBibPath(bib: string, baseDir: string): string[] {
 
     if (os.platform() === 'win32') {
         // Normalize drive letters on Windows.
-        return [ bibPath ].flat().map(p => p.replace(/^([a-zA-Z]):/, (_, p1: string) => p1.toLowerCase() + ':'))
+        return [bibPath].flat().map(p => p.replace(/^([a-zA-Z]):/, (_, p1: string) => p1.toLowerCase() + ':'))
     } else {
-        return [ bibPath ].flat()
+        return [bibPath].flat()
     }
 }
 
@@ -472,7 +474,7 @@ function getBibPath(bib: string, baseDir: string): string[] {
  */
 async function read(filePath: string, raise: boolean = false): Promise<string | undefined> {
     try {
-        return (await vscode.workspace.fs.readFile(vscode.Uri.file(filePath))).toString()
+        return (await vscode.workspace.fs.readFile(lw.file.fileUriFromPath(filePath))).toString()
     } catch (err) {
         if (raise === false) {
             return undefined
@@ -486,7 +488,7 @@ async function read(filePath: string, raise: boolean = false): Promise<string |
  *
  * This function accepts a URI object or a string representing a file path. If
  * the input is a string, it is converted to a file URI using
- * `vscode.Uri.file()`. The function then attempts to retrieve the status of the
+ * `lw.file.fileUriFromPath()`. The function then attempts to retrieve the status of the
  * file or directory at the given URI using `stat()` of VS Code workspace file
  * system API. If the status retrieval is successful, the function returns
  * `true`, indicating that the file or directory exists. If an error occurs
@@ -499,8 +501,8 @@ async function read(filePath: string, raise: boolean = false): Promise<string |
  * or directory exists, and `false` otherwise.
  */
 async function exists(uri: vscode.Uri | string): Promise<boolean> {
-    if (typeof(uri) === 'string') {
-        uri = vscode.Uri.file(uri)
+    if (typeof (uri) === 'string') {
+        uri = lw.file.fileUriFromPath(uri)
     }
     try {
         await lw.external.stat(uri)
@@ -509,3 +511,25 @@ async function exists(uri: vscode.Uri | string): Promise<boolean> {
         return false
     }
 }
+
+/**
+* Returns the scheme of the URI based on the file path.
+*
+* This function determines the URI scheme based on the file path provided. It
+* checks if the file path starts with any of the workspace folder paths and
+* returns the scheme associated with the workspace folder. If the file path
+* does not match any workspace folder, it returns the default scheme based on
+* whether the user is a guest in a Live Share session.
+*
+* @param {string} filePath - The file path for which to determine the URI scheme.
+* @returns {string} - The URI scheme associated with the file path.
+*/
+function getUriScheme(filePath?: string): string {
+    const scheme =
+        vscode.workspace.workspaceFolders?.filter(folder => filePath?.startsWith(folder.uri.path))[0]?.uri.scheme
+    return scheme ?? (lw.liveshare.isGuest ? 'vsls' : 'file')
+}
+
+function fileUriFromPath(filePath: string): vscode.Uri {
+    return vscode.Uri.file(filePath).with({ scheme: getUriScheme(filePath) })
+}
diff --git a/src/core/root.ts b/src/core/root.ts
index c8906aa84..6c00d10d5 100644
--- a/src/core/root.ts
+++ b/src/core/root.ts
@@ -21,6 +21,7 @@ export const root = {
     },
     find,
     getWorkspace,
+    canBeRoot,
     _test: {
         getIndicator,
         getWorkspace,
@@ -138,7 +139,7 @@ function getWorkspace(filePath?: string): vscode.Uri | undefined {
     }
     // If provided with a filePath, check its workspace
     if (filePath !== undefined) {
-        return (vscode.workspace.getWorkspaceFolder(vscode.Uri.file(filePath)) ?? firstWorkspace).uri
+        return (vscode.workspace.getWorkspaceFolder(lw.file.fileUriFromPath(filePath)) ?? firstWorkspace).uri
     }
     // If we don't have an active text editor, we can only make a guess.
     // Let's guess the first one.
@@ -208,7 +209,7 @@ function findFromRoot(): string | undefined {
     if (!vscode.window.activeTextEditor || root.file.path === undefined) {
         return
     }
-    if (vscode.window.activeTextEditor.document.uri.scheme !== 'file') {
+    if (!canBeRoot(vscode.window.activeTextEditor.document.uri)) {
         logger.log(`The active document cannot be used as the root file: ${vscode.window.activeTextEditor.document.uri.toString(true)}`)
         return
     }
@@ -231,7 +232,7 @@ function findFromActive(): string | undefined {
     if (!vscode.window.activeTextEditor) {
         return
     }
-    if (vscode.window.activeTextEditor.document.uri.scheme !== 'file') {
+    if (!canBeRoot(vscode.window.activeTextEditor.document.uri)) {
         logger.log(`The active document cannot be used as the root file: ${vscode.window.activeTextEditor.document.uri.toString(true)}`)
         return
     }
@@ -303,7 +304,7 @@ async function findInWorkspace(): Promise<string | undefined> {
         const fileUris = await vscode.workspace.findFiles(rootFilesIncludeGlob, rootFilesExcludeGlob)
         const candidates: string[] = []
         for (const fileUri of fileUris) {
-            if (fileUri.scheme !== 'file') {
+            if (!canBeRoot(fileUri)) {
                 logger.log(`Skip the file: ${fileUri.toString(true)}`)
                 continue
             }
@@ -335,3 +336,7 @@ async function findInWorkspace(): Promise<string | undefined> {
     } catch (e) {}
     return
 }
+
+function canBeRoot(file: vscode.Uri): boolean {
+    return file.scheme === 'file' || file.scheme === 'vsls'
+}
diff --git a/src/core/watcher.ts b/src/core/watcher.ts
index c20161e03..d194d3d34 100644
--- a/src/core/watcher.ts
+++ b/src/core/watcher.ts
@@ -139,7 +139,7 @@ class Watcher {
     private async initiatePolling(uri: vscode.Uri): Promise<void> {
         const filePath = uri.fsPath
         const firstChangeTime = Date.now()
-        const size = (await lw.external.stat(vscode.Uri.file(filePath))).size
+        const size = (await lw.external.stat(lw.file.fileUriFromPath(filePath))).size
 
         this.polling[filePath] = { size, time: firstChangeTime }
 
@@ -170,7 +170,7 @@ class Watcher {
             return
         }
 
-        const currentSize = (await lw.external.stat(vscode.Uri.file(filePath))).size
+        const currentSize = (await lw.external.stat(lw.file.fileUriFromPath(filePath))).size
 
         if (currentSize !== size) {
             this.polling[filePath].size = currentSize
diff --git a/src/extras/cleaner.ts b/src/extras/cleaner.ts
index e3d8b2182..24f7cdd24 100644
--- a/src/extras/cleaner.ts
+++ b/src/extras/cleaner.ts
@@ -45,7 +45,7 @@ async function clean(rootFile?: string): Promise<void> {
             return
         }
     }
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
     const cleanMethod = configuration.get('latex.clean.method') as string
     switch (cleanMethod) {
         case 'glob':
@@ -102,7 +102,7 @@ function splitGlobs(globs: string[]): { fileOrFolderGlobs: string[], folderGlobs
  * intentionally by the user. Otherwise, the folders will be ignored.
  */
 async function cleanGlob(rootFile: string): Promise<void> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
     const globPrefix = (configuration.get('latex.clean.subfolder.enabled') as boolean) ? './**/' : ''
     const globs = (configuration.get('latex.clean.fileTypes') as string[])
         .map(globType => globPrefix + replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath)(globType))
@@ -149,7 +149,7 @@ async function cleanGlob(rootFile: string): Promise<void> {
 }
 
 function cleanCommand(rootFile: string): Promise<void> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
     const command = configuration.get('latex.clean.command') as string
     const args = (configuration.get('latex.clean.args') as string[])
         .map(arg => { return replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath)(arg)
diff --git a/src/language/definition.ts b/src/language/definition.ts
index 683fef513..af84b6539 100644
--- a/src/language/definition.ts
+++ b/src/language/definition.ts
@@ -41,7 +41,7 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
     }
 
     provideDefinition(document: vscode.TextDocument, position: vscode.Position): vscode.Location | undefined {
-        if (document.uri.scheme !== 'file') {
+        if (!lw.root.canBeRoot(document.uri)) {
             return
         }
         const token = tokenizer(document, position)
@@ -58,15 +58,15 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
         }
         const ref = lw.completion.reference.getItem(token)
         if (ref) {
-            return new vscode.Location(vscode.Uri.file(ref.file), ref.position)
+            return new vscode.Location(lw.file.fileUriFromPath(ref.file), ref.position)
         }
         const cite = lw.completion.citation.getItem(token)
         if (cite) {
-            return new vscode.Location(vscode.Uri.file(cite.file), cite.position)
+            return new vscode.Location(lw.file.fileUriFromPath(cite.file), cite.position)
         }
         const glossary = lw.completion.glossary.getItem(token)
         if (glossary) {
-            return new vscode.Location(vscode.Uri.file(glossary.filePath), glossary.position)
+            return new vscode.Location(lw.file.fileUriFromPath(glossary.filePath), glossary.position)
         }
         if (vscode.window.activeTextEditor && token.includes('.')) {
             // We skip graphics files
@@ -77,13 +77,13 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
             }
             const absolutePath = path.resolve(path.dirname(vscode.window.activeTextEditor.document.fileName), token)
             if (fs.existsSync(absolutePath)) {
-                return new vscode.Location( vscode.Uri.file(absolutePath), new vscode.Position(0, 0) )
+                return new vscode.Location( lw.file.fileUriFromPath(absolutePath), new vscode.Position(0, 0) )
             }
         }
 
         const filename = this.onAFilename(document, position, token)
         if (filename) {
-            return new vscode.Location( vscode.Uri.file(filename), new vscode.Position(0, 0) )
+            return new vscode.Location( lw.file.fileUriFromPath(filename), new vscode.Position(0, 0) )
         }
         return
     }
diff --git a/src/language/symbol-document.ts b/src/language/symbol-document.ts
index 3057289c7..f0addcd56 100644
--- a/src/language/symbol-document.ts
+++ b/src/language/symbol-document.ts
@@ -3,6 +3,7 @@ import { type TeXElement, TeXElementType } from '../types'
 import { buildBibTeX } from '../outline/structure/bibtex'
 import { construct as constructLaTeX } from '../outline/structure/latex'
 import { construct } from '../outline/structure/doctex'
+import { lw } from '../lw'
 
 export class DocSymbolProvider implements vscode.DocumentSymbolProvider {
 
@@ -12,7 +13,7 @@ export class DocSymbolProvider implements vscode.DocumentSymbolProvider {
         } else if (document.languageId === 'doctex') {
             return construct(document).then((sections: TeXElement[]) => this.sectionToSymbols(sections))
         }
-        if (document.uri.scheme !== 'file') {
+        if (!lw.root.canBeRoot(document.uri)) {
             return []
         }
         const sections = await constructLaTeX(document.fileName, false)
diff --git a/src/language/symbol-project.ts b/src/language/symbol-project.ts
index e572eabb3..2345f964f 100644
--- a/src/language/symbol-project.ts
+++ b/src/language/symbol-project.ts
@@ -16,7 +16,7 @@ export class ProjectSymbolProvider implements vscode.WorkspaceSymbolProvider {
     private sectionToSymbols(sections: TeXElement[], containerName: string = 'Document'): vscode.SymbolInformation[] {
         let symbols: vscode.SymbolInformation[] = []
         sections.forEach(section => {
-            const location = new vscode.Location(vscode.Uri.file(section.filePath), new vscode.Range(section.lineFr, 0, section.lineTo, 65535))
+            const location = new vscode.Location(lw.file.fileUriFromPath(section.filePath), new vscode.Range(section.lineFr, 0, section.lineTo, 65535))
             symbols.push(new vscode.SymbolInformation(section.label, vscode.SymbolKind.String, containerName, location))
             if (section.children.length > 0) {
                 symbols = [...symbols, ...this.sectionToSymbols(section.children, section.label)]
diff --git a/src/lint/duplicate-label.ts b/src/lint/duplicate-label.ts
index 449ddc746..0217ba06b 100644
--- a/src/lint/duplicate-label.ts
+++ b/src/lint/duplicate-label.ts
@@ -79,7 +79,7 @@ function showDiagnostics(duplicates: string[]) {
 
     for (const file in diagsCollection) {
         if (path.extname(file) === '.tex') {
-            duplicatedLabelsDiagnostics.set(vscode.Uri.file(file), diagsCollection[file])
+            duplicatedLabelsDiagnostics.set(lw.file.fileUriFromPath(file), diagsCollection[file])
         }
     }
 }
diff --git a/src/lint/latex-linter/chktex.ts b/src/lint/latex-linter/chktex.ts
index efee015cd..5478fa4ae 100644
--- a/src/lint/latex-linter/chktex.ts
+++ b/src/lint/latex-linter/chktex.ts
@@ -24,7 +24,7 @@ let linterProcess: ChildProcessWithoutNullStreams | undefined
 async function lintRootFile(rootPath: string) {
     const requiredArgs = ['-f%f:%l:%c:%d:%k:%n:%m\n', rootPath]
 
-    const stdout = await chktexWrapper('root', vscode.Uri.file(rootPath), rootPath, requiredArgs, undefined)
+    const stdout = await chktexWrapper('root', lw.file.fileUriFromPath(rootPath), rootPath, requiredArgs, undefined)
     if (stdout === undefined) { // It's possible to have empty string as output
         return
     }
@@ -131,7 +131,7 @@ function globalRcPath(): string | undefined {
 }
 
 function getChktexrcTabSize(file: string): number | undefined {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(file))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(file))
     const args = configuration.get('linting.chktex.exec.args') as string[]
     let filePath: string | undefined
     if (args.includes('-l')) {
@@ -197,7 +197,7 @@ function parseLog(log: string, singleFileOriginalPath?: string, tabSizeArg?: num
     } else if (linterLog.length === 0) {
         // We are linting a single file and the new log is empty for it -
         // clean existing records.
-        chkTeX.linterDiagnostics.set(vscode.Uri.file(singleFileOriginalPath), [])
+        chkTeX.linterDiagnostics.set(lw.file.fileUriFromPath(singleFileOriginalPath), [])
     }
     showLinterDiagnostics(linterLog)
 }
@@ -279,7 +279,7 @@ function showLinterDiagnostics(linterLog: ChkTeXLogEntry[]) {
                     file1 = f
                 }
             }
-            chkTeX.linterDiagnostics.set(vscode.Uri.file(file1), diagsCollection[file])
+            chkTeX.linterDiagnostics.set(lw.file.fileUriFromPath(file1), diagsCollection[file])
         }
     }
 }
diff --git a/src/lint/latex-linter/lacheck.ts b/src/lint/latex-linter/lacheck.ts
index fb2df8948..4342902a1 100644
--- a/src/lint/latex-linter/lacheck.ts
+++ b/src/lint/latex-linter/lacheck.ts
@@ -21,7 +21,7 @@ export const laCheck: LaTeXLinter = {
 let linterProcess: ChildProcessWithoutNullStreams | undefined
 
 async function lintRootFile(rootPath: string) {
-    const stdout = await lacheckWrapper('root', vscode.Uri.file(rootPath), rootPath, undefined)
+    const stdout = await lacheckWrapper('root', lw.file.fileUriFromPath(rootPath), rootPath, undefined)
     if (stdout === undefined) { // It's possible to have empty string as output
         return
     }
@@ -130,7 +130,7 @@ function showLinterDiagnostics(linterLog: LaCheckLogEntry[]) {
                     file1 = f
                 }
             }
-            laCheck.linterDiagnostics.set(vscode.Uri.file(file1), diagsCollection[file])
+            laCheck.linterDiagnostics.set(lw.file.fileUriFromPath(file1), diagsCollection[file])
         }
     }
 }
diff --git a/src/main.ts b/src/main.ts
index 65c869a24..f3dee5ee8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -67,7 +67,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
     }))
 
     extensionContext.subscriptions.push(vscode.workspace.onDidSaveTextDocument( (e: vscode.TextDocument) => {
-        if (e.uri.scheme !== 'file'){
+        if (!lw.root.canBeRoot(e.uri)){
             return
         }
         if (lw.file.hasTeXLangId(e.languageId) ||
@@ -100,7 +100,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
         } else if (vscode.window.activeTextEditor && vscode.window.activeTextEditor.document.languageId.toLowerCase() === 'log') {
             logger.showStatus()
         }
-        if (e && e.document.uri.scheme !== 'file'){
+        if (e && !lw.root.canBeRoot(e.document.uri)) {
             return
         }
         if (e && lw.file.hasTeXLangId(e.document.languageId) && e.document.fileName !== prevTeXDocumentPath) {
@@ -119,7 +119,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
     }))
 
     extensionContext.subscriptions.push(vscode.workspace.onDidChangeTextDocument((e: vscode.TextDocumentChangeEvent) => {
-        if (e.document.uri.scheme !== 'file'){
+        if (!lw.root.canBeRoot(e.document.uri)){
             return
         }
         if (!lw.file.hasTeXLangId(e.document.languageId) &&
@@ -268,6 +268,7 @@ function registerProviders(extensionContext: vscode.ExtensionContext) {
 
     extensionContext.subscriptions.push(
         vscode.languages.registerCompletionItemProvider({ scheme: 'file', language: 'tex'}, lw.completion.provider, '\\', '{'),
+        vscode.languages.registerCompletionItemProvider({ scheme: 'vsls', language: 'tex'}, lw.completion.provider, '\\', '{'),
         vscode.languages.registerCompletionItemProvider(bibtexSelector, lw.completion.bibProvider, '@')
     )
 
@@ -338,7 +339,7 @@ function conflictCheck() {
 
 function selectDocumentsWithId(ids: string[]): vscode.DocumentSelector {
    const selector = ids.map( (id) => {
-       return { scheme: 'file', language: id }
+       return { scheme: lw.file.getUriScheme(), language: id }
    })
    return selector
 }
diff --git a/src/outline/structure/bibtex.ts b/src/outline/structure/bibtex.ts
index 1d0e24d9a..e66c31a50 100644
--- a/src/outline/structure/bibtex.ts
+++ b/src/outline/structure/bibtex.ts
@@ -22,7 +22,7 @@ function fieldValueToString(field: bibtexParser.FieldValue, abbreviations: {[abb
 }
 
 export async function buildBibTeX(document: vscode.TextDocument): Promise<TeXElement[]> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(document.fileName))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(document.fileName))
     if (document.getText().length >= (configuration.get('bibtex.maxFileSize') as number) * 1024 * 1024) {
         logger.log(`Bib file is too large, ignoring it: ${document.fileName}`)
         return []
diff --git a/src/parse/parser/parserutils.ts b/src/parse/parser/parserutils.ts
index 7ba7c9d23..41b711b15 100644
--- a/src/parse/parser/parserutils.ts
+++ b/src/parse/parser/parserutils.ts
@@ -74,6 +74,6 @@ export function showCompilerDiagnostics(diagnostics: vscode.DiagnosticCollection
                 file1 = f
             }
         }
-        diagnostics.set(vscode.Uri.file(file1), diagsCollection[file])
+        diagnostics.set(lw.file.fileUriFromPath(file1), diagsCollection[file])
     }
 }
diff --git a/src/preview/hover/ongraphics.ts b/src/preview/hover/ongraphics.ts
index be8952c2e..171786ec0 100644
--- a/src/preview/hover/ongraphics.ts
+++ b/src/preview/hover/ongraphics.ts
@@ -37,7 +37,7 @@ export async function onGraphics(document: vscode.TextDocument, position: vscode
 }
 
 export async function graph2md(filePath: string, opts: { height: number, width: number, pageNumber?: number }): Promise<vscode.MarkdownString | undefined> {
-    const filePathUriString = vscode.Uri.file(filePath).toString()
+    const filePathUriString = (filePath).toString()
     if (/\.(bmp|jpg|jpeg|gif|png)$/i.exec(filePath)) {
         // Workaround for https://github.com/microsoft/vscode/issues/137632
         if (vscode.env.remoteName) {
@@ -57,7 +57,7 @@ export async function graph2md(filePath: string, opts: { height: number, width:
             return md
         } else {
             let msg = '$(error) Failed to render.'
-            if (!vscode.workspace.getWorkspaceFolder(vscode.Uri.file(filePath))) {
+            if (!vscode.workspace.getWorkspaceFolder(lw.file.fileUriFromPath(filePath))) {
                 msg = '$(warning) Cannot render a PDF file not in workspaces.'
             } else if (lw.extra.snippet.state.view?.webview === undefined) {
                 msg = '$(info) Please activate the LaTeX Workshop activity bar item to render PDF thumbnails.'
@@ -73,19 +73,19 @@ async function renderPdfFileAsDataUrl(pdfFilePath: string, opts: { height: numbe
         const maxDataUrlLength = 99980
         let scale = 1.5
         let newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        let dataUrl = await lw.extra.snippet.render(vscode.Uri.file(pdfFilePath), newOpts)
+        let dataUrl = await lw.extra.snippet.render(lw.file.fileUriFromPath(pdfFilePath), newOpts)
         if (!dataUrl || dataUrl.length < maxDataUrlLength) {
             return dataUrl
         }
         scale = 1
         newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        dataUrl = await lw.extra.snippet.render(vscode.Uri.file(pdfFilePath), newOpts)
+        dataUrl = await lw.extra.snippet.render(lw.file.fileUriFromPath(pdfFilePath), newOpts)
         if (!dataUrl || dataUrl.length < maxDataUrlLength) {
             return dataUrl
         }
         scale = Math.sqrt(maxDataUrlLength/dataUrl.length) / 1.2
         newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        dataUrl = await lw.extra.snippet.render(vscode.Uri.file(pdfFilePath), newOpts)
+        dataUrl = await lw.extra.snippet.render(lw.file.fileUriFromPath(pdfFilePath), newOpts)
         if (dataUrl && dataUrl.length >= maxDataUrlLength) {
             logger.log(`Data URL still too large: ${pdfFilePath}`)
             return
diff --git a/src/preview/math-preview-panel.ts b/src/preview/math-preview-panel.ts
index 863308fdb..4037c3c6b 100644
--- a/src/preview/math-preview-panel.ts
+++ b/src/preview/math-preview-panel.ts
@@ -23,7 +23,7 @@ type UpdateEvent = {
 
 function resourcesFolder(extensionRoot: string) {
     const folder = path.join(extensionRoot, 'resources', 'mathpreviewpanel')
-    return vscode.Uri.file(folder)
+    return lw.file.fileUriFromPath(folder)
 }
 
 class MathPreviewPanelSerializer implements vscode.WebviewPanelSerializer {
diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index bbd035ccf..e0e4010ca 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -53,7 +53,7 @@ function reload(): void {
  */
 function refresh(pdfFile?: string): void {
     logger.log(`Call refreshExistingViewer: ${JSON.stringify(pdfFile)} .`)
-    const pdfUri = pdfFile ? vscode.Uri.file(pdfFile) : undefined
+    const pdfUri = pdfFile ? lw.file.fileUriFromPath(pdfFile) : undefined
     if (pdfUri === undefined) {
         manager.getClients()?.forEach(client => {
             client.send({type: 'refresh'})
@@ -62,7 +62,7 @@ function refresh(pdfFile?: string): void {
     }
     let clientSet = manager.getClients(pdfUri)
     if (lw.liveshare.isHost && lw.liveshare.liveshare !== null && pdfFile !== undefined) {
-        const sharedUri = lw.liveshare.liveshare?.convertLocalUriToShared(vscode.Uri.file(pdfFile))
+        const sharedUri = lw.liveshare.liveshare?.convertLocalUriToShared(lw.file.fileUriFromPath(pdfFile))
         const guestClients = manager.getClients(sharedUri)
         if (guestClients) {
             clientSet?.forEach(client => guestClients.add(client))
@@ -80,7 +80,7 @@ function refresh(pdfFile?: string): void {
 }
 
 async function getUrl(pdfFile: string): Promise<string | undefined> {
-    const pdfUri = vscode.Uri.file(pdfFile)
+    const pdfUri = lw.file.fileUriFromPath(pdfFile)
     if (!await lw.file.exists(pdfUri)) {
         logger.log(`Cannot find PDF file ${pdfUri}`)
         logger.refreshStatus('check', 'statusBar.foreground', `Cannot view file PDF file. File not found: ${pdfUri}`, 'warning')
@@ -119,7 +119,7 @@ async function viewInBrowser(pdfFile: string): Promise<void> {
     if (!url) {
         return
     }
-    const pdfUri = vscode.Uri.file(pdfFile)
+    const pdfUri = lw.file.fileUriFromPath(pdfFile)
     manager.create(pdfUri)
     lw.watcher.pdf.add(pdfUri.fsPath)
     try {
@@ -147,7 +147,7 @@ async function viewInTab(pdfFile: string, tabEditorGroup: string, preserveFocus:
     if (!url) {
         return
     }
-    const pdfUri = vscode.Uri.file(pdfFile)
+    const pdfUri = lw.file.fileUriFromPath(pdfFile)
     return viewInWebviewPanel(pdfUri, tabEditorGroup, preserveFocus)
 }
 
@@ -158,7 +158,7 @@ async function viewInCustomEditor(pdfFile: string): Promise<void> {
     }
     const configuration = vscode.workspace.getConfiguration('latex-workshop')
     const editorGroup = configuration.get('view.pdf.tab.editorGroup') as string
-    const pdfUri = vscode.Uri.file(pdfFile)
+    const pdfUri = lw.file.fileUriFromPath(pdfFile)
     const showOptions: vscode.TextDocumentShowOptions = {
         viewColumn: vscode.ViewColumn.Active,
         preserveFocus: true
@@ -404,7 +404,7 @@ function getParams(): PdfViewerParams {
  * @param record The position to be revealed.
  */
 async function locate(pdfFile: string, record: SyncTeXRecordToPDF | SyncTeXRecordToPDFAll[]): Promise<void> {
-    const pdfUri = vscode.Uri.file(pdfFile)
+    const pdfUri = lw.file.fileUriFromPath(pdfFile)
     let clientSet = manager.getClients(pdfUri)
     if (clientSet === undefined || clientSet.size === 0) {
         logger.log(`PDF is not opened: ${pdfFile} , try opening.`)
diff --git a/src/preview/viewer/pdfviewerpanel.ts b/src/preview/viewer/pdfviewerpanel.ts
index 160c4370c..1b5b49e20 100644
--- a/src/preview/viewer/pdfviewerpanel.ts
+++ b/src/preview/viewer/pdfviewerpanel.ts
@@ -47,7 +47,7 @@ class PdfViewerPanelSerializer implements vscode.WebviewPanelSerializer {
         const state = argState.state
         let pdfFileUri: vscode.Uri | undefined
         if (state.path) {
-            pdfFileUri = vscode.Uri.file(state.path)
+            pdfFileUri = lw.file.fileUriFromPath(state.path)
         } else if (state.pdfFileUri) {
             pdfFileUri = vscode.Uri.parse(state.pdfFileUri, true)
         }
diff --git a/src/utils/quick-pick.ts b/src/utils/quick-pick.ts
index fe315c820..cad8279b2 100644
--- a/src/utils/quick-pick.ts
+++ b/src/utils/quick-pick.ts
@@ -1,7 +1,8 @@
 import * as vscode from 'vscode'
+import { lw } from '../lw'
 
 export async function pickRootPath(rootPath: string, subRootPath: string, verb: string): Promise<string | undefined> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootPath))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootPath))
     const doNotPrompt = configuration.get('latex.rootFile.doNotPrompt') as boolean
     if (doNotPrompt) {
         if (configuration.get('latex.rootFile.useSubFile')) {
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 52a44415d..5b7a121a6 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -2,6 +2,7 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import * as fs from 'fs'
 import { glob } from 'glob'
+import { lw } from '../lw'
 
 export function sleep(ms: number) {
     return new Promise(resolve => setTimeout(resolve, ms))
@@ -268,7 +269,7 @@ export function resolveFileGlob(dirs: string[], inputGlob: string, suffix: strin
  */
 export function replaceArgumentPlaceholders(rootFile: string, tmpDir: string): (arg: string) => string {
     return (arg: string) => {
-        const configuration = vscode.workspace.getConfiguration('latex-workshop', vscode.Uri.file(rootFile))
+        const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
         const docker = configuration.get('docker.enabled')
 
         const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
diff --git a/viewer/components/utils.ts b/viewer/components/utils.ts
index 577b99d85..f74bc73ce 100644
--- a/viewer/components/utils.ts
+++ b/viewer/components/utils.ts
@@ -30,7 +30,7 @@ export function parseURL(): { encodedPath: string, pdfFileUri: string, docTitle:
 
     for (let i = 0, ii = parts.length; i < ii; ++i) {
         const param = parts[i].split('=')
-        if (param[0].toLowerCase() === 'file') {
+        if (param[0].toLowerCase() === 'file' || param[0].toLowerCase() === 'vsls') {
             const encodedPath = param[1].replace(pdfFilePrefix, '')
             const pdfFileUri = decodePath(encodedPath)
             const docTitle = pdfFileUri.split(/[\\/]/).pop() ?? 'Untitled PDF'

From c71c7c2060d05af36fd5ca3b38da843a25083eb9 Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Thu, 4 Jul 2024 08:46:17 +0000
Subject: [PATCH 09/20] Refactored

---
 src/core/file.ts                | 10 ++++++++++
 src/core/root.ts                | 11 +++--------
 src/language/definition.ts      |  2 +-
 src/language/symbol-document.ts |  2 +-
 src/main.ts                     |  6 +++---
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/core/file.ts b/src/core/file.ts
index 0f39e5842..a2b5406aa 100644
--- a/src/core/file.ts
+++ b/src/core/file.ts
@@ -26,6 +26,8 @@ export const file = {
     kpsewhich,
     getUriScheme,
     fileUriFromPath,
+    hasAcceptedScheme,
+    isAcceptedScheme,
     _test: {
         createTmpDir
     }
@@ -533,3 +535,11 @@ function getUriScheme(filePath?: string): string {
 function fileUriFromPath(filePath: string): vscode.Uri {
     return vscode.Uri.file(filePath).with({ scheme: getUriScheme(filePath) })
 }
+
+function hasAcceptedScheme(fileUri: vscode.Uri): boolean {
+    return isAcceptedScheme(fileUri.scheme)
+}
+
+function isAcceptedScheme(scheme: string): boolean {
+    return ['file', 'vsls'].includes(scheme)
+}
diff --git a/src/core/root.ts b/src/core/root.ts
index 6c00d10d5..450ecaeb9 100644
--- a/src/core/root.ts
+++ b/src/core/root.ts
@@ -21,7 +21,6 @@ export const root = {
     },
     find,
     getWorkspace,
-    canBeRoot,
     _test: {
         getIndicator,
         getWorkspace,
@@ -209,7 +208,7 @@ function findFromRoot(): string | undefined {
     if (!vscode.window.activeTextEditor || root.file.path === undefined) {
         return
     }
-    if (!canBeRoot(vscode.window.activeTextEditor.document.uri)) {
+    if (!lw.file.hasAcceptedScheme(vscode.window.activeTextEditor.document.uri)) {
         logger.log(`The active document cannot be used as the root file: ${vscode.window.activeTextEditor.document.uri.toString(true)}`)
         return
     }
@@ -232,7 +231,7 @@ function findFromActive(): string | undefined {
     if (!vscode.window.activeTextEditor) {
         return
     }
-    if (!canBeRoot(vscode.window.activeTextEditor.document.uri)) {
+    if (!lw.file.hasAcceptedScheme(vscode.window.activeTextEditor.document.uri)) {
         logger.log(`The active document cannot be used as the root file: ${vscode.window.activeTextEditor.document.uri.toString(true)}`)
         return
     }
@@ -304,7 +303,7 @@ async function findInWorkspace(): Promise<string | undefined> {
         const fileUris = await vscode.workspace.findFiles(rootFilesIncludeGlob, rootFilesExcludeGlob)
         const candidates: string[] = []
         for (const fileUri of fileUris) {
-            if (!canBeRoot(fileUri)) {
+            if (!lw.file.hasAcceptedScheme(fileUri)) {
                 logger.log(`Skip the file: ${fileUri.toString(true)}`)
                 continue
             }
@@ -336,7 +335,3 @@ async function findInWorkspace(): Promise<string | undefined> {
     } catch (e) {}
     return
 }
-
-function canBeRoot(file: vscode.Uri): boolean {
-    return file.scheme === 'file' || file.scheme === 'vsls'
-}
diff --git a/src/language/definition.ts b/src/language/definition.ts
index af84b6539..ba7409ad5 100644
--- a/src/language/definition.ts
+++ b/src/language/definition.ts
@@ -41,7 +41,7 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
     }
 
     provideDefinition(document: vscode.TextDocument, position: vscode.Position): vscode.Location | undefined {
-        if (!lw.root.canBeRoot(document.uri)) {
+        if (!lw.file.hasAcceptedScheme(document.uri)) {
             return
         }
         const token = tokenizer(document, position)
diff --git a/src/language/symbol-document.ts b/src/language/symbol-document.ts
index f0addcd56..cf1b367c6 100644
--- a/src/language/symbol-document.ts
+++ b/src/language/symbol-document.ts
@@ -13,7 +13,7 @@ export class DocSymbolProvider implements vscode.DocumentSymbolProvider {
         } else if (document.languageId === 'doctex') {
             return construct(document).then((sections: TeXElement[]) => this.sectionToSymbols(sections))
         }
-        if (!lw.root.canBeRoot(document.uri)) {
+        if (!lw.file.hasAcceptedScheme(document.uri)) {
             return []
         }
         const sections = await constructLaTeX(document.fileName, false)
diff --git a/src/main.ts b/src/main.ts
index f3dee5ee8..062c9c00d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -67,7 +67,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
     }))
 
     extensionContext.subscriptions.push(vscode.workspace.onDidSaveTextDocument( (e: vscode.TextDocument) => {
-        if (!lw.root.canBeRoot(e.uri)){
+        if (!lw.file.hasAcceptedScheme(e.uri)){
             return
         }
         if (lw.file.hasTeXLangId(e.languageId) ||
@@ -100,7 +100,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
         } else if (vscode.window.activeTextEditor && vscode.window.activeTextEditor.document.languageId.toLowerCase() === 'log') {
             logger.showStatus()
         }
-        if (e && !lw.root.canBeRoot(e.document.uri)) {
+        if (e && !lw.file.hasAcceptedScheme(e.document.uri)) {
             return
         }
         if (e && lw.file.hasTeXLangId(e.document.languageId) && e.document.fileName !== prevTeXDocumentPath) {
@@ -119,7 +119,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
     }))
 
     extensionContext.subscriptions.push(vscode.workspace.onDidChangeTextDocument((e: vscode.TextDocumentChangeEvent) => {
-        if (!lw.root.canBeRoot(e.document.uri)){
+        if (!lw.file.hasAcceptedScheme(e.document.uri)){
             return
         }
         if (!lw.file.hasTeXLangId(e.document.languageId) &&

From 984246b6ab665eab6a98d8bd014c1920aa94bd4d Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Sat, 6 Jul 2024 05:51:27 +0000
Subject: [PATCH 10/20] Used proxy to pave the way for synctex

---
 src/liveshare/liveshare.ts                    |  11 +-
 src/lw.ts                                     |   5 +-
 src/main.ts                                   |   4 +
 src/preview/host-connection.ts                | 122 ++++++++++++++++++
 src/preview/index.ts                          |   1 +
 src/preview/math-preview-panel.ts             |   8 +-
 src/preview/server.ts                         |  57 +++++++-
 src/preview/viewer.ts                         |   7 +-
 src/preview/viewer/client.ts                  |   5 +-
 src/utils/utils.ts                            |   4 +
 .../latex-workshop-protocol-types/index.d.ts  |   3 +-
 11 files changed, 207 insertions(+), 20 deletions(-)
 create mode 100644 src/preview/host-connection.ts

diff --git a/src/liveshare/liveshare.ts b/src/liveshare/liveshare.ts
index 631a3bbfc..a85130fc2 100644
--- a/src/liveshare/liveshare.ts
+++ b/src/liveshare/liveshare.ts
@@ -2,6 +2,7 @@ import * as vsls from 'vsls/vscode'
 import * as vscode from 'vscode'
 import { lw } from '../lw'
 import * as url from 'url'
+import * as utils from '../utils/utils'
 
 export class LiveShare {
     private role: vsls.Role = vsls.Role.None
@@ -36,6 +37,7 @@ export class LiveShare {
         this.role = role
         this.hostServerPort = null
         this.shareServerDisposable?.dispose()
+        lw.hostConnection.resetConnectionToHost()
     }
 
     get isGuest(): boolean {
@@ -48,6 +50,7 @@ export class LiveShare {
 
     private async initGuest() {
         await this.getHostServerPort()
+        await lw.hostConnection.connectToHostWs()
     }
 
     public async getHostServerPort(reset: boolean = false): Promise<number> {
@@ -58,7 +61,7 @@ export class LiveShare {
             const savedClipboard = await vscode.env.clipboard.readText()
             void vscode.commands.executeCommand('liveshare.listServers')
             // delay here instead of doing await vscode.commands.executeCommand acquires the port more reliably because await vscode.commands.executeCommand does not return until the user closes the info box of the command or clicks copy again.
-            await this.delay(500)
+            await utils.delay(500)
             const hostUrl = await vscode.env.clipboard.readText()
             const hostServerPort = Number(url.parse(hostUrl).port)
             this.hostServerPort = hostServerPort
@@ -74,11 +77,7 @@ export class LiveShare {
         if (this.shareServerDisposable !== null) {
             this.shareServerDisposable?.dispose()
         }
-        this.shareServerDisposable = await this.liveshare?.shareServer({ port: await lw.server.getPort(), displayName: 'latex-workshop-server' })
-    }
-
-    private async delay(t: number) {
-        return new Promise(resolve => setTimeout(resolve, t))
+        this.shareServerDisposable = await this.liveshare?.shareServer({ port: lw.server.getLocalPort(), displayName: 'latex-workshop-server' })
     }
 
     private async initHost() {
diff --git a/src/lw.ts b/src/lw.ts
index 940440ad6..ca623313e 100644
--- a/src/lw.ts
+++ b/src/lw.ts
@@ -7,7 +7,7 @@ import type { watcher } from './core/watcher'
 import type { cache } from './core/cache'
 import type { root } from './core/root'
 import type { compile } from './compile'
-import type { preview, server, viewer } from './preview'
+import type { preview, server, viewer, hostConnection } from './preview'
 import type { locate } from './locate'
 import type { completion } from './completion'
 import type { language } from './language'
@@ -44,7 +44,8 @@ export const lw = {
     lint: {} as typeof lint,
     outline: {} as typeof outline,
     extra: {} as typeof extra,
-    liveshare: new LiveShare(),
+    liveshare: {} as LiveShare,
+    hostConnection: {} as typeof hostConnection,
     commands: Object.create(null) as typeof commands,
     external: {
         spawn: wrapper(cs.spawn),
diff --git a/src/main.ts b/src/main.ts
index 062c9c00d..c43e9826f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -39,6 +39,10 @@ import { extra } from './extras'
 lw.extra = extra
 import * as commander from './core/commands'
 lw.commands = commander
+import { LiveShare } from './liveshare/liveshare'
+lw.liveshare = new LiveShare()
+import { hostConnection } from './preview'
+lw.hostConnection = hostConnection
 
 log.initStatusBarItem()
 
diff --git a/src/preview/host-connection.ts b/src/preview/host-connection.ts
new file mode 100644
index 000000000..c68ef3c8e
--- /dev/null
+++ b/src/preview/host-connection.ts
@@ -0,0 +1,122 @@
+import * as vscode from 'vscode'
+import { WebSocket } from 'ws'
+import { lw } from '../lw'
+import * as utils from '../utils/utils'
+import { ClientRequest, ServerResponse } from '../../types/latex-workshop-protocol-types'
+import * as manager from './viewer/pdfviewermanager'
+import { Client } from './viewer/client'
+
+export {
+    hostConnectionHandler,
+    connectToHostWs,
+    resetConnectionToHost,
+    registerWithHost
+}
+
+export let wsToHost: Promise<WebSocket> | undefined
+export let initialized: boolean = false
+
+function hostConnectionHandler(_: WebSocket, msg: string): void {
+    const data = JSON.parse(msg) as ServerResponse
+
+    switch (data.type) {
+        case 'refresh': {
+            lw.viewer.refresh(vscode.Uri.parse(data.pdfFileUri).fsPath)
+            break
+        }
+        default: {
+            break
+        }
+    }
+}
+
+async function connectToHostWs() {
+    if (!lw.liveshare.isGuest) {
+        resetConnectionToHost()
+        return
+    }
+
+    if (initialized) {
+        return
+    }
+
+    const server = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${await lw.liveshare.getHostServerPort()}`, true))
+
+    wsToHost = new Promise((resolve, reject) => {
+        const ws = new WebSocket(server.toString(true))
+        ws.addEventListener('open', () => {
+            initialized = true
+            resolve(ws)
+        })
+        ws.addEventListener('error', () => reject(new Error(`Failed to connect to ${server}`)))
+    })
+
+    void wsToHost.then((ws: WebSocket) => {
+        ws.addEventListener('message', (event) => {
+            if (event.type === 'message') {
+                hostConnectionHandler(ws, event.data as string)
+            }
+        })
+        ws.addEventListener('close', async () => {
+            initialized = false
+            await reconnectToHostWs()
+        })
+    })
+
+    const id = setInterval(async () => {
+        try {
+            await send({ type: 'ping' })
+        }
+        catch {
+            clearInterval(id)
+        }
+    }, 30000)
+}
+
+function registerWithHost(client?: Client) {
+    if (client) {
+        void send({ type: 'open', pdfFileUri: client.pdfFileUri, viewer: client.viewer })
+    }
+
+    manager.getClients()?.forEach(cl => {
+        void send({ type: 'open', pdfFileUri: cl.pdfFileUri, viewer: cl.viewer })
+    })
+}
+
+async function reconnectToHostWs() {
+    // Since WebSockets are disconnected when PC resumes from sleep,
+    // we have to reconnect. https://github.com/James-Yu/LaTeX-Workshop/pull/1812
+    await utils.delay(3000)
+
+    let tries = 1
+    while (tries <= 10) {
+        try {
+            await connectToHostWs()
+            const ws = await wsToHost
+            if (ws?.readyState !== 1) {
+                throw new Error('Connection to host is not open.')
+            }
+            return
+        } catch (e) {
+        }
+
+        await utils.delay(1000 * (tries + 2))
+        tries++
+    }
+}
+
+function resetConnectionToHost() {
+    initialized = false
+    lw.hostConnection.wsToHost = undefined
+}
+
+export async function send(message: ClientRequest) {
+    if (!lw.liveshare.isGuest) {
+        return
+    }
+
+    const ws = await wsToHost
+    if (ws?.readyState === 1) {
+        ws.send(JSON.stringify(message))
+    }
+}
diff --git a/src/preview/index.ts b/src/preview/index.ts
index 45d49cdae..d6aaebb27 100644
--- a/src/preview/index.ts
+++ b/src/preview/index.ts
@@ -4,6 +4,7 @@ import * as mathpreview from './math-preview-panel'
 
 export * as viewer from './viewer'
 export * as server from './server'
+export * as hostConnection from './host-connection'
 
 export const preview = {
     graph2md,
diff --git a/src/preview/math-preview-panel.ts b/src/preview/math-preview-panel.ts
index 4037c3c6b..0e6387dac 100644
--- a/src/preview/math-preview-panel.ts
+++ b/src/preview/math-preview-panel.ts
@@ -48,7 +48,7 @@ const state = {
     prevMacros: undefined as string | undefined,
 }
 
-async function open() {
+function open() {
     const activeDocument = vscode.window.activeTextEditor?.document
     if (state.panel) {
         if (!state.panel.visible) {
@@ -67,7 +67,7 @@ async function open() {
         }
     )
     initializePanel(panel)
-    panel.webview.html = await getHtml()
+    panel.webview.html = getHtml()
     const configuration = vscode.workspace.getConfiguration('latex-workshop')
     const editorGroup = configuration.get('mathpreviewpanel.editorGroup') as string
     if (activeDocument) {
@@ -132,7 +132,7 @@ function clearCache() {
 }
 
 let serverHandlerInserted = false
-async function getHtml() {
+function getHtml() {
     if (serverHandlerInserted === false) {
         lw.server.setHandler((url: string) => {
             if (url.startsWith('/mathpreviewpanel/')) {
@@ -157,7 +157,7 @@ async function getHtml() {
                 padding-left: 50px;
             }
         </style>
-        <script src='http://127.0.0.1:${(await lw.server.getPort()).toString()}/mathpreviewpanel/mathpreview.js' defer></script>
+        <script src='http://127.0.0.1:${(lw.server.getLocalPort()).toString()}/mathpreviewpanel/mathpreview.js' defer></script>
     </head>
     <body>
         <div id="mathBlock"><img src="" id="math" /></div>
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 267279ecb..2f7ce6b58 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -1,5 +1,6 @@
 import * as vscode from 'vscode'
 import * as http from 'http'
+import * as URL from 'url'
 import type { AddressInfo } from 'net'
 import ws from 'ws'
 import * as fs from 'fs'
@@ -9,7 +10,8 @@ import { lw } from '../lw'
 const logger = lw.log('Server')
 
 export {
-    getPort,
+    getHostPort,
+    getLocalPort,
     getUrl,
     setHandler,
     initialize,
@@ -65,11 +67,15 @@ const state: {
 
 lw.onDispose({ dispose: () => state.httpServer.close() })
 
-async function getPort(): Promise<number> {
+async function getHostPort(): Promise<number> {
     if (lw.liveshare.isGuest) {
         const portNum = await lw.liveshare.getHostServerPort()
         return portNum
     }
+    return getLocalPort()
+}
+
+function getLocalPort(): number {
     const portNum = state.address?.port
     if (portNum === undefined) {
         logger.log('Server port number is undefined.')
@@ -80,7 +86,7 @@ async function getPort(): Promise<number> {
 
 async function getUrl(pdfUri?: vscode.Uri): Promise<{url: string, uri: vscode.Uri}> {
     // viewer/viewer.js automatically requests the file to server.ts, and server.ts decodes the encoded path of PDF file.
-    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${await lw.server.getPort()}`, true))
+    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${lw.server.getLocalPort()}`, true))
     const url =
         (origUrl.toString().endsWith('/') ? origUrl.toString().slice(0, -1) : origUrl.toString()) +
         (pdfUri ? ('/viewer.html?file=' + encodePathWithPrefix(pdfUri)) : '')
@@ -190,7 +196,52 @@ function sendOkResponse(response: http.ServerResponse, content: Buffer, contentT
     response.end(content)
 }
 
+async function proxyHandler(req: http.IncomingMessage, res: http.ServerResponse) {
+    if (!lw.liveshare.isGuest || !req.url) {
+        return
+    }
+
+    const request = URL.parse(req.url)
+
+    const options = {
+        host: request.hostname,
+        port: await lw.server.getHostPort(),
+        path: request.path,
+        method: req.method,
+        headers: req.headers,
+    }
+
+    const backendReq = http.request(options, (backendRes) => {
+        if (!backendRes.statusCode) {
+            res.end()
+            return
+        }
+        res.writeHead(backendRes.statusCode, backendRes.headers)
+
+        backendRes.on('data', (chunk) => {
+            res.write(chunk)
+        })
+
+        backendRes.on('end', () => {
+            res.end()
+        })
+    })
+
+    req.on('data', (chunk) => {
+        backendReq.write(chunk)
+    })
+
+    req.on('end', () => {
+        backendReq.end()
+    })
+}
+
 async function handler(request: http.IncomingMessage, response: http.ServerResponse) {
+    if (lw.liveshare.isGuest) {
+        await proxyHandler(request, response)
+        return
+    }
+
     if (!request.url) {
         return
     }
diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index e0e4010ca..f9e5dc6ce 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -56,7 +56,7 @@ function refresh(pdfFile?: string): void {
     const pdfUri = pdfFile ? lw.file.fileUriFromPath(pdfFile) : undefined
     if (pdfUri === undefined) {
         manager.getClients()?.forEach(client => {
-            client.send({type: 'refresh'})
+            client.send({type: 'refresh', pdfFileUri: client.pdfFileUri})
         })
         return
     }
@@ -75,7 +75,7 @@ function refresh(pdfFile?: string): void {
     }
     logger.log(`Refresh PDF viewer: ${pdfFile}`)
     clientSet.forEach(client => {
-        client.send({type: 'refresh'})
+        client.send({type: 'refresh', pdfFileUri: client.pdfFileUri})
     })
 }
 
@@ -289,7 +289,8 @@ function handler(websocket: ws, msg: string): void {
             if (clientSet === undefined) {
                 break
             }
-            const client = new Client(data.viewer, websocket)
+            const client = new Client(data.viewer, websocket, pdfUri.toString(true))
+            lw.hostConnection.registerWithHost(client)
             clientSet.add(client)
             client.onDidDispose(() => {
                 clientSet.delete(client)
diff --git a/src/preview/viewer/client.ts b/src/preview/viewer/client.ts
index 56274cd2b..ba5ffd748 100644
--- a/src/preview/viewer/client.ts
+++ b/src/preview/viewer/client.ts
@@ -5,14 +5,16 @@ import type { ServerResponse } from '../../../types/latex-workshop-protocol-type
 export class Client {
     readonly viewer: 'browser' | 'tab'
     readonly websocket: ws
+    readonly pdfFileUri: string
     private readonly disposables = new Set<vscode.Disposable>()
 
-    constructor(viewer: 'browser' | 'tab', websocket: ws) {
+    constructor(viewer: 'browser' | 'tab', websocket: ws, pdfFileUri: string) {
         this.viewer = viewer
         this.websocket = websocket
         this.websocket.on('close', () => {
             this.disposeDisposables()
         })
+        this.pdfFileUri = pdfFileUri
     }
 
     private disposeDisposables() {
@@ -25,6 +27,7 @@ export class Client {
     }
 
     send(message: ServerResponse) {
+        console.log(' sends message ', JSON.stringify(message))
         this.websocket.send(JSON.stringify(message))
     }
 }
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 5b7a121a6..b5c658541 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -306,3 +306,7 @@ export function replaceArgumentPlaceholders(rootFile: string, tmpDir: string): (
         return expandPlaceHolders(arg).replace(/%OUTDIR%/g, outDir).replace(/%OUTDIR_W32%/g, outDirW32)
     }
 }
+
+export async function delay(t: number) {
+    return new Promise(resolve => setTimeout(resolve, t))
+}
diff --git a/types/latex-workshop-protocol-types/index.d.ts b/types/latex-workshop-protocol-types/index.d.ts
index 8d29e59d7..87d7f4ecf 100644
--- a/types/latex-workshop-protocol-types/index.d.ts
+++ b/types/latex-workshop-protocol-types/index.d.ts
@@ -14,7 +14,8 @@ type SynctexRangeData = SynctexData & {
 }
 
 export type ServerResponse = {
-    type: 'refresh'
+    type: 'refresh',
+    pdfFileUri: string
 } | {
     type: 'synctex',
     data: SynctexData | SynctexRangeData[]

From cf75c51c2bc2d22d6502dc7e0c80662fb15f1a2e Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Sat, 6 Jul 2024 05:55:26 +0000
Subject: [PATCH 11/20] Lint

---
 src/preview/math-preview-panel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/preview/math-preview-panel.ts b/src/preview/math-preview-panel.ts
index 0e6387dac..0f4e549c9 100644
--- a/src/preview/math-preview-panel.ts
+++ b/src/preview/math-preview-panel.ts
@@ -33,7 +33,7 @@ class MathPreviewPanelSerializer implements vscode.WebviewPanelSerializer {
             enableScripts: true,
             localResourceRoots: [resourcesFolder(lw.extensionRoot)]
         }
-        panel.webview.html = await getHtml()
+        panel.webview.html = getHtml()
         logger.log('Math preview panel: restored')
         return Promise.resolve()
     }

From 0068feb78095f180a171b53e18d63a0dc056adfa Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Sat, 6 Jul 2024 13:37:30 +0000
Subject: [PATCH 12/20] Implemented reverse synctex on guests

---
 src/locate/synctex.ts                         | 29 +++++++++++++++----
 src/preview/host-connection.ts                |  6 +++-
 src/preview/server.ts                         |  2 +-
 src/preview/viewer.ts                         | 23 +++++++++++++--
 src/preview/viewer/pdfviewerpanel.ts          |  2 +-
 .../latex-workshop-protocol-types/index.d.ts  |  7 +++++
 6 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/src/locate/synctex.ts b/src/locate/synctex.ts
index b0f3a3054..30b1fbd6b 100644
--- a/src/locate/synctex.ts
+++ b/src/locate/synctex.ts
@@ -14,6 +14,8 @@ const logger = lw.log('Locator')
 export const synctex = {
     toPDF,
     toPDFFromRef,
+    computeToTeX,
+    openTeX,
     toTeX
 }
 
@@ -420,6 +422,13 @@ function toPDFFromRef(args: {line: number, filePath: string}) {
  * @param pdfPath - The path of the PDF file.
  */
 async function toTeX(data: Extract<ClientRequest, {type: 'reverse_synctex'}>, pdfPath: string) {
+    const record = computeToTeX(data, pdfPath)
+    if (record) {
+        await openTeX(record.input, record.line, record.column, data.textBeforeSelection, data.textAfterSelection)
+    }
+}
+
+function computeToTeX(data: Extract<ClientRequest, {type: 'reverse_synctex'}>, pdfPath: string): SyncTeXRecordToTeX | undefined {
     let record: SyncTeXRecordToTeX
 
     // We only use synctex.js for backward sync as the binary cannot handle CJK encodings #4239.
@@ -460,19 +469,27 @@ async function toTeX(data: Extract<ClientRequest, {type: 'reverse_synctex'}>, pd
         }
     }
 
-    const filePath = path.resolve(record.input)
-    if (!fs.existsSync(filePath)) {
+    record.input = path.resolve(record.input)
+    return record
+}
+
+async function openTeX(input: string, line: number, column: number, textBeforeSelection: string, textAfterSelection: string) {
+    const filePath = path.resolve(input)
+    const uri = lw.file.fileUriFromPath(input)
+    try {
+        await vscode.workspace.fs.stat(uri)
+    } catch (e) {
         logger.log(`Backward SyncTeX failed on non-existent ${filePath} .`)
         return
     }
     logger.log(`Backward SyncTeX to ${filePath} .`)
     try {
-        const doc = await vscode.workspace.openTextDocument(filePath)
-        let row = record.line - 1
-        let col = record.column < 0 ? 0 : record.column
+        const doc = await vscode.workspace.openTextDocument(uri)
+        let row = line - 1
+        let col = column < 0 ? 0 : column
         // columns are typically not supplied by SyncTex, this could change in the future for some engines though
         if (col === 0) {
-            [row, col] = getRowAndColumn(doc, row, data.textBeforeSelection, data.textAfterSelection)
+            [row, col] = getRowAndColumn(doc, row, textBeforeSelection, textAfterSelection)
         }
         const pos = new vscode.Position(row, col)
 
diff --git a/src/preview/host-connection.ts b/src/preview/host-connection.ts
index c68ef3c8e..af2370fb5 100644
--- a/src/preview/host-connection.ts
+++ b/src/preview/host-connection.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import { WebSocket } from 'ws'
 import { lw } from '../lw'
 import * as utils from '../utils/utils'
-import { ClientRequest, ServerResponse } from '../../types/latex-workshop-protocol-types'
+import { ClientRequest, ServerResponse } from '../../types/latex-workshop-protocol-types/index'
 import * as manager from './viewer/pdfviewermanager'
 import { Client } from './viewer/client'
 
@@ -24,6 +24,10 @@ function hostConnectionHandler(_: WebSocket, msg: string): void {
             lw.viewer.refresh(vscode.Uri.parse(data.pdfFileUri).fsPath)
             break
         }
+        case 'reverse_synctex_result': {
+            void lw.locate.synctex.openTeX(vscode.Uri.parse(data.input).fsPath, data.line, data.column, data.textBeforeSelection, data.textAfterSelection)
+            break
+        }
         default: {
             break
         }
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 2f7ce6b58..1d0e2ff54 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -252,7 +252,7 @@ async function handler(request: http.IncomingMessage, response: http.ServerRespo
     if (hasPrefix(request.url) && !request.url.includes('viewer.html')) {
         const s = request.url.replace('/', '')
         let fileUri = decodePathWithPrefix(s)
-        const isVsls = fileUri.scheme === 'vsls'
+        const isVsls = (fileUri.scheme === 'vsls') && (lw.liveshare.isHost)
         if (isVsls && lw.liveshare.isHost) {
             fileUri = lw.liveshare.liveshare?.convertSharedUriToLocal(fileUri) ?? fileUri
         }
diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index f9e5dc6ce..29b0fd9f7 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -1,5 +1,5 @@
 import * as vscode from 'vscode'
-import type ws from 'ws'
+import ws from 'ws'
 import * as path from 'path'
 import * as os from 'os'
 import * as cs from 'cross-spawn'
@@ -8,7 +8,7 @@ import type { SyncTeXRecordToPDF, SyncTeXRecordToPDFAll, ViewerMode } from '../t
 import * as manager from './viewer/pdfviewermanager'
 import { populate } from './viewer/pdfviewerpanel'
 
-import type { ClientRequest, PdfViewerParams, PdfViewerState } from '../../types/latex-workshop-protocol-types/index'
+import type { ClientRequest, PdfViewerParams, PdfViewerState, ServerResponse } from '../../types/latex-workshop-protocol-types/index'
 import { Client } from './viewer/client'
 
 import { moveActiveEditor } from '../utils/webview'
@@ -309,6 +309,25 @@ function handler(websocket: ws, msg: string): void {
         }
         case 'reverse_synctex': {
             const uri = vscode.Uri.parse(data.pdfFileUri, true)
+            if (lw.liveshare.isGuest) {
+                void lw.hostConnection.wsToHost?.then(hostWs => hostWs.send(JSON.stringify(data))) // forward the request to host
+                break
+            } else if (lw.liveshare.isHost && uri.scheme === 'vsls' && lw.liveshare.liveshare) { // reply to guest if request comes from guest
+                const localUri = lw.liveshare.liveshare.convertSharedUriToLocal(uri) ?? uri
+                const record = lw.locate.synctex.computeToTeX(data, localUri.fsPath)
+                if (record) {
+                    const response: ServerResponse = {
+                        type: 'reverse_synctex_result',
+                        input: lw.liveshare.liveshare.convertLocalUriToShared(vscode.Uri.file(record.input)).toString(true),
+                        line: record.line,
+                        column: record.column,
+                        textBeforeSelection: data.textAfterSelection,
+                        textAfterSelection: data.textAfterSelection
+                    }
+                    websocket.send(JSON.stringify(response))
+                }
+                break
+            }
             void lw.locate.synctex.toTeX(data, uri.fsPath)
             break
         }
diff --git a/src/preview/viewer/pdfviewerpanel.ts b/src/preview/viewer/pdfviewerpanel.ts
index 1b5b49e20..9ca23a89f 100644
--- a/src/preview/viewer/pdfviewerpanel.ts
+++ b/src/preview/viewer/pdfviewerpanel.ts
@@ -120,7 +120,7 @@ async function getPDFViewerContent(pdfUri: vscode.Uri): Promise<string> {
     logger.log(`Internal PDF viewer at ${iframeSrcUrl} .`)
     const rebroadcast: boolean = getKeyboardEventConfig()
     return `
-    <!DOCTYPE html><html><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; base-uri 'none'; frame-src *; script-src 'unsafe-inline'; style-src 'unsafe-inline';"></head>
+    <!DOCTYPE html><html><head><meta http-equiv="Content-Security-Policy" content="default-src 'none'; base-uri 'none'; frame-src ${iframeSrcOrigin}; script-src 'unsafe-inline'; style-src 'unsafe-inline';"></head>
     <body><iframe id="preview-panel" class="preview-panel" src="${iframeSrcUrl}" style="position:absolute; border: none; left: 0; top: 0; width: 100%; height: 100%;">
     </iframe>
     <script>
diff --git a/types/latex-workshop-protocol-types/index.d.ts b/types/latex-workshop-protocol-types/index.d.ts
index 87d7f4ecf..230b3a099 100644
--- a/types/latex-workshop-protocol-types/index.d.ts
+++ b/types/latex-workshop-protocol-types/index.d.ts
@@ -19,6 +19,13 @@ export type ServerResponse = {
 } | {
     type: 'synctex',
     data: SynctexData | SynctexRangeData[]
+} | {
+    type: 'reverse_synctex_result',
+    input: string,
+    line: number,
+    column: number,
+    textBeforeSelection: string,
+    textAfterSelection: string
 } | {
     type: 'reload'
 }

From 10baaf4bcfc7a302b69303e49e83dbcc94af1cd6 Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Sun, 7 Jul 2024 09:02:01 +0000
Subject: [PATCH 13/20] Implemented synctex on guest

---
 package.json                                  |  7 +-
 src/core/commands.ts                          | 26 +++--
 src/core/root.ts                              | 13 +++
 src/locate/synctex.ts                         | 99 ++++++++++++-------
 src/preview/host-connection.ts                | 19 +++-
 src/preview/viewer.ts                         | 23 +++++
 src/preview/viewer/client.ts                  |  1 -
 .../latex-workshop-protocol-types/index.d.ts  | 13 ++-
 8 files changed, 152 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index 7578d4506..f4df0ce07 100644
--- a/package.json
+++ b/package.json
@@ -399,8 +399,7 @@
       {
         "command": "latex-workshop.synctex",
         "title": "%command.synctex%",
-        "category": "LaTeX Workshop",
-        "enablement": "!virtualWorkspace"
+        "category": "LaTeX Workshop"
       },
       {
         "command": "latex-workshop.clean",
@@ -554,7 +553,7 @@
         "key": "ctrl+l alt+j",
         "mac": "cmd+l alt+j",
         "command": "latex-workshop.synctex",
-        "when": "editorTextFocus && editorLangId =~ /^latex$|^latex-expl3$|^doctex$/ && config.latex-workshop.bind.altKeymap.enabled && !virtualWorkspace"
+        "when": "editorTextFocus && editorLangId =~ /^latex$|^latex-expl3$|^doctex$/ && config.latex-workshop.bind.altKeymap.enabled"
       },
       {
         "key": "ctrl+l alt+x",
@@ -590,7 +589,7 @@
         "key": "ctrl+alt+j",
         "mac": "cmd+alt+j",
         "command": "latex-workshop.synctex",
-        "when": "editorTextFocus && editorLangId =~ /^latex$|^latex-expl3$|^doctex$/ && !config.latex-workshop.bind.altKeymap.enabled && !virtualWorkspace"
+        "when": "editorTextFocus && editorLangId =~ /^latex$|^latex-expl3$|^doctex$/ && !config.latex-workshop.bind.altKeymap.enabled"
       },
       {
         "key": "ctrl+alt+x",
diff --git a/src/core/commands.ts b/src/core/commands.ts
index 7d374e720..df62b498c 100644
--- a/src/core/commands.ts
+++ b/src/core/commands.ts
@@ -113,13 +113,27 @@ export function synctex() {
         return
     }
     const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.getWorkspace())
-    let pdfFile: string | undefined = undefined
-    if (lw.root.subfiles.path && configuration.get('latex.rootFile.useSubFile')) {
-        pdfFile = lw.file.getPdfPath(lw.root.subfiles.path)
-    } else if (lw.root.file.path !== undefined) {
-        pdfFile = lw.file.getPdfPath(lw.root.file.path)
+
+    if (lw.liveshare.isGuest) {
+        const coords = lw.locate.synctex.getCurrentEditorCoordinates()
+        const pdfFileUri = lw.root.getRootFileAndTargetPdfUri()?.pdfFileUri
+
+        if (pdfFileUri === undefined || coords === undefined) {
+            logger.log('Cannot find LaTeX root PDF to perform synctex.')
+            return
+        }
+
+        const indicator = configuration.get('synctex.indicator') as 'none' | 'circle' | 'rectangle'
+        void lw.hostConnection.send({type: 'synctex', line: coords.line, column: coords.column, filePath: coords.inputFileUri.toString(true), targetPdfFile: pdfFileUri.toString(true), indicator})
+    } else {
+        let pdfFile: string | undefined = undefined
+        if (lw.root.subfiles.path && configuration.get('latex.rootFile.useSubFile')) {
+            pdfFile = lw.file.getPdfPath(lw.root.subfiles.path)
+        } else if (lw.root.file.path !== undefined) {
+            pdfFile = lw.file.getPdfPath(lw.root.file.path)
+        }
+        lw.locate.synctex.toPDF(undefined, undefined, pdfFile)
     }
-    lw.locate.synctex.toPDF(undefined, undefined, pdfFile)
 }
 
 export function synctexonref(line: number, filePath: string) {
diff --git a/src/core/root.ts b/src/core/root.ts
index 450ecaeb9..3b1ee7c65 100644
--- a/src/core/root.ts
+++ b/src/core/root.ts
@@ -19,6 +19,7 @@ export const root = {
         path: undefined as string | undefined,
         langId: undefined as string | undefined,
     },
+    getRootFileAndTargetPdfUri,
     find,
     getWorkspace,
     _test: {
@@ -39,6 +40,18 @@ lw.watcher.src.onDelete(filePath => {
     void find()
 })
 
+function getRootFileAndTargetPdfUri(): {rootFileUri: vscode.Uri, pdfFileUri: vscode.Uri} | undefined{
+    if (lw.root.file.path === undefined) {
+        logger.log('No root file found.')
+        return
+    }
+
+    const rootFileUri = lw.file.fileUriFromPath(lw.root.file.path)
+    const pdfFileUri = lw.file.fileUriFromPath(lw.file.getPdfPath(lw.root.file.path))
+
+    return {rootFileUri, pdfFileUri}
+}
+
 /**
  * Finds the LaTeX project's root file.
  *
diff --git a/src/locate/synctex.ts b/src/locate/synctex.ts
index 30b1fbd6b..0ed1bcf4e 100644
--- a/src/locate/synctex.ts
+++ b/src/locate/synctex.ts
@@ -13,10 +13,12 @@ const logger = lw.log('Locator')
 
 export const synctex = {
     toPDF,
+    synctexToPDFCombined,
     toPDFFromRef,
     computeToTeX,
     openTeX,
-    toTeX
+    toTeX,
+    getCurrentEditorCoordinates
 }
 
 /**
@@ -176,6 +178,47 @@ function parseToPDFList(result: string): SyncTeXRecordToPDFAll[] {
 //     }
 // }
 
+function getCurrentEditorCoordinates(): {line: number, column: number, inputFileUri: vscode.Uri} | undefined {
+    if (!vscode.window.activeTextEditor) {
+        logger.log('No active editor found.')
+        return
+    }
+
+    const inputFileUri = vscode.window.activeTextEditor.document.uri
+    if (!lw.file.hasTeXLangId(vscode.window.activeTextEditor.document.languageId)) {
+        logger.log(`${inputFileUri} is not valid LaTeX.`)
+        return
+    }
+    const position = vscode.window.activeTextEditor.selection.active
+    if (!position) {
+        logger.log(`No cursor position from ${position}`)
+        return
+    }
+
+    let line = position.line + 1
+    const column = position.character
+
+    if (vscode.window.activeTextEditor.document.lineCount === line &&
+        vscode.window.activeTextEditor.document.lineAt(line - 1).text === '') {
+            line -= 1
+    }
+
+    return {line, column, inputFileUri}
+}
+
+async function synctexToPDFCombined(line: number, col: number, filePath: string, targetPdfFile: string, indicator: 'none' | 'circle' | 'rectangle'): Promise<SyncTeXRecordToPDF> {
+    try {
+        return await callSyncTeXToPDF(line, col, filePath, targetPdfFile, indicator)
+    } catch {
+        logger.log(`Compute with synctex.js from ${filePath} to ${targetPdfFile} on line ${line}.`)
+        const record = syncTeXToPDF(line, filePath, targetPdfFile)
+        if (!record) {
+            throw new Error('Failed to compute the SyncTeX record.')
+        }
+        return record
+    }
+}
+
 /**
  * Execute forward SyncTeX with respect to the provided arguments.
  *
@@ -194,59 +237,45 @@ function parseToPDFList(result: string): SyncTeXRecordToPDFAll[] {
 function toPDF(args?: {line: number, filePath: string}, forcedViewer: 'auto' | 'tabOrBrowser' | 'external' = 'auto', pdfFile?: string) {
     let line: number
     let filePath: string
-    let character = 0
+    let column = 0
+
     if (!vscode.window.activeTextEditor) {
         logger.log('No active editor found.')
         return
     }
 
     if (args === undefined) {
-        filePath = vscode.window.activeTextEditor.document.uri.fsPath
-        if (!lw.file.hasTeXLangId(vscode.window.activeTextEditor.document.languageId)) {
-            logger.log(`${filePath} is not valid LaTeX.`)
-            return
-        }
-        const position = vscode.window.activeTextEditor.selection.active
-        if (!position) {
-            logger.log(`No cursor position from ${position}`)
+        const currentEditorCoordinates = getCurrentEditorCoordinates()
+        if (currentEditorCoordinates === undefined) {
             return
         }
-        line = position.line + 1
-        character = position.character
+        line = currentEditorCoordinates.line
+        column = currentEditorCoordinates.column
+        filePath = currentEditorCoordinates.inputFileUri.fsPath
     } else {
         line = args.line
         filePath = args.filePath
     }
-    const configuration = vscode.workspace.getConfiguration('latex-workshop')
-    const rootFile = lw.root.file.path
-    if (rootFile === undefined) {
-        logger.log('No root file found.')
+
+    const currentRootAndPdf = lw.root.getRootFileAndTargetPdfUri()
+    if (currentRootAndPdf === undefined) {
         return
     }
-    const targetPdfFile = pdfFile ?? lw.file.getPdfPath(rootFile)
-    if (vscode.window.activeTextEditor.document.lineCount === line &&
-        vscode.window.activeTextEditor.document.lineAt(line - 1).text === '') {
-            line -= 1
-    }
+
+    const rootFile = currentRootAndPdf.rootFileUri.fsPath
+    const targetPdfFile = pdfFile ?? currentRootAndPdf.pdfFileUri.fsPath
+
+    const configuration = vscode.workspace.getConfiguration('latex-workshop')
     if (forcedViewer === 'external' || (forcedViewer === 'auto' && configuration.get('view.pdf.viewer') === 'external') ) {
         syncTeXExternal(line, targetPdfFile, rootFile)
         return
     }
 
-    callSyncTeXToPDF(line, character, filePath, targetPdfFile, configuration.get('synctex.indicator') as 'none' | 'circle' | 'rectangle').then((record) => {
-        void lw.viewer.locate(targetPdfFile, record)
-    }).catch(() => {
-        try {
-            logger.log(`Forward with synctex.js from ${filePath} to ${pdfFile} on line ${line}.`)
-            const record = syncTeXToPDF(line, filePath, targetPdfFile)
-            if (!record) {
-                return
-            }
-            void lw.viewer.locate(targetPdfFile, record)
-        } catch (e) {
-            logger.logError('Forward SyncTeX failed.', e)
-        }
-    })
+    void synctexToPDFCombined(line, column, filePath, targetPdfFile, configuration.get('synctex.indicator') as 'none' | 'circle' | 'rectangle').then(async (record) => {
+        await lw.viewer.locate(targetPdfFile, record)
+    }).catch(e =>
+        logger.logError('Forward SyncTeX failed.', e)
+    )
 }
 
 /**
diff --git a/src/preview/host-connection.ts b/src/preview/host-connection.ts
index af2370fb5..f67523353 100644
--- a/src/preview/host-connection.ts
+++ b/src/preview/host-connection.ts
@@ -6,11 +6,14 @@ import { ClientRequest, ServerResponse } from '../../types/latex-workshop-protoc
 import * as manager from './viewer/pdfviewermanager'
 import { Client } from './viewer/client'
 
+const logger = lw.log('HostConnection')
+
 export {
     hostConnectionHandler,
     connectToHostWs,
     resetConnectionToHost,
-    registerWithHost
+    registerWithHost,
+    send
 }
 
 export let wsToHost: Promise<WebSocket> | undefined
@@ -18,6 +21,7 @@ export let initialized: boolean = false
 
 function hostConnectionHandler(_: WebSocket, msg: string): void {
     const data = JSON.parse(msg) as ServerResponse
+    logger.log(`Handle data type: ${data.type}`)
 
     switch (data.type) {
         case 'refresh': {
@@ -28,6 +32,10 @@ function hostConnectionHandler(_: WebSocket, msg: string): void {
             void lw.locate.synctex.openTeX(vscode.Uri.parse(data.input).fsPath, data.line, data.column, data.textBeforeSelection, data.textAfterSelection)
             break
         }
+        case 'synctex_result': {
+            void lw.viewer.locate(vscode.Uri.parse(data.pdfFile, true).fsPath, data.synctexData)
+            break
+        }
         default: {
             break
         }
@@ -35,12 +43,14 @@ function hostConnectionHandler(_: WebSocket, msg: string): void {
 }
 
 async function connectToHostWs() {
+    logger.log('Connecting to host')
     if (!lw.liveshare.isGuest) {
         resetConnectionToHost()
         return
     }
 
     if (initialized) {
+        logger.log('Already connected to host.')
         return
     }
 
@@ -49,6 +59,7 @@ async function connectToHostWs() {
     wsToHost = new Promise((resolve, reject) => {
         const ws = new WebSocket(server.toString(true))
         ws.addEventListener('open', () => {
+            logger.log('Connected to host')
             initialized = true
             resolve(ws)
         })
@@ -62,6 +73,7 @@ async function connectToHostWs() {
             }
         })
         ws.addEventListener('close', async () => {
+            logger.log('Connection to host disconnected')
             initialized = false
             await reconnectToHostWs()
         })
@@ -96,6 +108,7 @@ async function reconnectToHostWs() {
     while (tries <= 10) {
         try {
             await connectToHostWs()
+            await registerWithHost()
             const ws = await wsToHost
             if (ws?.readyState !== 1) {
                 throw new Error('Connection to host is not open.')
@@ -110,11 +123,13 @@ async function reconnectToHostWs() {
 }
 
 function resetConnectionToHost() {
+    logger.log('Reset connection to host')
     initialized = false
     lw.hostConnection.wsToHost = undefined
 }
 
-export async function send(message: ClientRequest) {
+async function send(message: ClientRequest) {
+    logger.log(`Sends message ${JSON.stringify(message)} to host`)
     if (!lw.liveshare.isGuest) {
         return
     }
diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index 29b0fd9f7..6c0a86882 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -331,6 +331,29 @@ function handler(websocket: ws, msg: string): void {
             void lw.locate.synctex.toTeX(data, uri.fsPath)
             break
         }
+        case 'synctex': {
+            if (!lw.liveshare.isHost || !lw.liveshare.liveshare) {
+                return
+            }
+
+            const filePath = lw.liveshare.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.filePath, true)).fsPath
+            const targetPdfFile = lw.liveshare.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.targetPdfFile, true)).fsPath
+            void lw.locate.synctex.synctexToPDFCombined(data.line, data.column, filePath, targetPdfFile, data.indicator).then(record => {
+                if (!record) {
+                    logger.log(`Failed to locate synctex for ${filePath}. This was requested from a guest.`)
+                    return
+                }
+
+                const response: ServerResponse = {
+                    type: 'synctex_result',
+                    pdfFile: data.targetPdfFile,
+                    synctexData: record
+                }
+
+                websocket.send(JSON.stringify(response))
+            })
+            break
+        }
         case 'external_link': {
             void vscode.env.clipboard.writeText(data.url)
             const uri = vscode.Uri.parse(data.url)
diff --git a/src/preview/viewer/client.ts b/src/preview/viewer/client.ts
index ba5ffd748..d978804de 100644
--- a/src/preview/viewer/client.ts
+++ b/src/preview/viewer/client.ts
@@ -27,7 +27,6 @@ export class Client {
     }
 
     send(message: ServerResponse) {
-        console.log(' sends message ', JSON.stringify(message))
         this.websocket.send(JSON.stringify(message))
     }
 }
diff --git a/types/latex-workshop-protocol-types/index.d.ts b/types/latex-workshop-protocol-types/index.d.ts
index 230b3a099..fc8fa18d1 100644
--- a/types/latex-workshop-protocol-types/index.d.ts
+++ b/types/latex-workshop-protocol-types/index.d.ts
@@ -19,9 +19,13 @@ export type ServerResponse = {
 } | {
     type: 'synctex',
     data: SynctexData | SynctexRangeData[]
+} | {
+    type: 'synctex_result',
+    pdfFile: string, // vsls scheme
+    synctexData: SynctexData | SynctexRangeData
 } | {
     type: 'reverse_synctex_result',
-    input: string,
+    input: string, // input file path, in vsls scheme
     line: number,
     column: number,
     textBeforeSelection: string,
@@ -90,6 +94,13 @@ export type ClientRequest = {
     type: 'copy',
     content: string,
     isMetaKey: boolean
+} | {
+    type: 'synctex',
+    line: number,
+    column: number,
+    filePath: string,
+    targetPdfFile: string,
+    indicator: 'none' | 'circle' | 'rectangle'
 }
 
 export type PanelManagerResponse = {

From c98bac85b6dcd44a1bb03d1348775825257e6323 Mon Sep 17 00:00:00 2001
From: Quoc Ho <phuquocvn@gmail.com>
Date: Sun, 7 Jul 2024 09:04:14 +0000
Subject: [PATCH 14/20] Lint

---
 src/preview/host-connection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/preview/host-connection.ts b/src/preview/host-connection.ts
index f67523353..bbf07f695 100644
--- a/src/preview/host-connection.ts
+++ b/src/preview/host-connection.ts
@@ -108,7 +108,7 @@ async function reconnectToHostWs() {
     while (tries <= 10) {
         try {
             await connectToHostWs()
-            await registerWithHost()
+            registerWithHost()
             const ws = await wsToHost
             if (ws?.readyState !== 1) {
                 throw new Error('Connection to host is not open.')

From 23b08d4448711bc72db274b648d78668de515cfd Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Wed, 31 Jul 2024 18:10:34 +0800
Subject: [PATCH 15/20] Rename new lw.file functions

---
 package-lock.json                    |  2 +-
 package.json                         |  2 +-
 src/compile/build.ts                 | 12 ++++++------
 src/compile/queue.ts                 |  2 +-
 src/compile/recipe.ts                |  8 ++++----
 src/completion/completer/citation.ts |  2 +-
 src/completion/completer/input.ts    |  2 +-
 src/completion/completer/macro.ts    |  4 ++--
 src/core/commands.ts                 | 12 ++++++------
 src/core/file.ts                     | 23 +++++++++--------------
 src/core/root.ts                     | 21 ++++-----------------
 src/core/watcher.ts                  |  4 ++--
 src/extras/cleaner.ts                |  6 +++---
 src/language/definition.ts           | 12 ++++++------
 src/language/symbol-document.ts      |  2 +-
 src/language/symbol-project.ts       |  2 +-
 src/lint/duplicate-label.ts          |  2 +-
 src/lint/latex-linter/chktex.ts      |  8 ++++----
 src/lint/latex-linter/lacheck.ts     |  4 ++--
 src/locate/synctex.ts                | 15 +++++++--------
 src/main.ts                          |  6 +++---
 src/outline/structure/bibtex.ts      |  2 +-
 src/parse/parser/parserutils.ts      |  2 +-
 src/preview/hover/ongraphics.ts      |  8 ++++----
 src/preview/math-preview-panel.ts    |  2 +-
 src/preview/viewer.ts                | 14 +++++++-------
 src/preview/viewer/pdfviewerpanel.ts |  2 +-
 src/utils/quick-pick.ts              |  2 +-
 src/utils/utils.ts                   |  2 +-
 29 files changed, 83 insertions(+), 102 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ce18e54ab..ce5bb7776 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "micromatch": "4.0.5",
         "pdfjs-dist": "4.3.136",
         "tmp": "0.2.3",
-        "vsls": "^1.0.4753",
+        "vsls": "1.0.4753",
         "workerpool": "9.1.1",
         "ws": "8.17.1"
       },
diff --git a/package.json b/package.json
index f4df0ce07..f9cc3e0af 100644
--- a/package.json
+++ b/package.json
@@ -2576,7 +2576,7 @@
     "micromatch": "4.0.5",
     "pdfjs-dist": "4.3.136",
     "tmp": "0.2.3",
-    "vsls": "^1.0.4753",
+    "vsls": "1.0.4753",
     "workerpool": "9.1.1",
     "ws": "8.17.1"
   },
diff --git a/src/compile/build.ts b/src/compile/build.ts
index 0ea32aacd..407fa7cc2 100644
--- a/src/compile/build.ts
+++ b/src/compile/build.ts
@@ -30,7 +30,7 @@ lw.watcher.bib.onChange(filePath => autoBuild(filePath, 'onFileChange', true))
  * changed.
  */
 function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: boolean = false) {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(file))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(file))
     if (configuration.get('latex.autoBuild.run') as string !== type) {
         return
     }
@@ -57,7 +57,7 @@ function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: bo
  * @returns {boolean} - True if auto-build can be triggered, false otherwise.
  */
 function canAutoBuild(): boolean {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.file.path ? lw.file.fileUriFromPath(lw.root.file.path) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.file.path ? lw.file.getUri(lw.root.file.path) : undefined)
     return Date.now() - lw.compile.lastAutoBuildTime >= (configuration.get('latex.autoBuild.interval', 1000) as number)
 }
 
@@ -91,7 +91,7 @@ async function build(skipSelection: boolean = false, rootFile: string | undefine
 
     logger.log(`The document of the active editor: ${activeEditor.document.uri.toString(true)}`)
     logger.log(`The languageId of the document: ${activeEditor.document.languageId}`)
-    const workspace = rootFile ? lw.file.fileUriFromPath(rootFile) : activeEditor.document.uri
+    const workspace = rootFile ? lw.file.getUri(rootFile) : activeEditor.document.uri
     const configuration = vscode.workspace.getConfiguration('latex-workshop', workspace)
     const externalBuildCommand = configuration.get('latex.external.build.command') as string
     const externalBuildArgs = configuration.get('latex.external.build.args') as string[]
@@ -187,7 +187,7 @@ async function buildLoop() {
  * process.
  */
 function spawnProcess(step: Step): ProcessEnv {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.fileUriFromPath(step.rootFile) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.getUri(step.rootFile) : undefined)
     if (step.index === 0 || configuration.get('latex.build.clearLog.everyRecipeStep.enabled') as boolean) {
         logger.clearCompilerMessage()
     }
@@ -332,7 +332,7 @@ function handleExitCodeError(step: Step, env: ProcessEnv, stderr: string, code:
         logger.log(`${stderr}`)
     }
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.fileUriFromPath(step.rootFile) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.getUri(step.rootFile) : undefined)
     if (!step.isExternal && signal !== 'SIGTERM' && !step.isRetry && configuration.get('latex.autoBuild.cleanAndRetry.enabled')) {
         handleRetryError(step)
     } else if (!step.isExternal && signal !== 'SIGTERM') {
@@ -423,7 +423,7 @@ async function afterSuccessfulBuilt(lastStep: Step, skipped: boolean) {
     lw.viewer.refresh(lw.file.getPdfPath(lastStep.rootFile))
     lw.completion.reference.setNumbersFromAuxFile(lastStep.rootFile)
     await lw.cache.loadFlsFile(lastStep.rootFile ?? '')
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(lastStep.rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(lastStep.rootFile))
     // If the PDF viewer is internal, we call SyncTeX in src/components/viewer.ts.
     if (configuration.get('view.pdf.viewer') === 'external' && configuration.get('synctex.afterBuild.enabled')) {
         const pdfFile = lw.file.getPdfPath(lastStep.rootFile)
diff --git a/src/compile/queue.ts b/src/compile/queue.ts
index a06bff6a3..6465ed974 100644
--- a/src/compile/queue.ts
+++ b/src/compile/queue.ts
@@ -100,7 +100,7 @@ function getStepString(step: Step): string {
 
     // Determine the format of the stepString based on timestamp and index
     if(step.rootFile) {
-        const rootFileUri = lw.file.fileUriFromPath(step.rootFile)
+        const rootFileUri = lw.file.getUri(step.rootFile)
         const configuration = vscode.workspace.getConfiguration('latex-workshop', rootFileUri)
         const showFilename = configuration.get<boolean>('latex.build.rootfileInStatus', false)
         if(showFilename) {
diff --git a/src/compile/recipe.ts b/src/compile/recipe.ts
index be3a227a5..faaf62b02 100644
--- a/src/compile/recipe.ts
+++ b/src/compile/recipe.ts
@@ -120,7 +120,7 @@ function createOutputSubFolders(rootFile: string) {
 function createBuildTools(rootFile: string, langId: string, recipeName?: string): Tool[] | undefined {
     let buildTools: Tool[] = []
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
     const magic = findMagicComments(rootFile)
 
     if (recipeName === undefined && magic.tex && !configuration.get('latex.build.forceRecipeUsage')) {
@@ -233,7 +233,7 @@ function findMagicComments(rootFile: string): {tex?: Tool, bib?: Tool, recipe?:
  * @returns {Tool[]} - An array of Tool objects representing the build tools.
  */
 function createBuildMagic(rootFile: string, magicTex: Tool, magicBib?: Tool): Tool[] {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
 
     if (!magicTex.args) {
         magicTex.args = configuration.get('latex.magic.args') as string[]
@@ -261,7 +261,7 @@ function createBuildMagic(rootFile: string, magicTex: Tool, magicBib?: Tool): To
  * provided parameters.
  */
 function findRecipe(rootFile: string, langId: string, recipeName?: string): Recipe | undefined {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
 
     const recipes = configuration.get('latex.recipes') as Recipe[]
     const defaultRecipeName = configuration.get('latex.recipe.default') as string
@@ -317,7 +317,7 @@ function findRecipe(rootFile: string, langId: string, recipeName?: string): Reci
  * @returns {Tool[]} - An array of Tool objects with expanded values.
  */
 function populateTools(rootFile: string, buildTools: Tool[]): Tool[] {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
     const docker = configuration.get('docker.enabled')
 
     buildTools.forEach(tool => {
diff --git a/src/completion/completer/citation.ts b/src/completion/completer/citation.ts
index b4ec3a97b..3825635b8 100644
--- a/src/completion/completer/citation.ts
+++ b/src/completion/completer/citation.ts
@@ -238,7 +238,7 @@ function updateAll(bibFiles?: string[]): CitationItem[] {
  */
 async function parseBibFile(fileName: string) {
     logger.log(`Parsing .bib entries from ${fileName}`)
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(fileName))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(fileName))
     if (fs.statSync(fileName).size >= (configuration.get('bibtex.maxFileSize') as number) * 1024 * 1024) {
         logger.log(`Bib file is too large, ignoring it: ${fileName}`)
         data.bibEntries.delete(fileName)
diff --git a/src/completion/completer/input.ts b/src/completion/completer/input.ts
index fbe15257a..9cbe503e1 100644
--- a/src/completion/completer/input.ts
+++ b/src/completion/completer/input.ts
@@ -148,7 +148,7 @@ class Input extends InputAbstract {
         if (['includegraphics', 'includesvg'].includes(macro) && this.graphicsPath.size > 0) {
             baseDir = Array.from(this.graphicsPath).map(dir => path.join(rootDir, dir))
         } else {
-            const baseConfig = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(currentFile)).get('intellisense.file.base')
+            const baseConfig = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(currentFile)).get('intellisense.file.base')
             const baseDirCurrentFile = path.dirname(currentFile)
             switch (baseConfig) {
                 case 'root relative':
diff --git a/src/completion/completer/macro.ts b/src/completion/completer/macro.ts
index 49ec68c31..27bb330dd 100644
--- a/src/completion/completer/macro.ts
+++ b/src/completion/completer/macro.ts
@@ -289,7 +289,7 @@ function parseAst(node: Ast.Node, filePath: string, defined?: Set<string>): CmdE
         data.definedCmds.set(cmd.signatureAsString(), {
             filePath,
             location: new vscode.Location(
-                lw.file.fileUriFromPath(filePath),
+                lw.file.getUri(filePath),
                 new vscode.Position(
                     (node.position?.start.line ?? 1) - 1,
                     (node.position?.start.column ?? 1) - 1))
@@ -387,7 +387,7 @@ function parseContent(content: string, filePath: string): CmdEnvSuggestion[] {
         data.definedCmds.set(result[1], {
             filePath,
             location: new vscode.Location(
-                lw.file.fileUriFromPath(filePath),
+                lw.file.getUri(filePath),
                 new vscode.Position(content.substring(0, result.index).split('\n').length - 1, 0))
         })
     }
diff --git a/src/core/commands.ts b/src/core/commands.ts
index df62b498c..b4cda2586 100644
--- a/src/core/commands.ts
+++ b/src/core/commands.ts
@@ -36,13 +36,13 @@ export async function revealOutputDir() {
         const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
         const rootDir = lw.root.dir.path || workspaceFolder?.uri.fsPath
         if (rootDir === undefined) {
-            logger.log(`Cannot reveal ${lw.file.fileUriFromPath(outDir)}: no root dir can be identified.`)
+            logger.log(`Cannot reveal ${lw.file.getUri(outDir)}: no root dir can be identified.`)
             return
         }
         outDir = path.resolve(rootDir, outDir)
     }
-    logger.log(`Reveal ${lw.file.fileUriFromPath(outDir)}`)
-    await vscode.commands.executeCommand('revealFileInOS', lw.file.fileUriFromPath(outDir))
+    logger.log(`Reveal ${lw.file.getUri(outDir)}`)
+    await vscode.commands.executeCommand('revealFileInOS', lw.file.getUri(outDir))
 }
 
 export function recipes(recipe?: string) {
@@ -116,13 +116,13 @@ export function synctex() {
 
     if (lw.liveshare.isGuest) {
         const coords = lw.locate.synctex.getCurrentEditorCoordinates()
-        const pdfFileUri = lw.root.getRootFileAndTargetPdfUri()?.pdfFileUri
 
-        if (pdfFileUri === undefined || coords === undefined) {
+        if (lw.root.file.path === undefined || coords === undefined) {
             logger.log('Cannot find LaTeX root PDF to perform synctex.')
             return
         }
 
+        const pdfFileUri = lw.file.getUri(lw.file.getPdfPath(lw.root.file.path))
         const indicator = configuration.get('synctex.indicator') as 'none' | 'circle' | 'rectangle'
         void lw.hostConnection.send({type: 'synctex', line: coords.line, column: coords.column, filePath: coords.inputFileUri.toString(true), targetPdfFile: pdfFileUri.toString(true), indicator})
     } else {
@@ -496,7 +496,7 @@ export function toggleMathPreviewPanel() {
 }
 
 async function quickPickRootFile(rootFile: string, localRootFile: string, verb: string): Promise<string | undefined> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
     const doNotPrompt = configuration.get('latex.rootFile.doNotPrompt') as boolean
     if (doNotPrompt) {
         if (configuration.get('latex.rootFile.useSubFile')) {
diff --git a/src/core/file.ts b/src/core/file.ts
index a2b5406aa..e65f1b3dc 100644
--- a/src/core/file.ts
+++ b/src/core/file.ts
@@ -25,9 +25,8 @@ export const file = {
     read,
     kpsewhich,
     getUriScheme,
-    fileUriFromPath,
-    hasAcceptedScheme,
-    isAcceptedScheme,
+    getUri,
+    isUriScheme,
     _test: {
         createTmpDir
     }
@@ -241,7 +240,7 @@ function getOutDir(texPath?: string): string {
         return './'
     }
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(texPath))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(texPath))
     const outDir = configuration.get('latex.outDir') as string || './'
     const out = utils.replaceArgumentPlaceholders(texPath, file.tmpDirPath)(outDir)
     let result = undefined
@@ -294,7 +293,7 @@ function getLangId(filename: string): string | undefined {
  * configuration or derived from the file name.
  */
 function getJobname(texPath: string): string {
-    const jobname = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(texPath)).get('latex.jobname') as string
+    const jobname = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(texPath)).get('latex.jobname') as string
     return jobname || path.parse(texPath).name
 }
 
@@ -476,7 +475,7 @@ function getBibPath(bib: string, baseDir: string): string[] {
  */
 async function read(filePath: string, raise: boolean = false): Promise<string | undefined> {
     try {
-        return (await vscode.workspace.fs.readFile(lw.file.fileUriFromPath(filePath))).toString()
+        return (await vscode.workspace.fs.readFile(lw.file.getUri(filePath))).toString()
     } catch (err) {
         if (raise === false) {
             return undefined
@@ -504,7 +503,7 @@ async function read(filePath: string, raise: boolean = false): Promise<string |
  */
 async function exists(uri: vscode.Uri | string): Promise<boolean> {
     if (typeof (uri) === 'string') {
-        uri = lw.file.fileUriFromPath(uri)
+        uri = lw.file.getUri(uri)
     }
     try {
         await lw.external.stat(uri)
@@ -532,14 +531,10 @@ function getUriScheme(filePath?: string): string {
     return scheme ?? (lw.liveshare.isGuest ? 'vsls' : 'file')
 }
 
-function fileUriFromPath(filePath: string): vscode.Uri {
+function getUri(filePath: string): vscode.Uri {
     return vscode.Uri.file(filePath).with({ scheme: getUriScheme(filePath) })
 }
 
-function hasAcceptedScheme(fileUri: vscode.Uri): boolean {
-    return isAcceptedScheme(fileUri.scheme)
-}
-
-function isAcceptedScheme(scheme: string): boolean {
-    return ['file', 'vsls'].includes(scheme)
+function isUriScheme(fileUri: vscode.Uri): boolean {
+    return ['file', 'vsls'].includes(fileUri.scheme)
 }
diff --git a/src/core/root.ts b/src/core/root.ts
index 3b1ee7c65..350b7e948 100644
--- a/src/core/root.ts
+++ b/src/core/root.ts
@@ -19,7 +19,6 @@ export const root = {
         path: undefined as string | undefined,
         langId: undefined as string | undefined,
     },
-    getRootFileAndTargetPdfUri,
     find,
     getWorkspace,
     _test: {
@@ -40,18 +39,6 @@ lw.watcher.src.onDelete(filePath => {
     void find()
 })
 
-function getRootFileAndTargetPdfUri(): {rootFileUri: vscode.Uri, pdfFileUri: vscode.Uri} | undefined{
-    if (lw.root.file.path === undefined) {
-        logger.log('No root file found.')
-        return
-    }
-
-    const rootFileUri = lw.file.fileUriFromPath(lw.root.file.path)
-    const pdfFileUri = lw.file.fileUriFromPath(lw.file.getPdfPath(lw.root.file.path))
-
-    return {rootFileUri, pdfFileUri}
-}
-
 /**
  * Finds the LaTeX project's root file.
  *
@@ -151,7 +138,7 @@ function getWorkspace(filePath?: string): vscode.Uri | undefined {
     }
     // If provided with a filePath, check its workspace
     if (filePath !== undefined) {
-        return (vscode.workspace.getWorkspaceFolder(lw.file.fileUriFromPath(filePath)) ?? firstWorkspace).uri
+        return (vscode.workspace.getWorkspaceFolder(lw.file.getUri(filePath)) ?? firstWorkspace).uri
     }
     // If we don't have an active text editor, we can only make a guess.
     // Let's guess the first one.
@@ -221,7 +208,7 @@ function findFromRoot(): string | undefined {
     if (!vscode.window.activeTextEditor || root.file.path === undefined) {
         return
     }
-    if (!lw.file.hasAcceptedScheme(vscode.window.activeTextEditor.document.uri)) {
+    if (!lw.file.isUriScheme(vscode.window.activeTextEditor.document.uri)) {
         logger.log(`The active document cannot be used as the root file: ${vscode.window.activeTextEditor.document.uri.toString(true)}`)
         return
     }
@@ -244,7 +231,7 @@ function findFromActive(): string | undefined {
     if (!vscode.window.activeTextEditor) {
         return
     }
-    if (!lw.file.hasAcceptedScheme(vscode.window.activeTextEditor.document.uri)) {
+    if (!lw.file.isUriScheme(vscode.window.activeTextEditor.document.uri)) {
         logger.log(`The active document cannot be used as the root file: ${vscode.window.activeTextEditor.document.uri.toString(true)}`)
         return
     }
@@ -316,7 +303,7 @@ async function findInWorkspace(): Promise<string | undefined> {
         const fileUris = await vscode.workspace.findFiles(rootFilesIncludeGlob, rootFilesExcludeGlob)
         const candidates: string[] = []
         for (const fileUri of fileUris) {
-            if (!lw.file.hasAcceptedScheme(fileUri)) {
+            if (!lw.file.isUriScheme(fileUri)) {
                 logger.log(`Skip the file: ${fileUri.toString(true)}`)
                 continue
             }
diff --git a/src/core/watcher.ts b/src/core/watcher.ts
index d194d3d34..8ac82f4c5 100644
--- a/src/core/watcher.ts
+++ b/src/core/watcher.ts
@@ -139,7 +139,7 @@ class Watcher {
     private async initiatePolling(uri: vscode.Uri): Promise<void> {
         const filePath = uri.fsPath
         const firstChangeTime = Date.now()
-        const size = (await lw.external.stat(lw.file.fileUriFromPath(filePath))).size
+        const size = (await lw.external.stat(lw.file.getUri(filePath))).size
 
         this.polling[filePath] = { size, time: firstChangeTime }
 
@@ -170,7 +170,7 @@ class Watcher {
             return
         }
 
-        const currentSize = (await lw.external.stat(lw.file.fileUriFromPath(filePath))).size
+        const currentSize = (await lw.external.stat(lw.file.getUri(filePath))).size
 
         if (currentSize !== size) {
             this.polling[filePath].size = currentSize
diff --git a/src/extras/cleaner.ts b/src/extras/cleaner.ts
index 24f7cdd24..a23698601 100644
--- a/src/extras/cleaner.ts
+++ b/src/extras/cleaner.ts
@@ -45,7 +45,7 @@ async function clean(rootFile?: string): Promise<void> {
             return
         }
     }
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
     const cleanMethod = configuration.get('latex.clean.method') as string
     switch (cleanMethod) {
         case 'glob':
@@ -102,7 +102,7 @@ function splitGlobs(globs: string[]): { fileOrFolderGlobs: string[], folderGlobs
  * intentionally by the user. Otherwise, the folders will be ignored.
  */
 async function cleanGlob(rootFile: string): Promise<void> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
     const globPrefix = (configuration.get('latex.clean.subfolder.enabled') as boolean) ? './**/' : ''
     const globs = (configuration.get('latex.clean.fileTypes') as string[])
         .map(globType => globPrefix + replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath)(globType))
@@ -149,7 +149,7 @@ async function cleanGlob(rootFile: string): Promise<void> {
 }
 
 function cleanCommand(rootFile: string): Promise<void> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
     const command = configuration.get('latex.clean.command') as string
     const args = (configuration.get('latex.clean.args') as string[])
         .map(arg => { return replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath)(arg)
diff --git a/src/language/definition.ts b/src/language/definition.ts
index ba7409ad5..1c8a4a1cc 100644
--- a/src/language/definition.ts
+++ b/src/language/definition.ts
@@ -41,7 +41,7 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
     }
 
     provideDefinition(document: vscode.TextDocument, position: vscode.Position): vscode.Location | undefined {
-        if (!lw.file.hasAcceptedScheme(document.uri)) {
+        if (!lw.file.isUriScheme(document.uri)) {
             return
         }
         const token = tokenizer(document, position)
@@ -58,15 +58,15 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
         }
         const ref = lw.completion.reference.getItem(token)
         if (ref) {
-            return new vscode.Location(lw.file.fileUriFromPath(ref.file), ref.position)
+            return new vscode.Location(lw.file.getUri(ref.file), ref.position)
         }
         const cite = lw.completion.citation.getItem(token)
         if (cite) {
-            return new vscode.Location(lw.file.fileUriFromPath(cite.file), cite.position)
+            return new vscode.Location(lw.file.getUri(cite.file), cite.position)
         }
         const glossary = lw.completion.glossary.getItem(token)
         if (glossary) {
-            return new vscode.Location(lw.file.fileUriFromPath(glossary.filePath), glossary.position)
+            return new vscode.Location(lw.file.getUri(glossary.filePath), glossary.position)
         }
         if (vscode.window.activeTextEditor && token.includes('.')) {
             // We skip graphics files
@@ -77,13 +77,13 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
             }
             const absolutePath = path.resolve(path.dirname(vscode.window.activeTextEditor.document.fileName), token)
             if (fs.existsSync(absolutePath)) {
-                return new vscode.Location( lw.file.fileUriFromPath(absolutePath), new vscode.Position(0, 0) )
+                return new vscode.Location( lw.file.getUri(absolutePath), new vscode.Position(0, 0) )
             }
         }
 
         const filename = this.onAFilename(document, position, token)
         if (filename) {
-            return new vscode.Location( lw.file.fileUriFromPath(filename), new vscode.Position(0, 0) )
+            return new vscode.Location( lw.file.getUri(filename), new vscode.Position(0, 0) )
         }
         return
     }
diff --git a/src/language/symbol-document.ts b/src/language/symbol-document.ts
index cf1b367c6..50959271e 100644
--- a/src/language/symbol-document.ts
+++ b/src/language/symbol-document.ts
@@ -13,7 +13,7 @@ export class DocSymbolProvider implements vscode.DocumentSymbolProvider {
         } else if (document.languageId === 'doctex') {
             return construct(document).then((sections: TeXElement[]) => this.sectionToSymbols(sections))
         }
-        if (!lw.file.hasAcceptedScheme(document.uri)) {
+        if (!lw.file.isUriScheme(document.uri)) {
             return []
         }
         const sections = await constructLaTeX(document.fileName, false)
diff --git a/src/language/symbol-project.ts b/src/language/symbol-project.ts
index 2345f964f..1f3f1f3bf 100644
--- a/src/language/symbol-project.ts
+++ b/src/language/symbol-project.ts
@@ -16,7 +16,7 @@ export class ProjectSymbolProvider implements vscode.WorkspaceSymbolProvider {
     private sectionToSymbols(sections: TeXElement[], containerName: string = 'Document'): vscode.SymbolInformation[] {
         let symbols: vscode.SymbolInformation[] = []
         sections.forEach(section => {
-            const location = new vscode.Location(lw.file.fileUriFromPath(section.filePath), new vscode.Range(section.lineFr, 0, section.lineTo, 65535))
+            const location = new vscode.Location(lw.file.getUri(section.filePath), new vscode.Range(section.lineFr, 0, section.lineTo, 65535))
             symbols.push(new vscode.SymbolInformation(section.label, vscode.SymbolKind.String, containerName, location))
             if (section.children.length > 0) {
                 symbols = [...symbols, ...this.sectionToSymbols(section.children, section.label)]
diff --git a/src/lint/duplicate-label.ts b/src/lint/duplicate-label.ts
index 0217ba06b..76d73186b 100644
--- a/src/lint/duplicate-label.ts
+++ b/src/lint/duplicate-label.ts
@@ -79,7 +79,7 @@ function showDiagnostics(duplicates: string[]) {
 
     for (const file in diagsCollection) {
         if (path.extname(file) === '.tex') {
-            duplicatedLabelsDiagnostics.set(lw.file.fileUriFromPath(file), diagsCollection[file])
+            duplicatedLabelsDiagnostics.set(lw.file.getUri(file), diagsCollection[file])
         }
     }
 }
diff --git a/src/lint/latex-linter/chktex.ts b/src/lint/latex-linter/chktex.ts
index 5478fa4ae..d535ed173 100644
--- a/src/lint/latex-linter/chktex.ts
+++ b/src/lint/latex-linter/chktex.ts
@@ -24,7 +24,7 @@ let linterProcess: ChildProcessWithoutNullStreams | undefined
 async function lintRootFile(rootPath: string) {
     const requiredArgs = ['-f%f:%l:%c:%d:%k:%n:%m\n', rootPath]
 
-    const stdout = await chktexWrapper('root', lw.file.fileUriFromPath(rootPath), rootPath, requiredArgs, undefined)
+    const stdout = await chktexWrapper('root', lw.file.getUri(rootPath), rootPath, requiredArgs, undefined)
     if (stdout === undefined) { // It's possible to have empty string as output
         return
     }
@@ -131,7 +131,7 @@ function globalRcPath(): string | undefined {
 }
 
 function getChktexrcTabSize(file: string): number | undefined {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(file))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(file))
     const args = configuration.get('linting.chktex.exec.args') as string[]
     let filePath: string | undefined
     if (args.includes('-l')) {
@@ -197,7 +197,7 @@ function parseLog(log: string, singleFileOriginalPath?: string, tabSizeArg?: num
     } else if (linterLog.length === 0) {
         // We are linting a single file and the new log is empty for it -
         // clean existing records.
-        chkTeX.linterDiagnostics.set(lw.file.fileUriFromPath(singleFileOriginalPath), [])
+        chkTeX.linterDiagnostics.set(lw.file.getUri(singleFileOriginalPath), [])
     }
     showLinterDiagnostics(linterLog)
 }
@@ -279,7 +279,7 @@ function showLinterDiagnostics(linterLog: ChkTeXLogEntry[]) {
                     file1 = f
                 }
             }
-            chkTeX.linterDiagnostics.set(lw.file.fileUriFromPath(file1), diagsCollection[file])
+            chkTeX.linterDiagnostics.set(lw.file.getUri(file1), diagsCollection[file])
         }
     }
 }
diff --git a/src/lint/latex-linter/lacheck.ts b/src/lint/latex-linter/lacheck.ts
index 4342902a1..f8950e15d 100644
--- a/src/lint/latex-linter/lacheck.ts
+++ b/src/lint/latex-linter/lacheck.ts
@@ -21,7 +21,7 @@ export const laCheck: LaTeXLinter = {
 let linterProcess: ChildProcessWithoutNullStreams | undefined
 
 async function lintRootFile(rootPath: string) {
-    const stdout = await lacheckWrapper('root', lw.file.fileUriFromPath(rootPath), rootPath, undefined)
+    const stdout = await lacheckWrapper('root', lw.file.getUri(rootPath), rootPath, undefined)
     if (stdout === undefined) { // It's possible to have empty string as output
         return
     }
@@ -130,7 +130,7 @@ function showLinterDiagnostics(linterLog: LaCheckLogEntry[]) {
                     file1 = f
                 }
             }
-            laCheck.linterDiagnostics.set(lw.file.fileUriFromPath(file1), diagsCollection[file])
+            laCheck.linterDiagnostics.set(lw.file.getUri(file1), diagsCollection[file])
         }
     }
 }
diff --git a/src/locate/synctex.ts b/src/locate/synctex.ts
index 0ed1bcf4e..0006d99ad 100644
--- a/src/locate/synctex.ts
+++ b/src/locate/synctex.ts
@@ -244,6 +244,10 @@ function toPDF(args?: {line: number, filePath: string}, forcedViewer: 'auto' | '
         return
     }
 
+    if (lw.root.file.path === undefined) {
+        return
+    }
+
     if (args === undefined) {
         const currentEditorCoordinates = getCurrentEditorCoordinates()
         if (currentEditorCoordinates === undefined) {
@@ -257,13 +261,8 @@ function toPDF(args?: {line: number, filePath: string}, forcedViewer: 'auto' | '
         filePath = args.filePath
     }
 
-    const currentRootAndPdf = lw.root.getRootFileAndTargetPdfUri()
-    if (currentRootAndPdf === undefined) {
-        return
-    }
-
-    const rootFile = currentRootAndPdf.rootFileUri.fsPath
-    const targetPdfFile = pdfFile ?? currentRootAndPdf.pdfFileUri.fsPath
+    const rootFile = lw.file.getUri(lw.root.file.path).fsPath
+    const targetPdfFile = pdfFile ?? lw.file.getUri(lw.file.getPdfPath(lw.root.file.path)).fsPath
 
     const configuration = vscode.workspace.getConfiguration('latex-workshop')
     if (forcedViewer === 'external' || (forcedViewer === 'auto' && configuration.get('view.pdf.viewer') === 'external') ) {
@@ -504,7 +503,7 @@ function computeToTeX(data: Extract<ClientRequest, {type: 'reverse_synctex'}>, p
 
 async function openTeX(input: string, line: number, column: number, textBeforeSelection: string, textAfterSelection: string) {
     const filePath = path.resolve(input)
-    const uri = lw.file.fileUriFromPath(input)
+    const uri = lw.file.getUri(input)
     try {
         await vscode.workspace.fs.stat(uri)
     } catch (e) {
diff --git a/src/main.ts b/src/main.ts
index c43e9826f..61a291267 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -71,7 +71,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
     }))
 
     extensionContext.subscriptions.push(vscode.workspace.onDidSaveTextDocument( (e: vscode.TextDocument) => {
-        if (!lw.file.hasAcceptedScheme(e.uri)){
+        if (!lw.file.isUriScheme(e.uri)){
             return
         }
         if (lw.file.hasTeXLangId(e.languageId) ||
@@ -104,7 +104,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
         } else if (vscode.window.activeTextEditor && vscode.window.activeTextEditor.document.languageId.toLowerCase() === 'log') {
             logger.showStatus()
         }
-        if (e && !lw.file.hasAcceptedScheme(e.document.uri)) {
+        if (e && !lw.file.isUriScheme(e.document.uri)) {
             return
         }
         if (e && lw.file.hasTeXLangId(e.document.languageId) && e.document.fileName !== prevTeXDocumentPath) {
@@ -123,7 +123,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
     }))
 
     extensionContext.subscriptions.push(vscode.workspace.onDidChangeTextDocument((e: vscode.TextDocumentChangeEvent) => {
-        if (!lw.file.hasAcceptedScheme(e.document.uri)){
+        if (!lw.file.isUriScheme(e.document.uri)){
             return
         }
         if (!lw.file.hasTeXLangId(e.document.languageId) &&
diff --git a/src/outline/structure/bibtex.ts b/src/outline/structure/bibtex.ts
index e66c31a50..1a0a36faf 100644
--- a/src/outline/structure/bibtex.ts
+++ b/src/outline/structure/bibtex.ts
@@ -22,7 +22,7 @@ function fieldValueToString(field: bibtexParser.FieldValue, abbreviations: {[abb
 }
 
 export async function buildBibTeX(document: vscode.TextDocument): Promise<TeXElement[]> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(document.fileName))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(document.fileName))
     if (document.getText().length >= (configuration.get('bibtex.maxFileSize') as number) * 1024 * 1024) {
         logger.log(`Bib file is too large, ignoring it: ${document.fileName}`)
         return []
diff --git a/src/parse/parser/parserutils.ts b/src/parse/parser/parserutils.ts
index 41b711b15..fd71ce8f0 100644
--- a/src/parse/parser/parserutils.ts
+++ b/src/parse/parser/parserutils.ts
@@ -74,6 +74,6 @@ export function showCompilerDiagnostics(diagnostics: vscode.DiagnosticCollection
                 file1 = f
             }
         }
-        diagnostics.set(lw.file.fileUriFromPath(file1), diagsCollection[file])
+        diagnostics.set(lw.file.getUri(file1), diagsCollection[file])
     }
 }
diff --git a/src/preview/hover/ongraphics.ts b/src/preview/hover/ongraphics.ts
index 171786ec0..8312c6ee0 100644
--- a/src/preview/hover/ongraphics.ts
+++ b/src/preview/hover/ongraphics.ts
@@ -57,7 +57,7 @@ export async function graph2md(filePath: string, opts: { height: number, width:
             return md
         } else {
             let msg = '$(error) Failed to render.'
-            if (!vscode.workspace.getWorkspaceFolder(lw.file.fileUriFromPath(filePath))) {
+            if (!vscode.workspace.getWorkspaceFolder(lw.file.getUri(filePath))) {
                 msg = '$(warning) Cannot render a PDF file not in workspaces.'
             } else if (lw.extra.snippet.state.view?.webview === undefined) {
                 msg = '$(info) Please activate the LaTeX Workshop activity bar item to render PDF thumbnails.'
@@ -73,19 +73,19 @@ async function renderPdfFileAsDataUrl(pdfFilePath: string, opts: { height: numbe
         const maxDataUrlLength = 99980
         let scale = 1.5
         let newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        let dataUrl = await lw.extra.snippet.render(lw.file.fileUriFromPath(pdfFilePath), newOpts)
+        let dataUrl = await lw.extra.snippet.render(lw.file.getUri(pdfFilePath), newOpts)
         if (!dataUrl || dataUrl.length < maxDataUrlLength) {
             return dataUrl
         }
         scale = 1
         newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        dataUrl = await lw.extra.snippet.render(lw.file.fileUriFromPath(pdfFilePath), newOpts)
+        dataUrl = await lw.extra.snippet.render(lw.file.getUri(pdfFilePath), newOpts)
         if (!dataUrl || dataUrl.length < maxDataUrlLength) {
             return dataUrl
         }
         scale = Math.sqrt(maxDataUrlLength/dataUrl.length) / 1.2
         newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        dataUrl = await lw.extra.snippet.render(lw.file.fileUriFromPath(pdfFilePath), newOpts)
+        dataUrl = await lw.extra.snippet.render(lw.file.getUri(pdfFilePath), newOpts)
         if (dataUrl && dataUrl.length >= maxDataUrlLength) {
             logger.log(`Data URL still too large: ${pdfFilePath}`)
             return
diff --git a/src/preview/math-preview-panel.ts b/src/preview/math-preview-panel.ts
index 0f4e549c9..c194ef91b 100644
--- a/src/preview/math-preview-panel.ts
+++ b/src/preview/math-preview-panel.ts
@@ -23,7 +23,7 @@ type UpdateEvent = {
 
 function resourcesFolder(extensionRoot: string) {
     const folder = path.join(extensionRoot, 'resources', 'mathpreviewpanel')
-    return lw.file.fileUriFromPath(folder)
+    return lw.file.getUri(folder)
 }
 
 class MathPreviewPanelSerializer implements vscode.WebviewPanelSerializer {
diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index 6c0a86882..9c2a439e5 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -53,7 +53,7 @@ function reload(): void {
  */
 function refresh(pdfFile?: string): void {
     logger.log(`Call refreshExistingViewer: ${JSON.stringify(pdfFile)} .`)
-    const pdfUri = pdfFile ? lw.file.fileUriFromPath(pdfFile) : undefined
+    const pdfUri = pdfFile ? lw.file.getUri(pdfFile) : undefined
     if (pdfUri === undefined) {
         manager.getClients()?.forEach(client => {
             client.send({type: 'refresh', pdfFileUri: client.pdfFileUri})
@@ -62,7 +62,7 @@ function refresh(pdfFile?: string): void {
     }
     let clientSet = manager.getClients(pdfUri)
     if (lw.liveshare.isHost && lw.liveshare.liveshare !== null && pdfFile !== undefined) {
-        const sharedUri = lw.liveshare.liveshare?.convertLocalUriToShared(lw.file.fileUriFromPath(pdfFile))
+        const sharedUri = lw.liveshare.liveshare?.convertLocalUriToShared(lw.file.getUri(pdfFile))
         const guestClients = manager.getClients(sharedUri)
         if (guestClients) {
             clientSet?.forEach(client => guestClients.add(client))
@@ -80,7 +80,7 @@ function refresh(pdfFile?: string): void {
 }
 
 async function getUrl(pdfFile: string): Promise<string | undefined> {
-    const pdfUri = lw.file.fileUriFromPath(pdfFile)
+    const pdfUri = lw.file.getUri(pdfFile)
     if (!await lw.file.exists(pdfUri)) {
         logger.log(`Cannot find PDF file ${pdfUri}`)
         logger.refreshStatus('check', 'statusBar.foreground', `Cannot view file PDF file. File not found: ${pdfUri}`, 'warning')
@@ -119,7 +119,7 @@ async function viewInBrowser(pdfFile: string): Promise<void> {
     if (!url) {
         return
     }
-    const pdfUri = lw.file.fileUriFromPath(pdfFile)
+    const pdfUri = lw.file.getUri(pdfFile)
     manager.create(pdfUri)
     lw.watcher.pdf.add(pdfUri.fsPath)
     try {
@@ -147,7 +147,7 @@ async function viewInTab(pdfFile: string, tabEditorGroup: string, preserveFocus:
     if (!url) {
         return
     }
-    const pdfUri = lw.file.fileUriFromPath(pdfFile)
+    const pdfUri = lw.file.getUri(pdfFile)
     return viewInWebviewPanel(pdfUri, tabEditorGroup, preserveFocus)
 }
 
@@ -158,7 +158,7 @@ async function viewInCustomEditor(pdfFile: string): Promise<void> {
     }
     const configuration = vscode.workspace.getConfiguration('latex-workshop')
     const editorGroup = configuration.get('view.pdf.tab.editorGroup') as string
-    const pdfUri = lw.file.fileUriFromPath(pdfFile)
+    const pdfUri = lw.file.getUri(pdfFile)
     const showOptions: vscode.TextDocumentShowOptions = {
         viewColumn: vscode.ViewColumn.Active,
         preserveFocus: true
@@ -447,7 +447,7 @@ function getParams(): PdfViewerParams {
  * @param record The position to be revealed.
  */
 async function locate(pdfFile: string, record: SyncTeXRecordToPDF | SyncTeXRecordToPDFAll[]): Promise<void> {
-    const pdfUri = lw.file.fileUriFromPath(pdfFile)
+    const pdfUri = lw.file.getUri(pdfFile)
     let clientSet = manager.getClients(pdfUri)
     if (clientSet === undefined || clientSet.size === 0) {
         logger.log(`PDF is not opened: ${pdfFile} , try opening.`)
diff --git a/src/preview/viewer/pdfviewerpanel.ts b/src/preview/viewer/pdfviewerpanel.ts
index 9ca23a89f..f6149b127 100644
--- a/src/preview/viewer/pdfviewerpanel.ts
+++ b/src/preview/viewer/pdfviewerpanel.ts
@@ -47,7 +47,7 @@ class PdfViewerPanelSerializer implements vscode.WebviewPanelSerializer {
         const state = argState.state
         let pdfFileUri: vscode.Uri | undefined
         if (state.path) {
-            pdfFileUri = lw.file.fileUriFromPath(state.path)
+            pdfFileUri = lw.file.getUri(state.path)
         } else if (state.pdfFileUri) {
             pdfFileUri = vscode.Uri.parse(state.pdfFileUri, true)
         }
diff --git a/src/utils/quick-pick.ts b/src/utils/quick-pick.ts
index cad8279b2..0ce1e296e 100644
--- a/src/utils/quick-pick.ts
+++ b/src/utils/quick-pick.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import { lw } from '../lw'
 
 export async function pickRootPath(rootPath: string, subRootPath: string, verb: string): Promise<string | undefined> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootPath))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootPath))
     const doNotPrompt = configuration.get('latex.rootFile.doNotPrompt') as boolean
     if (doNotPrompt) {
         if (configuration.get('latex.rootFile.useSubFile')) {
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index b5c658541..5d69d015d 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -269,7 +269,7 @@ export function resolveFileGlob(dirs: string[], inputGlob: string, suffix: strin
  */
 export function replaceArgumentPlaceholders(rootFile: string, tmpDir: string): (arg: string) => string {
     return (arg: string) => {
-        const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.fileUriFromPath(rootFile))
+        const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
         const docker = configuration.get('docker.enabled')
 
         const workspaceFolder = vscode.workspace.workspaceFolders?.[0]

From d3ee1f097210ce6f81307920325c857b873c8cc1 Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Wed, 31 Jul 2024 18:19:06 +0800
Subject: [PATCH 16/20] Move liveshare to extra

---
 src/{liveshare => extras}/liveshare.ts | 0
 src/lw.ts                              | 2 +-
 src/main.ts                            | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{liveshare => extras}/liveshare.ts (100%)

diff --git a/src/liveshare/liveshare.ts b/src/extras/liveshare.ts
similarity index 100%
rename from src/liveshare/liveshare.ts
rename to src/extras/liveshare.ts
diff --git a/src/lw.ts b/src/lw.ts
index ca623313e..b4c92ac6e 100644
--- a/src/lw.ts
+++ b/src/lw.ts
@@ -17,7 +17,7 @@ import type { parser } from './parse'
 import type { extra } from './extras'
 
 import type * as commands from './core/commands'
-import { LiveShare } from './liveshare/liveshare'
+import { LiveShare } from './extras/liveshare'
 
 const wrapper = <T extends Array<any>, U>(fn: (...args: T) => U) => {
     return (...args: T): U => fn(...args)
diff --git a/src/main.ts b/src/main.ts
index 61a291267..99c0db04c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -39,7 +39,7 @@ import { extra } from './extras'
 lw.extra = extra
 import * as commander from './core/commands'
 lw.commands = commander
-import { LiveShare } from './liveshare/liveshare'
+import { LiveShare } from './extras/liveshare'
 lw.liveshare = new LiveShare()
 import { hostConnection } from './preview'
 lw.hostConnection = hostConnection

From 7fc5d04ae3810e2902a2de0a9d0e2e2ef30e8ed7 Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Sat, 10 Aug 2024 11:28:56 +0800
Subject: [PATCH 17/20] Minimal intrusion

---
 package.json                         |   9 +-
 package.nls.bg.json                  |   1 +
 package.nls.cs.json                  |   1 +
 package.nls.de.json                  |   1 +
 package.nls.es.json                  |   1 +
 package.nls.fr.json                  |   1 +
 package.nls.hu.json                  |   1 +
 package.nls.it.json                  |   1 +
 package.nls.ja.json                  |   1 +
 package.nls.json                     |   1 +
 package.nls.ko.json                  |   1 +
 package.nls.pl.json                  |   1 +
 package.nls.pt-br.json               |   1 +
 package.nls.ru.json                  |   1 +
 package.nls.tr.json                  |   1 +
 package.nls.zh-cn.json               |   1 +
 package.nls.zh-tw.json               |   1 +
 src/compile/build.ts                 |  12 +-
 src/compile/queue.ts                 |   2 +-
 src/compile/recipe.ts                |   8 +-
 src/completion/completer/citation.ts |   2 +-
 src/completion/completer/input.ts    |   2 +-
 src/completion/completer/macro.ts    |   4 +-
 src/completion/latex.ts              |   2 +-
 src/core/commands.ts                 |  56 ++--
 src/core/file.ts                     |  20 +-
 src/core/root.ts                     |   2 +-
 src/core/watcher.ts                  |   4 +-
 src/extras/cleaner.ts                |   6 +-
 src/extras/index.ts                  |   4 +-
 src/extras/liveshare.ts              | 389 +++++++++++++++++++++++----
 src/language/definition.ts           |  10 +-
 src/language/symbol-project.ts       |   2 +-
 src/lint/duplicate-label.ts          |   2 +-
 src/lint/latex-linter/chktex.ts      |   8 +-
 src/lint/latex-linter/lacheck.ts     |   4 +-
 src/locate/synctex.ts                |   6 +-
 src/lw.ts                            |   5 +-
 src/main.ts                          |   7 +-
 src/outline/structure/bibtex.ts      |   2 +-
 src/parse/parser/parserutils.ts      |   2 +-
 src/preview/host-connection.ts       | 141 ----------
 src/preview/hover/ongraphics.ts      |   8 +-
 src/preview/index.ts                 |   1 -
 src/preview/math-preview-panel.ts    |   4 +-
 src/preview/server.ts                |  65 +----
 src/preview/viewer.ts                |  71 +----
 src/preview/viewer/pdfviewerpanel.ts |   2 +-
 src/utils/quick-pick.ts              |   2 +-
 src/utils/utils.ts                   |   6 +-
 50 files changed, 457 insertions(+), 429 deletions(-)
 delete mode 100644 src/preview/host-connection.ts

diff --git a/package.json b/package.json
index f9cc3e0af..49e3b9636 100644
--- a/package.json
+++ b/package.json
@@ -286,13 +286,8 @@
     ],
     "commands": [
       {
-        "command": "latex-workshop.acquireHostPort",
-        "title": "Acquire Live Share host port",
-        "category": "LaTeX Workshop"
-      },
-      {
-        "command": "latex-workshop.shareHostPort",
-        "title": "Share Live Share host port",
+        "command": "latex-workshop.hostPort",
+        "title": "%command.hostPort%",
         "category": "LaTeX Workshop"
       },
       {
diff --git a/package.nls.bg.json b/package.nls.bg.json
index 2827eccfa..75b24706f 100644
--- a/package.nls.bg.json
+++ b/package.nls.bg.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Споделяне (на хоста) / Придобиване (на госта) на порт за споделяне на живо на хоста",
   "command.navigate-envpair": "Навигирай до съвпадение на \\begin{}/\\end{}",
   "command.select-envname": "Избери името на текущото среда",
   "command.select-envcontent": "Избери съдържанието на текущото среда",
diff --git a/package.nls.cs.json b/package.nls.cs.json
index 0d67dad0f..aed6ad2d7 100644
--- a/package.nls.cs.json
+++ b/package.nls.cs.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Sdílet (na hostiteli) / Získat (na hostu) port pro Live Share hostitele",
   "command.navigate-envpair": "Přejít k odpovídajícímu \\begin{}/\\end{}",
   "command.select-envname": "Vybrat název aktuálního prostředí",
   "command.select-envcontent": "Vybrat obsah aktuálního prostředí",
diff --git a/package.nls.de.json b/package.nls.de.json
index 57fff9517..a64d5dfe7 100644
--- a/package.nls.de.json
+++ b/package.nls.de.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Teilen (auf Host) / Erwerben (auf Gast) Live Share Host-Port",
   "command.navigate-envpair": "Zu passendem \\begin{}/\\end{} navigieren",
   "command.select-envname": "Aktuellen Umgebungsnamen auswählen",
   "command.select-envcontent": "Aktuellen Umgebungsinhalt auswählen",
diff --git a/package.nls.es.json b/package.nls.es.json
index 5dc2162cc..c6c7e0511 100644
--- a/package.nls.es.json
+++ b/package.nls.es.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Compartir (en anfitrión) / Adquirir (en invitado) puerto de anfitrión de Live Share",
   "command.navigate-envpair": "Navegar al \\begin{}/\\end{} correspondiente",
   "command.select-envname": "Seleccionar el nombre del entorno actual",
   "command.select-envcontent": "Seleccionar el contenido del entorno actual",
diff --git a/package.nls.fr.json b/package.nls.fr.json
index 06a85ac3b..c4089b47f 100644
--- a/package.nls.fr.json
+++ b/package.nls.fr.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Partager (sur l'hôte) / Acquérir (sur l'invité) le port de l'hôte Live Share",
   "command.navigate-envpair": "Naviguer vers \\begin{}/\\end{} correspondant",
   "command.select-envname": "Sélectionner le nom de l'environnement actuel",
   "command.select-envcontent": "Sélectionner le contenu de l'environnement actuel",
diff --git a/package.nls.hu.json b/package.nls.hu.json
index 4d9166687..a145b7363 100644
--- a/package.nls.hu.json
+++ b/package.nls.hu.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Megosztás (a gazdagépen) / Megszerzés (a vendégen) Live Share gazdagép port",
   "command.navigate-envpair": "\\begin{}/\\end{} párok közötti navigáció",
   "command.select-envname": "Jelenlegi környezet nevének kijelölése",
   "command.select-envcontent": "Jelenlegi környezet tartalmának kijelölése",
diff --git a/package.nls.it.json b/package.nls.it.json
index e7c518528..51f256713 100644
--- a/package.nls.it.json
+++ b/package.nls.it.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Condividi (su host) / Acquisisci (su guest) porta dell'host Live Share",
   "command.navigate-envpair": "Vai alla coppia corrispondente \\begin{}/\\end{}",
   "command.select-envname": "Seleziona il nome dell'ambiente corrente",
   "command.select-envcontent": "Seleziona il contenuto dell'ambiente corrente",
diff --git a/package.nls.ja.json b/package.nls.ja.json
index 7d0329483..5bf6c1e80 100644
--- a/package.nls.ja.json
+++ b/package.nls.ja.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "共有 (ホスト側) / 取得 (ゲスト側) Live Share ホストポート",
   "command.navigate-envpair": "\\begin{}/\\end{}に移動",
   "command.select-envname": "現在の環境名を選択",
   "command.select-envcontent": "現在の環境内容を選択",
diff --git a/package.nls.json b/package.nls.json
index 39e3f9cd6..027a32b96 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Share (on host) / Acquire (on guest) Live Share host port",
   "command.navigate-envpair": "Navigate to matching \\begin{}/\\end{}",
   "command.select-envname": "Select the current environment name",
   "command.select-envcontent": "Select the current environment content",
diff --git a/package.nls.ko.json b/package.nls.ko.json
index cf5229fd3..49c161f8d 100644
--- a/package.nls.ko.json
+++ b/package.nls.ko.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "공유 (호스트) / 획득 (게스트) Live Share 호스트 포트",
   "command.navigate-envpair": "\\begin{}/\\end{}와 일치하는 곳으로 이동",
   "command.select-envname": "현재 환경 이름 선택",
   "command.select-envcontent": "현재 환경 내용 선택",
diff --git a/package.nls.pl.json b/package.nls.pl.json
index 16324bba7..0fb849525 100644
--- a/package.nls.pl.json
+++ b/package.nls.pl.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Udostępnij (na hoście) / Uzyskaj (na gościu) port hosta Live Share",
   "command.navigate-envpair": "Przejdź do pasującego \\begin{}/\\end{}",
   "command.select-envname": "Wybierz nazwę bieżącego środowiska",
   "command.select-envcontent": "Wybierz zawartość bieżącego środowiska",
diff --git a/package.nls.pt-br.json b/package.nls.pt-br.json
index c812c3363..71488cbee 100644
--- a/package.nls.pt-br.json
+++ b/package.nls.pt-br.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Compartilhar (no host) / Adquirir (no guest) porta do host do Live Share",
   "command.navigate-envpair": "Navegar para correspondência \\begin{}/\\end{}",
   "command.select-envname": "Selecionar o nome do ambiente atual",
   "command.select-envcontent": "Selecionar o conteúdo do ambiente atual",
diff --git a/package.nls.ru.json b/package.nls.ru.json
index cd9721419..227674a36 100644
--- a/package.nls.ru.json
+++ b/package.nls.ru.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Поделиться (на хосте) / Получить (на госте) порт хоста Live Share",
   "command.navigate-envpair": "Перейти к соответствующему \\begin{}/\\end{}",
   "command.select-envname": "Выбрать имя текущего окружения",
   "command.select-envcontent": "Выбрать содержимое текущего окружения",
diff --git a/package.nls.tr.json b/package.nls.tr.json
index 47325a0bb..33db0b7fa 100644
--- a/package.nls.tr.json
+++ b/package.nls.tr.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "Paylaş (ev sahibinde) / Al (misafirde) Live Share ev sahibi portu",
   "command.navigate-envpair": "\\begin{}/\\end{} eşleşmesine git",
   "command.select-envname": "Geçerli ortam adını seç",
   "command.select-envcontent": "Geçerli ortam içeriğini seç",
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
index f38ce7958..54a1c2ad2 100644
--- a/package.nls.zh-cn.json
+++ b/package.nls.zh-cn.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "共享（在主机上）/ 获取（在客户端）Live Share 主机端口",
   "command.navigate-envpair": "导航到匹配的 \\begin{}/\\end{}",
   "command.select-envname": "选择当前环境名称",
   "command.select-envcontent": "选择当前环境内容",
diff --git a/package.nls.zh-tw.json b/package.nls.zh-tw.json
index c2a9ab49d..d7ef7e6d1 100644
--- a/package.nls.zh-tw.json
+++ b/package.nls.zh-tw.json
@@ -1,4 +1,5 @@
 {
+  "command.hostPort": "共享（在主機上）/ 獲取（在客戶端）Live Share 主機端口",
   "command.navigate-envpair": "導航至匹配的 \\begin{}/\\end{}",
   "command.select-envname": "選擇當前環境名稱",
   "command.select-envcontent": "選擇當前環境內容",
diff --git a/src/compile/build.ts b/src/compile/build.ts
index 407fa7cc2..04f6cf67c 100644
--- a/src/compile/build.ts
+++ b/src/compile/build.ts
@@ -30,7 +30,7 @@ lw.watcher.bib.onChange(filePath => autoBuild(filePath, 'onFileChange', true))
  * changed.
  */
 function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: boolean = false) {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(file))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(file))
     if (configuration.get('latex.autoBuild.run') as string !== type) {
         return
     }
@@ -57,7 +57,7 @@ function autoBuild(file: string, type: 'onFileChange' | 'onSave', bibChanged: bo
  * @returns {boolean} - True if auto-build can be triggered, false otherwise.
  */
 function canAutoBuild(): boolean {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.file.path ? lw.file.getUri(lw.root.file.path) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.file.path ? lw.file.toUri(lw.root.file.path) : undefined)
     return Date.now() - lw.compile.lastAutoBuildTime >= (configuration.get('latex.autoBuild.interval', 1000) as number)
 }
 
@@ -91,7 +91,7 @@ async function build(skipSelection: boolean = false, rootFile: string | undefine
 
     logger.log(`The document of the active editor: ${activeEditor.document.uri.toString(true)}`)
     logger.log(`The languageId of the document: ${activeEditor.document.languageId}`)
-    const workspace = rootFile ? lw.file.getUri(rootFile) : activeEditor.document.uri
+    const workspace = rootFile ? lw.file.toUri(rootFile) : activeEditor.document.uri
     const configuration = vscode.workspace.getConfiguration('latex-workshop', workspace)
     const externalBuildCommand = configuration.get('latex.external.build.command') as string
     const externalBuildArgs = configuration.get('latex.external.build.args') as string[]
@@ -187,7 +187,7 @@ async function buildLoop() {
  * process.
  */
 function spawnProcess(step: Step): ProcessEnv {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.getUri(step.rootFile) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.toUri(step.rootFile) : undefined)
     if (step.index === 0 || configuration.get('latex.build.clearLog.everyRecipeStep.enabled') as boolean) {
         logger.clearCompilerMessage()
     }
@@ -332,7 +332,7 @@ function handleExitCodeError(step: Step, env: ProcessEnv, stderr: string, code:
         logger.log(`${stderr}`)
     }
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.getUri(step.rootFile) : undefined)
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', step.rootFile ? lw.file.toUri(step.rootFile) : undefined)
     if (!step.isExternal && signal !== 'SIGTERM' && !step.isRetry && configuration.get('latex.autoBuild.cleanAndRetry.enabled')) {
         handleRetryError(step)
     } else if (!step.isExternal && signal !== 'SIGTERM') {
@@ -423,7 +423,7 @@ async function afterSuccessfulBuilt(lastStep: Step, skipped: boolean) {
     lw.viewer.refresh(lw.file.getPdfPath(lastStep.rootFile))
     lw.completion.reference.setNumbersFromAuxFile(lastStep.rootFile)
     await lw.cache.loadFlsFile(lastStep.rootFile ?? '')
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(lastStep.rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(lastStep.rootFile))
     // If the PDF viewer is internal, we call SyncTeX in src/components/viewer.ts.
     if (configuration.get('view.pdf.viewer') === 'external' && configuration.get('synctex.afterBuild.enabled')) {
         const pdfFile = lw.file.getPdfPath(lastStep.rootFile)
diff --git a/src/compile/queue.ts b/src/compile/queue.ts
index 6465ed974..9d0d2a71d 100644
--- a/src/compile/queue.ts
+++ b/src/compile/queue.ts
@@ -100,7 +100,7 @@ function getStepString(step: Step): string {
 
     // Determine the format of the stepString based on timestamp and index
     if(step.rootFile) {
-        const rootFileUri = lw.file.getUri(step.rootFile)
+        const rootFileUri = lw.file.toUri(step.rootFile)
         const configuration = vscode.workspace.getConfiguration('latex-workshop', rootFileUri)
         const showFilename = configuration.get<boolean>('latex.build.rootfileInStatus', false)
         if(showFilename) {
diff --git a/src/compile/recipe.ts b/src/compile/recipe.ts
index faaf62b02..5863a8cd4 100644
--- a/src/compile/recipe.ts
+++ b/src/compile/recipe.ts
@@ -120,7 +120,7 @@ function createOutputSubFolders(rootFile: string) {
 function createBuildTools(rootFile: string, langId: string, recipeName?: string): Tool[] | undefined {
     let buildTools: Tool[] = []
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
     const magic = findMagicComments(rootFile)
 
     if (recipeName === undefined && magic.tex && !configuration.get('latex.build.forceRecipeUsage')) {
@@ -233,7 +233,7 @@ function findMagicComments(rootFile: string): {tex?: Tool, bib?: Tool, recipe?:
  * @returns {Tool[]} - An array of Tool objects representing the build tools.
  */
 function createBuildMagic(rootFile: string, magicTex: Tool, magicBib?: Tool): Tool[] {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
 
     if (!magicTex.args) {
         magicTex.args = configuration.get('latex.magic.args') as string[]
@@ -261,7 +261,7 @@ function createBuildMagic(rootFile: string, magicTex: Tool, magicBib?: Tool): To
  * provided parameters.
  */
 function findRecipe(rootFile: string, langId: string, recipeName?: string): Recipe | undefined {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
 
     const recipes = configuration.get('latex.recipes') as Recipe[]
     const defaultRecipeName = configuration.get('latex.recipe.default') as string
@@ -317,7 +317,7 @@ function findRecipe(rootFile: string, langId: string, recipeName?: string): Reci
  * @returns {Tool[]} - An array of Tool objects with expanded values.
  */
 function populateTools(rootFile: string, buildTools: Tool[]): Tool[] {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
     const docker = configuration.get('docker.enabled')
 
     buildTools.forEach(tool => {
diff --git a/src/completion/completer/citation.ts b/src/completion/completer/citation.ts
index 3825635b8..1a38e0161 100644
--- a/src/completion/completer/citation.ts
+++ b/src/completion/completer/citation.ts
@@ -238,7 +238,7 @@ function updateAll(bibFiles?: string[]): CitationItem[] {
  */
 async function parseBibFile(fileName: string) {
     logger.log(`Parsing .bib entries from ${fileName}`)
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(fileName))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(fileName))
     if (fs.statSync(fileName).size >= (configuration.get('bibtex.maxFileSize') as number) * 1024 * 1024) {
         logger.log(`Bib file is too large, ignoring it: ${fileName}`)
         data.bibEntries.delete(fileName)
diff --git a/src/completion/completer/input.ts b/src/completion/completer/input.ts
index 9cbe503e1..8dae26088 100644
--- a/src/completion/completer/input.ts
+++ b/src/completion/completer/input.ts
@@ -148,7 +148,7 @@ class Input extends InputAbstract {
         if (['includegraphics', 'includesvg'].includes(macro) && this.graphicsPath.size > 0) {
             baseDir = Array.from(this.graphicsPath).map(dir => path.join(rootDir, dir))
         } else {
-            const baseConfig = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(currentFile)).get('intellisense.file.base')
+            const baseConfig = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(currentFile)).get('intellisense.file.base')
             const baseDirCurrentFile = path.dirname(currentFile)
             switch (baseConfig) {
                 case 'root relative':
diff --git a/src/completion/completer/macro.ts b/src/completion/completer/macro.ts
index 27bb330dd..805ae93e4 100644
--- a/src/completion/completer/macro.ts
+++ b/src/completion/completer/macro.ts
@@ -289,7 +289,7 @@ function parseAst(node: Ast.Node, filePath: string, defined?: Set<string>): CmdE
         data.definedCmds.set(cmd.signatureAsString(), {
             filePath,
             location: new vscode.Location(
-                lw.file.getUri(filePath),
+                lw.file.toUri(filePath),
                 new vscode.Position(
                     (node.position?.start.line ?? 1) - 1,
                     (node.position?.start.column ?? 1) - 1))
@@ -387,7 +387,7 @@ function parseContent(content: string, filePath: string): CmdEnvSuggestion[] {
         data.definedCmds.set(result[1], {
             filePath,
             location: new vscode.Location(
-                lw.file.getUri(filePath),
+                lw.file.toUri(filePath),
                 new vscode.Position(content.substring(0, result.index).split('\n').length - 1, 0))
         })
     }
diff --git a/src/completion/latex.ts b/src/completion/latex.ts
index 1598c4bfa..5d0bd7be0 100644
--- a/src/completion/latex.ts
+++ b/src/completion/latex.ts
@@ -57,7 +57,7 @@ export class Provider implements vscode.CompletionItemProvider {
     async resolveCompletionItem(item: vscode.CompletionItem, ctoken: vscode.CancellationToken): Promise<vscode.CompletionItem> {
         const configuration = vscode.workspace.getConfiguration('latex-workshop')
         if (item.kind === vscode.CompletionItemKind.Reference) {
-            if (!('file' in item || 'vsls' in item) || !configuration.get('hover.ref.enabled')) {
+            if (!('file' in item) || !configuration.get('hover.ref.enabled')) {
                 return item
             }
             const refItem = item as ReferenceItem
diff --git a/src/core/commands.ts b/src/core/commands.ts
index b4cda2586..35f733164 100644
--- a/src/core/commands.ts
+++ b/src/core/commands.ts
@@ -5,23 +5,13 @@ import { getSurroundingMacroRange, stripText } from '../utils/utils'
 
 const logger = lw.log('Commander')
 
-export async function acquireHostPort() {
-    logger.log('ACQUIREHOSTPORT command invoked.')
-    if (lw.liveshare.isGuest) {
-        await lw.liveshare.getHostServerPort(true)
+export async function hostPort() {
+    logger.log('HOSTPORT command invoked.')
+    if (lw.extra.liveshare.isGuest()) {
+        await lw.extra.liveshare.getHostServerPort(true)
     }
     else {
-        void vscode.window.showInformationMessage('This command only works for guests in a Live Share session.')
-    }
-}
-
-export async function shareHostPort() {
-    logger.log('SHAREHOSTPORT command invoked.')
-    if (lw.liveshare.isHost) {
-        await lw.liveshare.shareServer()
-    }
-    else {
-        void vscode.window.showInformationMessage('This command only works for a host in a Live Share session.')
+        await lw.extra.liveshare.shareServer()
     }
 }
 
@@ -36,13 +26,13 @@ export async function revealOutputDir() {
         const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
         const rootDir = lw.root.dir.path || workspaceFolder?.uri.fsPath
         if (rootDir === undefined) {
-            logger.log(`Cannot reveal ${lw.file.getUri(outDir)}: no root dir can be identified.`)
+            logger.log(`Cannot reveal ${lw.file.toUri(outDir)}: no root dir can be identified.`)
             return
         }
         outDir = path.resolve(rootDir, outDir)
     }
-    logger.log(`Reveal ${lw.file.getUri(outDir)}`)
-    await vscode.commands.executeCommand('revealFileInOS', lw.file.getUri(outDir))
+    logger.log(`Reveal ${lw.file.toUri(outDir)}`)
+    await vscode.commands.executeCommand('revealFileInOS', lw.file.toUri(outDir))
 }
 
 export function recipes(recipe?: string) {
@@ -114,26 +104,16 @@ export function synctex() {
     }
     const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.getWorkspace())
 
-    if (lw.liveshare.isGuest) {
-        const coords = lw.locate.synctex.getCurrentEditorCoordinates()
-
-        if (lw.root.file.path === undefined || coords === undefined) {
-            logger.log('Cannot find LaTeX root PDF to perform synctex.')
-            return
-        }
-
-        const pdfFileUri = lw.file.getUri(lw.file.getPdfPath(lw.root.file.path))
-        const indicator = configuration.get('synctex.indicator') as 'none' | 'circle' | 'rectangle'
-        void lw.hostConnection.send({type: 'synctex', line: coords.line, column: coords.column, filePath: coords.inputFileUri.toString(true), targetPdfFile: pdfFileUri.toString(true), indicator})
-    } else {
-        let pdfFile: string | undefined = undefined
-        if (lw.root.subfiles.path && configuration.get('latex.rootFile.useSubFile')) {
-            pdfFile = lw.file.getPdfPath(lw.root.subfiles.path)
-        } else if (lw.root.file.path !== undefined) {
-            pdfFile = lw.file.getPdfPath(lw.root.file.path)
-        }
-        lw.locate.synctex.toPDF(undefined, undefined, pdfFile)
+    if (lw.extra.liveshare.handle.command.syncTeX()) {
+        return
+    }
+    let pdfFile: string | undefined = undefined
+    if (lw.root.subfiles.path && configuration.get('latex.rootFile.useSubFile')) {
+        pdfFile = lw.file.getPdfPath(lw.root.subfiles.path)
+    } else if (lw.root.file.path !== undefined) {
+        pdfFile = lw.file.getPdfPath(lw.root.file.path)
     }
+    lw.locate.synctex.toPDF(undefined, undefined, pdfFile)
 }
 
 export function synctexonref(line: number, filePath: string) {
@@ -496,7 +476,7 @@ export function toggleMathPreviewPanel() {
 }
 
 async function quickPickRootFile(rootFile: string, localRootFile: string, verb: string): Promise<string | undefined> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
     const doNotPrompt = configuration.get('latex.rootFile.doNotPrompt') as boolean
     if (doNotPrompt) {
         if (configuration.get('latex.rootFile.useSubFile')) {
diff --git a/src/core/file.ts b/src/core/file.ts
index e65f1b3dc..68b95d902 100644
--- a/src/core/file.ts
+++ b/src/core/file.ts
@@ -25,8 +25,8 @@ export const file = {
     read,
     kpsewhich,
     getUriScheme,
-    getUri,
     isUriScheme,
+    toUri,
     _test: {
         createTmpDir
     }
@@ -240,7 +240,7 @@ function getOutDir(texPath?: string): string {
         return './'
     }
 
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(texPath))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(texPath))
     const outDir = configuration.get('latex.outDir') as string || './'
     const out = utils.replaceArgumentPlaceholders(texPath, file.tmpDirPath)(outDir)
     let result = undefined
@@ -293,7 +293,7 @@ function getLangId(filename: string): string | undefined {
  * configuration or derived from the file name.
  */
 function getJobname(texPath: string): string {
-    const jobname = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(texPath)).get('latex.jobname') as string
+    const jobname = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(texPath)).get('latex.jobname') as string
     return jobname || path.parse(texPath).name
 }
 
@@ -475,7 +475,7 @@ function getBibPath(bib: string, baseDir: string): string[] {
  */
 async function read(filePath: string, raise: boolean = false): Promise<string | undefined> {
     try {
-        return (await vscode.workspace.fs.readFile(lw.file.getUri(filePath))).toString()
+        return (await vscode.workspace.fs.readFile(lw.file.toUri(filePath))).toString()
     } catch (err) {
         if (raise === false) {
             return undefined
@@ -503,7 +503,7 @@ async function read(filePath: string, raise: boolean = false): Promise<string |
  */
 async function exists(uri: vscode.Uri | string): Promise<boolean> {
     if (typeof (uri) === 'string') {
-        uri = lw.file.getUri(uri)
+        uri = lw.file.toUri(uri)
     }
     try {
         await lw.external.stat(uri)
@@ -528,13 +528,13 @@ async function exists(uri: vscode.Uri | string): Promise<boolean> {
 function getUriScheme(filePath?: string): string {
     const scheme =
         vscode.workspace.workspaceFolders?.filter(folder => filePath?.startsWith(folder.uri.path))[0]?.uri.scheme
-    return scheme ?? (lw.liveshare.isGuest ? 'vsls' : 'file')
-}
-
-function getUri(filePath: string): vscode.Uri {
-    return vscode.Uri.file(filePath).with({ scheme: getUriScheme(filePath) })
+    return scheme ?? (lw.extra.liveshare.isGuest() ? 'vsls' : 'file')
 }
 
 function isUriScheme(fileUri: vscode.Uri): boolean {
     return ['file', 'vsls'].includes(fileUri.scheme)
 }
+
+function toUri(filePath: string): vscode.Uri {
+    return vscode.Uri.file(filePath).with({ scheme: getUriScheme(filePath) })
+}
diff --git a/src/core/root.ts b/src/core/root.ts
index 350b7e948..f220d5315 100644
--- a/src/core/root.ts
+++ b/src/core/root.ts
@@ -138,7 +138,7 @@ function getWorkspace(filePath?: string): vscode.Uri | undefined {
     }
     // If provided with a filePath, check its workspace
     if (filePath !== undefined) {
-        return (vscode.workspace.getWorkspaceFolder(lw.file.getUri(filePath)) ?? firstWorkspace).uri
+        return (vscode.workspace.getWorkspaceFolder(lw.file.toUri(filePath)) ?? firstWorkspace).uri
     }
     // If we don't have an active text editor, we can only make a guess.
     // Let's guess the first one.
diff --git a/src/core/watcher.ts b/src/core/watcher.ts
index 8ac82f4c5..82a25b171 100644
--- a/src/core/watcher.ts
+++ b/src/core/watcher.ts
@@ -139,7 +139,7 @@ class Watcher {
     private async initiatePolling(uri: vscode.Uri): Promise<void> {
         const filePath = uri.fsPath
         const firstChangeTime = Date.now()
-        const size = (await lw.external.stat(lw.file.getUri(filePath))).size
+        const size = (await lw.external.stat(lw.file.toUri(filePath))).size
 
         this.polling[filePath] = { size, time: firstChangeTime }
 
@@ -170,7 +170,7 @@ class Watcher {
             return
         }
 
-        const currentSize = (await lw.external.stat(lw.file.getUri(filePath))).size
+        const currentSize = (await lw.external.stat(lw.file.toUri(filePath))).size
 
         if (currentSize !== size) {
             this.polling[filePath].size = currentSize
diff --git a/src/extras/cleaner.ts b/src/extras/cleaner.ts
index a23698601..45ee32501 100644
--- a/src/extras/cleaner.ts
+++ b/src/extras/cleaner.ts
@@ -45,7 +45,7 @@ async function clean(rootFile?: string): Promise<void> {
             return
         }
     }
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
     const cleanMethod = configuration.get('latex.clean.method') as string
     switch (cleanMethod) {
         case 'glob':
@@ -102,7 +102,7 @@ function splitGlobs(globs: string[]): { fileOrFolderGlobs: string[], folderGlobs
  * intentionally by the user. Otherwise, the folders will be ignored.
  */
 async function cleanGlob(rootFile: string): Promise<void> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
     const globPrefix = (configuration.get('latex.clean.subfolder.enabled') as boolean) ? './**/' : ''
     const globs = (configuration.get('latex.clean.fileTypes') as string[])
         .map(globType => globPrefix + replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath)(globType))
@@ -149,7 +149,7 @@ async function cleanGlob(rootFile: string): Promise<void> {
 }
 
 function cleanCommand(rootFile: string): Promise<void> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
     const command = configuration.get('latex.clean.command') as string
     const args = (configuration.get('latex.clean.args') as string[])
         .map(arg => { return replaceArgumentPlaceholders(rootFile, lw.file.tmpDirPath)(arg)
diff --git a/src/extras/index.ts b/src/extras/index.ts
index db426ee75..12c6962a1 100644
--- a/src/extras/index.ts
+++ b/src/extras/index.ts
@@ -5,6 +5,7 @@ import { texroot } from './texroot'
 import { section } from './section'
 import * as commands from './activity-bar'
 import * as snippet from './snippet-view'
+import * as liveshare from './liveshare'
 
 export const extra = {
     count,
@@ -13,5 +14,6 @@ export const extra = {
     texroot,
     section,
     commands,
-    snippet
+    snippet,
+    liveshare
 }
diff --git a/src/extras/liveshare.ts b/src/extras/liveshare.ts
index a85130fc2..acdd4951b 100644
--- a/src/extras/liveshare.ts
+++ b/src/extras/liveshare.ts
@@ -1,86 +1,369 @@
 import * as vsls from 'vsls/vscode'
 import * as vscode from 'vscode'
-import { lw } from '../lw'
 import * as url from 'url'
-import * as utils from '../utils/utils'
+import http from 'http'
+import ws from 'ws'
+import { lw } from '../lw'
+import type { ClientRequest, ServerResponse } from '../../types/latex-workshop-protocol-types'
+import type { Client } from '../preview/viewer/client'
+import { getClients } from '../preview/viewer/pdfviewermanager'
 
-export class LiveShare {
-    private role: vsls.Role = vsls.Role.None
-    private hostServerPort: number | undefined | null
-    private shareServerDisposable: vscode.Disposable | undefined
+const logger = lw.log('LiveShare')
 
-    liveshare: vsls.LiveShare | undefined | null
+export {
+    getApi,
+    getHostServerPort,
+    isGuest,
+    isHost,
+    handle,
+    register,
+    shareServer
+}
 
-    constructor() {
-        void this.init()
+const handle = {
+    command: {
+        syncTeX: handleCommandSyncTeX
+    },
+    viewer: {
+        refresh: handleViewerRefresh,
+        reverseSyncTeX: handleViewerReverseSyncTeX,
+        syncTeX: handleViewerSyncTeX
+    },
+    server: {
+        request: handleServerRequest
     }
+}
 
-    private async init() {
-        this.liveshare = await vsls.getApi()
-        if (!this.liveshare) {
-            return
+const state: {
+    initialized: Promise<void>,
+    liveshare: vsls.LiveShare | undefined,
+    role: vsls.Role,
+    hostServerPort: number | undefined,
+    shareServerDisposable: vscode.Disposable | undefined,
+    connected: boolean,
+    ws: ws.WebSocket | undefined
+} = {
+    initialized: new Promise<void>(resolve =>
+        vsls.getApi().then(api => {
+            if (api === null) {
+                resolve()
+                return
+            }
+            setRole(api.session.role)
+            state.liveshare = api
+            state.liveshare.onDidChangeSession(e => setRole(e.session.role))
+            resolve()
+        })
+    ),
+    liveshare: undefined,
+    role: vsls.Role.None,
+    hostServerPort: undefined,
+    shareServerDisposable: undefined,
+    connected: false,
+    ws: undefined
+}
+
+function isGuest() {
+    return state.role === vsls.Role.Guest
+}
+
+function isHost() {
+    return state.role === vsls.Role.Host
+}
+
+function getApi() {
+    return state.liveshare
+}
+
+function setRole(role: vsls.Role) {
+    state.role = role
+    state.hostServerPort = undefined
+    state.shareServerDisposable?.dispose()
+    resetConnection()
+    if (role === vsls.Role.Guest) {
+        void initGuest()
+    } else if (role === vsls.Role.Host) {
+        void initHost()
+    }
+}
+
+async function initGuest() {
+    await getHostServerPort()
+    await connectHost()
+}
+
+async function initHost() {
+    await shareServer()
+}
+
+async function getHostServerPort(reset: boolean = false): Promise<number> {
+    if (!reset && state.hostServerPort !== undefined) {
+        return state.hostServerPort
+    }
+    const savedClipboard = await vscode.env.clipboard.readText()
+    void vscode.commands.executeCommand('liveshare.listServers')
+    // delay here instead of doing await vscode.commands.executeCommand acquires the port more reliably because await vscode.commands.executeCommand does not return until the user closes the info box of the command or clicks copy again.
+    await sleep(500)
+    const hostUrl = await vscode.env.clipboard.readText()
+    const hostServerPort = Number(url.parse(hostUrl).port)
+    state.hostServerPort = hostServerPort
+    await vscode.env.clipboard.writeText(savedClipboard)
+    return hostServerPort
+}
+
+async function shareServer() {
+    if (state.role !== vsls.Role.Host) {
+        return
+    }
+    state.shareServerDisposable?.dispose()
+    await state.initialized
+    state.shareServerDisposable = await state.liveshare?.shareServer({ port: lw.server.getPort(), displayName: 'latex-workshop-server' })
+}
+
+
+async function connectHost() {
+    logger.log('Connecting to host')
+    if (state.role !== vsls.Role.Guest) {
+        resetConnection()
+        return
+    }
+
+    if (state.connected) {
+        logger.log('Already connected to host.')
+        return
+    }
+
+    const server = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${await getHostServerPort()}`, true))
+
+    await new Promise<void>(resolve => {
+        const websocket = new ws.WebSocket(server.toString(true))
+        websocket.addEventListener('open', () => {
+            logger.log('Connected to host')
+            state.ws = websocket
+            state.connected = true
+            resolve()
+        })
+    })
+    state.ws?.addEventListener('message', event => {
+        if (event.type === 'message') {
+            connectionHandler(event.data as string)
+        }
+    })
+    state.ws?.addEventListener('close', async () => {
+        logger.log('Connection to host disconnected')
+        state.connected = false
+        await reconnect()
+    })
+    state.ws?.addEventListener('error', err => logger.logError(`Failed to connect to ${server}`, err))
+
+    const id = setInterval(() => {
+        try {
+            sendToHost({ type: 'ping' })
+        }
+        catch {
+            clearInterval(id)
+        }
+    }, 30000)
+}
+
+function resetConnection() {
+    logger.log('Reset connection to host')
+    state.connected = false
+    state.ws = undefined
+}
+
+function connectionHandler(msg: string): void {
+    const data = JSON.parse(msg) as ServerResponse
+    logger.log(`Handle data type: ${data.type}`)
+
+    switch (data.type) {
+        case 'refresh': {
+            lw.viewer.refresh(vscode.Uri.parse(data.pdfFileUri).fsPath)
+            break
+        }
+        case 'reverse_synctex_result': {
+            void lw.locate.synctex.openTeX(vscode.Uri.parse(data.input).fsPath, data.line, data.column, data.textBeforeSelection, data.textAfterSelection)
+            break
+        }
+        case 'synctex_result': {
+            void lw.viewer.locate(vscode.Uri.parse(data.pdfFile, true).fsPath, data.synctexData)
+            break
+        }
+        default: {
+            break
         }
-        this.sessionRole = this.liveshare.session.role
-        this.liveshare.onDidChangeSession(e => this.sessionRole = e.session.role, null)
     }
+}
 
-    private set sessionRole(role: vsls.Role) {
-        this.reset(role)
-        if (this.role === vsls.Role.Guest) {
-            void this.initGuest()
-        } else if (this.role === vsls.Role.Host) {
-            void this.initHost()
+async function reconnect() {
+    // Since WebSockets are disconnected when PC resumes from sleep,
+    // we have to reconnect. https://github.com/James-Yu/LaTeX-Workshop/pull/1812
+    await sleep(3000)
+
+    let tries = 1
+    while (tries <= 10) {
+        try {
+            await connectHost()
+            register()
+            if (state.ws?.readyState !== 1) {
+                throw new Error('Connection to host is not open.')
+            }
+            return
+        } catch (e) {
         }
+
+        await sleep(1000 * (tries + 2))
+        tries++
+    }
+}
+
+function register(client?: Client) {
+    if (client) {
+        sendToHost({ type: 'open', pdfFileUri: client.pdfFileUri, viewer: client.viewer })
     }
 
-    private reset(role: vsls.Role) {
-        this.role = role
-        this.hostServerPort = null
-        this.shareServerDisposable?.dispose()
-        lw.hostConnection.resetConnectionToHost()
+    getClients()?.forEach(guestClient => {
+        sendToHost({ type: 'open', pdfFileUri: guestClient.pdfFileUri, viewer: guestClient.viewer })
+    })
+}
+
+function sendToHost(message: ClientRequest) {
+    logger.log(`Sends message ${JSON.stringify(message)} to host`)
+    if (state.role !== vsls.Role.Guest) {
+        return
     }
 
-    get isGuest(): boolean {
-        return this.role === vsls.Role.Guest
+    if (state.ws?.readyState === 1) {
+        state.ws.send(JSON.stringify(message))
     }
+}
 
-    get isHost(): boolean {
-        return this.role === vsls.Role.Host
+function handleCommandSyncTeX(): boolean {
+    if (!isGuest()) {
+        return false
     }
+    const coords = lw.locate.synctex.getCurrentEditorCoordinates()
 
-    private async initGuest() {
-        await this.getHostServerPort()
-        await lw.hostConnection.connectToHostWs()
+    if (lw.root.file.path === undefined || coords === undefined) {
+        logger.log('Cannot find LaTeX root PDF to perform synctex.')
+        return true
     }
 
-    public async getHostServerPort(reset: boolean = false): Promise<number> {
-        if (!reset && this.hostServerPort !== undefined && this.hostServerPort !== null) {
-            return this.hostServerPort
+    const pdfFileUri = lw.file.toUri(lw.file.getPdfPath(lw.root.file.path))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.root.getWorkspace())
+    const indicator = configuration.get('synctex.indicator') as 'none' | 'circle' | 'rectangle'
+    sendToHost({type: 'synctex', line: coords.line, column: coords.column, filePath: coords.inputFileUri.toString(true), targetPdfFile: pdfFileUri.toString(true), indicator})
+    return true
+}
+
+function handleViewerRefresh(pdfFile?: string, clientSet?: Set<Client>) {
+    if (isHost() && state.liveshare && pdfFile !== undefined) {
+        const sharedUri = state.liveshare.convertLocalUriToShared(lw.file.toUri(pdfFile))
+        const guestClients = getClients(sharedUri)
+        if (guestClients) {
+            clientSet?.forEach(client => guestClients.add(client))
+            return guestClients
         }
-        else {
-            const savedClipboard = await vscode.env.clipboard.readText()
-            void vscode.commands.executeCommand('liveshare.listServers')
-            // delay here instead of doing await vscode.commands.executeCommand acquires the port more reliably because await vscode.commands.executeCommand does not return until the user closes the info box of the command or clicks copy again.
-            await utils.delay(500)
-            const hostUrl = await vscode.env.clipboard.readText()
-            const hostServerPort = Number(url.parse(hostUrl).port)
-            this.hostServerPort = hostServerPort
-            await vscode.env.clipboard.writeText(savedClipboard)
-            return hostServerPort
+    }
+    return clientSet
+}
+
+function handleViewerReverseSyncTeX(websocket: ws, uri: vscode.Uri, data: Extract<ClientRequest, {type: 'reverse_synctex'}>): boolean {
+    if (isGuest()) {
+        state.ws?.send(JSON.stringify(data)) // forward the request to host
+        return true
+    } else if (isHost() && uri.scheme === 'vsls' && state.liveshare) { // reply to guest if request comes from guest
+        const localUri = state.liveshare.convertSharedUriToLocal(uri) ?? uri
+        const record = lw.locate.synctex.computeToTeX(data, localUri.fsPath)
+        if (record) {
+            const response: ServerResponse = {
+                type: 'reverse_synctex_result',
+                input: state.liveshare.convertLocalUriToShared(vscode.Uri.file(record.input)).toString(true),
+                line: record.line,
+                column: record.column,
+                textBeforeSelection: data.textAfterSelection,
+                textAfterSelection: data.textAfterSelection
+            }
+            websocket.send(JSON.stringify(response))
         }
+        return true
+    }
+    return false
+}
+
+function handleViewerSyncTeX(websocket: ws, data: ClientRequest): boolean {
+    if (data.type !== 'synctex') {
+        return false
+    }
+    if (!isHost() || !state.liveshare) {
+        return true
     }
 
-    public async shareServer() {
-        if (!this.isHost) {
+    const filePath = state.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.filePath, true)).fsPath
+    const targetPdfFile = state.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.targetPdfFile, true)).fsPath
+    void lw.locate.synctex.synctexToPDFCombined(data.line, data.column, filePath, targetPdfFile, data.indicator).then(record => {
+        if (!record) {
+            logger.log(`Failed to locate synctex for ${filePath}. This was requested from a guest.`)
             return
         }
-        if (this.shareServerDisposable !== null) {
-            this.shareServerDisposable?.dispose()
+
+        const response: ServerResponse = {
+            type: 'synctex_result',
+            pdfFile: data.targetPdfFile,
+            synctexData: record
         }
-        this.shareServerDisposable = await this.liveshare?.shareServer({ port: lw.server.getLocalPort(), displayName: 'latex-workshop-server' })
+
+        websocket.send(JSON.stringify(response))
+    })
+    return true
+}
+
+async function handleServerRequest(request: http.IncomingMessage, response: http.ServerResponse): Promise<boolean> {
+    if (!isGuest()) {
+        return false
     }
 
-    private async initHost() {
-        await this.shareServer()
+    if (!request.url) {
+        return true
+    }
+
+    const requestUrl = url.parse(request.url)
+
+    const options = {
+        host: requestUrl.hostname,
+        port: await getHostServerPort(),
+        path: requestUrl.path,
+        method: request.method,
+        headers: request.headers,
     }
+
+    const backendReq = http.request(options, (backendRes) => {
+        if (!backendRes.statusCode) {
+            response.end()
+            return
+        }
+        response.writeHead(backendRes.statusCode, backendRes.headers)
+
+        backendRes.on('data', (chunk) => {
+            response.write(chunk)
+        })
+
+        backendRes.on('end', () => {
+            response.end()
+        })
+    })
+
+    request.on('data', (chunk) => {
+        backendReq.write(chunk)
+    })
+
+    request.on('end', () => {
+        backendReq.end()
+    })
+
+    return true
+}
+
+async function sleep(timeout: number) {
+    await new Promise((resolve) => setTimeout(resolve, timeout))
 }
diff --git a/src/language/definition.ts b/src/language/definition.ts
index 1c8a4a1cc..4dfa96e31 100644
--- a/src/language/definition.ts
+++ b/src/language/definition.ts
@@ -58,15 +58,15 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
         }
         const ref = lw.completion.reference.getItem(token)
         if (ref) {
-            return new vscode.Location(lw.file.getUri(ref.file), ref.position)
+            return new vscode.Location(lw.file.toUri(ref.file), ref.position)
         }
         const cite = lw.completion.citation.getItem(token)
         if (cite) {
-            return new vscode.Location(lw.file.getUri(cite.file), cite.position)
+            return new vscode.Location(lw.file.toUri(cite.file), cite.position)
         }
         const glossary = lw.completion.glossary.getItem(token)
         if (glossary) {
-            return new vscode.Location(lw.file.getUri(glossary.filePath), glossary.position)
+            return new vscode.Location(lw.file.toUri(glossary.filePath), glossary.position)
         }
         if (vscode.window.activeTextEditor && token.includes('.')) {
             // We skip graphics files
@@ -77,13 +77,13 @@ export class DefinitionProvider implements vscode.DefinitionProvider {
             }
             const absolutePath = path.resolve(path.dirname(vscode.window.activeTextEditor.document.fileName), token)
             if (fs.existsSync(absolutePath)) {
-                return new vscode.Location( lw.file.getUri(absolutePath), new vscode.Position(0, 0) )
+                return new vscode.Location( lw.file.toUri(absolutePath), new vscode.Position(0, 0) )
             }
         }
 
         const filename = this.onAFilename(document, position, token)
         if (filename) {
-            return new vscode.Location( lw.file.getUri(filename), new vscode.Position(0, 0) )
+            return new vscode.Location( lw.file.toUri(filename), new vscode.Position(0, 0) )
         }
         return
     }
diff --git a/src/language/symbol-project.ts b/src/language/symbol-project.ts
index 1f3f1f3bf..a0b355384 100644
--- a/src/language/symbol-project.ts
+++ b/src/language/symbol-project.ts
@@ -16,7 +16,7 @@ export class ProjectSymbolProvider implements vscode.WorkspaceSymbolProvider {
     private sectionToSymbols(sections: TeXElement[], containerName: string = 'Document'): vscode.SymbolInformation[] {
         let symbols: vscode.SymbolInformation[] = []
         sections.forEach(section => {
-            const location = new vscode.Location(lw.file.getUri(section.filePath), new vscode.Range(section.lineFr, 0, section.lineTo, 65535))
+            const location = new vscode.Location(lw.file.toUri(section.filePath), new vscode.Range(section.lineFr, 0, section.lineTo, 65535))
             symbols.push(new vscode.SymbolInformation(section.label, vscode.SymbolKind.String, containerName, location))
             if (section.children.length > 0) {
                 symbols = [...symbols, ...this.sectionToSymbols(section.children, section.label)]
diff --git a/src/lint/duplicate-label.ts b/src/lint/duplicate-label.ts
index 76d73186b..d505aa92e 100644
--- a/src/lint/duplicate-label.ts
+++ b/src/lint/duplicate-label.ts
@@ -79,7 +79,7 @@ function showDiagnostics(duplicates: string[]) {
 
     for (const file in diagsCollection) {
         if (path.extname(file) === '.tex') {
-            duplicatedLabelsDiagnostics.set(lw.file.getUri(file), diagsCollection[file])
+            duplicatedLabelsDiagnostics.set(lw.file.toUri(file), diagsCollection[file])
         }
     }
 }
diff --git a/src/lint/latex-linter/chktex.ts b/src/lint/latex-linter/chktex.ts
index d535ed173..20007dfd3 100644
--- a/src/lint/latex-linter/chktex.ts
+++ b/src/lint/latex-linter/chktex.ts
@@ -24,7 +24,7 @@ let linterProcess: ChildProcessWithoutNullStreams | undefined
 async function lintRootFile(rootPath: string) {
     const requiredArgs = ['-f%f:%l:%c:%d:%k:%n:%m\n', rootPath]
 
-    const stdout = await chktexWrapper('root', lw.file.getUri(rootPath), rootPath, requiredArgs, undefined)
+    const stdout = await chktexWrapper('root', lw.file.toUri(rootPath), rootPath, requiredArgs, undefined)
     if (stdout === undefined) { // It's possible to have empty string as output
         return
     }
@@ -131,7 +131,7 @@ function globalRcPath(): string | undefined {
 }
 
 function getChktexrcTabSize(file: string): number | undefined {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(file))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(file))
     const args = configuration.get('linting.chktex.exec.args') as string[]
     let filePath: string | undefined
     if (args.includes('-l')) {
@@ -197,7 +197,7 @@ function parseLog(log: string, singleFileOriginalPath?: string, tabSizeArg?: num
     } else if (linterLog.length === 0) {
         // We are linting a single file and the new log is empty for it -
         // clean existing records.
-        chkTeX.linterDiagnostics.set(lw.file.getUri(singleFileOriginalPath), [])
+        chkTeX.linterDiagnostics.set(lw.file.toUri(singleFileOriginalPath), [])
     }
     showLinterDiagnostics(linterLog)
 }
@@ -279,7 +279,7 @@ function showLinterDiagnostics(linterLog: ChkTeXLogEntry[]) {
                     file1 = f
                 }
             }
-            chkTeX.linterDiagnostics.set(lw.file.getUri(file1), diagsCollection[file])
+            chkTeX.linterDiagnostics.set(lw.file.toUri(file1), diagsCollection[file])
         }
     }
 }
diff --git a/src/lint/latex-linter/lacheck.ts b/src/lint/latex-linter/lacheck.ts
index f8950e15d..3ab2630de 100644
--- a/src/lint/latex-linter/lacheck.ts
+++ b/src/lint/latex-linter/lacheck.ts
@@ -21,7 +21,7 @@ export const laCheck: LaTeXLinter = {
 let linterProcess: ChildProcessWithoutNullStreams | undefined
 
 async function lintRootFile(rootPath: string) {
-    const stdout = await lacheckWrapper('root', lw.file.getUri(rootPath), rootPath, undefined)
+    const stdout = await lacheckWrapper('root', lw.file.toUri(rootPath), rootPath, undefined)
     if (stdout === undefined) { // It's possible to have empty string as output
         return
     }
@@ -130,7 +130,7 @@ function showLinterDiagnostics(linterLog: LaCheckLogEntry[]) {
                     file1 = f
                 }
             }
-            laCheck.linterDiagnostics.set(lw.file.getUri(file1), diagsCollection[file])
+            laCheck.linterDiagnostics.set(lw.file.toUri(file1), diagsCollection[file])
         }
     }
 }
diff --git a/src/locate/synctex.ts b/src/locate/synctex.ts
index 0006d99ad..47e557ca0 100644
--- a/src/locate/synctex.ts
+++ b/src/locate/synctex.ts
@@ -261,8 +261,8 @@ function toPDF(args?: {line: number, filePath: string}, forcedViewer: 'auto' | '
         filePath = args.filePath
     }
 
-    const rootFile = lw.file.getUri(lw.root.file.path).fsPath
-    const targetPdfFile = pdfFile ?? lw.file.getUri(lw.file.getPdfPath(lw.root.file.path)).fsPath
+    const rootFile = lw.file.toUri(lw.root.file.path).fsPath
+    const targetPdfFile = pdfFile ?? lw.file.toUri(lw.file.getPdfPath(lw.root.file.path)).fsPath
 
     const configuration = vscode.workspace.getConfiguration('latex-workshop')
     if (forcedViewer === 'external' || (forcedViewer === 'auto' && configuration.get('view.pdf.viewer') === 'external') ) {
@@ -503,7 +503,7 @@ function computeToTeX(data: Extract<ClientRequest, {type: 'reverse_synctex'}>, p
 
 async function openTeX(input: string, line: number, column: number, textBeforeSelection: string, textAfterSelection: string) {
     const filePath = path.resolve(input)
-    const uri = lw.file.getUri(input)
+    const uri = lw.file.toUri(input)
     try {
         await vscode.workspace.fs.stat(uri)
     } catch (e) {
diff --git a/src/lw.ts b/src/lw.ts
index b4c92ac6e..aa690ed3e 100644
--- a/src/lw.ts
+++ b/src/lw.ts
@@ -7,7 +7,7 @@ import type { watcher } from './core/watcher'
 import type { cache } from './core/cache'
 import type { root } from './core/root'
 import type { compile } from './compile'
-import type { preview, server, viewer, hostConnection } from './preview'
+import type { preview, server, viewer } from './preview'
 import type { locate } from './locate'
 import type { completion } from './completion'
 import type { language } from './language'
@@ -17,7 +17,6 @@ import type { parser } from './parse'
 import type { extra } from './extras'
 
 import type * as commands from './core/commands'
-import { LiveShare } from './extras/liveshare'
 
 const wrapper = <T extends Array<any>, U>(fn: (...args: T) => U) => {
     return (...args: T): U => fn(...args)
@@ -44,8 +43,6 @@ export const lw = {
     lint: {} as typeof lint,
     outline: {} as typeof outline,
     extra: {} as typeof extra,
-    liveshare: {} as LiveShare,
-    hostConnection: {} as typeof hostConnection,
     commands: Object.create(null) as typeof commands,
     external: {
         spawn: wrapper(cs.spawn),
diff --git a/src/main.ts b/src/main.ts
index 99c0db04c..2c0d127cd 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -39,10 +39,6 @@ import { extra } from './extras'
 lw.extra = extra
 import * as commander from './core/commands'
 lw.commands = commander
-import { LiveShare } from './extras/liveshare'
-lw.liveshare = new LiveShare()
-import { hostConnection } from './preview'
-lw.hostConnection = hostConnection
 
 log.initStatusBarItem()
 
@@ -160,8 +156,7 @@ export function activate(extensionContext: vscode.ExtensionContext) {
 
 function registerLatexWorkshopCommands(extensionContext: vscode.ExtensionContext) {
     extensionContext.subscriptions.push(
-        vscode.commands.registerCommand('latex-workshop.acquireHostPort', () => lw.commands.acquireHostPort()),
-        vscode.commands.registerCommand('latex-workshop.shareHostPort', () => lw.commands.shareHostPort()),
+        vscode.commands.registerCommand('latex-workshop.hostPort', () => lw.commands.hostPort()),
         vscode.commands.registerCommand('latex-workshop.saveWithoutBuilding', () => lw.commands.saveActive()),
         vscode.commands.registerCommand('latex-workshop.build', () => lw.commands.build()),
         vscode.commands.registerCommand('latex-workshop.recipes', (recipe: string | undefined) => lw.commands.recipes(recipe)),
diff --git a/src/outline/structure/bibtex.ts b/src/outline/structure/bibtex.ts
index 1a0a36faf..292d20e19 100644
--- a/src/outline/structure/bibtex.ts
+++ b/src/outline/structure/bibtex.ts
@@ -22,7 +22,7 @@ function fieldValueToString(field: bibtexParser.FieldValue, abbreviations: {[abb
 }
 
 export async function buildBibTeX(document: vscode.TextDocument): Promise<TeXElement[]> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(document.fileName))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(document.fileName))
     if (document.getText().length >= (configuration.get('bibtex.maxFileSize') as number) * 1024 * 1024) {
         logger.log(`Bib file is too large, ignoring it: ${document.fileName}`)
         return []
diff --git a/src/parse/parser/parserutils.ts b/src/parse/parser/parserutils.ts
index fd71ce8f0..5f1b9c9ae 100644
--- a/src/parse/parser/parserutils.ts
+++ b/src/parse/parser/parserutils.ts
@@ -74,6 +74,6 @@ export function showCompilerDiagnostics(diagnostics: vscode.DiagnosticCollection
                 file1 = f
             }
         }
-        diagnostics.set(lw.file.getUri(file1), diagsCollection[file])
+        diagnostics.set(lw.file.toUri(file1), diagsCollection[file])
     }
 }
diff --git a/src/preview/host-connection.ts b/src/preview/host-connection.ts
deleted file mode 100644
index bbf07f695..000000000
--- a/src/preview/host-connection.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import * as vscode from 'vscode'
-import { WebSocket } from 'ws'
-import { lw } from '../lw'
-import * as utils from '../utils/utils'
-import { ClientRequest, ServerResponse } from '../../types/latex-workshop-protocol-types/index'
-import * as manager from './viewer/pdfviewermanager'
-import { Client } from './viewer/client'
-
-const logger = lw.log('HostConnection')
-
-export {
-    hostConnectionHandler,
-    connectToHostWs,
-    resetConnectionToHost,
-    registerWithHost,
-    send
-}
-
-export let wsToHost: Promise<WebSocket> | undefined
-export let initialized: boolean = false
-
-function hostConnectionHandler(_: WebSocket, msg: string): void {
-    const data = JSON.parse(msg) as ServerResponse
-    logger.log(`Handle data type: ${data.type}`)
-
-    switch (data.type) {
-        case 'refresh': {
-            lw.viewer.refresh(vscode.Uri.parse(data.pdfFileUri).fsPath)
-            break
-        }
-        case 'reverse_synctex_result': {
-            void lw.locate.synctex.openTeX(vscode.Uri.parse(data.input).fsPath, data.line, data.column, data.textBeforeSelection, data.textAfterSelection)
-            break
-        }
-        case 'synctex_result': {
-            void lw.viewer.locate(vscode.Uri.parse(data.pdfFile, true).fsPath, data.synctexData)
-            break
-        }
-        default: {
-            break
-        }
-    }
-}
-
-async function connectToHostWs() {
-    logger.log('Connecting to host')
-    if (!lw.liveshare.isGuest) {
-        resetConnectionToHost()
-        return
-    }
-
-    if (initialized) {
-        logger.log('Already connected to host.')
-        return
-    }
-
-    const server = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${await lw.liveshare.getHostServerPort()}`, true))
-
-    wsToHost = new Promise((resolve, reject) => {
-        const ws = new WebSocket(server.toString(true))
-        ws.addEventListener('open', () => {
-            logger.log('Connected to host')
-            initialized = true
-            resolve(ws)
-        })
-        ws.addEventListener('error', () => reject(new Error(`Failed to connect to ${server}`)))
-    })
-
-    void wsToHost.then((ws: WebSocket) => {
-        ws.addEventListener('message', (event) => {
-            if (event.type === 'message') {
-                hostConnectionHandler(ws, event.data as string)
-            }
-        })
-        ws.addEventListener('close', async () => {
-            logger.log('Connection to host disconnected')
-            initialized = false
-            await reconnectToHostWs()
-        })
-    })
-
-    const id = setInterval(async () => {
-        try {
-            await send({ type: 'ping' })
-        }
-        catch {
-            clearInterval(id)
-        }
-    }, 30000)
-}
-
-function registerWithHost(client?: Client) {
-    if (client) {
-        void send({ type: 'open', pdfFileUri: client.pdfFileUri, viewer: client.viewer })
-    }
-
-    manager.getClients()?.forEach(cl => {
-        void send({ type: 'open', pdfFileUri: cl.pdfFileUri, viewer: cl.viewer })
-    })
-}
-
-async function reconnectToHostWs() {
-    // Since WebSockets are disconnected when PC resumes from sleep,
-    // we have to reconnect. https://github.com/James-Yu/LaTeX-Workshop/pull/1812
-    await utils.delay(3000)
-
-    let tries = 1
-    while (tries <= 10) {
-        try {
-            await connectToHostWs()
-            registerWithHost()
-            const ws = await wsToHost
-            if (ws?.readyState !== 1) {
-                throw new Error('Connection to host is not open.')
-            }
-            return
-        } catch (e) {
-        }
-
-        await utils.delay(1000 * (tries + 2))
-        tries++
-    }
-}
-
-function resetConnectionToHost() {
-    logger.log('Reset connection to host')
-    initialized = false
-    lw.hostConnection.wsToHost = undefined
-}
-
-async function send(message: ClientRequest) {
-    logger.log(`Sends message ${JSON.stringify(message)} to host`)
-    if (!lw.liveshare.isGuest) {
-        return
-    }
-
-    const ws = await wsToHost
-    if (ws?.readyState === 1) {
-        ws.send(JSON.stringify(message))
-    }
-}
diff --git a/src/preview/hover/ongraphics.ts b/src/preview/hover/ongraphics.ts
index 8312c6ee0..e4705f319 100644
--- a/src/preview/hover/ongraphics.ts
+++ b/src/preview/hover/ongraphics.ts
@@ -57,7 +57,7 @@ export async function graph2md(filePath: string, opts: { height: number, width:
             return md
         } else {
             let msg = '$(error) Failed to render.'
-            if (!vscode.workspace.getWorkspaceFolder(lw.file.getUri(filePath))) {
+            if (!vscode.workspace.getWorkspaceFolder(lw.file.toUri(filePath))) {
                 msg = '$(warning) Cannot render a PDF file not in workspaces.'
             } else if (lw.extra.snippet.state.view?.webview === undefined) {
                 msg = '$(info) Please activate the LaTeX Workshop activity bar item to render PDF thumbnails.'
@@ -73,19 +73,19 @@ async function renderPdfFileAsDataUrl(pdfFilePath: string, opts: { height: numbe
         const maxDataUrlLength = 99980
         let scale = 1.5
         let newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        let dataUrl = await lw.extra.snippet.render(lw.file.getUri(pdfFilePath), newOpts)
+        let dataUrl = await lw.extra.snippet.render(lw.file.toUri(pdfFilePath), newOpts)
         if (!dataUrl || dataUrl.length < maxDataUrlLength) {
             return dataUrl
         }
         scale = 1
         newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        dataUrl = await lw.extra.snippet.render(lw.file.getUri(pdfFilePath), newOpts)
+        dataUrl = await lw.extra.snippet.render(lw.file.toUri(pdfFilePath), newOpts)
         if (!dataUrl || dataUrl.length < maxDataUrlLength) {
             return dataUrl
         }
         scale = Math.sqrt(maxDataUrlLength/dataUrl.length) / 1.2
         newOpts = { height: opts.height * scale , width: opts.width * scale, pageNumber: opts.pageNumber }
-        dataUrl = await lw.extra.snippet.render(lw.file.getUri(pdfFilePath), newOpts)
+        dataUrl = await lw.extra.snippet.render(lw.file.toUri(pdfFilePath), newOpts)
         if (dataUrl && dataUrl.length >= maxDataUrlLength) {
             logger.log(`Data URL still too large: ${pdfFilePath}`)
             return
diff --git a/src/preview/index.ts b/src/preview/index.ts
index d6aaebb27..45d49cdae 100644
--- a/src/preview/index.ts
+++ b/src/preview/index.ts
@@ -4,7 +4,6 @@ import * as mathpreview from './math-preview-panel'
 
 export * as viewer from './viewer'
 export * as server from './server'
-export * as hostConnection from './host-connection'
 
 export const preview = {
     graph2md,
diff --git a/src/preview/math-preview-panel.ts b/src/preview/math-preview-panel.ts
index c194ef91b..27ce59a64 100644
--- a/src/preview/math-preview-panel.ts
+++ b/src/preview/math-preview-panel.ts
@@ -23,7 +23,7 @@ type UpdateEvent = {
 
 function resourcesFolder(extensionRoot: string) {
     const folder = path.join(extensionRoot, 'resources', 'mathpreviewpanel')
-    return lw.file.getUri(folder)
+    return lw.file.toUri(folder)
 }
 
 class MathPreviewPanelSerializer implements vscode.WebviewPanelSerializer {
@@ -157,7 +157,7 @@ function getHtml() {
                 padding-left: 50px;
             }
         </style>
-        <script src='http://127.0.0.1:${(lw.server.getLocalPort()).toString()}/mathpreviewpanel/mathpreview.js' defer></script>
+        <script src='http://127.0.0.1:${(lw.server.getPort()).toString()}/mathpreviewpanel/mathpreview.js' defer></script>
     </head>
     <body>
         <div id="mathBlock"><img src="" id="math" /></div>
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 1d0e2ff54..fe5812801 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -1,6 +1,5 @@
 import * as vscode from 'vscode'
 import * as http from 'http'
-import * as URL from 'url'
 import type { AddressInfo } from 'net'
 import ws from 'ws'
 import * as fs from 'fs'
@@ -10,8 +9,7 @@ import { lw } from '../lw'
 const logger = lw.log('Server')
 
 export {
-    getHostPort,
-    getLocalPort,
+    getPort,
     getUrl,
     setHandler,
     initialize,
@@ -67,15 +65,7 @@ const state: {
 
 lw.onDispose({ dispose: () => state.httpServer.close() })
 
-async function getHostPort(): Promise<number> {
-    if (lw.liveshare.isGuest) {
-        const portNum = await lw.liveshare.getHostServerPort()
-        return portNum
-    }
-    return getLocalPort()
-}
-
-function getLocalPort(): number {
+function getPort(): number {
     const portNum = state.address?.port
     if (portNum === undefined) {
         logger.log('Server port number is undefined.')
@@ -86,7 +76,7 @@ function getLocalPort(): number {
 
 async function getUrl(pdfUri?: vscode.Uri): Promise<{url: string, uri: vscode.Uri}> {
     // viewer/viewer.js automatically requests the file to server.ts, and server.ts decodes the encoded path of PDF file.
-    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${lw.server.getLocalPort()}`, true))
+    const origUrl = await vscode.env.asExternalUri(vscode.Uri.parse(`http://127.0.0.1:${lw.server.getPort()}`, true))
     const url =
         (origUrl.toString().endsWith('/') ? origUrl.toString().slice(0, -1) : origUrl.toString()) +
         (pdfUri ? ('/viewer.html?file=' + encodePathWithPrefix(pdfUri)) : '')
@@ -196,49 +186,8 @@ function sendOkResponse(response: http.ServerResponse, content: Buffer, contentT
     response.end(content)
 }
 
-async function proxyHandler(req: http.IncomingMessage, res: http.ServerResponse) {
-    if (!lw.liveshare.isGuest || !req.url) {
-        return
-    }
-
-    const request = URL.parse(req.url)
-
-    const options = {
-        host: request.hostname,
-        port: await lw.server.getHostPort(),
-        path: request.path,
-        method: req.method,
-        headers: req.headers,
-    }
-
-    const backendReq = http.request(options, (backendRes) => {
-        if (!backendRes.statusCode) {
-            res.end()
-            return
-        }
-        res.writeHead(backendRes.statusCode, backendRes.headers)
-
-        backendRes.on('data', (chunk) => {
-            res.write(chunk)
-        })
-
-        backendRes.on('end', () => {
-            res.end()
-        })
-    })
-
-    req.on('data', (chunk) => {
-        backendReq.write(chunk)
-    })
-
-    req.on('end', () => {
-        backendReq.end()
-    })
-}
-
 async function handler(request: http.IncomingMessage, response: http.ServerResponse) {
-    if (lw.liveshare.isGuest) {
-        await proxyHandler(request, response)
+    if (await lw.extra.liveshare.handle.server.request(request, response)) {
         return
     }
 
@@ -252,9 +201,9 @@ async function handler(request: http.IncomingMessage, response: http.ServerRespo
     if (hasPrefix(request.url) && !request.url.includes('viewer.html')) {
         const s = request.url.replace('/', '')
         let fileUri = decodePathWithPrefix(s)
-        const isVsls = (fileUri.scheme === 'vsls') && (lw.liveshare.isHost)
-        if (isVsls && lw.liveshare.isHost) {
-            fileUri = lw.liveshare.liveshare?.convertSharedUriToLocal(fileUri) ?? fileUri
+        const isVsls = (fileUri.scheme === 'vsls') && (lw.extra.liveshare.isHost())
+        if (isVsls) {
+            fileUri = lw.extra.liveshare.getApi()?.convertSharedUriToLocal(fileUri) ?? fileUri
         }
         if (!lw.viewer.isViewing(fileUri) && !isVsls) {
             logger.log(`Invalid PDF request: ${fileUri.toString(true)}`)
diff --git a/src/preview/viewer.ts b/src/preview/viewer.ts
index 9c2a439e5..31f2edf4d 100644
--- a/src/preview/viewer.ts
+++ b/src/preview/viewer.ts
@@ -8,7 +8,7 @@ import type { SyncTeXRecordToPDF, SyncTeXRecordToPDFAll, ViewerMode } from '../t
 import * as manager from './viewer/pdfviewermanager'
 import { populate } from './viewer/pdfviewerpanel'
 
-import type { ClientRequest, PdfViewerParams, PdfViewerState, ServerResponse } from '../../types/latex-workshop-protocol-types/index'
+import type { ClientRequest, PdfViewerParams, PdfViewerState } from '../../types/latex-workshop-protocol-types/index'
 import { Client } from './viewer/client'
 
 import { moveActiveEditor } from '../utils/webview'
@@ -53,7 +53,7 @@ function reload(): void {
  */
 function refresh(pdfFile?: string): void {
     logger.log(`Call refreshExistingViewer: ${JSON.stringify(pdfFile)} .`)
-    const pdfUri = pdfFile ? lw.file.getUri(pdfFile) : undefined
+    const pdfUri = pdfFile ? lw.file.toUri(pdfFile) : undefined
     if (pdfUri === undefined) {
         manager.getClients()?.forEach(client => {
             client.send({type: 'refresh', pdfFileUri: client.pdfFileUri})
@@ -61,14 +61,7 @@ function refresh(pdfFile?: string): void {
         return
     }
     let clientSet = manager.getClients(pdfUri)
-    if (lw.liveshare.isHost && lw.liveshare.liveshare !== null && pdfFile !== undefined) {
-        const sharedUri = lw.liveshare.liveshare?.convertLocalUriToShared(lw.file.getUri(pdfFile))
-        const guestClients = manager.getClients(sharedUri)
-        if (guestClients) {
-            clientSet?.forEach(client => guestClients.add(client))
-            clientSet = guestClients
-        }
-    }
+    clientSet = lw.extra.liveshare.handle.viewer.refresh(pdfFile, clientSet)
     if (!clientSet) {
         logger.log(`Not found PDF viewers to refresh: ${pdfFile}`)
         return
@@ -80,7 +73,7 @@ function refresh(pdfFile?: string): void {
 }
 
 async function getUrl(pdfFile: string): Promise<string | undefined> {
-    const pdfUri = lw.file.getUri(pdfFile)
+    const pdfUri = lw.file.toUri(pdfFile)
     if (!await lw.file.exists(pdfUri)) {
         logger.log(`Cannot find PDF file ${pdfUri}`)
         logger.refreshStatus('check', 'statusBar.foreground', `Cannot view file PDF file. File not found: ${pdfUri}`, 'warning')
@@ -119,7 +112,7 @@ async function viewInBrowser(pdfFile: string): Promise<void> {
     if (!url) {
         return
     }
-    const pdfUri = lw.file.getUri(pdfFile)
+    const pdfUri = lw.file.toUri(pdfFile)
     manager.create(pdfUri)
     lw.watcher.pdf.add(pdfUri.fsPath)
     try {
@@ -147,7 +140,7 @@ async function viewInTab(pdfFile: string, tabEditorGroup: string, preserveFocus:
     if (!url) {
         return
     }
-    const pdfUri = lw.file.getUri(pdfFile)
+    const pdfUri = lw.file.toUri(pdfFile)
     return viewInWebviewPanel(pdfUri, tabEditorGroup, preserveFocus)
 }
 
@@ -158,7 +151,7 @@ async function viewInCustomEditor(pdfFile: string): Promise<void> {
     }
     const configuration = vscode.workspace.getConfiguration('latex-workshop')
     const editorGroup = configuration.get('view.pdf.tab.editorGroup') as string
-    const pdfUri = lw.file.getUri(pdfFile)
+    const pdfUri = lw.file.toUri(pdfFile)
     const showOptions: vscode.TextDocumentShowOptions = {
         viewColumn: vscode.ViewColumn.Active,
         preserveFocus: true
@@ -282,7 +275,7 @@ function handler(websocket: ws, msg: string): void {
     switch (data.type) {
         case 'open': {
             const pdfUri = vscode.Uri.parse(data.pdfFileUri, true)
-            if (pdfUri.scheme === 'vsls' && lw.liveshare.isHost) {
+            if (pdfUri.scheme === 'vsls' && lw.extra.liveshare.isHost()) {
                 manager.create(pdfUri)
             }
             const clientSet = manager.getClients(pdfUri)
@@ -290,7 +283,7 @@ function handler(websocket: ws, msg: string): void {
                 break
             }
             const client = new Client(data.viewer, websocket, pdfUri.toString(true))
-            lw.hostConnection.registerWithHost(client)
+            lw.extra.liveshare.register(client)
             clientSet.add(client)
             client.onDidDispose(() => {
                 clientSet.delete(client)
@@ -309,51 +302,12 @@ function handler(websocket: ws, msg: string): void {
         }
         case 'reverse_synctex': {
             const uri = vscode.Uri.parse(data.pdfFileUri, true)
-            if (lw.liveshare.isGuest) {
-                void lw.hostConnection.wsToHost?.then(hostWs => hostWs.send(JSON.stringify(data))) // forward the request to host
-                break
-            } else if (lw.liveshare.isHost && uri.scheme === 'vsls' && lw.liveshare.liveshare) { // reply to guest if request comes from guest
-                const localUri = lw.liveshare.liveshare.convertSharedUriToLocal(uri) ?? uri
-                const record = lw.locate.synctex.computeToTeX(data, localUri.fsPath)
-                if (record) {
-                    const response: ServerResponse = {
-                        type: 'reverse_synctex_result',
-                        input: lw.liveshare.liveshare.convertLocalUriToShared(vscode.Uri.file(record.input)).toString(true),
-                        line: record.line,
-                        column: record.column,
-                        textBeforeSelection: data.textAfterSelection,
-                        textAfterSelection: data.textAfterSelection
-                    }
-                    websocket.send(JSON.stringify(response))
-                }
+            if (lw.extra.liveshare.handle.viewer.reverseSyncTeX(websocket, uri, data)) {
                 break
             }
             void lw.locate.synctex.toTeX(data, uri.fsPath)
             break
         }
-        case 'synctex': {
-            if (!lw.liveshare.isHost || !lw.liveshare.liveshare) {
-                return
-            }
-
-            const filePath = lw.liveshare.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.filePath, true)).fsPath
-            const targetPdfFile = lw.liveshare.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.targetPdfFile, true)).fsPath
-            void lw.locate.synctex.synctexToPDFCombined(data.line, data.column, filePath, targetPdfFile, data.indicator).then(record => {
-                if (!record) {
-                    logger.log(`Failed to locate synctex for ${filePath}. This was requested from a guest.`)
-                    return
-                }
-
-                const response: ServerResponse = {
-                    type: 'synctex_result',
-                    pdfFile: data.targetPdfFile,
-                    synctexData: record
-                }
-
-                websocket.send(JSON.stringify(response))
-            })
-            break
-        }
         case 'external_link': {
             void vscode.env.clipboard.writeText(data.url)
             const uri = vscode.Uri.parse(data.url)
@@ -392,6 +346,9 @@ function handler(websocket: ws, msg: string): void {
             break
         }
         default: {
+            if (lw.extra.liveshare.handle.viewer.syncTeX(websocket, data)) {
+                break
+            }
             logger.log(`Unknown websocket message: ${msg}`)
             break
         }
@@ -447,7 +404,7 @@ function getParams(): PdfViewerParams {
  * @param record The position to be revealed.
  */
 async function locate(pdfFile: string, record: SyncTeXRecordToPDF | SyncTeXRecordToPDFAll[]): Promise<void> {
-    const pdfUri = lw.file.getUri(pdfFile)
+    const pdfUri = lw.file.toUri(pdfFile)
     let clientSet = manager.getClients(pdfUri)
     if (clientSet === undefined || clientSet.size === 0) {
         logger.log(`PDF is not opened: ${pdfFile} , try opening.`)
diff --git a/src/preview/viewer/pdfviewerpanel.ts b/src/preview/viewer/pdfviewerpanel.ts
index f6149b127..6db592062 100644
--- a/src/preview/viewer/pdfviewerpanel.ts
+++ b/src/preview/viewer/pdfviewerpanel.ts
@@ -47,7 +47,7 @@ class PdfViewerPanelSerializer implements vscode.WebviewPanelSerializer {
         const state = argState.state
         let pdfFileUri: vscode.Uri | undefined
         if (state.path) {
-            pdfFileUri = lw.file.getUri(state.path)
+            pdfFileUri = lw.file.toUri(state.path)
         } else if (state.pdfFileUri) {
             pdfFileUri = vscode.Uri.parse(state.pdfFileUri, true)
         }
diff --git a/src/utils/quick-pick.ts b/src/utils/quick-pick.ts
index 0ce1e296e..74061927a 100644
--- a/src/utils/quick-pick.ts
+++ b/src/utils/quick-pick.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
 import { lw } from '../lw'
 
 export async function pickRootPath(rootPath: string, subRootPath: string, verb: string): Promise<string | undefined> {
-    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootPath))
+    const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootPath))
     const doNotPrompt = configuration.get('latex.rootFile.doNotPrompt') as boolean
     if (doNotPrompt) {
         if (configuration.get('latex.rootFile.useSubFile')) {
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 5d69d015d..d4efd4054 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -269,7 +269,7 @@ export function resolveFileGlob(dirs: string[], inputGlob: string, suffix: strin
  */
 export function replaceArgumentPlaceholders(rootFile: string, tmpDir: string): (arg: string) => string {
     return (arg: string) => {
-        const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.getUri(rootFile))
+        const configuration = vscode.workspace.getConfiguration('latex-workshop', lw.file.toUri(rootFile))
         const docker = configuration.get('docker.enabled')
 
         const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
@@ -306,7 +306,3 @@ export function replaceArgumentPlaceholders(rootFile: string, tmpDir: string): (
         return expandPlaceHolders(arg).replace(/%OUTDIR%/g, outDir).replace(/%OUTDIR_W32%/g, outDirW32)
     }
 }
-
-export async function delay(t: number) {
-    return new Promise(resolve => setTimeout(resolve, t))
-}

From e254ae3b6c933869356784491c56c8b7f381107d Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Sat, 10 Aug 2024 11:37:02 +0800
Subject: [PATCH 18/20] Remove unused exports, small refactor

---
 src/extras/liveshare.ts |  8 ++++----
 src/locate/synctex.ts   | 10 ++++++----
 src/preview/server.ts   |  2 --
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/extras/liveshare.ts b/src/extras/liveshare.ts
index acdd4951b..311c22cb8 100644
--- a/src/extras/liveshare.ts
+++ b/src/extras/liveshare.ts
@@ -182,7 +182,7 @@ function connectionHandler(msg: string): void {
             break
         }
         case 'reverse_synctex_result': {
-            void lw.locate.synctex.openTeX(vscode.Uri.parse(data.input).fsPath, data.line, data.column, data.textBeforeSelection, data.textAfterSelection)
+            void lw.locate.synctex.components.openTeX(vscode.Uri.parse(data.input).fsPath, data.line, data.column, data.textBeforeSelection, data.textAfterSelection)
             break
         }
         case 'synctex_result': {
@@ -242,7 +242,7 @@ function handleCommandSyncTeX(): boolean {
     if (!isGuest()) {
         return false
     }
-    const coords = lw.locate.synctex.getCurrentEditorCoordinates()
+    const coords = lw.locate.synctex.components.getCurrentEditorCoordinates()
 
     if (lw.root.file.path === undefined || coords === undefined) {
         logger.log('Cannot find LaTeX root PDF to perform synctex.')
@@ -274,7 +274,7 @@ function handleViewerReverseSyncTeX(websocket: ws, uri: vscode.Uri, data: Extrac
         return true
     } else if (isHost() && uri.scheme === 'vsls' && state.liveshare) { // reply to guest if request comes from guest
         const localUri = state.liveshare.convertSharedUriToLocal(uri) ?? uri
-        const record = lw.locate.synctex.computeToTeX(data, localUri.fsPath)
+        const record = lw.locate.synctex.components.computeToTeX(data, localUri.fsPath)
         if (record) {
             const response: ServerResponse = {
                 type: 'reverse_synctex_result',
@@ -301,7 +301,7 @@ function handleViewerSyncTeX(websocket: ws, data: ClientRequest): boolean {
 
     const filePath = state.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.filePath, true)).fsPath
     const targetPdfFile = state.liveshare.convertSharedUriToLocal(vscode.Uri.parse(data.targetPdfFile, true)).fsPath
-    void lw.locate.synctex.synctexToPDFCombined(data.line, data.column, filePath, targetPdfFile, data.indicator).then(record => {
+    void lw.locate.synctex.components.synctexToPDFCombined(data.line, data.column, filePath, targetPdfFile, data.indicator).then(record => {
         if (!record) {
             logger.log(`Failed to locate synctex for ${filePath}. This was requested from a guest.`)
             return
diff --git a/src/locate/synctex.ts b/src/locate/synctex.ts
index 47e557ca0..a8bb63946 100644
--- a/src/locate/synctex.ts
+++ b/src/locate/synctex.ts
@@ -13,12 +13,14 @@ const logger = lw.log('Locator')
 
 export const synctex = {
     toPDF,
-    synctexToPDFCombined,
     toPDFFromRef,
-    computeToTeX,
-    openTeX,
     toTeX,
-    getCurrentEditorCoordinates
+    components: {
+        synctexToPDFCombined,
+        computeToTeX,
+        openTeX,
+        getCurrentEditorCoordinates
+    }
 }
 
 /**
diff --git a/src/preview/server.ts b/src/preview/server.ts
index fe5812801..410d25f83 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -13,8 +13,6 @@ export {
     getUrl,
     setHandler,
     initialize,
-    encodePathWithPrefix,
-    decodePathWithPrefix
     // initialized
 }
 

From 5ae60c7a69b53b875ad5a313b76750d90374f586 Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Sun, 11 Aug 2024 01:39:57 +0800
Subject: [PATCH 19/20] Squashed commit of the following:

commit ff2ca23e2f2b8f0b9075859c856a4d6a84c1ebc9
Author: James Yu <yujianqiaojames@gmail.com>
Date:   Sun Aug 11 01:38:40 2024 +0800

    Fix #4334 PDF viewer position retained across vscode reloads

commit be6da68231188f6037dbdaa3ede4eebc22e58301
Author: Jerome Lelong <jerome.lelong@gmail.com>
Date:   Fri Aug 9 18:24:34 2024 +0200

    Add highlighting to the extension logs (#4331)

    * Fix typo in log

    * Highlight extension's logs

    * Do not highlight the finale full stop

commit 693d7090a030d36ca4951ccfbb15050c3be9611b
Author: James Yu <yujianqiaojames@gmail.com>
Date:   Sat Aug 3 17:57:55 2024 +0800

    Fix linter errors

commit 82b7561bd853bbf189ae12c01959ada7a09470bf
Author: James Yu <yujianqiaojames@gmail.com>
Date:   Sat Aug 3 17:56:37 2024 +0800

    Add tests to queue module of compile

commit 55e4c877aaa5fe941d2f580d1d13f16698097f2c
Author: James Yu <yujianqiaojames@gmail.com>
Date:   Wed Jul 31 18:49:38 2024 +0800

    Fix a find root in ws test as file glob order is not static

commit e9d6ec5f68584fb34fb96fe028d1d0e7669eb2d6
Author: Jerome Lelong <jerome.lelong@gmail.com>
Date:   Fri Jul 26 07:37:21 2024 +0200

    Update grammar files to jlelong/vscode-latex-basics@4795be4cec74ef58b30c8fa5876b5cefdae4f724

commit bf2df7fa3847b9013f982b8b2836b06f5928d4f6
Author: James Yu <yujianqiaojames@gmail.com>
Date:   Mon Jul 22 00:56:18 2024 +0800

    Fix #4313 Include (arg) macro signature in package intellisense

commit 53fdd38b19888656f045f0a1dee66a26148541d4
Author: Jerome Lelong <jerome.lelong@gmail.com>
Date:   Mon Jul 8 15:52:47 2024 +0200

    Update grammar files to jlelong/vscode-latex-basics@1deac8f139dbb01caae6d5d1c78b315e6a6a2253
---
 data/packages/algorithm2e.json                |  102 +
 data/packages/babel.json                      |   31 +-
 data/packages/beamerbaseframesize.json        |   15 +-
 data/packages/biblatex.json                   |  590 +-
 data/packages/booktabs.json                   |    6 +
 data/packages/chemformula.json                |    3 +
 data/packages/circuitikz.json                 |    2 +-
 data/packages/class-altacv.json               |    2 +-
 data/packages/class-memoir.json               |    6 +
 data/packages/class-moderncv.json             |   35 +
 data/packages/class-scrlttr2.json             |    8 +
 data/packages/class-yathesis.json             |    1 +
 data/packages/coordsys.json                   |   90 +
 data/packages/fancybox.json                   |   27 +
 data/packages/fontspec.json                   |    3 +
 data/packages/glosstex.json                   |  114 +
 data/packages/hyperref.json                   |    2 +-
 data/packages/jurabib.json                    |   10 +-
 data/packages/latex-dev.json                  |  176 +-
 data/packages/latex-document.json             |   78 +-
 data/packages/listings.json                   |    2 +-
 data/packages/logsys.json                     |  108 +
 data/packages/paracol.json                    |    8 +-
 data/packages/pgfcore.json                    |    3 +
 data/packages/pgfplots.json                   |   50 +-
 data/packages/physics.json                    |  236 +-
 data/packages/physics2.json                   |   24 +-
 data/packages/pst-3d.json                     |    8 +-
 data/packages/pst-coil.json                   |   72 +
 data/packages/pst-node.json                   |  450 +
 data/packages/pst-plot.json                   |  113 +-
 data/packages/pst-text.json                   |   18 +
 data/packages/pstricks.json                   |  674 +-
 data/packages/subfigure.json                  |    3 +
 data/packages/tcolorbox.json                  |    4 +-
 data/packages/tex.json                        |   21 +
 data/packages/tkz-euclide.json                | 1804 +++-
 data/packages/xy.json                         |    9 +
 data/packages/zhnumber.json                   |    4 +-
 dev/packages/CJK.json                         |  112 +
 dev/packages/CJKfntef.json                    |   75 +
 dev/packages/PapierGurvan.json                |    6 +
 dev/packages/ProfCollege.json                 |   52 +-
 dev/packages/ProfLycee.json                   |  173 +-
 dev/packages/ProfSio.json                     |   13 +-
 dev/packages/ResolSysteme.json                |  370 +-
 dev/packages/TangramTikz.json                 |   16 +
 dev/packages/WriteOnGrid.json                 |   30 +
 dev/packages/abspos.json                      |   36 +
 dev/packages/abstract.json                    |   34 +
 dev/packages/accsupp.json                     |   49 +
 dev/packages/achemso.json                     |   46 +
 dev/packages/acro.json                        |  934 ++
 dev/packages/acronym.json                     |  383 +
 dev/packages/addrset.json                     |    2 +-
 dev/packages/addtoluatexpath.json             |    2 +-
 dev/packages/aeb_pro.json                     |    6 +
 dev/packages/aebxmp.json                      |    6 +-
 dev/packages/ajmacros.json                    |  254 +
 dev/packages/algorithm2e.json                 |  102 +
 dev/packages/alterqcm.json                    |    5 +-
 dev/packages/amsmath.json                     |  348 +
 dev/packages/answers.json                     |   57 +
 dev/packages/ar.json                          |   30 +
 dev/packages/argumentation.json               |   37 +-
 dev/packages/array.json                       |   20 +
 dev/packages/arrayjobx.json                   |    9 +
 dev/packages/arsclassica.json                 |   22 +
 dev/packages/ascmac.json                      |    9 +
 dev/packages/assoccnt.json                    |   96 +
 dev/packages/assurelatexmode.json             |   53 +-
 dev/packages/asyalign.json                    |    9 +
 dev/packages/asyfig.json                      |   31 +
 dev/packages/at.json                          |   19 +
 dev/packages/atbegshi.json                    |   40 +
 dev/packages/autoaligne.json                  |    3 +
 dev/packages/axodraw2.json                    | 1053 +-
 dev/packages/babel.json                       | 4651 +++++++++
 dev/packages/backref.json                     |   59 +
 dev/packages/balance.json                     |   11 +
 dev/packages/bangla.json                      |   72 +
 dev/packages/bargraph-js.json                 |    3 +
 dev/packages/beamerbaseframesize.json         |   15 +-
 dev/packages/beamerprosper.json               |    3 +
 dev/packages/beamerthemeAmurmaple.json        |    2 +-
 dev/packages/beamerthemeArguelles.json        |    1 +
 dev/packages/beamerthememoloch.json           |    1 +
 dev/packages/bewerbung.json                   |  163 +
 dev/packages/bez123.json                      |   18 +
 dev/packages/bibentry.json                    |   22 +
 dev/packages/biblatex-archaeology.json        |  156 +
 dev/packages/biblatex-chicago.json            |  184 +-
 dev/packages/biblatex-ext-oa.json             |    2 +-
 dev/packages/biblatex-ms.json                 |  194 +-
 dev/packages/biblatex.json                    | 8530 +++++++++++++++++
 dev/packages/bibleref.json                    |   27 +
 dev/packages/bibpes.json                      |   29 +
 dev/packages/bidi.json                        |  341 +
 dev/packages/bidishadowtext.json              |    2 +-
 dev/packages/bm.json                          |   39 +
 dev/packages/bondcolor.json                   |    6 +
 dev/packages/booktabs.json                    |   47 +
 dev/packages/bxeepic.json                     |   27 +
 dev/packages/bxorigcapt.json                  |    2 +-
 dev/packages/calc.json                        |   47 +
 dev/packages/callouts.json                    |   42 +
 dev/packages/caption.json                     |  153 +
 dev/packages/catppuccinpalette.json           |   15 +
 dev/packages/censor.json                      |   60 +
 dev/packages/cesenaexam.json                  |   74 +
 dev/packages/cgloss4e.json                    |    3 +
 dev/packages/chapterbib.json                  |   38 +
 dev/packages/chemcompounds.json               |    4 +-
 dev/packages/chemfig.json                     |  243 +
 dev/packages/chemformula-ru.json              |    4 +-
 dev/packages/chemformula.json                 |    3 +
 dev/packages/chemist.json                     |  470 +
 dev/packages/chemmacros.json                  |   92 +
 dev/packages/chemplants.json                  |    4 +-
 dev/packages/chemstr.json                     |   12 +
 dev/packages/chet.json                        |  243 +
 dev/packages/chextras.json                    |    3 +
 dev/packages/chmst-pdf.json                   |   54 +
 dev/packages/circuitikz.json                  |    2 +-
 dev/packages/citation-style-language.json     |    8 +
 dev/packages/cite.json                        |   44 +
 dev/packages/class-abntex2.json               |   10 +-
 dev/packages/class-acmart.json                |    3 +
 dev/packages/class-altacv.json                |    2 +-
 dev/packages/class-aomart.json                |    1 +
 dev/packages/class-apa6.json                  |   18 +-
 dev/packages/class-asmeconf.json              |    5 +-
 dev/packages/class-asmejour.json              |    3 +
 dev/packages/class-bfhpub.json                |    4 +-
 dev/packages/class-bitart.json                |   32 +
 dev/packages/class-bitbook.json               |   24 +
 dev/packages/class-bjfuthesis.json            |   28 +-
 dev/packages/class-bookcover.json             |    8 +-
 dev/packages/class-cquthesis.json             |    6 +-
 dev/packages/class-droit-fr.json              |    3 +
 dev/packages/class-elegantbook.json           |    3 +
 dev/packages/class-elteikthesis.json          |    6 +
 dev/packages/class-fei.json                   |   12 +
 dev/packages/class-gztarticle.json            |    1 +
 dev/packages/class-hecthese.json              |    3 +
 dev/packages/class-hgbarticle.json            |   16 +
 dev/packages/class-hgbreport.json             |   16 +
 dev/packages/class-hgbthesis.json             |   16 +
 dev/packages/class-iopart.json                |    3 +
 dev/packages/class-l3doc.json                 |   21 +-
 dev/packages/class-langscibook.json           |    3 +
 dev/packages/class-letgut.json                |    1 +
 dev/packages/class-lni.json                   |    5 +-
 dev/packages/class-ltugboat.json              |    3 +
 dev/packages/class-matapli.json               |    1 +
 dev/packages/class-meetingmins.json           |    8 +-
 dev/packages/class-memoir.json                |    6 +
 dev/packages/class-mitthesis.json             |    6 +
 dev/packages/class-moderncv.json              |   35 +
 dev/packages/class-msu-thesis.json            |    1 +
 dev/packages/class-mucproc.json               |   12 +
 dev/packages/class-newlfm.json                |    2 +-
 dev/packages/class-njuthesis.json             |   32 +
 dev/packages/class-novel.json                 |   12 +-
 dev/packages/class-nwafuthesis.json           |   36 +
 dev/packages/class-nwejmart.json              |    3 +
 .../class-oup-authoring-template.json         |    2 +-
 dev/packages/class-philosophersimprint.json   |    2 +-
 dev/packages/class-prtec.json                 |   19 +-
 dev/packages/class-randexam.json              |   12 +
 dev/packages/class-resphilosophica.json       |   14 +-
 dev/packages/class-sagej.json                 |    2 +-
 dev/packages/class-sapthesis.json             |    4 +-
 dev/packages/class-schulma-klausur.json       |   18 +
 dev/packages/class-scrlttr2.json              |    8 +
 dev/packages/class-se2thesis.json             |    3 +
 dev/packages/class-skdoc.json                 |    4 +-
 dev/packages/class-sn-jnl.json                |    2 +-
 dev/packages/class-standalone.json            |    2 +-
 dev/packages/class-thuthesis.json             |    1 +
 dev/packages/class-tkz-doc.json               |    3 +
 dev/packages/class-tudapub.json               |    2 +-
 dev/packages/class-udes-genie-these.json      |    1 +
 dev/packages/class-ulthese.json               |   13 +-
 dev/packages/class-univie-ling-expose.json    |   29 +
 dev/packages/class-univie-ling-handout.json   |   28 +
 dev/packages/class-univie-ling-paper.json     |   29 +
 dev/packages/class-univie-ling-poster.json    |   32 +
 dev/packages/class-univie-ling-thesis.json    |   29 +
 dev/packages/class-univie-ling-wlg.json       |   17 +-
 dev/packages/class-utexasthesis.json          |    2 +-
 dev/packages/class-xdupgthesis.json           |   24 +
 dev/packages/class-xduugthesis.json           |   24 +
 dev/packages/class-xduugtp.json               |   24 +
 dev/packages/class-yathesis.json              |    1 +
 dev/packages/clock.json                       |   22 +
 dev/packages/cmdtrack.json                    |    2 +-
 dev/packages/codeanatomy.json                 |    5 +-
 dev/packages/codelisting.json                 |   76 +
 dev/packages/color.json                       |   79 +
 dev/packages/colorblind.json                  |   27 +
 dev/packages/colortbl.json                    |   88 +
 dev/packages/comma.json                       |   15 +
 dev/packages/comment.json                     |   69 +
 dev/packages/commutative-diagrams.json        |   49 +
 dev/packages/competences.json                 |    2 +-
 dev/packages/contour.json                     |   34 +
 dev/packages/contracard.json                  |  538 ++
 dev/packages/conv-xkv.json                    |    9 +
 dev/packages/coordsys.json                    |   90 +
 dev/packages/cquthesis.json                   |   53 +
 dev/packages/cropmark.json                    |   21 +
 dev/packages/cursor.json                      |   29 +
 dev/packages/curve2e.json                     |  120 +
 dev/packages/curves.json                      |   27 +
 dev/packages/cyber.json                       |    2 +-
 dev/packages/dad.json                         |   25 +
 dev/packages/dbshow.json                      |   10 +-
 dev/packages/delim.json                       |   20 +
 dev/packages/delimset.json                    |   35 +-
 dev/packages/democodetools.json               |   20 +-
 dev/packages/diagbox.json                     |   60 +
 dev/packages/diagram.json                     |  278 +
 dev/packages/dichokey.json                    |   39 +
 dev/packages/diffcoeff.json                   |  136 +-
 dev/packages/digicap-pro.json                 |    2 +-
 dev/packages/dline.json                       |   51 +
 dev/packages/dljslib.json                     |    9 +
 dev/packages/doc.json                         |  269 +
 dev/packages/drawstack.json                   |    2 +-
 dev/packages/dsptricks.json                   |    7 +-
 dev/packages/dtk-url.json                     |    3 +
 dev/packages/dynkin-diagrams.json             |    4 +
 dev/packages/easybase.json                    |   35 +-
 dev/packages/easylist.json                    |   85 +
 dev/packages/easyvector.json                  |    3 +
 dev/packages/ebook.json                       |   18 +
 dev/packages/ed.json                          |  157 +
 dev/packages/eepic.json                       |   46 +
 dev/packages/egpeirce.json                    |    4 +-
 dev/packages/elements.json                    |   83 +
 dev/packages/ellipsis.json                    |   19 +
 dev/packages/emarks.json                      |   55 +
 dev/packages/embrac.json                      |    6 +-
 dev/packages/emo.json                         |   32 +
 dev/packages/emoji.json                       |   20 +
 dev/packages/emp.json                         |   44 +-
 dev/packages/endiagram.json                   |    4 +-
 dev/packages/endnotes.json                    |   36 +
 dev/packages/enumerate.json                   |   12 +
 dev/packages/epic.json                        |   80 +
 dev/packages/esami.json                       |    2 +-
 dev/packages/esk.json                         |    6 +
 dev/packages/eso-pic.json                     |   85 +
 dev/packages/etaremune.json                   |    3 +-
 dev/packages/etoc.json                        |  366 +
 dev/packages/euclideangeometry.json           |   99 +
 dev/packages/euler.json                       |   32 +
 dev/packages/example.json                     |   13 +
 dev/packages/exercise.json                    |  280 +
 dev/packages/exerquiz.json                    |   18 +-
 dev/packages/exesheet.json                    |  370 +
 dev/packages/expex-acro.json                  |    4 +-
 dev/packages/expex.json                       |    2 +-
 dev/packages/export.json                      |   53 +
 dev/packages/extract.json                     |   47 +
 dev/packages/fancybox.json                    |   27 +
 dev/packages/fancyhdr.json                    |  132 +
 dev/packages/fancyvrb-ex.json                 |   16 +
 dev/packages/fapapersize.json                 |    2 +-
 dev/packages/fbox.json                        |   50 +
 dev/packages/fdsymbol.json                    |    2 +
 dev/packages/fetchbibpes.json                 |    3 +
 dev/packages/feyn.json                        |   70 +
 dev/packages/feynmf.json                      |   63 +-
 dev/packages/feynmp.json                      |   63 +-
 dev/packages/filehook.json                    |   81 +
 dev/packages/fitch.json                       |  141 +
 dev/packages/float.json                       |   29 +
 dev/packages/floatrow.json                    |    4 +-
 dev/packages/fltrace.json                     |   11 +
 dev/packages/fontspec.json                    |  351 +
 dev/packages/fonttable.json                   |   77 +
 dev/packages/fontwrap.json                    |    4 +-
 dev/packages/footnote.json                    |   36 +
 dev/packages/forest-index.json                |    9 +
 dev/packages/forest.json                      |   12 +
 dev/packages/forloop.json                     |   22 +
 dev/packages/forms16be.json                   |    6 +
 dev/packages/fp.json                          |   22 +
 dev/packages/framed.json                      |   38 +
 dev/packages/fullpict.json                    |   87 +-
 dev/packages/functional.json                  | 1186 +++
 dev/packages/fusering.json                    |  156 +
 dev/packages/fvextra.json                     |    6 +
 dev/packages/gastex.json                      |  192 +
 dev/packages/gb4e.json                        |  180 +
 dev/packages/gchords.json                     |    2 +-
 dev/packages/gelasiomath.json                 |   35 +
 dev/packages/geometry.json                    |  269 +
 dev/packages/german.json                      |    7 +
 dev/packages/glossaries.json                  | 4118 ++++++++
 dev/packages/glosstex.json                    |  114 +
 dev/packages/gradient-text.json               |    2 +-
 dev/packages/grafcet.json                     |   18 +-
 dev/packages/graphics.json                    |   84 +
 dev/packages/graphicsonthefly.json            |    2 +-
 dev/packages/graphpap.json                    |    9 +-
 dev/packages/greektonoi.json                  |    4 +
 dev/packages/gregoriosyms.json                |    4 +-
 dev/packages/gregoriotex.json                 |    4 +-
 dev/packages/grid.json                        |   30 +
 dev/packages/gridslides.json                  |   84 +
 dev/packages/grmath.json                      |   16 +
 dev/packages/guit.json                        |  197 +
 dev/packages/hamnosys.json                    |    2 +-
 dev/packages/handout.json                     |   42 +
 dev/packages/hcycle.json                      |   72 +
 dev/packages/hep-math.json                    |    4 +-
 dev/packages/hetarom.json                     |  168 +
 dev/packages/hetaromh.json                    |  120 +
 dev/packages/hf-tikz.json                     |    3 +
 dev/packages/hgbbib.json                      |   28 +
 dev/packages/hlist.json                       |    3 +
 dev/packages/hsetup.json                      |  367 +
 dev/packages/hvlogos.json                     |    4 +-
 dev/packages/hvpygmentex.json                 |    3 +
 dev/packages/hvqrurl.json                     |    3 +-
 dev/packages/hypbmsec.json                    |   42 +
 dev/packages/hyperref.json                    |  479 +
 dev/packages/icite.json                       |   36 +
 dev/packages/iffont.json                      |    2 +-
 dev/packages/ifoption.json                    |    2 +-
 dev/packages/ifthen.json                      |   41 +
 dev/packages/igo.json                         |  125 +
 dev/packages/imsart.json                      |  576 ++
 dev/packages/index.json                       |   44 +
 dev/packages/inputenc.json                    |   58 +
 dev/packages/intcalc.json                     |   65 +
 dev/packages/interactiveanimation.json        |    4 +-
 dev/packages/interval.json                    |   60 +
 dev/packages/invoice.json                     |  116 +
 dev/packages/ipa.json                         |  153 +
 dev/packages/ipsum.json                       |   31 +
 dev/packages/isomath.json                     |   51 +
 dev/packages/joinbox.json                     |   16 +-
 dev/packages/junicode.json                    |    1 -
 dev/packages/jurabib.json                     |   10 +-
 dev/packages/kanbun.json                      |   54 +
 dev/packages/keyval.json                      |   14 +
 dev/packages/keyvaltable.json                 |    6 +
 dev/packages/knowledge.json                   |   23 +-
 dev/packages/knufakelogo.json                 |   15 +
 dev/packages/l3sys-query.json                 |   37 +
 dev/packages/la.json                          |   27 +
 dev/packages/labels.json                      |   90 +
 dev/packages/labyrinth.json                   |   19 +
 dev/packages/ladder.json                      |   50 +
 dev/packages/lapdf.json                       |  316 +
 dev/packages/latex-dev.json                   |  178 +-
 dev/packages/latex-document.json              |   78 +-
 dev/packages/latex2pydata.json                |    6 +
 dev/packages/latexscreenshooter.json          |   14 +
 dev/packages/layout.json                      |   74 +
 dev/packages/lazylist.json                    |    2 +-
 dev/packages/lcd.json                         |   29 +
 dev/packages/leading.json                     |   13 +
 dev/packages/lhelp.json                       |   18 +
 dev/packages/lie-hasse.json                   |   26 +-
 dev/packages/liftarm.json                     |  108 +-
 dev/packages/limap.json                       |   78 +
 dev/packages/linearregression.json            |   19 +
 dev/packages/lineno.json                      |  212 +
 dev/packages/lipsum.json                      |  171 +
 dev/packages/listing.json                     |   19 +
 dev/packages/listings.json                    |  344 +
 dev/packages/listingsutf8.json                |   30 +
 dev/packages/lltjext.json                     |   17 +
 dev/packages/lmodern.json                     |   11 +
 dev/packages/logicpuzzle.json                 |   16 +-
 dev/packages/logpap.json                      |   36 +
 dev/packages/logsys.json                      |  108 +
 dev/packages/longtable.json                   |   38 +
 dev/packages/lpic.json                        |    4 +-
 dev/packages/lscape.json                      |   13 +
 dev/packages/lstdoc.json                      |    2 +-
 dev/packages/ltugcomn.json                    |    3 +
 dev/packages/ltxdockit.json                   |  348 +
 dev/packages/luagcd.json                      |    2 +-
 dev/packages/luahttp.json                     |    8 +-
 dev/packages/luamaths.json                    |    4 +-
 dev/packages/luamplib.json                    |   40 +-
 dev/packages/luatex.json                      |  314 +
 dev/packages/luatexja-fontspec.json           |   24 +
 dev/packages/luatexko.json                    |   12 +-
 dev/packages/luatruthtable.json               |    4 +-
 dev/packages/lutabulartools.json              |   14 +-
 dev/packages/luwiantype.json                  |  780 ++
 dev/packages/lwarp.json                       |    6 +
 dev/packages/mafr.json                        |    1 +
 dev/packages/mailmerge.json                   |    4 +-
 dev/packages/makecell.json                    |    3 +
 dev/packages/makeidx.json                     |   17 +
 dev/packages/makeplot.json                    |    6 +
 dev/packages/mandi.json                       |  488 +-
 dev/packages/mandistudent.json                |   30 +-
 dev/packages/mathsemantics-manifolds.json     |   90 +
 dev/packages/mathsemantics-semantic.json      |   12 +
 dev/packages/mathspec.json                    |   18 +
 dev/packages/mathtools.json                   |  521 +
 dev/packages/memhangul-common.json            |    2 +-
 dev/packages/memoize.json                     |  242 +
 dev/packages/memory.json                      |   14 +
 dev/packages/menu.json                        |   94 +
 dev/packages/merge.json                       |   12 +
 dev/packages/mfpic.json                       |  227 +-
 dev/packages/mfpic4ode.json                   |   12 +-
 dev/packages/miller.json                      |    3 +
 dev/packages/milsymb.json                     |   72 +
 dev/packages/minted.json                      |  297 +
 dev/packages/minutes.json                     |   34 +-
 dev/packages/mismath.json                     |    7 +
 dev/packages/mkstmp_pro.json                  |    2 +-
 dev/packages/mlist.json                       |  151 +
 dev/packages/modiagram.json                   |   36 +-
 dev/packages/msc.json                         |   61 +
 dev/packages/multibib.json                    |    2 +-
 dev/packages/multicol.json                    |   63 +
 dev/packages/multienv.json                    |   22 +-
 dev/packages/multilang.json                   |   49 +
 dev/packages/na-position.json                 |    4 +-
 dev/packages/nameauth.json                    |    6 +-
 dev/packages/nameref.json                     |   26 +
 dev/packages/nccfloats.json                   |   72 +
 dev/packages/nccpic.json                      |   14 +-
 dev/packages/newtx.json                       |    1 +
 dev/packages/newtxmath.json                   |    1 +
 dev/packages/nextpage.json                    |   24 +
 dev/packages/nicematrix.json                  |   28 +-
 dev/packages/nlctuserguide.json               |    2 +-
 dev/packages/nth.json                         |   27 +
 dev/packages/ntheorem.json                    |    2 +-
 dev/packages/numerica.json                    |   16 +-
 dev/packages/numprint.json                    |  149 +
 dev/packages/ocgx.json                        |   23 +
 dev/packages/ocgx2.json                       |   44 +-
 dev/packages/onedown.json                     |   24 +
 dev/packages/optex.json                       |   15 +-
 dev/packages/optional.json                    |   16 +
 dev/packages/options.json                     |  157 +
 dev/packages/orcidlink.json                   |   13 +
 dev/packages/otf.json                         |  142 +
 dev/packages/overarrows.json                  |   31 +-
 dev/packages/pagegrid.json                    |   47 +
 dev/packages/paracol.json                     |    8 +-
 dev/packages/parallel.json                    |   76 +
 dev/packages/parcolumns.json                  |   37 +
 dev/packages/parskip.json                     |   16 +
 dev/packages/pas-crosswords.json              |    8 +-
 dev/packages/pas-tableur.json                 |    4 +-
 dev/packages/passopt.json                     |   26 +
 dev/packages/path.json                        |   18 +
 dev/packages/pbox.json                        |   31 +
 dev/packages/pdfx.json                        |    1 +
 dev/packages/perpage.json                     |   28 +
 dev/packages/pgf-PeriodicTable.json           |   23 +-
 dev/packages/pgf-pie.json                     |    4 +-
 dev/packages/pgf-spectra.json                 |   23 +
 dev/packages/pgfcore.json                     |    3 +
 dev/packages/pgfmanual.json                   |   21 +-
 dev/packages/pgfmath.json                     |  491 +
 dev/packages/pgfplots.json                    |   50 +-
 dev/packages/phfparen.json                    |    6 +
 dev/packages/phfqit.json                      |   30 +
 dev/packages/physics.json                     |  236 +-
 dev/packages/physics2.json                    |   24 +-
 dev/packages/piano.json                       |   11 +
 dev/packages/picinpar.json                    |    6 +-
 dev/packages/picins.json                      |   53 +-
 dev/packages/pict2e.json                      |  119 +
 dev/packages/picture.json                     |   15 +
 dev/packages/pinoutikz.json                   |   27 +
 dev/packages/pinyin.json                      |  892 ++
 dev/packages/piton.json                       |    7 +-
 dev/packages/placeat.json                     |   72 +
 dev/packages/plaintex.json                    |   21 +
 dev/packages/platex.json                      |  150 +
 dev/packages/plext.json                       |   12 +
 dev/packages/pm-isomath.json                  |  120 +
 dev/packages/pmdraw.json                      |   46 +-
 dev/packages/pmhanguljamo-frkim.json          |    6 +
 dev/packages/pmhanguljamo.json                |   10 +-
 dev/packages/polyglossia.json                 |   61 +-
 dev/packages/polyhedra.json                   |    2 +-
 dev/packages/polynomial.json                  |    4 +-
 dev/packages/popupmenu.json                   |    6 +
 dev/packages/poster.json                      |   57 +
 dev/packages/printlen.json                    |   18 +
 dev/packages/probsoln.json                    |   12 +-
 dev/packages/projlib-language.json            |    1 +
 dev/packages/proof.json                       |   26 +
 dev/packages/pseudo.json                      |   18 +
 dev/packages/pseudocode.json                  |   85 +
 dev/packages/psfragx.json                     |   15 +
 dev/packages/psgo.json                        |    8 +-
 dev/packages/pst-2dplot.json                  |   13 +-
 dev/packages/pst-3d.json                      |    8 +-
 dev/packages/pst-3dplot.json                  |  229 +-
 dev/packages/pst-abspos.json                  |    9 +
 dev/packages/pst-arrow.json                   |    6 +
 dev/packages/pst-bar.json                     |    3 +
 dev/packages/pst-bezier.json                  |   19 +-
 dev/packages/pst-circ.json                    |  513 +
 dev/packages/pst-coil.json                    |   72 +
 dev/packages/pst-contourplot.json             |   23 +-
 dev/packages/pst-dart.json                    |   21 +
 dev/packages/pst-dbicons.json                 |   30 +
 dev/packages/pst-electricfield.json           |   18 +
 dev/packages/pst-eucl.json                    | 1219 ++-
 dev/packages/pst-feyn.json                    |  129 +
 dev/packages/pst-fractal.json                 |   81 +
 dev/packages/pst-fun.json                     |    6 +
 dev/packages/pst-func.json                    |  129 +-
 dev/packages/pst-geo.json                     |   39 +
 dev/packages/pst-geometrictools.json          |   39 +
 dev/packages/pst-gr3d.json                    |    6 +
 dev/packages/pst-hsb.json                     |    6 +
 dev/packages/pst-jtree.json                   |   12 +
 dev/packages/pst-knot.json                    |   12 +
 dev/packages/pst-labo.json                    |    6 +
 dev/packages/pst-lens.json                    |    8 +
 dev/packages/pst-lsystem.json                 |   23 +-
 dev/packages/pst-magneticfield.json           |   46 +-
 dev/packages/pst-marble.json                  |   39 +-
 dev/packages/pst-math.json                    |    3 +
 dev/packages/pst-mirror.json                  |   27 +
 dev/packages/pst-moire.json                   |   46 +-
 dev/packages/pst-node.json                    |  450 +
 dev/packages/pst-optexp.json                  |  594 ++
 dev/packages/pst-optic.json                   |   75 +
 dev/packages/pst-pad.json                     |   48 +
 dev/packages/pst-pdf.json                     |  101 +
 dev/packages/pst-perspective.json             |   24 +
 dev/packages/pst-plot.json                    |  113 +-
 dev/packages/pst-rputover.json                |   61 +-
 dev/packages/pst-rubans.json                  |   15 +
 dev/packages/pst-shell.json                   |    5 +
 dev/packages/pst-sigsys.json                  |  204 +
 dev/packages/pst-slpe.json                    |    6 +
 dev/packages/pst-solides3d.json               |  245 +-
 dev/packages/pst-spinner.json                 |    8 +
 dev/packages/pst-stru.json                    |   12 +
 dev/packages/pst-text.json                    |   18 +
 dev/packages/pst-turtle.json                  |    9 +-
 dev/packages/pst-venn.json                    |   21 +-
 dev/packages/pstricks-add.json                |  214 +-
 dev/packages/pstricks.json                    |  674 +-
 dev/packages/ptex.json                        |   76 +
 dev/packages/puyotikz.json                    |    2 +-
 dev/packages/pxbabel.json                     |    2 +-
 dev/packages/pygmentex.json                   |  124 +
 dev/packages/pylatex.json                     |   29 +
 dev/packages/pythontex.json                   |    2 +-
 dev/packages/qcm.json                         |   58 +
 dev/packages/qrcode.json                      |   56 +
 dev/packages/qtree.json                       |   48 +
 dev/packages/quantikz.json                    |   10 +
 dev/packages/ran_toks.json                    |    4 +-
 dev/packages/randbild.json                    |   36 +
 dev/packages/rangen.json                      |    4 +-
 dev/packages/readarray.json                   |   12 +-
 dev/packages/rec-thy.json                     |   42 +
 dev/packages/rgltxdoc.json                    |    2 +-
 dev/packages/ribbonproofs.json                |    8 +-
 dev/packages/rigidnotation.json               |   21 +
 dev/packages/rterface.json                    |    2 +-
 dev/packages/ruby.json                        |   24 +
 dev/packages/sankey.json                      |    4 +-
 dev/packages/scanpages.json                   |   15 +
 dev/packages/schule.json                      |    4 +
 dev/packages/schwalbe.json                    |   29 +
 dev/packages/scontents.json                   |    7 +-
 dev/packages/scrbase.json                     |  351 +
 dev/packages/scrletter.json                   |    6 +
 dev/packages/se2packages.json                 |   16 +
 dev/packages/semantex.json                    |  630 ++
 dev/packages/semantic.json                    |   95 +
 dev/packages/semesterplannerlua.json          |   99 +
 dev/packages/sepfootnotes.json                |    3 +-
 dev/packages/sets.json                        |   35 +
 dev/packages/setspace.json                    |   35 +
 dev/packages/sf298.json                       |    2 +-
 dev/packages/shadow.json                      |   14 +
 dev/packages/shadowtext.json                  |   28 +
 dev/packages/shapepar.json                    |    3 +
 dev/packages/sidebars.json                    |   10 +-
 dev/packages/sidenotesplus.json               |    6 +
 dev/packages/simplekv.json                    |    6 +-
 dev/packages/simplenodes.json                 |    2 +-
 dev/packages/simpleoptics.json                |    2 +-
 dev/packages/simples-matrices.json            |   66 +
 dev/packages/siunitx.json                     | 2747 ++++++
 dev/packages/skak.json                        |  584 ++
 dev/packages/skillicons.json                  |   16 +
 dev/packages/skmath.json                      |    6 +-
 dev/packages/snotez.json                      |    6 +
 dev/packages/sparklines.json                  |   25 +
 dev/packages/spbmark.json                     |    9 +-
 dev/packages/spectralsequences.json           |  231 +-
 dev/packages/spelatex.json                    |   91 +
 dev/packages/spot.json                        |   24 +
 dev/packages/spotcolor.json                   |   43 +
 dev/packages/spreadtab.json                   |    6 +
 dev/packages/sseq.json                        |  410 +
 dev/packages/stack.json                       |   23 +
 dev/packages/stackengine.json                 |  204 +
 dev/packages/standalone.json                  |   89 +
 dev/packages/standardsectioning.json          |   11 +
 dev/packages/statistics.json                  |  527 +
 dev/packages/stex.json                        |  985 ++
 dev/packages/structmech.json                  |   60 +-
 dev/packages/struktex.json                    |    8 +
 dev/packages/styledcmd.json                   |    2 +-
 dev/packages/subfigure.json                   |    3 +
 dev/packages/sudoku.json                      |   14 +
 dev/packages/suffix.json                      |    7 +
 dev/packages/sverb.json                       |   35 +
 dev/packages/svg.json                         |  102 +
 dev/packages/swfigure.json                    |   33 +-
 dev/packages/synthslant.json                  |    1 +
 dev/packages/systeme.json                     |    4 +-
 dev/packages/tableof.json                     |   59 +
 dev/packages/tablvar.json                     |    2 +-
 dev/packages/tabstackengine.json              |    2 +-
 dev/packages/tabto.json                       |    2 +-
 dev/packages/tabu.json                        |   87 +
 dev/packages/tabularcalc.json                 |    4 +-
 dev/packages/tagpdf.json                      |    3 -
 dev/packages/tasks.json                       |   32 +
 dev/packages/tcolorbox.json                   |    4 +-
 .../tcolorboxlibrarydocumentation.json        |    8 +-
 dev/packages/tcolorboxlibraryskins.json       |    1 -
 dev/packages/ted.json                         |   28 +
 dev/packages/tensor.json                      |   45 +
 dev/packages/tex.json                         | 1425 +++
 dev/packages/tex4ht.json                      |    8 +-
 dev/packages/texdraw.json                     |   39 +
 dev/packages/texshade.json                    |   22 +-
 dev/packages/textopo.json                     |   20 +-
 dev/packages/textpos.json                     |   19 +-
 dev/packages/theorem.json                     |   19 +
 dev/packages/thm-listof.json                  |    6 +-
 dev/packages/tikz-3dplot.json                 |    6 +
 dev/packages/tikz-inet.json                   |   21 +
 dev/packages/tikz-lake-fig.json               |    3 +
 dev/packages/tikz-network.json                |   45 +-
 dev/packages/tikz-truchet.json                |   18 +-
 dev/packages/tikz.json                        | 1508 +++
 dev/packages/tikz3d-fr.json                   |    6 +
 dev/packages/tikzdotncross.json               |   18 +
 dev/packages/tikzinput.json                   |   63 +
 .../tikzlibrarycommutative-diagrams.json      |    6 +
 .../tikzlibrarydatavisualization.json         |    3 +
 dev/packages/tikzlings.json                   |  163 +
 dev/packages/tikzpingus.json                  |    4 +-
 dev/packages/tikzquests.json                  |    6 +
 dev/packages/tikzrput.json                    |   12 +
 dev/packages/time.json                        |   11 +
 dev/packages/titlefoot.json                   |    2 +-
 dev/packages/titleps.json                     |    4 +-
 dev/packages/titleref.json                    |   15 +
 dev/packages/tkz-base.json                    |  190 +-
 dev/packages/tkz-berge.json                   |   14 +-
 dev/packages/tkz-elements.json                |    6 +
 dev/packages/tkz-euclide.json                 | 1804 +++-
 dev/packages/tkz-fct.json                     |   39 +-
 dev/packages/tkz-graph.json                   |  146 +-
 dev/packages/tkz-kiviat.json                  |   19 +-
 dev/packages/tkz-tab.json                     |   14 +-
 dev/packages/tocbasic.json                    |  288 +
 dev/packages/todo.json                        |   62 +
 dev/packages/todonotes.json                   |  148 +
 dev/packages/tokcycle.json                    |    2 +-
 dev/packages/tone.json                        |   19 +
 dev/packages/toolbox.json                     |  120 +
 dev/packages/toptesi.json                     |  256 +
 dev/packages/totpages.json                    |   25 +
 dev/packages/trace.json                       |   13 +
 dev/packages/translations.json                |  143 +
 dev/packages/translator.json                  |   77 +
 dev/packages/trees.json                       |   15 +
 dev/packages/trig.json                        |   26 +
 dev/packages/truncate.json                    |   20 +
 dev/packages/truthtable.json                  |   16 +
 dev/packages/tsvtemplate.json                 |    4 +-
 dev/packages/twemojis.json                    |   58 +
 dev/packages/typog.json                       |   37 +-
 dev/packages/ucs.json                         |  276 +
 dev/packages/ucshyper.json                    |   21 +
 dev/packages/uni.json                         |  111 +
 dev/packages/units.json                       |   28 +
 dev/packages/upmethodology-document.json      |  699 ++
 dev/packages/upmethodology-extension.json     |    3 +
 dev/packages/uptex.json                       |   21 +
 dev/packages/uri.json                         |   97 +
 dev/packages/url.json                         |   41 +
 dev/packages/va.json                          |   21 +
 dev/packages/varioref.json                    |  151 +
 dev/packages/varwidth.json                    |   14 +
 dev/packages/vector.json                      |   56 +
 dev/packages/verbatim.json                    |   16 +
 dev/packages/verse.json                       |  104 +
 dev/packages/version.json                     |   19 +
 dev/packages/vowel.json                       |   62 +
 dev/packages/wargame.json                     |  115 +-
 dev/packages/watermark.json                   |   23 +
 dev/packages/web.json                         | 1013 ++
 dev/packages/wiley-authoringtemplate.json     |    2 +-
 dev/packages/witharrows.json                  |  212 +
 dev/packages/wordcloud.json                   |    6 +-
 dev/packages/wrapfig.json                     |   31 +
 dev/packages/xassoccnt.json                   |   86 +-
 dev/packages/xcntperchap.json                 |    8 +-
 dev/packages/xcolor.json                      |  181 +
 dev/packages/xetex.json                       |  131 +
 dev/packages/xfp.json                         |    7 +
 dev/packages/xintcfrac.json                   |   10 +-
 dev/packages/xlop.json                        |   12 +
 dev/packages/xob-font.json                    |  117 +
 dev/packages/xpatch.json                      |   10 +
 dev/packages/xpicture.json                    |  130 +-
 dev/packages/xr-hyper.json                    |   23 +-
 dev/packages/xr.json                          |   32 +
 dev/packages/xskak.json                       |    3 +
 dev/packages/xspace.json                      |   15 +
 dev/packages/xtemplate.json                   |   46 -
 dev/packages/xy.json                          |  370 +
 dev/packages/xymtx-pdf.json                   |   62 +-
 dev/packages/yagusylo.json                    |    2 +-
 dev/packages/ydoc.json                        |   49 +
 dev/packages/youngtab.json                    |    6 +
 dev/packages/ytableau.json                    |    6 +-
 dev/packages/zhnumber.json                    |    4 +-
 dev/packages/zref.json                        |   78 +
 dev/packages/zx-calculus.json                 |   11 +
 dev/pyintel/pkgcommand.py                     |   15 +-
 package.json                                  |   12 +
 src/compile/queue.ts                          |    5 +-
 src/preview/server.ts                         |    2 +-
 src/utils/logger.ts                           |    2 +-
 syntax/DocTeX.tmLanguage.json                 |  141 +-
 syntax/LaTeX-Workshop-Log.tmLanguage.json     |   85 +
 syntax/LaTeX.tmLanguage.json                  |  141 +-
 ...x-workshop-log-language-configuration.json |    6 +
 .../04_core_root/find_workspace/trap.tex      |    2 -
 test/units/05_compile.test.ts                 |  128 +
 viewer/components/refresh.ts                  |   10 +
 viewer/components/state.ts                    |   81 +-
 758 files changed, 76912 insertions(+), 1730 deletions(-)
 create mode 100644 dev/packages/CJK.json
 create mode 100644 dev/packages/CJKfntef.json
 create mode 100644 dev/packages/abspos.json
 create mode 100644 dev/packages/abstract.json
 create mode 100644 dev/packages/accsupp.json
 create mode 100644 dev/packages/achemso.json
 create mode 100644 dev/packages/acro.json
 create mode 100644 dev/packages/acronym.json
 create mode 100644 dev/packages/ajmacros.json
 create mode 100644 dev/packages/amsmath.json
 create mode 100644 dev/packages/answers.json
 create mode 100644 dev/packages/ar.json
 create mode 100644 dev/packages/array.json
 create mode 100644 dev/packages/arsclassica.json
 create mode 100644 dev/packages/ascmac.json
 create mode 100644 dev/packages/assoccnt.json
 create mode 100644 dev/packages/asyfig.json
 create mode 100644 dev/packages/at.json
 create mode 100644 dev/packages/atbegshi.json
 create mode 100644 dev/packages/babel.json
 create mode 100644 dev/packages/backref.json
 create mode 100644 dev/packages/balance.json
 create mode 100644 dev/packages/bangla.json
 create mode 100644 dev/packages/bewerbung.json
 create mode 100644 dev/packages/bibentry.json
 create mode 100644 dev/packages/biblatex.json
 create mode 100644 dev/packages/bibpes.json
 create mode 100644 dev/packages/bidi.json
 create mode 100644 dev/packages/bm.json
 create mode 100644 dev/packages/booktabs.json
 create mode 100644 dev/packages/calc.json
 create mode 100644 dev/packages/callouts.json
 create mode 100644 dev/packages/caption.json
 create mode 100644 dev/packages/catppuccinpalette.json
 create mode 100644 dev/packages/censor.json
 create mode 100644 dev/packages/cesenaexam.json
 create mode 100644 dev/packages/chapterbib.json
 create mode 100644 dev/packages/chemfig.json
 create mode 100644 dev/packages/chemist.json
 create mode 100644 dev/packages/chet.json
 create mode 100644 dev/packages/cite.json
 create mode 100644 dev/packages/clock.json
 create mode 100644 dev/packages/codelisting.json
 create mode 100644 dev/packages/color.json
 create mode 100644 dev/packages/colorblind.json
 create mode 100644 dev/packages/colortbl.json
 create mode 100644 dev/packages/comma.json
 create mode 100644 dev/packages/comment.json
 create mode 100644 dev/packages/commutative-diagrams.json
 create mode 100644 dev/packages/contour.json
 create mode 100644 dev/packages/contracard.json
 create mode 100644 dev/packages/cquthesis.json
 create mode 100644 dev/packages/cropmark.json
 create mode 100644 dev/packages/cursor.json
 create mode 100644 dev/packages/dad.json
 create mode 100644 dev/packages/delim.json
 create mode 100644 dev/packages/diagbox.json
 create mode 100644 dev/packages/diagram.json
 create mode 100644 dev/packages/dichokey.json
 create mode 100644 dev/packages/dline.json
 create mode 100644 dev/packages/doc.json
 create mode 100644 dev/packages/easylist.json
 create mode 100644 dev/packages/ebook.json
 create mode 100644 dev/packages/ed.json
 create mode 100644 dev/packages/eepic.json
 create mode 100644 dev/packages/elements.json
 create mode 100644 dev/packages/ellipsis.json
 create mode 100644 dev/packages/emarks.json
 create mode 100644 dev/packages/emo.json
 create mode 100644 dev/packages/emoji.json
 create mode 100644 dev/packages/endnotes.json
 create mode 100644 dev/packages/enumerate.json
 create mode 100644 dev/packages/epic.json
 create mode 100644 dev/packages/eso-pic.json
 create mode 100644 dev/packages/etoc.json
 create mode 100644 dev/packages/euler.json
 create mode 100644 dev/packages/example.json
 create mode 100644 dev/packages/exercise.json
 create mode 100644 dev/packages/exesheet.json
 create mode 100644 dev/packages/export.json
 create mode 100644 dev/packages/extract.json
 create mode 100644 dev/packages/fancyhdr.json
 create mode 100644 dev/packages/fbox.json
 create mode 100644 dev/packages/feyn.json
 create mode 100644 dev/packages/filehook.json
 create mode 100644 dev/packages/fitch.json
 create mode 100644 dev/packages/float.json
 create mode 100644 dev/packages/fltrace.json
 create mode 100644 dev/packages/fontspec.json
 create mode 100644 dev/packages/fonttable.json
 create mode 100644 dev/packages/footnote.json
 create mode 100644 dev/packages/forloop.json
 create mode 100644 dev/packages/fp.json
 create mode 100644 dev/packages/framed.json
 create mode 100644 dev/packages/functional.json
 create mode 100644 dev/packages/gb4e.json
 create mode 100644 dev/packages/gelasiomath.json
 create mode 100644 dev/packages/geometry.json
 create mode 100644 dev/packages/german.json
 create mode 100644 dev/packages/glossaries.json
 create mode 100644 dev/packages/graphics.json
 create mode 100644 dev/packages/grid.json
 create mode 100644 dev/packages/gridslides.json
 create mode 100644 dev/packages/grmath.json
 create mode 100644 dev/packages/guit.json
 create mode 100644 dev/packages/handout.json
 create mode 100644 dev/packages/hsetup.json
 create mode 100644 dev/packages/hyperref.json
 create mode 100644 dev/packages/icite.json
 create mode 100644 dev/packages/ifthen.json
 create mode 100644 dev/packages/igo.json
 create mode 100644 dev/packages/imsart.json
 create mode 100644 dev/packages/index.json
 create mode 100644 dev/packages/inputenc.json
 create mode 100644 dev/packages/intcalc.json
 create mode 100644 dev/packages/interval.json
 create mode 100644 dev/packages/invoice.json
 create mode 100644 dev/packages/ipa.json
 create mode 100644 dev/packages/ipsum.json
 create mode 100644 dev/packages/isomath.json
 create mode 100644 dev/packages/kanbun.json
 create mode 100644 dev/packages/keyval.json
 create mode 100644 dev/packages/l3sys-query.json
 create mode 100644 dev/packages/la.json
 create mode 100644 dev/packages/labels.json
 create mode 100644 dev/packages/ladder.json
 create mode 100644 dev/packages/latexscreenshooter.json
 create mode 100644 dev/packages/layout.json
 create mode 100644 dev/packages/lcd.json
 create mode 100644 dev/packages/leading.json
 create mode 100644 dev/packages/limap.json
 create mode 100644 dev/packages/linearregression.json
 create mode 100644 dev/packages/lineno.json
 create mode 100644 dev/packages/lipsum.json
 create mode 100644 dev/packages/listing.json
 create mode 100644 dev/packages/listings.json
 create mode 100644 dev/packages/listingsutf8.json
 create mode 100644 dev/packages/lmodern.json
 create mode 100644 dev/packages/longtable.json
 create mode 100644 dev/packages/lscape.json
 create mode 100644 dev/packages/ltxdockit.json
 create mode 100644 dev/packages/luatex.json
 create mode 100644 dev/packages/luwiantype.json
 create mode 100644 dev/packages/makeidx.json
 create mode 100644 dev/packages/mathtools.json
 create mode 100644 dev/packages/memoize.json
 create mode 100644 dev/packages/memory.json
 create mode 100644 dev/packages/menu.json
 create mode 100644 dev/packages/merge.json
 create mode 100644 dev/packages/minted.json
 create mode 100644 dev/packages/mlist.json
 create mode 100644 dev/packages/multicol.json
 create mode 100644 dev/packages/multilang.json
 create mode 100644 dev/packages/nameref.json
 create mode 100644 dev/packages/nextpage.json
 create mode 100644 dev/packages/nth.json
 create mode 100644 dev/packages/numprint.json
 create mode 100644 dev/packages/ocgx.json
 create mode 100644 dev/packages/optional.json
 create mode 100644 dev/packages/options.json
 create mode 100644 dev/packages/otf.json
 create mode 100644 dev/packages/pagegrid.json
 create mode 100644 dev/packages/parallel.json
 create mode 100644 dev/packages/parcolumns.json
 create mode 100644 dev/packages/parskip.json
 create mode 100644 dev/packages/passopt.json
 create mode 100644 dev/packages/path.json
 create mode 100644 dev/packages/pbox.json
 create mode 100644 dev/packages/perpage.json
 create mode 100644 dev/packages/pgfmath.json
 create mode 100644 dev/packages/piano.json
 create mode 100644 dev/packages/pict2e.json
 create mode 100644 dev/packages/picture.json
 create mode 100644 dev/packages/pinyin.json
 create mode 100644 dev/packages/platex.json
 create mode 100644 dev/packages/poster.json
 create mode 100644 dev/packages/printlen.json
 create mode 100644 dev/packages/proof.json
 create mode 100644 dev/packages/pseudocode.json
 create mode 100644 dev/packages/pst-pdf.json
 create mode 100644 dev/packages/ptex.json
 create mode 100644 dev/packages/pygmentex.json
 create mode 100644 dev/packages/pylatex.json
 create mode 100644 dev/packages/qcm.json
 create mode 100644 dev/packages/qrcode.json
 create mode 100644 dev/packages/qtree.json
 create mode 100644 dev/packages/quantikz.json
 create mode 100644 dev/packages/randbild.json
 create mode 100644 dev/packages/rigidnotation.json
 create mode 100644 dev/packages/ruby.json
 create mode 100644 dev/packages/schwalbe.json
 create mode 100644 dev/packages/scrbase.json
 create mode 100644 dev/packages/semantex.json
 create mode 100644 dev/packages/semantic.json
 create mode 100644 dev/packages/semesterplannerlua.json
 create mode 100644 dev/packages/sets.json
 create mode 100644 dev/packages/setspace.json
 create mode 100644 dev/packages/shadow.json
 create mode 100644 dev/packages/shadowtext.json
 create mode 100644 dev/packages/siunitx.json
 create mode 100644 dev/packages/skak.json
 create mode 100644 dev/packages/skillicons.json
 create mode 100644 dev/packages/sparklines.json
 create mode 100644 dev/packages/spelatex.json
 create mode 100644 dev/packages/spotcolor.json
 create mode 100644 dev/packages/sseq.json
 create mode 100644 dev/packages/stack.json
 create mode 100644 dev/packages/stackengine.json
 create mode 100644 dev/packages/standalone.json
 create mode 100644 dev/packages/standardsectioning.json
 create mode 100644 dev/packages/statistics.json
 create mode 100644 dev/packages/stex.json
 create mode 100644 dev/packages/sudoku.json
 create mode 100644 dev/packages/suffix.json
 create mode 100644 dev/packages/sverb.json
 create mode 100644 dev/packages/svg.json
 create mode 100644 dev/packages/tableof.json
 create mode 100644 dev/packages/tabu.json
 create mode 100644 dev/packages/ted.json
 create mode 100644 dev/packages/tensor.json
 create mode 100644 dev/packages/tex.json
 create mode 100644 dev/packages/theorem.json
 create mode 100644 dev/packages/tikz.json
 create mode 100644 dev/packages/tikzinput.json
 create mode 100644 dev/packages/tikzlings.json
 create mode 100644 dev/packages/time.json
 create mode 100644 dev/packages/titleref.json
 create mode 100644 dev/packages/tocbasic.json
 create mode 100644 dev/packages/todo.json
 create mode 100644 dev/packages/todonotes.json
 create mode 100644 dev/packages/tone.json
 create mode 100644 dev/packages/toolbox.json
 create mode 100644 dev/packages/toptesi.json
 create mode 100644 dev/packages/totpages.json
 create mode 100644 dev/packages/trace.json
 create mode 100644 dev/packages/translations.json
 create mode 100644 dev/packages/translator.json
 create mode 100644 dev/packages/trees.json
 create mode 100644 dev/packages/trig.json
 create mode 100644 dev/packages/truncate.json
 create mode 100644 dev/packages/truthtable.json
 create mode 100644 dev/packages/twemojis.json
 create mode 100644 dev/packages/ucs.json
 create mode 100644 dev/packages/ucshyper.json
 create mode 100644 dev/packages/uni.json
 create mode 100644 dev/packages/units.json
 create mode 100644 dev/packages/upmethodology-document.json
 create mode 100644 dev/packages/uptex.json
 create mode 100644 dev/packages/uri.json
 create mode 100644 dev/packages/url.json
 create mode 100644 dev/packages/va.json
 create mode 100644 dev/packages/varioref.json
 create mode 100644 dev/packages/varwidth.json
 create mode 100644 dev/packages/vector.json
 create mode 100644 dev/packages/verbatim.json
 create mode 100644 dev/packages/verse.json
 create mode 100644 dev/packages/version.json
 create mode 100644 dev/packages/vowel.json
 create mode 100644 dev/packages/watermark.json
 create mode 100644 dev/packages/web.json
 create mode 100644 dev/packages/witharrows.json
 create mode 100644 dev/packages/wrapfig.json
 create mode 100644 dev/packages/xcolor.json
 create mode 100644 dev/packages/xetex.json
 create mode 100644 dev/packages/xfp.json
 create mode 100644 dev/packages/xpatch.json
 create mode 100644 dev/packages/xr.json
 create mode 100644 dev/packages/xspace.json
 create mode 100644 dev/packages/xy.json
 create mode 100644 dev/packages/ydoc.json
 create mode 100644 dev/packages/zref.json
 create mode 100644 dev/packages/zx-calculus.json
 create mode 100644 syntax/LaTeX-Workshop-Log.tmLanguage.json
 create mode 100644 syntax/latex-workshop-log-language-configuration.json
 delete mode 100644 test/fixtures/unittest/04_core_root/find_workspace/trap.tex
 create mode 100644 test/units/05_compile.test.ts

diff --git a/data/packages/algorithm2e.json b/data/packages/algorithm2e.json
index 638aba744..567c2875f 100644
--- a/data/packages/algorithm2e.json
+++ b/data/packages/algorithm2e.json
@@ -428,6 +428,9 @@
     "Begin{}": {
       "snippet": "Begin{${1:block inside}}"
     },
+    "Begin(){}": {
+      "snippet": "Begin(${2:begin comment}){${1:block inside}}"
+    },
     "tcc{}": {
       "snippet": "tcc{${1:comments}}"
     },
@@ -449,90 +452,189 @@
     "If{}{}": {
       "snippet": "If{${1:condition}}{${2:then block}}"
     },
+    "If(){}{}": {
+      "snippet": "If(${3:then comment}){${1:condition}}{${2:then block}}"
+    },
     "uIf{}{}": {
       "snippet": "uIf{${1:condition}}{${2:then block without end}}"
     },
+    "uIf(){}{}": {
+      "snippet": "uIf(${3:then comment}){${1:condition}}{${2:then block without end}}"
+    },
     "lIf{}{}": {
       "snippet": "lIf{${1:condition}}{${2:then line}}"
     },
+    "lIf(){}{}": {
+      "snippet": "lIf(${3:if comment}){${1:condition}}{${2:then line}}"
+    },
     "ElseIf{}": {
       "snippet": "ElseIf{${1:elseif block}}"
     },
+    "ElseIf(){}": {
+      "snippet": "ElseIf(${2:elseif comment}){${1:elseif block}}"
+    },
     "uElseIf{}": {
       "snippet": "uElseIf{${1:elseif block without end}}"
     },
+    "uElseIf(){}": {
+      "snippet": "uElseIf(${2:elseif comment}){${1:elseif block without end}}"
+    },
     "lElseIf{}": {
       "snippet": "lElseIf{${1:elseif line}}"
     },
+    "lElseif(){}": {
+      "snippet": "lElseif(${2:elseif line}){${1:elseif block}}"
+    },
     "Else{}": {
       "snippet": "Else{${1:else block}}"
     },
+    "Else(){}": {
+      "snippet": "Else(${2:else comment}){${1:else block}}"
+    },
     "uElse{}": {
       "snippet": "uElse{${1:else block without end}}"
     },
+    "uElse(){}": {
+      "snippet": "uElse(${2:else block comment}){${1:else block without end}}"
+    },
     "lElse{}": {
       "snippet": "lElse{${1:else line}}"
     },
+    "lElse(){}": {
+      "snippet": "lElse(${2:else comment}){${1:else line}}"
+    },
     "eIf{}{}{}": {
       "snippet": "eIf{${1:condition}}{${2:then block}}{${3:else block}}"
     },
+    "eIf(){}{}(){}": {
+      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}(${5:else comment}){${3:else block}}"
+    },
+    "eIf(){}{}{}": {
+      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}{${3:else block}}"
+    },
+    "eIf{}{}(){}": {
+      "snippet": "eIf{${1:condition}}{${2:then block}}(${4:else comment}){${3:else block}}"
+    },
     "leIf{}{}{}": {
       "snippet": "leIf{${1:condition}}{${2:then line}}{${3:else line}}"
     },
+    "leIf(){}{}{}": {
+      "snippet": "leIf(${4:comment}){${1:condition}}{${2:then line}}{${3:else line}}"
+    },
+    "Switch(){}{}": {
+      "snippet": "Switch(${3:switch comment}){${1:condition}}{${2:switch block}}"
+    },
     "Switch{}{}": {
       "snippet": "Switch{${1:condition}}{${2:switch block}}"
     },
     "Case{}{}": {
       "snippet": "Case{${1:case}}{${2:case block}}"
     },
+    "Case(){}{}": {
+      "snippet": "Case(${3:case comment}){${1:case}}{${2:case block}}"
+    },
     "uCase{}{}": {
       "snippet": "uCase{${1:case}}{${2:case block without end}}"
     },
+    "uCase(){}{}": {
+      "snippet": "uCase(${3:case comment}){${1:case}}{${2:case block without end}}"
+    },
     "lCase{}{}": {
       "snippet": "lCase{${1:case}}{${2:case line}}"
     },
+    "lCase(){}{}": {
+      "snippet": "lCase(${3:case comment}){${1:case}}{${2:case line}}"
+    },
     "Other{}": {
       "snippet": "Other{${1:otherwise block}}"
     },
+    "Other(){}": {
+      "snippet": "Other(${2:other comment}){${1:otherwise block}}"
+    },
     "uOther{}": {
       "snippet": "uOther{${1:otherwise text}}"
     },
+    "uOther(){}": {
+      "snippet": "uOther(${2:other comment}){${1:otherwise text}}"
+    },
     "lOther{}": {
       "snippet": "lOther{${1:otherwise line}}"
     },
+    "lOther(){}": {
+      "snippet": "lOther(${2:other comment}){${1:otherwise line}}"
+    },
     "For{}{}": {
       "snippet": "For{${1:condition}}{${2:for block}}"
     },
+    "For(){}{}": {
+      "snippet": "For(${3:for comment}){${1:condition}}{${2:for block}}"
+    },
     "lFor{}{}": {
       "snippet": "lFor{${1:condition}}{${2:for line}}"
     },
+    "lFor(){}{}": {
+      "snippet": "lFor(${3:for comment}){${1:condition}}{${2:for line}}"
+    },
     "While{}{}": {
       "snippet": "While{${1:condition}}{${2:while block}}"
     },
+    "While(){}{}": {
+      "snippet": "While(${3:while comment}){${1:condition}}{${2:while block}}"
+    },
     "lWhile{}{}": {
       "snippet": "lWhile{${1:condition}}{${2:while line}}"
     },
+    "lWhile(){}{}": {
+      "snippet": "lWhile(${3:while comment}){${1:condition}}{${2:while line}}"
+    },
     "ForPar{}{}": {
       "snippet": "ForPar{${1:condition}}{${2:foreach block}}"
     },
+    "ForPar(){}{}": {
+      "snippet": "ForPar(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
+    },
     "ForEach{}{}": {
       "snippet": "ForEach{${1:condition}}{${2:foreach block}}"
     },
+    "ForEach(){}{}": {
+      "snippet": "ForEach(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
+    },
     "lForEach{}{}": {
       "snippet": "lForEach{${1:condition}}{${2:foreach line}}"
     },
+    "lForEach(){}{}": {
+      "snippet": "lForEach(${3:foreach comment}){${1:condition}}{${2:foreach line}}"
+    },
     "ForAll{}{}": {
       "snippet": "ForAll{${1:condition}}{${2:forall block}}"
     },
+    "ForAll(){}{}": {
+      "snippet": "ForAll(${3:forall comment}){${1:condition}}{${2:forall block}}"
+    },
     "lForAll{}{}": {
       "snippet": "lForAll{${1:condition}}{${2:forall line}}"
     },
+    "lForAll(){}{}": {
+      "snippet": "lForAll(${3:forall comment}){${1:condition}}{${2:forall line}}"
+    },
     "Repeat{}{}": {
       "snippet": "Repeat{${1:end condition}}{${2:repeat block}}"
     },
+    "Repeat(){}{}()": {
+      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}(${4:until comment})"
+    },
+    "Repeat(){}{}": {
+      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}"
+    },
+    "Repeat{}{}()": {
+      "snippet": "Repeat{${1:end condition}}{${2:repeat block}}(${3:until comment})"
+    },
     "lRepeat{}{}": {
       "snippet": "lRepeat{${1:end condition}}{${2:repeat line}}"
     },
+    "lRepeat(){}{}": {
+      "snippet": "lRepeat(${3:repeat comment}){${1:end condition}}{${2:repeat line}}"
+    },
     "SetKwInput{}{}": {
       "snippet": "SetKwInput{${1:csname}}{${2:name}}"
     },
diff --git a/data/packages/babel.json b/data/packages/babel.json
index 144f86b60..4c9160cc6 100644
--- a/data/packages/babel.json
+++ b/data/packages/babel.json
@@ -25,7 +25,7 @@
       "keyvalpos": 0
     },
     "babeltags{}": {
-      "snippet": "babeltags{${1:tag1=lang1,tag2=lang2,...}}"
+      "snippet": "babeltags{${1:tag1=lang1,${2:tag2=lang2},...}}"
     },
     "babelensure{}": {
       "snippet": "babelensure{${1:language}}"
@@ -54,7 +54,7 @@
       "snippet": "defineshorthand{${1:shorthand}}{${2:code}}"
     },
     "defineshorthand[]{}{}": {
-      "snippet": "defineshorthand[${3:lang1,lang2,...}]{${1:shorthand}}{${2:code}}"
+      "snippet": "defineshorthand[${3:lang1,${4:lang2},...}]{${1:shorthand}}{${2:code}}"
     },
     "languageshorthands{}": {
       "snippet": "languageshorthands{${1:language}}"
@@ -79,10 +79,10 @@
       "snippet": "babelfont{${1:font_family}}[${2:font_options}]{${3:font_name}}"
     },
     "babelfont[]{}{}": {
-      "snippet": "babelfont[${3:lang1,lang2,...}]{${1:font_family}}{${2:font_name}}"
+      "snippet": "babelfont[${3:lang1,${4:lang2},...}]{${1:font_family}}{${2:font_name}}"
     },
     "babelfont[]{}[]{}": {
-      "snippet": "babelfont[${3:lang1,lang2,...}]{${1:font_family}}[${4:font_options}]{${2:font_name}}"
+      "snippet": "babelfont[${3:lang1,${5:lang2},...}]{${1:font_family}}[${4:font_options}]{${2:font_name}}"
     },
     "setlocalecaption{}{}{}": {
       "snippet": "setlocalecaption{${1:language}}{${2:caption_name}}{${3:string}}"
@@ -153,13 +153,13 @@
       "snippet": "babelhyphenation{${1:exceptions}}"
     },
     "babelhyphenation[]{}": {
-      "snippet": "babelhyphenation[${2:lang1,lang2,...}]{${1:exceptions}}"
+      "snippet": "babelhyphenation[${2:lang1,${3:lang2},...}]{${1:exceptions}}"
     },
     "babelpatterns{}": {
       "snippet": "babelpatterns{${1:patterns}}"
     },
     "babelpatterns[]{}": {
-      "snippet": "babelpatterns[${2:lang1,lang2,...}]{${1:patterns}}"
+      "snippet": "babelpatterns[${2:lang1,${3:lang2},...}]{${1:patterns}}"
     },
     "babelposthyphenation{}{}{}": {
       "snippet": "babelposthyphenation{${1:hypenrules-name}}{${2:lua-pattern}}{${3:replacement}}"
@@ -308,6 +308,8 @@
       "snippet": "AfterBabelCommands{${1:code}}"
     },
     "allowhyphens": {},
+    "BabelCJKGlue": {},
+    "BabelCJKSpace": {},
     "BabelDated{}": {
       "snippet": "BabelDated{${1:arg}}"
     },
@@ -1331,6 +1333,9 @@
     "FBfnindent": {
       "option": "acadian"
     },
+    "FBfnmarkspace": {
+      "option": "acadian"
+    },
     "FBFrenchFootnotesfalse": {
       "option": "acadian"
     },
@@ -1433,6 +1438,9 @@
     "fgii": {
       "option": "acadian"
     },
+    "fprimo)": {
+      "option": "acadian"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "acadian"
@@ -1546,9 +1554,6 @@
     "ifFBPartNameFull": {
       "option": "acadian"
     },
-    "ifFBReduceListSpacing": {
-      "option": "acadian"
-    },
     "ifFBShowOptions": {
       "option": "acadian"
     },
@@ -2926,6 +2931,14 @@
       "snippet": "Apageref{${1:label}}",
       "option": "hungarian"
     },
+    "aref({})": {
+      "snippet": "aref(${2:{${1:label}}})",
+      "option": "hungarian"
+    },
+    "Aref({})": {
+      "snippet": "Aref(${2:{${1:label}}})",
+      "option": "hungarian"
+    },
     "aref*{}": {
       "snippet": "aref*{${1:label}}",
       "option": "hungarian"
diff --git a/data/packages/beamerbaseframesize.json b/data/packages/beamerbaseframesize.json
index 967a6e8c0..349c7ecb2 100644
--- a/data/packages/beamerbaseframesize.json
+++ b/data/packages/beamerbaseframesize.json
@@ -1,11 +1,24 @@
 {
   "includes": {},
   "macros": {
+    "framezoom<><>()()": {
+      "snippet": "framezoom<${1:button overlay specification}><${2:zoomed overlay specification}>(${3:upper left x},${4:upper left y})(${5:zoom area width},${6:zoom area depth})"
+    },
+    "framezoom<><>[]()()": {
+      "snippet": "framezoom<${2:button overlay specification}><${3:zoomed overlay specification}>[${1:options}](${4:upper left x},${5:upper left y})(${6:zoom area width},${7:zoom area depth})",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
     "insertcontinuationcount": {},
     "insertcontinuationcountroman": {},
     "insertcontinuationtext": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": []
+  "keyvals": [
+    [
+      "border",
+      "border=${1:width in pixels}"
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/data/packages/biblatex.json b/data/packages/biblatex.json
index 78057dfd3..19557d681 100644
--- a/data/packages/biblatex.json
+++ b/data/packages/biblatex.json
@@ -377,32 +377,32 @@
     },
     "endrefcontext": {},
     "assignrefcontextkeyws[]{}": {
-      "snippet": "assignrefcontextkeyws[${2:options}]{${1:keyword1,keyword2,...}}",
+      "snippet": "assignrefcontextkeyws[${2:options}]{${1:keyword1,${3:keyword2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextkeyws*[]{}": {
-      "snippet": "assignrefcontextkeyws*[${2:options}]{${1:keyword1,keyword2,...}}",
+      "snippet": "assignrefcontextkeyws*[${2:options}]{${1:keyword1,${3:keyword2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextcats[]{}": {
-      "snippet": "assignrefcontextcats[${2:options}]{${1:category1,category2,...}}",
+      "snippet": "assignrefcontextcats[${2:options}]{${1:category1,${3:category2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextcats*[]{}": {
-      "snippet": "assignrefcontextcats*[${2:options}]{${1:category1,category2,...}}",
+      "snippet": "assignrefcontextcats*[${2:options}]{${1:category1,${3:category2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextentries[]{}": {
-      "snippet": "assignrefcontextentries[${2:options}]{${1:entrykey1,entrykey2,...}}",
+      "snippet": "assignrefcontextentries[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextentries*[]{}": {
-      "snippet": "assignrefcontextentries*[${2:options}]{${1:entrykey1,entrykey2,...}}",
+      "snippet": "assignrefcontextentries*[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
@@ -412,7 +412,7 @@
       "keyvalpos": 0
     },
     "defbibentryset{}{}": {
-      "snippet": "defbibentryset{${1:bibid}}{${2:key1,key2,...}}"
+      "snippet": "defbibentryset{${1:bibid}}{${2:key1,${3:key2},...}}"
     },
     "cite[][]{}": {
       "snippet": "cite[${2:prenote}][${3:postnote}]{${1:bibid}}"
@@ -517,102 +517,234 @@
     "cites{}{}": {
       "snippet": "cites{${1:bibid}}{${2:bibid}}"
     },
+    "cites(){}{}": {
+      "snippet": "cites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "cites()(){}{}": {
+      "snippet": "cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "cites()()[]{}[]{}": {
+      "snippet": "cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "cites[]{}[]{}": {
       "snippet": "cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "cites[][]{}[][]{}": {
       "snippet": "cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "cites()()[][]{}[][]{}": {
+      "snippet": "cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Cites{}{}": {
       "snippet": "Cites{${1:bibid}}{${2:bibid}}"
     },
+    "Cites(){}{}": {
+      "snippet": "Cites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Cites()(){}{}": {
+      "snippet": "Cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Cites()()[]{}[]{}": {
+      "snippet": "Cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "Cites[]{}[]{}": {
       "snippet": "Cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Cites[][]{}[][]{}": {
       "snippet": "Cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Cites()()[][]{}[][]{}": {
+      "snippet": "Cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "parencites{}{}": {
       "snippet": "parencites{${1:bibid}}{${2:bibid}}"
     },
+    "parencites(){}{}": {
+      "snippet": "parencites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "parencites()(){}{}": {
+      "snippet": "parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "parencites()()[]{}[]{}": {
+      "snippet": "parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "parencites[]{}[]{}": {
       "snippet": "parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "parencites[][]{}[][]{}": {
       "snippet": "parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "parencites()()[][]{}[][]{}": {
+      "snippet": "parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Parencites{}{}": {
       "snippet": "Parencites{${1:bibid}}{${2:bibid}}"
     },
+    "Parencites(){}{}": {
+      "snippet": "Parencites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Parencites()(){}{}": {
+      "snippet": "Parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Parencites()()[]{}[]{}": {
+      "snippet": "Parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "Parencites[]{}[]{}": {
       "snippet": "Parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Parencites[][]{}[][]{}": {
       "snippet": "Parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Parencites()()[][]{}[][]{}": {
+      "snippet": "Parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "footcites{}{}": {
       "snippet": "footcites{${1:bibid}}{${2:bibid}}"
     },
+    "footcites(){}{}": {
+      "snippet": "footcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcites()(){}{}": {
+      "snippet": "footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcites()()[]{}[]{}": {
+      "snippet": "footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "footcites[]{}[]{}": {
       "snippet": "footcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "footcites[][]{}[][]{}": {
       "snippet": "footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "footcites()()[][]{}[][]{}": {
+      "snippet": "footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "footcitetexts{}{}": {
       "snippet": "footcitetexts{${1:bibid}}{${2:bibid}}"
     },
+    "footcitetexts(){}{}": {
+      "snippet": "footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcitetexts()(){}{}": {
+      "snippet": "footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcitetexts()()[]{}[]{}": {
+      "snippet": "footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "footcitetexts[]{}[]{}": {
       "snippet": "footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "footcitetexts[][]{}[][]{}": {
       "snippet": "footcitetexts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "footcitetexts()()[][]{}[][]{}": {
+      "snippet": "footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "smartcites{}{}": {
       "snippet": "smartcites{${1:bibid}}{${2:bibid}}"
     },
+    "smartcites(){}{}": {
+      "snippet": "smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "smartcites()(){}{}": {
+      "snippet": "smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "smartcites()()[]{}[]{}": {
+      "snippet": "smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "smartcites[]{}[]{}": {
       "snippet": "smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "smartcites[][]{}[][]{}": {
       "snippet": "smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "smartcites()()[][]{}[][]{}": {
+      "snippet": "smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Smartcites{}{}": {
       "snippet": "Smartcites{${1:bibid}}{${2:bibid}}"
     },
+    "Smartcites(){}{}": {
+      "snippet": "Smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Smartcites()(){}{}": {
+      "snippet": "Smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Smartcites()()[]{}[]{}": {
+      "snippet": "Smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "Smartcites[]{}[]{}": {
       "snippet": "Smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Smartcites[][]{}[][]{}": {
       "snippet": "Smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Smartcites()()[][]{}[][]{}": {
+      "snippet": "Smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "textcites{}{}": {
       "snippet": "textcites{${1:bibid}}{${2:bibid}}"
     },
+    "textcites(){}{}": {
+      "snippet": "textcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "textcites()(){}{}": {
+      "snippet": "textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "textcites()()[]{}[]{}": {
+      "snippet": "textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "textcites[]{}[]{}": {
       "snippet": "textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "textcites[][]{}[][]{}": {
       "snippet": "textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "textcites()()[][]{}[][]{}": {
+      "snippet": "textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Textcites{}{}": {
       "snippet": "Textcites{${1:bibid}}{${2:bibid}}"
     },
+    "Textcites(){}{}": {
+      "snippet": "Textcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Textcites()(){}{}": {
+      "snippet": "Textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Textcites()()[]{}[]{}": {
+      "snippet": "Textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "Textcites[]{}[]{}": {
       "snippet": "Textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Textcites[][]{}[][]{}": {
       "snippet": "Textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Textcites()()[][]{}[][]{}": {
+      "snippet": "Textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "supercites{}{}": {
       "snippet": "supercites{${1:bibid}}{${2:bibid}}"
     },
+    "supercites(){}{}": {
+      "snippet": "supercites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "supercites()(){}{}": {
+      "snippet": "supercites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "supercites()()[]{}[]{}": {
+      "snippet": "supercites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "supercites[]{}[]{}": {
       "snippet": "supercites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "supercites[][]{}[][]{}": {
       "snippet": "supercites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "supercites()()[][]{}[][]{}": {
+      "snippet": "supercites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "autocite[][]{}": {
       "snippet": "autocite[${2:prenote}][${3:postnote}]{${1:bibid}}"
     },
@@ -652,21 +784,45 @@
     "autocites{}{}": {
       "snippet": "autocites{${1:bibid}}{${2:bibid}}"
     },
+    "autocites(){}{}": {
+      "snippet": "autocites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "autocites()(){}{}": {
+      "snippet": "autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "autocites()()[]{}[]{}": {
+      "snippet": "autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "autocites[]{}[]{}": {
       "snippet": "autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "autocites[][]{}[][]{}": {
       "snippet": "autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "autocites()()[][]{}[][]{}": {
+      "snippet": "autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Autocites{}{}": {
       "snippet": "Autocites{${1:bibid}}{${2:bibid}}"
     },
+    "Autocites(){}{}": {
+      "snippet": "Autocites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Autocites()(){}{}": {
+      "snippet": "Autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Autocites()()[]{}[]{}": {
+      "snippet": "Autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "Autocites[]{}[]{}": {
       "snippet": "Autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Autocites[][]{}[][]{}": {
       "snippet": "Autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Autocites()()[][]{}[][]{}": {
+      "snippet": "Autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "citeauthor[][]{}": {
       "snippet": "citeauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "natbib=true"
@@ -838,21 +994,45 @@
     "volcites{}{}{}{}": {
       "snippet": "volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "volcites(){}{}{}{}": {
+      "snippet": "volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "volcites()(){}{}{}{}": {
+      "snippet": "volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "volcites()()[]{}{}[]{}{}": {
+      "snippet": "volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "volcites[]{}{}[]{}{}": {
       "snippet": "volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "volcites[][]{}{}[][]{}{}": {
       "snippet": "volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "volcites()()[][]{}{}[][]{}{}": {
+      "snippet": "volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "Volcites{}{}{}{}": {
       "snippet": "Volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "Volcites(){}{}{}{}": {
+      "snippet": "Volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites()(){}{}{}{}": {
+      "snippet": "Volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites()()[]{}{}[]{}{}": {
+      "snippet": "Volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "Volcites[]{}{}[]{}{}": {
       "snippet": "Volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Volcites[][]{}{}[][]{}{}": {
       "snippet": "Volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "Volcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "pvolcite{}{}": {
       "snippet": "pvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -880,21 +1060,45 @@
     "pvolcites{}{}{}{}": {
       "snippet": "pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "pvolcites(){}{}{}{}": {
+      "snippet": "pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites()(){}{}{}{}": {
+      "snippet": "pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites()()[]{}{}[]{}{}": {
+      "snippet": "pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "pvolcites[]{}{}[]{}{}": {
       "snippet": "pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "pvolcites[][]{}{}[][]{}{}": {
       "snippet": "pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "pvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "Pvolcites{}{}{}{}": {
       "snippet": "Pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "Pvolcites(){}{}{}{}": {
+      "snippet": "Pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites()(){}{}{}{}": {
+      "snippet": "Pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "Pvolcites[]{}{}[]{}{}": {
       "snippet": "Pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Pvolcites[][]{}{}[][]{}{}": {
       "snippet": "Pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "Pvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "fvolcite{}{}": {
       "snippet": "fvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -922,21 +1126,45 @@
     "fvolcites{}{}{}{}": {
       "snippet": "fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "fvolcites(){}{}{}{}": {
+      "snippet": "fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites()(){}{}{}{}": {
+      "snippet": "fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites()()[]{}{}[]{}{}": {
+      "snippet": "fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "fvolcites[]{}{}[]{}{}": {
       "snippet": "fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "fvolcites[][]{}{}[][]{}{}": {
       "snippet": "fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "fvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "Fvolcites{}{}{}{}": {
       "snippet": "Fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "Fvolcites(){}{}{}{}": {
+      "snippet": "Fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites()(){}{}{}{}": {
+      "snippet": "Fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "Fvolcites[]{}{}[]{}{}": {
       "snippet": "Fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Fvolcites[][]{}{}[][]{}{}": {
       "snippet": "Fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "Fvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "ftvolcite{}{}": {
       "snippet": "ftvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -964,21 +1192,45 @@
     "ftvolcites{}{}{}{}": {
       "snippet": "ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "ftvolcites(){}{}{}{}": {
+      "snippet": "ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites()(){}{}{}{}": {
+      "snippet": "ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites()()[]{}{}[]{}{}": {
+      "snippet": "ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "ftvolcites[]{}{}[]{}{}": {
       "snippet": "ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "ftvolcites[][]{}{}[][]{}{}": {
       "snippet": "ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "ftvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "Ftvolcites{}{}{}{}": {
       "snippet": "Ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "Ftvolcites(){}{}{}{}": {
+      "snippet": "Ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites()(){}{}{}{}": {
+      "snippet": "Ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "Ftvolcites[]{}{}[]{}{}": {
       "snippet": "Ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Ftvolcites[][]{}{}[][]{}{}": {
       "snippet": "Ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "Ftvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "svolcite{}{}": {
       "snippet": "svolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1006,21 +1258,45 @@
     "svolcites{}{}{}{}": {
       "snippet": "svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "svolcites(){}{}{}{}": {
+      "snippet": "svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites()(){}{}{}{}": {
+      "snippet": "svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites()()[]{}{}[]{}{}": {
+      "snippet": "svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "svolcites[]{}{}[]{}{}": {
       "snippet": "svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "svolcites[][]{}{}[][]{}{}": {
       "snippet": "svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "svolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "Svolcites{}{}{}{}": {
       "snippet": "Svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "Svolcites(){}{}{}{}": {
+      "snippet": "Svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites()(){}{}{}{}": {
+      "snippet": "Svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites()()[]{}{}[]{}{}": {
+      "snippet": "Svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "Svolcites[]{}{}[]{}{}": {
       "snippet": "Svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Svolcites[][]{}{}[][]{}{}": {
       "snippet": "Svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "Svolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "tvolcite{}{}": {
       "snippet": "tvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1048,21 +1324,45 @@
     "tvolcites{}{}{}{}": {
       "snippet": "tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "tvolcites(){}{}{}{}": {
+      "snippet": "tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites()(){}{}{}{}": {
+      "snippet": "tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites()()[]{}{}[]{}{}": {
+      "snippet": "tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "tvolcites[]{}{}[]{}{}": {
       "snippet": "tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "tvolcites[][]{}{}[][]{}{}": {
       "snippet": "tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "tvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "Tvolcites{}{}{}{}": {
       "snippet": "Tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "Tvolcites(){}{}{}{}": {
+      "snippet": "Tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites()(){}{}{}{}": {
+      "snippet": "Tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "Tvolcites[]{}{}[]{}{}": {
       "snippet": "Tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Tvolcites[][]{}{}[][]{}{}": {
       "snippet": "Tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "Tvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "avolcite{}{}": {
       "snippet": "avolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1090,21 +1390,45 @@
     "avolcites{}{}{}{}": {
       "snippet": "avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "avolcites(){}{}{}{}": {
+      "snippet": "avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites()(){}{}{}{}": {
+      "snippet": "avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites()()[]{}{}[]{}{}": {
+      "snippet": "avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "avolcites[]{}{}[]{}{}": {
       "snippet": "avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "avolcites[][]{}{}[][]{}{}": {
       "snippet": "avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "avolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "Avolcites{}{}{}{}": {
       "snippet": "Avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
+    "Avolcites(){}{}{}{}": {
+      "snippet": "Avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites()(){}{}{}{}": {
+      "snippet": "Avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites()()[]{}{}[]{}{}": {
+      "snippet": "Avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
     "Avolcites[]{}{}[]{}{}": {
       "snippet": "Avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Avolcites[][]{}{}[][]{}{}": {
       "snippet": "Avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
+    "Avolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
     "notecite[][]{}": {
       "snippet": "notecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
     },
@@ -3482,7 +3806,7 @@
       "snippet": "texouterlang{${1:text}}"
     },
     "DeclareBibstringSet{}{}": {
-      "snippet": "DeclareBibstringSet{${1:name}}{${2:key1,key2,...}}"
+      "snippet": "DeclareBibstringSet{${1:name}}{${2:key1,${3:key2},...}}"
     },
     "UndeclareBibstringSet{}": {
       "snippet": "UndeclareBibstringSet{${1:name}}"
@@ -3812,6 +4136,18 @@
     "Footcite{}": {
       "snippet": "Footcite{${1:bibid}}"
     },
+    "Footcites()()[][]{}[][]{}": {
+      "snippet": "Footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Footcites()()[]{}[]{}": {
+      "snippet": "Footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Footcites()(){}{}": {
+      "snippet": "Footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Footcites(){}{}": {
+      "snippet": "Footcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
     "Footcites[][]{}[][]{}": {
       "snippet": "Footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
@@ -3830,6 +4166,18 @@
     "Footcitetext{}": {
       "snippet": "Footcitetext{${1:bibid}}"
     },
+    "Footcitetexts(){}{}": {
+      "snippet": "Footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Footcitetexts()()[]{}[]{}": {
+      "snippet": "Footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Footcitetexts()()[][]{}[][]{}": {
+      "snippet": "Footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Footcitetexts()(){}{}": {
+      "snippet": "Footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
     "Footcitetexts[]{}[]{}": {
       "snippet": "Footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
@@ -3968,6 +4316,18 @@
       "snippet": "apud{${1:bibid}}{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
+    "apud(){}{}": {
+      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud()(){}{}": {
+      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud()()[]{}[]{}": {
+      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
     "apud[]{}[]{}": {
       "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
@@ -3976,6 +4336,10 @@
       "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
+    "apud()()[][]{}[][]{}": {
+      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
     "plaincite[][]{}": {
       "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "style=abnt"
@@ -4228,6 +4592,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "style=apa6"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=apa6"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=apa6"
@@ -4236,6 +4612,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=apa6"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=apa6"
+    },
     "arthistoryversion": {
       "option": "style=arthistory-bonn"
     },
@@ -4653,6 +5033,18 @@
       "snippet": "citets{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
+    "citets(){}{}": {
+      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets()(){}{}": {
+      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets()()[]{}[]{}": {
+      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
     "citets[]{}[]{}": {
       "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
@@ -4661,10 +5053,26 @@
       "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
+    "citets()()[][]{}[][]{}": {
+      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
     "Citets{}{}": {
       "snippet": "Citets{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citets(){}{}": {
+      "snippet": "Citets(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets()(){}{}": {
+      "snippet": "Citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets()()[]{}[]{}": {
+      "snippet": "Citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "Citets[]{}[]{}": {
       "snippet": "Citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -4673,10 +5081,26 @@
       "snippet": "Citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citets()()[][]{}[][]{}": {
+      "snippet": "Citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "citealts{}{}": {
       "snippet": "citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "citealts(){}{}": {
+      "snippet": "citealts(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts()(){}{}": {
+      "snippet": "citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts()()[]{}[]{}": {
+      "snippet": "citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "citealts[]{}[]{}": {
       "snippet": "citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -4685,10 +5109,26 @@
       "snippet": "citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "citealts()()[][]{}[][]{}": {
+      "snippet": "citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "Citealts{}{}": {
       "snippet": "Citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citealts(){}{}": {
+      "snippet": "Citealts(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts()(){}{}": {
+      "snippet": "Citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts()()[]{}[]{}": {
+      "snippet": "Citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "Citealts[]{}[]{}": {
       "snippet": "Citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -4697,6 +5137,10 @@
       "snippet": "Citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citealts()()[][]{}[][]{}": {
+      "snippet": "Citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "mkbibindextruename{}{}{}{}": {
       "snippet": "mkbibindextruename{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}",
       "option": "style=fiwi2"
@@ -5055,6 +5499,18 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -5063,10 +5519,26 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -5075,6 +5547,10 @@
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "dealnoathor": {
       "option": "style=thuthesis-author-year"
     },
@@ -5295,6 +5771,18 @@
       "snippet": "detailscites{${1:bibid}}{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
+    "detailscites(){}{}": {
+      "snippet": "detailscites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites()(){}{}": {
+      "snippet": "detailscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites()()[]{}[]{}": {
+      "snippet": "detailscites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
     "detailscites[]{}[]{}": {
       "snippet": "detailscites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
@@ -5303,6 +5791,10 @@
       "snippet": "detailscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
+    "detailscites()()[][]{}[][]{}": {
+      "snippet": "detailscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
     "collectionshelfmarkpunct": {
       "option": "style=oxnum"
     },
@@ -6058,6 +6550,37 @@
       "snippet": "citeitem{${1:bibid}}",
       "option": "style=publist"
     },
+    "citesecitem[][]{}": {
+      "snippet": "citesecitem[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitem[]{}": {
+      "snippet": "citesecitem[${2:postnote}]{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitem{}": {
+      "snippet": "citesecitem{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitem*{}": {
+      "snippet": "citesecitem*{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citeitemrange{}{}": {
+      "snippet": "citeitemrange{${1:bibid}}{${2:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitemrange{}{}": {
+      "snippet": "citesecitemrange{${1:bibid}}{${2:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitemrange*{}{}": {
+      "snippet": "citesecitemrange*{${1:bibid}}{${2:bibid}}",
+      "option": "style=publist"
+    },
+    "itemrangesep": {
+      "option": "style=publist"
+    },
     "shiftciteitem{}": {
       "snippet": "shiftciteitem{${1:integer}}",
       "option": "style=publist"
@@ -6066,6 +6589,9 @@
       "snippet": "mkrefdesc{${1:number}}",
       "option": "style=publist"
     },
+    "secitemsecref": {
+      "option": "style=publist"
+    },
     "theprevcrefsection": {
       "option": "style=publist"
     },
@@ -6333,6 +6859,18 @@
       "snippet": "idemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
+    "idemcites(){}{}": {
+      "snippet": "idemcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites()(){}{}": {
+      "snippet": "idemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites()()[]{}[]{}": {
+      "snippet": "idemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "idemcites[]{}[]{}": {
       "snippet": "idemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -6341,6 +6879,10 @@
       "snippet": "idemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
+    "idemcites()()[][]{}[][]{}": {
+      "snippet": "idemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "footidemcite{}": {
       "snippet": "footidemcite{${1:bibid}}",
       "option": "style=windycity"
@@ -6357,6 +6899,18 @@
       "snippet": "footidemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
+    "footidemcites(){}{}": {
+      "snippet": "footidemcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites()(){}{}": {
+      "snippet": "footidemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites()()[]{}[]{}": {
+      "snippet": "footidemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "footidemcites[]{}[]{}": {
       "snippet": "footidemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -6365,6 +6919,10 @@
       "snippet": "footidemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
+    "footidemcites()()[][]{}[][]{}": {
+      "snippet": "footidemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "parenauth{}": {
       "snippet": "parenauth{${1:bibid}}",
       "option": "style=windycity"
@@ -6381,6 +6939,18 @@
       "snippet": "parenauths{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
+    "parenauths(){}{}": {
+      "snippet": "parenauths(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths()(){}{}": {
+      "snippet": "parenauths(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths()()[]{}[]{}": {
+      "snippet": "parenauths(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "parenauths[]{}[]{}": {
       "snippet": "parenauths[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -6389,6 +6959,10 @@
       "snippet": "parenauths[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
+    "parenauths()()[][]{}[][]{}": {
+      "snippet": "parenauths(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "mkmonthrange{}{}": {
       "snippet": "mkmonthrange{${1:arg1}}{${2:arg2}}",
       "option": "style=windycity"
diff --git a/data/packages/booktabs.json b/data/packages/booktabs.json
index 7962a0fa4..e315bafad 100644
--- a/data/packages/booktabs.json
+++ b/data/packages/booktabs.json
@@ -16,6 +16,12 @@
     "cmidrule{}": {
       "snippet": "cmidrule{${1:a-b}}"
     },
+    "cmidrule(){}": {
+      "snippet": "cmidrule(${2:trim}){${1:a-b}}"
+    },
+    "cmidrule[](){}": {
+      "snippet": "cmidrule[${2:line width}](${3:trim}){${1:a-b}}"
+    },
     "morecmidrules": {},
     "specialrule{}{}{}": {
       "snippet": "specialrule{${1:line width}}{${2:above space}}{${3:below space}}"
diff --git a/data/packages/chemformula.json b/data/packages/chemformula.json
index 26d290ca6..38486ecd5 100644
--- a/data/packages/chemformula.json
+++ b/data/packages/chemformula.json
@@ -115,6 +115,9 @@
     "charrow{}[][]": {
       "snippet": "charrow{${1:type}}[${2:above}][${3:below}]"
     },
+    "chname()()": {
+      "snippet": "chname(${1:text 1})(${2:text 2})"
+    },
     "chlewis{}{}": {
       "snippet": "chlewis{${1:electron spec}}{${2:atom}}"
     },
diff --git a/data/packages/circuitikz.json b/data/packages/circuitikz.json
index 10d7aa748..b9d0a4c89 100644
--- a/data/packages/circuitikz.json
+++ b/data/packages/circuitikz.json
@@ -69,7 +69,7 @@
       "snippet": "ctikztextnot{${1:text}}"
     },
     "ctikzsubcircuitdef{}{}{}": {
-      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,anchor2,...}}{${3:definition}}"
+      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,${4:anchor2},...}}{${3:definition}}"
     },
     "ctikzsubcircuitactivate{}": {
       "snippet": "ctikzsubcircuitactivate{${1:name}}"
diff --git a/data/packages/class-altacv.json b/data/packages/class-altacv.json
index b69421c99..bbd266cda 100644
--- a/data/packages/class-altacv.json
+++ b/data/packages/class-altacv.json
@@ -145,7 +145,7 @@
     "xetexorluatextrue": {},
     "xetexorluatexfalse": {},
     "mynames{}": {
-      "snippet": "mynames{${1:name1,name2,...}}"
+      "snippet": "mynames{${1:name1,${2:name2},...}}"
     },
     "utffriendlydetokenize{}": {
       "snippet": "utffriendlydetokenize{${1:arg}}"
diff --git a/data/packages/class-memoir.json b/data/packages/class-memoir.json
index b82ea65b8..86844323f 100644
--- a/data/packages/class-memoir.json
+++ b/data/packages/class-memoir.json
@@ -835,6 +835,9 @@
     "glossary[]{}{}": {
       "snippet": "glossary[${3:file}]{${1:term}}{${2:description}}"
     },
+    "glossary[](){}{}": {
+      "snippet": "glossary[${3:file}](${4:key}){${1:term}}{${2:description}}"
+    },
     "glossarycolsep": {},
     "glossaryintoc": {},
     "glossarymark": {},
@@ -1048,6 +1051,9 @@
     "justlastraggedleft": {},
     "keepthetitle": {},
     "killtitle": {},
+    "label(){}": {
+      "snippet": "label(${2:bookmark}){${1:label}}"
+    },
     "LastFrameCommand": {},
     "lastlineparrule": {},
     "lastlinerulefill": {},
diff --git a/data/packages/class-moderncv.json b/data/packages/class-moderncv.json
index f95c8cb4d..ad8fc51b6 100644
--- a/data/packages/class-moderncv.json
+++ b/data/packages/class-moderncv.json
@@ -37,6 +37,9 @@
     "homepage{}": {
       "snippet": "homepage{${1:URL}}"
     },
+    "homepage[]{}": {
+      "snippet": "homepage[${2:protocol}]{${1:URL}}"
+    },
     "phone{}": {
       "snippet": "phone{${1:number}}"
     },
@@ -83,6 +86,17 @@
     "signalsocialsymbol": {},
     "codebergsocialsymbol": {},
     "discordsocialsymbol": {},
+    "twitchsocialsymbol": {},
+    "youtubesocialsymbol": {},
+    "tiktoksocialsymbol": {},
+    "instagramsocialsymbol": {},
+    "soundcloudsocialsymbol": {},
+    "steamsocialsymbol": {},
+    "xboxsocialsymbol": {},
+    "playstationsocialsymbol": {},
+    "battlenetsocialsymbol": {},
+    "arxivsocialsymbol": {},
+    "inspiresocialsymbol": {},
     "enclname": {},
     "makefooter": {},
     "moderncvstyle{}": {
@@ -144,6 +158,12 @@
     "namestyle{}": {
       "snippet": "namestyle{${1:text}}"
     },
+    "firstnamestyle{}": {
+      "snippet": "firstnamestyle{${1:text}}"
+    },
+    "lastnamestyle{}": {
+      "snippet": "lastnamestyle{${1:text}}"
+    },
     "titlestyle{}": {
       "snippet": "titlestyle{${1:text}}"
     },
@@ -185,6 +205,12 @@
     "cvdoubleitem[]{}{}{}{}": {
       "snippet": "cvdoubleitem[${5:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}"
     },
+    "cvtripleitem{}{}{}{}{}{}": {
+      "snippet": "cvtripleitem{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
+    },
+    "cvtripleitem[]{}{}{}{}{}{}": {
+      "snippet": "cvtripleitem[${7:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
+    },
     "cvlistitem{}": {
       "snippet": "cvlistitem{${1:item}}"
     },
@@ -262,12 +288,18 @@
     "recipient{}{}": {
       "snippet": "recipient{${1:recipient}}{${2:recipient address}}"
     },
+    "subject{}": {
+      "snippet": "subject{${1:subject}}"
+    },
     "opening{}": {
       "snippet": "opening{${1:opening}}"
     },
     "closing{}": {
       "snippet": "closing{${1:closing}}"
     },
+    "signature{}{}": {
+      "snippet": "signature{${1:scale}}{${2:imagefile}}"
+    },
     "enclosure{}": {
       "snippet": "enclosure{${1:enclosure}}"
     },
@@ -282,13 +314,16 @@
     "makeletterhead": {},
     "makeletterfoot": {},
     "makeletterclosing": {},
+    "hintscolumnwidth": {},
     "separatorcolumnwidth": {},
     "maincolumnwidth": {},
     "doubleitemcolumnwidth": {},
+    "tripleitemcolumnwidth": {},
     "separatorrulewidth": {},
     "listitemsymbolwidth": {},
     "listitemcolumnwidth": {},
     "listdoubleitemcolumnwidth": {},
+    "listitemsymbolspace": {},
     "cventryyearbox": {},
     "cventrytitleboxwidth": {},
     "cvskill{}": {
diff --git a/data/packages/class-scrlttr2.json b/data/packages/class-scrlttr2.json
index b8030dca6..7a15b64dc 100644
--- a/data/packages/class-scrlttr2.json
+++ b/data/packages/class-scrlttr2.json
@@ -268,6 +268,14 @@
     "edgesize": {
       "option": "visualize"
     },
+    "showenvelope()()": {
+      "snippet": "showenvelope(${1:width},${2:height})(${3:h-offset},${4:v-offset})",
+      "option": "visualize"
+    },
+    "showenvelope()()[]": {
+      "snippet": "showenvelope(${2:width},${3:height})(${4:h-offset},${5:v-offset})[${1:instructions}]",
+      "option": "visualize"
+    },
     "showISOenvelope{}": {
       "snippet": "showISOenvelope{${1:format}}",
       "option": "visualize"
diff --git a/data/packages/class-yathesis.json b/data/packages/class-yathesis.json
index 1596d19ba..339b43305 100644
--- a/data/packages/class-yathesis.json
+++ b/data/packages/class-yathesis.json
@@ -337,6 +337,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/data/packages/coordsys.json b/data/packages/coordsys.json
index 487bf54a7..20a7802c7 100644
--- a/data/packages/coordsys.json
+++ b/data/packages/coordsys.json
@@ -25,6 +25,96 @@
     "vnumbline*[]{}{}": {
       "snippet": "vnumbline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
+    "coordsys()()": {
+      "snippet": "coordsys(${1:lower-left})(${2:upper-right})"
+    },
+    "coordsys[]()()": {
+      "snippet": "coordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordsys[][]()()": {
+      "snippet": "coordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "coordsys*()()": {
+      "snippet": "coordsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "coordsys*[]()()": {
+      "snippet": "coordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordsys*[][]()()": {
+      "snippet": "coordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "fcoordsys()()": {
+      "snippet": "fcoordsys(${1:lower-left})(${2:upper-right})"
+    },
+    "fcoordsys[]()()": {
+      "snippet": "fcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "fcoordsys[][]()()": {
+      "snippet": "fcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "fcoordsys*()()": {
+      "snippet": "fcoordsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "fcoordsys*[]()()": {
+      "snippet": "fcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "fcoordsys*[][]()()": {
+      "snippet": "fcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "bcoordsys()()": {
+      "snippet": "bcoordsys(${1:lower-left})(${2:upper-right})"
+    },
+    "bcoordsys[]()()": {
+      "snippet": "bcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "bcoordsys[][]()()": {
+      "snippet": "bcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "bcoordsys*()()": {
+      "snippet": "bcoordsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "bcoordsys*[]()()": {
+      "snippet": "bcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "bcoordsys*[][]()()": {
+      "snippet": "bcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "window()()": {
+      "snippet": "window(${1:lower-left})(${2:upper-right})"
+    },
+    "window[]()()": {
+      "snippet": "window[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "window[][]()()": {
+      "snippet": "window[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "window*()()": {
+      "snippet": "window*(${1:lower-left})(${2:upper-right})"
+    },
+    "window*[]()()": {
+      "snippet": "window*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "window*[][]()()": {
+      "snippet": "window*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "coordgrid()()": {
+      "snippet": "coordgrid(${1:lower-left})(${2:upper-right})"
+    },
+    "coordgrid[]()()": {
+      "snippet": "coordgrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordgrid[][]()()": {
+      "snippet": "coordgrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "coordgrid*()()": {
+      "snippet": "coordgrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "coordgrid*[]()()": {
+      "snippet": "coordgrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordgrid*[][]()()": {
+      "snippet": "coordgrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
     "gridstyle{}{}": {
       "snippet": "gridstyle{${1:thin-declaration}}{${2:thick-declaration}}"
     },
diff --git a/data/packages/fancybox.json b/data/packages/fancybox.json
index b89e35d42..416d7a604 100644
--- a/data/packages/fancybox.json
+++ b/data/packages/fancybox.json
@@ -22,10 +22,37 @@
     "cornersize*{}": {
       "snippet": "cornersize*{${1:dimen}}"
     },
+    "fancyoval()": {
+      "snippet": "fancyoval(${1:width},${2:height})"
+    },
+    "fancyoval()[]": {
+      "snippet": "fancyoval(${2:width},${3:height})[${1:portion}]"
+    },
     "TheSbox": {},
     "GenericCaption{}": {
       "snippet": "GenericCaption{${1:text}}"
     },
+    "item()": {
+      "snippet": "item(${1:vspace})"
+    },
+    "item()[]": {
+      "snippet": "item(${2:vspace})[${1:label}]"
+    },
+    "boxput(){}{}": {
+      "snippet": "boxput(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
+    },
+    "boxput*(){}{}": {
+      "snippet": "boxput*(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
+    },
+    "fancyput(){}": {
+      "snippet": "fancyput(${2:x},${3:y}){${1:contents}}"
+    },
+    "fancyput*(){}": {
+      "snippet": "fancyput*(${2:x},${3:y}){${1:contents}}"
+    },
+    "thisfancyput*(){}": {
+      "snippet": "thisfancyput*(${2:x},${3:y}){${1:contents}}"
+    },
     "fancypage{}{}": {
       "snippet": "fancypage{${1:cmds1}}{${2:cmds2}}"
     },
diff --git a/data/packages/fontspec.json b/data/packages/fontspec.json
index 073bcfd0b..848549b92 100644
--- a/data/packages/fontspec.json
+++ b/data/packages/fontspec.json
@@ -245,6 +245,9 @@
     "EncodingComposite{}{}{}": {
       "snippet": "EncodingComposite{${1:cmd}}{${2:letter}}{${3:slot}}"
     },
+    "EncodingCompositeCommand(){}{}": {
+      "snippet": "EncodingCompositeCommand(${3:cmd}){${1:letter}}{${2:code}}"
+    },
     "UndeclareSymbol{}": {
       "snippet": "UndeclareSymbol{${1:cmd}}"
     },
diff --git a/data/packages/glosstex.json b/data/packages/glosstex.json
index 9e96fc2fb..e79578345 100644
--- a/data/packages/glosstex.json
+++ b/data/packages/glosstex.json
@@ -7,84 +7,198 @@
     "glosstex[]{}": {
       "snippet": "glosstex[${2:pageref-mode}]{${1:label}}"
     },
+    "glosstex(){}": {
+      "snippet": "glosstex(${2:list}){${1:label}}"
+    },
+    "glosstex()[]{}": {
+      "snippet": "glosstex(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "glosstex*{}": {
       "snippet": "glosstex*{${1:label}}"
     },
     "glosstex*[]{}": {
       "snippet": "glosstex*[${2:pageref-mode}]{${1:label}}"
     },
+    "glosstex*(){}": {
+      "snippet": "glosstex*(${2:list}){${1:label}}"
+    },
+    "glosstex*()[]{}": {
+      "snippet": "glosstex*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "acronym{}": {
       "snippet": "acronym{${1:label}}"
     },
     "acronym[]{}": {
       "snippet": "acronym[${2:pageref-mode}]{${1:label}}"
     },
+    "acronym(){}": {
+      "snippet": "acronym(${2:list}){${1:label}}"
+    },
+    "acronym()[]{}": {
+      "snippet": "acronym(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "acronym*{}": {
       "snippet": "acronym*{${1:label}}"
     },
     "acronym*[]{}": {
       "snippet": "acronym*[${2:pageref-mode}]{${1:label}}"
     },
+    "acronym*(){}": {
+      "snippet": "acronym*(${2:list}){${1:label}}"
+    },
+    "acronym*()[]{}": {
+      "snippet": "acronym*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "gls{}": {
       "snippet": "gls{${1:label}}"
     },
     "gls[]{}": {
       "snippet": "gls[${2:pageref-mode}]{${1:label}}"
     },
+    "gls(){}": {
+      "snippet": "gls(${2:list}){${1:label}}"
+    },
+    "gls()[]{}": {
+      "snippet": "gls(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "gls*{}": {
       "snippet": "gls*{${1:label}}"
     },
     "gls*[]{}": {
       "snippet": "gls*[${2:pageref-mode}]{${1:label}}"
     },
+    "gls*(){}": {
+      "snippet": "gls*(${2:list}){${1:label}}"
+    },
+    "gls*()[]{}": {
+      "snippet": "gls*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "ac{}": {
       "snippet": "ac{${1:label}}"
     },
     "ac[]{}": {
       "snippet": "ac[${2:pageref-mode}]{${1:label}}"
     },
+    "ac()[]{}": {
+      "snippet": "ac(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac<>()[]{}": {
+      "snippet": "ac<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac[]<>()[]{}": {
+      "snippet": "ac[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "ac*{}": {
       "snippet": "ac*{${1:label}}"
     },
     "ac*[]{}": {
       "snippet": "ac*[${2:pageref-mode}]{${1:label}}"
     },
+    "ac*()[]{}": {
+      "snippet": "ac*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac*<>()[]{}": {
+      "snippet": "ac*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac*[]<>()[]{}": {
+      "snippet": "ac*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acs{}": {
       "snippet": "acs{${1:label}}"
     },
     "acs[]{}": {
       "snippet": "acs[${2:pageref-mode}]{${1:label}}"
     },
+    "acs()[]{}": {
+      "snippet": "acs(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs<>()[]{}": {
+      "snippet": "acs<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs[]<>()[]{}": {
+      "snippet": "acs[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acs*{}": {
       "snippet": "acs*{${1:label}}"
     },
     "acs*[]{}": {
       "snippet": "acs*[${2:pageref-mode}]{${1:label}}"
     },
+    "acs*()[]{}": {
+      "snippet": "acs*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs*<>()[]{}": {
+      "snippet": "acs*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs*[]<>()[]{}": {
+      "snippet": "acs*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acl{}": {
       "snippet": "acl{${1:label}}"
     },
     "acl[]{}": {
       "snippet": "acl[${2:pageref-mode}]{${1:label}}"
     },
+    "acl()[]{}": {
+      "snippet": "acl(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl<>()[]{}": {
+      "snippet": "acl<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl[]<>()[]{}": {
+      "snippet": "acl[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acl*{}": {
       "snippet": "acl*{${1:label}}"
     },
     "acl*[]{}": {
       "snippet": "acl*[${2:pageref-mode}]{${1:label}}"
     },
+    "acl*()[]{}": {
+      "snippet": "acl*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl*<>()[]{}": {
+      "snippet": "acl*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl*[]<>()[]{}": {
+      "snippet": "acl*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acf{}": {
       "snippet": "acf{${1:label}}"
     },
     "acf[]{}": {
       "snippet": "acf[${2:pageref-mode}]{${1:label}}"
     },
+    "acf()[]{}": {
+      "snippet": "acf(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf<>()[]{}": {
+      "snippet": "acf<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf[]<>()[]{}": {
+      "snippet": "acf[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acf*{}": {
       "snippet": "acf*{${1:label}}"
     },
     "acf*[]{}": {
       "snippet": "acf*[${2:pageref-mode}]{${1:label}}"
     },
+    "acf*()[]{}": {
+      "snippet": "acf*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf*<>()[]{}": {
+      "snippet": "acf*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf*[]<>()[]{}": {
+      "snippet": "acf*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
+    "printglosstex()": {
+      "snippet": "printglosstex(${1:list})"
+    },
+    "printglosstex()[]": {
+      "snippet": "printglosstex(${2:list})[${1:pageref-mode}]"
+    },
     "glxitemorderdefault{}{}": {
       "snippet": "glxitemorderdefault{${1:list}}{${2:item-order i/l/\"\"}}"
     },
diff --git a/data/packages/hyperref.json b/data/packages/hyperref.json
index 2ba1809cd..fe966b0a7 100644
--- a/data/packages/hyperref.json
+++ b/data/packages/hyperref.json
@@ -6,7 +6,6 @@
     "kvdefinekeys": [],
     "pdfescape": [],
     "hycolor": [],
-    "auxhook": [],
     "kvoptions": [],
     "intcalc": [],
     "url": [],
@@ -17,6 +16,7 @@
     "rerunfilecheck": [],
     "nameref": [],
     "etoolbox": [],
+    "stringenc": [],
     "backref": [
       "backref",
       "backref=section",
diff --git a/data/packages/jurabib.json b/data/packages/jurabib.json
index 2ac6aeb22..f844586c0 100644
--- a/data/packages/jurabib.json
+++ b/data/packages/jurabib.json
@@ -25,7 +25,7 @@
       "snippet": "citefield[${3:page-range}]{${1:field}}{${2:bibid}}"
     },
     "citenotitlefortype{}": {
-      "snippet": "citenotitlefortype{${1:article,book,…}}"
+      "snippet": "citenotitlefortype{${1:article,${2:book},…}}"
     },
     "citeswithoutentry{}": {
       "snippet": "citeswithoutentry{${1:keylist}}"
@@ -37,7 +37,7 @@
       "snippet": "citetitle[${2:Annotator/See}][${3:page-range}]{${1:bibid}}"
     },
     "citetitlefortype{}": {
-      "snippet": "citetitlefortype{${1:article,book,…}}"
+      "snippet": "citetitlefortype{${1:article,${2:book},…}}"
     },
     "footcite[]{}": {
       "snippet": "footcite[${2:page-range}]{${1:bibid}}"
@@ -99,13 +99,13 @@
       "snippet": "pageadd{${1:text}}"
     },
     "formatpages{}{}{}": {
-      "snippet": "formatpages{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages{${1:article,${4:book},…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}]{${1:article,${5:book},…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[][]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,${6:book},…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "citealp[]{}": {
       "snippet": "citealp[${2:postfix}]{${1:keylist}}"
diff --git a/data/packages/latex-dev.json b/data/packages/latex-dev.json
index f4d99e4a4..915177450 100644
--- a/data/packages/latex-dev.json
+++ b/data/packages/latex-dev.json
@@ -34,6 +34,7 @@
     "AssignSocketPlug{}{}": {
       "snippet": "AssignSocketPlug{${1:socket}}{${2:socket plug}}"
     },
+    "AssignTemplateKeys": {},
     "AtBeginDocument[]{}": {
       "snippet": "AtBeginDocument[${2:label}]{${1:code}}"
     },
@@ -142,6 +143,8 @@
     "DebugShipoutsOn": {},
     "DebugSocketsOff": {},
     "DebugSocketsOn": {},
+    "DebugTablesOff": {},
+    "DebugTablesOn": {},
     "DeclareCaseChangeEquivalent{}{}": {
       "snippet": "DeclareCaseChangeEquivalent{${1:cmd}}{${2:replacement text}}"
     },
@@ -211,6 +214,12 @@
     "DeclareHookRule{}{}{}{}": {
       "snippet": "DeclareHookRule{${1:hook}}{${2:label1}}{${3:relation}}{${4:label2}}"
     },
+    "DeclareInstance{}{}{}{}": {
+      "snippet": "DeclareInstance{${1:type}}{${2:instance}}{${3:template}}{${4:parameters}}"
+    },
+    "DeclareInstanceCopy{}{}{}": {
+      "snippet": "DeclareInstanceCopy{${1:type}}{${2:instance2}}{${3:instance1}}"
+    },
     "DeclareKeys[]{}": {
       "snippet": "DeclareKeys[${2:family}]{${1:declarations}}"
     },
@@ -289,6 +298,15 @@
     "DeclareSymbolFontAlphabet{}{}": {
       "snippet": "DeclareSymbolFontAlphabet{${1:math-alph}}{${2:sym-font}}"
     },
+    "DeclareTemplateCode{}{}{}{}{}": {
+      "snippet": "DeclareTemplateCode{${1:type}}{${2:template}}{${3:no. of args}}{${4:key bindings}}{${5:code}}"
+    },
+    "DeclareTemplateCopy{}{}{}": {
+      "snippet": "DeclareTemplateCopy{${1:type}}{${2:template2}}{${3:template1}}"
+    },
+    "DeclareTemplateInterface{}{}{}{}": {
+      "snippet": "DeclareTemplateInterface{${1:type}}{${2:template}}{${3:no. of args}}{${4:key list}}"
+    },
     "DeclareTextAccent{}{}{}": {
       "snippet": "DeclareTextAccent{${1:cmd}}{${2:encoding}}{${3:slot}}"
     },
@@ -350,6 +368,12 @@
       "snippet": "DisableHook{${1:hook}}"
     },
     "DiscardShipoutBox": {},
+    "EditInstance{}{}{}": {
+      "snippet": "EditInstance{${1:type}}{${2:instance}}{${3:new values}}"
+    },
+    "EditTemplateDefaults{}{}{}": {
+      "snippet": "EditTemplateDefaults{${1:type}}{${2:template}}{${3:new defaults}}"
+    },
     "EndIncludeInRelease": {},
     "EndModuleRelease": {},
     "ExecuteOptions{}": {
@@ -393,35 +417,89 @@
     "IfBooleanTF{}{}{}": {
       "snippet": "IfBooleanTF{${1:arg}}{${2:true code}}{${3:false code}}"
     },
+    "IfClassAtLeastF{}{}{}": {
+      "snippet": "IfClassAtLeastF{${1:class}}{${2:date}}{${3:false code}}"
+    },
+    "IfClassAtLeastT{}{}{}": {
+      "snippet": "IfClassAtLeastT{${1:class}}{${2:date}}{${3:true code}}"
+    },
     "IfClassAtLeastTF{}{}{}{}": {
       "snippet": "IfClassAtLeastTF{${1:class}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
+    "IfClassLoadedF{}{}": {
+      "snippet": "IfClassLoadedF{${1:class}}{${2:false code}}"
+    },
+    "IfClassLoadedT{}{}": {
+      "snippet": "IfClassLoadedT{${1:class}}{${2:true code}}"
+    },
     "IfClassLoadedTF{}{}{}": {
       "snippet": "IfClassLoadedTF{${1:class}}{${2:true code}}{${3:false code}}"
     },
+    "IfClassLoadedWithOptionsF{}{}{}": {
+      "snippet": "IfClassLoadedWithOptionsF{${1:class}}{${2:options}}{${3:false code}}"
+    },
+    "IfClassLoadedWithOptionsT{}{}{}": {
+      "snippet": "IfClassLoadedWithOptionsT{${1:class}}{${2:options}}{${3:true code}}"
+    },
     "IfClassLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfClassLoadedWithOptionsTF{${1:class}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfExplAtLeastTF{}{}{}": {
       "snippet": "IfExplAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
+    "IfFileAtLeastF{}{}{}": {
+      "snippet": "IfFileAtLeastF{${1:file}}{${2:date}}{${3:false code}}"
+    },
+    "IfFileAtLeastT{}{}{}": {
+      "snippet": "IfFileAtLeastT{${1:file}}{${2:date}}{${3:true code}}"
+    },
     "IfFileAtLeastTF{}{}{}{}": {
       "snippet": "IfFileAtLeastTF{${1:file}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
     "IfFileExists{}{}{}": {
       "snippet": "IfFileExists{${1:file}}{${2:true code}}{${3:false code}}"
     },
+    "IfFileLoadedF{}{}": {
+      "snippet": "IfFileLoadedF{${1:file}}{${2:false code}}"
+    },
+    "IfFileLoadedT{}{}": {
+      "snippet": "IfFileLoadedT{${1:file}}{${2:true code}}"
+    },
+    "IfFileLoadedTF{}{}{}": {
+      "snippet": "IfFileLoadedTF{${1:file}}{${2:true code}}{${3:false code}}"
+    },
     "IfFontSeriesContextTF{}{}{}": {
       "snippet": "IfFontSeriesContextTF{${1:face}}{${2:true code}}{${3:false code}}"
     },
+    "IfFormatAtLeastF{}{}": {
+      "snippet": "IfFormatAtLeastF{${1:date}}{${2:false code}}"
+    },
+    "IfFormatAtLeastT{}{}": {
+      "snippet": "IfFormatAtLeastT{${1:date}}{${2:true code}}"
+    },
     "IfFormatAtLeastTF{}{}{}": {
       "snippet": "IfFormatAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
     "IfHookEmptyTF{}{}{}": {
       "snippet": "IfHookEmptyTF{${1:hook}}{${2:true code}}{${3:false code}}"
     },
-    "IfLabelExistTF{}{}{}": {
-      "snippet": "IfLabelExistTF{${1:label}}{${2:true code}}{${3:false code}}"
+    "IfInstanceExistsF{}{}{}{}": {
+      "snippet": "IfInstanceExistsF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
+    },
+    "IfInstanceExistsT{}{}{}{}": {
+      "snippet": "IfInstanceExistsT{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
+    },
+    "IfInstanceExistsTF{}{}{}{}": {
+      "snippet": "IfInstanceExistsTF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
+    },
+    "IfLabelExistsF{}{}": {
+      "snippet": "IfLabelExistsF{${1:label}}{${2:false code}}"
+    },
+    "IfLabelExistsT{}{}": {
+      "snippet": "IfLabelExistsT{${1:label}}{${2:true code}}"
+    },
+    "IfLabelExistsTF{}{}{}": {
+      "snippet": "IfLabelExistsTF{${1:label}}{${2:true code}}{${3:false code}}"
     },
     "IfMarksEqualTF[]{}{}{}{}{}": {
       "snippet": "IfMarksEqualTF[${6:region}]{${1:class}}{${2:pos1}}{${3:pos2}}{${4:true code}}{${5:false code}}"
@@ -438,20 +516,44 @@
     "IfNoValueTF{}{}{}": {
       "snippet": "IfNoValueTF{${1:arg}}{${2:-NoValue-Code}}{${3:ValueCode}}"
     },
+    "IfPackageAtLeastF{}{}{}": {
+      "snippet": "IfPackageAtLeastF{${1:package}}{${2:date}}{${3:false code}}"
+    },
+    "IfPackageAtLeastT{}{}{}": {
+      "snippet": "IfPackageAtLeastT{${1:package}}{${2:date}}{${3:true code}}"
+    },
     "IfPackageAtLeastTF{}{}{}{}": {
       "snippet": "IfPackageAtLeastTF{${1:package}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
+    "IfPackageLoadedF{}{}": {
+      "snippet": "IfPackageLoadedF{${1:package}}{${2:false code}}"
+    },
+    "IfPackageLoadedT{}{}": {
+      "snippet": "IfPackageLoadedT{${1:package}}{${2:true code}}"
+    },
     "IfPackageLoadedTF{}{}{}": {
       "snippet": "IfPackageLoadedTF{${1:package}}{${2:true code}}{${3:false code}}"
     },
+    "IfPackageLoadedWithOptionsF{}{}{}": {
+      "snippet": "IfPackageLoadedWithOptionsF{${1:package}}{${2:options}}{${3:false code}}"
+    },
+    "IfPackageLoadedWithOptionsT{}{}{}": {
+      "snippet": "IfPackageLoadedWithOptionsT{${1:package}}{${2:options}}{${3:true code}}"
+    },
     "IfPackageLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfPackageLoadedWithOptionsTF{${1:package}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfPDFManagementActiveTF{}{}": {
       "snippet": "IfPDFManagementActiveTF{${1:true code}}{${2:false code}}"
     },
-    "IfPropertyExistTF{}{}{}": {
-      "snippet": "IfPropertyExistTF{${1:property}}{${2:true code}}{${3:false code}}"
+    "IfPropertyExistsF{}{}": {
+      "snippet": "IfPropertyExistsF{${1:property}}{${2:false code}}"
+    },
+    "IfPropertyExistsT{}{}": {
+      "snippet": "IfPropertyExistsT{${1:property}}{${2:true code}}"
+    },
+    "IfPropertyExistsTF{}{}{}": {
+      "snippet": "IfPropertyExistsTF{${1:property}}{${2:true code}}{${3:false code}}"
     },
     "IfPropertyRecordedTF{}{}{}{}": {
       "snippet": "IfPropertyRecordedTF{${1:label}}{${2:property}}{${3:true code}}{${4:false code}}"
@@ -478,6 +580,9 @@
     "InsertMark{}{}": {
       "snippet": "InsertMark{${1:class}}{${2:text}}"
     },
+    "KeyValue{}": {
+      "snippet": "KeyValue{${1:key name}}"
+    },
     "LastDeclaredEncoding": {},
     "LastMark[]{}": {
       "snippet": "LastMark[${2:region}]{${1:class}}"
@@ -582,6 +687,9 @@
     "NewSocketPlug{}{}{}": {
       "snippet": "NewSocketPlug{${1:socket}}{${2:socket plug}}{${3:code}}"
     },
+    "NewTemplateType{}{}": {
+      "snippet": "NewTemplateType{${1:template type}}{${2:no. of args}}"
+    },
     "NextLinkTarget{}": {
       "snippet": "NextLinkTarget{${1:target name}}"
     },
@@ -730,6 +838,9 @@
     "RequirePackageWithOptions{}[]": {
       "snippet": "RequirePackageWithOptions{${1:package}}[${2:release}]"
     },
+    "ResumeTagging{}": {
+      "snippet": "ResumeTagging{${1:string}}"
+    },
     "ReverseBoolean": {},
     "SetDefaultHookLabel{}": {
       "snippet": "SetDefaultHookLabel{${1:default label}}"
@@ -749,6 +860,9 @@
     "SetSymbolFont{}{}{}{}{}{}": {
       "snippet": "SetSymbolFont{${1:sym-font}}{${2:version}}{${3:encoding}}{${4:family}}{${5:series}}{${6:shape}}"
     },
+    "SetTemplateKeys{}{}{}": {
+      "snippet": "SetTemplateKeys{${1:type}}{${2:template}}{${3:keyvals}}"
+    },
     "ShipoutBox": {},
     "ShipoutBoxDepth": {},
     "ShipoutBoxHeight": {},
@@ -765,15 +879,36 @@
     "ShowHook{}": {
       "snippet": "ShowHook{${1:hook}}"
     },
+    "ShowInstanceValues{}{}": {
+      "snippet": "ShowInstanceValues{${1:type}}{${2:instance}}"
+    },
+    "ShowMarksAt{}": {
+      "snippet": "ShowMarksAt{${1:text}}"
+    },
     "ShowSocket{}": {
       "snippet": "ShowSocket{${1:socket}}"
     },
+    "ShowTemplateCode{}{}": {
+      "snippet": "ShowTemplateCode{${1:type}}{${2:template}}"
+    },
+    "ShowTemplateDefaults{}{}": {
+      "snippet": "ShowTemplateDefaults{${1:type}}{${2:template}}"
+    },
+    "ShowTemplateInterface{}{}": {
+      "snippet": "ShowTemplateInterface{${1:type}}{${2:template}}"
+    },
+    "ShowTemplateVariables{}{}": {
+      "snippet": "ShowTemplateVariables{${1:type}}{${2:template}}"
+    },
     "SplitArgument{}{}": {
       "snippet": "SplitArgument{${1:number}}{${2:tokens}}"
     },
     "SplitList{}": {
       "snippet": "SplitList{${1:tokens}}"
     },
+    "SuspendTagging{}": {
+      "snippet": "SuspendTagging{${1:string}}"
+    },
     "TextSymbolUnavailable{}": {
       "snippet": "TextSymbolUnavailable{${1:arg}}"
     },
@@ -790,6 +925,9 @@
     "UseHook{}": {
       "snippet": "UseHook{${1:hook}}"
     },
+    "UseInstance{}{}": {
+      "snippet": "UseInstance{${1:type}}{${2:instance}}"
+    },
     "UseLegacyTextSymbols": {},
     "UseName{}": {
       "snippet": "UseName{${1:csname}}"
@@ -799,7 +937,13 @@
     },
     "UseRawInputEncoding": {},
     "UseSocket{}": {
-      "snippet": "UseSocket{${1:socket}}"
+      "snippet": "UseSocket{${1:socket name}}"
+    },
+    "UseTaggingSocket{}": {
+      "snippet": "UseTaggingSocket{${1:socket}}"
+    },
+    "UseTemplate{}{}{}": {
+      "snippet": "UseTemplate{${1:type}}{${2:template}}{${3:settings}}"
     },
     "UseTextAccent{}{}{}": {
       "snippet": "UseTextAccent{${1:encoding}}{${2:cmd}}{${3:text}}"
@@ -1243,26 +1387,6 @@
     "itdefault": {},
     "loggingall": {},
     "loggingoutput": {},
-    "ltcmddate": {},
-    "ltcmdhooksdate": {},
-    "ltcmdhooksversion": {},
-    "ltcmdversion": {},
-    "ltfilehookdate": {},
-    "ltfilehookversion": {},
-    "lthooksdate": {},
-    "lthooksversion": {},
-    "ltmarksdate": {},
-    "ltmarksversion": {},
-    "ltmetadate": {},
-    "ltmetaversion": {},
-    "ltparadate": {},
-    "ltparaversion": {},
-    "ltpropertiesdate": {},
-    "ltpropertiesversion": {},
-    "ltshipoutdate": {},
-    "ltshipoutversion": {},
-    "ltsocketsdate": {},
-    "ltsocketsversion": {},
     "mathalpha": {},
     "mathgroup": {},
     "mathhexbox": {},
@@ -1273,6 +1397,8 @@
     "numberline{}": {
       "snippet": "numberline{${1:number}}"
     },
+    "obeyedline": {},
+    "obeyedspace": {},
     "poptabs": {},
     "pushtabs": {},
     "requestedLaTeXdate": {},
diff --git a/data/packages/latex-document.json b/data/packages/latex-document.json
index be4a24017..696a6c964 100644
--- a/data/packages/latex-document.json
+++ b/data/packages/latex-document.json
@@ -13,13 +13,22 @@
     },
     "and": {},
     "asciispace": {},
+    "bezier{}()()()": {
+      "snippet": "bezier{${1:n}}(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
+    },
     "bfseries": {},
     "bibindent": {},
     "Bigg": {},
+    "Bigg(": {
+      "snippet": "Bigg(${2:${1}\\Bigg})"
+    },
     "Bigg[": {
       "snippet": "Bigg[${1}\\Bigg]"
     },
     "bigg": {},
+    "bigg(": {
+      "snippet": "bigg(${2:${1}\\bigg})"
+    },
     "bigg[": {
       "snippet": "bigg[${1}\\bigg]"
     },
@@ -40,6 +49,12 @@
       "snippet": "contentsline{${1:type}}{${2:text}}{${3:page}}{${4:Href}}"
     },
     "contentsname": {},
+    "dashbox{}()[]{}": {
+      "snippet": "dashbox{${1:dashlength}}(${4:width},${5:height})[${2:position}]{${3:text}}"
+    },
+    "dashbox{}(){}": {
+      "snippet": "dashbox{${1:dashlength}}(${3:width},${4:height}){${2:text}}"
+    },
     "date{}": {
       "snippet": "date{${1:text}}"
     },
@@ -91,6 +106,12 @@
     "fpeval{}": {
       "snippet": "fpeval{${1:fp expression}}"
     },
+    "framebox()[]{}": {
+      "snippet": "framebox(${3:xdimen},${4:ydimen})[${2:position}]{${1:text}}"
+    },
+    "framebox(){}": {
+      "snippet": "framebox(${2:xdimen},${3:ydimen}){${1:text}}"
+    },
     "frame{}": {
       "snippet": "frame{${1:text}}"
     },
@@ -136,21 +157,35 @@
       "snippet": "legacyoldstylenums{${1:text}}"
     },
     "lhook": {},
+    "line(){}": {
+      "snippet": "line(${2:xslope},${3:yslope}){${1:length}}"
+    },
     "linethickness{}": {
       "snippet": "linethickness{${1:dimension}}"
     },
     "linewidth": {},
     "listfigurename": {},
     "listfiles": {},
+    "listfiles[]": {
+      "snippet": "listfiles[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "listparindent": {},
     "listtablename": {},
+    "makebox()[]{}": {
+      "snippet": "makebox(${3:width},${4:height})[${2:position}]{${1:text}}"
+    },
+    "makebox(){}": {
+      "snippet": "makebox(${2:width},${3:height}){${1:text}}"
+    },
     "makelabel": {},
     "MakeLowercase{}": {
       "snippet": "MakeLowercase{${1:text}}"
     },
     "MakeLowercase[]{}": {
       "snippet": "MakeLowercase[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "MakeTitlecase{}": {
@@ -158,7 +193,7 @@
     },
     "MakeTitlecase[]{}": {
       "snippet": "MakeTitlecase[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "MakeUppercase{}": {
@@ -166,7 +201,7 @@
     },
     "MakeUppercase[]{}": {
       "snippet": "MakeUppercase[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "mapstochar": {},
@@ -195,6 +230,9 @@
       "documentation": "MEDIUM MATHEMATICAL SPACE, four-eighteenths of an em"
     },
     "mdseries": {},
+    "multiput()(){}{}": {
+      "snippet": "multiput(${3:xcoord},${4:ycoord})(${5:xdelta},${6:ydelta}){${1:copies}}{${2:object}}"
+    },
     "negmedspace": {},
     "negthickspace": {},
     "newblock": {},
@@ -226,6 +264,12 @@
       "snippet": "oldstylenums{${1:text}}"
     },
     "onecolumn": {},
+    "oval()": {
+      "snippet": "oval(${1:width},${2:height})"
+    },
+    "oval()[]": {
+      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
+    },
     "pageref*{}": {
       "snippet": "pageref*{${1:label}}"
     },
@@ -246,6 +290,15 @@
     },
     "protect": {},
     "pushtabs": {},
+    "put(){}": {
+      "snippet": "put(${2:xcoord},${3:ycoord}){${1:text}}"
+    },
+    "qbezier()()()": {
+      "snippet": "qbezier(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
+    "qbezier[]()()()": {
+      "snippet": "qbezier[${1:n}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
+    },
     "qbeziermax": {},
     "r{}": {
       "snippet": "r{${1:letter}}"
@@ -422,6 +475,9 @@
       "detail": "⋮",
       "documentation": "VERTICAL ELLIPSIS"
     },
+    "vector(){}": {
+      "snippet": "vector(${2:xslope},${3:yslope}){${1:length}}"
+    },
     "verb": {
       "snippet": "verb|${1:text}|"
     },
@@ -517,7 +573,7 @@
     "filecontents[]{}": {
       "name": "filecontents",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "filecontents*{}": {
@@ -527,7 +583,7 @@
     "filecontents*[]{}": {
       "name": "filecontents*",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "flushleft": {},
@@ -566,6 +622,14 @@
       "snippet": "{${1:width}}"
     },
     "normalsize": {},
+    "picture(width,height)": {
+      "name": "picture",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "picture(width,height)(xoffset,yoffset)": {
+      "name": "picture",
+      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
+    },
     "pmatrix": {},
     "quotation": {},
     "quote": {},
@@ -635,6 +699,10 @@
     "openbib"
   ],
   "keyvals": [
+    [
+      "hashes",
+      "sizes"
+    ],
     [
       "locale=${1:BCP-47 tag}",
       "lang=${1:BCP-47 tag}"
diff --git a/data/packages/listings.json b/data/packages/listings.json
index 24c2b4ab8..a41539139 100644
--- a/data/packages/listings.json
+++ b/data/packages/listings.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "lstloadlanguages{}": {
-      "snippet": "lstloadlanguages{${1:lang1,lang2,...}}"
+      "snippet": "lstloadlanguages{${1:lang1,${2:lang2},...}}"
     },
     "lstset{}": {
       "snippet": "lstset{${1:keyvals}}",
diff --git a/data/packages/logsys.json b/data/packages/logsys.json
index e109b42f8..c82c7867b 100644
--- a/data/packages/logsys.json
+++ b/data/packages/logsys.json
@@ -27,6 +27,114 @@
     "vlogline*[]{}{}": {
       "snippet": "vlogline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
+    "logsys()()": {
+      "snippet": "logsys(${1:lower-left})(${2:upper-right})"
+    },
+    "logsys[]()()": {
+      "snippet": "logsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logsys[][]()()": {
+      "snippet": "logsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "logsys*()()": {
+      "snippet": "logsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "logsys*[]()()": {
+      "snippet": "logsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logsys*[][]()()": {
+      "snippet": "logsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semilogsys()()": {
+      "snippet": "semilogsys(${1:lower-left})(${2:upper-right})"
+    },
+    "semilogsys[]()()": {
+      "snippet": "semilogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semilogsys[][]()()": {
+      "snippet": "semilogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semilogsys*()()": {
+      "snippet": "semilogsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "semilogsys*[]()()": {
+      "snippet": "semilogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semilogsys*[][]()()": {
+      "snippet": "semilogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loglogsys()()": {
+      "snippet": "loglogsys(${1:lower-left})(${2:upper-right})"
+    },
+    "loglogsys[]()()": {
+      "snippet": "loglogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loglogsys[][]()()": {
+      "snippet": "loglogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loglogsys*()()": {
+      "snippet": "loglogsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "loglogsys*[]()()": {
+      "snippet": "loglogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loglogsys*[][]()()": {
+      "snippet": "loglogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loggrid()()": {
+      "snippet": "loggrid(${1:lower-left})(${2:upper-right})"
+    },
+    "loggrid[]()()": {
+      "snippet": "loggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loggrid[][]()()": {
+      "snippet": "loggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loggrid*()()": {
+      "snippet": "loggrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "loggrid*[]()()": {
+      "snippet": "loggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loggrid*[][]()()": {
+      "snippet": "loggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semiloggrid()()": {
+      "snippet": "semiloggrid(${1:lower-left})(${2:upper-right})"
+    },
+    "semiloggrid[]()()": {
+      "snippet": "semiloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semiloggrid[][]()()": {
+      "snippet": "semiloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semiloggrid*()()": {
+      "snippet": "semiloggrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "semiloggrid*[]()()": {
+      "snippet": "semiloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semiloggrid*[][]()()": {
+      "snippet": "semiloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "logloggrid()()": {
+      "snippet": "logloggrid(${1:lower-left})(${2:upper-right})"
+    },
+    "logloggrid[]()()": {
+      "snippet": "logloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logloggrid[][]()()": {
+      "snippet": "logloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "logloggrid*()()": {
+      "snippet": "logloggrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "logloggrid*[]()()": {
+      "snippet": "logloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logloggrid*[][]()()": {
+      "snippet": "logloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
     "interval": {},
     "intervalthickness{}": {
       "snippet": "intervalthickness{${1:width}}"
diff --git a/data/packages/paracol.json b/data/packages/paracol.json
index 85b063636..0ded80be5 100644
--- a/data/packages/paracol.json
+++ b/data/packages/paracol.json
@@ -19,16 +19,16 @@
       "snippet": "ensurevspace{${1:length}}"
     },
     "columnratio{}": {
-      "snippet": "columnratio{${1:ratio 0,...,ratio k}}"
+      "snippet": "columnratio{${1:ratio 0,${2:...},ratio k}}"
     },
     "columnratio{}[]": {
-      "snippet": "columnratio{${1:ratio 0,...,ratio k}}[${2:ratio' 0,...,ratio' k}]"
+      "snippet": "columnratio{${1:ratio 0,${3:...},${4:ratio k}}[${2:ratio' 0},${5:...},ratio' k}]"
     },
     "setcolumnwidth{}": {
-      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}"
+      "snippet": "setcolumnwidth{${1:gap 0,${2:...},gap k}}"
     },
     "setcolumnwidth{}[]": {
-      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}[${2:gap' 0,...,gap' k}]"
+      "snippet": "setcolumnwidth{${1:gap 0,${3:...},${4:gap k}}[${2:gap' 0},${5:...},gap' k}]"
     },
     "twosided": {},
     "twosided[]": {
diff --git a/data/packages/pgfcore.json b/data/packages/pgfcore.json
index 602c3d2be..8634f1142 100644
--- a/data/packages/pgfcore.json
+++ b/data/packages/pgfcore.json
@@ -2157,6 +2157,9 @@
     "pgfooclass{}{}": {
       "snippet": "pgfooclass{${1:class}}{${2:body}}"
     },
+    "pgfooclass(){}{}": {
+      "snippet": "pgfooclass(${3:list of superclasses}){${1:class}}{${2:body}}"
+    },
     "attribute": {},
     "method": {},
     "pgfoovalueof{}": {
diff --git a/data/packages/pgfplots.json b/data/packages/pgfplots.json
index d4093d1a3..e27c2719b 100644
--- a/data/packages/pgfplots.json
+++ b/data/packages/pgfplots.json
@@ -365,46 +365,46 @@
       "snippet": "pgfplotsutilsortfour{${1:macro1}}{${2:macro2}}{${3:macro3}}{${4:macro4}}"
     },
     "pgfplotsmathvectortostring{}{}": {
-      "snippet": "pgfplotsmathvectortostring{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectortostring{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorfromstring{}{}": {
-      "snippet": "pgfplotsmathvectorfromstring{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorfromstring{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorsubtract{}{}{}": {
-      "snippet": "pgfplotsmathvectorsubtract{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorsubtract{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectoradd{}{}{}": {
-      "snippet": "pgfplotsmathvectoradd{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectoradd{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorcompwise{}{}{}{}": {
-      "snippet": "pgfplotsmathvectorcompwise{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:operation}}{${4:arg}}"
+      "snippet": "pgfplotsmathvectorcompwise{${1:x1,${5:y1},${6:z1}}{${2:x2},${7:y2},z2}}{${3:operation}}{${4:arg}}"
     },
     "pgfplotsmathvectorsum{}{}": {
-      "snippet": "pgfplotsmathvectorsum{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorsum{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscalarproduct{}{}{}": {
-      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectortocomponents{}{}{}": {
-      "snippet": "pgfplotsmathvectortocomponents{${1:x,y,z}}{${2:string}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectortocomponents{${1:x,${4:y},z}}{${2:string}}{${3:arg}}"
     },
     "pgfplotsmathvectorcrossprod{}{}{}": {
-      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorscaleindividually{}{}{}": {
-      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotspointfromcsvvector{}{}": {
-      "snippet": "pgfplotspointfromcsvvector{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotspointfromcsvvector{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorlength{}{}": {
-      "snippet": "pgfplotsmathvectorlength{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorlength{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscale{}{}{}": {
-      "snippet": "pgfplotsmathvectorscale{${1:x,y,z}}{${2:scale}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscale{${1:x,${4:y},z}}{${2:scale}}{${3:arg}}"
     },
     "pgfplotsmathvectordatascaletrafoinverse{}{}": {
-      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsDQ": {},
     "pgfplotsVERTBAR": {},
@@ -980,6 +980,9 @@
     "rangea": {},
     "rangeb": {},
     "factor": {},
+    "simplecoordinate()": {
+      "snippet": "simplecoordinate(${1:x},${2:y},${3:z})"
+    },
     "curelem": {},
     "pgfplotssetaxesfromazel{}{}{}": {
       "snippet": "pgfplotssetaxesfromazel{${1:azimuth}}{${2:elevation}}{${3:macro}}"
@@ -1190,7 +1193,7 @@
     },
     "pgfplotsaxisvisphasepreparedatapoint": {},
     "pgfplotsaxisvisphasetransformcoordinateentry{}{}": {
-      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x, y, or z}}{${2:input}}"
+      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x,${3: y}, or z}}{${2:input}}"
     },
     "pgfplotstransformplotattime{}": {
       "snippet": "pgfplotstransformplotattime{${1:fraction}}"
@@ -1206,13 +1209,16 @@
       "snippet": "pgfplotspointplotattime{${1:fraction}}"
     },
     "pgfplotsplothandlergraphics": {},
+    "pgfplotsplothandlergraphicspointmappoint()()": {
+      "snippet": "pgfplotsplothandlergraphicspointmappoint(${1:x},${2:y},${3:z})(${4:a},${5:b})"
+    },
     "pgfplotsplothandlergraphicspointmapcomputerequiredview": {},
     "pgfplotsE": {},
     "pgfplotsmathfloatviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathfloatviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
     },
     "pgfplotsmathvectorviewdepth{}": {
-      "snippet": "pgfplotsmathvectorviewdepth{${1:x,y,z}}"
+      "snippet": "pgfplotsmathvectorviewdepth{${1:x,${2:y},z}}"
     },
     "pgfplotsmathviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
@@ -1227,22 +1233,22 @@
     "tick": {},
     "nexttick": {},
     "pgfplotsvalueoflargesttickdimen{}": {
-      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x, y, or z}}"
+      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x,${2: y}, or z}}"
     },
     "pgfplotsqpointoutsideofticklabelaxis{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxisrel{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxistransformed{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsticklabelaxisspec{}": {
-      "snippet": "pgfplotsticklabelaxisspec{${1:x, y, or z}}"
+      "snippet": "pgfplotsticklabelaxisspec{${1:x,${2: y}, or z}}"
     },
     "pgfplotspointouternormalvectorofticklabelaxis{}": {
-      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x, y, or z}}"
+      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x,${2: y}, or z}}"
     },
     "Hmacro": {},
     "Hmacrobaseten": {},
diff --git a/data/packages/physics.json b/data/packages/physics.json
index 6dfcaa9e3..bb72bca82 100644
--- a/data/packages/physics.json
+++ b/data/packages/physics.json
@@ -15,6 +15,9 @@
     "Pmqty{}": {
       "snippet": "Pmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
+    "Pr()": {
+      "snippet": "Pr(${1:expression})"
+    },
     "Probability": {},
     "Res[]": {
       "snippet": "Res[${1:expression}]"
@@ -43,30 +46,102 @@
     "acommutator{}{}": {
       "snippet": "acommutator{${1:expression1}}{${2:expression2}}"
     },
+    "acos()": {
+      "snippet": "acos(${1:expression})"
+    },
+    "acos[]()": {
+      "snippet": "acos[${1:power}](${2:expression})"
+    },
     "acosecant": {},
     "acosine": {},
+    "acot()": {
+      "snippet": "acot(${1:expression})"
+    },
+    "acot[]()": {
+      "snippet": "acot[${1:power}](${2:expression})"
+    },
     "acotangent": {},
+    "acsc()": {
+      "snippet": "acsc(${1:expression})"
+    },
+    "acsc[]()": {
+      "snippet": "acsc[${1:power}](${2:expression})"
+    },
     "admat{}": {
-      "snippet": "admat{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "admat{${1:matrix element 1,${2:matrix element 2},...}}"
     },
     "anticommutator{}{}": {
       "snippet": "anticommutator{${1:expression1}}{${2:expression2}}"
     },
     "antidiagonalmatrix{}": {
-      "snippet": "antidiagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "antidiagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
+    },
+    "arccos()": {
+      "snippet": "arccos(${1:expression})"
+    },
+    "arccos[]()": {
+      "snippet": "arccos[${1:power}](${2:expression})"
     },
     "arccosecant": {},
     "arccosine": {},
+    "arccot()": {
+      "snippet": "arccot(${1:expression})"
+    },
+    "arccot[]()": {
+      "snippet": "arccot[${1:power}](${2:expression})"
+    },
     "arccotangent": {},
+    "arccsc()": {
+      "snippet": "arccsc(${1:expression})"
+    },
+    "arccsc[]()": {
+      "snippet": "arccsc[${1:power}](${2:expression})"
+    },
+    "arcsec()": {
+      "snippet": "arcsec(${1:expression})"
+    },
+    "arcsec[]()": {
+      "snippet": "arcsec[${1:power}](${2:expression})"
+    },
     "arcsecant": {},
+    "arcsin()": {
+      "snippet": "arcsin(${1:expression})"
+    },
+    "arcsin[]()": {
+      "snippet": "arcsin[${1:power}](${2:expression})"
+    },
     "arcsine": {},
+    "arctan()": {
+      "snippet": "arctan(${1:expression})"
+    },
+    "arctan[]()": {
+      "snippet": "arctan[${1:power}](${2:expression})"
+    },
     "arctangent": {},
     "argclose": {},
     "argclose*": {},
     "argopen": {},
     "argopen*": {},
+    "asec()": {
+      "snippet": "asec(${1:expression})"
+    },
+    "asec[]()": {
+      "snippet": "asec[${1:power}](${2:expression})"
+    },
     "asecant": {},
+    "asin()": {
+      "snippet": "asin(${1:expression})"
+    },
+    "asin[]()": {
+      "snippet": "asin[${1:power}](${2:expression})"
+    },
     "asine": {},
+    "atan()": {
+      "snippet": "atan(${1:expression})"
+    },
+    "atan[]()": {
+      "snippet": "atan[${1:power}](${2:expression})"
+    },
     "atangent": {},
     "bmqty{}": {
       "snippet": "bmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
@@ -102,13 +177,55 @@
     "commutator{}{}": {
       "snippet": "commutator{${1:expression1}}{${2:expression2}}"
     },
+    "cos()": {
+      "snippet": "cos(${1:expression})"
+    },
+    "cos[]()": {
+      "snippet": "cos[${1:power}](${2:expression})"
+    },
     "cosecant": {},
+    "cosh()": {
+      "snippet": "cosh(${1:expression})"
+    },
+    "cosh[]()": {
+      "snippet": "cosh[${1:power}](${2:expression})"
+    },
     "cosine": {},
+    "cot()": {
+      "snippet": "cot(${1:expression})"
+    },
+    "cot[]()": {
+      "snippet": "cot[${1:power}](${2:expression})"
+    },
     "cotangent": {},
+    "coth()": {
+      "snippet": "coth(${1:expression})"
+    },
+    "coth[]()": {
+      "snippet": "coth[${1:power}](${2:expression})"
+    },
     "cp": {},
     "cross": {},
     "crossproduct": {},
+    "csc()": {
+      "snippet": "csc(${1:expression})"
+    },
+    "csc[]()": {
+      "snippet": "csc[${1:power}](${2:expression})"
+    },
+    "csch()": {
+      "snippet": "csch(${1:expression})"
+    },
+    "csch[]()": {
+      "snippet": "csch[${1:power}](${2:expression})"
+    },
     "curl": {},
+    "curl()": {
+      "snippet": "curl(${1:expression})"
+    },
+    "curl*()": {
+      "snippet": "curl*(${1:expression})"
+    },
     "curl*[]": {
       "snippet": "curl*[${1:expression}]"
     },
@@ -122,6 +239,9 @@
       "detail": "ⅆ",
       "documentation": "DOUBLE-STRUCK ITALIC SMALL D"
     },
+    "dd()": {
+      "snippet": "dd(${1:expression})"
+    },
     "dd[]{}": {
       "snippet": "dd[${2:power}]{${1:expression}}"
     },
@@ -131,11 +251,20 @@
     "derivative{}{}": {
       "snippet": "derivative{${1:function}}{${2:expression}}"
     },
+    "det()": {
+      "snippet": "det(${1:expression})"
+    },
     "determinant": {},
     "diagonalmatrix{}": {
-      "snippet": "diagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "diagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
     },
     "differential": {},
+    "div()": {
+      "snippet": "div(${1:expression})"
+    },
+    "div*()": {
+      "snippet": "div*(${1:expression})"
+    },
     "div*[]": {
       "snippet": "div*[${1:expression}]"
     },
@@ -151,7 +280,7 @@
     },
     "divisionsymbol": {},
     "dmat{}": {
-      "snippet": "dmat{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "dmat{${1:matrix element 1,${2:matrix element 2},...}}"
     },
     "dotproduct": {},
     "dv*{}{}": {
@@ -163,6 +292,9 @@
     "dv{}": {
       "snippet": "dv{${1:expression}}"
     },
+    "dv{}()": {
+      "snippet": "dv{${1:expression1}}(${2:expression2})"
+    },
     "dv{}{}": {
       "snippet": "dv{${1:function}}{${2:expression}}"
     },
@@ -175,6 +307,9 @@
     "dyad{}{}": {
       "snippet": "dyad{${1:expression1}}{${2:expression2}}"
     },
+    "erf()": {
+      "snippet": "erf(${1:expression})"
+    },
     "ev**{}{}": {
       "snippet": "ev**{${1:expression1}}{${2:expression2}}"
     },
@@ -196,6 +331,9 @@
     "evaluated{}_{}^{}": {
       "snippet": "evaluated{${1:expression}}_{${2:limit1}}^{${3:limit2}}"
     },
+    "exp()": {
+      "snippet": "exp(${1:expression})"
+    },
     "expectationvalue{}{}": {
       "snippet": "expectationvalue{${1:expression1}}{${2:expression2}}"
     },
@@ -221,13 +359,25 @@
     "fdv{}": {
       "snippet": "fdv{${1:expression}}"
     },
+    "fdv{}()": {
+      "snippet": "fdv{${1:expression}}(${2:function})"
+    },
     "fdv{}{}": {
       "snippet": "fdv{${1:function}}{${2:expression}}"
     },
+    "flatfrac{}()": {
+      "snippet": "flatfrac{${1:expression1}}(${2:expression2})"
+    },
     "functionalderivative{}{}": {
       "snippet": "functionalderivative{${1:function}}{${2:expression}}"
     },
     "grad": {},
+    "grad()": {
+      "snippet": "grad(${1:expression})"
+    },
+    "grad*()": {
+      "snippet": "grad*(${1:expression})"
+    },
     "grad*[]": {
       "snippet": "grad*[${1:expression}]"
     },
@@ -277,6 +427,12 @@
       "snippet": "ketbra{${1:expression1}}{${2:expression2}}"
     },
     "laplacian": {},
+    "laplacian()": {
+      "snippet": "laplacian(${1:expression})"
+    },
+    "laplacian*()": {
+      "snippet": "laplacian*(${1:expression})"
+    },
     "laplacian*[]": {
       "snippet": "laplacian*[${1:expression}]"
     },
@@ -286,6 +442,12 @@
     "laplacian{}": {
       "snippet": "laplacian{${1:expression}}"
     },
+    "ln()": {
+      "snippet": "ln(${1:expression})"
+    },
+    "log()": {
+      "snippet": "log(${1:expression})"
+    },
     "logarithm": {},
     "lparen": {
       "detail": "(",
@@ -306,6 +468,9 @@
     "matrixelement{}{}{}": {
       "snippet": "matrixelement{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
+    "matrixquantity()": {
+      "snippet": "matrixquantity(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
+    },
     "matrixquantity{}": {
       "snippet": "matrixquantity{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -322,6 +487,12 @@
     "mel{}{}{}": {
       "snippet": "mel{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
+    "mqty()": {
+      "snippet": "mqty(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
+    },
+    "mqty*()": {
+      "snippet": "mqty*(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
+    },
     "mqty[]": {
       "snippet": "mqty[${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}]"
     },
@@ -344,6 +515,9 @@
     "op{}{}": {
       "snippet": "op{${1:expression1}}{${2:expression2}}"
     },
+    "opbraces{}()": {
+      "snippet": "opbraces{${1:operator}}(${2:expression})"
+    },
     "order*{}": {
       "snippet": "order*{${1:expression}}"
     },
@@ -460,6 +634,9 @@
     "qsince*": {},
     "qthen": {},
     "qthen*": {},
+    "qty()": {
+      "snippet": "qty(${1:expression})"
+    },
     "qty[]": {
       "snippet": "qty[${1:expression}]"
     },
@@ -484,8 +661,32 @@
     "sbmqty{}": {
       "snippet": "sbmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
+    "sec()": {
+      "snippet": "sec(${1:expression})"
+    },
+    "sec[]()": {
+      "snippet": "sec[${1:power}](${2:expression})"
+    },
     "secant": {},
+    "sech()": {
+      "snippet": "sech(${1:expression})"
+    },
+    "sech[]()": {
+      "snippet": "sech[${1:power}](${2:expression})"
+    },
+    "sin()": {
+      "snippet": "sin(${1:expression})"
+    },
+    "sin[]()": {
+      "snippet": "sin[${1:power}](${2:expression})"
+    },
     "sine": {},
+    "sinh()": {
+      "snippet": "sinh(${1:expression})"
+    },
+    "sinh[]()": {
+      "snippet": "sinh[${1:power}](${2:expression})"
+    },
     "smallmatrixdeterminant{}": {
       "snippet": "smallmatrixdeterminant{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -495,6 +696,12 @@
     "smdet{}": {
       "snippet": "smdet{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element}}"
     },
+    "smqty({})": {
+      "snippet": "smqty(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
+    },
+    "smqty*({})": {
+      "snippet": "smqty*(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
+    },
     "smqty[{]": {
       "snippet": "smqty[{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}]"
     },
@@ -513,9 +720,27 @@
     "svmqty{}": {
       "snippet": "svmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
+    "tan()": {
+      "snippet": "tan(${1:expression})"
+    },
+    "tan[]()": {
+      "snippet": "tan[${1:power}](${2:expression})"
+    },
     "tangent": {},
+    "tanh()": {
+      "snippet": "tanh(${1:expression})"
+    },
+    "tanh[]()": {
+      "snippet": "tanh[${1:power}](${2:expression})"
+    },
     "tr": {},
+    "tr()": {
+      "snippet": "tr(${1:expression})"
+    },
     "trace": {},
+    "trigbraces{}()": {
+      "snippet": "trigbraces{${1:operator}}(${2:expression})"
+    },
     "trigopt": {},
     "va*{}": {
       "snippet": "va*{${1:expression}}"
@@ -523,6 +748,9 @@
     "va{}": {
       "snippet": "va{${1:expression}}"
     },
+    "var()": {
+      "snippet": "var(${1:expression})"
+    },
     "var{}": {
       "snippet": "var{${1:expression}}"
     },
diff --git a/data/packages/physics2.json b/data/packages/physics2.json
index 36533ab9b..05a055b1a 100644
--- a/data/packages/physics2.json
+++ b/data/packages/physics2.json
@@ -73,40 +73,40 @@
       "snippet": "ketbra*|subformula1>${1:optional}<subformula2|"
     },
     "diagmat{}": {
-      "snippet": "diagmat{${1:entry1,entry2,...}}"
+      "snippet": "diagmat{${1:entry1,${2:entry2},...}}"
     },
     "diagmat[]{}": {
-      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "pdiagmat{}": {
-      "snippet": "pdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "pdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "pdiagmat[]{}": {
-      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "bdiagmat{}": {
-      "snippet": "bdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "bdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "bdiagmat[]{}": {
-      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "Bdiagmat{}": {
-      "snippet": "Bdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "Bdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "Bdiagmat[]{}": {
-      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "vdiagmat{}": {
-      "snippet": "vdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "vdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "vdiagmat[]{}": {
-      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "Vdiagmat{}": {
-      "snippet": "Vdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "Vdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "Vdiagmat[]{}": {
-      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "doublecross": {},
     "doubledot": {},
diff --git a/data/packages/pst-3d.json b/data/packages/pst-3d.json
index 3e4399531..7d72b7c56 100644
--- a/data/packages/pst-3d.json
+++ b/data/packages/pst-3d.json
@@ -31,7 +31,13 @@
     "psTilt{}{}": {
       "snippet": "psTilt{${1:angle}}{${2:stuff}}"
     },
-    "PSTthreeDLoaded": {}
+    "PSTthreeDLoaded": {},
+    "ThreeDput(){}": {
+      "snippet": "ThreeDput(${2:x},${3:y},${4:z}){${1:stuff}}"
+    },
+    "ThreeDput[](){}": {
+      "snippet": "ThreeDput[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
+    }
   },
   "envs": {},
   "options": [],
diff --git a/data/packages/pst-coil.json b/data/packages/pst-coil.json
index 202fee6f9..63e6a59e3 100644
--- a/data/packages/pst-coil.json
+++ b/data/packages/pst-coil.json
@@ -5,6 +5,30 @@
     "pst-xkey": []
   },
   "macros": {
+    "pscoil()()": {
+      "snippet": "pscoil(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pscoil{}()()": {
+      "snippet": "pscoil{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil[]()()": {
+      "snippet": "pscoil[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil[]{}()()": {
+      "snippet": "pscoil[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pscoil*()()": {
+      "snippet": "pscoil*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pscoil*{}()()": {
+      "snippet": "pscoil*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil*[]()()": {
+      "snippet": "pscoil*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil*[]{}()()": {
+      "snippet": "pscoil*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
     "psCoil{}{}": {
       "snippet": "psCoil{${1:angle1}}{${2:angle2}}"
     },
@@ -17,6 +41,54 @@
     "psCoil*[]{}{}": {
       "snippet": "psCoil*[${3:options}]{${1:angle1}}{${2:angle2}}"
     },
+    "pszigzag()()": {
+      "snippet": "pszigzag(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pszigzag{}()()": {
+      "snippet": "pszigzag{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag[]()()": {
+      "snippet": "pszigzag[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag[]{}()()": {
+      "snippet": "pszigzag[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pszigzag*()()": {
+      "snippet": "pszigzag*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pszigzag*{}()()": {
+      "snippet": "pszigzag*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag*[]()()": {
+      "snippet": "pszigzag*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag*[]{}()()": {
+      "snippet": "pszigzag*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pssin()()": {
+      "snippet": "pssin(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pssin{}()()": {
+      "snippet": "pssin{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin[]()()": {
+      "snippet": "pssin[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin[]{}()()": {
+      "snippet": "pssin[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pssin*()()": {
+      "snippet": "pssin*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pssin*{}()()": {
+      "snippet": "pssin*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin*[]()()": {
+      "snippet": "pssin*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin*[]{}()()": {
+      "snippet": "pssin*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
     "nccoil{}{}": {
       "snippet": "nccoil{${1:nodeA}}{${2:nodeB}}"
     },
diff --git a/data/packages/pst-node.json b/data/packages/pst-node.json
index 942ece71b..4f4be32c9 100644
--- a/data/packages/pst-node.json
+++ b/data/packages/pst-node.json
@@ -10,9 +10,15 @@
     "algparnode{}{}{}": {
       "snippet": "algparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
+    "AplusB()(){}": {
+      "snippet": "AplusB(${2:A})(${3:B}){${1:C}}"
+    },
     "ArrowNotch{}{}{}{}": {
       "snippet": "ArrowNotch{${1:node name}}{${2:node index}}{${3:direction}}{${4:notch}}"
     },
+    "AtoB()(){}": {
+      "snippet": "AtoB(${2:A})(${3:B}){${1:C}}"
+    },
     "Circlenode*[]{}{}": {
       "snippet": "Circlenode*[${3:options}]{${1:name}}{${2:stuff}}"
     },
@@ -37,6 +43,78 @@
     "circlenode{}{}": {
       "snippet": "circlenode{${1:name}}{${2:stuff}}"
     },
+    "Cnode(){}": {
+      "snippet": "Cnode(${2:x},${3:y}){${1:name}}"
+    },
+    "cnode(){}{}": {
+      "snippet": "cnode(${3:x},${4:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnode*(){}": {
+      "snippet": "Cnode*(${2:x},${3:y}){${1:name}}"
+    },
+    "cnode*(){}{}": {
+      "snippet": "cnode*(${3:x},${4:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnode*[](){}": {
+      "snippet": "Cnode*[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "cnode*[](){}{}": {
+      "snippet": "cnode*[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnode[](){}": {
+      "snippet": "Cnode[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "cnode[](){}{}": {
+      "snippet": "cnode[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnodeput(){}{}{}": {
+      "snippet": "Cnodeput(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput(){}{}": {
+      "snippet": "cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput(){}{}": {
+      "snippet": "Cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*(){}{}{}": {
+      "snippet": "Cnodeput*(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput*(){}{}": {
+      "snippet": "cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*(){}{}": {
+      "snippet": "Cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*[](){}{}{}": {
+      "snippet": "Cnodeput*[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput*[](){}{}": {
+      "snippet": "cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*[](){}{}": {
+      "snippet": "Cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "cnodeput*[]{}(){}{}": {
+      "snippet": "cnodeput*[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
+    },
+    "cnodeput*{}(){}{}": {
+      "snippet": "cnodeput*{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
+    },
+    "Cnodeput[](){}{}{}": {
+      "snippet": "Cnodeput[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput[](){}{}": {
+      "snippet": "cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput[](){}{}": {
+      "snippet": "Cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "cnodeput[]{}(){}{}": {
+      "snippet": "cnodeput[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
+    },
+    "cnodeput{}(){}{}": {
+      "snippet": "cnodeput{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
+    },
     "curvepnode{}{}{}": {
       "snippet": "curvepnode{${1:tval}}{${2:expr in t}}{${3:node name}}"
     },
@@ -58,8 +136,32 @@
     "dianode{}{}": {
       "snippet": "dianode{${1:name}}{${2:stuff}}"
     },
+    "dotnode(){}": {
+      "snippet": "dotnode(${2:x},${3:y}){${1:name}}"
+    },
+    "dotnode*(){}": {
+      "snippet": "dotnode*(${2:x},${3:y}){${1:name}}"
+    },
+    "dotnode*[](){}": {
+      "snippet": "dotnode*[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "dotnode[](){}": {
+      "snippet": "dotnode[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
     "endpsmatrix": {},
     "equalwhat": {},
+    "fnode(){}": {
+      "snippet": "fnode(${2:x},${3:y}){${1:name}}"
+    },
+    "fnode*(){}": {
+      "snippet": "fnode*(${2:x},${3:y}){${1:name}}"
+    },
+    "fnode*[](){}": {
+      "snippet": "fnode*[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "fnode[](){}": {
+      "snippet": "fnode[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
     "fnpnode{}{}{}": {
       "snippet": "fnpnode{${1:xval}}{${2:expr in x}}{${3:node name}}"
     },
@@ -81,6 +183,9 @@
     "MakeShortTablr{}{}{}{}": {
       "snippet": "MakeShortTablr{${1:char1}}{${2:char2}}{${3:char3}}{${4:char4}}"
     },
+    "midAB()(){}": {
+      "snippet": "midAB(${2:A})(${3:B}){${1:C}}"
+    },
     "naput*[]{}": {
       "snippet": "naput*[${2:options}]{${1:stuff}}"
     },
@@ -471,6 +576,12 @@
     "nczigzag{}{}": {
       "snippet": "nczigzag{${1:nodeA}}{${2:nodeB}}"
     },
+    "nlput()(){}{}": {
+      "snippet": "nlput(${3:A})(${4:B}){${1:distance}}{${2:text}}"
+    },
+    "nlput[]()(){}{}": {
+      "snippet": "nlput[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:text}}"
+    },
     "nodenameA": {},
     "nodenameB": {},
     "nodex{}": {
@@ -479,6 +590,9 @@
     "nodexn{}{}": {
       "snippet": "nodexn{${1:expr}}{${2:node name}}"
     },
+    "normalvec(){}": {
+      "snippet": "normalvec(${2:coords}){${1:node name}}"
+    },
     "nput*[]{}{}{}": {
       "snippet": "nput*[${4:options}]{${1:refangle}}{${2:name}}{${3:stuff}}"
     },
@@ -503,6 +617,237 @@
     "ovalnode{}{}": {
       "snippet": "ovalnode{${1:name}}{${2:stuff}}"
     },
+    "parsenodexn{}(){}": {
+      "snippet": "parsenodexn{${1:arg1}}(${3:arg2}){${2:arg3}}"
+    },
+    "pcangle()()": {
+      "snippet": "pcangle(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcangle*()()": {
+      "snippet": "pcangle*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcangle*[]()()": {
+      "snippet": "pcangle*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangle*[]{}()()": {
+      "snippet": "pcangle*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangle*{}()()": {
+      "snippet": "pcangle*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangle[]()()": {
+      "snippet": "pcangle[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangle[]{}()()": {
+      "snippet": "pcangle[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangle{}()()": {
+      "snippet": "pcangle{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles*()()": {
+      "snippet": "pcangles*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcangles*[]()()": {
+      "snippet": "pcangles*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles*[]{}()()": {
+      "snippet": "pcangles*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangles*{}()()": {
+      "snippet": "pcangles*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles[]()()": {
+      "snippet": "pcangles[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles[]{}()()": {
+      "snippet": "pcangles[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangles{}()()": {
+      "snippet": "pcangles{${1:nodeA}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc()()": {
+      "snippet": "pcarc(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarc*()()": {
+      "snippet": "pcarc*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarc*[]()()": {
+      "snippet": "pcarc*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc*[]{}()()": {
+      "snippet": "pcarc*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcarc*{}()()": {
+      "snippet": "pcarc*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc[]()()": {
+      "snippet": "pcarc[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc[]{}()()": {
+      "snippet": "pcarc[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcarc{}()()": {
+      "snippet": "pcarc{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarcbox()()": {
+      "snippet": "pcarcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarcbox*()()": {
+      "snippet": "pcarcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarcbox*[]()()": {
+      "snippet": "pcarcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarcbox[]()()": {
+      "snippet": "pcarcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar()()": {
+      "snippet": "pcbar(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbar*()()": {
+      "snippet": "pcbar*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbar*[]()()": {
+      "snippet": "pcbar*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar*[]{}()()": {
+      "snippet": "pcbar*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcbar*{}()()": {
+      "snippet": "pcbar*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar[]()()": {
+      "snippet": "pcbar[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar[]{}()()": {
+      "snippet": "pcbar[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcbar{}()()": {
+      "snippet": "pcbar{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbox()()": {
+      "snippet": "pcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbox*()()": {
+      "snippet": "pcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbox*[]()()": {
+      "snippet": "pcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbox[]()()": {
+      "snippet": "pcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve()()": {
+      "snippet": "pccurve(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pccurve*()()": {
+      "snippet": "pccurve*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pccurve*[]()()": {
+      "snippet": "pccurve*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve*[]{}()()": {
+      "snippet": "pccurve*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pccurve*{}()()": {
+      "snippet": "pccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve[]()()": {
+      "snippet": "pccurve[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve[]{}()()": {
+      "snippet": "pccurve[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pccurve{}()()": {
+      "snippet": "pccurve{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag()()": {
+      "snippet": "pcdiag(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcdiag*()()": {
+      "snippet": "pcdiag*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcdiag*[]()()": {
+      "snippet": "pcdiag*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag*[]{}()()": {
+      "snippet": "pcdiag*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcdiag*{}()()": {
+      "snippet": "pcdiag*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag[]()()": {
+      "snippet": "pcdiag[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag[]{}()()": {
+      "snippet": "pcdiag[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcdiag{}()()": {
+      "snippet": "pcdiag{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiagg()()": {
+      "snippet": "pcdiagg(${1:nodeA})(${2:nodeB})"
+    },
+    "pcdiagg[]()()": {
+      "snippet": "pcdiagg[${1:options}](${2:nodeA})(${3:nodeB})"
+    },
+    "pcline()()": {
+      "snippet": "pcline(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcline*()()": {
+      "snippet": "pcline*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcline*[]()()": {
+      "snippet": "pcline*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcline*[]{}()()": {
+      "snippet": "pcline*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcline*{}()()": {
+      "snippet": "pcline*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcline[]()()": {
+      "snippet": "pcline[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcline[]{}()()": {
+      "snippet": "pcline[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcline{}()()": {
+      "snippet": "pcline{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop()()": {
+      "snippet": "pcloop(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcloop*()()": {
+      "snippet": "pcloop*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcloop*[]()()": {
+      "snippet": "pcloop*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop*[]{}()()": {
+      "snippet": "pcloop*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcloop*{}()()": {
+      "snippet": "pcloop*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop[]()()": {
+      "snippet": "pcloop[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop[]{}()()": {
+      "snippet": "pcloop[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcloop{}()()": {
+      "snippet": "pcloop{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pnode(){}": {
+      "snippet": "pnode(${2:x},${3:y}){${1:name}}"
+    },
+    "pnode[](){}": {
+      "snippet": "pnode[${2:offset}](${3:x},${4:y}){${1:name}}"
+    },
+    "polyIntersections{}{}()(){}{}": {
+      "snippet": "polyIntersections{${1:name1}}{${2:name2}}(${5:A})(${6:B}){${3:P}}{${4:number}}"
+    },
     "pscloseNodeFile": {},
     "pscolhooki": {},
     "pscolhookii": {},
@@ -542,6 +887,15 @@
     "psLCNode{}{}{}": {
       "snippet": "psLCNode{${1:val1}}{${2:val2}}{${3:node name}}"
     },
+    "psLCNodeVar()()(){}": {
+      "snippet": "psLCNodeVar(${2:nodeA})(${3:nodeB})(${4:factorA},${5:factorB}){${1:node name}}"
+    },
+    "psLDNode()(){}{}": {
+      "snippet": "psLDNode(${3:A})(${4:B}){${1:distance}}{${2:node name}}"
+    },
+    "psLDNode[]()(){}{}": {
+      "snippet": "psLDNode[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:node name}}"
+    },
     "psLNode[][]{}{}": {
       "snippet": "psLNode[${3:P1}][${4:P2}]{${1:value}}{${2:node name}}"
     },
@@ -555,10 +909,67 @@
     "psmatrix[]": {
       "snippet": "psmatrix[${1:options}]"
     },
+    "psncurve(){}": {
+      "snippet": "psncurve(${2:x},${3:y}){${1:name}}"
+    },
+    "psncurve[](){}": {
+      "snippet": "psncurve[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psncurve[]{}(){}": {
+      "snippet": "psncurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psncurve{}(){}": {
+      "snippet": "psncurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
+    "psnccurve(){}": {
+      "snippet": "psnccurve(${2:x},${3:y}){${1:name}}"
+    },
+    "psnccurve[](){}": {
+      "snippet": "psnccurve[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psnccurve[]{}(){}": {
+      "snippet": "psnccurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psnccurve{}(){}": {
+      "snippet": "psnccurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
+    "psnline(){}": {
+      "snippet": "psnline(${2:x},${3:y}){${1:name}}"
+    },
+    "psnline[](){}": {
+      "snippet": "psnline[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psnline[]{}(){}": {
+      "snippet": "psnline[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psnline{}(){}": {
+      "snippet": "psnline{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
+    "psnode(){}{}": {
+      "snippet": "psnode(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "psnode[](){}{}": {
+      "snippet": "psnode[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "psnpolygon(){}": {
+      "snippet": "psnpolygon(${2:x},${3:y}){${1:name}}"
+    },
+    "psnpolygon[](){}": {
+      "snippet": "psnpolygon[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psnpolygon[]{}(){}": {
+      "snippet": "psnpolygon[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psnpolygon{}(){}": {
+      "snippet": "psnpolygon{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
     "psopenNodeFile": {},
     "psparnode{}{}{}": {
       "snippet": "psparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
+    "psRelLineVar()()(){}": {
+      "snippet": "psRelLineVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
+    },
     "psRelNode[][]{}{}": {
       "snippet": "psRelNode[${3:P0}][${4:P1}]{${1:length factor}}{${2:end node name}}"
     },
@@ -568,6 +979,9 @@
     "psRelNode{}{}": {
       "snippet": "psRelNode{${1:length factor}}{${2:end node name}}"
     },
+    "psRelNodeVar()()(){}": {
+      "snippet": "psRelNodeVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
+    },
     "psrowhooki": {},
     "psrowhookii": {},
     "psrowhookiii": {},
@@ -586,6 +1000,21 @@
       "snippet": "pstloop{${1:arg}}"
     },
     "PSTnodesLoaded": {},
+    "psxline(){}{}": {
+      "snippet": "psxline(${3:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
+    },
+    "psxline[](){}{}": {
+      "snippet": "psxline[${3:options}](${4:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
+    },
+    "psxline[]{}(){}{}": {
+      "snippet": "psxline[${4:options}]{${1:arrows}}(${5:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
+    },
+    "psxline{}(){}{}": {
+      "snippet": "psxline{${1:arrows}}(${4:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
+    },
+    "rhombus{}()(){}{}": {
+      "snippet": "rhombus{${1:edge length}}(${4:A})(${5:B}){${2:C}}{${3:D}}"
+    },
     "rnode[]{}{}": {
       "snippet": "rnode[${3:refpoint}]{${1:name}}{${2:stuff}}"
     },
@@ -598,6 +1027,9 @@
     "saveDataAsNodes{}{}": {
       "snippet": "saveDataAsNodes{${1:data}}{${2:node prefix}}"
     },
+    "shownode()": {
+      "snippet": "shownode(${1:P})"
+    },
     "taput*[]{}": {
       "snippet": "taput*[${2:options}]{${1:stuff}}"
     },
@@ -723,6 +1155,24 @@
     "bput*[]{}{}": {
       "snippet": "bput*[${3:labelsep}]{${1:angle}}{${2:stuff}}"
     },
+    "Lput{}{}(){}": {
+      "snippet": "Lput{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
+    },
+    "Lput{}[]{}(){}": {
+      "snippet": "Lput{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
+    },
+    "Lput*{}{}(){}": {
+      "snippet": "Lput*{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
+    },
+    "Lput*{}[]{}(){}": {
+      "snippet": "Lput*{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
+    },
+    "lput(){}": {
+      "snippet": "lput(${2:pos}){${1:stuff}}"
+    },
+    "lput*(){}": {
+      "snippet": "lput*(${2:pos}){${1:stuff}}"
+    },
     "lput{}{}": {
       "snippet": "lput{${1:angle}}{${2:stuff}}"
     },
diff --git a/data/packages/pst-plot.json b/data/packages/pst-plot.json
index ad9811114..edc5301fa 100644
--- a/data/packages/pst-plot.json
+++ b/data/packages/pst-plot.json
@@ -39,12 +39,42 @@
     "parametricplot{}{}{}": {
       "snippet": "parametricplot{${1:tmin}}{${2:tmax}}{${3:function}}"
     },
+    "psaxes()()()": {
+      "snippet": "psaxes(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "psaxes()()()[][]": {
+      "snippet": "psaxes(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})[${1:Xlabel,${9:Xangle}][${2:Ylabel},Yangle}]"
+    },
+    "psaxes[]()()()": {
+      "snippet": "psaxes[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
+    "psaxes[]()()()[][]": {
+      "snippet": "psaxes[${1:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
+    },
+    "psaxes[]{}()()()": {
+      "snippet": "psaxes[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})"
+    },
+    "psaxes[]{}()()()[][]": {
+      "snippet": "psaxes[${2:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2})[${3:Xlabel,${11:Xangle}][${4:Ylabel},Yangle}]"
+    },
+    "psaxes{}()()()": {
+      "snippet": "psaxes{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
+    "psaxes{}()()()[][]": {
+      "snippet": "psaxes{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
+    },
     "psBoxplot[]{}": {
       "snippet": "psBoxplot[${2:options}]{${1:macro}}"
     },
     "psBoxplot{}": {
       "snippet": "psBoxplot{${1:macro}}"
     },
+    "psCoordinates()": {
+      "snippet": "psCoordinates(${1:x},${2:y})"
+    },
+    "psCoordinates[]()": {
+      "snippet": "psCoordinates[${1:options}](${2:x},${3:y})"
+    },
     "psdataplot[]{}": {
       "snippet": "psdataplot[${2:options}]{${1:macro}}"
     },
@@ -63,11 +93,26 @@
     "psFixpoint{}{}{}": {
       "snippet": "psFixpoint{${1:x0}}{${2:f(${4:x})}}{${3:n}}"
     },
+    "psgraph()()(){}{}": {
+      "snippet": "psgraph(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[]()()(){}{}": {
+      "snippet": "psgraph[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[]{}()()(){}{}": {
+      "snippet": "psgraph[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph{}()()(){}{}": {
+      "snippet": "psgraph{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
+    },
     "psgraphLLx": {},
     "psgraphLLy": {},
     "psgraphURx": {},
     "psgraphURy": {},
     "pshlabel": {},
+    "pslegend[](){}": {
+      "snippet": "pslegend[${2:reference}](${3:xoffset},${4:yoffset}){${1:text}}"
+    },
     "pslegend[]{}": {
       "snippet": "pslegend[${2:reference}]{${1:text}}"
     },
@@ -143,16 +188,49 @@
     "PSTplotLoaded": {},
     "pstRadUnit": {},
     "pstRadUnitInv": {},
+    "pstScalePoints(){}{}": {
+      "snippet": "pstScalePoints(${3:xscale},${4:yscale}){${1:xPS}}{${2:yPS}}"
+    },
     "pstXPSScale": {},
     "pstXScale": {},
     "pstYPSScale": {},
     "pstYScale": {},
+    "psVectorfield()(){}": {
+      "snippet": "psVectorfield(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:f'(${6:x},${7:y})}}"
+    },
+    "psVectorfield[]()(){}": {
+      "snippet": "psVectorfield[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:f'(${7:x},${8:y})}}"
+    },
     "psvlabel": {},
     "psxlabelsep": {},
     "psxsubticklinestyle": {},
+    "psxTick(){}": {
+      "snippet": "psxTick(${2:x value}){${1:label}}"
+    },
+    "psxTick[](){}": {
+      "snippet": "psxTick[${2:options}](${3:x value}){${1:label}}"
+    },
+    "psxTick[]{}(){}": {
+      "snippet": "psxTick[${3:options}]{${1:rotation}}(${4:x value}){${2:label}}"
+    },
+    "psxTick{}(){}": {
+      "snippet": "psxTick{${1:rotation}}(${3:x value}){${2:label}}"
+    },
     "psxticklinestyle": {},
     "psylabelsep": {},
     "psysubticklinestyle": {},
+    "psyTick(){}": {
+      "snippet": "psyTick(${2:y value}){${1:label}}"
+    },
+    "psyTick[](){}": {
+      "snippet": "psyTick[${2:options}](${3:y value}){${1:label}}"
+    },
+    "psyTick[]{}(){}": {
+      "snippet": "psyTick[${3:options}]{${1:rotation}}(${4:y value}){${2:label}}"
+    },
+    "psyTick{}(){}": {
+      "snippet": "psyTick{${1:rotation}}(${3:y value}){${2:label}}"
+    },
     "psyticklinestyle": {},
     "readdata{}{}": {
       "snippet": "readdata{${1:macro}}{${2:file}}"
@@ -175,7 +253,40 @@
     "SpecialLabelsDonetrue": {},
     "stripDecimals": {}
   },
-  "envs": {},
+  "envs": {
+    "psgraph(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[](x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph*(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph*[](x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph*[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph*{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
+    }
+  },
   "options": [
     "97"
   ],
diff --git a/data/packages/pst-text.json b/data/packages/pst-text.json
index d4e2f18ad..a85cb983e 100644
--- a/data/packages/pst-text.json
+++ b/data/packages/pst-text.json
@@ -3,6 +3,12 @@
     "pstricks": []
   },
   "macros": {
+    "pstextpath[](){}{}": {
+      "snippet": "pstextpath[${3:pos}](${4:x},${5:y}){${1:graphics object}}{${2:text}}"
+    },
+    "pstextpath(){}{}": {
+      "snippet": "pstextpath(${3:x},${4:y}){${1:graphics object}}{${2:text}}"
+    },
     "pscharpath{}": {
       "snippet": "pscharpath{${1:text}}"
     },
@@ -34,12 +40,24 @@
     "psCircleText[]{}": {
       "snippet": "psCircleText[${2:options}]{${1:text}}"
     },
+    "psCircleText(){}": {
+      "snippet": "psCircleText(${2:x},${3:y}){${1:text}}"
+    },
+    "psCircleText[](){}": {
+      "snippet": "psCircleText[${2:options}](${3:x},${4:y}){${1:text}}"
+    },
     "psWarp{}": {
       "snippet": "psWarp{${1:text}}"
     },
     "psWarp[]{}": {
       "snippet": "psWarp[${2:options}]{${1:text}}"
     },
+    "psWarp(){}": {
+      "snippet": "psWarp(${2:x},${3:y}){${1:text}}"
+    },
+    "psWarp[](){}": {
+      "snippet": "psWarp[${2:options}](${3:x},${4:y}){${1:text}}"
+    },
     "TPoffset": {},
     "PSTextPathLoaded": {}
   },
diff --git a/data/packages/pstricks.json b/data/packages/pstricks.json
index 65c804130..07a894c18 100644
--- a/data/packages/pstricks.json
+++ b/data/packages/pstricks.json
@@ -31,11 +31,8 @@
     "black": {},
     "blue": {},
     "Cartesian": {},
-    "clipbox[]{}": {
-      "snippet": "clipbox[${2:dim}]{${1:stuff}}"
-    },
-    "clipbox{}": {
-      "snippet": "clipbox{${1:stuff}}"
+    "Cartesian()": {
+      "snippet": "Cartesian(${1:x},${2:y})"
     },
     "closedshadow": {},
     "closedshadow[]": {
@@ -45,6 +42,33 @@
     "code{}": {
       "snippet": "code{${1:code}}"
     },
+    "cput*[]{}(){}": {
+      "snippet": "cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "Cput*[]{}(){}": {
+      "snippet": "Cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "cput*{}(){}": {
+      "snippet": "cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "Cput*{}(){}": {
+      "snippet": "Cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "cput[]{}(){}": {
+      "snippet": "cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "Cput[]{}(){}": {
+      "snippet": "Cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "cput{}(){}": {
+      "snippet": "cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "Cput{}(){}": {
+      "snippet": "Cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "curveto()()()": {
+      "snippet": "curveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
     "cyan": {},
     "darkgray": {},
     "degrees": {},
@@ -79,9 +103,48 @@
     "ifshowgrid": {},
     "KillGlue": {},
     "lightgray": {},
+    "lineto()": {
+      "snippet": "lineto(${1:coor})"
+    },
     "magenta": {},
+    "movepath()": {
+      "snippet": "movepath(${1:coor})"
+    },
+    "moveto()": {
+      "snippet": "moveto(${1:coor})"
+    },
     "mrestore": {},
     "msave": {},
+    "multips()(){}{}": {
+      "snippet": "multips(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:graphics}}"
+    },
+    "multips{}()(){}{}": {
+      "snippet": "multips{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:graphics}}"
+    },
+    "multirput()(){}{}": {
+      "snippet": "multirput(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput*()(){}{}": {
+      "snippet": "multirput*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput*[]()(){}{}": {
+      "snippet": "multirput*[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput*[]{}()(){}{}": {
+      "snippet": "multirput*[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
+    },
+    "multirput*{}()(){}{}": {
+      "snippet": "multirput*{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
+    },
+    "multirput[]()(){}{}": {
+      "snippet": "multirput[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput[]{}()(){}{}": {
+      "snippet": "multirput[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
+    },
+    "multirput{}()(){}{}": {
+      "snippet": "multirput{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
+    },
     "newcmykcolor{}{}": {
       "snippet": "newcmykcolor{${1:color}}{${2:num1 num2 num3 num4}}"
     },
@@ -122,6 +185,30 @@
       "snippet": "openshadow[${1:keyvals}]"
     },
     "overlaybox": {},
+    "parabola()()": {
+      "snippet": "parabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "parabola*()()": {
+      "snippet": "parabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "parabola*[]()()": {
+      "snippet": "parabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "parabola*[]{}()()": {
+      "snippet": "parabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "parabola*{}()()": {
+      "snippet": "parabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "parabola[]()()": {
+      "snippet": "parabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "parabola[]{}()()": {
+      "snippet": "parabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "parabola{}()()": {
+      "snippet": "parabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pgfforeach": {},
     "pgfforeach{}": {
       "snippet": "pgfforeach{${1:cmd}}"
@@ -130,8 +217,176 @@
     "psaddtolength{}{}": {
       "snippet": "psaddtolength{${1:cmd}}{${2:dim}}"
     },
+    "psarc(){}{}{}": {
+      "snippet": "psarc(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc*(){}{}{}": {
+      "snippet": "psarc*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc*[](){}{}{}": {
+      "snippet": "psarc*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc*[]{}(){}{}{}": {
+      "snippet": "psarc*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarc*{}(){}{}{}": {
+      "snippet": "psarc*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarc[](){}{}{}": {
+      "snippet": "psarc[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc[]{}(){}{}{}": {
+      "snippet": "psarc[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarc{}(){}{}{}": {
+      "snippet": "psarc{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcAB()()()": {
+      "snippet": "psarcAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
+    },
+    "psarcAB[]()()()": {
+      "snippet": "psarcAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
+    "psarcAB[]{}()()()": {
+      "snippet": "psarcAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
+    },
+    "psarcAB{}()()()": {
+      "snippet": "psarcAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
+    "psarcn(){}{}{}": {
+      "snippet": "psarcn(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn*(){}{}{}": {
+      "snippet": "psarcn*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn*[](){}{}{}": {
+      "snippet": "psarcn*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn*[]{}(){}{}{}": {
+      "snippet": "psarcn*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcn*{}(){}{}{}": {
+      "snippet": "psarcn*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcn[](){}{}{}": {
+      "snippet": "psarcn[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn[]{}(){}{}{}": {
+      "snippet": "psarcn[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcn{}(){}{}{}": {
+      "snippet": "psarcn{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcnAB()()()": {
+      "snippet": "psarcnAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
+    },
+    "psarcnAB[]()()()": {
+      "snippet": "psarcnAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
+    "psarcnAB[]{}()()()": {
+      "snippet": "psarcnAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
+    },
+    "psarcnAB{}()()()": {
+      "snippet": "psarcnAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
     "psarrowlinestyle": {},
+    "psbezier()()()()": {
+      "snippet": "psbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "psbezier*()()()()": {
+      "snippet": "psbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "psbezier*[]()()()()": {
+      "snippet": "psbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psbezier*[]{}()()()()": {
+      "snippet": "psbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "psbezier*{}()()()()": {
+      "snippet": "psbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psbezier[]()()()()": {
+      "snippet": "psbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psbezier[]{}()()()()": {
+      "snippet": "psbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "psbezier{}()()()()": {
+      "snippet": "psbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
     "psbordercolor": {},
+    "pscbezier()()()()": {
+      "snippet": "pscbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "pscbezier*()()()()": {
+      "snippet": "pscbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "pscbezier*[]()()()()": {
+      "snippet": "pscbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "pscbezier*[]{}()()()()": {
+      "snippet": "pscbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "pscbezier*{}()()()()": {
+      "snippet": "pscbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "pscbezier[]()()()()": {
+      "snippet": "pscbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "pscbezier[]{}()()()()": {
+      "snippet": "pscbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "pscbezier{}()()()()": {
+      "snippet": "pscbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psccurve()()": {
+      "snippet": "psccurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psccurve*()()": {
+      "snippet": "psccurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psccurve*[]()()": {
+      "snippet": "psccurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psccurve*[]{}()()": {
+      "snippet": "psccurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psccurve*{}()()": {
+      "snippet": "psccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psccurve[]()()": {
+      "snippet": "psccurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psccurve[]{}()()": {
+      "snippet": "psccurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psccurve{}()()": {
+      "snippet": "psccurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscircle(){}": {
+      "snippet": "pscircle(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "psCircle(){}": {
+      "snippet": "psCircle(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "pscircle*(){}": {
+      "snippet": "pscircle*(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "psCircle*(){}": {
+      "snippet": "psCircle*(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "pscircle*[](){}": {
+      "snippet": "pscircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
+    "psCircle*[](){}": {
+      "snippet": "psCircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
+    "pscircle[](){}": {
+      "snippet": "pscircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
+    "psCircle[](){}": {
+      "snippet": "psCircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
     "pscirclebox*[]{}": {
       "snippet": "pscirclebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -156,10 +411,46 @@
     "psCirclebox{}": {
       "snippet": "psCirclebox{${1:stuff}}"
     },
+    "pscircleOA()()": {
+      "snippet": "pscircleOA(${1:xO},${2:yO})(${3:xA},${4:yA})"
+    },
+    "pscircleOA[]()()": {
+      "snippet": "pscircleOA[${1:keyvals}](${2:xO},${3:yO})(${4:xA},${5:yA})"
+    },
     "psclip{}": {
       "snippet": "psclip{${1:graphics}}"
     },
+    "psclipbox[]{}": {
+      "snippet": "psclipbox[${2:dim}]{${1:stuff}}"
+    },
+    "psclipbox{}": {
+      "snippet": "psclipbox{${1:stuff}}"
+    },
     "pscoor": {},
+    "pscurve()()": {
+      "snippet": "pscurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "pscurve*()()": {
+      "snippet": "pscurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "pscurve*[]()()": {
+      "snippet": "pscurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscurve*[]{}()()": {
+      "snippet": "pscurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "pscurve*{}()()": {
+      "snippet": "pscurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscurve[]()()": {
+      "snippet": "pscurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscurve[]{}()()": {
+      "snippet": "pscurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "pscurve{}()()": {
+      "snippet": "pscurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
     "pscustom*[]{}": {
       "snippet": "pscustom*[${2:keyvals}]{${1:commands}}"
     },
@@ -203,8 +494,128 @@
     "psdiabox{}": {
       "snippet": "psdiabox{${1:stuff}}"
     },
+    "psdiamond()()": {
+      "snippet": "psdiamond(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psdiamond*()()": {
+      "snippet": "psdiamond*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psdiamond*[]()()": {
+      "snippet": "psdiamond*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psdiamond[]()()": {
+      "snippet": "psdiamond[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psdot()": {
+      "snippet": "psdot(${1:x1},${2:y1})"
+    },
+    "psdot*()": {
+      "snippet": "psdot*(${1:x1},${2:y1})"
+    },
+    "psdot*[]()": {
+      "snippet": "psdot*[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psdot[]()": {
+      "snippet": "psdot[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psdots()()": {
+      "snippet": "psdots(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psdots*()()": {
+      "snippet": "psdots*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psdots*[]()()": {
+      "snippet": "psdots*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psdots[]()()": {
+      "snippet": "psdots[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
     "psdoublecolor": {},
     "psdoublesep": {},
+    "psecurve()()": {
+      "snippet": "psecurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psecurve*()()": {
+      "snippet": "psecurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psecurve*[]()()": {
+      "snippet": "psecurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psecurve*[]{}()()": {
+      "snippet": "psecurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psecurve*{}()()": {
+      "snippet": "psecurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psecurve[]()()": {
+      "snippet": "psecurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psecurve[]{}()()": {
+      "snippet": "psecurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psecurve{}()()": {
+      "snippet": "psecurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psellipse()()": {
+      "snippet": "psellipse(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psellipse*()()": {
+      "snippet": "psellipse*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psellipse*[]()()": {
+      "snippet": "psellipse*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psellipse[]()()": {
+      "snippet": "psellipse[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psellipseAB(){}": {
+      "snippet": "psellipseAB(${2:x},${3:y}){${1:half radius}}"
+    },
+    "psellipseAB*(){}": {
+      "snippet": "psellipseAB*(${2:x},${3:y}){${1:half radius}}"
+    },
+    "psellipseAB*[](){}": {
+      "snippet": "psellipseAB*[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
+    },
+    "psellipseAB[](){}": {
+      "snippet": "psellipseAB[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
+    },
+    "psellipticarc()(){}{}": {
+      "snippet": "psellipticarc(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarc*()(){}{}": {
+      "snippet": "psellipticarc*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarc*[]()(){}{}": {
+      "snippet": "psellipticarc*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarc[]()(){}{}": {
+      "snippet": "psellipticarc[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn()(){}{}": {
+      "snippet": "psellipticarcn(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn*()(){}{}": {
+      "snippet": "psellipticarcn*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn*[]()(){}{}": {
+      "snippet": "psellipticarcn*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn[]()(){}{}": {
+      "snippet": "psellipticarcn[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge()(){}{}": {
+      "snippet": "psellipticwedge(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge*()(){}{}": {
+      "snippet": "psellipticwedge*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge*[]()(){}{}": {
+      "snippet": "psellipticwedge*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge[]()(){}{}": {
+      "snippet": "psellipticwedge[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
     "psfillcolor": {},
     "psforeach{}{}{}": {
       "snippet": "psforeach{${1:variable}}{${2:value list}}{${3:action}}"
@@ -212,6 +623,18 @@
     "psForeach{}{}{}": {
       "snippet": "psForeach{${1:variable}}{${2:value list}}{${3:action}}"
     },
+    "psframe()()": {
+      "snippet": "psframe(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psframe*()()": {
+      "snippet": "psframe*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psframe*[]()()": {
+      "snippet": "psframe*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psframe[]()()": {
+      "snippet": "psframe[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "psframebox*[]{}": {
       "snippet": "psframebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -234,6 +657,9 @@
     "psgetRGBColorValues{}": {
       "snippet": "psgetRGBColorValues{${1:color macro}}"
     },
+    "psgrid()()()": {
+      "snippet": "psgrid(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
     "psgridcolor": {},
     "psgridlabelcolor": {},
     "pshatchcolor": {},
@@ -244,6 +670,54 @@
     },
     "pslabelsep": {},
     "pslbrace": {},
+    "psline()()": {
+      "snippet": "psline(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine()()": {
+      "snippet": "psLine(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine()": {
+      "snippet": "psLine(${1:x1},${2:y1})"
+    },
+    "psline*()()": {
+      "snippet": "psline*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine*()()": {
+      "snippet": "psLine*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine*()": {
+      "snippet": "psLine*(${1:x1},${2:y1})"
+    },
+    "psline*[]()()": {
+      "snippet": "psline*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine*[]()()": {
+      "snippet": "psLine*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine*[]()": {
+      "snippet": "psLine*[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psline*[]{}()()": {
+      "snippet": "psline*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psline*{}()()": {
+      "snippet": "psline*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psline[]()()": {
+      "snippet": "psline[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine[]()()": {
+      "snippet": "psLine[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine[]()": {
+      "snippet": "psLine[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psline[]{}()()": {
+      "snippet": "psline[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psline{}()()": {
+      "snippet": "psline{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pslinearc": {},
     "pslinecolor": {},
     "pslinestyle": {},
@@ -273,11 +747,77 @@
     "psoverlay{}": {
       "snippet": "psoverlay{${1:string}}"
     },
+    "psparabola()()": {
+      "snippet": "psparabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psparabola*()()": {
+      "snippet": "psparabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psparabola*[]()()": {
+      "snippet": "psparabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psparabola*[]{}()()": {
+      "snippet": "psparabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psparabola*{}()()": {
+      "snippet": "psparabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psparabola[]()()": {
+      "snippet": "psparabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psparabola[]{}()()": {
+      "snippet": "psparabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psparabola{}()()": {
+      "snippet": "psparabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pspicture[]": {
       "snippet": "pspicture[${1:keyvals}]"
     },
+    "psPline()()()": {
+      "snippet": "psPline(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
+    "psPline[]()()()": {
+      "snippet": "psPline[${1:keyvals}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
+    },
+    "pspolygon()()()": {
+      "snippet": "pspolygon(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pspolygon*()()()": {
+      "snippet": "pspolygon*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pspolygon*[]()()()": {
+      "snippet": "pspolygon*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
+    "pspolygon[]()()()": {
+      "snippet": "pspolygon[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
     "psrbrace": {},
     "psresetColor": {},
+    "psRing()[]{}{}": {
+      "snippet": "psRing(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing(){}{}": {
+      "snippet": "psRing(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*()[]{}{}": {
+      "snippet": "psRing*(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*(){}{}": {
+      "snippet": "psRing*(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*[]()[]{}{}": {
+      "snippet": "psRing*[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*[](){}{}": {
+      "snippet": "psRing*[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing[]()[]{}{}": {
+      "snippet": "psRing[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing[](){}{}": {
+      "snippet": "psRing[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
+    },
     "psrotatedown{}": {
       "snippet": "psrotatedown{${1:stuff}}"
     },
@@ -291,6 +831,9 @@
     "psscalebox{}{}": {
       "snippet": "psscalebox{${1:num1 num2}}{${2:stuff}}"
     },
+    "psscaleboxto(){}": {
+      "snippet": "psscaleboxto(${2:x},${3:y}){${1:stuff}}"
+    },
     "pssetGrayscale": {},
     "pssetlength{}{}": {
       "snippet": "pssetlength{${1:cmd}}{${2:dim}}"
@@ -322,12 +865,36 @@
     },
     "pstcustomize": {},
     "pstdriver": {},
+    "psTextFrame()(){}": {
+      "snippet": "psTextFrame(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
+    },
+    "psTextFrame*()(){}": {
+      "snippet": "psTextFrame*(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
+    },
+    "psTextFrame*[]()(){}": {
+      "snippet": "psTextFrame*[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
+    },
+    "psTextFrame[]()(){}": {
+      "snippet": "psTextFrame[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
+    },
     "pstheader{}": {
       "snippet": "pstheader{${1:arg}}"
     },
     "PSTlualatexfalse": {},
     "PSTlualatextrue": {},
     "pstnodescale": {},
+    "pstriangle()()": {
+      "snippet": "pstriangle(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pstriangle*()()": {
+      "snippet": "pstriangle*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pstriangle*[]()()": {
+      "snippet": "pstriangle*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pstriangle[]()()": {
+      "snippet": "pstriangle[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pstribox*[]{}": {
       "snippet": "pstribox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -356,15 +923,42 @@
     "psunit": {},
     "psverbboxfalse": {},
     "psverbboxtrue": {},
+    "pswedge(){}{}{}": {
+      "snippet": "pswedge(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
+    "pswedge*(){}{}{}": {
+      "snippet": "pswedge*(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
+    "pswedge*[](){}{}{}": {
+      "snippet": "pswedge*[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
+    "pswedge[](){}{}{}": {
+      "snippet": "pswedge[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
     "psxunit": {},
     "psyunit": {},
     "putoverlaybox{}": {
       "snippet": "putoverlaybox{${1:string}}"
     },
+    "qdisk(){}": {
+      "snippet": "qdisk(${2:coor}){${1:radius}}"
+    },
+    "qline()()": {
+      "snippet": "qline(${1:coor0})(${2:coor1})"
+    },
     "radians": {},
+    "rcurveto()()()": {
+      "snippet": "rcurveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
     "red": {},
     "resetArrowOptions": {},
     "reversepath": {},
+    "rlineto()": {
+      "snippet": "rlineto(${1:coor})"
+    },
+    "rmoveto()": {
+      "snippet": "rmoveto(${1:coor})"
+    },
     "rotate{}": {
       "snippet": "rotate{${1:angle}}"
     },
@@ -377,6 +971,33 @@
     "rotateright{}": {
       "snippet": "rotateright{${1:stuff}}"
     },
+    "rput(){}": {
+      "snippet": "rput(${2:x},${3:y}){${1:stuff}}"
+    },
+    "rput*(){}": {
+      "snippet": "rput*(${2:x},${3:y}){${1:stuff}}"
+    },
+    "rput*[](){}": {
+      "snippet": "rput*[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "rput*[]{}(){}": {
+      "snippet": "rput*[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "rput*{}(){}": {
+      "snippet": "rput*{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "rput[](){}": {
+      "snippet": "rput[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "rput[]{}(){}": {
+      "snippet": "rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "Rput[]{}(){}": {
+      "snippet": "Rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "rput{}(){}": {
+      "snippet": "rput{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
+    },
     "scale{}": {
       "snippet": "scale{${1:num1 num2}}"
     },
@@ -391,6 +1012,33 @@
       "snippet": "stroke[${1:keyvals}]"
     },
     "swapaxes": {},
+    "translate()": {
+      "snippet": "translate(${1:coor})"
+    },
+    "uput*[](){}": {
+      "snippet": "uput*[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "uput*[]{}(){}": {
+      "snippet": "uput*[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "uput*{}[](){}": {
+      "snippet": "uput*{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
+    },
+    "uput*{}[]{}(){}": {
+      "snippet": "uput*{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
+    },
+    "uput[](){}": {
+      "snippet": "uput[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "uput[]{}(){}": {
+      "snippet": "uput[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "uput{}[](){}": {
+      "snippet": "uput{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
+    },
+    "uput{}[]{}(){}": {
+      "snippet": "uput{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
+    },
     "white": {},
     "yellow": {},
     "psarcOA": {},
@@ -428,6 +1076,22 @@
     "psclip{}": {
       "name": "psclip",
       "snippet": "{${1:graphics}}"
+    },
+    "pspicture*(x0,y0)(x1,y1)": {
+      "name": "pspicture*",
+      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pspicture*[](x0,y0)(x1,y1)": {
+      "name": "pspicture*",
+      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pspicture(x0,y0)(x1,y1)": {
+      "name": "pspicture",
+      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pspicture[](x0,y0)(x1,y1)": {
+      "name": "pspicture",
+      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
     }
   },
   "options": [
diff --git a/data/packages/subfigure.json b/data/packages/subfigure.json
index f1f87bac9..1b0c33e68 100644
--- a/data/packages/subfigure.json
+++ b/data/packages/subfigure.json
@@ -49,6 +49,9 @@
     "iftabletopcap": {},
     "tabletopcaptrue": {},
     "tabletopcapfalse": {},
+    "label(){}": {
+      "snippet": "label(${2:bookmark}){${1:key}}"
+    },
     "subcapfont": {},
     "subcaplabelfont": {},
     "subcapsize": {},
diff --git a/data/packages/tcolorbox.json b/data/packages/tcolorbox.json
index d5522ce87..d9199d4b2 100644
--- a/data/packages/tcolorbox.json
+++ b/data/packages/tcolorbox.json
@@ -2,7 +2,7 @@
   "includes": {
     "environ": [],
     "etoolbox": [],
-    "pgf": [],
+    "tikz": [],
     "verbatim": [],
     "tcolorboxlibraryskins": [
       "skins"
@@ -815,7 +815,6 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
-      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
@@ -1165,7 +1164,6 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
-      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
diff --git a/data/packages/tex.json b/data/packages/tex.json
index ae6e35fdc..984786914 100644
--- a/data/packages/tex.json
+++ b/data/packages/tex.json
@@ -1299,24 +1299,45 @@
       "detail": "⋮",
       "documentation": "VERTICAL ELLIPSIS"
     },
+    "big(": {
+      "snippet": "big(${2:${1}\\big})"
+    },
     "big[": {
       "snippet": "big[${1}\\big]"
     },
+    "Big(": {
+      "snippet": "Big(${2:${1}\\Big})"
+    },
     "Big[": {
       "snippet": "Big[${1}\\Big]"
     },
+    "bigl(": {
+      "snippet": "bigl(${2:${1}\\bigr})"
+    },
     "bigl[": {
       "snippet": "bigl[${1}\\bigr]"
     },
+    "Bigl(": {
+      "snippet": "Bigl(${2:${1}\\Bigr})"
+    },
     "Bigl[": {
       "snippet": "Bigl[${1}\\Bigr]"
     },
+    "biggl(": {
+      "snippet": "biggl(${2:${1}\\biggr})"
+    },
     "biggl[": {
       "snippet": "biggl[${1}\\biggr]"
     },
+    "Biggl(": {
+      "snippet": "Biggl(${2:${1}\\Biggr})"
+    },
     "Biggl[": {
       "snippet": "Biggl[${1}\\Biggr]"
     },
+    "left(": {
+      "snippet": "left(${2:${1}\\right})"
+    },
     "left[": {
       "snippet": "left[${1}\\right]"
     },
diff --git a/data/packages/tkz-euclide.json b/data/packages/tkz-euclide.json
index 14bfda990..8da3dd027 100644
--- a/data/packages/tkz-euclide.json
+++ b/data/packages/tkz-euclide.json
@@ -47,11 +47,25 @@
       "snippet": "tkzCos{${1:arg}}",
       "option": "lua"
     },
+    "tkzDefPoint(){}": {
+      "snippet": "tkzDefPoint(${2:angle:radius}){${1:ref}}"
+    },
+    "tkzDefPoint[](){}": {
+      "snippet": "tkzDefPoint[${2:options}](${3:angle:radius}){${1:ref}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "tkzDefShiftPoint[](){}": {
+      "snippet": "tkzDefShiftPoint[${2:point}](${3:angle:radius}){${1:ref}}"
+    },
+    "tkzDefShiftPointCoord[](){}": {
+      "snippet": "tkzDefShiftPointCoord[${2:point1}](${3:angle:radius}){${1:point2}}"
+    },
     "tkzDefPoints{}": {
-      "snippet": "tkzDefPoints{${1:x1/y1/name1,x2/y2/name2,...}}"
+      "snippet": "tkzDefPoints{${1:x1/y1/name1,${2:x2/y2/name2},...}}"
     },
     "tkzDefPoints[]{}": {
-      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,x2/y2/name2,...}}"
+      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,${3:x2/y2/name2},...}}"
     },
     "tkzGetPoint{}": {
       "snippet": "tkzGetPoint{${1:ref}}"
@@ -71,64 +85,639 @@
     "tkzGetLength{}": {
       "snippet": "tkzGetLength{${1:csname}}"
     },
+    "tkzDefMidPoint()": {
+      "snippet": "tkzDefMidPoint(${1:point1},${2:point2})"
+    },
+    "tkzDefBarycentricPoint()": {
+      "snippet": "tkzDefBarycentricPoint(${1:point1=num1},${2:point2=num2},${3:...})"
+    },
+    "tkzDefSimilitudeCenter()()": {
+      "snippet": "tkzDefSimilitudeCenter(${1:O},${2:A})(${3:O'},${4:B})"
+    },
+    "tkzDefSimilitudeCenter[]()()": {
+      "snippet": "tkzDefSimilitudeCenter[${1:options}](${2:O},${3:A})(${4:O'},${5:B})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "tkzDefHarmonic()": {
+      "snippet": "tkzDefHarmonic(${1:A},${2:B},${3:C})"
+    },
+    "tkzDefHarmonic[]()": {
+      "snippet": "tkzDefHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "tkzDefGoldenRatio()": {
+      "snippet": "tkzDefGoldenRatio(${1:point1},${2:point2})"
+    },
+    "tkzDefEquiPoints()": {
+      "snippet": "tkzDefEquiPoints(${1:point1},${2:point2})"
+    },
+    "tkzDefEquiPoints[]()": {
+      "snippet": "tkzDefEquiPoints[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "tkzDefMidArc()": {
+      "snippet": "tkzDefMidArc(${1:A},${2:B},${3:C})"
+    },
+    "tkzDefTriangleCenter()": {
+      "snippet": "tkzDefTriangleCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefTriangleCenter[]()": {
+      "snippet": "tkzDefTriangleCenter[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "tkzDefProjExcenter()(){}": {
+      "snippet": "tkzDefProjExcenter(${2:A},${3:B},${4:C})(${5:a},${6:b},${7:c}){${1:X,${8:Y},Z}}"
+    },
+    "tkzDefProjExcenter[]()(){}": {
+      "snippet": "tkzDefProjExcenter[${2:options}](${3:A},${4:B},${5:C})(${6:a},${7:b},${8:c}){${1:X,${9:Y},Z}}",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "tkzDefPointOnLine()": {
+      "snippet": "tkzDefPointOnLine(${1:point1},${2:point2})"
+    },
+    "tkzDefPointOnLine[]()": {
+      "snippet": "tkzDefPointOnLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
     "tkzDefPointOnCircle[]": {
       "snippet": "tkzDefPointOnCircle[${1:options}]",
-      "keyvalindex": 0,
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "tkzDefPointBy()": {
+      "snippet": "tkzDefPointBy(${1:point})"
+    },
+    "tkzDefPointBy[]()": {
+      "snippet": "tkzDefPointBy[${1:options}](${2:point})",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "tkzDefPointsBy(){}": {
+      "snippet": "tkzDefPointsBy(${2:point1},${3:point2},${4:...}){${1:point1,${5:point2},...}}"
+    },
+    "tkzDefPointsBy[](){}": {
+      "snippet": "tkzDefPointsBy[${2:options}](${3:point1},${4:point2},${5:...}){${1:point1,${6:point2},...}}",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "tkzDefPointWith()": {
+      "snippet": "tkzDefPointWith(${1:point1},${2:point2})"
+    },
+    "tkzDefPointWith[]()": {
+      "snippet": "tkzDefPointWith[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "tkzGetVectxy(){}": {
+      "snippet": "tkzGetVectxy(${2:point1},${3:point2}){${1:text}}"
+    },
+    "tkzDefLine()": {
+      "snippet": "tkzDefLine(${1:point1},${2:point2})"
+    },
+    "tkzDefLine[]()": {
+      "snippet": "tkzDefLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "tkzDefTangent()": {
+      "snippet": "tkzDefTangent(${1:point1},${2:point2})"
+    },
+    "tkzDefTangent[]()": {
+      "snippet": "tkzDefTangent[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "tkzDefTriangle[]()": {
+      "snippet": "tkzDefTriangle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "tkzDefSpcTriangle[](){}": {
+      "snippet": "tkzDefSpcTriangle[${2:options}](${3:point1},${4:point2},${5:point3}){${1:ref1,${6:ref2},ref3}}",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "tkzPermute()": {
+      "snippet": "tkzPermute(${1:A},${2:B},${3:C})"
+    },
+    "tkzDefSquare()": {
+      "snippet": "tkzDefSquare(${1:point1},${2:point2})"
+    },
+    "tkzDefRectangle()": {
+      "snippet": "tkzDefRectangle(${1:point1},${2:point2})"
+    },
+    "tkzDefParallelogram()": {
+      "snippet": "tkzDefParallelogram(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefGoldenRectangle()": {
+      "snippet": "tkzDefGoldenRectangle(${1:point1},${2:point2})"
+    },
+    "tkzDefGoldRectangle()": {
+      "snippet": "tkzDefGoldRectangle(${1:point1},${2:point2})"
+    },
+    "tkzDefRegPolygon()": {
+      "snippet": "tkzDefRegPolygon(${1:point1},${2:point2})"
+    },
+    "tkzDefRegPolygon[]()": {
+      "snippet": "tkzDefRegPolygon[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "tkzDefCircle()": {
+      "snippet": "tkzDefCircle(${1:point1},${2:point2})"
+    },
+    "tkzDefCircle[]()": {
+      "snippet": "tkzDefCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 15,
+      "keyvalpos": 0
+    },
+    "tkzDefCircleBy()": {
+      "snippet": "tkzDefCircleBy(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleBy[]()": {
+      "snippet": "tkzDefCircleBy[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 16,
+      "keyvalpos": 0
+    },
+    "tkzInterLL()()": {
+      "snippet": "tkzInterLL(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterLC()()": {
+      "snippet": "tkzInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterLC[]()()": {
+      "snippet": "tkzInterLC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
+      "keyvalindex": 17,
+      "keyvalpos": 0
+    },
+    "tkzInterCC()()": {
+      "snippet": "tkzInterCC(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterCC[]()()": {
+      "snippet": "tkzInterCC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
+      "keyvalindex": 17,
       "keyvalpos": 0
     },
+    "tkzTestInterCC()()": {
+      "snippet": "tkzTestInterCC(${1:O},${2:A})(${3:O'},${4:B})"
+    },
     "iftkzFlagCC": {},
     "tkzFlagCCtrue": {},
     "tkzFlagCCfalse": {},
+    "tkzInterCCN()()": {
+      "snippet": "tkzInterCCN(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterCCR()()": {
+      "snippet": "tkzInterCCR(${1:point1},${2:radius1})(${3:point2},${4:radius2})"
+    },
+    "tkzGetAngle()": {
+      "snippet": "tkzGetAngle(${1:csname})"
+    },
     "tkzAngleResult": {},
+    "tkzFindAngle()": {
+      "snippet": "tkzFindAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFindSlopeAngle()": {
+      "snippet": "tkzFindSlopeAngle(${1:point1},${2:point2})"
+    },
     "tkzDefRandPointOn[]": {
       "snippet": "tkzDefRandPointOn[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 18,
+      "keyvalpos": 0
+    },
+    "tkzDrawPoint()": {
+      "snippet": "tkzDrawPoint(${1:name})"
+    },
+    "tkzDrawPoint[]()": {
+      "snippet": "tkzDrawPoint[${1:options}](${2:name})",
+      "keyvalindex": 19,
+      "keyvalpos": 0
+    },
+    "tkzDrawPoints()": {
+      "snippet": "tkzDrawPoints(${1:name1},${2:name2},${3:...})"
+    },
+    "tkzDrawPoints[]()": {
+      "snippet": "tkzDrawPoints[${1:options}](${2:name1},${3:name2},${4:...})",
+      "keyvalindex": 19,
+      "keyvalpos": 0
+    },
+    "tkzDrawLine()": {
+      "snippet": "tkzDrawLine(${1:point1},${2:point2})"
+    },
+    "tkzDrawLine[]()": {
+      "snippet": "tkzDrawLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 20,
+      "keyvalpos": 0
+    },
+    "tkzDrawLines()": {
+      "snippet": "tkzDrawLines(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawLines[]()": {
+      "snippet": "tkzDrawLines[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 20,
+      "keyvalpos": 0
+    },
+    "tkzDrawSegment()": {
+      "snippet": "tkzDrawSegment(${1:point1},${2:point2})"
+    },
+    "tkzDrawSegment[]()": {
+      "snippet": "tkzDrawSegment[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 21,
+      "keyvalpos": 0
+    },
+    "tkzDrawSegments()": {
+      "snippet": "tkzDrawSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzDrawSegments[]()": {
+      "snippet": "tkzDrawSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 21,
+      "keyvalpos": 0
+    },
+    "tkzDrawPolygon()": {
+      "snippet": "tkzDrawPolygon(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawPolygon[]()": {
+      "snippet": "tkzDrawPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 22,
+      "keyvalpos": 0
+    },
+    "tkzDrawPolySeg()": {
+      "snippet": "tkzDrawPolySeg(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawPolySeg[]()": {
+      "snippet": "tkzDrawPolySeg[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 22,
+      "keyvalpos": 0
+    },
+    "tkzDrawCircle()": {
+      "snippet": "tkzDrawCircle(${1:point1},${2:point2})"
+    },
+    "tkzDrawCircle[]()": {
+      "snippet": "tkzDrawCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 23,
+      "keyvalpos": 0
+    },
+    "tkzDrawCircles()": {
+      "snippet": "tkzDrawCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzDrawCircles[]()": {
+      "snippet": "tkzDrawCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 23,
+      "keyvalpos": 0
+    },
+    "tkzDrawSemiCircle()": {
+      "snippet": "tkzDrawSemiCircle(${1:point1},${2:point2})"
+    },
+    "tkzDrawSemiCircle[]()": {
+      "snippet": "tkzDrawSemiCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 24,
+      "keyvalpos": 0
+    },
+    "tkzDrawSemiCircles()": {
+      "snippet": "tkzDrawSemiCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzDrawSemiCircles[]()": {
+      "snippet": "tkzDrawSemiCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 24,
+      "keyvalpos": 0
+    },
+    "tkzDrawArc()()": {
+      "snippet": "tkzDrawArc(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzDrawArc[]()()": {
+      "snippet": "tkzDrawArc[${1:options}](${2:point1},${3:point2})(${4:point3})",
+      "keyvalindex": 25,
+      "keyvalpos": 0
+    },
+    "tkzDrawSector()()": {
+      "snippet": "tkzDrawSector(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzDrawSector[]()()": {
+      "snippet": "tkzDrawSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
+      "keyvalindex": 26,
+      "keyvalpos": 0
+    },
+    "tkzFillCircle()": {
+      "snippet": "tkzFillCircle(${1:point1},${2:point2})"
+    },
+    "tkzFillCircle[]()": {
+      "snippet": "tkzFillCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 27,
+      "keyvalpos": 0
+    },
+    "tkzFillCircles()": {
+      "snippet": "tkzFillCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzFillCircles[]()": {
+      "snippet": "tkzFillCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 27,
+      "keyvalpos": 0
+    },
+    "tkzFillPolygon()": {
+      "snippet": "tkzFillPolygon(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzFillPolygon[]()": {
+      "snippet": "tkzFillPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 28,
+      "keyvalpos": 0
+    },
+    "tkzFillSector()()": {
+      "snippet": "tkzFillSector(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzFillSector[]()()": {
+      "snippet": "tkzFillSector[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillAngle()": {
+      "snippet": "tkzFillAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFillAngle[]()": {
+      "snippet": "tkzFillAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 29,
       "keyvalpos": 0
     },
     "tkzInit[]": {
       "snippet": "tkzInit[${1:options}]",
-      "keyvalindex": 2,
+      "keyvalindex": 30,
       "keyvalpos": 0
     },
     "tkzClip": {},
     "tkzClip[]": {
       "snippet": "tkzClip[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 31,
       "keyvalpos": 0
     },
     "tkzShowBB": {},
     "tkzShowBB[]": {
       "snippet": "tkzShowBB[${1:options}]",
-      "keyvalindex": 4,
+      "keyvalindex": 32,
       "keyvalpos": 0
     },
     "tkzClipBB": {},
+    "tkzClipPolygon()": {
+      "snippet": "tkzClipPolygon(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzClipPolygon[]()": {
+      "snippet": "tkzClipPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 33,
+      "keyvalpos": 0
+    },
+    "tkzClipCircle()": {
+      "snippet": "tkzClipCircle(${1:point1},${2:point2})"
+    },
+    "tkzClipCircle[]()": {
+      "snippet": "tkzClipCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 33,
+      "keyvalpos": 0
+    },
+    "tkzClipSector[]()()": {
+      "snippet": "tkzClipSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
+      "keyvalindex": 34,
+      "keyvalpos": 0
+    },
+    "tkzClipSector()()": {
+      "snippet": "tkzClipSector(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzMarkSegment()": {
+      "snippet": "tkzMarkSegment(${1:point1},${2:point2})"
+    },
+    "tkzMarkSegment[]()": {
+      "snippet": "tkzMarkSegment[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "tkzMarkSegments()": {
+      "snippet": "tkzMarkSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzMarkSegments[]()": {
+      "snippet": "tkzMarkSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "tkzMarkArc()": {
+      "snippet": "tkzMarkArc(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMarkArc[]()": {
+      "snippet": "tkzMarkArc[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "tkzMarkAngle()": {
+      "snippet": "tkzMarkAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMarkAngle[]()": {
+      "snippet": "tkzMarkAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 36,
+      "keyvalpos": 0
+    },
+    "tkzMarkRightAngle()": {
+      "snippet": "tkzMarkRightAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMarkRightAngle[]()": {
+      "snippet": "tkzMarkRightAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 37,
+      "keyvalpos": 0
+    },
+    "tkzPicAngle()": {
+      "snippet": "tkzPicAngle(${1:A},${2:O},${3:B})"
+    },
+    "tkzPicAngle[]()": {
+      "snippet": "tkzPicAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
+    },
+    "tkzPicRightAngle()": {
+      "snippet": "tkzPicRightAngle(${1:A},${2:O},${3:B})"
+    },
+    "tkzPicRightAngle[]()": {
+      "snippet": "tkzPicRightAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
+    },
+    "tkzLabelPoint(){}": {
+      "snippet": "tkzLabelPoint(${2:point}){${1:label}}"
+    },
+    "tkzLabelPoint[](){}": {
+      "snippet": "tkzLabelPoint[${2:options}](${3:point}){${1:label}}",
+      "keyvalindex": 38,
+      "keyvalpos": 0
+    },
+    "tkzLabelPoints()": {
+      "snippet": "tkzLabelPoints(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzLabelPoints[]()": {
+      "snippet": "tkzLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 38,
+      "keyvalpos": 0
+    },
+    "tkzAutoLabelPoints()": {
+      "snippet": "tkzAutoLabelPoints(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzAutoLabelPoints[]()": {
+      "snippet": "tkzAutoLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 39,
+      "keyvalpos": 0
+    },
+    "tkzLabelSegment(){}": {
+      "snippet": "tkzLabelSegment(${2:point1},${3:point2}){${1:label}}"
+    },
+    "tkzLabelSegment[](){}": {
+      "snippet": "tkzLabelSegment[${2:options}](${3:point1},${4:point2}){${1:label}}",
+      "keyvalindex": 40,
+      "keyvalpos": 0
+    },
+    "tkzLabelSegments(){}": {
+      "snippet": "tkzLabelSegments(${2:pt1},${3:pt2 pt3},${4:pt4 ...}){${1:label}}"
+    },
+    "tkzLabelSegments[](){}": {
+      "snippet": "tkzLabelSegments[${2:options}](${3:pt1},${4:pt2 pt3},${5:pt4 ...}){${1:label}}",
+      "keyvalindex": 40,
+      "keyvalpos": 0
+    },
+    "tkzLabelLine(){}": {
+      "snippet": "tkzLabelLine(${2:point1},${3:point2}){${1:label}}"
+    },
+    "tkzLabelLine[](){}": {
+      "snippet": "tkzLabelLine[${2:options}](${3:point1},${4:point2}){${1:label}}"
+    },
+    "tkzLabelAngle()": {
+      "snippet": "tkzLabelAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzLabelAngle[]()": {
+      "snippet": "tkzLabelAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 41,
+      "keyvalpos": 0
+    },
+    "tkzLabelCircle()(){}": {
+      "snippet": "tkzLabelCircle(${2:point1},${3:point2})(${4:angle}){${1:label}}"
+    },
+    "tkzLabelCircle[]()(){}": {
+      "snippet": "tkzLabelCircle[${2:options}](${3:point1},${4:point2})(${5:angle}){${1:label}}",
+      "keyvalindex": 42,
+      "keyvalpos": 0
+    },
+    "tkzLabelArc(){}": {
+      "snippet": "tkzLabelArc(${2:point1},${3:point2},${4:point3}){${1:label}}"
+    },
+    "tkzLabelArc[](){}": {
+      "snippet": "tkzLabelArc[${2:options}](${3:point1},${4:point2},${5:point3}){${1:label}}",
+      "keyvalindex": 43,
+      "keyvalpos": 0
+    },
+    "tkzCompass()": {
+      "snippet": "tkzCompass(${1:point1},${2:point2})"
+    },
+    "tkzCompass[]()": {
+      "snippet": "tkzCompass[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 44,
+      "keyvalpos": 0
+    },
+    "tkzCompasss()": {
+      "snippet": "tkzCompasss(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzCompasss[]()": {
+      "snippet": "tkzCompasss[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 44,
+      "keyvalpos": 0
+    },
+    "tkzShowLine()": {
+      "snippet": "tkzShowLine(${1:point1},${2:point2})"
+    },
+    "tkzShowLine[]()": {
+      "snippet": "tkzShowLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 45,
+      "keyvalpos": 0
+    },
+    "tkzShowTransformation()": {
+      "snippet": "tkzShowTransformation(${1:point1},${2:point2})"
+    },
+    "tkzShowTransformation[]()": {
+      "snippet": "tkzShowTransformation[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 46,
+      "keyvalpos": 0
+    },
+    "tkzProtractor()": {
+      "snippet": "tkzProtractor(${1:point1},${2:point2})"
+    },
+    "tkzProtractor[]()": {
+      "snippet": "tkzProtractor[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 47,
+      "keyvalpos": 0
+    },
+    "tkzDuplicateSegment()()": {
+      "snippet": "tkzDuplicateSegment(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzDuplicateSegment()(){}": {
+      "snippet": "tkzDuplicateSegment(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
+    },
+    "tkzDuplicateLength()()": {
+      "snippet": "tkzDuplicateLength(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzDuplicateLength()(){}": {
+      "snippet": "tkzDuplicateLength(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
+    },
+    "tkzCalcLength()": {
+      "snippet": "tkzCalcLength(${1:point1},${2:point2})"
+    },
+    "tkzCalcLength[]()": {
+      "snippet": "tkzCalcLength[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 48,
+      "keyvalpos": 0
+    },
+    "tkzpttocm(){}": {
+      "snippet": "tkzpttocm(${2:number}){${1:csname}}"
+    },
+    "tkzcmtopt(){}": {
+      "snippet": "tkzcmtopt(${2:number}){${1:csname}}"
+    },
+    "tkzGetPointCoord(){}": {
+      "snippet": "tkzGetPointCoord(${2:point}){${1:csname}}"
+    },
+    "tkzSwapPoints()": {
+      "snippet": "tkzSwapPoints(${1:A},${2:B})"
+    },
+    "tkzDotProduct()": {
+      "snippet": "tkzDotProduct(${1:A},${2:B},${3:C})"
+    },
+    "tkzPowerCircle()()": {
+      "snippet": "tkzPowerCircle(${1:A})(${2:O},${3:M})"
+    },
+    "tkzDefRadicalAxis()()": {
+      "snippet": "tkzDefRadicalAxis(${1:A},${2:B})(${3:C},${4:D})"
+    },
+    "tkzIsLinear()": {
+      "snippet": "tkzIsLinear(${1:A},${2:B},${3:C})"
+    },
+    "tkzIsOrtho()": {
+      "snippet": "tkzIsOrtho(${1:A},${2:B},${3:C})"
+    },
     "tkzGetResult{}": {
       "snippet": "tkzGetResult{${1:csname}}"
     },
     "tkzSetUpColors[]": {
       "snippet": "tkzSetUpColors[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 49,
       "keyvalpos": 0
     },
     "tkzSetUpPoint[]": {
       "snippet": "tkzSetUpPoint[${1:options}]",
-      "keyvalindex": 6,
+      "keyvalindex": 50,
       "keyvalpos": 0
     },
     "tkzSetUpLine[]": {
       "snippet": "tkzSetUpLine[${1:options}]",
-      "keyvalindex": 7,
+      "keyvalindex": 51,
       "keyvalpos": 0
     },
     "tkzSetUpArc[]": {
       "snippet": "tkzSetUpArc[${1:options}]",
-      "keyvalindex": 8,
+      "keyvalindex": 52,
       "keyvalpos": 0
     },
     "tkzSetUpCompass[]": {
       "snippet": "tkzSetUpCompass[${1:options}]",
-      "keyvalindex": 8,
+      "keyvalindex": 52,
       "keyvalpos": 0
     },
     "tkzSetUpLabel[]": {
@@ -140,6 +729,21 @@
     "tkzLengthResult": {},
     "fileversion": {},
     "filedate": {},
+    "tkzDrawBisector()": {
+      "snippet": "tkzDrawBisector(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefIntSimilitudeCenter()()": {
+      "snippet": "tkzDefIntSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
+    "tkzDefExtSimilitudeCenter()()": {
+      "snippet": "tkzDefExtSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
+    "tkzDefIntHomotheticCenter()()": {
+      "snippet": "tkzDefIntHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
+    "tkzDefExtHomotheticCenter()()": {
+      "snippet": "tkzDefExtHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
     "tkzDrawMedian": {},
     "tkzDrawBisector": {},
     "tkzDrawAltitude": {},
@@ -163,6 +767,9 @@
     "tkzSetUpAllColors[]": {
       "snippet": "tkzSetUpAllColors[${1:options}]"
     },
+    "tkzNormalizeAngle()": {
+      "snippet": "tkzNormalizeAngle(${1:arg})"
+    },
     "tkzpointnormalised{}": {
       "snippet": "tkzpointnormalised{${1:arg}}"
     },
@@ -193,12 +800,20 @@
     "EnabledNumprint": {},
     "tkzMathResult": {},
     "tkzHelpGrid": {},
+    "tkzText(){}": {
+      "snippet": "tkzText(${2:x},${3:y}){${1:text}}"
+    },
+    "tkzText[](){}": {
+      "snippet": "tkzText[${2:options}](${3:x},${4:y}){${1:text}}",
+      "keyvalindex": 53,
+      "keyvalpos": 0
+    },
     "tkzLegend{}": {
       "snippet": "tkzLegend{${1:style/size/color/text}}"
     },
     "tkzLegend[]{}": {
       "snippet": "tkzLegend[${2:options}]{${1:style/size/color/text}}",
-      "keyvalindex": 9,
+      "keyvalindex": 54,
       "keyvalpos": 0
     },
     "ifinteger": {},
@@ -211,15 +826,27 @@
     "tkzDrawX": {},
     "tkzDrawX[]": {
       "snippet": "tkzDrawX[${1:options}]",
-      "keyvalindex": 10,
+      "keyvalindex": 55,
       "keyvalpos": 0
     },
     "tkzDrawY": {},
     "tkzDrawY[]": {
       "snippet": "tkzDrawY[${1:options}]",
-      "keyvalindex": 11,
+      "keyvalindex": 56,
       "keyvalpos": 0
     },
+    "tkzDrawPolygons()": {
+      "snippet": "tkzDrawPolygons(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawPolygons[]()": {
+      "snippet": "tkzDrawPolygons[${1:options}](${2:point1},${3:point2},${4:...})"
+    },
+    "tkzLabelRegPolygon(){}": {
+      "snippet": "tkzLabelRegPolygon(${2:point}){${1:label1,${3:label2},...}}"
+    },
+    "tkzLabelRegPolygon[](){}": {
+      "snippet": "tkzLabelRegPolygon[${2:options}](${3:point}){${1:label1,${4:label2},...}}"
+    },
     "iftkzClipOutPoly": {},
     "tkzClipOutPolytrue": {},
     "tkzClipOutPolyfalse": {},
@@ -234,25 +861,505 @@
     },
     "tkzGrid[]": {
       "snippet": "tkzGrid[${1:options}]",
-      "keyvalindex": 12,
+      "keyvalindex": 57,
+      "keyvalpos": 0
+    },
+    "tkzGrid[]()()": {
+      "snippet": "tkzGrid[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 57,
       "keyvalpos": 0
     },
+    "tkzDefCircleTranslation()": {
+      "snippet": "tkzDefCircleTranslation(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleHomothety()": {
+      "snippet": "tkzDefCircleHomothety(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleReflection()": {
+      "snippet": "tkzDefCircleReflection(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleSymmetry()": {
+      "snippet": "tkzDefCircleSymmetry(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleRotation()": {
+      "snippet": "tkzDefCircleRotation(${1:point1},${2:point2})"
+    },
+    "tkzDefOrthogonalCircle()": {
+      "snippet": "tkzDefOrthogonalCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefOrthoThroughCircle()": {
+      "snippet": "tkzDefOrthoThroughCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
+    },
+    "tkzDefInversionCircle()": {
+      "snippet": "tkzDefInversionCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
+    },
+    "tkzDefEquilateral()": {
+      "snippet": "tkzDefEquilateral(${1:point1},${2:point2})"
+    },
+    "tkzDefIsoscelesRightTriangle()": {
+      "snippet": "tkzDefIsoscelesRightTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDrawEquilateral[]()": {
+      "snippet": "tkzDrawEquilateral[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzDefIsoscelesRightTriangle[]()": {
+      "snippet": "tkzDefIsoscelesRightTriangle[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzDefTwoOne()": {
+      "snippet": "tkzDefTwoOne(${1:point1},${2:point2})"
+    },
+    "tkzDefPythagore()": {
+      "snippet": "tkzDefPythagore(${1:point1},${2:point2})"
+    },
+    "tkzDefSchoolTriangle()": {
+      "snippet": "tkzDefSchoolTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefGoldTriangle()": {
+      "snippet": "tkzDefGoldTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefEuclideTriangle()": {
+      "snippet": "tkzDefEuclideTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefGoldenTriangle()": {
+      "snippet": "tkzDefGoldenTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefCheopsTriangle()": {
+      "snippet": "tkzDefCheopsTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefTwoAnglesTriangle()": {
+      "snippet": "tkzDefTwoAnglesTriangle(${1:point1},${2:point2})"
+    },
     "SetUpPTTR{}": {
       "snippet": "SetUpPTTR{${1:options}}"
     },
+    "tkzDefIncentralTriangle[]()()": {
+      "snippet": "tkzDefIncentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefExcentralTriangle[]()()": {
+      "snippet": "tkzDefExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzExcentralTriangle[]()()": {
+      "snippet": "tkzExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefIntouchTriangle[]()()": {
+      "snippet": "tkzDefIntouchTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefContactTriangle[]()()": {
+      "snippet": "tkzDefContactTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefFeuerbachTriangle[]()()": {
+      "snippet": "tkzDefFeuerbachTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefCentroidTriangle[]()()": {
+      "snippet": "tkzDefCentroidTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefMedialTriangle[]()()": {
+      "snippet": "tkzDefMedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefMidpointTriangle[]()()": {
+      "snippet": "tkzDefMidpointTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefOrthicTriangle[]()()": {
+      "snippet": "tkzDefOrthicTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefAltitudeTriangle[]()()": {
+      "snippet": "tkzDefAltitudeTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefEulerTriangle[]()()": {
+      "snippet": "tkzDefEulerTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefTangentialTriangle[]()()": {
+      "snippet": "tkzDefTangentialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefSymmedialTriangle[]()()": {
+      "snippet": "tkzDefSymmedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzPointShowCoord()": {
+      "snippet": "tkzPointShowCoord(${1:point})"
+    },
+    "tkzPointShowCoord[]()": {
+      "snippet": "tkzPointShowCoord[${1:options}](${2:point})",
+      "keyvalindex": 58,
+      "keyvalpos": 0
+    },
+    "tkzShowPointCoord()": {
+      "snippet": "tkzShowPointCoord(${1:point})"
+    },
+    "tkzShowPointCoord[]()": {
+      "snippet": "tkzShowPointCoord[${1:options}](${2:point})",
+      "keyvalindex": 58,
+      "keyvalpos": 0
+    },
+    "tkzDefCircleR()": {
+      "snippet": "tkzDefCircleR(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleD()": {
+      "snippet": "tkzDefCircleD(${1:point1},${2:point2})"
+    },
+    "tkzDefCircumCircle()": {
+      "snippet": "tkzDefCircumCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefInCircle()": {
+      "snippet": "tkzDefInCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefExCircle()": {
+      "snippet": "tkzDefExCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefExRadius()": {
+      "snippet": "tkzDefExRadius(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerCircle()": {
+      "snippet": "tkzDefEulerCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefNinePointsCircle()": {
+      "snippet": "tkzDefNinePointsCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFeuerBachCircle()": {
+      "snippet": "tkzFeuerBachCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerRadius()": {
+      "snippet": "tkzDefEulerRadius(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefApolloniusCircle()": {
+      "snippet": "tkzDefApolloniusCircle(${1:point1},${2:point2})"
+    },
+    "tkzDefSpiekerCircle()": {
+      "snippet": "tkzDefSpiekerCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDrawSectorRAngles[]()()": {
+      "snippet": "tkzDrawSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorN[]()()": {
+      "snippet": "tkzDrawSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorRotate[]()()": {
+      "snippet": "tkzDrawSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorAngles[]()()": {
+      "snippet": "tkzDrawSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorRwithNodesAngles[]()()": {
+      "snippet": "tkzDrawSectorRwithNodesAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorR[]()()": {
+      "snippet": "tkzDrawSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorRAngles[]()()": {
+      "snippet": "tkzFillSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorN[]()()": {
+      "snippet": "tkzFillSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorRotate[]()()": {
+      "snippet": "tkzFillSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorAngles[]()()": {
+      "snippet": "tkzFillSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorR[]()()": {
+      "snippet": "tkzFillSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDefLineLL[]()": {
+      "snippet": "tkzDefLineLL[${1:options}](${2:point1},${3:point2},${4:point3})"
+    },
+    "tkzDefOrthLine[]()": {
+      "snippet": "tkzDefOrthLine[${1:options}](${2:point1},${3:point2},${4:point3})"
+    },
+    "tkzDefMediatorLine[]()": {
+      "snippet": "tkzDefMediatorLine[${1:options}](${2:point1},${3:point2},${4:point3})"
+    },
+    "tkzDefBisectorLine()": {
+      "snippet": "tkzDefBisectorLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefBisectorOutLine()": {
+      "snippet": "tkzDefBisectorOutLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefSymmedianLine()": {
+      "snippet": "tkzDefSymmedianLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefAltitudeLine()": {
+      "snippet": "tkzDefAltitudeLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerLine()": {
+      "snippet": "tkzDefEulerLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzTgtAt()()": {
+      "snippet": "tkzTgtAt(${1:point1})(${2:point2})"
+    },
+    "tkzTgtFromP()()": {
+      "snippet": "tkzTgtFromP(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzTgtFromPR()()": {
+      "snippet": "tkzTgtFromPR(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzRegPolygonCenter()": {
+      "snippet": "tkzRegPolygonCenter(${1:point1},${2:point2})"
+    },
+    "tkzRegPolygonSide()": {
+      "snippet": "tkzRegPolygonSide(${1:point1},${2:point2})"
+    },
+    "tkzRenamePoint(){}": {
+      "snippet": "tkzRenamePoint(${2:arg1}){${1:arg2}}"
+    },
+    "tkzGetPointxy(){}": {
+      "snippet": "tkzGetPointxy(${2:arg1}){${1:arg2}}"
+    },
+    "tkzDrawArcTowards[]()()": {
+      "snippet": "tkzDrawArcTowards[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRotate[]()()": {
+      "snippet": "tkzDrawArcRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcAngles[]()()": {
+      "snippet": "tkzDrawArcAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRwithNodes[]()()": {
+      "snippet": "tkzDrawArcRwithNodes[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcR[]()()": {
+      "snippet": "tkzDrawArcR[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRAngles[]()()": {
+      "snippet": "tkzDrawArcRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRAN[]()()": {
+      "snippet": "tkzDrawArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzPathArcRAN[]()()": {
+      "snippet": "tkzPathArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzRandPointOnRect()": {
+      "snippet": "tkzRandPointOnRect(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnSegment()": {
+      "snippet": "tkzRandPointOnSegment(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnLine()": {
+      "snippet": "tkzRandPointOnLine(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnCircle()": {
+      "snippet": "tkzRandPointOnCircle(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnCircleThrough()": {
+      "snippet": "tkzRandPointOnCircleThrough(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnDisk()": {
+      "snippet": "tkzRandPointOnDisk(${1:point1},${2:point2})"
+    },
+    "tkzVecKOrth[]()": {
+      "snippet": "tkzVecKOrth[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzVecK[]()": {
+      "snippet": "tkzVecK[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzVecKOrthNorm[]()": {
+      "snippet": "tkzVecKOrthNorm[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzVecKNorm[]()": {
+      "snippet": "tkzVecKNorm[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzShowMediatorLine[]()": {
+      "snippet": "tkzShowMediatorLine[${1:opts}](${2:arg})"
+    },
+    "tkzShowLLLine[]()()": {
+      "snippet": "tkzShowLLLine[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowOrthLine[]()()": {
+      "snippet": "tkzShowOrthLine[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowBisectorLine[]()()": {
+      "snippet": "tkzShowBisectorLine[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowTranslation[]()()": {
+      "snippet": "tkzShowTranslation[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowSymOrth[]()()": {
+      "snippet": "tkzShowSymOrth[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowCSym[]()()": {
+      "snippet": "tkzShowCSym[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowProjection[]()()": {
+      "snippet": "tkzShowProjection[${1:opts}](${2:arg1})(${3:arg2})"
+    },
     "ExtractPoint": {},
     "FirstPointInList{}": {
       "snippet": "FirstPointInList{${1:arg}}"
     },
+    "tkzTranslation()(){}": {
+      "snippet": "tkzTranslation(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUTranslation()()": {
+      "snippet": "tkzUTranslation(${1:arg1})(${2:arg2})"
+    },
+    "tkzCSym()(){}": {
+      "snippet": "tkzCSym(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUCSym()()": {
+      "snippet": "tkzUCSym(${1:arg1})(${2:arg2})"
+    },
+    "tkzSymOrth()(){}": {
+      "snippet": "tkzSymOrth(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUSymOrth()()": {
+      "snippet": "tkzUSymOrth(${1:arg1})(${2:arg2})"
+    },
+    "tkzProjection()(){}": {
+      "snippet": "tkzProjection(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUProjection()()": {
+      "snippet": "tkzUProjection(${1:arg1})(${2:arg2})"
+    },
+    "tkzHomo()(){}": {
+      "snippet": "tkzHomo(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUHomo()()": {
+      "snippet": "tkzUHomo(${1:arg1})(${2:arg2})"
+    },
+    "tkzRotateAngle()(){}": {
+      "snippet": "tkzRotateAngle(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzURotateAngle()()": {
+      "snippet": "tkzURotateAngle(${1:arg1})(${2:arg2})"
+    },
+    "tkzRotateInRad()(){}": {
+      "snippet": "tkzRotateInRad(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzURotateInRad()()": {
+      "snippet": "tkzURotateInRad(${1:arg1})(${2:arg2})"
+    },
+    "tkzInversePoint()(){}": {
+      "snippet": "tkzInversePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUInversePoint()()": {
+      "snippet": "tkzUInversePoint(${1:arg1})(${2:arg2})"
+    },
+    "tkzInverseNegativePoint()(){}": {
+      "snippet": "tkzInverseNegativePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUInverseNegativePoint()()": {
+      "snippet": "tkzUInverseNegativePoint(${1:arg1})(${2:arg2})"
+    },
+    "tkzDefBCPoint()": {
+      "snippet": "tkzDefBCPoint(${1:point1=num1},${2:point2=num2},${3:...})"
+    },
+    "tkzDivHarmonic()": {
+      "snippet": "tkzDivHarmonic(${1:pt1},${2:pt2},${3:pt3})"
+    },
+    "tkzDivHarmonic[]()": {
+      "snippet": "tkzDivHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})"
+    },
+    "tkzOrthoCenter()": {
+      "snippet": "tkzOrthoCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefOrthoCenter()": {
+      "snippet": "tkzDefOrthoCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzCentroid()": {
+      "snippet": "tkzCentroid(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzBaryCenter()": {
+      "snippet": "tkzBaryCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzCircumCenter()": {
+      "snippet": "tkzCircumCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefCircumCenter()": {
+      "snippet": "tkzDefCircumCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzInCenter()": {
+      "snippet": "tkzInCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefInCenter()": {
+      "snippet": "tkzDefInCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzExCenter()": {
+      "snippet": "tkzExCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefExCenter()": {
+      "snippet": "tkzDefExCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzEulerCenter()": {
+      "snippet": "tkzEulerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzNinePointCenter()": {
+      "snippet": "tkzNinePointCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerCenter()": {
+      "snippet": "tkzDefEulerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzSymmedianCenter()": {
+      "snippet": "tkzSymmedianCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzLemoinePoint()": {
+      "snippet": "tkzLemoinePoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzGrebePoint()": {
+      "snippet": "tkzGrebePoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefLemoinePoint()": {
+      "snippet": "tkzDefLemoinePoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzSpiekerCenter()": {
+      "snippet": "tkzSpiekerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefSpiekerCenter()": {
+      "snippet": "tkzDefSpiekerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzGergonneCenter()": {
+      "snippet": "tkzGergonneCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefGergonneCenter()": {
+      "snippet": "tkzDefGergonneCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzNagelCenter()": {
+      "snippet": "tkzNagelCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefNagelCenter()": {
+      "snippet": "tkzDefNagelCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMittenpunktCenter()": {
+      "snippet": "tkzMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefMittenpunktCenter()": {
+      "snippet": "tkzDefMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefMiddlespoint()": {
+      "snippet": "tkzDefMiddlespoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFeuerbachCenter()": {
+      "snippet": "tkzFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefFeuerbachCenter()": {
+      "snippet": "tkzDefFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzOrthogonalCenter()": {
+      "snippet": "tkzOrthogonalCenter(${1:point1},${2:point2})"
+    },
     "usetkzobj{}": {
       "snippet": "usetkzobj{${1:list of objects}}"
     },
     "usetkztool{}": {
       "snippet": "usetkztool{${1:list of tools}}"
     },
+    "tkzInterLLxy()()": {
+      "snippet": "tkzInterLLxy(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzTestInterLC()()": {
+      "snippet": "tkzTestInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
     "iftkzFlagLC": {},
     "tkzFlagLCtrue": {},
     "tkzFlagLCfalse": {},
+    "tkzInterLCR()(){}{}": {
+      "snippet": "tkzInterLCR(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
+    },
+    "tkzInterLCWithNodes()(){}{}": {
+      "snippet": "tkzInterLCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
+    },
+    "tkzInterCCWithNodes()(){}{}": {
+      "snippet": "tkzInterCCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
+    },
     "tkzAddName[]{}": {
       "snippet": "tkzAddName[${2:options}]{${1:name}}"
     },
@@ -277,12 +1384,162 @@
     "lua"
   ],
   "keyvals": [
+    [
+      "label=${1:text}",
+      "shift=(${1:x},${2:y})",
+      "shift=(${1:angle}:${2:radius})"
+    ],
+    [
+      "ext",
+      "int"
+    ],
+    [
+      "both",
+      "ext",
+      "int"
+    ],
+    [
+      "dist=",
+      "from=${1:point}",
+      "show",
+      "/tkzcompass/delta=${1:number}"
+    ],
+    [
+      "ortho",
+      "orthic",
+      "centroid",
+      "median",
+      "circum",
+      "in",
+      "ex",
+      "euler",
+      "gergonne",
+      "symmedian",
+      "lemoine",
+      "grebe",
+      "spieker",
+      "nagel",
+      "mittenpunkt",
+      "feuerbach"
+    ],
+    [
+      "name=${1:name}"
+    ],
+    [
+      "pos=${1:number}"
+    ],
     [
       "through=center ${1:point1} angle ${2:degrees} point ${3:point2}",
       "R=center ${1:point} angle ${2:degrees} radius ${3:radius}",
       "through in rad=center ${1:point1} angle ${2:radians} point ${3:point2}",
       "R in rad=center ${1:point} angle ${2:radians} radius ${3:radius}"
     ],
+    [
+      "translation=from ${1:point1} to ${2:point2}",
+      "homothety=center ${1:point} ratio ${2:number}",
+      "reflection=over ${1:point1}--${2:point2}",
+      "symmetry=center ${1:point}",
+      "projection=onto ${1:point1}--${2:point2}",
+      "rotation=center ${1:point} angle ${2:degrees}",
+      "rotation in rad=center ${1:point} angle ${2:radians}",
+      "inversion=center ${1:point1} through ${2:point2}",
+      "inversion negative=center ${1:point1} through ${2:point2}"
+    ],
+    [
+      "orthogonal",
+      "orthogonal normed",
+      "linear",
+      "linear normed",
+      "colinear=at ${1:point}",
+      "colinear normed=at ${1:point}",
+      "K=${1:number}"
+    ],
+    [
+      "mediator",
+      "perpendicular=through ${1:point}",
+      "orthogonal=through ${1:point}",
+      "parallel=through ${1:point}",
+      "bisector",
+      "bisector out",
+      "symmedian",
+      "altitude",
+      "euler",
+      "tangent at=${1:point}",
+      "tangent from=${1:point}",
+      "K=${1:number}",
+      "normed"
+    ],
+    [
+      "at=${1:point}",
+      "from=${1:point}",
+      "from with R=${1:point}"
+    ],
+    [
+      "two angles=${1:angle1} and ${2:angle2}",
+      "equilateral",
+      "isosceles right",
+      "pythagore",
+      "pythagoras",
+      "egyptian",
+      "school",
+      "gold",
+      "euclid",
+      "golden",
+      "cheops",
+      "swap"
+    ],
+    [
+      "orthic",
+      "centroid",
+      "medial",
+      "in",
+      "incentral",
+      "ex",
+      "excentral",
+      "extouch",
+      "intouch",
+      "contact",
+      "euler",
+      "symmedial",
+      "tangential",
+      "feuerbach",
+      "name=${1:name}",
+      "ortho"
+    ],
+    [
+      "name=${1:name}",
+      "sides=${1:integer}",
+      "center",
+      "side"
+    ],
+    [
+      "R",
+      "diameter",
+      "circum",
+      "in",
+      "ex",
+      "euler",
+      "nine",
+      "spieker",
+      "apollonius",
+      "orthogonal from=${1:point}",
+      "orthogonal through=${1:point1} and ${2:point2}",
+      "K=${1:number}"
+    ],
+    [
+      "translation=from ${1:point1} to ${2:point2}",
+      "homothety=center ${1:point} ratio ${2:number}",
+      "reflection=over ${1:point1}--${2:point2}",
+      "symmetry=center ${1:point}",
+      "projection=onto ${1:point1}--${2:point2}",
+      "rotation=center ${1:point} angle ${2:degrees}",
+      "inversion=center ${1:point1} through ${2:point2}"
+    ],
+    [
+      "N",
+      "R",
+      "with nodes"
+    ],
     [
       "rectangle=${1:point1} and ${2:point2}",
       "segment=${1:point1}--${2:point2}",
@@ -291,6 +1548,279 @@
       "circle through=center ${1:point1} through ${2:point2}",
       "disk through=center ${1:point1} through ${2:point2}"
     ],
+    [
+      "shape=",
+      "size=${1:number}",
+      "color=",
+      "%color",
+      "fill=",
+      "draw=",
+      "opacity=${1:factor}",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "add=${1:num1} and ${2:num2}",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "style={${1:TikZ options}}",
+      "->",
+      "<-",
+      "<->",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line width=",
+      "double",
+      "double distance="
+    ],
+    [
+      "add=${1:num1} and ${2:num2}",
+      "dim={${1:label},${2:dim},${3:option}}",
+      "color=",
+      "%color",
+      "opacity=${1:factor}",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "style={${1:TikZ options}}",
+      "->",
+      "<-",
+      "<->",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line width=",
+      "double",
+      "double distance="
+    ],
+    [
+      "color=",
+      "%color",
+      "fill=",
+      "draw=",
+      "opacity=${1:factor}",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "style={${1:TikZ options}}",
+      "->",
+      "<-",
+      "<->",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line width=",
+      "line join=",
+      "double",
+      "double distance="
+    ],
+    [
+      "through",
+      "R",
+      "color=",
+      "%color",
+      "fill=",
+      "opacity=${1:factor}",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "through",
+      "diameter",
+      "color=",
+      "%color",
+      "fill=",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "towards",
+      "rotate",
+      "R",
+      "R with nodes",
+      "angles",
+      "delta=${1:number}",
+      "reverse",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "towards",
+      "rotate",
+      "R",
+      "R with nodes",
+      "fill=",
+      "opacity=${1:factor}",
+      "color=",
+      "%color",
+      "draw=",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "radius",
+      "R",
+      "color=",
+      "%color",
+      "fill=",
+      "opacity=${1:factor}"
+    ],
+    [
+      "color=",
+      "%color",
+      "opacity=${1:factor}",
+      "fill="
+    ],
+    [
+      "size=${1:number}",
+      "color=",
+      "%color",
+      "opacity=${1:factor}",
+      "fill=",
+      "left color=",
+      "right color="
+    ],
     [
       "xmin=${1:number}",
       "xmax=${1:number}",
@@ -309,6 +1839,229 @@
       "color=",
       "%color"
     ],
+    [
+      "out"
+    ],
+    [
+      "towards",
+      "rotate",
+      "R"
+    ],
+    [
+      "pos=${1:number}",
+      "color=",
+      "%color",
+      "mark=${1:mark}",
+      "size=",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "arc=",
+      "size=",
+      "mark=${1:mark}",
+      "mksize=",
+      "mkcolor=",
+      "color=",
+      "mkpos=${1:number}"
+    ],
+    [
+      "german",
+      "size=${1:number}",
+      "fill=",
+      "opacity=${1:factor}",
+      "draw=",
+      "color=",
+      "%color",
+      "line width="
+    ],
+    [
+      "left",
+      "right",
+      "above",
+      "below",
+      "above right",
+      "above left",
+      "below right",
+      "below left",
+      "color=",
+      "%color",
+      "font=${1:font commands}",
+      "label=${1:text}",
+      "centered"
+    ],
+    [
+      "left",
+      "right",
+      "above",
+      "below",
+      "above right",
+      "above left",
+      "below right",
+      "below left",
+      "color=",
+      "%color",
+      "font=${1:font commands}",
+      "label=${1:text}",
+      "centered",
+      "center=${1:point}",
+      "dist=${1:number}"
+    ],
+    [
+      "pos=${1:number}",
+      "swap",
+      "auto",
+      "below=",
+      "above=",
+      "left=",
+      "right=",
+      "below left=",
+      "below right=",
+      "above left=",
+      "above right=",
+      "sloped",
+      "midway",
+      "near start",
+      "near end",
+      "very near start",
+      "very near end",
+      "at start",
+      "at end",
+      "color=",
+      "%color"
+    ],
+    [
+      "pos=${1:number}",
+      "circle",
+      "draw",
+      "fill=",
+      "font=${1:font commands}"
+    ],
+    [
+      "radius",
+      "R",
+      "below=",
+      "above=",
+      "left=",
+      "right=",
+      "below left=",
+      "below right=",
+      "above left=",
+      "above right=",
+      "color=",
+      "%color",
+      "fill=",
+      "font=${1:font commands}",
+      "draw",
+      "text width=",
+      "text centered"
+    ],
+    [
+      "pos=${1:number}",
+      "below=",
+      "above=",
+      "left=",
+      "right=",
+      "below left=",
+      "below right=",
+      "above left=",
+      "above right=",
+      "color=",
+      "%color"
+    ],
+    [
+      "delta=${1:degrees}",
+      "length=${1:number}",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "mediator",
+      "parallel=through ${1:point}",
+      "perpendicular=through ${1:point}",
+      "orthogonal",
+      "bisector",
+      "K=${1:number}",
+      "length=${1:number}",
+      "ratio=${1:number}",
+      "gap=${1:number}",
+      "size=${1:number}",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "reflection=over ${1:point1}--${2:point2}",
+      "symmetry=center ${1:point}",
+      "projection=onto ${1:point1}--${2:point2}",
+      "translation=from ${1:point1} to ${2:point2}",
+      "K=${1:number}",
+      "length=${1:number}",
+      "ratio=${1:number}",
+      "gap=${1:number}",
+      "size=${1:number}",
+      "color=",
+      "%color"
+    ],
+    [
+      "lw=",
+      "scale=${1:factor}",
+      "return"
+    ],
+    [
+      "cm"
+    ],
     [
       "background=",
       "text="
@@ -333,6 +2086,17 @@
       "add=${1:num1} and ${2:num2}",
       "delta=${1:number}"
     ],
+    [
+      "draw",
+      "color=",
+      "text=",
+      "fill=",
+      "opacity=${1:factor}",
+      "line width=",
+      "rotate=${1:degrees}",
+      "inner sep=",
+      "text width="
+    ],
     [
       "line"
     ],
@@ -366,6 +2130,14 @@
       "subxstep=${1:number}",
       "subystep=${1:number}",
       "line width="
+    ],
+    [
+      "xlabel=${1:text}",
+      "xstyle=",
+      "noxdraw",
+      "ylabel=${1:text}",
+      "ystyle=",
+      "noydraw"
     ]
   ]
 }
\ No newline at end of file
diff --git a/data/packages/xy.json b/data/packages/xy.json
index 5002491d4..e40a1f458 100644
--- a/data/packages/xy.json
+++ b/data/packages/xy.json
@@ -262,6 +262,9 @@
     "xybsqlfont": {},
     "xybtipfont": {},
     "xycircfont": {},
+    "xycircle(){}": {
+      "snippet": "xycircle(${2:x},${3:y}){${1:style}}"
+    },
     "xycircle<>{}": {
       "snippet": "xycircle<${2:radius}>{${1:style}}"
     },
@@ -280,6 +283,12 @@
     "xyignore{}": {
       "snippet": "xyignore{${1:<${2:pos}><${3:decor}>}}"
     },
+    "xyimport()(){}": {
+      "snippet": "xyimport(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics code}}"
+    },
+    "xyimport(){}": {
+      "snippet": "xyimport(${2:width},${3:height}){${1:graphics code}}"
+    },
     "xylattice{}{}{}{}": {
       "snippet": "xylattice{${1:pt1}}{${2:pt2}}{${3:pt3}}{${4:pt4}}"
     },
diff --git a/data/packages/zhnumber.json b/data/packages/zhnumber.json
index 28d29514b..d734873b1 100644
--- a/data/packages/zhnumber.json
+++ b/data/packages/zhnumber.json
@@ -68,10 +68,10 @@
       "snippet": "zhganzhinian{${1:year}}"
     },
     "zhnumExtendScaleMap{}": {
-      "snippet": "zhnumExtendScaleMap{${1:character1, character2, ..., charactern}}"
+      "snippet": "zhnumExtendScaleMap{${1:character1,${2: character2},${3: ...}, charactern}}"
     },
     "zhnumExtendScaleMap[]{}": {
-      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1, character2, ..., charactern}}"
+      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1,${3: character2},${4: ...}, charactern}}"
     },
     "zhnumsetup{}": {
       "snippet": "zhnumsetup{${1:options}}",
diff --git a/dev/packages/CJK.json b/dev/packages/CJK.json
new file mode 100644
index 000000000..9dd0c23e8
--- /dev/null
+++ b/dev/packages/CJK.json
@@ -0,0 +1,112 @@
+{
+  "includes": {
+    "MULEenc": []
+  },
+  "macros": {
+    "CJKbold": {},
+    "CJKnormal": {},
+    "CJKboldshift": {},
+    "CJKsymbol{}": {
+      "snippet": "CJKsymbol{${1:n}}"
+    },
+    "CJKpunctsymbol{}": {
+      "snippet": "CJKpunctsymbol{${1:n}}"
+    },
+    "CJKsymbols{}{}": {
+      "snippet": "CJKsymbols{${1:codepoint1}}{${2:codepoint2}}"
+    },
+    "CJKchar{}{}": {
+      "snippet": "CJKchar{${1:byte1}}{${2:byte2}}"
+    },
+    "CJKchar[]{}{}": {
+      "snippet": "CJKchar[${3:UTF8}]{${1:byte1}}{${2:byte2}}"
+    },
+    "Unicode{}{}": {
+      "snippet": "Unicode{${1:byte1}}{${2:byte2}}"
+    },
+    "CJKCJKchar": {},
+    "CJKhangulchar": {},
+    "CJKlatinchar": {},
+    "CJKhwkatakana": {},
+    "CJKnohwkatakana": {},
+    "CJKenc{}": {
+      "snippet": "CJKenc{${1:encoding}}"
+    },
+    "CJKfontenc{}{}": {
+      "snippet": "CJKfontenc{${1:encoding}}{${2:font encoding}}"
+    },
+    "CJKfamily{}": {
+      "snippet": "CJKfamily{${1:family}}"
+    },
+    "CJKencfamily{}{}": {
+      "snippet": "CJKencfamily{${1:encoding}}{${2:family}}"
+    },
+    "CJKencfamily[]{}{}": {
+      "snippet": "CJKencfamily[${3:font encoding}]{${1:encoding}}{${2:family}}"
+    },
+    "CJKshape{}": {
+      "snippet": "CJKshape{${1:family}}"
+    },
+    "CJKencshape{}{}": {
+      "snippet": "CJKencshape{${1:encoding}}{${2:family}}"
+    },
+    "CJKencshape[]{}{}": {
+      "snippet": "CJKencshape[${3:font encoding}]{${1:encoding}}{${2:family}}"
+    },
+    "CJKaddEncHook{}{}": {
+      "snippet": "CJKaddEncHook{${1:encoding}}{${2:code}}"
+    },
+    "CJKhanja": {},
+    "CJKhangul": {},
+    "CJKkern": {},
+    "CJKglue": {},
+    "CJKtolerance": {},
+    "nbs": {},
+    "CJKtilde": {},
+    "standardtilde": {},
+    "CJKspace": {},
+    "CJKnospace": {},
+    "CJKindent": {},
+    "CJKcaption{}": {
+      "snippet": "CJKcaption{${1:caption}}"
+    },
+    "CJKhdef{}{}": {
+      "snippet": "CJKhdef{${1:arg1}}{${2:arg2}}"
+    },
+    "CJKhlet{}{}": {
+      "snippet": "CJKhlet{${1:arg1}}{${2:arg2}}"
+    },
+    "CJKvdef{}{}": {
+      "snippet": "CJKvdef{${1:arg1}}{${2:arg2}}"
+    },
+    "CJKvlet{}{}": {
+      "snippet": "CJKvlet{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {
+    "CJK{}{}": {
+      "name": "CJK",
+      "snippet": "{${1:encoding}}{${2:family}}"
+    },
+    "CJK[]{}{}": {
+      "name": "CJK",
+      "snippet": "[${3:font encoding}]{${1:encoding}}{${2:family}}"
+    },
+    "CJK*{}{}": {
+      "name": "CJK*",
+      "snippet": "{${1:encoding}}{${2:family}}"
+    },
+    "CJK*[]{}{}": {
+      "name": "CJK*",
+      "snippet": "[${3:font encoding}]{${1:encoding}}{${2:family}}"
+    }
+  },
+  "options": [
+    "lowercase",
+    "global",
+    "local",
+    "active",
+    "encapsulated"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/CJKfntef.json b/dev/packages/CJKfntef.json
new file mode 100644
index 000000000..db79c91bc
--- /dev/null
+++ b/dev/packages/CJKfntef.json
@@ -0,0 +1,75 @@
+{
+  "includes": {
+    "CJK": [],
+    "CJKulem": []
+  },
+  "macros": {
+    "CJKunderdot{}": {
+      "snippet": "CJKunderdot{${1:contents}}"
+    },
+    "CJKunderline{}": {
+      "snippet": "CJKunderline{${1:contents}}"
+    },
+    "CJKunderline*{}": {
+      "snippet": "CJKunderline*{${1:contents}}"
+    },
+    "CJKunderdblline{}": {
+      "snippet": "CJKunderdblline{${1:contents}}"
+    },
+    "CJKunderdblline*{}": {
+      "snippet": "CJKunderdblline*{${1:contents}}"
+    },
+    "CJKunderwave{}": {
+      "snippet": "CJKunderwave{${1:contents}}"
+    },
+    "CJKunderwave*{}": {
+      "snippet": "CJKunderwave*{${1:contents}}"
+    },
+    "CJKsout{}": {
+      "snippet": "CJKsout{${1:contents}}"
+    },
+    "CJKsout*{}": {
+      "snippet": "CJKsout*{${1:contents}}"
+    },
+    "CJKxout{}": {
+      "snippet": "CJKxout{${1:contents}}"
+    },
+    "CJKxout*{}": {
+      "snippet": "CJKxout*{${1:contents}}"
+    },
+    "varCJKunderline{}": {
+      "snippet": "varCJKunderline{${1:contents}}"
+    },
+    "CJKunderanyline{}{}{}": {
+      "snippet": "CJKunderanyline{${1:depth}}{${2:underline code}}{${3:contents}}"
+    },
+    "CJKunderanysymbol{}{}{}": {
+      "snippet": "CJKunderanysymbol{${1:depth}}{${2:under-symbol code}}{${3:contents}}"
+    },
+    "CJKsoutcolor": {},
+    "CJKsoutheight": {},
+    "CJKulineleftskip": {},
+    "CJKulinerightskip": {},
+    "CJKunderdbllinebasesep": {},
+    "CJKunderdbllinecolor": {},
+    "CJKunderdbllinesep": {},
+    "CJKunderdotbasesep": {},
+    "CJKunderdotcolor": {},
+    "CJKunderdotsep": {},
+    "CJKunderlinebasesep": {},
+    "CJKunderlinecolor": {},
+    "CJKunderlinesep": {},
+    "CJKunderwavebasesep": {},
+    "CJKunderwavecolor": {},
+    "CJKunderwavesep": {},
+    "CJKxoutcolor": {}
+  },
+  "envs": {
+    "CJKfilltwosides{}": {
+      "name": "CJKfilltwosides",
+      "snippet": "{${1:width}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/PapierGurvan.json b/dev/packages/PapierGurvan.json
index 59cd6feec..ff2008c82 100644
--- a/dev/packages/PapierGurvan.json
+++ b/dev/packages/PapierGurvan.json
@@ -40,6 +40,9 @@
     "LigneGurvan[]<>{}": {
       "snippet": "LigneGurvan[${2:clés}]<${3:alignement}>{${1:texte}}"
     },
+    "LigneGurvan[]<>(){}": {
+      "snippet": "LigneGurvan[${2:clés}]<${3:alignement}>(${4:ajustement}){${1:texte}}"
+    },
     "ParagrapheGurvan{}": {
       "snippet": "ParagrapheGurvan{${1:texte}}"
     },
@@ -52,6 +55,9 @@
     "ParagrapheGurvan[]<>{}": {
       "snippet": "ParagrapheGurvan[${2:clés}]<${3:alignement}>{${1:texte}}"
     },
+    "ParagrapheGurvan[]<>(){}": {
+      "snippet": "ParagrapheGurvan[${2:clés}]<${3:alignement}>(${4:ajustement}){${1:texte}}"
+    },
     "thelggurvan": {}
   },
   "envs": {
diff --git a/dev/packages/ProfCollege.json b/dev/packages/ProfCollege.json
index e3074f562..52e29b967 100644
--- a/dev/packages/ProfCollege.json
+++ b/dev/packages/ProfCollege.json
@@ -179,10 +179,10 @@
       "snippet": "Ecriture[${2:clés}]{${1:nombre}}"
     },
     "Frise{}": {
-      "snippet": "Frise{${1:1/A/a,2/B/b,3/C/c,...}}"
+      "snippet": "Frise{${1:1/A/a,${2:2/B/b},${3:3/C/c},...}}"
     },
     "Frise[]{}": {
-      "snippet": "Frise[${2:clés}]{${1:1/A/a,2/B/b,3/C/c,...}}"
+      "snippet": "Frise[${2:clés}]{${1:1/A/a,${3:2/B/b},${4:3/C/c},...}}"
     },
     "Tables{}": {
       "snippet": "Tables{${1:nombre}}"
@@ -255,22 +255,22 @@
       "snippet": "BoiteRapido{${1:texte}}"
     },
     "Cible{}": {
-      "snippet": "Cible{${1:n1,n2,...}}"
+      "snippet": "Cible{${1:n1,${2:n2},...}}"
     },
     "Cible[]{}": {
-      "snippet": "Cible[${2:clés}]{${1:n1,n2,...}}"
+      "snippet": "Cible[${2:clés}]{${1:n1,${3:n2},...}}"
     },
     "Mentalo{}": {
-      "snippet": "Mentalo{${1:o1,o2,...}}"
+      "snippet": "Mentalo{${1:o1,${2:o2},...}}"
     },
     "Mentalo[]{}": {
-      "snippet": "Mentalo[${2:clés}]{${1:o1,o2,...}}"
+      "snippet": "Mentalo[${2:clés}]{${1:o1,${3:o2},...}}"
     },
     "Automatismes{}": {
-      "snippet": "Automatismes{${1:o1,o2,...}}"
+      "snippet": "Automatismes{${1:o1,${2:o2},...}}"
     },
     "Automatismes[]{}": {
-      "snippet": "Automatismes[${2:clés}]{${1:o1,o2,...}}"
+      "snippet": "Automatismes[${2:clés}]{${1:o1,${3:o2},...}}"
     },
     "PyraVoca{}": {
       "snippet": "PyraVoca{${1:définition1/mot1/couleur1,...}}"
@@ -446,16 +446,16 @@
       "snippet": "DivisionD[${3:clés}]{${1:n1}}{${2:n2}}"
     },
     "PyramideNombre{}": {
-      "snippet": "PyramideNombre{${1:c1,c2,...}}"
+      "snippet": "PyramideNombre{${1:c1,${2:c2},...}}"
     },
     "PyramideNombre[]{}": {
-      "snippet": "PyramideNombre[${2:clés}]{${1:c1,c2,...}}"
+      "snippet": "PyramideNombre[${2:clés}]{${1:c1,${3:c2},...}}"
     },
     "ProgCalcul{}": {
-      "snippet": "ProgCalcul{${1:i1,i2,...}}"
+      "snippet": "ProgCalcul{${1:i1,${2:i2},...}}"
     },
     "ProgCalcul[]{}": {
-      "snippet": "ProgCalcul[${2:clés}]{${1:i1,i2,...}}"
+      "snippet": "ProgCalcul[${2:clés}]{${1:i1,${3:i2},...}}"
     },
     "Decomposition{}": {
       "snippet": "Decomposition{${1:integer}}"
@@ -468,10 +468,10 @@
       "snippet": "Erathostene[${1:clés}]"
     },
     "Engrenages{}": {
-      "snippet": "Engrenages{${1:m1/z1,m2/z2,...}}"
+      "snippet": "Engrenages{${1:m1/z1,${2:m2/z2},...}}"
     },
     "Engrenages[]{}": {
-      "snippet": "Engrenages[${2:clés}]{${1:m1/z1,m2/z2,...}}"
+      "snippet": "Engrenages[${2:clés}]{${1:m1/z1,${3:m2/z2},...}}"
     },
     "Fraction{}": {
       "snippet": "Fraction{${1:a/b}}"
@@ -718,10 +718,10 @@
       "snippet": "Billard[${2:clés}]{${1:\"mot\"}}"
     },
     "Labyrinthe{}{}": {
-      "snippet": "Labyrinthe{${1:Contenu1/Couleur1,Contenu2/Couleur2,...}}{${2:P1/P2/...}}"
+      "snippet": "Labyrinthe{${1:Contenu1/Couleur1,${3:Contenu2/Couleur2},...}}{${2:P1/P2/...}}"
     },
     "Labyrinthe[]{}{}": {
-      "snippet": "Labyrinthe[${3:clés}]{${1:Contenu1/Couleur1,Contenu2/Couleur2,...}}{${2:P1/P2/...}}"
+      "snippet": "Labyrinthe[${3:clés}]{${1:Contenu1/Couleur1,${4:Contenu2/Couleur2},...}}{${2:P1/P2/...}}"
     },
     "LabyNombre": {},
     "LabyNombre[]": {
@@ -734,10 +734,10 @@
       "snippet": "Triomino[${2:clés}]{${1:v1§v2§v3...}}"
     },
     "DessinGradue{}{}{}": {
-      "snippet": "DessinGradue{${1:a1/a2/a3,...}}{${2:b1/b2/b3,...}}{${3:c1§c2§...}}"
+      "snippet": "DessinGradue{${1:a1/a2/a3,${4:...}}{${2:b1/b2/b3},...}}{${3:c1§c2§...}}"
     },
     "DessinGradue[]{}{}{}": {
-      "snippet": "DessinGradue[${4:clés}]{${1:a1/a2/a3,...}}{${2:b1/b2/b3,...}}{${3:c1§c2§...}}"
+      "snippet": "DessinGradue[${4:clés}]{${1:a1/a2/a3,${5:...}}{${2:b1/b2/b3},...}}{${3:c1§c2§...}}"
     },
     "Colorilude{}": {
       "snippet": "Colorilude{${1:a11 b11 a12 b12\\\\a21 b21...}}"
@@ -781,16 +781,16 @@
       "snippet": "QuisuisjeCodePerso[${3:Solution}]{${1:n1 n2...}}{${2:l1 l2...}}"
     },
     "MotsEmpiles{}": {
-      "snippet": "MotsEmpiles{${1:c1/mot1,c2/mot2,...}}"
+      "snippet": "MotsEmpiles{${1:c1/mot1,${2:c2/mot2},...}}"
     },
     "MotsEmpiles[]{}": {
-      "snippet": "MotsEmpiles[${2:clés}]{${1:c1/mot1,c2/mot2,...}}"
+      "snippet": "MotsEmpiles[${2:clés}]{${1:c1/mot1,${3:c2/mot2},...}}"
     },
     "MotsCroises{}": {
-      "snippet": "MotsCroises{${1:m11/q11,m12/q12...§m21/q21,m22/q22...}}"
+      "snippet": "MotsCroises{${1:m11/q11,${2:m12/q12...§m21/q21},m22/q22...}}"
     },
     "MotsCroises[]{}": {
-      "snippet": "MotsCroises[${2:clés}]{${1:m11/q11,m12/q12...§m21/q21,m22/q22...}}"
+      "snippet": "MotsCroises[${2:clés}]{${1:m11/q11,${3:m12/q12...§m21/q21},m22/q22...}}"
     },
     "MotsCodes{}": {
       "snippet": "MotsCodes{${1:énoncé1/lettre1§énoncé2/lettre2§...}}"
@@ -805,10 +805,10 @@
       "snippet": "MotsCodesTableau[${3:clés}]{${1:r11/r12...,r21/r22...}}{${2:texte à trouver}}"
     },
     "Mosaique{}": {
-      "snippet": "Mosaique{${1:mosa1/rep1,mosa2/rep2,...}}"
+      "snippet": "Mosaique{${1:mosa1/rep1,${2:mosa2/rep2},...}}"
     },
     "Mosaique[]{}": {
-      "snippet": "Mosaique[${2:clés}]{${1:mosa1/rep1,mosa2/rep2,...}}"
+      "snippet": "Mosaique[${2:clés}]{${1:mosa1/rep1,${3:mosa2/rep2},...}}"
     },
     "DessineMosaique{}": {
       "snippet": "DessineMosaique{${1:type}}"
@@ -947,10 +947,10 @@
       "snippet": "Futoshiki[${2:clés}]{${1:description de jeu}}"
     },
     "Garam{}": {
-      "snippet": "Garam{${1:c11/o11/O11,c12/o12/O12,...}}"
+      "snippet": "Garam{${1:c11/o11/O11,${2:c12/o12/O12},...}}"
     },
     "Garam[]{}": {
-      "snippet": "Garam[${2:clés}]{${1:c11/o11/O11,c12/o12/O12,...}}"
+      "snippet": "Garam[${2:clés}]{${1:c11/o11/O11,${3:c12/o12/O12},...}}"
     },
     "SquarO": {},
     "SquarO[]": {
diff --git a/dev/packages/ProfLycee.json b/dev/packages/ProfLycee.json
index 158e7d771..db0aaae99 100644
--- a/dev/packages/ProfLycee.json
+++ b/dev/packages/ProfLycee.json
@@ -258,6 +258,12 @@
     "FenetreSimpleTikz<>{}<>{}": {
       "snippet": "FenetreSimpleTikz<${3:opt axe Ox}>{${1:liste valx}}<${4:opt axe Oy}>{${2:liste valy}}"
     },
+    "FenetreSimpleTikz()<>{}<>{}": {
+      "snippet": "FenetreSimpleTikz(${5:opt axes})<${3:opt axe Ox}>{${1:liste valx}}<${4:opt axe Oy}>{${2:liste valy}}"
+    },
+    "FenetreSimpleTikz[]()<>{}<>{}": {
+      "snippet": "FenetreSimpleTikz[${3:opt}](${6:opt axes})<${4:opt axe Ox}>{${1:liste valx}}<${5:opt axe Oy}>{${2:liste valy}}"
+    },
     "OrigineTikz": {},
     "OrigineTikz[]": {
       "snippet": "OrigineTikz[${1:options}]",
@@ -585,10 +591,10 @@
       "snippet": "CalculCnp{${1:p}}{${2:n}}"
     },
     "FonctionRepartTikz{}": {
-      "snippet": "FonctionRepartTikz{${1:liste des probas,borneinf,bornesup}}"
+      "snippet": "FonctionRepartTikz{${1:liste des probas,${2:borneinf},bornesup}}"
     },
     "FonctionRepartTikz[]{}": {
-      "snippet": "FonctionRepartTikz[${2:option}]{${1:liste des probas,borneinf,bornesup}}"
+      "snippet": "FonctionRepartTikz[${2:option}]{${1:liste des probas,${3:borneinf},bornesup}}"
     },
     "ConversionDecBin{}": {
       "snippet": "ConversionDecBin{${1:nombre}}"
@@ -781,12 +787,74 @@
       "keyvalindex": 34,
       "keyvalpos": 0
     },
+    "AffPoint()": {
+      "snippet": "AffPoint(${1:liste de coordonnées})"
+    },
+    "AffPoint[]()": {
+      "snippet": "AffPoint[${1:options}](${2:liste de coordonnées})"
+    },
+    "AffVecteur()": {
+      "snippet": "AffVecteur(${1:liste de coordonnées})"
+    },
+    "AffVecteur<>()": {
+      "snippet": "AffVecteur<${1:options nicematrix}>(${2:liste de coordonnées})"
+    },
+    "AffVecteur[]()": {
+      "snippet": "AffVecteur[${1:options}](${2:liste de coordonnées})"
+    },
+    "AffVecteur[]<>()": {
+      "snippet": "AffVecteur[${1:options}]<${2:options nicematrix}>(${3:liste de coordonnées})"
+    },
+    "TrouveEqCartPlan()()": {
+      "snippet": "TrouveEqCartPlan(${1:vecteur normal})(${2:point})"
+    },
+    "TrouveEqCartPlan()()()": {
+      "snippet": "TrouveEqCartPlan(${1:vecteur dir1})(${2:vecteur dir2})(${3:point})"
+    },
+    "TrouveEqCartPlan[]()()": {
+      "snippet": "TrouveEqCartPlan[${1:options}](${2:vecteur normal})(${3:point})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "TrouveEqCartPlan[]()()()": {
+      "snippet": "TrouveEqCartPlan[${1:options}](${2:vecteur dir1})(${3:vecteur dir2})(${4:point})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "TrouveEqParamDroite()()": {
+      "snippet": "TrouveEqParamDroite(${1:vecteur directeur})(${2:point})"
+    },
+    "TrouveEqParamDroite[]()()": {
+      "snippet": "TrouveEqParamDroite[${1:options}](${2:vecteur directeur})(${3:point})",
+      "keyvalindex": 36,
+      "keyvalpos": 0
+    },
+    "TrouveEqCartDroite()()": {
+      "snippet": "TrouveEqCartDroite(${1:vecteur})(${2:point})"
+    },
+    "TrouveEqCartDroite[]()()": {
+      "snippet": "TrouveEqCartDroite[${1:options}](${2:vecteur})(${3:point})",
+      "keyvalindex": 37,
+      "keyvalpos": 0
+    },
+    "TrouveNorme()": {
+      "snippet": "TrouveNorme(${1:vecteur})"
+    },
+    "TrouveNorme()()": {
+      "snippet": "TrouveNorme(${1:point1})(${2:point2})"
+    },
+    "TrouveDistancePtPlan()()()": {
+      "snippet": "TrouveDistancePtPlan(${1:point})(${2:vec normal du plan})(${3:point du plan})"
+    },
+    "TrouveDistancePtPlan()()": {
+      "snippet": "TrouveDistancePtPlan(${1:point})(${2:équation cartésienne})"
+    },
     "EcritureTrinome{}{}{}": {
       "snippet": "EcritureTrinome{${1:a}}{${2:b}}{${3:c}}"
     },
     "EcritureTrinome[]{}{}{}": {
       "snippet": "EcritureTrinome[${4:options}]{${1:a}}{${2:b}}{${3:c}}",
-      "keyvalindex": 35,
+      "keyvalindex": 38,
       "keyvalpos": 0
     },
     "SimplificationRacine{}": {
@@ -797,7 +865,23 @@
     },
     "MesurePrincipale[]{}": {
       "snippet": "MesurePrincipale[${2:options}]{${1:angle}}",
-      "keyvalindex": 36,
+      "keyvalindex": 39,
+      "keyvalpos": 0
+    },
+    "LigneTrigo{}()": {
+      "snippet": "LigneTrigo{${1:cos|sin|tan}}(${2:angle})"
+    },
+    "LigneTrigo[]{}()": {
+      "snippet": "LigneTrigo[${2:options}]{${1:cos|sin|tan}}(${3:angle})",
+      "keyvalindex": 40,
+      "keyvalpos": 0
+    },
+    "LigneTrigo*{}()": {
+      "snippet": "LigneTrigo*{${1:cos|sin|tan}}(${2:angle})"
+    },
+    "LigneTrigo*[]{}()": {
+      "snippet": "LigneTrigo*[${2:options}]{${1:cos|sin|tan}}(${3:angle})",
+      "keyvalindex": 40,
       "keyvalpos": 0
     },
     "SudoMaths{}": {
@@ -805,13 +889,13 @@
     },
     "SudoMaths[]{}": {
       "snippet": "SudoMaths[${2:options}]{${1:liste}}",
-      "keyvalindex": 37,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "FractaleTikz": {},
     "FractaleTikz[]": {
       "snippet": "FractaleTikz[${1:options}]",
-      "keyvalindex": 38,
+      "keyvalindex": 42,
       "keyvalpos": 0
     },
     "FractaleTikz<>": {
@@ -819,13 +903,13 @@
     },
     "FractaleTikz[]<>": {
       "snippet": "FractaleTikz[${1:options}]<${2:TikZ options}>",
-      "keyvalindex": 38,
+      "keyvalindex": 42,
       "keyvalpos": 0
     },
     "FractaleTikz*": {},
     "FractaleTikz*[]": {
       "snippet": "FractaleTikz*[${1:options}]",
-      "keyvalindex": 38,
+      "keyvalindex": 42,
       "keyvalpos": 0
     },
     "FractaleTikz*<>": {
@@ -833,7 +917,7 @@
     },
     "FractaleTikz*[]<>": {
       "snippet": "FractaleTikz*[${1:options}]<${2:TikZ options}>",
-      "keyvalindex": 38,
+      "keyvalindex": 42,
       "keyvalpos": 0
     },
     "EtapesFloconKoch{}": {
@@ -841,7 +925,7 @@
     },
     "EtapesFloconKoch[]{}": {
       "snippet": "EtapesFloconKoch[${2:options}]{${1:étapes}}",
-      "keyvalindex": 38,
+      "keyvalindex": 42,
       "keyvalpos": 0
     },
     "Arrondi{}": {
@@ -888,7 +972,7 @@
     },
     "IntervalleFF[]{}{}": {
       "snippet": "IntervalleFF[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 39,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "IntervalleOF{}{}": {
@@ -896,7 +980,7 @@
     },
     "IntervalleOF[]{}{}": {
       "snippet": "IntervalleOF[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 39,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "IntervalleFO{}{}": {
@@ -904,7 +988,7 @@
     },
     "IntervalleFO[]{}{}": {
       "snippet": "IntervalleFO[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 39,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "IntervalleOO{}{}": {
@@ -912,7 +996,7 @@
     },
     "IntervalleOO[]{}{}": {
       "snippet": "IntervalleOO[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 39,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "Vecteur{}": {
@@ -975,7 +1059,7 @@
     },
     "Modulo[]{}": {
       "snippet": "Modulo[${2:options}]{${1:arg}}",
-      "keyvalindex": 40,
+      "keyvalindex": 44,
       "keyvalpos": 0
     },
     "Modulo*{}": {
@@ -983,7 +1067,7 @@
     },
     "Modulo*[]{}": {
       "snippet": "Modulo*[${2:options}]{${1:arg}}",
-      "keyvalindex": 40,
+      "keyvalindex": 44,
       "keyvalpos": 0
     },
     "Suite{}": {
@@ -1573,7 +1657,7 @@
     "CodePythonLst[]{}": {
       "name": "CodePythonLst",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "CodePythonLst*{}": {
@@ -1583,7 +1667,7 @@
     "CodePythonLst*[]{}": {
       "name": "CodePythonLst",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "CodePythonLstAlt{}": {
@@ -1593,7 +1677,7 @@
     "CodePythonLstAlt[]{}": {
       "name": "CodePythonLstAlt",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "CodePythonLstAlt*{}": {
@@ -1603,7 +1687,7 @@
     "CodePythonLstAlt*[]{}": {
       "name": "CodePythonLstAlt",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "CodePiton{}": {
@@ -1617,13 +1701,13 @@
     "CodePiton[]{}": {
       "name": "CodePiton",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 42,
+      "keyvalindex": 46,
       "keyvalpos": 0
     },
     "CodePiton[]{}<>": {
       "name": "CodePiton",
       "snippet": "[${2:options}]{${1:tcolorbox options}}<${3:line options}>",
-      "keyvalindex": 42,
+      "keyvalindex": 46,
       "keyvalpos": 0
     },
     "ConsolePiton{}": {
@@ -1641,7 +1725,7 @@
     "CodePythonMinted[]{}": {
       "name": "CodePythonMinted",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "CodePythonMinted*{}": {
@@ -1651,7 +1735,7 @@
     "CodePythonMinted*[]{}": {
       "name": "CodePythonMinted",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "CodePythonMintedAlt{}": {
@@ -1661,7 +1745,7 @@
     "CodePythonMintedAlt[]{}": {
       "name": "CodePythonMintedAlt",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "CodePythonMintedAlt*{}": {
@@ -1671,7 +1755,7 @@
     "CodePythonMintedAlt*[]{}": {
       "name": "CodePythonMintedAlt",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 41,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "PseudoCode{}": {
@@ -1681,7 +1765,7 @@
     "PseudoCode[]{}": {
       "name": "PseudoCode",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 43,
+      "keyvalindex": 47,
       "keyvalpos": 0
     },
     "PseudoCode*{}": {
@@ -1691,7 +1775,7 @@
     "PseudoCode*[]{}": {
       "name": "PseudoCode",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 43,
+      "keyvalindex": 47,
       "keyvalpos": 0
     },
     "PseudoCodeAlt{}": {
@@ -1701,7 +1785,7 @@
     "PseudoCodeAlt[]{}": {
       "name": "PseudoCodeAlt",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 43,
+      "keyvalindex": 47,
       "keyvalpos": 0
     },
     "PseudoCodeAlt*{}": {
@@ -1711,7 +1795,7 @@
     "PseudoCodeAlt*[]{}": {
       "name": "PseudoCodeAlt",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 43,
+      "keyvalindex": 47,
       "keyvalpos": 0
     },
     "TerminalWin{}": {
@@ -1763,7 +1847,7 @@
     "EnvSudoMaths[]{}": {
       "name": "EnvSudoMaths",
       "snippet": "[${2:options}]{${1:grille}}",
-      "keyvalindex": 37,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePythontex{}": {
@@ -1773,7 +1857,7 @@
     "CodePythontex[]{}": {
       "name": "CodePythontex",
       "snippet": "[${2:options}]{${1:}}",
-      "keyvalindex": 44,
+      "keyvalindex": 48,
       "keyvalpos": 0
     },
     "CodePythontexAlt{}": {
@@ -1783,7 +1867,7 @@
     "CodePythontexAlt[]{}": {
       "name": "CodePythontexAlt",
       "snippet": "[${2:options}]{${1:}}",
-      "keyvalindex": 44,
+      "keyvalindex": 48,
       "keyvalpos": 0
     },
     "ConsolePythontex{}": {
@@ -1793,7 +1877,7 @@
     "ConsolePythontex[]{}": {
       "name": "ConsolePythontex",
       "snippet": "[${2:options}]{${1:}}",
-      "keyvalindex": 45,
+      "keyvalindex": 49,
       "keyvalpos": 0
     },
     "pythont": {},
@@ -2156,6 +2240,23 @@
       "Methode=",
       "NbSubDiv=${1:nombre}"
     ],
+    [
+      "OptionCoeffs=${1:option}",
+      "SimplifCoeffs",
+      "Facteur=${1:facteur}"
+    ],
+    [
+      "OptionCoeffs=${1:option}",
+      "Reel=${1:symbole}",
+      "Oppose",
+      "Rgras"
+    ],
+    [
+      "OptionCoeffs=${1:option}",
+      "SimplifCoeffs",
+      "Facteur=${1:facteur}",
+      "VectDirecteur"
+    ],
     [
       "Alea",
       "Anegatif"
@@ -2165,6 +2266,10 @@
       "Crochets",
       "Brut"
     ],
+    [
+      "d",
+      "Etapes"
+    ],
     [
       "Epaisseurg=",
       "Epaisseur=",
diff --git a/dev/packages/ProfSio.json b/dev/packages/ProfSio.json
index 8603a945a..031be3dff 100644
--- a/dev/packages/ProfSio.json
+++ b/dev/packages/ProfSio.json
@@ -20,6 +20,15 @@
     "nicematrix": []
   },
   "macros": {
+    "MPMPlaceNotice()": {
+      "snippet": "MPMPlaceNotice(${1:coordonnées})"
+    },
+    "MPMPlaceNotice*()": {
+      "snippet": "MPMPlaceNotice*(${1:coordonnées})"
+    },
+    "MPMPlaceTache()()()": {
+      "snippet": "MPMPlaceTache(${1:coordonnées})(${2:Tâche})(${3:Dates})"
+    },
     "MPMPlaceTaches{}": {
       "snippet": "MPMPlaceTaches{${1:(${2:coordA})(${3:TâcheA})(${4:DatesA}) / (${5:coordB})(${6:TâcheB})(${7:DatesB}) / ...}}"
     },
@@ -32,10 +41,10 @@
       "keyvalpos": 0
     },
     "MPMPlaceDurees{}": {
-      "snippet": "MPMPlaceDurees{${1:TâcheA>TâcheB,durée / TâcheC>TâcheD,durée}}"
+      "snippet": "MPMPlaceDurees{${1:TâcheA>TâcheB,${2:durée / TâcheC>TâcheD},durée}}"
     },
     "MPMPlaceDurees[]{}": {
-      "snippet": "MPMPlaceDurees[${2:options}]{${1:TâcheA>TâcheB,durée / TâcheC>TâcheD,durée}}",
+      "snippet": "MPMPlaceDurees[${2:options}]{${1:TâcheA>TâcheB,${3:durée / TâcheC>TâcheD},durée}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/ResolSysteme.json b/dev/packages/ResolSysteme.json
index 645a85388..48310f188 100644
--- a/dev/packages/ResolSysteme.json
+++ b/dev/packages/ResolSysteme.json
@@ -10,6 +10,202 @@
     "xstring": []
   },
   "macros": {
+    "ProduitMatricesPY()()": {
+      "snippet": "ProduitMatricesPY(${1:matriceA})(${2:matriceB})",
+      "option": "pyluatex"
+    },
+    "ProduitMatricesPY<>()()": {
+      "snippet": "ProduitMatricesPY<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "ProduitMatricesPY[]()()": {
+      "snippet": "ProduitMatricesPY[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "ProduitMatricesPY[]<>()()": {
+      "snippet": "ProduitMatricesPY[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
+      "option": "pyluatex"
+    },
+    "ProduitMatricesPY*()()": {
+      "snippet": "ProduitMatricesPY*(${1:matriceA})(${2:matriceB})",
+      "option": "pyluatex"
+    },
+    "ProduitMatricesPY*<>()()": {
+      "snippet": "ProduitMatricesPY*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "ProduitMatricesPY*[]()()": {
+      "snippet": "ProduitMatricesPY*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "ProduitMatricesPY*[]<>()()": {
+      "snippet": "ProduitMatricesPY*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
+      "option": "pyluatex"
+    },
+    "MatricePuissancePY()()": {
+      "snippet": "MatricePuissancePY(${1:matrice})(${2:puissance})",
+      "option": "pyluatex"
+    },
+    "MatricePuissancePY<>()()": {
+      "snippet": "MatricePuissancePY<${1:options nicematrix}>(${2:matrice})(${3:puissance})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "MatricePuissancePY[]()()": {
+      "snippet": "MatricePuissancePY[${1:option de formatage}](${2:matrice})(${3:puissance})",
+      "option": "pyluatex"
+    },
+    "MatricePuissancePY[]<>()()": {
+      "snippet": "MatricePuissancePY[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})(${4:puissance})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "MatricePuissancePY*()()": {
+      "snippet": "MatricePuissancePY*(${1:matrice})(${2:puissance})",
+      "option": "pyluatex"
+    },
+    "MatricePuissancePY*<>()()": {
+      "snippet": "MatricePuissancePY*<${1:options nicematrix}>(${2:matrice})(${3:puissance})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "MatricePuissancePY*[]()()": {
+      "snippet": "MatricePuissancePY*[${1:option de formatage}](${2:matrice})(${3:puissance})",
+      "option": "pyluatex"
+    },
+    "MatricePuissancePY*[]<>()()": {
+      "snippet": "MatricePuissancePY*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})(${4:puissance})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "DetMatricePY()": {
+      "snippet": "DetMatricePY(${1:matrice})",
+      "option": "pyluatex"
+    },
+    "DetMatricePY[]()": {
+      "snippet": "DetMatricePY[${1:option de formatage}](${2:matrice})",
+      "option": "pyluatex"
+    },
+    "DetMatricePY*()": {
+      "snippet": "DetMatricePY*(${1:matrice})",
+      "option": "pyluatex"
+    },
+    "DetMatricePY*[]()": {
+      "snippet": "DetMatricePY*[${1:option de formatage}](${2:matrice})",
+      "option": "pyluatex"
+    },
+    "MatriceInversePY()": {
+      "snippet": "MatriceInversePY(${1:matrice})",
+      "option": "pyluatex"
+    },
+    "MatriceInversePY<>()": {
+      "snippet": "MatriceInversePY<${1:options nicematrix}>(${2:matrice})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "MatriceInversePY[]()": {
+      "snippet": "MatriceInversePY[${1:option de formatage}](${2:matrice})",
+      "option": "pyluatex"
+    },
+    "MatriceInversePY[]<>()": {
+      "snippet": "MatriceInversePY[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "MatriceInversePY*()": {
+      "snippet": "MatriceInversePY*(${1:matrice})",
+      "option": "pyluatex"
+    },
+    "MatriceInversePY*<>()": {
+      "snippet": "MatriceInversePY*<${1:options nicematrix}>(${2:matrice})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "MatriceInversePY*[]()": {
+      "snippet": "MatriceInversePY*[${1:option de formatage}](${2:matrice})",
+      "option": "pyluatex"
+    },
+    "MatriceInversePY*[]<>()": {
+      "snippet": "MatriceInversePY*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "EtatProbPY()()()": {
+      "snippet": "EtatProbPY(${1:état init})(${2:mat de trans})(${3:étape})",
+      "option": "pyluatex"
+    },
+    "EtatProbPY<>()()()": {
+      "snippet": "EtatProbPY<${1:options nicematrix}>(${2:état init})(${3:mat de trans})(${4:étape})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "EtatProbPY[]()()()": {
+      "snippet": "EtatProbPY[${1:option de formatage}](${2:état init})(${3:mat de trans})(${4:étape})",
+      "option": "pyluatex"
+    },
+    "EtatProbPY[]<>()()()": {
+      "snippet": "EtatProbPY[${1:option de formatage}]<${2:options nicematrix}>(${3:état init})(${4:mat de trans})(${5:étape})",
+      "option": "pyluatex",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "SolutionSystemePY()()": {
+      "snippet": "SolutionSystemePY(${1:matriceA})(${2:matriceB})",
+      "option": "pyluatex"
+    },
+    "SolutionSystemePY<>()()": {
+      "snippet": "SolutionSystemePY<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "SolutionSystemePY[]()()": {
+      "snippet": "SolutionSystemePY[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "SolutionSystemePY[]<>()()": {
+      "snippet": "SolutionSystemePY[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
+      "option": "pyluatex"
+    },
+    "SolutionSystemePY*()()": {
+      "snippet": "SolutionSystemePY*(${1:matriceA})(${2:matriceB})",
+      "option": "pyluatex"
+    },
+    "SolutionSystemePY*<>()()": {
+      "snippet": "SolutionSystemePY*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "SolutionSystemePY*[]()()": {
+      "snippet": "SolutionSystemePY*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
+      "option": "pyluatex"
+    },
+    "SolutionSystemePY*[]<>()()": {
+      "snippet": "SolutionSystemePY*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
+      "option": "pyluatex"
+    },
+    "EtatStablePY()": {
+      "snippet": "EtatStablePY(${1:matrice})",
+      "option": "pyluatex"
+    },
+    "EtatStablePY<>()": {
+      "snippet": "EtatStablePY<${1:opts nicematrix}>(${2:matrice})",
+      "option": "pyluatex"
+    },
+    "EtatStablePY[]()": {
+      "snippet": "EtatStablePY[${1:opt de formatage}](${2:matrice})",
+      "option": "pyluatex"
+    },
+    "EtatStablePY[]<>()": {
+      "snippet": "EtatStablePY[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matrice})",
+      "option": "pyluatex"
+    },
     "ConvVersFrac{}": {
       "snippet": "ConvVersFrac{${1:calcul}}"
     },
@@ -21,11 +217,183 @@
     },
     "ConvVersFrac*[]{}": {
       "snippet": "ConvVersFrac*[${2:option de formatage}]{${1:calcul}}"
+    },
+    "AffMatrice()": {
+      "snippet": "AffMatrice(${1:matrice})"
+    },
+    "AffMatrice[]()": {
+      "snippet": "AffMatrice[${1:option de formatage}](${2:matrice})"
+    },
+    "AffMatrice*()": {
+      "snippet": "AffMatrice*(${1:matrice})"
+    },
+    "AffMatrice*[]()": {
+      "snippet": "AffMatrice*[${1:option de formatage}](${2:matrice})"
+    },
+    "ProduitMatrices()()": {
+      "snippet": "ProduitMatrices(${1:matriceA})(${2:matriceB})"
+    },
+    "ProduitMatrices<>()()": {
+      "snippet": "ProduitMatrices<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
+    },
+    "ProduitMatrices[]()()": {
+      "snippet": "ProduitMatrices[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
+    },
+    "ProduitMatrices[]<>()()": {
+      "snippet": "ProduitMatrices[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
+    },
+    "ProduitMatrices*()()": {
+      "snippet": "ProduitMatrices*(${1:matriceA})(${2:matriceB})"
+    },
+    "ProduitMatrices*<>()()": {
+      "snippet": "ProduitMatrices*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
+    },
+    "ProduitMatrices*[]()()": {
+      "snippet": "ProduitMatrices*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
+    },
+    "ProduitMatrices*[]<>()()": {
+      "snippet": "ProduitMatrices*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
+    },
+    "CarreMatrice()": {
+      "snippet": "CarreMatrice(${1:matrice})"
+    },
+    "CarreMatrice<>()": {
+      "snippet": "CarreMatrice<${1:options nicematrix}>(${2:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "CarreMatrice[]()": {
+      "snippet": "CarreMatrice[${1:option de formatage}](${2:matrice})"
+    },
+    "CarreMatrice[]<>()": {
+      "snippet": "CarreMatrice[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "CarreMatrice*()": {
+      "snippet": "CarreMatrice*(${1:matrice})"
+    },
+    "CarreMatrice*<>()": {
+      "snippet": "CarreMatrice*<${1:options nicematrix}>(${2:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "CarreMatrice*[]()": {
+      "snippet": "CarreMatrice*[${1:option de formatage}](${2:matrice})"
+    },
+    "CarreMatrice*[]<>()": {
+      "snippet": "CarreMatrice*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "DetMatrice()": {
+      "snippet": "DetMatrice(${1:matrice})"
+    },
+    "DetMatrice[]()": {
+      "snippet": "DetMatrice[${1:option de formatage}](${2:matrice})"
+    },
+    "DetMatrice*()": {
+      "snippet": "DetMatrice*(${1:matrice})"
+    },
+    "DetMatrice*[]()": {
+      "snippet": "DetMatrice*[${1:option de formatage}](${2:matrice})"
+    },
+    "MatriceInverse()": {
+      "snippet": "MatriceInverse(${1:matrice})"
+    },
+    "MatriceInverse<>()": {
+      "snippet": "MatriceInverse<${1:options nicematrix}>(${2:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "MatriceInverse[]()": {
+      "snippet": "MatriceInverse[${1:option de formatage}](${2:matrice})"
+    },
+    "MatriceInverse[]<>()": {
+      "snippet": "MatriceInverse[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "MatriceInverse*()": {
+      "snippet": "MatriceInverse*(${1:matrice})"
+    },
+    "MatriceInverse*<>()": {
+      "snippet": "MatriceInverse*<${1:options nicematrix}>(${2:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "MatriceInverse*[]()": {
+      "snippet": "MatriceInverse*[${1:option de formatage}](${2:matrice})"
+    },
+    "MatriceInverse*[]<>()": {
+      "snippet": "MatriceInverse*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "AffEtatProb()": {
+      "snippet": "AffEtatProb(${1:matrice ligne})"
+    },
+    "AffEtatProb<>()": {
+      "snippet": "AffEtatProb<${1:options nicematrix}>(${2:matrice ligne})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "AffEtatProb[]()": {
+      "snippet": "AffEtatProb[${1:option de formatage}](${2:matrice ligne})"
+    },
+    "AffEtatProb[]<>()": {
+      "snippet": "AffEtatProb[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice ligne})",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "SolutionSysteme()()": {
+      "snippet": "SolutionSysteme(${1:matriceA})(${2:matriceB})"
+    },
+    "SolutionSysteme<>()()": {
+      "snippet": "SolutionSysteme<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
+    },
+    "SolutionSysteme[]()()": {
+      "snippet": "SolutionSysteme[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
+    },
+    "SolutionSysteme[]<>()()": {
+      "snippet": "SolutionSysteme[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
+    },
+    "SolutionSysteme*()()": {
+      "snippet": "SolutionSysteme*(${1:matriceA})(${2:matriceB})"
+    },
+    "SolutionSysteme*<>()()": {
+      "snippet": "SolutionSysteme*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
+    },
+    "SolutionSysteme*[]()()": {
+      "snippet": "SolutionSysteme*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
+    },
+    "SolutionSysteme*[]<>()()": {
+      "snippet": "SolutionSysteme*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
+    },
+    "EtatStable()": {
+      "snippet": "EtatStable(${1:matrice})"
+    },
+    "EtatStable<>()": {
+      "snippet": "EtatStable<${1:opts nicematrix}>(${2:matrice})"
+    },
+    "EtatStable[]()": {
+      "snippet": "EtatStable[${1:opt de formatage}](${2:matrice})"
+    },
+    "EtatStable[]<>()": {
+      "snippet": "EtatStable[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matrice})"
     }
   },
   "envs": {},
   "options": [
     "pyluatex"
   ],
-  "keyvals": []
+  "keyvals": [
+    [
+      "t",
+      "d",
+      "n",
+      "dec",
+      "dec=${1:k}"
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/TangramTikz.json b/dev/packages/TangramTikz.json
index c728939f0..a8f66d158 100644
--- a/dev/packages/TangramTikz.json
+++ b/dev/packages/TangramTikz.json
@@ -24,6 +24,16 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "PieceTangram[](){}": {
+      "snippet": "PieceTangram[${2:options}](${3:x},${4:y}){${1:piece name}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "PieceTangram[]<>(){}": {
+      "snippet": "PieceTangram[${2:options}]<${3:TikZ options}>(${4:x},${5:y}){${1:piece name}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "TangramSquare": {},
     "TangramSquare[]": {
       "snippet": "TangramSquare[${1:TikZ options}]"
@@ -351,6 +361,12 @@
       "ColorList={${1:color1,color2,...}}",
       "ListeCouleurs={${1:couleur1,couleur2,...}}",
       "Sep="
+    ],
+    [
+      "TangPuzz",
+      "TangPuzz={${1:color}}",
+      "TangSol",
+      "TangSol={${1:color}}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/WriteOnGrid.json b/dev/packages/WriteOnGrid.json
index f1003d8ce..9665cf629 100644
--- a/dev/packages/WriteOnGrid.json
+++ b/dev/packages/WriteOnGrid.json
@@ -66,6 +66,11 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
+    "LignePapierSeyes[]<>(){}": {
+      "snippet": "LignePapierSeyes[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "CadreNoteSeyes{}": {
       "snippet": "CadreNoteSeyes{${1:numligne}}"
     },
@@ -80,6 +85,11 @@
       "keyvalindex": 3,
       "keyvalpos": 0
     },
+    "ParagraphePapierSeyes[]<>(){}": {
+      "snippet": "ParagraphePapierSeyes[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
     "LignePapierCinqCinq{}": {
       "snippet": "LignePapierCinqCinq{${1:text}}"
     },
@@ -88,6 +98,11 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
+    "LignePapierCinqCinq[]<>(){}": {
+      "snippet": "LignePapierCinqCinq[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "CadreNoteCinqCinq{}": {
       "snippet": "CadreNoteCinqCinq{${1:numligne}}"
     },
@@ -102,6 +117,11 @@
       "keyvalindex": 3,
       "keyvalpos": 0
     },
+    "ParagraphePapierCinqCinq[]<>(){}": {
+      "snippet": "ParagraphePapierCinqCinq[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
     "LignePapierRuled{}": {
       "snippet": "LignePapierRuled{${1:text}}"
     },
@@ -110,6 +130,11 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
+    "LignePapierRuled[]<>(){}": {
+      "snippet": "LignePapierRuled[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "CadreNoteRuled{}": {
       "snippet": "CadreNoteRuled{${1:numligne}}"
     },
@@ -124,6 +149,11 @@
       "keyvalindex": 3,
       "keyvalpos": 0
     },
+    "ParagraphePapierRuled[]<>(){}": {
+      "snippet": "ParagraphePapierRuled[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
     "CCFullCoul": {},
     "CCFullCoulM": {},
     "CCLigne": {},
diff --git a/dev/packages/abspos.json b/dev/packages/abspos.json
new file mode 100644
index 000000000..b89e1992d
--- /dev/null
+++ b/dev/packages/abspos.json
@@ -0,0 +1,36 @@
+{
+  "includes": {
+    "atbegshi": []
+  },
+  "macros": {
+    "absposset{}": {
+      "snippet": "absposset{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "absput{}": {
+      "snippet": "absput{${1:contents}}"
+    },
+    "absput[]{}": {
+      "snippet": "absput[${2:options}]{${1:contents}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "angle=${1:degrees}",
+      "h=",
+      "pg=${1:page-coffin}",
+      "pg-h=",
+      "pg-v=",
+      "scale=${1:factor}",
+      "v=",
+      "width=",
+      "x=",
+      "y="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/abstract.json b/dev/packages/abstract.json
new file mode 100644
index 000000000..e69e15a81
--- /dev/null
+++ b/dev/packages/abstract.json
@@ -0,0 +1,34 @@
+{
+  "includes": {},
+  "macros": {
+    "saythanks": {},
+    "abstractnamefont": {},
+    "abstracttextfont": {},
+    "abstitlestyle": {},
+    "absleftindent": {},
+    "absrightindent": {},
+    "absparindent": {},
+    "absparsep": {},
+    "abslabeldelim{}": {
+      "snippet": "abslabeldelim{${1:text}}"
+    },
+    "absnamepos": {},
+    "abstitleskip": {
+      "snippet": "abstitleskip "
+    },
+    "appendiargdef{}{}": {
+      "snippet": "appendiargdef{${1:macro}}{${2:code}}"
+    }
+  },
+  "envs": {
+    "onecolabstract": {}
+  },
+  "options": [
+    "original",
+    "addtotoc",
+    "number",
+    "runin",
+    "style"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/accsupp.json b/dev/packages/accsupp.json
new file mode 100644
index 000000000..e1ad71456
--- /dev/null
+++ b/dev/packages/accsupp.json
@@ -0,0 +1,49 @@
+{
+  "includes": {
+    "pdfescape": [],
+    "iftex": [],
+    "kvoptions": []
+  },
+  "macros": {
+    "BeginAccSupp{}": {
+      "snippet": "BeginAccSupp{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "AccSuppSetup{}": {
+      "snippet": "AccSuppSetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "EndAccSupp{}": {
+      "snippet": "EndAccSupp{${1:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "ActualTextDriverDefault": {}
+  },
+  "envs": {},
+  "options": [
+    "pdftex",
+    "luatex",
+    "dvips",
+    "dvipdfm"
+  ],
+  "keyvals": [
+    [
+      "ActualText=${1:text}",
+      "Alt=${1:text}",
+      "E=${1:text}",
+      "Lang=${1:language}",
+      "method=",
+      "unicode",
+      "space",
+      "spacefont=${1:font name}",
+      "spacechar=${1:slot}",
+      "pdfliteral=${1:keyword}"
+    ],
+    [
+      "pdfliteral=${1:keyword}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/achemso.json b/dev/packages/achemso.json
new file mode 100644
index 000000000..2d1efea52
--- /dev/null
+++ b/dev/packages/achemso.json
@@ -0,0 +1,46 @@
+{
+  "includes": {
+    "xkeyval": [],
+    "natbib": [],
+    "mciteplus": [],
+    "natmove": [],
+    "xcolor": [
+      "journal=orlef7"
+    ]
+  },
+  "macros": {
+    "latin{}": {
+      "snippet": "latin{${1:text}}"
+    },
+    "bibnote{}": {
+      "snippet": "bibnote{${1:text}}"
+    },
+    "bibnotemark": {},
+    "bibnotetext{}": {
+      "snippet": "bibnotetext{${1:text}}"
+    },
+    "printbibnotes": {},
+    "thebibnote": {}
+  },
+  "envs": {},
+  "options": [
+    "abbreviations",
+    "articletitle",
+    "biblabel=",
+    "biochem",
+    "biochemistry",
+    "chaptertitle",
+    "doi",
+    "email",
+    "etalmode=",
+    "hyperref",
+    "journal=",
+    "keywords",
+    "layout=",
+    "manuscript=",
+    "maxauthors=${1:number}",
+    "super",
+    "usetitle"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/acro.json b/dev/packages/acro.json
new file mode 100644
index 000000000..91d96cb2f
--- /dev/null
+++ b/dev/packages/acro.json
@@ -0,0 +1,934 @@
+{
+  "includes": {
+    "l3keys2e": [],
+    "translations": [],
+    "etoolbox": []
+  },
+  "macros": {
+    "DeclareAcronym{}{}": {
+      "snippet": "DeclareAcronym{${1:id}}{${2:properties}}"
+    },
+    "NewAcroPreset{}{}": {
+      "snippet": "NewAcroPreset{${1:set name}}{${2:properties}}"
+    },
+    "RenewAcroPreset{}{}": {
+      "snippet": "RenewAcroPreset{${1:set name}}{${2:properties}}"
+    },
+    "DeclareAcroPreset{}{}": {
+      "snippet": "DeclareAcroPreset{${1:set name}}{${2:properties}}"
+    },
+    "ac{}": {
+      "snippet": "ac{${1:id}}"
+    },
+    "ac[]{}": {
+      "snippet": "ac[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ac*{}": {
+      "snippet": "ac*{${1:id}}"
+    },
+    "ac*[]{}": {
+      "snippet": "ac*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Ac{}": {
+      "snippet": "Ac{${1:id}}"
+    },
+    "Ac[]{}": {
+      "snippet": "Ac[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Ac*{}": {
+      "snippet": "Ac*{${1:id}}"
+    },
+    "Ac*[]{}": {
+      "snippet": "Ac*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acp{}": {
+      "snippet": "acp{${1:id}}"
+    },
+    "acp[]{}": {
+      "snippet": "acp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acp*{}": {
+      "snippet": "acp*{${1:id}}"
+    },
+    "acp*[]{}": {
+      "snippet": "acp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acp{}": {
+      "snippet": "Acp{${1:id}}"
+    },
+    "Acp[]{}": {
+      "snippet": "Acp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acp*{}": {
+      "snippet": "Acp*{${1:id}}"
+    },
+    "Acp*[]{}": {
+      "snippet": "Acp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iac{}": {
+      "snippet": "iac{${1:id}}"
+    },
+    "iac[]{}": {
+      "snippet": "iac[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iac*{}": {
+      "snippet": "iac*{${1:id}}"
+    },
+    "iac*[]{}": {
+      "snippet": "iac*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iac{}": {
+      "snippet": "Iac{${1:id}}"
+    },
+    "Iac[]{}": {
+      "snippet": "Iac[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iac*{}": {
+      "snippet": "Iac*{${1:id}}"
+    },
+    "Iac*[]{}": {
+      "snippet": "Iac*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acs{}": {
+      "snippet": "acs{${1:id}}"
+    },
+    "acs[]{}": {
+      "snippet": "acs[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acs*{}": {
+      "snippet": "acs*{${1:id}}"
+    },
+    "acs*[]{}": {
+      "snippet": "acs*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acs{}": {
+      "snippet": "Acs{${1:id}}"
+    },
+    "Acs[]{}": {
+      "snippet": "Acs[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acs*{}": {
+      "snippet": "Acs*{${1:id}}"
+    },
+    "Acs*[]{}": {
+      "snippet": "Acs*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acsp{}": {
+      "snippet": "acsp{${1:id}}"
+    },
+    "acsp[]{}": {
+      "snippet": "acsp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acsp*{}": {
+      "snippet": "acsp*{${1:id}}"
+    },
+    "acsp*[]{}": {
+      "snippet": "acsp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acsp{}": {
+      "snippet": "Acsp{${1:id}}"
+    },
+    "Acsp[]{}": {
+      "snippet": "Acsp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acsp*{}": {
+      "snippet": "Acsp*{${1:id}}"
+    },
+    "Acsp*[]{}": {
+      "snippet": "Acsp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iacs{}": {
+      "snippet": "iacs{${1:id}}"
+    },
+    "iacs[]{}": {
+      "snippet": "iacs[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iacs*{}": {
+      "snippet": "iacs*{${1:id}}"
+    },
+    "iacs*[]{}": {
+      "snippet": "iacs*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iacs{}": {
+      "snippet": "Iacs{${1:id}}"
+    },
+    "Iacs[]{}": {
+      "snippet": "Iacs[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iacs*{}": {
+      "snippet": "Iacs*{${1:id}}"
+    },
+    "Iacs*[]{}": {
+      "snippet": "Iacs*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acl{}": {
+      "snippet": "acl{${1:id}}"
+    },
+    "acl[]{}": {
+      "snippet": "acl[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acl*{}": {
+      "snippet": "acl*{${1:id}}"
+    },
+    "acl*[]{}": {
+      "snippet": "acl*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acl{}": {
+      "snippet": "Acl{${1:id}}"
+    },
+    "Acl[]{}": {
+      "snippet": "Acl[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acl*{}": {
+      "snippet": "Acl*{${1:id}}"
+    },
+    "Acl*[]{}": {
+      "snippet": "Acl*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "aclp{}": {
+      "snippet": "aclp{${1:id}}"
+    },
+    "aclp[]{}": {
+      "snippet": "aclp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "aclp*{}": {
+      "snippet": "aclp*{${1:id}}"
+    },
+    "aclp*[]{}": {
+      "snippet": "aclp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Aclp{}": {
+      "snippet": "Aclp{${1:id}}"
+    },
+    "Aclp[]{}": {
+      "snippet": "Aclp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Aclp*{}": {
+      "snippet": "Aclp*{${1:id}}"
+    },
+    "Aclp*[]{}": {
+      "snippet": "Aclp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iacl{}": {
+      "snippet": "iacl{${1:id}}"
+    },
+    "iacl[]{}": {
+      "snippet": "iacl[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iacl*{}": {
+      "snippet": "iacl*{${1:id}}"
+    },
+    "iacl*[]{}": {
+      "snippet": "iacl*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iacl{}": {
+      "snippet": "Iacl{${1:id}}"
+    },
+    "Iacl[]{}": {
+      "snippet": "Iacl[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iacl*{}": {
+      "snippet": "Iacl*{${1:id}}"
+    },
+    "Iacl*[]{}": {
+      "snippet": "Iacl*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "aca{}": {
+      "snippet": "aca{${1:id}}"
+    },
+    "aca[]{}": {
+      "snippet": "aca[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "aca*{}": {
+      "snippet": "aca*{${1:id}}"
+    },
+    "aca*[]{}": {
+      "snippet": "aca*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Aca{}": {
+      "snippet": "Aca{${1:id}}"
+    },
+    "Aca[]{}": {
+      "snippet": "Aca[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Aca*{}": {
+      "snippet": "Aca*{${1:id}}"
+    },
+    "Aca*[]{}": {
+      "snippet": "Aca*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acap{}": {
+      "snippet": "acap{${1:id}}"
+    },
+    "acap[]{}": {
+      "snippet": "acap[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acap*{}": {
+      "snippet": "acap*{${1:id}}"
+    },
+    "acap*[]{}": {
+      "snippet": "acap*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acap{}": {
+      "snippet": "Acap{${1:id}}"
+    },
+    "Acap[]{}": {
+      "snippet": "Acap[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acap*{}": {
+      "snippet": "Acap*{${1:id}}"
+    },
+    "Acap*[]{}": {
+      "snippet": "Acap*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iaca{}": {
+      "snippet": "iaca{${1:id}}"
+    },
+    "iaca[]{}": {
+      "snippet": "iaca[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iaca*{}": {
+      "snippet": "iaca*{${1:id}}"
+    },
+    "iaca*[]{}": {
+      "snippet": "iaca*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iaca{}": {
+      "snippet": "Iaca{${1:id}}"
+    },
+    "Iaca[]{}": {
+      "snippet": "Iaca[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iaca*{}": {
+      "snippet": "Iaca*{${1:id}}"
+    },
+    "Iaca*[]{}": {
+      "snippet": "Iaca*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acf{}": {
+      "snippet": "acf{${1:id}}"
+    },
+    "acf[]{}": {
+      "snippet": "acf[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acf*{}": {
+      "snippet": "acf*{${1:id}}"
+    },
+    "acf*[]{}": {
+      "snippet": "acf*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acf{}": {
+      "snippet": "Acf{${1:id}}"
+    },
+    "Acf[]{}": {
+      "snippet": "Acf[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acf*{}": {
+      "snippet": "Acf*{${1:id}}"
+    },
+    "Acf*[]{}": {
+      "snippet": "Acf*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acfp{}": {
+      "snippet": "acfp{${1:id}}"
+    },
+    "acfp[]{}": {
+      "snippet": "acfp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "acfp*{}": {
+      "snippet": "acfp*{${1:id}}"
+    },
+    "acfp*[]{}": {
+      "snippet": "acfp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acfp{}": {
+      "snippet": "Acfp{${1:id}}"
+    },
+    "Acfp[]{}": {
+      "snippet": "Acfp[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Acfp*{}": {
+      "snippet": "Acfp*{${1:id}}"
+    },
+    "Acfp*[]{}": {
+      "snippet": "Acfp*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iacf{}": {
+      "snippet": "iacf{${1:id}}"
+    },
+    "iacf[]{}": {
+      "snippet": "iacf[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "iacf*{}": {
+      "snippet": "iacf*{${1:id}}"
+    },
+    "iacf*[]{}": {
+      "snippet": "iacf*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iacf{}": {
+      "snippet": "Iacf{${1:id}}"
+    },
+    "Iacf[]{}": {
+      "snippet": "Iacf[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Iacf*{}": {
+      "snippet": "Iacf*{${1:id}}"
+    },
+    "Iacf*[]{}": {
+      "snippet": "Iacf*[${2:options}]{${1:id}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "printacronyms[]": {
+      "snippet": "printacronyms[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "acsetup{}": {
+      "snippet": "acsetup{${1:options}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "acrodotfill": {},
+    "acbarrier": {},
+    "acdot": {},
+    "acspace": {},
+    "abbrdot": {},
+    "aciftrailing{}{}{}": {
+      "snippet": "aciftrailing{${1:list of token names}}{${2:true}}{${3:false}}"
+    },
+    "acuse{}": {
+      "snippet": "acuse{${1:list of ids}}"
+    },
+    "acuseall": {},
+    "acreset{}": {
+      "snippet": "acreset{${1:list of ids}}"
+    },
+    "acresetall": {},
+    "acrotranslate{}": {
+      "snippet": "acrotranslate{${1:key}}"
+    },
+    "acswitchoff": {},
+    "acswitchon": {},
+    "NewAcroTemplate{}{}": {
+      "snippet": "NewAcroTemplate{${1:name}}{${2:code}}"
+    },
+    "NewAcroTemplate[]{}{}": {
+      "snippet": "NewAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
+    },
+    "RenewAcroTemplate{}{}": {
+      "snippet": "RenewAcroTemplate{${1:name}}{${2:code}}"
+    },
+    "RenewAcroTemplate[]{}{}": {
+      "snippet": "RenewAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
+    },
+    "SetupAcroTemplate{}{}": {
+      "snippet": "SetupAcroTemplate{${1:name}}{${2:code}}"
+    },
+    "SetupAcroTemplate[]{}{}": {
+      "snippet": "SetupAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
+    },
+    "SetupNextAcroTemplate{}{}": {
+      "snippet": "SetupNextAcroTemplate{${1:name}}{${2:code}}"
+    },
+    "SetupNextAcroTemplate[]{}{}": {
+      "snippet": "SetupNextAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
+    },
+    "AcroTemplateType": {},
+    "AcroTemplateName": {},
+    "acrolistname": {},
+    "acrowrite{}": {
+      "snippet": "acrowrite{${1:property}}"
+    },
+    "acroformat{}{}": {
+      "snippet": "acroformat{${1:type}}{${2:text}}"
+    },
+    "acroshow{}": {
+      "snippet": "acroshow{${1:property}}"
+    },
+    "acroifTF{}{}{}": {
+      "snippet": "acroifTF{${1:property}}{${2:true}}{${3:false}}"
+    },
+    "acroifT{}{}{}": {
+      "snippet": "acroifT{${1:property}}{${2:true}}{${3:false}}"
+    },
+    "acroifF{}{}{}": {
+      "snippet": "acroifF{${1:property}}{${2:true}}{${3:false}}"
+    },
+    "acroifbooleanTF{}{}{}": {
+      "snippet": "acroifbooleanTF{${1:property}}{${2:true}}{${3:false}}"
+    },
+    "acroifbooleanT{}{}{}": {
+      "snippet": "acroifbooleanT{${1:property}}{${2:true}}{${3:false}}"
+    },
+    "acroifbooleanF{}{}{}": {
+      "snippet": "acroifbooleanF{${1:property}}{${2:true}}{${3:false}}"
+    },
+    "acroifallTF{}{}{}": {
+      "snippet": "acroifallTF{${1:properties}}{${2:true}}{${3:false}}"
+    },
+    "acroifallT{}{}{}": {
+      "snippet": "acroifallT{${1:properties}}{${2:true}}{${3:false}}"
+    },
+    "acroifallF{}{}{}": {
+      "snippet": "acroifallF{${1:properties}}{${2:true}}{${3:false}}"
+    },
+    "acroifanyTF{}{}{}": {
+      "snippet": "acroifanyTF{${1:properties}}{${2:true}}{${3:false}}"
+    },
+    "acroifanyT{}{}{}": {
+      "snippet": "acroifanyT{${1:properties}}{${2:true}}{${3:false}}"
+    },
+    "acroifanyF{}{}{}": {
+      "snippet": "acroifanyF{${1:properties}}{${2:true}}{${3:false}}"
+    },
+    "acroiftagTF{}{}{}": {
+      "snippet": "acroiftagTF{${1:tag}}{${2:true}}{${3:false}}"
+    },
+    "acroiftagT{}{}{}": {
+      "snippet": "acroiftagT{${1:tag}}{${2:true}}{${3:false}}"
+    },
+    "acroiftagF{}{}{}": {
+      "snippet": "acroiftagF{${1:tag}}{${2:true}}{${3:false}}"
+    },
+    "acroifstarredTF{}{}": {
+      "snippet": "acroifstarredTF{${1:true}}{${2:false}}"
+    },
+    "acroifstarredT{}{}": {
+      "snippet": "acroifstarredT{${1:true}}{${2:false}}"
+    },
+    "acroifstarredF{}{}": {
+      "snippet": "acroifstarredF{${1:true}}{${2:false}}"
+    },
+    "AcroPropertiesMap{}": {
+      "snippet": "AcroPropertiesMap{${1:code}}"
+    },
+    "AcroAcronymsMap{}": {
+      "snippet": "AcroAcronymsMap{${1:code}}"
+    },
+    "AcronymID": {},
+    "AcroMapBreak": {},
+    "AcroPropertiesSet{}{}": {
+      "snippet": "AcroPropertiesSet{${1:id}}{${2:list of properties}}"
+    },
+    "acroifusedTF{}{}": {
+      "snippet": "acroifusedTF{${1:true}}{${2:false}}"
+    },
+    "acroifusedT{}{}": {
+      "snippet": "acroifusedT{${1:true}}{${2:false}}"
+    },
+    "acroifusedF{}{}": {
+      "snippet": "acroifusedF{${1:true}}{${2:false}}"
+    },
+    "acroiffirstTF{}{}": {
+      "snippet": "acroiffirstTF{${1:true}}{${2:false}}"
+    },
+    "acroiffirstT{}{}": {
+      "snippet": "acroiffirstT{${1:true}}{${2:false}}"
+    },
+    "acroiffirstF{}{}": {
+      "snippet": "acroiffirstF{${1:true}}{${2:false}}"
+    },
+    "acroifsingleTF{}{}": {
+      "snippet": "acroifsingleTF{${1:true}}{${2:false}}"
+    },
+    "acroifsingleT{}{}": {
+      "snippet": "acroifsingleT{${1:true}}{${2:false}}"
+    },
+    "acroifsingleF{}{}": {
+      "snippet": "acroifsingleF{${1:true}}{${2:false}}"
+    },
+    "acrogroupcite": {},
+    "acroifchapterTF{}{}": {
+      "snippet": "acroifchapterTF{${1:true}}{${2:false}}"
+    },
+    "acroifchapterT{}{}": {
+      "snippet": "acroifchapterT{${1:true}}{${2:false}}"
+    },
+    "acroifchapterF{}{}": {
+      "snippet": "acroifchapterF{${1:true}}{${2:false}}"
+    },
+    "acroifpagesTF{}{}": {
+      "snippet": "acroifpagesTF{${1:true}}{${2:false}}"
+    },
+    "acroifpagesT{}{}": {
+      "snippet": "acroifpagesT{${1:true}}{${2:false}}"
+    },
+    "acroifpagesF{}{}": {
+      "snippet": "acroifpagesF{${1:true}}{${2:false}}"
+    },
+    "acropages{}{}": {
+      "snippet": "acropages{${1:first}}{${2:range}}"
+    },
+    "acronopagerange": {},
+    "acroneedpages": {},
+    "acropagefill": {},
+    "acronymsmap{}": {
+      "snippet": "acronymsmap{${1:code}}"
+    },
+    "acronymsmapTF{}{}{}": {
+      "snippet": "acronymsmapTF{${1:code}}{${2:true}}{${3:false}}"
+    },
+    "acronymsmapT{}{}{}": {
+      "snippet": "acronymsmapT{${1:code}}{${2:true}}{${3:false}}"
+    },
+    "acronymsmapF{}{}{}": {
+      "snippet": "acronymsmapF{${1:code}}{${2:true}}{${3:false}}"
+    },
+    "AcronymTable": {},
+    "AcroAddRow{}": {
+      "snippet": "AcroAddRow{${1:code}}"
+    },
+    "AcroNeedPackage{}": {
+      "snippet": "AcroNeedPackage{${1:package}}"
+    },
+    "AcroRerun": {},
+    "DeclareAcroEnding{}{}{}": {
+      "snippet": "DeclareAcroEnding{${1:name}}{${2:short default}}{${3:long default}}"
+    },
+    "DeclareAcroArticle{}{}": {
+      "snippet": "DeclareAcroArticle{${1:name}}{${2:default}}"
+    },
+    "DeclareAcroTranslation{}{}": {
+      "snippet": "DeclareAcroTranslation{${1:key}}{${2:language-translation list}}"
+    },
+    "AddAcroTranslations{}{}": {
+      "snippet": "AddAcroTranslations{${1:key}}{${2:language-translation list}}"
+    },
+    "DeclareAcroProperty{}": {
+      "snippet": "DeclareAcroProperty{${1:name}}"
+    },
+    "DeclareAcroProperty*{}": {
+      "snippet": "DeclareAcroProperty*{${1:name}}"
+    },
+    "DeclareAcroPropertyAlias{}{}": {
+      "snippet": "DeclareAcroPropertyAlias{${1:name1}}{${2:name2}}"
+    },
+    "MakeAcroPropertyAlias{}{}": {
+      "snippet": "MakeAcroPropertyAlias{${1:name1}}{${2:name2}}"
+    },
+    "NewAcroCommand{}{}{}": {
+      "snippet": "NewAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
+    },
+    "RenewAcroCommand{}{}{}": {
+      "snippet": "RenewAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
+    },
+    "DeclareAcroCommand{}{}{}": {
+      "snippet": "DeclareAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
+    },
+    "ProvideAcroCommand{}{}{}": {
+      "snippet": "ProvideAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
+    },
+    "UseAcroTemplate{}": {
+      "snippet": "UseAcroTemplate{${1:name}}"
+    },
+    "UseAcroTemplate[]{}[]": {
+      "snippet": "UseAcroTemplate[${2:type}]{${1:name}}[${3:argument number}]"
+    },
+    "acrocite": {},
+    "acrodonotuse": {},
+    "acroplural": {},
+    "acroindefinite": {},
+    "acroupper": {},
+    "acrofull": {},
+    "nospace": {},
+    "AcroModule{}{}": {
+      "snippet": "AcroModule{${1:name}}{${2:description}}"
+    },
+    "AcroModuleEnd": {},
+    "AcroStyle{}": {
+      "snippet": "AcroStyle{${1:name}}"
+    },
+    "AcroMap{}{}": {
+      "snippet": "AcroMap{${1:arg1}}{${2:arg2}}"
+    },
+    "acroloadstyle{}": {
+      "snippet": "acroloadstyle{${1:style}}"
+    },
+    "acsimple{}{}": {
+      "snippet": "acsimple{${1:arg1}}{${2:arg2}}"
+    },
+    "acfootnote{}": {
+      "snippet": "acfootnote{${1:arg}}"
+    },
+    "acgobbletrail": {},
+    "acroheading": {},
+    "acropreamble": {},
+    "acropostamble": {},
+    "acrofield{}{}": {
+      "snippet": "acrofield{${1:arg1}}{${2:arg2}}"
+    },
+    "acroprintfield{}{}": {
+      "snippet": "acroprintfield{${1:arg1}}{${2:arg2}}"
+    },
+    "acroiffieldTF{}{}{}{}": {
+      "snippet": "acroiffieldTF{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
+    },
+    "acroifanyfieldTF{}{}{}{}": {
+      "snippet": "acroifanyfieldTF{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
+    },
+    "acroifallfieldsTF{}{}{}{}": {
+      "snippet": "acroifallfieldsTF{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
+    },
+    "acroifpagefieldTF{}": {
+      "snippet": "acroifpagefieldTF{${1:arg}}"
+    },
+    "acroifpropertyTF{}": {
+      "snippet": "acroifpropertyTF{${1:arg}}"
+    },
+    "acroifpropertyT{}": {
+      "snippet": "acroifpropertyT{${1:arg}}"
+    },
+    "acroifpropertyF{}": {
+      "snippet": "acroifpropertyF{${1:arg}}"
+    },
+    "acshow{}": {
+      "snippet": "acshow{${1:id}}"
+    },
+    "acshow[]{}": {
+      "snippet": "acshow[${2:options}]{${1:id}}"
+    },
+    "acroendfootnote": {}
+  },
+  "envs": {},
+  "options": [
+    "upgrade"
+  ],
+  "keyvals": [
+    [
+      "case-sensitive",
+      "case-insensitive",
+      "first-style=",
+      "subsequent-style=",
+      "single-style=",
+      "single={${1:text}}",
+      "use-id-as-short",
+      "cite=[${1:prenote}][${2:postnote}]{${3:citation keys}}",
+      "index={${1:text}}",
+      "index-sort={${1:text}}",
+      "no-index",
+      "format={${1:code}}",
+      "short-format={${1:code}}",
+      "long-format={${1:code}}",
+      "first-long-format={${1:code}}",
+      "alt-format={${1:code}}",
+      "extra-format={${1:code}}",
+      "foreign-format={${1:code}}",
+      "single-format={${1:code}}",
+      "list-format={${1:code}}",
+      "%acroproperty"
+    ],
+    [
+      "template=",
+      "sort",
+      "display=",
+      "exclude={${1:csv list of tags}}",
+      "include={${1:csv list of tags}}",
+      "add",
+      "heading=",
+      "name={${1:text}}",
+      "preamble={${1:text}}",
+      "locale/display",
+      "local",
+      "pages={${1:keyvals}}"
+    ],
+    [
+      "case-sensitive",
+      "case-insensitive",
+      "use-id-as-short",
+      "first-style=",
+      "subsequent-style=",
+      "single",
+      "single-style=",
+      "list/template=",
+      "list/sort",
+      "list/display=",
+      "list/exclude={${1:csv list of tags}}",
+      "list/include={${1:csv list of tags}}",
+      "list/add",
+      "list/heading=",
+      "list/name={${1:text}}",
+      "list/preamble={${1:text}}",
+      "list/locale/display",
+      "list/local",
+      "list/foreign/display",
+      "pages/display=",
+      "pages/seq/use=",
+      "pages/seq/pre={${1:code}}",
+      "pages/seq/threshold=${1:number}",
+      "pages/fill={${1:code}}",
+      "pages/name",
+      "format={${1:code}}",
+      "format/short={${1:code}}",
+      "format/long={${1:code}}",
+      "format/first-long={${1:code}}",
+      "format/alt={${1:code}}",
+      "format/extra={${1:code}}",
+      "format/foreign={${1:code}}",
+      "format/list={${1:code}}",
+      "format/replace",
+      "short-plural-ending={${1:text}}",
+      "long-plural-ending={${1:text}}",
+      "foreign/display",
+      "locale/display",
+      "locale/format={${1:code}}",
+      "uppercase/first",
+      "uppercase/title",
+      "uppercase/all",
+      "uppercase/none",
+      "uppercase/cmd={${1:commands}}",
+      "uppercase/short",
+      "cite/cmd={${1:citation command}}",
+      "cite/group",
+      "cite/display=",
+      "cite/pre={${1:text}}",
+      "cite/group/cmd={${1:citation command}}",
+      "cite/group/pre={${1:text}}",
+      "index/use=",
+      "index/cmd={${1:index command}}",
+      "index/disable={${1:code}}",
+      "index/clear",
+      "barriers/use",
+      "barriers/reset",
+      "barriers/single",
+      "trailing/define=${1:token}{${2:name}}",
+      "trailing/activate={${1:list of token names}}",
+      "trailing/deactivate={${1:list of token names}}",
+      "make-links",
+      "link-only-first",
+      "pdfcomments/use",
+      "pdfcomments/cmd={${1:code}}",
+      "accsupp/use",
+      "accsupp/options={${1:accsupp options}}",
+      "accsupp/method={${1:method}}",
+      "language=",
+      "patch/floats",
+      "patch/list",
+      "patch/tabularx",
+      "patch/ltxtable",
+      "patch/tabu",
+      "patch/caption",
+      "patch/maketitle",
+      "load-style=${1:name}",
+      "templates/colspec={${1:value}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/acronym.json b/dev/packages/acronym.json
new file mode 100644
index 000000000..6730074ea
--- /dev/null
+++ b/dev/packages/acronym.json
@@ -0,0 +1,383 @@
+{
+  "includes": {
+    "suffix": [],
+    "xstring": [],
+    "relsize": [
+      "smaller"
+    ]
+  },
+  "macros": {
+    "ac*[]{}": {
+      "snippet": "ac*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Ac*[]{}": {
+      "snippet": "Ac*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "ac*{}": {
+      "snippet": "ac*{${1:acronym}}"
+    },
+    "Ac*{}": {
+      "snippet": "Ac*{${1:acronym}}"
+    },
+    "ac[]{}": {
+      "snippet": "ac[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Ac[]{}": {
+      "snippet": "Ac[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "ac{}": {
+      "snippet": "ac{${1:acronym}}"
+    },
+    "Ac{}": {
+      "snippet": "Ac{${1:acronym}}"
+    },
+    "acf*[]{}": {
+      "snippet": "acf*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acf*[]{}": {
+      "snippet": "Acf*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acf*{}": {
+      "snippet": "acf*{${1:acronym}}"
+    },
+    "Acf*{}": {
+      "snippet": "Acf*{${1:acronym}}"
+    },
+    "acf[]{}": {
+      "snippet": "acf[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acf[]{}": {
+      "snippet": "Acf[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acf{}": {
+      "snippet": "acf{${1:acronym}}"
+    },
+    "Acf{}": {
+      "snippet": "Acf{${1:acronym}}"
+    },
+    "acfa[]{}": {
+      "snippet": "acfa[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acfa[]{}": {
+      "snippet": "Acfa[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acfa{}": {
+      "snippet": "acfa{${1:acronym}}"
+    },
+    "Acfa{}": {
+      "snippet": "Acfa{${1:acronym}}"
+    },
+    "acffont{}": {
+      "snippet": "acffont{${1:text}}"
+    },
+    "acfi*[]{}": {
+      "snippet": "acfi*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acfi*[]{}": {
+      "snippet": "Acfi*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acfi*{}": {
+      "snippet": "acfi*{${1:acronym}}"
+    },
+    "Acfi*{}": {
+      "snippet": "Acfi*{${1:acronym}}"
+    },
+    "acfi[]{}": {
+      "snippet": "acfi[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acfi[]{}": {
+      "snippet": "Acfi[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acfi{}": {
+      "snippet": "acfi{${1:acronym}}"
+    },
+    "Acfi{}": {
+      "snippet": "Acfi{${1:acronym}}"
+    },
+    "acfia[]{}": {
+      "snippet": "acfia[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acfia[]{}": {
+      "snippet": "Acfia[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acfia{}": {
+      "snippet": "acfia{${1:acronym}}"
+    },
+    "Acfia{}": {
+      "snippet": "Acfia{${1:acronym}}"
+    },
+    "acfp*[]{}": {
+      "snippet": "acfp*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acfp*{}": {
+      "snippet": "acfp*{${1:acronym}}"
+    },
+    "acfp[]{}": {
+      "snippet": "acfp[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acfp[]{}": {
+      "snippet": "Acfp[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acfp{}": {
+      "snippet": "acfp{${1:acronym}}"
+    },
+    "Acfp{}": {
+      "snippet": "Acfp{${1:acronym}}"
+    },
+    "acfpa[]{}": {
+      "snippet": "acfpa[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acfpa[]{}": {
+      "snippet": "Acfpa[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acfpa{}": {
+      "snippet": "acfpa{${1:acronym}}"
+    },
+    "Acfpa{}": {
+      "snippet": "Acfpa{${1:acronym}}"
+    },
+    "acfsfont{}": {
+      "snippet": "acfsfont{${1:text}}"
+    },
+    "acl*[]{}": {
+      "snippet": "acl*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acl*[]{}": {
+      "snippet": "Acl*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acl*{}": {
+      "snippet": "acl*{${1:acronym}}"
+    },
+    "Acl*{}": {
+      "snippet": "Acl*{${1:acronym}}"
+    },
+    "acl[]{}": {
+      "snippet": "acl[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acl[]{}": {
+      "snippet": "Acl[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acl{}": {
+      "snippet": "acl{${1:acronym}}"
+    },
+    "Acl{}": {
+      "snippet": "Acl{${1:acronym}}"
+    },
+    "aclabelfont{}": {
+      "snippet": "aclabelfont{${1:text}}"
+    },
+    "aclp*[]{}": {
+      "snippet": "aclp*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Aclp*[]{}": {
+      "snippet": "Aclp*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "aclp*{}": {
+      "snippet": "aclp*{${1:acronym}}"
+    },
+    "Aclp*{}": {
+      "snippet": "Aclp*{${1:acronym}}"
+    },
+    "aclp[]{}": {
+      "snippet": "aclp[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Aclp[]{}": {
+      "snippet": "Aclp[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "aclp{}": {
+      "snippet": "aclp{${1:acronym}}"
+    },
+    "Aclp{}": {
+      "snippet": "Aclp{${1:acronym}}"
+    },
+    "aclu*[]{}": {
+      "snippet": "aclu*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Aclu*[]{}": {
+      "snippet": "Aclu*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "aclu*{}": {
+      "snippet": "aclu*{${1:acronym}}"
+    },
+    "Aclu*{}": {
+      "snippet": "Aclu*{${1:acronym}}"
+    },
+    "aclu[]{}": {
+      "snippet": "aclu[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Aclu[]{}": {
+      "snippet": "Aclu[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "aclu{}": {
+      "snippet": "aclu{${1:acronym}}"
+    },
+    "Aclu{}": {
+      "snippet": "Aclu{${1:acronym}}"
+    },
+    "aclua[]{}": {
+      "snippet": "aclua[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Aclua[]{}": {
+      "snippet": "Aclua[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "aclua{}": {
+      "snippet": "aclua{${1:acronym}}"
+    },
+    "Aclua{}": {
+      "snippet": "Aclua{${1:acronym}}"
+    },
+    "acp*[]{}": {
+      "snippet": "acp*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acp*[]{}": {
+      "snippet": "Acp*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acp*{}": {
+      "snippet": "acp*{${1:acronym}}"
+    },
+    "Acp*{}": {
+      "snippet": "Acp*{${1:acronym}}"
+    },
+    "acp[]{}": {
+      "snippet": "acp[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "Acp[]{}": {
+      "snippet": "Acp[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acp{}": {
+      "snippet": "acp{${1:acronym}}"
+    },
+    "Acp{}": {
+      "snippet": "Acp{${1:acronym}}"
+    },
+    "acresetall": {},
+    "acro{}[]{}": {
+      "snippet": "acro{${1:acronym}}[${2:short name}]{${3:full name}}"
+    },
+    "acro{}{}": {
+      "snippet": "acro{${1:acronym}}{${2:full name}}"
+    },
+    "acrodef{}[]{}": {
+      "snippet": "acrodef{${1:acronym}}[${2:short name}]{${3:full name}}"
+    },
+    "acrodef{}{}": {
+      "snippet": "acrodef{${1:acronym}}{${2:full name}}"
+    },
+    "acrodefindefinite{}{}{}": {
+      "snippet": "acrodefindefinite{${1:acronym}}{${2:short indefinite article}}{${3:long indefinite article}}"
+    },
+    "acrodefplural{}[]{}": {
+      "snippet": "acrodefplural{${1:acronym}}[${2:short plural name}]{${3:full plural name}}"
+    },
+    "acrodefplural{}{}": {
+      "snippet": "acrodefplural{${1:acronym}}{${2:full plural name}}"
+    },
+    "acroextra{}": {
+      "snippet": "acroextra{${1:additional info}}"
+    },
+    "acroindefinite{}{}{}": {
+      "snippet": "acroindefinite{${1:acronym}}{${2:short indefinite article}}{${3:long indefinite article}}"
+    },
+    "acroplural{}[]{}": {
+      "snippet": "acroplural{${1:acronym}}[${2:short plural name}]{${3:full plural name}}"
+    },
+    "acroplural{}{}": {
+      "snippet": "acroplural{${1:acronym}}{${2:full plural name}}"
+    },
+    "acs*[]{}": {
+      "snippet": "acs*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acs*{}": {
+      "snippet": "acs*{${1:acronym}}"
+    },
+    "acs[]{}": {
+      "snippet": "acs[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acs{}": {
+      "snippet": "acs{${1:acronym}}"
+    },
+    "acsfont{}": {
+      "snippet": "acsfont{${1:text}}"
+    },
+    "acsp*[]{}": {
+      "snippet": "acsp*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acsp*{}": {
+      "snippet": "acsp*{${1:acronym}}"
+    },
+    "acsp[]{}": {
+      "snippet": "acsp[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acsp{}": {
+      "snippet": "acsp{${1:acronym}}"
+    },
+    "acspa[]{}": {
+      "snippet": "acspa[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acspa{}": {
+      "snippet": "acspa{${1:acronym}}"
+    },
+    "acsu*[]{}": {
+      "snippet": "acsu*[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acsu*{}": {
+      "snippet": "acsu*{${1:acronym}}"
+    },
+    "acsu[]{}": {
+      "snippet": "acsu[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acsu{}": {
+      "snippet": "acsu{${1:acronym}}"
+    },
+    "acsua[]{}": {
+      "snippet": "acsua[${2:linebreak penalty}]{${1:acronym}}"
+    },
+    "acsua{}": {
+      "snippet": "acsua{${1:acronym}}"
+    },
+    "acused{}": {
+      "snippet": "acused{${1:acronym}}"
+    },
+    "iac{}": {
+      "snippet": "iac{${1:acronym}}"
+    },
+    "Iac{}": {
+      "snippet": "Iac{${1:acronym}}"
+    },
+    "newacro{}[]{}": {
+      "snippet": "newacro{${1:acronym}}[${2:short name}]{${3:full name}}"
+    },
+    "newacro{}{}": {
+      "snippet": "newacro{${1:acronym}}{${2:full name}}"
+    },
+    "newacroindefinite{}{}{}": {
+      "snippet": "newacroindefinite{${1:acronym}}{${2:short indefinite article}}{${3:long indefinite article}}"
+    },
+    "newacroplural{}[]{}": {
+      "snippet": "newacroplural{${1:acronym}}[${2:short plural name}]{${3:full plural name}}"
+    },
+    "newacroplural{}{}": {
+      "snippet": "newacroplural{${1:acronym}}{${2:full plural name}}"
+    }
+  },
+  "envs": {
+    "acronym": {},
+    "acronym[]": {
+      "name": "acronym",
+      "snippet": "[${1:longest}]"
+    }
+  },
+  "options": [
+    "footnote",
+    "nohyperlinks",
+    "noacroprefix",
+    "printonlyused",
+    "printonlyreused",
+    "withpage",
+    "smaller",
+    "dua",
+    "nolist",
+    "nolinebreak"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/addrset.json b/dev/packages/addrset.json
index 7281d7415..2ea476204 100644
--- a/dev/packages/addrset.json
+++ b/dev/packages/addrset.json
@@ -336,7 +336,7 @@
       "snippet": "sigacross{${1:number}}"
     },
     "siglist{}": {
-      "snippet": "siglist{${1:sig1,sig2,...}}"
+      "snippet": "siglist{${1:sig1,${2:sig2},...}}"
     },
     "signame{}": {
       "snippet": "signame{${1:name}}"
diff --git a/dev/packages/addtoluatexpath.json b/dev/packages/addtoluatexpath.json
index b925f27a6..1a3c530a5 100644
--- a/dev/packages/addtoluatexpath.json
+++ b/dev/packages/addtoluatexpath.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "addtoluatexpath{}": {
-      "snippet": "addtoluatexpath{${1:path1,path2,...}}"
+      "snippet": "addtoluatexpath{${1:path1,${2:path2},...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/aeb_pro.json b/dev/packages/aeb_pro.json
index 63db6d73e..7db80267e 100644
--- a/dev/packages/aeb_pro.json
+++ b/dev/packages/aeb_pro.json
@@ -453,6 +453,9 @@
     },
     "signatureSign": {},
     "certifyInvisibleSign": {},
+    "signatureSetSeedValue()": {
+      "snippet": "signatureSetSeedValue(${1:oSeedValue})"
+    },
     "declareImageAndPlacement{}": {
       "snippet": "declareImageAndPlacement{${1:keyvals}}",
       "keyvalindex": 6,
@@ -525,6 +528,9 @@
     "requiredVersionResult{}{}{}": {
       "snippet": "requiredVersionResult{${1:arg1}}{${2:arg2}}{${3:arg3}}"
     },
+    "retnAbsPathAs()": {
+      "snippet": "retnAbsPathAs(${1:arg})"
+    },
     "setLayoutMag{}": {
       "snippet": "setLayoutMag{${1:arg}}"
     },
diff --git a/dev/packages/aebxmp.json b/dev/packages/aebxmp.json
index 7743e8879..b7bf3fa12 100644
--- a/dev/packages/aebxmp.json
+++ b/dev/packages/aebxmp.json
@@ -8,7 +8,7 @@
       "snippet": "Authors{{${1:name1}}{${2:name2}...}}"
     },
     "Keywords{}": {
-      "snippet": "Keywords{${1:word1,word2,...}}"
+      "snippet": "Keywords{${1:word1,${2:word2},...}}"
     },
     "xmpDoNotInsKWScript": {},
     "copyrightStatus{}": {
@@ -45,10 +45,10 @@
       "snippet": "Subject{{[${1:lang1] text1}}{[${2:lang2] text2}...}}"
     },
     "metaLang{}": {
-      "snippet": "metaLang{${1:lang1,lang2,...}}"
+      "snippet": "metaLang{${1:lang1,${2:lang2},...}}"
     },
     "customProperties{{}{}": {
-      "snippet": "customProperties{{${1:name=name1,value=value1}}{${2:name=name2,value=value2}...}}"
+      "snippet": "customProperties{{${1:name=name1,${3:value=value1}}{${2:name=name2},value=value2}...}}"
     },
     "aKeywords": {},
     "arrayOfAuthors": {},
diff --git a/dev/packages/ajmacros.json b/dev/packages/ajmacros.json
new file mode 100644
index 000000000..3e595ac64
--- /dev/null
+++ b/dev/packages/ajmacros.json
@@ -0,0 +1,254 @@
+{
+  "includes": {
+    "otf": []
+  },
+  "macros": {
+    "ajTsumesuji{}": {
+      "snippet": "ajTsumesuji{${1:number}}"
+    },
+    "ajTsumesuji*{}": {
+      "snippet": "ajTsumesuji*{${1:number}}"
+    },
+    "ajTumesuji{}": {
+      "snippet": "ajTumesuji{${1:number}}"
+    },
+    "ajTumesuji*{}": {
+      "snippet": "ajTumesuji*{${1:number}}"
+    },
+    "ajMaru{}": {
+      "snippet": "ajMaru{${1:number}}"
+    },
+    "ajMaru*{}": {
+      "snippet": "ajMaru*{${1:number}}"
+    },
+    "ajKuroMaru{}": {
+      "snippet": "ajKuroMaru{${1:number}}"
+    },
+    "ajKuroMaru*{}": {
+      "snippet": "ajKuroMaru*{${1:number}}"
+    },
+    "ajKaku{}": {
+      "snippet": "ajKaku{${1:number}}"
+    },
+    "ajKaku*{}": {
+      "snippet": "ajKaku*{${1:number}}"
+    },
+    "ajKuroKaku{}": {
+      "snippet": "ajKuroKaku{${1:number}}"
+    },
+    "ajKuroKaku*{}": {
+      "snippet": "ajKuroKaku*{${1:number}}"
+    },
+    "ajMaruKaku{}": {
+      "snippet": "ajMaruKaku{${1:number}}"
+    },
+    "ajMaruKaku*{}": {
+      "snippet": "ajMaruKaku*{${1:number}}"
+    },
+    "ajKuroMaruKaku{}": {
+      "snippet": "ajKuroMaruKaku{${1:number}}"
+    },
+    "ajKuroMaruKaku*{}": {
+      "snippet": "ajKuroMaruKaku*{${1:number}}"
+    },
+    "ajKakko{}": {
+      "snippet": "ajKakko{${1:number}}"
+    },
+    "ajKakko*{}": {
+      "snippet": "ajKakko*{${1:number}}"
+    },
+    "ajRoman{}": {
+      "snippet": "ajRoman{${1:number}}"
+    },
+    "ajRoman*{}": {
+      "snippet": "ajRoman*{${1:number}}"
+    },
+    "ajroman{}": {
+      "snippet": "ajroman{${1:number}}"
+    },
+    "ajroman*{}": {
+      "snippet": "ajroman*{${1:number}}"
+    },
+    "ajPeriod{}": {
+      "snippet": "ajPeriod{${1:number}}"
+    },
+    "ajKakkoalph{}": {
+      "snippet": "ajKakkoalph{${1:number}}"
+    },
+    "ajKakkoYobi{}": {
+      "snippet": "ajKakkoYobi{${1:number}}"
+    },
+    "ajKakkoroman{}": {
+      "snippet": "ajKakkoroman{${1:number}}"
+    },
+    "ajKakkoRoman{}": {
+      "snippet": "ajKakkoRoman{${1:number}}"
+    },
+    "ajKakkoAlph{}": {
+      "snippet": "ajKakkoAlph{${1:number}}"
+    },
+    "ajKakkoHira{}": {
+      "snippet": "ajKakkoHira{${1:number}}"
+    },
+    "ajKakkoKata{}": {
+      "snippet": "ajKakkoKata{${1:number}}"
+    },
+    "ajKakkoKansuji{}": {
+      "snippet": "ajKakkoKansuji{${1:number}}"
+    },
+    "ajMaruKansuji{}": {
+      "snippet": "ajMaruKansuji{${1:number}}"
+    },
+    "ajNijuMaru{}": {
+      "snippet": "ajNijuMaru{${1:number}}"
+    },
+    "ajRecycle{}": {
+      "snippet": "ajRecycle{${1:number}}"
+    },
+    "ajHasenKakuAlph{}": {
+      "snippet": "ajHasenKakuAlph{${1:number}}"
+    },
+    "ajCross{}": {
+      "snippet": "ajCross{${1:number}}"
+    },
+    "ajSlanted{}": {
+      "snippet": "ajSlanted{${1:number}}"
+    },
+    "ajSlanted*{}": {
+      "snippet": "ajSlanted*{${1:number}}"
+    },
+    "ajApostrophe{}": {
+      "snippet": "ajApostrophe{${1:number}}"
+    },
+    "ajYear{}": {
+      "snippet": "ajYear{${1:number}}"
+    },
+    "ajSquareMark{}": {
+      "snippet": "ajSquareMark{${1:number}}"
+    },
+    "ajSquareMark*{}": {
+      "snippet": "ajSquareMark*{${1:number}}"
+    },
+    "ajHishi{}": {
+      "snippet": "ajHishi{${1:number}}"
+    },
+    "offsetalph": {},
+    "offsetAlph": {},
+    "offsetHira": {},
+    "offsetKata": {},
+    "offsetYobi": {},
+    "offsetMaru": {},
+    "offsetKuroMaru": {},
+    "offsetKaku": {},
+    "offsetKuroKaku": {},
+    "offsetMaruKaku": {},
+    "offsetKuroMaruKaku": {},
+    "ajMaruYobi{}": {
+      "snippet": "ajMaruYobi{${1:number}}"
+    },
+    "ajTsumekakko{}": {
+      "snippet": "ajTsumekakko{${1:number}}"
+    },
+    "ajTumekakko{}": {
+      "snippet": "ajTumekakko{${1:number}}"
+    },
+    "ajKosu{}": {
+      "snippet": "ajKosu{${1:number}}"
+    },
+    "ajFrac{}{}": {
+      "snippet": "ajFrac{${1:num}}{${2:denom}}"
+    },
+    "ajLig{}": {
+      "snippet": "ajLig{${1:characters}}"
+    },
+    "ajPICT{}": {
+      "snippet": "ajPICT{${1:name}}"
+    },
+    "ajPICTClub": {},
+    "ajPICTHeart": {},
+    "ajPICTSpade": {},
+    "ajPICTDiamond": {},
+    "ajArrow{}": {
+      "snippet": "ajArrow{${1:name}}"
+    },
+    "ajArrowLeftTriangle": {},
+    "ajArrowRightTriangle": {},
+    "ajArrowDOWN": {},
+    "ajArrowUP": {},
+    "ajArrowLEFT": {},
+    "ajArrowRIGHT": {},
+    "ajArrowRightHand": {},
+    "ajArrowLeftHand": {},
+    "ajArrowUpHand": {},
+    "ajArrowDownHand": {},
+    "ajArrowLeftScissors": {},
+    "ajArrowRightScissors": {},
+    "ajArrowUpScissors": {},
+    "ajArrowDownScissors": {},
+    "ajArrowLeft": {},
+    "ajArrowRight": {},
+    "ajArrowUp": {},
+    "ajArrowDown": {},
+    "ajArrowLeftDouble": {},
+    "ajArrowRightDown": {},
+    "ajArrowLeftDown": {},
+    "ajArrowLeftUp": {},
+    "ajArrowRightUp": {},
+    "ajArrowLeftAngle": {},
+    "ajArrowRightAngle": {},
+    "ajArrowUpAngle": {},
+    "ajArrowDownAngle": {},
+    "ajArrowRightDouble": {},
+    "ajArrowLeftRightDouble": {},
+    "ajKunten{}": {
+      "snippet": "ajKunten{${1:characters}}"
+    },
+    "DeclareOriginalKundokuStyle": {},
+    "DeclareOriginalKundokuStyle[]": {
+      "snippet": "DeclareOriginalKundokuStyle[${1:size commands}]"
+    },
+    "kokana{}{}": {
+      "snippet": "kokana{${1:arg1}}{${2:arg2}}"
+    },
+    "retenform": {},
+    "reten": {},
+    "retenkana{}": {
+      "snippet": "retenkana{${1:arg}}"
+    },
+    "kaeriten{}": {
+      "snippet": "kaeriten{${1:arg}}"
+    },
+    "kundokusize": {},
+    "DeclareAJKundokuStyle": {},
+    "DeclareAJKundokuStyle[]": {
+      "snippet": "DeclareAJKundokuStyle[${1:size commands}]"
+    },
+    "ajCIDVarDef{}{}": {
+      "snippet": "ajCIDVarDef{${1:char}}{${2:number}}"
+    },
+    "ajUTFVarDef{}{}": {
+      "snippet": "ajUTFVarDef{${1:char}}{${2:hex number}}"
+    },
+    "ajVar{}": {
+      "snippet": "ajVar{${1:char}}"
+    },
+    "ajHashigoTaka": {},
+    "ajTsuchiYoshi": {},
+    "ajTatsuSaki": {},
+    "ajMayuHama": {},
+    "ajLeader": {},
+    "ajLeader{}": {
+      "snippet": "ajLeader{${1:arg}}"
+    },
+    "ajLeader[]{}": {
+      "snippet": "ajLeader[${2:opt}]{${1:arg}}"
+    },
+    "ajQuotedef": {},
+    "ajQuote{}{}": {
+      "snippet": "ajQuote{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/algorithm2e.json b/dev/packages/algorithm2e.json
index 638aba744..567c2875f 100644
--- a/dev/packages/algorithm2e.json
+++ b/dev/packages/algorithm2e.json
@@ -428,6 +428,9 @@
     "Begin{}": {
       "snippet": "Begin{${1:block inside}}"
     },
+    "Begin(){}": {
+      "snippet": "Begin(${2:begin comment}){${1:block inside}}"
+    },
     "tcc{}": {
       "snippet": "tcc{${1:comments}}"
     },
@@ -449,90 +452,189 @@
     "If{}{}": {
       "snippet": "If{${1:condition}}{${2:then block}}"
     },
+    "If(){}{}": {
+      "snippet": "If(${3:then comment}){${1:condition}}{${2:then block}}"
+    },
     "uIf{}{}": {
       "snippet": "uIf{${1:condition}}{${2:then block without end}}"
     },
+    "uIf(){}{}": {
+      "snippet": "uIf(${3:then comment}){${1:condition}}{${2:then block without end}}"
+    },
     "lIf{}{}": {
       "snippet": "lIf{${1:condition}}{${2:then line}}"
     },
+    "lIf(){}{}": {
+      "snippet": "lIf(${3:if comment}){${1:condition}}{${2:then line}}"
+    },
     "ElseIf{}": {
       "snippet": "ElseIf{${1:elseif block}}"
     },
+    "ElseIf(){}": {
+      "snippet": "ElseIf(${2:elseif comment}){${1:elseif block}}"
+    },
     "uElseIf{}": {
       "snippet": "uElseIf{${1:elseif block without end}}"
     },
+    "uElseIf(){}": {
+      "snippet": "uElseIf(${2:elseif comment}){${1:elseif block without end}}"
+    },
     "lElseIf{}": {
       "snippet": "lElseIf{${1:elseif line}}"
     },
+    "lElseif(){}": {
+      "snippet": "lElseif(${2:elseif line}){${1:elseif block}}"
+    },
     "Else{}": {
       "snippet": "Else{${1:else block}}"
     },
+    "Else(){}": {
+      "snippet": "Else(${2:else comment}){${1:else block}}"
+    },
     "uElse{}": {
       "snippet": "uElse{${1:else block without end}}"
     },
+    "uElse(){}": {
+      "snippet": "uElse(${2:else block comment}){${1:else block without end}}"
+    },
     "lElse{}": {
       "snippet": "lElse{${1:else line}}"
     },
+    "lElse(){}": {
+      "snippet": "lElse(${2:else comment}){${1:else line}}"
+    },
     "eIf{}{}{}": {
       "snippet": "eIf{${1:condition}}{${2:then block}}{${3:else block}}"
     },
+    "eIf(){}{}(){}": {
+      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}(${5:else comment}){${3:else block}}"
+    },
+    "eIf(){}{}{}": {
+      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}{${3:else block}}"
+    },
+    "eIf{}{}(){}": {
+      "snippet": "eIf{${1:condition}}{${2:then block}}(${4:else comment}){${3:else block}}"
+    },
     "leIf{}{}{}": {
       "snippet": "leIf{${1:condition}}{${2:then line}}{${3:else line}}"
     },
+    "leIf(){}{}{}": {
+      "snippet": "leIf(${4:comment}){${1:condition}}{${2:then line}}{${3:else line}}"
+    },
+    "Switch(){}{}": {
+      "snippet": "Switch(${3:switch comment}){${1:condition}}{${2:switch block}}"
+    },
     "Switch{}{}": {
       "snippet": "Switch{${1:condition}}{${2:switch block}}"
     },
     "Case{}{}": {
       "snippet": "Case{${1:case}}{${2:case block}}"
     },
+    "Case(){}{}": {
+      "snippet": "Case(${3:case comment}){${1:case}}{${2:case block}}"
+    },
     "uCase{}{}": {
       "snippet": "uCase{${1:case}}{${2:case block without end}}"
     },
+    "uCase(){}{}": {
+      "snippet": "uCase(${3:case comment}){${1:case}}{${2:case block without end}}"
+    },
     "lCase{}{}": {
       "snippet": "lCase{${1:case}}{${2:case line}}"
     },
+    "lCase(){}{}": {
+      "snippet": "lCase(${3:case comment}){${1:case}}{${2:case line}}"
+    },
     "Other{}": {
       "snippet": "Other{${1:otherwise block}}"
     },
+    "Other(){}": {
+      "snippet": "Other(${2:other comment}){${1:otherwise block}}"
+    },
     "uOther{}": {
       "snippet": "uOther{${1:otherwise text}}"
     },
+    "uOther(){}": {
+      "snippet": "uOther(${2:other comment}){${1:otherwise text}}"
+    },
     "lOther{}": {
       "snippet": "lOther{${1:otherwise line}}"
     },
+    "lOther(){}": {
+      "snippet": "lOther(${2:other comment}){${1:otherwise line}}"
+    },
     "For{}{}": {
       "snippet": "For{${1:condition}}{${2:for block}}"
     },
+    "For(){}{}": {
+      "snippet": "For(${3:for comment}){${1:condition}}{${2:for block}}"
+    },
     "lFor{}{}": {
       "snippet": "lFor{${1:condition}}{${2:for line}}"
     },
+    "lFor(){}{}": {
+      "snippet": "lFor(${3:for comment}){${1:condition}}{${2:for line}}"
+    },
     "While{}{}": {
       "snippet": "While{${1:condition}}{${2:while block}}"
     },
+    "While(){}{}": {
+      "snippet": "While(${3:while comment}){${1:condition}}{${2:while block}}"
+    },
     "lWhile{}{}": {
       "snippet": "lWhile{${1:condition}}{${2:while line}}"
     },
+    "lWhile(){}{}": {
+      "snippet": "lWhile(${3:while comment}){${1:condition}}{${2:while line}}"
+    },
     "ForPar{}{}": {
       "snippet": "ForPar{${1:condition}}{${2:foreach block}}"
     },
+    "ForPar(){}{}": {
+      "snippet": "ForPar(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
+    },
     "ForEach{}{}": {
       "snippet": "ForEach{${1:condition}}{${2:foreach block}}"
     },
+    "ForEach(){}{}": {
+      "snippet": "ForEach(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
+    },
     "lForEach{}{}": {
       "snippet": "lForEach{${1:condition}}{${2:foreach line}}"
     },
+    "lForEach(){}{}": {
+      "snippet": "lForEach(${3:foreach comment}){${1:condition}}{${2:foreach line}}"
+    },
     "ForAll{}{}": {
       "snippet": "ForAll{${1:condition}}{${2:forall block}}"
     },
+    "ForAll(){}{}": {
+      "snippet": "ForAll(${3:forall comment}){${1:condition}}{${2:forall block}}"
+    },
     "lForAll{}{}": {
       "snippet": "lForAll{${1:condition}}{${2:forall line}}"
     },
+    "lForAll(){}{}": {
+      "snippet": "lForAll(${3:forall comment}){${1:condition}}{${2:forall line}}"
+    },
     "Repeat{}{}": {
       "snippet": "Repeat{${1:end condition}}{${2:repeat block}}"
     },
+    "Repeat(){}{}()": {
+      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}(${4:until comment})"
+    },
+    "Repeat(){}{}": {
+      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}"
+    },
+    "Repeat{}{}()": {
+      "snippet": "Repeat{${1:end condition}}{${2:repeat block}}(${3:until comment})"
+    },
     "lRepeat{}{}": {
       "snippet": "lRepeat{${1:end condition}}{${2:repeat line}}"
     },
+    "lRepeat(){}{}": {
+      "snippet": "lRepeat(${3:repeat comment}){${1:end condition}}{${2:repeat line}}"
+    },
     "SetKwInput{}{}": {
       "snippet": "SetKwInput{${1:csname}}{${2:name}}"
     },
diff --git a/dev/packages/alterqcm.json b/dev/packages/alterqcm.json
index 39dd92894..9fcf230cc 100644
--- a/dev/packages/alterqcm.json
+++ b/dev/packages/alterqcm.json
@@ -11,8 +11,11 @@
     "AQmessage{}": {
       "snippet": "AQmessage{${1:text}}"
     },
+    "AQms()": {
+      "snippet": "AQms(${1:height},${2:depth})"
+    },
     "InputQuestionList{}{}{}": {
-      "snippet": "InputQuestionList{${1:filepath}}{${2:prefix}}{${3:num1,num2,...}}"
+      "snippet": "InputQuestionList{${1:filepath}}{${2:prefix}}{${3:num1,${4:num2},...}}"
     },
     "AQannexe{}{}{}": {
       "snippet": "AQannexe{${1:start}}{${2:end}}{${3:number of props}}"
diff --git a/dev/packages/amsmath.json b/dev/packages/amsmath.json
new file mode 100644
index 000000000..b34849271
--- /dev/null
+++ b/dev/packages/amsmath.json
@@ -0,0 +1,348 @@
+{
+  "includes": {
+    "amstext": [],
+    "amsbsy": [],
+    "amsopn": []
+  },
+  "macros": {
+    "allowdisplaybreaks": {},
+    "allowdisplaybreaks[]": {
+      "snippet": "allowdisplaybreaks[${1:value}]"
+    },
+    "AmS": {},
+    "AmSfont": {},
+    "And": {},
+    "binom{}{}": {
+      "snippet": "binom{${1:above}}{${2:below}}"
+    },
+    "boxed{}": {
+      "snippet": "boxed{${1:formula}}"
+    },
+    "cfrac[]{}{}": {
+      "snippet": "cfrac[${3:align}]{${1:num}}{${2:den}}"
+    },
+    "cfrac{}{}": {
+      "snippet": "cfrac{${1:num}}{${2:den}}"
+    },
+    "dbinom{}{}": {
+      "snippet": "dbinom{${1:above}}{${2:below}}"
+    },
+    "ddddot{}": {
+      "snippet": "ddddot{${1:arg}}"
+    },
+    "dddot{}": {
+      "snippet": "dddot{${1:arg}}"
+    },
+    "dfrac{}{}": {
+      "snippet": "dfrac{${1:num}}{${2:den}}"
+    },
+    "displaybreak": {},
+    "displaybreak[]": {
+      "snippet": "displaybreak[${1:value}]"
+    },
+    "DOTSB": {},
+    "DOTSI": {},
+    "DOTSX": {},
+    "dotsb": {},
+    "dotsc": {},
+    "dotsi": {},
+    "dotsm": {},
+    "dotso": {},
+    "endmathdisplay{}": {
+      "snippet": "endmathdisplay{${1:envname}}"
+    },
+    "eqref{}": {
+      "snippet": "eqref{${1:label}}"
+    },
+    "genfrac{}{}{}{}{}{}": {
+      "snippet": "genfrac{${1:left-delim}}{${2:right-delim}}{${3:thickness}}{${4:mathstyle}}{${5:numerator}}{${6:denominator}}"
+    },
+    "hdots": {},
+    "hdotsfor{}": {
+      "snippet": "hdotsfor{${1:columns}}"
+    },
+    "hdotsfor[]{}": {
+      "snippet": "hdotsfor[${2:multiplier}]{${1:columns}}"
+    },
+    "idotsint": {},
+    "iiiint": {
+      "detail": "⨌",
+      "documentation": "QUADRUPLE INTEGRAL OPERATOR"
+    },
+    "iiint": {
+      "detail": "∭",
+      "documentation": "TRIPLE INTEGRAL operator"
+    },
+    "iint": {
+      "detail": "∬",
+      "documentation": "DOUBLE INTEGRAL operator"
+    },
+    "impliedby": {
+      "detail": "⟸",
+      "documentation": "LONG LEFTWARDS DOUBLE ARROW"
+    },
+    "implies": {
+      "detail": "⟹",
+      "documentation": "LONG RIGHTWARDS DOUBLE ARROW"
+    },
+    "intertext{}": {
+      "snippet": "intertext{${1:word or phrase}}"
+    },
+    "leftroot{}": {
+      "snippet": "leftroot{${1:argument}}"
+    },
+    "lvert": {},
+    "lVert": {},
+    "mathaccentV": {},
+    "mathdisplay{}": {
+      "snippet": "mathdisplay{${1:envname}}"
+    },
+    "mintagsep": {},
+    "minalignsep": {},
+    "mod": {},
+    "mspace{}": {
+      "snippet": "mspace{${1:dimen}}"
+    },
+    "MultiIntegral{}": {
+      "snippet": "MultiIntegral{${1:integer}}"
+    },
+    "multlinegap": {},
+    "multlinetaggap": {},
+    "nobreakdash": {},
+    "notag": {},
+    "numberwithin{}{}": {
+      "snippet": "numberwithin{${1:counter}}{${2:within-counter}}"
+    },
+    "numberwithin[]{}{}": {
+      "snippet": "numberwithin[${3:format}]{${1:counter}}{${2:within-counter}}"
+    },
+    "overleftrightarrow{}": {
+      "snippet": "overleftrightarrow{${1:argument}}"
+    },
+    "overset{}{}": {
+      "snippet": "overset{${1:superscript}}{${2:argument}}"
+    },
+    "overunderset{}{}{}": {
+      "snippet": "overunderset{${1:superscript}}{${2:subscript}}{${3:argument}}"
+    },
+    "pod": {},
+    "raisetag{}": {
+      "snippet": "raisetag{${1:dimen}}"
+    },
+    "rvert": {},
+    "rVert": {},
+    "shoveright{}": {
+      "snippet": "shoveright{${1:arg}}"
+    },
+    "shoveleft{}": {
+      "snippet": "shoveleft{${1:arg}}"
+    },
+    "sideset{}{}{}": {
+      "snippet": "sideset{${1:left}}{${2:right}}{${3:symbol}}"
+    },
+    "smash{}": {
+      "snippet": "smash{${1:argument}}"
+    },
+    "smash[]{}": {
+      "snippet": "smash[${2:valign}]{${1:argument}}"
+    },
+    "substack{}": {
+      "snippet": "substack{${1:argument}}"
+    },
+    "tag{}": {
+      "snippet": "tag{${1:label}}"
+    },
+    "tag*{}": {
+      "snippet": "tag*{${1:label}}"
+    },
+    "tbinom{}{}": {
+      "snippet": "tbinom{${1:above}}{${2:below}}"
+    },
+    "tfrac{}{}": {
+      "snippet": "tfrac{${1:num}}{${2:den}}"
+    },
+    "theparentequation": {},
+    "thetag": {},
+    "underleftarrow{}": {
+      "snippet": "underleftarrow{${1:argument}}"
+    },
+    "underleftrightarrow{}": {
+      "snippet": "underleftrightarrow{${1:argument}}"
+    },
+    "underrightarrow{}": {
+      "snippet": "underrightarrow{${1:argument}}"
+    },
+    "underset{}{}": {
+      "snippet": "underset{${1:subscript}}{${2:argument}}"
+    },
+    "uproot{}": {
+      "snippet": "uproot{${1:argument}}"
+    },
+    "varDelta": {
+      "detail": "𝛥",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL DELTA"
+    },
+    "varGamma": {
+      "detail": "𝛤",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL GAMMA"
+    },
+    "varLambda": {
+      "detail": "𝛬",
+      "documentation": "mathematical italic capital lambda"
+    },
+    "varOmega": {
+      "detail": "𝛺",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL OMEGA"
+    },
+    "varPhi": {
+      "detail": "𝛷",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL PHI"
+    },
+    "varPi": {
+      "detail": "𝛱",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL PI"
+    },
+    "varPsi": {
+      "detail": "𝛹",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL PSI"
+    },
+    "varSigma": {
+      "detail": "𝛴",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL SIGMA"
+    },
+    "varTheta": {
+      "detail": "𝛩",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL THETA"
+    },
+    "varUpsilon": {
+      "detail": "𝛶",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL UPSILON"
+    },
+    "varXi": {
+      "detail": "𝛯",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL XI"
+    },
+    "veqno{}": {
+      "snippet": "veqno{${1:eqn num}}"
+    },
+    "xleftarrow[]{}": {
+      "snippet": "xleftarrow[${2:subscript}]{${1:superscript}}"
+    },
+    "xleftarrow{}": {
+      "snippet": "xleftarrow{${1:superscript}}"
+    },
+    "xrightarrow[]{}": {
+      "snippet": "xrightarrow[${2:subscript}]{${1:superscript}}"
+    },
+    "xrightarrow{}": {
+      "snippet": "xrightarrow{${1:superscript}}"
+    },
+    "Hat{}": {
+      "snippet": "Hat{${1:arg}}"
+    },
+    "Check{}": {
+      "snippet": "Check{${1:arg}}"
+    },
+    "Tilde{}": {
+      "snippet": "Tilde{${1:arg}}"
+    },
+    "Acute{}": {
+      "snippet": "Acute{${1:arg}}"
+    },
+    "Grave{}": {
+      "snippet": "Grave{${1:arg}}"
+    },
+    "Dot{}": {
+      "snippet": "Dot{${1:arg}}"
+    },
+    "Ddot{}": {
+      "snippet": "Ddot{${1:arg}}"
+    },
+    "Breve{}": {
+      "snippet": "Breve{${1:arg}}"
+    },
+    "Bar{}": {
+      "snippet": "Bar{${1:arg}}"
+    },
+    "Vec{}": {
+      "snippet": "Vec{${1:arg}}"
+    }
+  },
+  "envs": {
+    "align": {},
+    "align*": {},
+    "alignat[]{}": {
+      "name": "alignat",
+      "snippet": "[${2:alignment}]{${1:ncols}}"
+    },
+    "alignat*[]{}": {
+      "name": "alignat*",
+      "snippet": "[${2:alignment}]{${1:ncols}}"
+    },
+    "alignat{}": {
+      "name": "alignat",
+      "snippet": "{${1:ncols}}"
+    },
+    "alignat*{}": {
+      "name": "alignat*",
+      "snippet": "{${1:ncols}}"
+    },
+    "aligned": {},
+    "aligned[]": {
+      "name": "aligned",
+      "snippet": "[${1:alignment}]"
+    },
+    "alignedat{}": {
+      "name": "alignedat",
+      "snippet": "{${1:ncols}}"
+    },
+    "bmatrix": {},
+    "Bmatrix": {},
+    "cases": {},
+    "equation*": {},
+    "flalign": {},
+    "flalign*": {},
+    "gather": {},
+    "gather*": {},
+    "gathered": {},
+    "gathered[]": {
+      "name": "gathered",
+      "snippet": "[${1:alignment}]"
+    },
+    "matrix": {},
+    "multline": {},
+    "multline*": {},
+    "pmatrix": {},
+    "smallmatrix": {},
+    "split": {},
+    "subarray": {},
+    "subarray{}": {
+      "name": "subarray",
+      "snippet": "{${1:align}}"
+    },
+    "subequations": {},
+    "vmatrix": {},
+    "Vmatrix": {},
+    "xalignat": {},
+    "xalignat*": {},
+    "xxalignat": {}
+  },
+  "options": [
+    "intlimits",
+    "nointlimits",
+    "sumlimits",
+    "nosumlimits",
+    "namelimits",
+    "nonamelimits",
+    "leqno",
+    "reqno",
+    "centertags",
+    "tbtags",
+    "cmex10",
+    "fleqn",
+    "alignedleftspaceyes",
+    "alignedleftspaceno",
+    "alignedleftspaceyesifneg"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/answers.json b/dev/packages/answers.json
new file mode 100644
index 000000000..5e358c943
--- /dev/null
+++ b/dev/packages/answers.json
@@ -0,0 +1,57 @@
+{
+  "includes": {
+    "verbatim": []
+  },
+  "macros": {
+    "Newassociation{}{}{}": {
+      "snippet": "Newassociation{${1:envname}}{${2:name}}{${3:file}}"
+    },
+    "solutionextension": {},
+    "Opensolutionfile{}": {
+      "snippet": "Opensolutionfile{${1:file}}"
+    },
+    "Opensolutionfile{}[]": {
+      "snippet": "Opensolutionfile{${1:file}}[${2:prefix}]"
+    },
+    "Closesolutionfile{}": {
+      "snippet": "Closesolutionfile{${1:file}}"
+    },
+    "Writetofile{}{}": {
+      "snippet": "Writetofile{${1:file}}{${2:text}}"
+    },
+    "Readsolutionfile{}": {
+      "snippet": "Readsolutionfile{${1:file}}"
+    },
+    "Currentlabel": {},
+    "Ifanswerfiles{}{}": {
+      "snippet": "Ifanswerfiles{${1:true}}{${2:false}}"
+    },
+    "Iffileundefined{}{}{}": {
+      "snippet": "Iffileundefined{${1:file}}{${2:true}}{${3:false}}"
+    },
+    "Ifopen{}{}{}": {
+      "snippet": "Ifopen{${1:file}}{${2:true}}{${3:false}}"
+    },
+    "Tmp": {},
+    "newsolution{}": {
+      "snippet": "newsolution{${1:name}}"
+    },
+    "solutionpoint": {},
+    "solutionstyle{}": {
+      "snippet": "solutionstyle{${1:text}}"
+    },
+    "ifanswerfiles": {},
+    "answerfilestrue": {},
+    "answerfilesfalse": {}
+  },
+  "envs": {
+    "Filesave{}": {
+      "name": "Filesave",
+      "snippet": "{${1:file}}"
+    }
+  },
+  "options": [
+    "nosolutionfiles"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ar.json b/dev/packages/ar.json
new file mode 100644
index 000000000..19ee2c610
--- /dev/null
+++ b/dev/packages/ar.json
@@ -0,0 +1,30 @@
+{
+  "includes": {},
+  "macros": {
+    "ifCM": {},
+    "CMtrue": {},
+    "CMfalse": {},
+    "ifTM": {},
+    "TMtrue": {},
+    "TMfalse": {},
+    "ifPA": {},
+    "PAtrue": {},
+    "PAfalse": {},
+    "AR": {},
+    "ARb": {},
+    "ARss": {},
+    "ARssb": {},
+    "ARtt": {},
+    "ARm": {},
+    "ARmb": {}
+  },
+  "envs": {},
+  "options": [
+    "CM",
+    "TM",
+    "TC",
+    "PA",
+    "PX"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/argumentation.json b/dev/packages/argumentation.json
index c739557da..e9c56b8c0 100644
--- a/dev/packages/argumentation.json
+++ b/dev/packages/argumentation.json
@@ -1,5 +1,7 @@
 {
   "includes": {
+    "amsbsy": [],
+    "amsmath": [],
     "pgfopts": [],
     "tikz": [],
     "tikzlibrarypositioning": [],
@@ -15,11 +17,20 @@
     "setsupportstyle{}": {
       "snippet": "setsupportstyle{${1:style}}"
     },
-    "argument{}{}": {
-      "snippet": "argument{${1:id}}{${2:name}}"
+    "setannotationstyle{}": {
+      "snippet": "setannotationstyle{${1:style}}"
     },
-    "argument[]{}{}": {
-      "snippet": "argument[${3:options}]{${1:id}}{${2:name}}"
+    "argument{}": {
+      "snippet": "argument{${1:name}}"
+    },
+    "argument(){}": {
+      "snippet": "argument(${2:id}){${1:name}}"
+    },
+    "argument[](){}": {
+      "snippet": "argument[${2:options}](${3:id}){${1:name}}"
+    },
+    "argument[]{}": {
+      "snippet": "argument[${2:options}]{${1:name}}"
     },
     "attack{}{}": {
       "snippet": "attack{${1:id1}}{${2:id2}}"
@@ -51,11 +62,17 @@
     "annotatedattack[]{}{}{}": {
       "snippet": "annotatedattack[${4:options}]{${1:id1}}{${2:id2}}{${3:value}}"
     },
-    "afname{}{}": {
-      "snippet": "afname{${1:id}}{${2:name}}"
+    "afname{}": {
+      "snippet": "afname{${1:name}}"
+    },
+    "afname(){}": {
+      "snippet": "afname(${2:id}){${1:name}}"
     },
-    "afname[]{}{}": {
-      "snippet": "afname[${3:options}]{${1:id}}{${2:name}}"
+    "afname[](){}": {
+      "snippet": "afname[${2:options}](${3:id}){${1:name}}"
+    },
+    "afname[]{}": {
+      "snippet": "afname[${2:options}]{${1:name}}"
     },
     "annotation{}{}": {
       "snippet": "annotation{${1:id}}{${2:text}}"
@@ -65,7 +82,9 @@
     },
     "argstyle{}": {
       "snippet": "argstyle{${1:text}}"
-    }
+    },
+    "theaf": {},
+    "theargument": {}
   },
   "envs": {
     "af": {},
diff --git a/dev/packages/array.json b/dev/packages/array.json
new file mode 100644
index 000000000..c65eebabc
--- /dev/null
+++ b/dev/packages/array.json
@@ -0,0 +1,20 @@
+{
+  "includes": {},
+  "macros": {
+    "arraybackslash": {},
+    "extrarowheight": {},
+    "extratabsurround": {},
+    "firsthline": {},
+    "lasthline": {},
+    "newcolumntype{}{}": {
+      "snippet": "newcolumntype{${1:name}}{${2:definition}}"
+    },
+    "newcolumntype{}[]{}": {
+      "snippet": "newcolumntype{${1:name}}[${2:args}]{${3:definition}}"
+    },
+    "showcols": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/arrayjobx.json b/dev/packages/arrayjobx.json
index a66590e76..db0d42d45 100644
--- a/dev/packages/arrayjobx.json
+++ b/dev/packages/arrayjobx.json
@@ -19,6 +19,15 @@
     "ifexpandarrayelement": {},
     "expandarrayelementtrue": {},
     "expandarrayelementfalse": {},
+    "arrayx{}()": {
+      "snippet": "arrayx{${1:array name}}(${2:index})"
+    },
+    "clrarray{}()": {
+      "snippet": "clrarray{${1:array name}}(${2:index})"
+    },
+    "testarray{}()": {
+      "snippet": "testarray{${1:array name}}(${2:index})"
+    },
     "EntryArrayJob": {}
   },
   "envs": {},
diff --git a/dev/packages/arsclassica.json b/dev/packages/arsclassica.json
new file mode 100644
index 000000000..b4a779a13
--- /dev/null
+++ b/dev/packages/arsclassica.json
@@ -0,0 +1,22 @@
+{
+  "includes": {
+    "classicthesis": [],
+    "caption": [],
+    "soul": [],
+    "titlesec": []
+  },
+  "macros": {
+    "formatchapter{}": {
+      "snippet": "formatchapter{${1:text}}"
+    },
+    "allcapsspacing{}": {
+      "snippet": "allcapsspacing{${1:text}}"
+    },
+    "lowsmallcapsspacing{}": {
+      "snippet": "lowsmallcapsspacing{${1:text}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ascmac.json b/dev/packages/ascmac.json
new file mode 100644
index 000000000..bd25c1427
--- /dev/null
+++ b/dev/packages/ascmac.json
@@ -0,0 +1,9 @@
+{
+  "includes": {
+    "tascmac": []
+  },
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/assoccnt.json b/dev/packages/assoccnt.json
new file mode 100644
index 000000000..215ed8875
--- /dev/null
+++ b/dev/packages/assoccnt.json
@@ -0,0 +1,96 @@
+{
+  "includes": {
+    "xcolor": [],
+    "etoolbox": [],
+    "xkeyval": [],
+    "xstring": []
+  },
+  "macros": {
+    "setcounter{}{}": {
+      "snippet": "setcounter{${1:counter}}{${2:value}}"
+    },
+    "setcounter[]{}{}": {
+      "snippet": "setcounter[${3:options}]{${1:counter}}{${2:value}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "DeclareAssociatedCounters{}{}": {
+      "snippet": "DeclareAssociatedCounters{${1:driver counter}}{${2:associated counters list}}"
+    },
+    "AddAssociatedCounters{}{}": {
+      "snippet": "AddAssociatedCounters{${1:driver counter}}{${2:associated counters list}}"
+    },
+    "RemoveAssociatedCounter{}{}": {
+      "snippet": "RemoveAssociatedCounter{${1:driver counter}}{${2:associated counter}}"
+    },
+    "RemoveAssociatedCounters{}{}": {
+      "snippet": "RemoveAssociatedCounters{${1:driver counter}}{${2:associated counters list}}"
+    },
+    "ClearAssociatedCounters{}": {
+      "snippet": "ClearAssociatedCounters{${1:driver counter}}"
+    },
+    "AddDriverCounter{}": {
+      "snippet": "AddDriverCounter{${1:driver counter name}}"
+    },
+    "ClearDriverCounter": {},
+    "IsAssociatedToCounter{}{}{}{}": {
+      "snippet": "IsAssociatedToCounter{${1:driver counter}}{${2:associated counter}}{${3:true}}{${4:false}}"
+    },
+    "GetDriverCounter{}": {
+      "snippet": "GetDriverCounter{${1:counter}}"
+    },
+    "IsAssociatedCounter{}{}{}": {
+      "snippet": "IsAssociatedCounter{${1:counter}}{${2:true}}{${3:false}}"
+    },
+    "IsDriverCounter{}{}{}": {
+      "snippet": "IsDriverCounter{${1:driver counter}}{${2:true}}{${3:false}}"
+    },
+    "IsSuspendedCounter{}{}{}": {
+      "snippet": "IsSuspendedCounter{${1:counter}}{${2:true}}{${3:false}}"
+    },
+    "AssociatedDriverCounterInfo{}": {
+      "snippet": "AssociatedDriverCounterInfo{${1:counter}}"
+    },
+    "LastAddedToCounter": {},
+    "LastSteppedCounter": {},
+    "LastRefSteppedCounter": {},
+    "LastSetCounter": {},
+    "PrettyPrintCounterName{}": {
+      "snippet": "PrettyPrintCounterName{${1:counter}}"
+    },
+    "PrettyPrintCounterName[]{}": {
+      "snippet": "PrettyPrintCounterName[${2:options}]{${1:counter}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "GeneralCounterInfoColor": {},
+    "DriverCounterInfoColor": {},
+    "AssociatedCounterInfoColor": {},
+    "SuspendCounters{}": {
+      "snippet": "SuspendCounters{${1:counters list}}"
+    },
+    "ResumeSuspendedCounters": {},
+    "AssociationStatistics": {},
+    "ClearAssociatedCountersList{}": {
+      "snippet": "ClearAssociatedCountersList{${1:associated counters list}}"
+    },
+    "ClearDriverCountersList": {},
+    "IsInResetList{}{}{}{}": {
+      "snippet": "IsInResetList{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
+    },
+    "assoccntpackageversion": {}
+  },
+  "envs": {},
+  "options": [
+    "globalsuspend"
+  ],
+  "keyvals": [
+    [
+      "AssociatedToo",
+      "AssociatedCounters={${1:list of counters}}"
+    ],
+    [
+      "countertype="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/assurelatexmode.json b/dev/packages/assurelatexmode.json
index 2e9cd37b7..1f10601c2 100644
--- a/dev/packages/assurelatexmode.json
+++ b/dev/packages/assurelatexmode.json
@@ -3,18 +3,63 @@
     "chemstr": []
   },
   "macros": {
+    "HashWedgeAsSubst()(){}": {
+      "snippet": "HashWedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "HashWedgeAsSubstTeXLaTeX()(){}": {
+      "snippet": "HashWedgeAsSubstTeXLaTeX(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "HashWedgeAsSubstX()()": {
+      "snippet": "HashWedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "HashWedgeAsSubstX()()[]": {
+      "snippet": "HashWedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
+    },
+    "HashWedgeAsSubstXTeXLaTeX()()": {
+      "snippet": "HashWedgeAsSubstXTeXLaTeX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "HashWedgeAsSubstXTeXLaTeX()()[]": {
+      "snippet": "HashWedgeAsSubstXTeXLaTeX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
+    },
+    "PutBondLine()(){}": {
+      "snippet": "PutBondLine(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
+    },
+    "PutDashedBond()(){}": {
+      "snippet": "PutDashedBond(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
+    },
+    "PutTeXLaTeXLine()(){}": {
+      "snippet": "PutTeXLaTeXLine(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
+    },
+    "PutTeXLaTeXdashed()(){}": {
+      "snippet": "PutTeXLaTeXdashed(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
+    },
+    "WedgeAsSubst()(){}": {
+      "snippet": "WedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "WedgeAsSubstTeXLaTeX()(){}": {
+      "snippet": "WedgeAsSubstTeXLaTeX(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "WedgeAsSubstX()()": {
+      "snippet": "WedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "WedgeAsSubstX()()[]": {
+      "snippet": "WedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
+    },
+    "WedgeAsSubstXTeXLaTeX()()": {
+      "snippet": "WedgeAsSubstXTeXLaTeX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
     "dashhasheddash": {},
     "putRoundArrow{}": {
-      "snippet": "putRoundArrow{${1:(${2:x1,y1})(${3:x2,y2})...}}"
+      "snippet": "putRoundArrow{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
     },
     "putRoundArrow[]{}": {
-      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
+      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
     },
     "putRoundArrowTeXLaTeX{}": {
-      "snippet": "putRoundArrowTeXLaTeX{${1:(${2:x1,y1})(${3:x2,y2})...}}"
+      "snippet": "putRoundArrowTeXLaTeX{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
     },
     "putRoundArrowTeXLaTeX[]{}": {
-      "snippet": "putRoundArrowTeXLaTeX[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
+      "snippet": "putRoundArrowTeXLaTeX[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
     },
     "thickLineWidth": {},
     "thicklines": {},
diff --git a/dev/packages/asyalign.json b/dev/packages/asyalign.json
index 8eeb1f9b1..c6420442e 100644
--- a/dev/packages/asyalign.json
+++ b/dev/packages/asyalign.json
@@ -8,6 +8,15 @@
     "ASYbase{}{}": {
       "snippet": "ASYbase{${1:arg1}}{${2:arg2}}"
     },
+    "ASYaligned()(){}{}{}": {
+      "snippet": "ASYaligned(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "ASYalignT()(){}{}": {
+      "snippet": "ASYalignT(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:arg1}}{${2:arg2}}"
+    },
+    "ASYalign()(){}": {
+      "snippet": "ASYalign(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:arg}}"
+    },
     "ASYraw{}": {
       "snippet": "ASYraw{${1:arg}}"
     }
diff --git a/dev/packages/asyfig.json b/dev/packages/asyfig.json
new file mode 100644
index 000000000..b9248ed92
--- /dev/null
+++ b/dev/packages/asyfig.json
@@ -0,0 +1,31 @@
+{
+  "includes": {
+    "asyalign": [],
+    "color": [],
+    "ifmtarg": [],
+    "ifpdf": [],
+    "ifplatform": [],
+    "import": [],
+    "graphicx": [],
+    "pdftexcmds": [],
+    "suffix": [],
+    "xkeyval": [],
+    "asyprocess": []
+  },
+  "macros": {
+    "asyfig{}": {
+      "snippet": "asyfig{${1:file}}"
+    },
+    "asyfig*{}": {
+      "snippet": "asyfig*{${1:file}}"
+    },
+    "asypath{}": {
+      "snippet": "asypath{${1:path}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "process="
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/at.json b/dev/packages/at.json
new file mode 100644
index 000000000..54c8a4877
--- /dev/null
+++ b/dev/packages/at.json
@@ -0,0 +1,19 @@
+{
+  "includes": {},
+  "macros": {
+    "atallowdigits": {},
+    "atdisallowdigits": {},
+    "atdef": {},
+    "atshow": {},
+    "atlet": {},
+    "at": {},
+    "atoff": {},
+    "aton": {}
+  },
+  "envs": {},
+  "options": [
+    "digits",
+    "nodigits"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/atbegshi.json b/dev/packages/atbegshi.json
new file mode 100644
index 000000000..946f5aa0d
--- /dev/null
+++ b/dev/packages/atbegshi.json
@@ -0,0 +1,40 @@
+{
+  "includes": {
+    "infwarerr": [],
+    "ltxcmds": [],
+    "iftex": []
+  },
+  "macros": {
+    "AtBeginShipout{}": {
+      "snippet": "AtBeginShipout{${1:code}}"
+    },
+    "AtBeginShipoutAddToBox{}": {
+      "snippet": "AtBeginShipoutAddToBox{${1:code}}"
+    },
+    "AtBeginShipoutAddToBoxForeground{}": {
+      "snippet": "AtBeginShipoutAddToBoxForeground{${1:code}}"
+    },
+    "AtBeginShipoutBox": {},
+    "AtBeginShipoutBoxDepth": {},
+    "AtBeginShipoutBoxHeight": {},
+    "AtBeginShipoutBoxWidth": {},
+    "AtBeginShipoutDiscard": {},
+    "AtBeginShipoutFirst{}": {
+      "snippet": "AtBeginShipoutFirst{${1:code}}"
+    },
+    "AtBeginShipoutInit": {},
+    "AtBeginShipoutNext{}": {
+      "snippet": "AtBeginShipoutNext{${1:code}}"
+    },
+    "AtBeginShipoutOriginalShipout": {},
+    "AtBeginShipoutUpperLeft{}": {
+      "snippet": "AtBeginShipoutUpperLeft{${1:code}}"
+    },
+    "AtBeginShipoutUpperLeftForeground{}": {
+      "snippet": "AtBeginShipoutUpperLeftForeground{${1:code}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/autoaligne.json b/dev/packages/autoaligne.json
index a17ac20f7..3c8e2d834 100644
--- a/dev/packages/autoaligne.json
+++ b/dev/packages/autoaligne.json
@@ -9,6 +9,9 @@
     "autoaligne[]{}": {
       "snippet": "autoaligne[${2:hor_align}]{${1:eq1\\\\eq2\\\\...}}"
     },
+    "autoaligne[](){}": {
+      "snippet": "autoaligne[${2:hor_align}](${3:vert_align}){${1:eq1\\\\eq2\\\\...}}"
+    },
     "egaldevantmembrevide": {},
     "aavcoeff{}": {
       "snippet": "aavcoeff{${1:value}}"
diff --git a/dev/packages/axodraw2.json b/dev/packages/axodraw2.json
index 7c28db0bc..2aa159fc1 100644
--- a/dev/packages/axodraw2.json
+++ b/dev/packages/axodraw2.json
@@ -22,21 +22,773 @@
       "detail": "𝐶",
       "documentation": "MATHEMATICAL ITALIC CAPITAL C"
     },
+    "AxoGrid()()(){}{}": {
+      "snippet": "AxoGrid(${3:x},${4:y})(${5:xsize},${6:ysize})(${7:xdivs},${8:ydivs}){${1:color}}{${2:linewidth}}"
+    },
+    "Line()()": {
+      "snippet": "Line(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "Line[]()()": {
+      "snippet": "Line[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "DoubleLine()(){}": {
+      "snippet": "DoubleLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:linesep}}"
+    },
+    "DoubleLine[]()(){}": {
+      "snippet": "DoubleLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "DashLine()(){}": {
+      "snippet": "DashLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "DashLine[]()(){}": {
+      "snippet": "DashLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "DashDoubleLine()(){}{}": {
+      "snippet": "DashDoubleLine(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashDoubleLine[]()(){}{}": {
+      "snippet": "DashDoubleLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:linesep}}{${2:dashsize}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Arc()()": {
+      "snippet": "Arc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "Arc[]()()": {
+      "snippet": "Arc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "CArc()()": {
+      "snippet": "CArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "CArc[]()()": {
+      "snippet": "CArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
+    },
+    "DoubleArc()(){}": {
+      "snippet": "DoubleArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
+    },
+    "DoubleArc[]()(){}": {
+      "snippet": "DoubleArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "DoubleCArc()(){}": {
+      "snippet": "DoubleCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
+    },
+    "DoubleCArc[]()(){}": {
+      "snippet": "DoubleCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}"
+    },
+    "DashArc()(){}": {
+      "snippet": "DashArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "DashArc[]()(){}": {
+      "snippet": "DashArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "DashCArc()(){}": {
+      "snippet": "DashCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "DashCArc[]()(){}": {
+      "snippet": "DashCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "DashDoubleArc()(){}{}": {
+      "snippet": "DashDoubleArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashDoubleArc[]()(){}{}": {
+      "snippet": "DashDoubleArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "DashDoubleCArc()(){}{}": {
+      "snippet": "DashDoubleCArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashDoubleCArc[]()(){}{}": {
+      "snippet": "DashDoubleCArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "Bezier()()()()": {
+      "snippet": "Bezier(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})(${7:x4},${8:y4})"
+    },
+    "Bezier[]()()()()": {
+      "snippet": "Bezier[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "DoubleBezier()()()(){}": {
+      "snippet": "DoubleBezier(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4}){${1:linesep}}"
+    },
+    "DoubleBezier[]()()()(){}": {
+      "snippet": "DoubleBezier[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})(${9:x4},${10:y4}){${1:linesep}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "DashBezier()()()(){}": {
+      "snippet": "DashBezier(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4}){${1:dashsize}}"
+    },
+    "DashBezier[]()()()(){}": {
+      "snippet": "DashBezier[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})(${9:x4},${10:y4}){${1:dashsize}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "DashDoubleBezier()()()(){}{}": {
+      "snippet": "DashDoubleBezier(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})(${9:x4},${10:y4}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashDoubleBezier[]()()()(){}{}": {
+      "snippet": "DashDoubleBezier[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})(${10:x4},${11:y4}){${1:linesep}}{${2:dashsize}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
     "Curve{}": {
-      "snippet": "Curve{${1:(${2:x1,y1})(${3:x2,y2})...}}"
+      "snippet": "Curve{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
     },
     "DashCurve{}{}": {
-      "snippet": "DashCurve{${1:(${3:x1,y1})(${4:x2,y2})...}}{${2:dashsize}}"
+      "snippet": "DashCurve{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}{${2:dashsize}}"
+    },
+    "Gluon()(){}{}": {
+      "snippet": "Gluon(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:amplitude}}{${2:number}}"
+    },
+    "Gluon[]()(){}{}": {
+      "snippet": "Gluon[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "DoubleGluon()(){}{}{}": {
+      "snippet": "DoubleGluon(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGluon[]()(){}{}{}": {
+      "snippet": "DoubleGluon[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "DashGluon()(){}{}{}": {
+      "snippet": "DashGluon(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGluon[]()(){}{}{}": {
+      "snippet": "DashGluon[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "DashDoubleGluon()(){}{}{}{}": {
+      "snippet": "DashDoubleGluon(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGluon[]()(){}{}{}{}": {
+      "snippet": "DashDoubleGluon[${5:options}](${6:x1},${7:y1})(${8:x2},${9:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "GluonArc()(){}{}": {
+      "snippet": "GluonArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "GluonArc[]()(){}{}": {
+      "snippet": "GluonArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}",
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "GlueArc()(){}{}": {
+      "snippet": "GlueArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "GlueArc[]()(){}{}": {
+      "snippet": "GlueArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "GluonArcn()(){}{}": {
+      "snippet": "GluonArcn(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "GluonArcn[]()(){}{}": {
+      "snippet": "GluonArcn[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "GlueArcn()(){}{}": {
+      "snippet": "GlueArcn(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "GlueArcn[]()(){}{}": {
+      "snippet": "GlueArcn[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "DoubleGluonArc()(){}{}{}": {
+      "snippet": "DoubleGluonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGluonArc[]()(){}{}{}": {
+      "snippet": "DoubleGluonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "DoubleGlueArc()(){}{}{}": {
+      "snippet": "DoubleGlueArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGlueArc[]()(){}{}{}": {
+      "snippet": "DoubleGlueArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGluonArcn()(){}{}{}": {
+      "snippet": "DoubleGluonArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGluonArcn[]()(){}{}{}": {
+      "snippet": "DoubleGluonArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGlueArcn()(){}{}{}": {
+      "snippet": "DoubleGlueArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGlueArcn[]()(){}{}{}": {
+      "snippet": "DoubleGlueArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DashGluonArc()(){}{}{}": {
+      "snippet": "DashGluonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGluonArc[]()(){}{}{}": {
+      "snippet": "DashGluonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "DashGlueArc()(){}{}{}": {
+      "snippet": "DashGlueArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGlueArc[]()(){}{}{}": {
+      "snippet": "DashGlueArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGluonArcn()(){}{}{}": {
+      "snippet": "DashGluonArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGluonArcn[]()(){}{}{}": {
+      "snippet": "DashGluonArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGlueArcn()(){}{}{}": {
+      "snippet": "DashGlueArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGlueArcn[]()(){}{}{}": {
+      "snippet": "DashGlueArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashDoubleGluonArc()(){}{}{}{}": {
+      "snippet": "DashDoubleGluonArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGluonArc[]()(){}{}{}{}": {
+      "snippet": "DashDoubleGluonArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
+      "keyvalindex": 15,
+      "keyvalpos": 0
+    },
+    "DashDoubleGlueArc()(){}{}{}{}": {
+      "snippet": "DashDoubleGlueArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGlueArc[]()(){}{}{}{}": {
+      "snippet": "DashDoubleGlueArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGluonArcn()(){}{}{}{}": {
+      "snippet": "DashDoubleGluonArcn(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGluonArcn[]()(){}{}{}{}": {
+      "snippet": "DashDoubleGluonArcn[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGlueArcn()(){}{}{}{}": {
+      "snippet": "DashDoubleGlueArcn(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGlueArcn[]()(){}{}{}{}": {
+      "snippet": "DashDoubleGlueArcn[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "GluonCirc()(){}{}": {
+      "snippet": "GluonCirc(${3:x},${4:y})(${5:radius},${6:phase}){${1:amplitude}}{${2:number}}"
+    },
+    "GluonCirc[]()(){}{}": {
+      "snippet": "GluonCirc[${3:options}](${4:x},${5:y})(${6:radius},${7:phase}){${1:amplitude}}{${2:number}}",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "DoubleGluonCirc()(){}{}{}": {
+      "snippet": "DoubleGluonCirc(${4:x},${5:y})(${6:radius},${7:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleGluonCirc[]()(){}{}{}": {
+      "snippet": "DoubleGluonCirc[${4:options}](${5:x},${6:y})(${7:radius},${8:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "DashGluonCirc()(){}{}{}": {
+      "snippet": "DashGluonCirc(${4:x},${5:y})(${6:radius},${7:phase}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashGluonCirc[]()(){}{}{}": {
+      "snippet": "DashGluonCirc[${4:options}](${5:x},${6:y})(${7:radius},${8:phase}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "DashDoubleGluonCirc()(){}{}{}{}": {
+      "snippet": "DashDoubleGluonCirc(${5:x},${6:y})(${7:radius},${8:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleGluonCirc[]()(){}{}{}{}": {
+      "snippet": "DashDoubleGluonCirc[${5:options}](${6:x},${7:y})(${8:radius},${9:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "Photon()(){}{}": {
+      "snippet": "Photon(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:amplitude}}{${2:number}}"
+    },
+    "Photon[]()(){}{}": {
+      "snippet": "Photon[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "DoublePhoton()(){}{}{}": {
+      "snippet": "DoublePhoton(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoublePhoton[]()(){}{}{}": {
+      "snippet": "DoublePhoton[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "DashPhoton()(){}{}{}": {
+      "snippet": "DashPhoton(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashPhoton[]()(){}{}{}": {
+      "snippet": "DashPhoton[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "DashDoublePhoton()(){}{}{}{}": {
+      "snippet": "DashDoublePhoton(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoublePhoton[]()(){}{}{}{}": {
+      "snippet": "DashDoublePhoton[${5:options}](${6:x1},${7:y1})(${8:x2},${9:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "PhotonArc()(){}{}": {
+      "snippet": "PhotonArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "PhotonArc[]()(){}{}": {
+      "snippet": "PhotonArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}",
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "DoublePhotonArc()(){}{}{}": {
+      "snippet": "DoublePhotonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoublePhotonArc[]()(){}{}{}": {
+      "snippet": "DoublePhotonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "DashPhotonArc()(){}{}{}": {
+      "snippet": "DashPhotonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashPhotonArc[]()(){}{}{}": {
+      "snippet": "DashPhotonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "DashDoublePhotonArc()(){}{}{}{}": {
+      "snippet": "DashDoublePhotonArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoublePhotonArc[]()(){}{}{}{}": {
+      "snippet": "DashDoublePhotonArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
+      "keyvalindex": 15,
+      "keyvalpos": 0
+    },
+    "ZigZag()(){}{}": {
+      "snippet": "ZigZag(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:amplitude}}{${2:number}}"
+    },
+    "ZigZag[]()(){}{}": {
+      "snippet": "ZigZag[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "DoubleZigZag()(){}{}{}": {
+      "snippet": "DoubleZigZag(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleZigZag[]()(){}{}{}": {
+      "snippet": "DoubleZigZag[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "DashZigZag()(){}{}{}": {
+      "snippet": "DashZigZag(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashZigZag[]()(){}{}{}": {
+      "snippet": "DashZigZag[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "DashDoubleZigZag()(){}{}{}{}": {
+      "snippet": "DashDoubleZigZag(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleZigZag[]()(){}{}{}{}": {
+      "snippet": "DashDoubleZigZag[${5:options}](${6:x1},${7:y1})(${8:x2},${9:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "ZigZagArc()(){}{}": {
+      "snippet": "ZigZagArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
+    },
+    "ZigZagArc[]()(){}{}": {
+      "snippet": "ZigZagArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}",
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "DoubleZigZagArc()(){}{}{}": {
+      "snippet": "DoubleZigZagArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
+    },
+    "DoubleZigZagArc[]()(){}{}{}": {
+      "snippet": "DoubleZigZagArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "DashZigZagArc()(){}{}{}": {
+      "snippet": "DashZigZagArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
+    },
+    "DashZigZagArc[]()(){}{}{}": {
+      "snippet": "DashZigZagArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "DashDoubleZigZagArc()(){}{}{}{}": {
+      "snippet": "DashDoubleZigZagArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
+    },
+    "DashDoubleZigZagArc[]()(){}{}{}{}": {
+      "snippet": "DashDoubleZigZagArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
+      "keyvalindex": 15,
+      "keyvalpos": 0
+    },
+    "Vertex(){}": {
+      "snippet": "Vertex(${2:x},${3:y}){${1:radius}}"
+    },
+    "FCirc(){}": {
+      "snippet": "FCirc(${2:x},${3:y}){${1:radius}}"
+    },
+    "ECirc(){}": {
+      "snippet": "ECirc(${2:x},${3:y}){${1:radius}}"
+    },
+    "BCirc(){}": {
+      "snippet": "BCirc(${2:x},${3:y}){${1:radius}}"
+    },
+    "GCirc(){}{}": {
+      "snippet": "GCirc(${3:x},${4:y}){${1:radius}}{${2:grayscale}}"
+    },
+    "CCirc(){}{}{}": {
+      "snippet": "CCirc(${4:x},${5:y}){${1:radius}}{${2:bound color}}{${3:fill color}}"
+    },
+    "Oval()()()": {
+      "snippet": "Oval(${1:x},${2:y})(${3:half-height},${4:half-width})(${5:angle})"
+    },
+    "FOval()()()": {
+      "snippet": "FOval(${1:x},${2:y})(${3:half-height},${4:half-width})(${5:angle})"
+    },
+    "GOval()()(){}": {
+      "snippet": "GOval(${2:x},${3:y})(${4:half-height},${5:half-width})(${6:angle}){${1:grayscale}}"
+    },
+    "COval()()(){}{}": {
+      "snippet": "COval(${3:x},${4:y})(${5:half-height},${6:half-width})(${7:angle}){${1:bound color}}{${2:fill color}}"
+    },
+    "EBox()()": {
+      "snippet": "EBox(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "FBox()()": {
+      "snippet": "FBox(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "BBox()()": {
+      "snippet": "BBox(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "GBox()(){}": {
+      "snippet": "GBox(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:grayscale}}"
+    },
+    "CBox()(){}{}": {
+      "snippet": "CBox(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:bound color}}{${2:fill color}}"
+    },
+    "EBoxc()()": {
+      "snippet": "EBoxc(${1:x},${2:y})(${3:width},${4:height})"
+    },
+    "Boxc()()": {
+      "snippet": "Boxc(${1:x},${2:y})(${3:width},${4:height})"
+    },
+    "FBoxc()()": {
+      "snippet": "FBoxc(${1:x},${2:y})(${3:width},${4:height})"
+    },
+    "BBoxc()()": {
+      "snippet": "BBoxc(${1:x},${2:y})(${3:width},${4:height})"
+    },
+    "GBoxc()(){}": {
+      "snippet": "GBoxc(${2:x},${3:y})(${4:width},${5:height}){${1:grayscale}}"
+    },
+    "CBoxc()(){}{}": {
+      "snippet": "CBoxc(${3:x},${4:y})(${5:width},${6:height}){${1:bound color}}{${2:fill color}}"
+    },
+    "RotatedBox()(){}{}": {
+      "snippet": "RotatedBox(${3:x},${4:y})(${5:width},${6:height}){${1:angle}}{${2:color}}"
+    },
+    "FilledRotatedBox()(){}{}": {
+      "snippet": "FilledRotatedBox(${3:x},${4:y})(${5:width},${6:height}){${1:angle}}{${2:color}}"
+    },
+    "ETri()()()": {
+      "snippet": "ETri(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
+    "FTri()()()": {
+      "snippet": "FTri(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
+    "BTri()()()": {
+      "snippet": "BTri(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
+    "GTri()()(){}": {
+      "snippet": "GTri(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3}){${1:grayscale}}"
+    },
+    "CTri()()(){}{}": {
+      "snippet": "CTri(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:bound color}}{${2:fill color}}"
     },
     "Polygon{}{}": {
-      "snippet": "Polygon{${1:(${3:x1,y1}),(${4:x2,y2}),...}}{${2:color}}"
+      "snippet": "Polygon{${1:(${3:x1},${4:y1}),(${5:x2},${6:y2}),...}}{${2:color}}"
     },
     "FilledPolygon{}{}": {
-      "snippet": "FilledPolygon{${1:(${3:x1,y1}),(${4:x2,y2}),...}}{${2:color}}"
+      "snippet": "FilledPolygon{${1:(${3:x1},${4:y1}),(${5:x2},${6:y2}),...}}{${2:color}}"
+    },
+    "LinAxis()()()": {
+      "snippet": "LinAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:divs},${6:subdivs},${7:hashsize},${8:offset},${9:width})"
+    },
+    "LogAxis()()()": {
+      "snippet": "LogAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:divs},${6:hashsize},${7:offset},${8:width})"
+    },
+    "Text(){}": {
+      "snippet": "Text(${2:x},${3:y}){${1:text}}"
+    },
+    "Text()[]{}": {
+      "snippet": "Text(${3:x},${4:y})[${2:pos}]{${1:text}}"
+    },
+    "Text()(){}": {
+      "snippet": "Text(${2:x},${3:y})(${4:angle}){${1:text}}"
+    },
+    "Text()()[]{}": {
+      "snippet": "Text(${3:x},${4:y})(${5:angle})[${2:pos}]{${1:text}}"
+    },
+    "rText(){}": {
+      "snippet": "rText(${2:x},${3:y}){${1:text}}"
+    },
+    "rText()[]{}": {
+      "snippet": "rText(${3:x},${4:y})[${2:mode}]{${1:text}}"
+    },
+    "rText()[][]{}": {
+      "snippet": "rText(${4:x},${5:y})[${2:mode}][${3:rotation}]{${1:text}}"
+    },
+    "RText()(){}": {
+      "snippet": "RText(${2:x},${3:y})(${4:angle}){${1:text}}"
+    },
+    "RText()[](){}": {
+      "snippet": "RText(${3:x},${4:y})[${2:pos}](${5:angle}){${1:text}}"
     },
     "SetPFont{}{}": {
       "snippet": "SetPFont{${1:postscript font}}{${2:size}}"
     },
+    "PText()(){}": {
+      "snippet": "PText(${2:x},${3:y})(${4:angle}){${1:text}}"
+    },
+    "PText()()[]{}": {
+      "snippet": "PText(${3:x},${4:y})(${5:angle})[${2:pos}]{${1:text}}"
+    },
+    "BText(){}": {
+      "snippet": "BText(${2:x},${3:y}){${1:text}}"
+    },
+    "GText(){}{}": {
+      "snippet": "GText(${3:x},${4:y}){${1:grayscale}}{${2:text}}"
+    },
+    "CText(){}{}{}": {
+      "snippet": "CText(${4:x},${5:y}){${1:bound color}}{${2:fill color}}{${3:text}}"
+    },
+    "BTwoText(){}{}": {
+      "snippet": "BTwoText(${3:x},${4:y}){${1:text1}}{${2:text2}}"
+    },
+    "GTwoText(){}{}{}": {
+      "snippet": "GTwoText(${4:x},${5:y}){${1:grayscale}}{${2:text1}}{${3:text2}}"
+    },
+    "CTwoText(){}{}{}{}": {
+      "snippet": "CTwoText(${5:x},${6:y}){${1:bound color}}{${2:fill color}}{${3:text1}}{${4:text2}}"
+    },
+    "ArrowLine()()": {
+      "snippet": "ArrowLine(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "ArrowLine[]()()": {
+      "snippet": "ArrowLine[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "LongArrow()()": {
+      "snippet": "LongArrow(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "LongArrow[]()()": {
+      "snippet": "LongArrow[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "ArrowDoubleLine()(){}": {
+      "snippet": "ArrowDoubleLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:linesep}}"
+    },
+    "ArrowDoubleLine[]()(){}": {
+      "snippet": "ArrowDoubleLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}"
+    },
+    "DashArrowLine()(){}": {
+      "snippet": "DashArrowLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "DashArrowLine[]()(){}": {
+      "snippet": "DashArrowLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
+    },
+    "ArrowDashLine()(){}": {
+      "snippet": "ArrowDashLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "ArrowDashLine[]()(){}": {
+      "snippet": "ArrowDashLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
+    },
+    "DashArrowDoubleLine()(){}{}": {
+      "snippet": "DashArrowDoubleLine(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashArrowDoubleLine[]()(){}{}": {
+      "snippet": "DashArrowDoubleLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:linesep}}{${2:dashsize}}"
+    },
+    "ArrowDashDoubleLine()(){}{}": {
+      "snippet": "ArrowDashDoubleLine(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}{${2:dashsize}}"
+    },
+    "ArrowDashDoubleLine[]()(){}{}": {
+      "snippet": "ArrowDashDoubleLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashLongArrowLine()(){}": {
+      "snippet": "DashLongArrowLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "DashLongArrowLine[]()(){}": {
+      "snippet": "DashLongArrowLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
+    },
+    "LongArrowDashLine()(){}": {
+      "snippet": "LongArrowDashLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "LongArrowDashLine[]()(){}": {
+      "snippet": "LongArrowDashLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
+    },
+    "LongArrowDash()(){}": {
+      "snippet": "LongArrowDash(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "LongArrowDash[]()(){}": {
+      "snippet": "LongArrowDash[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
+    },
+    "DashLongArrow()(){}": {
+      "snippet": "DashLongArrow(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "DashLongArrow[]()(){}": {
+      "snippet": "DashLongArrow[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
+    },
+    "LongArrowArcn()()": {
+      "snippet": "LongArrowArcn(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "LongArrowArcn[]()()": {
+      "snippet": "LongArrowArcn[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
+    },
+    "ArrowArcn()()": {
+      "snippet": "ArrowArcn(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "ArrowArcn[]()()": {
+      "snippet": "ArrowArcn[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
+    },
+    "LongArrowArc()()": {
+      "snippet": "LongArrowArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "LongArrowArc[]()()": {
+      "snippet": "LongArrowArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
+    },
+    "ArrowArc()()": {
+      "snippet": "ArrowArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "ArrowArc[]()()": {
+      "snippet": "ArrowArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
+    },
+    "ArrowCArc()()": {
+      "snippet": "ArrowCArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "ArrowCArc[]()()": {
+      "snippet": "ArrowCArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
+    },
+    "DashArrowArcn()(){}": {
+      "snippet": "DashArrowArcn(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "DashArrowArcn[]()(){}": {
+      "snippet": "DashArrowArcn[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "ArrowDashArcn()(){}": {
+      "snippet": "ArrowDashArcn(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "ArrowDashArcn[]()(){}": {
+      "snippet": "ArrowDashArcn[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "DashArrowArc()(){}": {
+      "snippet": "DashArrowArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "DashArrowArc[]()(){}": {
+      "snippet": "DashArrowArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "DashArrowCArc()(){}": {
+      "snippet": "DashArrowCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "DashArrowCArc[]()(){}": {
+      "snippet": "DashArrowCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "ArrowDashArc()(){}": {
+      "snippet": "ArrowDashArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "ArrowDashArc[]()(){}": {
+      "snippet": "ArrowDashArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "ArrowDashCArc()(){}": {
+      "snippet": "ArrowDashCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "ArrowDashCArc[]()(){}": {
+      "snippet": "ArrowDashCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "LongDashArrowArc()(){}": {
+      "snippet": "LongDashArrowArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "LongDashArrowArc[]()(){}": {
+      "snippet": "LongDashArrowArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "LongDashArrowCArc()(){}": {
+      "snippet": "LongDashArrowCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "LongDashArrowCArc[]()(){}": {
+      "snippet": "LongDashArrowCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "LongArrowDashArc()(){}": {
+      "snippet": "LongArrowDashArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "LongArrowDashArc[]()(){}": {
+      "snippet": "LongArrowDashArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "LongArrowDashCArc()(){}": {
+      "snippet": "LongArrowDashCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "LongArrowDashCArc[]()(){}": {
+      "snippet": "LongArrowDashCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
+    },
+    "ArrowDoubleArc()(){}": {
+      "snippet": "ArrowDoubleArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
+    },
+    "ArrowDoubleArc[]()(){}": {
+      "snippet": "ArrowDoubleArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}"
+    },
+    "ArrowDoubleCArc()(){}": {
+      "snippet": "ArrowDoubleCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
+    },
+    "ArrowDoubleCArc[]()(){}": {
+      "snippet": "ArrowDoubleCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}"
+    },
+    "ArrowDashDoubleArc()(){}{}": {
+      "snippet": "ArrowDashDoubleArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "ArrowDashDoubleArc[]()(){}{}": {
+      "snippet": "ArrowDashDoubleArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "ArrowDashDoubleCArc()(){}{}": {
+      "snippet": "ArrowDashDoubleCArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "ArrowDashDoubleCArc[]()(){}{}": {
+      "snippet": "ArrowDashDoubleCArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashArrowDoubleArc()(){}{}": {
+      "snippet": "DashArrowDoubleArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashArrowDoubleArc[]()(){}{}": {
+      "snippet": "DashArrowDoubleArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashArrowDoubleCArc()(){}{}": {
+      "snippet": "DashArrowDoubleCArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
+    "DashArrowDoubleCArc[]()(){}{}": {
+      "snippet": "DashArrowDoubleCArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
+    },
     "SetDashSize{}": {
       "snippet": "SetDashSize{${1:number}}"
     },
@@ -85,6 +837,12 @@
     "ifPSTextScalesLikeGraphics": {},
     "PSTextScalesLikeGraphicsfalse": {},
     "PSTextScalesLikeGraphicstrue": {},
+    "SetOffset()": {
+      "snippet": "SetOffset(${1:x},${2:y})"
+    },
+    "SetScaledOffset()": {
+      "snippet": "SetScaledOffset(${1:x},${2:y})"
+    },
     "SetColor{}": {
       "snippet": "SetColor{${1:color}}"
     },
@@ -395,9 +1153,15 @@
     "AssignDecDiv{}{}{}": {
       "snippet": "AssignDecDiv{${1:variable}}{${2:integer1}}{${3:integer2}}"
     },
+    "AxoPut(){}": {
+      "snippet": "AxoPut(${2:x},${3:y}){${1:text}}"
+    },
     "IfColor{}{}": {
       "snippet": "IfColor{${1:arg1}}{${2:arg2}}"
     },
+    "SetPoint{}()": {
+      "snippet": "SetPoint{${1:name}}(${2:x},${3:y})"
+    },
     "SetTmpBoxTwo{}{}": {
       "snippet": "SetTmpBoxTwo{${1:contents1}}{${2:contents2}}"
     },
@@ -411,6 +1175,9 @@
     "axohelp": {},
     "axominusone": {},
     "axoone": {},
+    "axoparray(){}": {
+      "snippet": "axoparray(${2:x},${3:y}){${1:arg}}"
+    },
     "axoscale": {},
     "axoscalePT": {},
     "axoscaleTT": {},
@@ -442,6 +1209,9 @@
     },
     "pfontC": {},
     "pfontN": {},
+    "putLen(){}": {
+      "snippet": "putLen(${2:x},${3:y}){${1:text}}"
+    },
     "tmpfh": {},
     "useX{}": {
       "snippet": "useX{${1:point name}}"
@@ -458,6 +1228,14 @@
     "ptinsp": {}
   },
   "envs": {
+    "axopicture(x,y)": {
+      "name": "axopicture",
+      "snippet": "(${1:x},${2:y})"
+    },
+    "axopicture(x,y)(xoffset,yoffset)": {
+      "name": "axopicture",
+      "snippet": "(${1:x},${2:y})(${3:xoffset},${4:yoffset})"
+    },
     "OLDpicture": {}
   },
   "options": [
@@ -468,5 +1246,270 @@
     "PSTextScalesIndependently",
     "PSTextScalesLikeGraphics"
   ],
-  "keyvals": []
+  "keyvals": [
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash",
+      "double",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "double",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash",
+      "double",
+      "clock",
+      "clockwise",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash",
+      "clock",
+      "clockwise",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "double",
+      "clock",
+      "clockwise",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "clock",
+      "clockwise",
+      "arrow",
+      "flip",
+      "arrowpos=${1:number}",
+      "arrowaspect=${1:number}",
+      "arrowlength=${1:number}",
+      "arrowheight=${1:number}",
+      "arrowinset=${1:number}",
+      "arrowscale=${1:number}",
+      "arrowstroke=${1:number}",
+      "arrowwidth=${1:number}",
+      "inset=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash",
+      "double"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "double"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash",
+      "double",
+      "clock",
+      "clockwise"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "dash",
+      "clock",
+      "clockwise"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "double",
+      "clock",
+      "clockwise"
+    ],
+    [
+      "color=",
+      "colour=",
+      "dsize=${1:number}",
+      "dashsize=${1:number}",
+      "sep=${1:number}",
+      "linesep=${1:number}",
+      "width=${1:number}",
+      "clock",
+      "clockwise"
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/babel.json b/dev/packages/babel.json
new file mode 100644
index 000000000..4c9160cc6
--- /dev/null
+++ b/dev/packages/babel.json
@@ -0,0 +1,4651 @@
+{
+  "includes": {
+    "fontspec": [
+      "bidi=default",
+      "bidi=basic",
+      "bidi=basic-r",
+      "bidi=bidi-l",
+      "bidi=bidi-r"
+    ],
+    "bidi": [
+      "bidi=bidi-l",
+      "bidi=bidi-r"
+    ]
+  },
+  "macros": {
+    "selectlanguage{}": {
+      "snippet": "selectlanguage{${1:language}}"
+    },
+    "foreignlanguage{}{}": {
+      "snippet": "foreignlanguage{${1:language}}{${2:text}}"
+    },
+    "foreignlanguage[]{}{}": {
+      "snippet": "foreignlanguage[${3:options}]{${1:language}}{${2:text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "babeltags{}": {
+      "snippet": "babeltags{${1:tag1=lang1,${2:tag2=lang2},...}}"
+    },
+    "babelensure{}": {
+      "snippet": "babelensure{${1:language}}"
+    },
+    "babelensure[]{}": {
+      "snippet": "babelensure[${2:options}]{${1:language}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "shorthandon{}": {
+      "snippet": "shorthandon{${1:characters}}"
+    },
+    "shorthandoff{}": {
+      "snippet": "shorthandoff{${1:characters}}"
+    },
+    "shorthandoff*{}": {
+      "snippet": "shorthandoff*{${1:characters}}"
+    },
+    "useshorthands{}": {
+      "snippet": "useshorthands{${1:char}}"
+    },
+    "useshorthands*{}": {
+      "snippet": "useshorthands*{${1:char}}"
+    },
+    "defineshorthand{}{}": {
+      "snippet": "defineshorthand{${1:shorthand}}{${2:code}}"
+    },
+    "defineshorthand[]{}{}": {
+      "snippet": "defineshorthand[${3:lang1,${4:lang2},...}]{${1:shorthand}}{${2:code}}"
+    },
+    "languageshorthands{}": {
+      "snippet": "languageshorthands{${1:language}}"
+    },
+    "babelshorthand{}": {
+      "snippet": "babelshorthand{${1:shorthand}}"
+    },
+    "ifbabelshorthand{}{}{}": {
+      "snippet": "ifbabelshorthand{${1:character}}{${2:true}}{${3:false}}"
+    },
+    "textormath{}{}": {
+      "snippet": "textormath{${1:text code}}{${2:math code}}"
+    },
+    "AfterBabelLanguage{}{}": {
+      "snippet": "AfterBabelLanguage{${1:option_name}}{${2:code}}",
+      "option": "base"
+    },
+    "babelfont{}{}": {
+      "snippet": "babelfont{${1:font_family}}{${2:font_name}}"
+    },
+    "babelfont{}[]{}": {
+      "snippet": "babelfont{${1:font_family}}[${2:font_options}]{${3:font_name}}"
+    },
+    "babelfont[]{}{}": {
+      "snippet": "babelfont[${3:lang1,${4:lang2},...}]{${1:font_family}}{${2:font_name}}"
+    },
+    "babelfont[]{}[]{}": {
+      "snippet": "babelfont[${3:lang1,${5:lang2},...}]{${1:font_family}}[${4:font_options}]{${2:font_name}}"
+    },
+    "setlocalecaption{}{}{}": {
+      "snippet": "setlocalecaption{${1:language}}{${2:caption_name}}{${3:string}}"
+    },
+    "BabelUppercaseMapping{}{}{}": {
+      "snippet": "BabelUppercaseMapping{${1:locale-name}}{${2:codepoint}}{${3:output}}"
+    },
+    "BabelLowercaseMapping{}{}{}": {
+      "snippet": "BabelLowercaseMapping{${1:locale-name}}{${2:codepoint}}{${3:output}}"
+    },
+    "babelprovide[]{}": {
+      "snippet": "babelprovide[${2:options}]{${1:language}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "localenumeral{}{}": {
+      "snippet": "localenumeral{${1:style}}{${2:number}}"
+    },
+    "localecounter{}{}": {
+      "snippet": "localecounter{${1:style}}{${2:counter}}"
+    },
+    "localedate{}{}{}": {
+      "snippet": "localedate{${1:year}}{${2:month}}{${3:day}}"
+    },
+    "localedate[]{}{}{}": {
+      "snippet": "localedate[${4:options}]{${1:year}}{${2:month}}{${3:day}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "babelcalendar{}{}{}{}": {
+      "snippet": "babelcalendar{${1:calendar}}{${2:year-macro}}{${3:month-macro}}{${4:day-macro}}"
+    },
+    "babelcalendar[]{}{}{}{}": {
+      "snippet": "babelcalendar[${5:YYYY-MM-DD}]{${1:calendar}}{${2:year-macro}}{${3:month-macro}}{${4:day-macro}}"
+    },
+    "languagename": {},
+    "iflanguage{}{}{}": {
+      "snippet": "iflanguage{${1:language}}{${2:true}}{${3:false}}"
+    },
+    "localeinfo{}": {
+      "snippet": "localeinfo{${1:field}}"
+    },
+    "localeinfo*{}": {
+      "snippet": "localeinfo*{${1:field}}"
+    },
+    "getlocaleproperty{}{}{}": {
+      "snippet": "getlocaleproperty{${1:cmd}}{${2:locale}}{${3:property}}"
+    },
+    "getlocaleproperty*{}{}{}": {
+      "snippet": "getlocaleproperty*{${1:cmd}}{${2:locale}}{${3:property}}"
+    },
+    "ShowLocaleProperties{}": {
+      "snippet": "ShowLocaleProperties{${1:language}}"
+    },
+    "LocaleForEach{}": {
+      "snippet": "LocaleForEach{${1:code}}"
+    },
+    "BabelEnsureInfo": {},
+    "localeid": {},
+    "babelhyphen{}": {
+      "snippet": "babelhyphen{${1:text}}"
+    },
+    "babelhyphen*{}": {
+      "snippet": "babelhyphen*{${1:text}}"
+    },
+    "babelnullhyphen": {},
+    "babelhyphenation{}": {
+      "snippet": "babelhyphenation{${1:exceptions}}"
+    },
+    "babelhyphenation[]{}": {
+      "snippet": "babelhyphenation[${2:lang1,${3:lang2},...}]{${1:exceptions}}"
+    },
+    "babelpatterns{}": {
+      "snippet": "babelpatterns{${1:patterns}}"
+    },
+    "babelpatterns[]{}": {
+      "snippet": "babelpatterns[${2:lang1,${3:lang2},...}]{${1:patterns}}"
+    },
+    "babelposthyphenation{}{}{}": {
+      "snippet": "babelposthyphenation{${1:hypenrules-name}}{${2:lua-pattern}}{${3:replacement}}"
+    },
+    "babelposthyphenation[]{}{}{}": {
+      "snippet": "babelposthyphenation[${4:options}]{${1:hypenrules-name}}{${2:lua-pattern}}{${3:replacement}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "babelprehyphenation{}{}{}": {
+      "snippet": "babelprehyphenation{${1:locale-name}}{${2:lua-pattern}}{${3:replacement}}"
+    },
+    "babelprehyphenation[]{}{}{}": {
+      "snippet": "babelprehyphenation[${4:options}]{${1:locale-name}}{${2:lua-pattern}}{${3:replacement}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "enablelocaletransform{}": {
+      "snippet": "enablelocaletransform{${1:transform}}"
+    },
+    "disablelocaletransform{}": {
+      "snippet": "disablelocaletransform{${1:transform}}"
+    },
+    "localeprehyphenation{}": {
+      "snippet": "localeprehyphenation{${1:string}}"
+    },
+    "babelcharclass{}{}{}": {
+      "snippet": "babelcharclass{${1:locale}}{${2:name}}{${3:char-list}}"
+    },
+    "babelinterchar{}{}{}{}": {
+      "snippet": "babelinterchar{${1:locale}}{${2:class-first}}{${3:class-second}}{${4:code}}"
+    },
+    "babelinterchar[]{}{}{}{}": {
+      "snippet": "babelinterchar[${5:options}]{${1:locale}}{${2:class-first}}{${3:class-second}}{${4:code}}",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "enablelocaleinterchar{}": {
+      "snippet": "enablelocaleinterchar{${1:label}}"
+    },
+    "disablelocaleinterchar{}": {
+      "snippet": "disablelocaleinterchar{${1:label}}"
+    },
+    "IfBabelIntercharT{}{}": {
+      "snippet": "IfBabelIntercharT{${1:interchar-list}}{${2:code}}"
+    },
+    "ensureascii{}": {
+      "snippet": "ensureascii{${1:text}}"
+    },
+    "asciiencoding": {},
+    "localfootnote{}": {
+      "snippet": "localfootnote{${1:text}}",
+      "option": "layout=footnotes"
+    },
+    "mainfootnote{}": {
+      "snippet": "mainfootnote{${1:text}}",
+      "option": "layout=footnotes"
+    },
+    "localfootnotetext": {
+      "option": "layout=footnotes"
+    },
+    "mainfootnotetext": {
+      "option": "layout=footnotes"
+    },
+    "babelsublr{}": {
+      "snippet": "babelsublr{${1:text}}"
+    },
+    "localerestoredirs": {},
+    "BabelPatchSection{}": {
+      "snippet": "BabelPatchSection{${1:section-name}}"
+    },
+    "BabelFootnote{}{}{}{}": {
+      "snippet": "BabelFootnote{${1:cmd}}{${2:language}}{${3:before}}{${4:after}}"
+    },
+    "languageattribute{}{}": {
+      "snippet": "languageattribute{${1:language}}{${2:list of attributes}}"
+    },
+    "AddBabelHook{}{}{}": {
+      "snippet": "AddBabelHook{${1:name}}{${2:event}}{${3:code}}"
+    },
+    "AddBabelHook[]{}{}{}": {
+      "snippet": "AddBabelHook[${4:language}]{${1:name}}{${2:event}}{${3:code}}"
+    },
+    "EnableBabelHook{}": {
+      "snippet": "EnableBabelHook{${1:name}}"
+    },
+    "DisableBabelHook{}": {
+      "snippet": "DisableBabelHook{${1:name}}"
+    },
+    "BabelContentsFiles": {},
+    "babelcharproperty{}{}{}": {
+      "snippet": "babelcharproperty{${1:char-code}}{${2:property}}{${3:value}}"
+    },
+    "babelcharproperty{}[]{}{}": {
+      "snippet": "babelcharproperty{${1:char-code}}[${2:to-char-code}]{${3:property}}{${4:value}}"
+    },
+    "babeladjust{}": {
+      "snippet": "babeladjust{${1:keyvals}}",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "localebox{}": {
+      "snippet": "localebox{${1:text}}"
+    },
+    "fmtname": {},
+    "glqq": {},
+    "grqq": {},
+    "glq": {},
+    "grq": {},
+    "flqq": {},
+    "frqq": {},
+    "flq": {},
+    "frq": {},
+    "quotedblbase": {
+      "option": "mongolian"
+    },
+    "quotesinglbase": {},
+    "guillemetleft": {},
+    "guillemetright": {},
+    "guillemotleft": {
+      "option": "mongolian"
+    },
+    "guillemotright": {
+      "option": "mongolian"
+    },
+    "guilsinglleft": {},
+    "guilsinglright": {},
+    "dj": {},
+    "DJ": {},
+    "umlauthigh": {},
+    "umlautlow": {},
+    "umlautelow": {},
+    "latinencoding": {
+      "option": "mongolian"
+    },
+    "latintext": {},
+    "textlatin{}": {
+      "snippet": "textlatin{${1:text}}"
+    },
+    "adddialect": {},
+    "addlanguage": {},
+    "addto{}{}": {
+      "snippet": "addto{${1:cmd}}{${2:code}}"
+    },
+    "AfterBabelCommands{}": {
+      "snippet": "AfterBabelCommands{${1:code}}"
+    },
+    "allowhyphens": {},
+    "BabelCJKGlue": {},
+    "BabelCJKSpace": {},
+    "BabelDated{}": {
+      "snippet": "BabelDated{${1:arg}}"
+    },
+    "BabelDatedd{}": {
+      "snippet": "BabelDatedd{${1:arg}}"
+    },
+    "BabelDateDot": {},
+    "BabelDateM{}": {
+      "snippet": "BabelDateM{${1:arg}}"
+    },
+    "BabelDateMM{}": {
+      "snippet": "BabelDateMM{${1:arg}}"
+    },
+    "BabelDateMMMM{}": {
+      "snippet": "BabelDateMMMM{${1:arg}}"
+    },
+    "BabelDateSpace": {},
+    "BabelDatey{}": {
+      "snippet": "BabelDatey{${1:arg}}"
+    },
+    "BabelDateyy{}": {
+      "snippet": "BabelDateyy{${1:arg}}"
+    },
+    "BabelDateyyyy{}": {
+      "snippet": "BabelDateyyyy{${1:arg}}"
+    },
+    "BabelLanguages": {},
+    "BabelLower{}{}": {
+      "snippet": "BabelLower{${1:uccode}}{${2:lccode}}"
+    },
+    "BabelLowerMM{}{}{}{}": {
+      "snippet": "BabelLowerMM{${1:uccode-from}}{${2:uccode-to}}{${3:step}}{${4:lccode}}"
+    },
+    "BabelLowerMO{}{}{}{}": {
+      "snippet": "BabelLowerMO{${1:uccode-from}}{${2:uccode-to}}{${3:step}}{${4:lccode}}"
+    },
+    "BabelModifiers": {},
+    "BabelNonASCII": {},
+    "BabelNonText": {},
+    "BabelString": {},
+    "BabelStringsDefault": {},
+    "BabelText{}": {
+      "snippet": "BabelText{${1:arg}}"
+    },
+    "EndBabelCommands": {},
+    "IfBabelLayout{}{}{}": {
+      "snippet": "IfBabelLayout{${1:layout}}{${2:true}}{${3:false}}"
+    },
+    "IfBabelSelectorTF{}{}{}": {
+      "snippet": "IfBabelSelectorTF{${1:selectors}}{${2:true}}{${3:false}}"
+    },
+    "LdfInit{}{}": {
+      "snippet": "LdfInit{${1:language}}{${2:captionslanguage}}"
+    },
+    "loadlocalcfg{}": {
+      "snippet": "loadlocalcfg{${1:file}}"
+    },
+    "localename": {},
+    "ProvidesLanguage{}": {
+      "snippet": "ProvidesLanguage{${1:language}}"
+    },
+    "ProvidesLanguage{}[]": {
+      "snippet": "ProvidesLanguage{${1:language}}[${2:release info}]"
+    },
+    "SetHyphenMap{}": {
+      "snippet": "SetHyphenMap{${1:to-lower-macros}}"
+    },
+    "SetString{}{}": {
+      "snippet": "SetString{${1:macro-name}}{${2:string}}"
+    },
+    "SetStringLoop{}{}": {
+      "snippet": "SetStringLoop{${1:macro-name}}{${2:string-list}}"
+    },
+    "StartBabelCommands*{}{}": {
+      "snippet": "StartBabelCommands*{${1:language-list}}{${2:category}}"
+    },
+    "StartBabelCommands*{}{}[]": {
+      "snippet": "StartBabelCommands*{${1:language-list}}{${2:category}}[${3:selector}]"
+    },
+    "StartBabelCommands{}{}": {
+      "snippet": "StartBabelCommands{${1:language-list}}{${2:category}}"
+    },
+    "StartBabelCommands{}{}[]": {
+      "snippet": "StartBabelCommands{${1:language-list}}{${2:category}}[${3:selector}]"
+    },
+    "captionsalbanian": {
+      "option": "albanian"
+    },
+    "datealbanian": {
+      "option": "albanian"
+    },
+    "extrasalbanian": {
+      "option": "albanian"
+    },
+    "noextrasalbanian": {
+      "option": "albanian"
+    },
+    "prefacename": {
+      "option": "welsh"
+    },
+    "bibname": {
+      "option": "welsh"
+    },
+    "chaptername": {
+      "option": "welsh"
+    },
+    "enclname": {
+      "option": "welsh"
+    },
+    "ccname": {
+      "option": "welsh"
+    },
+    "headtoname": {
+      "option": "welsh"
+    },
+    "seename": {
+      "option": "welsh"
+    },
+    "alsoname": {
+      "option": "welsh"
+    },
+    "proofname": {
+      "option": "welsh"
+    },
+    "glossaryname": {
+      "option": "welsh"
+    },
+    "sh": {
+      "option": "ukrainian"
+    },
+    "ch": {
+      "option": "ukrainian"
+    },
+    "th": {
+      "option": "ukrainian"
+    },
+    "cth": {
+      "option": "ukrainian"
+    },
+    "arsh": {
+      "option": "serbianc"
+    },
+    "arch": {
+      "option": "serbianc"
+    },
+    "arth": {
+      "option": "serbianc"
+    },
+    "arcth": {
+      "option": "serbianc"
+    },
+    "tg": {
+      "option": "ukrainian"
+    },
+    "ctg": {
+      "option": "ukrainian"
+    },
+    "arctg": {
+      "option": "ukrainian"
+    },
+    "arcctg": {
+      "option": "ukrainian"
+    },
+    "Prob": {
+      "option": "serbianc"
+    },
+    "Expect": {
+      "option": "serbianc"
+    },
+    "Variance": {
+      "option": "serbianc"
+    },
+    "captionsazerbaijani": {
+      "option": "azerbaijani"
+    },
+    "dateazerbaijani": {
+      "option": "azerbaijani"
+    },
+    "extrasazerbaijani": {
+      "option": "azerbaijani"
+    },
+    "noextrasazerbaijani": {
+      "option": "azerbaijani"
+    },
+    "azerbaijanischwa": {
+      "option": "azerbaijani"
+    },
+    "Azerbaijanischwa": {
+      "option": "azerbaijani"
+    },
+    "captionsbasque": {
+      "option": "basque"
+    },
+    "datebasque": {
+      "option": "basque"
+    },
+    "extrasbasque": {
+      "option": "basque"
+    },
+    "noextrasbasque": {
+      "option": "basque"
+    },
+    "basquehyphenmins": {
+      "option": "basque"
+    },
+    "dieresia{}": {
+      "snippet": "dieresia{${1:arg}}",
+      "option": "basque"
+    },
+    "texttilde{}": {
+      "snippet": "texttilde{${1:arg}}",
+      "option": "basque"
+    },
+    "captionsbelarusian": {
+      "option": "belarusian"
+    },
+    "datebelarusian": {
+      "option": "belarusian"
+    },
+    "extrasbelarusian": {
+      "option": "belarusian"
+    },
+    "noextrasbelarusian": {
+      "option": "belarusian"
+    },
+    "cyrdash": {
+      "option": "ukrainian"
+    },
+    "asbuk{}": {
+      "snippet": "asbuk{${1:counter}}",
+      "option": "russian.ancient"
+    },
+    "Asbuk{}": {
+      "snippet": "Asbuk{${1:counter}}",
+      "option": "russian.ancient"
+    },
+    "Belarusian": {
+      "option": "belarusian"
+    },
+    "cosec": {
+      "option": "ukrainian"
+    },
+    "NOD": {
+      "option": "russian.ancient"
+    },
+    "nod": {
+      "option": "russian.ancient"
+    },
+    "NOK": {
+      "option": "russian.ancient"
+    },
+    "nok": {
+      "option": "russian.ancient"
+    },
+    "Proj": {
+      "option": "russian.ancient"
+    },
+    "NAD": {
+      "option": "belarusian"
+    },
+    "nad": {
+      "option": "belarusian"
+    },
+    "NAK": {
+      "option": "belarusian"
+    },
+    "nak": {
+      "option": "belarusian"
+    },
+    "cyrillicencoding": {
+      "option": "ukrainian"
+    },
+    "cyrillictext": {
+      "option": "ukrainian"
+    },
+    "cyr": {
+      "option": "ukrainian"
+    },
+    "textcyrillic{}": {
+      "snippet": "textcyrillic{${1:text}}",
+      "option": "ukrainian"
+    },
+    "dq": {
+      "option": "ukrainian"
+    },
+    "CYRA": {
+      "option": "ukrainian"
+    },
+    "CYRB": {
+      "option": "ukrainian"
+    },
+    "CYRV": {
+      "option": "ukrainian"
+    },
+    "CYRG": {
+      "option": "ukrainian"
+    },
+    "CYRGUP": {
+      "option": "ukrainian"
+    },
+    "CYRD": {
+      "option": "ukrainian"
+    },
+    "CYRE": {
+      "option": "ukrainian"
+    },
+    "CYRIE": {
+      "option": "ukrainian"
+    },
+    "CYRZH": {
+      "option": "ukrainian"
+    },
+    "CYRZ": {
+      "option": "ukrainian"
+    },
+    "CYRI": {
+      "option": "ukrainian"
+    },
+    "CYRII": {
+      "option": "ukrainian"
+    },
+    "CYRYI": {
+      "option": "ukrainian"
+    },
+    "CYRISHRT": {
+      "option": "ukrainian"
+    },
+    "CYRK": {
+      "option": "ukrainian"
+    },
+    "CYRL": {
+      "option": "ukrainian"
+    },
+    "CYRM": {
+      "option": "ukrainian"
+    },
+    "CYRN": {
+      "option": "ukrainian"
+    },
+    "CYRO": {
+      "option": "ukrainian"
+    },
+    "CYRP": {
+      "option": "ukrainian"
+    },
+    "CYRR": {
+      "option": "ukrainian"
+    },
+    "CYRS": {
+      "option": "ukrainian"
+    },
+    "CYRT": {
+      "option": "ukrainian"
+    },
+    "CYRU": {
+      "option": "ukrainian"
+    },
+    "CYRF": {
+      "option": "ukrainian"
+    },
+    "CYRH": {
+      "option": "ukrainian"
+    },
+    "CYRC": {
+      "option": "ukrainian"
+    },
+    "CYRCH": {
+      "option": "ukrainian"
+    },
+    "CYRSH": {
+      "option": "ukrainian"
+    },
+    "CYRSHCH": {
+      "option": "ukrainian"
+    },
+    "CYRYU": {
+      "option": "ukrainian"
+    },
+    "CYRYA": {
+      "option": "ukrainian"
+    },
+    "CYRSFTSN": {
+      "option": "ukrainian"
+    },
+    "CYRERY": {
+      "option": "ukrainian"
+    },
+    "cyra": {
+      "option": "ukrainian"
+    },
+    "cyrb": {
+      "option": "ukrainian"
+    },
+    "cyrv": {
+      "option": "ukrainian"
+    },
+    "cyrg": {
+      "option": "ukrainian"
+    },
+    "cyrgup": {
+      "option": "ukrainian"
+    },
+    "cyrd": {
+      "option": "ukrainian"
+    },
+    "cyre": {
+      "option": "ukrainian"
+    },
+    "cyrie": {
+      "option": "ukrainian"
+    },
+    "cyrzh": {
+      "option": "ukrainian"
+    },
+    "cyrz": {
+      "option": "ukrainian"
+    },
+    "cyri": {
+      "option": "ukrainian"
+    },
+    "cyrii": {
+      "option": "ukrainian"
+    },
+    "cyryi": {
+      "option": "ukrainian"
+    },
+    "cyrishrt": {
+      "option": "ukrainian"
+    },
+    "cyrk": {
+      "option": "ukrainian"
+    },
+    "cyrl": {
+      "option": "ukrainian"
+    },
+    "cyrm": {
+      "option": "ukrainian"
+    },
+    "cyrn": {
+      "option": "ukrainian"
+    },
+    "cyro": {
+      "option": "ukrainian"
+    },
+    "cyrp": {
+      "option": "ukrainian"
+    },
+    "cyrr": {
+      "option": "ukrainian"
+    },
+    "cyrs": {
+      "option": "ukrainian"
+    },
+    "cyrt": {
+      "option": "ukrainian"
+    },
+    "cyru": {
+      "option": "ukrainian"
+    },
+    "cyrf": {
+      "option": "ukrainian"
+    },
+    "cyrh": {
+      "option": "ukrainian"
+    },
+    "cyrc": {
+      "option": "ukrainian"
+    },
+    "cyrch": {
+      "option": "ukrainian"
+    },
+    "cyrsh": {
+      "option": "ukrainian"
+    },
+    "cyrshch": {
+      "option": "ukrainian"
+    },
+    "cyryu": {
+      "option": "ukrainian"
+    },
+    "cyrya": {
+      "option": "ukrainian"
+    },
+    "cyrsftsn": {
+      "option": "ukrainian"
+    },
+    "cyrery": {
+      "option": "ukrainian"
+    },
+    "cdash": {
+      "option": "ukrainian"
+    },
+    "tocname": {
+      "option": "ukrainian"
+    },
+    "authorname": {
+      "option": "ukrainian"
+    },
+    "acronymname": {
+      "option": "ukrainian"
+    },
+    "lstlistingname": {
+      "option": "ukrainian"
+    },
+    "lstlistlistingname": {
+      "option": "ukrainian"
+    },
+    "notesname": {
+      "option": "ukrainian"
+    },
+    "nomname": {
+      "option": "ukrainian"
+    },
+    "captionsbosnian": {
+      "option": "bosnian"
+    },
+    "datebosnian": {
+      "option": "bosnian"
+    },
+    "extrasbosnian": {
+      "option": "bosnian"
+    },
+    "noextrasbosnian": {
+      "option": "bosnian"
+    },
+    "atcctg": {
+      "option": "bosnian"
+    },
+    "captionsbreton": {
+      "option": "breton"
+    },
+    "datebreton": {
+      "option": "breton"
+    },
+    "extrasbreton": {
+      "option": "breton"
+    },
+    "noextrasbreton": {
+      "option": "breton"
+    },
+    "at": {
+      "option": "acadian"
+    },
+    "boi": {
+      "option": "acadian"
+    },
+    "circonflexe": {
+      "option": "acadian"
+    },
+    "tild": {
+      "option": "acadian"
+    },
+    "degre": {
+      "option": "acadian"
+    },
+    "kentan": {
+      "option": "breton"
+    },
+    "eil": {
+      "option": "breton"
+    },
+    "re": {
+      "option": "breton"
+    },
+    "trede": {
+      "option": "breton"
+    },
+    "pevare": {
+      "option": "breton"
+    },
+    "vet": {
+      "option": "breton"
+    },
+    "pempvet": {
+      "option": "breton"
+    },
+    "captionsbulgarian": {
+      "option": "bulgarian"
+    },
+    "datebulgarian": {
+      "option": "bulgarian"
+    },
+    "extrasbulgarian": {
+      "option": "bulgarian"
+    },
+    "noextrasbulgarian": {
+      "option": "bulgarian"
+    },
+    "Bulgarian": {
+      "option": "bulgarian"
+    },
+    "English": {
+      "option": "mongolian"
+    },
+    "Bul": {
+      "option": "bulgarian"
+    },
+    "Bg": {
+      "option": "bulgarian"
+    },
+    "selectbglanguage": {
+      "option": "bulgarian"
+    },
+    "Eng": {
+      "option": "mongolian"
+    },
+    "selectenglanguage": {
+      "option": "bulgarian"
+    },
+    "lat": {
+      "option": "mongolian",
+      "detail": "⪫",
+      "documentation": "LARGER THAN"
+    },
+    "todayRoman": {
+      "option": "serbianc"
+    },
+    "weekdaynamebulgarian{}": {
+      "snippet": "weekdaynamebulgarian{${1:number}}",
+      "option": "bulgarian"
+    },
+    "abvon": {
+      "option": "bulgarian"
+    },
+    "abvoff": {
+      "option": "bulgarian"
+    },
+    "cyrxtounicode": {
+      "option": "bulgarian"
+    },
+    "Romannumeral{}": {
+      "snippet": "Romannumeral{${1:number}}",
+      "option": "macedonian"
+    },
+    "lastJulianDatebulgarian{}": {
+      "snippet": "lastJulianDatebulgarian{${1:number}}",
+      "option": "bulgarian"
+    },
+    "firstGregorianDatebulgarian{}": {
+      "snippet": "firstGregorianDatebulgarian{${1:number}}",
+      "option": "bulgarian"
+    },
+    "abbgyear": {
+      "option": "ukrainian"
+    },
+    "No": {
+      "option": "ukrainian"
+    },
+    "captionscatalan": {
+      "option": "catalan"
+    },
+    "datecatalan": {
+      "option": "catalan"
+    },
+    "extrascatalan": {
+      "option": "catalan"
+    },
+    "noextrascatalan": {
+      "option": "catalan"
+    },
+    "catalanhyphenmins": {
+      "option": "catalan"
+    },
+    "lgem": {
+      "option": "catalan"
+    },
+    "Lgem": {
+      "option": "catalan"
+    },
+    "up{}": {
+      "snippet": "up{${1:text}}",
+      "option": "acadian"
+    },
+    "dieresis{}": {
+      "snippet": "dieresis{${1:arg}}",
+      "option": "catalan"
+    },
+    "captionscroatian": {
+      "option": "croatian"
+    },
+    "datecroatian": {
+      "option": "croatian"
+    },
+    "extrascroatian": {
+      "option": "croatian"
+    },
+    "noextrascroatian": {
+      "option": "croatian"
+    },
+    "captionsczech": {
+      "option": "czech"
+    },
+    "dateczech": {
+      "option": "czech"
+    },
+    "extrasczech": {
+      "option": "czech"
+    },
+    "noextrasczech": {
+      "option": "czech"
+    },
+    "q{}": {
+      "snippet": "q{${1:arg}}",
+      "option": "slovak"
+    },
+    "w{}": {
+      "snippet": "w{${1:arg}}",
+      "option": "czech"
+    },
+    "uv{}": {
+      "snippet": "uv{${1:arg}}",
+      "option": "slovak"
+    },
+    "csprimeson": {
+      "option": "czech"
+    },
+    "csprimesoff": {
+      "option": "czech"
+    },
+    "sq": {
+      "option": "slovak"
+    },
+    "lcaron": {
+      "option": "slovak"
+    },
+    "Lcaron": {
+      "option": "slovak"
+    },
+    "clqq": {
+      "option": "slovak"
+    },
+    "crqq": {
+      "option": "slovak"
+    },
+    "clq": {
+      "option": "slovak"
+    },
+    "crq": {
+      "option": "slovak"
+    },
+    "captionsdanish": {
+      "option": "danish"
+    },
+    "datedanish": {
+      "option": "danish"
+    },
+    "extrasdanish": {
+      "option": "danish"
+    },
+    "noextrasdanish": {
+      "option": "danish"
+    },
+    "captionsdutch": {
+      "option": "dutch"
+    },
+    "datedutch": {
+      "option": "dutch"
+    },
+    "extrasdutch": {
+      "option": "dutch"
+    },
+    "noextrasdutch": {
+      "option": "dutch"
+    },
+    "dutchhyphenmins": {
+      "option": "dutch"
+    },
+    "captionsafrikaans": {
+      "option": "afrikaans"
+    },
+    "dateafrikaans": {
+      "option": "afrikaans"
+    },
+    "extrasafrikaans": {
+      "option": "afrikaans"
+    },
+    "noextrasafrikaans": {
+      "option": "afrikaans"
+    },
+    "afrikaanshyphenmins": {
+      "option": "afrikaans"
+    },
+    "captionsenglish": {
+      "option": "english"
+    },
+    "dateenglish": {
+      "option": "english"
+    },
+    "extrasenglish": {
+      "option": "english"
+    },
+    "noextrasenglish": {
+      "option": "english"
+    },
+    "englishhyphenmins": {
+      "option": "mongolian"
+    },
+    "britishhyphenmins": {
+      "option": "USenglish"
+    },
+    "americanhyphenmins": {
+      "option": "USenglish"
+    },
+    "captionsamerican": {
+      "option": "american"
+    },
+    "dateamerican": {
+      "option": "american"
+    },
+    "extrasamerican": {
+      "option": "american"
+    },
+    "noextrasamerican": {
+      "option": "american"
+    },
+    "captionsaustralian": {
+      "option": "australian"
+    },
+    "dateaustralian": {
+      "option": "australian"
+    },
+    "extrasaustralian": {
+      "option": "australian"
+    },
+    "noextrasaustralian": {
+      "option": "australian"
+    },
+    "australianhyphenmins": {
+      "option": "australian"
+    },
+    "captionsbritish": {
+      "option": "british"
+    },
+    "datebritish": {
+      "option": "british"
+    },
+    "extrasbritish": {
+      "option": "british"
+    },
+    "noextrasbritish": {
+      "option": "british"
+    },
+    "captionscanadian": {
+      "option": "canadian"
+    },
+    "datecanadian": {
+      "option": "canadian"
+    },
+    "extrascanadian": {
+      "option": "canadian"
+    },
+    "noextrascanadian": {
+      "option": "canadian"
+    },
+    "canadianhyphenmins": {
+      "option": "canadian"
+    },
+    "captionsnewzealand": {
+      "option": "newzealand"
+    },
+    "datenewzealand": {
+      "option": "newzealand"
+    },
+    "extrasnewzealand": {
+      "option": "newzealand"
+    },
+    "noextrasnewzealand": {
+      "option": "newzealand"
+    },
+    "newzealandhyphenmins": {
+      "option": "newzealand"
+    },
+    "captionsUKenglish": {
+      "option": "UKenglish"
+    },
+    "dateUKenglish": {
+      "option": "UKenglish"
+    },
+    "extrasUKenglish": {
+      "option": "UKenglish"
+    },
+    "noextrasUKenglish": {
+      "option": "UKenglish"
+    },
+    "captionsUSenglish": {
+      "option": "USenglish"
+    },
+    "dateUSenglish": {
+      "option": "USenglish"
+    },
+    "extrasUSenglish": {
+      "option": "USenglish"
+    },
+    "noextrasUSenglish": {
+      "option": "USenglish"
+    },
+    "captionsesperanto": {
+      "option": "esperanto"
+    },
+    "dateesperanto": {
+      "option": "esperanto"
+    },
+    "extrasesperanto": {
+      "option": "esperanto"
+    },
+    "noextrasesperanto": {
+      "option": "esperanto"
+    },
+    "Esper{}": {
+      "snippet": "Esper{${1:counter}}",
+      "option": "esperanto"
+    },
+    "esper{}": {
+      "snippet": "esper{${1:counter}}",
+      "option": "esperanto"
+    },
+    "hodiau": {
+      "option": "esperanto"
+    },
+    "hodiaun": {
+      "option": "esperanto"
+    },
+    "captionsestonian": {
+      "option": "estonian"
+    },
+    "dateestonian": {
+      "option": "estonian"
+    },
+    "extrasestonian": {
+      "option": "estonian"
+    },
+    "noextrasestonian": {
+      "option": "estonian"
+    },
+    "estonianhyphenmins": {
+      "option": "estonian"
+    },
+    "captionsfinnish": {
+      "option": "finnish"
+    },
+    "datefinnish": {
+      "option": "finnish"
+    },
+    "extrasfinnish": {
+      "option": "finnish"
+    },
+    "noextrasfinnish": {
+      "option": "finnish"
+    },
+    "finnishhyphenmins": {
+      "option": "finnish"
+    },
+    "frenchsetup{}": {
+      "snippet": "frenchsetup{${1:options}}",
+      "option": "acadian",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "frenchbsetup{}": {
+      "snippet": "frenchbsetup{${1:options}}",
+      "option": "acadian",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "AddThinSpaceBeforeFootnotes": {
+      "option": "acadian"
+    },
+    "AutoSpaceBeforeFDP": {
+      "option": "acadian"
+    },
+    "bname{}": {
+      "snippet": "bname{${1:text}}",
+      "option": "acadian"
+    },
+    "bsc{}": {
+      "snippet": "bsc{${1:text}}",
+      "option": "acadian"
+    },
+    "CaptionSeparator": {
+      "option": "acadian"
+    },
+    "captionsfrench": {
+      "option": "acadian"
+    },
+    "dateacadian": {
+      "option": "acadian"
+    },
+    "datefrench": {
+      "option": "acadian"
+    },
+    "DecimalMathComma": {
+      "option": "acadian"
+    },
+    "degres": {
+      "option": "acadian"
+    },
+    "descindentFB": {
+      "option": "acadian"
+    },
+    "dotFFN": {
+      "option": "acadian"
+    },
+    "extrasfrench": {
+      "option": "acadian"
+    },
+    "FBcolonspace": {
+      "option": "acadian"
+    },
+    "FBdatebox": {
+      "option": "acadian"
+    },
+    "FBdatespace": {
+      "option": "acadian"
+    },
+    "FBeverylineguill": {
+      "option": "acadian"
+    },
+    "FBfigtabshape": {
+      "option": "acadian"
+    },
+    "FBfnindent": {
+      "option": "acadian"
+    },
+    "FBfnmarkspace": {
+      "option": "acadian"
+    },
+    "FBFrenchFootnotesfalse": {
+      "option": "acadian"
+    },
+    "FBFrenchFootnotestrue": {
+      "option": "acadian"
+    },
+    "FBFrenchSuperscriptstrue": {
+      "option": "acadian"
+    },
+    "FBGlobalLayoutFrenchtrue": {
+      "option": "acadian"
+    },
+    "FBgspchar": {
+      "option": "acadian"
+    },
+    "FBguillopen": {
+      "option": "acadian"
+    },
+    "FBguillspace": {
+      "option": "acadian"
+    },
+    "FBInnerGuillSinglefalse": {
+      "option": "acadian"
+    },
+    "FBInnerGuillSingletrue": {
+      "option": "acadian"
+    },
+    "FBListItemsAsParfalse": {
+      "option": "acadian"
+    },
+    "FBListItemsAsPartrue": {
+      "option": "acadian"
+    },
+    "FBLowercaseSuperscriptstrue": {
+      "option": "acadian"
+    },
+    "FBmedkern": {
+      "option": "acadian"
+    },
+    "FBPartNameFulltrue": {
+      "option": "acadian"
+    },
+    "FBsetspaces[]{}{}{}{}": {
+      "snippet": "FBsetspaces[${5:language}]{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
+      "option": "acadian"
+    },
+    "FBsetspaces{}{}{}{}": {
+      "snippet": "FBsetspaces{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
+      "option": "acadian"
+    },
+    "FBSmallCapsFigTabCaptionstrue": {
+      "option": "acadian"
+    },
+    "FBStandardEnumerateEnvtrue": {
+      "option": "acadian"
+    },
+    "FBStandardItemizeEnvtrue": {
+      "option": "acadian"
+    },
+    "FBStandardItemLabelstrue": {
+      "option": "acadian"
+    },
+    "FBStandardLayouttrue": {
+      "option": "acadian"
+    },
+    "FBStandardListSpacingtrue": {
+      "option": "acadian"
+    },
+    "FBStandardListstrue": {
+      "option": "acadian"
+    },
+    "FBsupR": {
+      "option": "acadian"
+    },
+    "FBsupS": {
+      "option": "acadian"
+    },
+    "FBtextellipsis": {
+      "option": "acadian"
+    },
+    "FBthickkern": {
+      "option": "acadian"
+    },
+    "FBthinspace": {
+      "option": "acadian"
+    },
+    "FBthousandsep": {
+      "option": "acadian"
+    },
+    "FBWarning{}": {
+      "snippet": "FBWarning{${1:message}}",
+      "option": "acadian"
+    },
+    "fg": {
+      "option": "acadian"
+    },
+    "fgi": {
+      "option": "acadian"
+    },
+    "fgii": {
+      "option": "acadian"
+    },
+    "fprimo)": {
+      "option": "acadian"
+    },
+    "frenchdate{}{}{}": {
+      "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
+      "option": "acadian"
+    },
+    "FrenchEnumerate{}": {
+      "snippet": "FrenchEnumerate{${1:arg}}",
+      "option": "acadian"
+    },
+    "FrenchFootnotes": {
+      "option": "acadian"
+    },
+    "FrenchLabelItem": {
+      "option": "acadian"
+    },
+    "frenchpartfirst": {
+      "option": "acadian"
+    },
+    "frenchpartsecond": {
+      "option": "acadian"
+    },
+    "FrenchPopularEnumerate{}": {
+      "snippet": "FrenchPopularEnumerate{${1:arg}}",
+      "option": "acadian"
+    },
+    "frenchtoday": {
+      "option": "acadian"
+    },
+    "Frlabelitemi": {
+      "option": "acadian"
+    },
+    "Frlabelitemii": {
+      "option": "acadian"
+    },
+    "Frlabelitemiii": {
+      "option": "acadian"
+    },
+    "Frlabelitemiv": {
+      "option": "acadian"
+    },
+    "frquote{}": {
+      "snippet": "frquote{${1:text}}",
+      "option": "acadian"
+    },
+    "fup{}": {
+      "snippet": "fup{${1:text}}",
+      "option": "acadian"
+    },
+    "ieme": {
+      "option": "acadian"
+    },
+    "iemes": {
+      "option": "acadian"
+    },
+    "ier": {
+      "option": "acadian"
+    },
+    "iere": {
+      "option": "acadian"
+    },
+    "ieres": {
+      "option": "acadian"
+    },
+    "iers": {
+      "option": "acadian"
+    },
+    "ifFBAutoSpaceFootnotes": {
+      "option": "acadian"
+    },
+    "ifFBCompactItemize": {
+      "option": "acadian"
+    },
+    "ifFBCustomiseFigTabCaptions": {
+      "option": "acadian"
+    },
+    "ifFBfrench": {
+      "option": "acadian"
+    },
+    "ifFBFrenchFootnotes": {
+      "option": "acadian"
+    },
+    "ifFBFrenchSuperscripts": {
+      "option": "acadian"
+    },
+    "ifFBGlobalLayoutFrench": {
+      "option": "acadian"
+    },
+    "ifFBIndentFirst": {
+      "option": "acadian"
+    },
+    "ifFBINGuillSpace": {
+      "option": "acadian"
+    },
+    "ifFBListItemsAsPar": {
+      "option": "acadian"
+    },
+    "ifFBListOldLayout": {
+      "option": "acadian"
+    },
+    "ifFBLowercaseSuperscripts": {
+      "option": "acadian"
+    },
+    "ifFBLuaTeX": {
+      "option": "acadian"
+    },
+    "ifFBOldFigTabCaptions": {
+      "option": "acadian"
+    },
+    "ifFBOriginalTypewriter": {
+      "option": "acadian"
+    },
+    "ifFBPartNameFull": {
+      "option": "acadian"
+    },
+    "ifFBShowOptions": {
+      "option": "acadian"
+    },
+    "ifFBSmallCapsFigTabCaptions": {
+      "option": "acadian"
+    },
+    "ifFBStandardEnumerateEnv": {
+      "option": "acadian"
+    },
+    "ifFBStandardItemizeEnv": {
+      "option": "acadian"
+    },
+    "ifFBStandardItemLabels": {
+      "option": "acadian"
+    },
+    "ifFBStandardLayout": {
+      "option": "acadian"
+    },
+    "ifFBStandardLists": {
+      "option": "acadian"
+    },
+    "ifFBStandardListSpacing": {
+      "option": "acadian"
+    },
+    "ifFBSuppressWarning": {
+      "option": "acadian"
+    },
+    "ifFBThinColonSpace": {
+      "option": "acadian"
+    },
+    "ifFBThinSpaceInFrenchNumbers": {
+      "option": "acadian"
+    },
+    "ifFBunicode": {
+      "option": "acadian"
+    },
+    "ifFBXeTeX": {
+      "option": "acadian"
+    },
+    "ifLaTeXe": {
+      "option": "acadian"
+    },
+    "kernFFN": {
+      "option": "acadian"
+    },
+    "labelindentFB": {
+      "option": "acadian"
+    },
+    "labelwidthFB": {
+      "option": "acadian"
+    },
+    "leftmarginFB": {
+      "option": "acadian"
+    },
+    "listfigurename": {
+      "option": "acadian"
+    },
+    "listindentFB": {
+      "option": "acadian"
+    },
+    "no": {
+      "option": "acadian"
+    },
+    "NoAutoSpaceBeforeFDP": {
+      "option": "acadian"
+    },
+    "NoAutoSpacing": {
+      "option": "acadian"
+    },
+    "NoEveryParQuote": {
+      "option": "acadian"
+    },
+    "noextrasfrench": {
+      "option": "acadian"
+    },
+    "nombre{}": {
+      "snippet": "nombre{${1:arg}}",
+      "option": "acadian"
+    },
+    "nos": {
+      "option": "acadian"
+    },
+    "Nos": {
+      "option": "acadian"
+    },
+    "og": {
+      "option": "acadian"
+    },
+    "ogi": {
+      "option": "acadian"
+    },
+    "ogii": {
+      "option": "acadian"
+    },
+    "parindentFFN": {
+      "option": "acadian"
+    },
+    "partfirst": {
+      "option": "acadian"
+    },
+    "partnameord": {
+      "option": "acadian"
+    },
+    "partsecond": {
+      "option": "acadian"
+    },
+    "primo": {
+      "option": "acadian"
+    },
+    "quarto": {
+      "option": "acadian"
+    },
+    "rmfamilyFB": {
+      "option": "acadian"
+    },
+    "secundo": {
+      "option": "acadian"
+    },
+    "sffamilyFB": {
+      "option": "acadian"
+    },
+    "StandardFootnotes": {
+      "option": "acadian"
+    },
+    "StandardMathComma": {
+      "option": "acadian"
+    },
+    "tertio": {
+      "option": "acadian"
+    },
+    "ttfamilyFB": {
+      "option": "acadian"
+    },
+    "xspace": {
+      "option": "acadian"
+    },
+    "acadiandate{}{}{}": {
+      "snippet": "acadiandate{${1:day}}{${2:month}}{${3:year}}",
+      "option": "acadian"
+    },
+    "acadiantoday": {
+      "option": "acadian"
+    },
+    "captionsacadian": {
+      "option": "acadian"
+    },
+    "extrasacadian": {
+      "option": "acadian"
+    },
+    "noextrasacadian": {
+      "option": "acadian"
+    },
+    "captionsfriulan": {
+      "option": "friulan"
+    },
+    "datefriulan": {
+      "option": "friulan"
+    },
+    "extrasfriulan": {
+      "option": "friulan"
+    },
+    "noextrasfriulan": {
+      "option": "friulan"
+    },
+    "friulanhyphenmins": {
+      "option": "friulan"
+    },
+    "captionsgalician": {
+      "option": "galician"
+    },
+    "dategalician": {
+      "option": "galician"
+    },
+    "extrasgalician": {
+      "option": "galician"
+    },
+    "noextrasgalician": {
+      "option": "galician"
+    },
+    "selectgalician": {
+      "option": "galician"
+    },
+    "selectgalician*": {
+      "option": "galician"
+    },
+    "layoutgalician": {
+      "option": "galician"
+    },
+    "textgalician": {
+      "option": "galician"
+    },
+    "shorthandsgalician": {
+      "option": "galician"
+    },
+    "mathgalician": {
+      "option": "galician"
+    },
+    "galiciandatedo": {
+      "option": "galician"
+    },
+    "galiciandatede": {
+      "option": "galician"
+    },
+    "deactivatetilden": {
+      "option": "galician"
+    },
+    "galiciandeactivate{}": {
+      "snippet": "galiciandeactivate{${1:characters}}",
+      "option": "galician"
+    },
+    "decimalcomma": {
+      "option": "spanish"
+    },
+    "decimalpoint": {
+      "option": "spanish"
+    },
+    "galiciandecimal{}": {
+      "snippet": "galiciandecimal{${1:math}}",
+      "option": "galician"
+    },
+    "sptext{}": {
+      "snippet": "sptext{${1:text}}",
+      "option": "spanish"
+    },
+    "sptextfont": {
+      "option": "galician"
+    },
+    "accentedoperators": {
+      "option": "spanish"
+    },
+    "unaccentedoperators": {
+      "option": "spanish"
+    },
+    "spacedoperators": {
+      "option": "spanish"
+    },
+    "unspacedoperators": {
+      "option": "spanish"
+    },
+    "lquoti": {
+      "option": "spanish"
+    },
+    "rquoti": {
+      "option": "spanish"
+    },
+    "lquotii": {
+      "option": "spanish"
+    },
+    "rquotii": {
+      "option": "spanish"
+    },
+    "lquotiii": {
+      "option": "spanish"
+    },
+    "rquotiii": {
+      "option": "spanish"
+    },
+    "activatequoting": {
+      "option": "spanish"
+    },
+    "deactivatequoting": {
+      "option": "spanish"
+    },
+    "lsc{}": {
+      "snippet": "lsc{${1:text}}",
+      "option": "spanish"
+    },
+    "msc{}": {
+      "snippet": "msc{${1:text}}",
+      "option": "galician"
+    },
+    "captionsgerman": {
+      "option": "german"
+    },
+    "dategerman": {
+      "option": "german"
+    },
+    "extrasgerman": {
+      "option": "german"
+    },
+    "noextrasgerman": {
+      "option": "german"
+    },
+    "tosstrue": {
+      "option": "swissgerman"
+    },
+    "tossfalse": {
+      "option": "swissgerman"
+    },
+    "mdqon": {
+      "option": "uppersorbian"
+    },
+    "mdqoff": {
+      "option": "uppersorbian"
+    },
+    "ck": {
+      "option": "uppersorbian"
+    },
+    "ifcapsz": {
+      "option": "swissgerman"
+    },
+    "capsztrue": {
+      "option": "swissgerman"
+    },
+    "capszfalse": {
+      "option": "swissgerman"
+    },
+    "mkngender": {
+      "option": "swissgerman"
+    },
+    "captionsaustrian": {
+      "option": "austrian"
+    },
+    "dateaustrian": {
+      "option": "austrian"
+    },
+    "extrasaustrian": {
+      "option": "austrian"
+    },
+    "noextrasaustrian": {
+      "option": "austrian"
+    },
+    "captionsswissgerman": {
+      "option": "swissgerman"
+    },
+    "dateswissgerman": {
+      "option": "swissgerman"
+    },
+    "extrasswissgerman": {
+      "option": "swissgerman"
+    },
+    "noextrasswissgerman": {
+      "option": "swissgerman"
+    },
+    "captionsngerman": {
+      "option": "ngerman"
+    },
+    "datengerman": {
+      "option": "ngerman"
+    },
+    "extrasngerman": {
+      "option": "ngerman"
+    },
+    "noextrasngerman": {
+      "option": "ngerman"
+    },
+    "ntosstrue": {
+      "option": "nswissgerman"
+    },
+    "ntossfalse": {
+      "option": "nswissgerman"
+    },
+    "captionsnaustrian": {
+      "option": "naustrian"
+    },
+    "datenaustrian": {
+      "option": "naustrian"
+    },
+    "extrasnaustrian": {
+      "option": "naustrian"
+    },
+    "noextrasnaustrian": {
+      "option": "naustrian"
+    },
+    "captionsnswissgerman": {
+      "option": "nswissgerman"
+    },
+    "datenswissgerman": {
+      "option": "nswissgerman"
+    },
+    "extrasnswissgerman": {
+      "option": "nswissgerman"
+    },
+    "noextrasnswissgerman": {
+      "option": "nswissgerman"
+    },
+    "captionsgreek": {
+      "option": "greek.ancient"
+    },
+    "dategreek": {
+      "option": "greek.ancient"
+    },
+    "extrasgreek": {
+      "option": "greek.ancient"
+    },
+    "noextrasgreek": {
+      "option": "greek.ancient"
+    },
+    "greekscript": {
+      "option": "greek.ancient"
+    },
+    "greektext": {
+      "option": "greek.ancient"
+    },
+    "ensuregreek{}": {
+      "snippet": "ensuregreek{${1:text}}",
+      "option": "greek.ancient"
+    },
+    "lgrfont{}": {
+      "snippet": "lgrfont{${1:text}}",
+      "option": "greek"
+    },
+    "textgreek{}": {
+      "snippet": "textgreek{${1:text}}",
+      "option": "greek.ancient"
+    },
+    "greeknumeral{}": {
+      "snippet": "greeknumeral{${1:number}}",
+      "option": "greek.ancient"
+    },
+    "Greeknumeral{}": {
+      "snippet": "Greeknumeral{${1:number}}",
+      "option": "greek.ancient"
+    },
+    "greeknumeralsix": {
+      "option": "greek"
+    },
+    "greeknumeralSix": {
+      "option": "greek"
+    },
+    "greeknumeralninety": {
+      "option": "greek"
+    },
+    "greeknumeralNinety": {
+      "option": "greek"
+    },
+    "greekfontencoding": {
+      "option": "greek.ancient"
+    },
+    "BabelGreekRestoreFontEncoding": {
+      "option": "greek"
+    },
+    "BabelGreekPreviousFontEncoding": {
+      "option": "greek"
+    },
+    "EnsureStandardFontEncoding": {
+      "option": "greek"
+    },
+    "textol{}": {
+      "snippet": "textol{${1:text}}",
+      "option": "greek.ancient"
+    },
+    "outlfamily": {
+      "option": "greek.ancient"
+    },
+    "greekhyphenmins": {
+      "option": "greek.ancient"
+    },
+    "Grtoday": {
+      "option": "greek.ancient"
+    },
+    "anwtonos": {
+      "option": "greek.ancient"
+    },
+    "katwtonos": {
+      "option": "greek.ancient"
+    },
+    "qoppa": {
+      "option": "greek.ancient",
+      "detail": "ϙ",
+      "documentation": "GREEK SMALL LETTER ARCHAIC KOPPA"
+    },
+    "varqoppa": {
+      "option": "greek.ancient"
+    },
+    "stigma": {
+      "option": "greek.ancient",
+      "detail": "ϛ",
+      "documentation": "GREEK SMALL LETTER STIGMA"
+    },
+    "sampi": {
+      "option": "greek.ancient",
+      "detail": "ϡ",
+      "documentation": "GREEK SMALL LETTER SAMPI"
+    },
+    "Digamma": {
+      "option": "greek.ancient",
+      "detail": "Ϝ",
+      "documentation": "capital digamma"
+    },
+    "ddigamma": {
+      "option": "greek.ancient"
+    },
+    "euro": {
+      "option": "greek.ancient",
+      "detail": "€",
+      "documentation": "EURO SIGN"
+    },
+    "permill": {
+      "option": "greek.ancient"
+    },
+    "textAlpha": {
+      "option": "greek.ancient"
+    },
+    "textBeta": {
+      "option": "greek.ancient"
+    },
+    "textGamma": {
+      "option": "greek.ancient"
+    },
+    "textDelta": {
+      "option": "greek.ancient"
+    },
+    "textEpsilon": {
+      "option": "greek.ancient"
+    },
+    "textZeta": {
+      "option": "greek.ancient"
+    },
+    "textEta": {
+      "option": "greek.ancient"
+    },
+    "textTheta": {
+      "option": "greek.ancient"
+    },
+    "textIota": {
+      "option": "greek.ancient"
+    },
+    "textKappa": {
+      "option": "greek.ancient"
+    },
+    "textLambda": {
+      "option": "greek.ancient"
+    },
+    "textMu": {
+      "option": "greek.ancient"
+    },
+    "textNu": {
+      "option": "greek.ancient"
+    },
+    "textXi": {
+      "option": "greek.ancient"
+    },
+    "textOmicron": {
+      "option": "greek.ancient"
+    },
+    "textPi": {
+      "option": "greek.ancient"
+    },
+    "textRho": {
+      "option": "greek.ancient"
+    },
+    "textSigma": {
+      "option": "greek.ancient"
+    },
+    "textTau": {
+      "option": "greek.ancient"
+    },
+    "textUpsilon": {
+      "option": "greek.ancient"
+    },
+    "textPhi": {
+      "option": "greek.ancient"
+    },
+    "textChi": {
+      "option": "greek.ancient"
+    },
+    "textPsi": {
+      "option": "greek.ancient"
+    },
+    "textOmega": {
+      "option": "greek.ancient"
+    },
+    "textalpha": {
+      "option": "greek.ancient"
+    },
+    "textbeta": {
+      "option": "greek.ancient"
+    },
+    "textgamma": {
+      "option": "greek.ancient"
+    },
+    "textdelta": {
+      "option": "greek.ancient"
+    },
+    "textepsilon": {
+      "option": "greek.ancient"
+    },
+    "textzeta": {
+      "option": "greek.ancient"
+    },
+    "texteta": {
+      "option": "greek.ancient"
+    },
+    "texttheta": {
+      "option": "greek.ancient"
+    },
+    "textiota": {
+      "option": "greek.ancient"
+    },
+    "textkappa": {
+      "option": "greek.ancient"
+    },
+    "textlambda": {
+      "option": "greek.ancient"
+    },
+    "textmu": {
+      "option": "greek.ancient"
+    },
+    "textnu": {
+      "option": "greek.ancient"
+    },
+    "textxi": {
+      "option": "greek.ancient"
+    },
+    "textomicron": {
+      "option": "greek.ancient"
+    },
+    "textpi": {
+      "option": "greek.ancient"
+    },
+    "textrho": {
+      "option": "greek.ancient"
+    },
+    "textsigma": {
+      "option": "greek.ancient"
+    },
+    "textfinalsigma": {
+      "option": "greek.ancient"
+    },
+    "textautosigma": {
+      "option": "greek.ancient"
+    },
+    "texttau": {
+      "option": "greek.ancient"
+    },
+    "textupsilon": {
+      "option": "greek.ancient"
+    },
+    "textphi": {
+      "option": "greek.ancient"
+    },
+    "textchi": {
+      "option": "greek.ancient"
+    },
+    "textpsi": {
+      "option": "greek.ancient"
+    },
+    "textomega": {
+      "option": "greek.ancient"
+    },
+    "textpentedeka": {
+      "option": "greek.ancient"
+    },
+    "textpentehekaton": {
+      "option": "greek.ancient"
+    },
+    "textpenteqilioi": {
+      "option": "greek.ancient"
+    },
+    "textstigma": {
+      "option": "greek.ancient"
+    },
+    "textvarstigma": {
+      "option": "greek.ancient"
+    },
+    "textKoppa": {
+      "option": "greek.ancient"
+    },
+    "textkoppa": {
+      "option": "greek.ancient"
+    },
+    "textqoppa": {
+      "option": "greek.ancient"
+    },
+    "textQoppa": {
+      "option": "greek.ancient"
+    },
+    "textStigma": {
+      "option": "greek.ancient"
+    },
+    "textSampi": {
+      "option": "greek.ancient"
+    },
+    "textsampi": {
+      "option": "greek.ancient"
+    },
+    "textanoteleia": {
+      "option": "greek.ancient"
+    },
+    "texterotimatiko": {
+      "option": "greek.ancient"
+    },
+    "textdigamma": {
+      "option": "greek.ancient"
+    },
+    "textDigamma": {
+      "option": "greek.ancient"
+    },
+    "textdexiakeraia": {
+      "option": "greek.ancient"
+    },
+    "textaristerikeraia": {
+      "option": "greek.ancient"
+    },
+    "textvarsigma": {
+      "option": "greek.ancient"
+    },
+    "textstigmagreek": {
+      "option": "greek.ancient"
+    },
+    "textkoppagreek": {
+      "option": "greek.ancient"
+    },
+    "textStigmagreek": {
+      "option": "greek.ancient"
+    },
+    "textSampigreek": {
+      "option": "greek.ancient"
+    },
+    "textsampigreek": {
+      "option": "greek.ancient"
+    },
+    "textdigammagreek": {
+      "option": "greek.ancient"
+    },
+    "textDigammagreek": {
+      "option": "greek.ancient"
+    },
+    "textnumeralsigngreek": {
+      "option": "greek.ancient"
+    },
+    "textnumeralsignlowergreek": {
+      "option": "greek.ancient"
+    },
+    "textpentemuria": {
+      "option": "greek.ancient"
+    },
+    "textpercent": {
+      "option": "greek.ancient"
+    },
+    "textmicro": {
+      "option": "greek.ancient"
+    },
+    "textschwa": {
+      "option": "greek.ancient"
+    },
+    "textampersand": {
+      "option": "greek.ancient"
+    },
+    "textvarbeta": {
+      "option": "greek.ancient"
+    },
+    "textvarkappa": {
+      "option": "greek.ancient"
+    },
+    "textvarTheta": {
+      "option": "greek.ancient"
+    },
+    "textvartheta": {
+      "option": "greek.ancient"
+    },
+    "textvarpi": {
+      "option": "greek.ancient"
+    },
+    "textvarrho": {
+      "option": "greek.ancient"
+    },
+    "textvarepsilon": {
+      "option": "greek.ancient"
+    },
+    "textvarphi": {
+      "option": "greek.ancient"
+    },
+    "accdialytika{}": {
+      "snippet": "accdialytika{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "acctonos{}": {
+      "snippet": "acctonos{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accdasia{}": {
+      "snippet": "accdasia{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accpsili{}": {
+      "snippet": "accpsili{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accvaria{}": {
+      "snippet": "accvaria{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accperispomeni{}": {
+      "snippet": "accperispomeni{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "prosgegrammeni": {
+      "option": "greek.ancient"
+    },
+    "ypogegrammeni": {
+      "option": "greek.ancient"
+    },
+    "accdialytikaperispomeni{}": {
+      "snippet": "accdialytikaperispomeni{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accdialytikatonos{}": {
+      "snippet": "accdialytikatonos{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accdialytikavaria{}": {
+      "snippet": "accdialytikavaria{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accdasiaperispomeni{}": {
+      "snippet": "accdasiaperispomeni{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accdasiavaria{}": {
+      "snippet": "accdasiavaria{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accdasiaoxia{}": {
+      "snippet": "accdasiaoxia{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accpsiliperispomeni{}": {
+      "snippet": "accpsiliperispomeni{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accpsilioxia{}": {
+      "snippet": "accpsilioxia{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accpsilivaria{}": {
+      "snippet": "accpsilivaria{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accinvertedbrevebelow{}": {
+      "snippet": "accinvertedbrevebelow{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "textsubarch{}": {
+      "snippet": "textsubarch{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "accbrevebelow{}": {
+      "snippet": "accbrevebelow{${1:arg}}",
+      "option": "greek.ancient"
+    },
+    "captionspolutonikogreek": {
+      "option": "greek.polutoniko"
+    },
+    "datepolutonikogreek": {
+      "option": "greek.polutoniko"
+    },
+    "extraspolutonikogreek": {
+      "option": "greek.polutoniko"
+    },
+    "noextraspolutonikogreek": {
+      "option": "greek.polutoniko"
+    },
+    "captionsancientgreek": {
+      "option": "greek.ancient"
+    },
+    "extrasancientgreek": {
+      "option": "greek.ancient"
+    },
+    "captionsicelandic": {
+      "option": "icelandic"
+    },
+    "dateicelandic": {
+      "option": "icelandic"
+    },
+    "extrasicelandic": {
+      "option": "icelandic"
+    },
+    "noextrasicelandic": {
+      "option": "icelandic"
+    },
+    "tala{}": {
+      "snippet": "tala{${1:arg}}",
+      "option": "icelandic"
+    },
+    "grada{}": {
+      "snippet": "grada{${1:arg}}",
+      "option": "icelandic"
+    },
+    "gradur{}": {
+      "snippet": "gradur{${1:arg}}",
+      "option": "icelandic"
+    },
+    "upp{}": {
+      "snippet": "upp{${1:arg}}",
+      "option": "icelandic"
+    },
+    "ilqq": {
+      "option": "icelandic"
+    },
+    "irqq": {
+      "option": "icelandic"
+    },
+    "ilq": {
+      "option": "icelandic"
+    },
+    "irq": {
+      "option": "icelandic"
+    },
+    "iflqq": {
+      "option": "icelandic"
+    },
+    "ifrqq": {
+      "option": "icelandic"
+    },
+    "ifrq": {
+      "option": "icelandic"
+    },
+    "iflq": {
+      "option": "icelandic"
+    },
+    "oob": {
+      "option": "icelandic"
+    },
+    "Oob": {
+      "option": "icelandic"
+    },
+    "ooob": {
+      "option": "icelandic"
+    },
+    "OOob": {
+      "option": "icelandic"
+    },
+    "eob": {
+      "option": "polish"
+    },
+    "Eob": {
+      "option": "polish"
+    },
+    "eeob": {
+      "option": "icelandic"
+    },
+    "EEob": {
+      "option": "icelandic"
+    },
+    "captionsindonesian": {
+      "option": "indonesian"
+    },
+    "dateindonesian": {
+      "option": "indonesian"
+    },
+    "extrasindonesian": {
+      "option": "indonesian"
+    },
+    "noextrasindonesian": {
+      "option": "indonesian"
+    },
+    "indonesianhyphenmins": {
+      "option": "indonesian"
+    },
+    "captionsbahasa": {
+      "option": "bahasa"
+    },
+    "datebahasa": {
+      "option": "bahasa"
+    },
+    "extrasbahasa": {
+      "option": "bahasa"
+    },
+    "noextrasbahasa": {
+      "option": "bahasa"
+    },
+    "bahasahyphenmins": {
+      "option": "bahasa"
+    },
+    "captionsindon": {
+      "option": "indon"
+    },
+    "dateindon": {
+      "option": "indon"
+    },
+    "extrasindon": {
+      "option": "indon"
+    },
+    "noextrasindon": {
+      "option": "indon"
+    },
+    "indonhyphenmins": {
+      "option": "indon"
+    },
+    "captionsbahasai": {
+      "option": "bahasai"
+    },
+    "datebahasai": {
+      "option": "bahasai"
+    },
+    "extrasbahasai": {
+      "option": "bahasai"
+    },
+    "noextrasbahasai": {
+      "option": "bahasai"
+    },
+    "bahasaihyphenmins": {
+      "option": "bahasai"
+    },
+    "captionsinterlingua": {
+      "option": "interlingua"
+    },
+    "dateinterlingua": {
+      "option": "interlingua"
+    },
+    "extrasinterlingua": {
+      "option": "interlingua"
+    },
+    "noextrasinterlingua": {
+      "option": "interlingua"
+    },
+    "interlinguahyphenmins": {
+      "option": "interlingua"
+    },
+    "captionsirish": {
+      "option": "irish"
+    },
+    "dateirish": {
+      "option": "irish"
+    },
+    "extrasirish": {
+      "option": "irish"
+    },
+    "noextrasirish": {
+      "option": "irish"
+    },
+    "irishhyphenmins": {
+      "option": "irish"
+    },
+    "captionsitalian": {
+      "option": "italian"
+    },
+    "dateitalian": {
+      "option": "italian"
+    },
+    "extrasitalian": {
+      "option": "italian"
+    },
+    "noextrasitalian": {
+      "option": "italian"
+    },
+    "italianhyphenmins": {
+      "option": "italian"
+    },
+    "setactivedoublequote": {
+      "option": "italian"
+    },
+    "setISOcompliance": {
+      "option": "italian"
+    },
+    "IntelligentComma": {
+      "option": "italian"
+    },
+    "NoIntelligentComma": {
+      "option": "italian"
+    },
+    "XXIletters": {
+      "option": "italian"
+    },
+    "XXVIletters": {
+      "option": "italian"
+    },
+    "ap{}": {
+      "snippet": "ap{${1:text}}",
+      "option": "italian"
+    },
+    "ped{}": {
+      "snippet": "ped{${1:text}}",
+      "option": "italian"
+    },
+    "unit{}": {
+      "snippet": "unit{${1:unit}}",
+      "option": "italian"
+    },
+    "virgola": {
+      "option": "italian"
+    },
+    "virgoladecimale": {
+      "option": "italian"
+    },
+    "LtxSymbCaporali": {
+      "option": "italian"
+    },
+    "CaporaliFrom{}{}{}{}": {
+      "snippet": "CaporaliFrom{${1:encoding}}{${2:family}}{${3:open guill slot}}{${4:close guill slot}}",
+      "option": "italian"
+    },
+    "captionsjapanese": {
+      "option": "japanese"
+    },
+    "datejapanese": {
+      "option": "japanese"
+    },
+    "extrasjapanese": {
+      "option": "japanese"
+    },
+    "noextrasjapanese": {
+      "option": "japanese"
+    },
+    "prechaptername": {
+      "option": "japanese"
+    },
+    "postchaptername": {
+      "option": "japanese"
+    },
+    "presectionname": {
+      "option": "japanese"
+    },
+    "postsectionname": {
+      "option": "japanese"
+    },
+    "prepartname": {
+      "option": "japanese"
+    },
+    "postpartname": {
+      "option": "japanese"
+    },
+    "captionskurmanji": {
+      "option": "kurmanji"
+    },
+    "datekurmanji": {
+      "option": "kurmanji"
+    },
+    "extraskurmanji": {
+      "option": "kurmanji"
+    },
+    "noextraskurmanji": {
+      "option": "kurmanji"
+    },
+    "datekurmanjialternate": {
+      "option": "kurmanji"
+    },
+    "kurmanjihyphenmins": {
+      "option": "kurmanji"
+    },
+    "ontoday": {
+      "option": "hungarian"
+    },
+    "datesymd": {
+      "option": "swedish"
+    },
+    "datesdmy": {
+      "option": "swedish"
+    },
+    "dategdmy": {
+      "option": "kurmanji"
+    },
+    "januaryname": {
+      "option": "kurmanji"
+    },
+    "februaryname": {
+      "option": "kurmanji"
+    },
+    "marchname": {
+      "option": "kurmanji"
+    },
+    "aprilname": {
+      "option": "kurmanji"
+    },
+    "mayname": {
+      "option": "kurmanji"
+    },
+    "junename": {
+      "option": "kurmanji"
+    },
+    "julyname": {
+      "option": "kurmanji"
+    },
+    "augustname": {
+      "option": "kurmanji"
+    },
+    "septembername": {
+      "option": "kurmanji"
+    },
+    "octobername": {
+      "option": "kurmanji"
+    },
+    "novembername": {
+      "option": "kurmanji"
+    },
+    "decembername": {
+      "option": "kurmanji"
+    },
+    "captionslatin": {
+      "option": "latin"
+    },
+    "datelatin": {
+      "option": "latin"
+    },
+    "extraslatin": {
+      "option": "latin"
+    },
+    "noextraslatin": {
+      "option": "latin"
+    },
+    "ProsodicMarksOn": {
+      "option": "latin"
+    },
+    "ProsodicMarksOff": {
+      "option": "latin"
+    },
+    "captionsclassiclatin": {
+      "option": "classiclatin"
+    },
+    "dateclassiclatin": {
+      "option": "classiclatin"
+    },
+    "extrasclassiclatin": {
+      "option": "classiclatin"
+    },
+    "noextrasclassiclatin": {
+      "option": "classiclatin"
+    },
+    "captionsecclesiasticlatin": {
+      "option": "ecclesiasticlatin"
+    },
+    "dateecclesiasticlatin": {
+      "option": "ecclesiasticlatin"
+    },
+    "extrasecclesiasticlatin": {
+      "option": "ecclesiasticlatin"
+    },
+    "noextrasecclesiasticlatin": {
+      "option": "ecclesiasticlatin"
+    },
+    "captionsmedievallatin": {
+      "option": "medievallatin"
+    },
+    "datemedievallatin": {
+      "option": "medievallatin"
+    },
+    "extrasmedievallatin": {
+      "option": "medievallatin"
+    },
+    "noextrasmedievallatin": {
+      "option": "medievallatin"
+    },
+    "captionslatvian": {
+      "option": "latvian"
+    },
+    "datelatvian": {
+      "option": "latvian"
+    },
+    "extraslatvian": {
+      "option": "latvian"
+    },
+    "noextraslatvian": {
+      "option": "latvian"
+    },
+    "latvianhyphenmins": {
+      "option": "latvian"
+    },
+    "datumaa": {
+      "option": "latvian"
+    },
+    "datums": {
+      "option": "latvian"
+    },
+    "latviangada": {
+      "option": "latvian"
+    },
+    "latviantoday": {
+      "option": "latvian"
+    },
+    "captionslithuanian": {
+      "option": "lithuanian"
+    },
+    "datelithuanian": {
+      "option": "lithuanian"
+    },
+    "extraslithuanian": {
+      "option": "lithuanian"
+    },
+    "noextraslithuanian": {
+      "option": "lithuanian"
+    },
+    "lithuanianhyphenmins": {
+      "option": "lithuanian"
+    },
+    "captionsmacedonian": {
+      "option": "macedonian"
+    },
+    "datemacedonian": {
+      "option": "macedonian"
+    },
+    "extrasmacedonian": {
+      "option": "macedonian"
+    },
+    "noextrasmacedonian": {
+      "option": "macedonian"
+    },
+    "Macedonian": {
+      "option": "macedonian"
+    },
+    "Mkd": {
+      "option": "macedonian"
+    },
+    "Mk": {
+      "option": "macedonian"
+    },
+    "theoremname": {
+      "option": "macedonian"
+    },
+    "corollaryname": {
+      "option": "macedonian"
+    },
+    "lemmaname": {
+      "option": "macedonian"
+    },
+    "overbar{}": {
+      "snippet": "overbar{${1:arg}}",
+      "option": "macedonian"
+    },
+    "textoverline{}": {
+      "snippet": "textoverline{${1:arg}}",
+      "option": "macedonian"
+    },
+    "overbarshort{}": {
+      "snippet": "overbarshort{${1:arg}}",
+      "option": "macedonian"
+    },
+    "textoverlineshort{}": {
+      "snippet": "textoverlineshort{${1:arg}}",
+      "option": "macedonian"
+    },
+    "IfItalic{}{}": {
+      "snippet": "IfItalic{${1:arg1}}{${2:arg2}}",
+      "option": "macedonian"
+    },
+    "tbar{}": {
+      "snippet": "tbar{${1:arg}}",
+      "option": "macedonian"
+    },
+    "captionsmagyar": {
+      "option": "magyar"
+    },
+    "datemagyar": {
+      "option": "magyar"
+    },
+    "extrasmagyar": {
+      "option": "magyar"
+    },
+    "noextrasmagyar": {
+      "option": "magyar"
+    },
+    "ondatemagyar": {
+      "option": "magyar"
+    },
+    "acite*{}": {
+      "snippet": "acite*{${1:keylist}}",
+      "option": "hungarian"
+    },
+    "Acite*{}": {
+      "snippet": "Acite*{${1:keylist}}",
+      "option": "hungarian"
+    },
+    "acite{}": {
+      "snippet": "acite{${1:keylist}}",
+      "option": "hungarian"
+    },
+    "Acite{}": {
+      "snippet": "Acite{${1:keylist}}",
+      "option": "hungarian"
+    },
+    "apageref*{}": {
+      "snippet": "apageref*{${1:label}}",
+      "option": "hungarian"
+    },
+    "Apageref*{}": {
+      "snippet": "Apageref*{${1:label}}",
+      "option": "hungarian"
+    },
+    "apageref{}": {
+      "snippet": "apageref{${1:label}}",
+      "option": "hungarian"
+    },
+    "Apageref{}": {
+      "snippet": "Apageref{${1:label}}",
+      "option": "hungarian"
+    },
+    "aref({})": {
+      "snippet": "aref(${2:{${1:label}}})",
+      "option": "hungarian"
+    },
+    "Aref({})": {
+      "snippet": "Aref(${2:{${1:label}}})",
+      "option": "hungarian"
+    },
+    "aref*{}": {
+      "snippet": "aref*{${1:label}}",
+      "option": "hungarian"
+    },
+    "Aref*{}": {
+      "snippet": "Aref*{${1:label}}",
+      "option": "hungarian"
+    },
+    "aref{}": {
+      "snippet": "aref{${1:label}}",
+      "option": "hungarian"
+    },
+    "Aref{}": {
+      "snippet": "Aref{${1:label}}",
+      "option": "hungarian"
+    },
+    "az*{}": {
+      "snippet": "az*{${1:szó}}",
+      "option": "hungarian"
+    },
+    "Az*{}": {
+      "snippet": "Az*{${1:szó}}",
+      "option": "hungarian"
+    },
+    "az{}": {
+      "snippet": "az{${1:szó}}",
+      "option": "hungarian"
+    },
+    "Az{}": {
+      "snippet": "Az{${1:szó}}",
+      "option": "hungarian"
+    },
+    "azc{}": {
+      "snippet": "azc{${1:keylist}}",
+      "option": "hungarian"
+    },
+    "Azc{}": {
+      "snippet": "Azc{${1:keylist}}",
+      "option": "hungarian"
+    },
+    "azp{}": {
+      "snippet": "azp{${1:label}}",
+      "option": "hungarian"
+    },
+    "Azp{}": {
+      "snippet": "Azp{${1:label}}",
+      "option": "hungarian"
+    },
+    "azr{}": {
+      "snippet": "azr{${1:label}}",
+      "option": "hungarian"
+    },
+    "Azr{}": {
+      "snippet": "Azr{${1:label}}",
+      "option": "hungarian"
+    },
+    "captionlabeldelim": {
+      "option": "hungarian"
+    },
+    "dMf": {
+      "option": "hungarian"
+    },
+    "editorfootnote{}": {
+      "snippet": "editorfootnote{${1:lábjegyzet-szöveg}}",
+      "option": "hungarian"
+    },
+    "emitdate[]{}{}": {
+      "snippet": "emitdate[${3:toldalék}]{${1:formátum}}{${2:dátum}}",
+      "option": "hungarian"
+    },
+    "emitdate{}{}": {
+      "snippet": "emitdate{${1:formátum}}{${2:dátum}}",
+      "option": "hungarian"
+    },
+    "factorial": {
+      "option": "hungarian"
+    },
+    "footnotestyle{}": {
+      "snippet": "footnotestyle{${1:előírás}}",
+      "option": "hungarian"
+    },
+    "hang{}": {
+      "snippet": "hang{${1:bekezdéskezdő jel}}",
+      "option": "hungarian"
+    },
+    "headingfootnote[]{}": {
+      "snippet": "headingfootnote[${2:szám}]{${1:lábjegyzet-szöveg}}",
+      "option": "hungarian"
+    },
+    "headingfootnote{}": {
+      "snippet": "headingfootnote{${1:lábjegyzet-szöveg}}",
+      "option": "hungarian"
+    },
+    "HuComma": {
+      "option": "hungarian"
+    },
+    "hunnewlabel": {
+      "option": "hungarian"
+    },
+    "Hunumeral{}": {
+      "snippet": "Hunumeral{${1:counter}}",
+      "option": "hungarian"
+    },
+    "hunumeral{}": {
+      "snippet": "hunumeral{${1:counter}}",
+      "option": "hungarian"
+    },
+    "huordinal{}": {
+      "snippet": "huordinal{${1:counter}}",
+      "option": "hungarian"
+    },
+    "Huordinal{}": {
+      "snippet": "Huordinal{${1:counter}}",
+      "option": "hungarian"
+    },
+    "magyarDumpHuMin": {
+      "option": "hungarian"
+    },
+    "makeFootnotable{}": {
+      "snippet": "makeFootnotable{${1:környezet-név}}",
+      "option": "hungarian"
+    },
+    "MathBrk{}": {
+      "snippet": "MathBrk{${1:szimbólum}}",
+      "option": "hungarian"
+    },
+    "MathBrkAll{}": {
+      "snippet": "MathBrkAll{${1:szimbólum}}",
+      "option": "hungarian"
+    },
+    "MathReal{}": {
+      "snippet": "MathReal{${1:képlet tizedestörtekkel}}",
+      "option": "hungarian"
+    },
+    "refstruc{}": {
+      "snippet": "refstruc{${1:label}}",
+      "option": "hungarian"
+    },
+    "refstrucparen{}": {
+      "snippet": "refstrucparen{${1:label}}",
+      "option": "hungarian"
+    },
+    "SafeToday": {
+      "option": "hungarian"
+    },
+    "textqq{}": {
+      "snippet": "textqq{${1:szövegközti idézet}}",
+      "option": "hungarian"
+    },
+    "captionshungarian": {
+      "option": "hungarian"
+    },
+    "datehungarian": {
+      "option": "hungarian"
+    },
+    "extrashungarian": {
+      "option": "hungarian"
+    },
+    "noextrashungarian": {
+      "option": "hungarian"
+    },
+    "ondatehungarian": {
+      "option": "hungarian"
+    },
+    "captionsmalay": {
+      "option": "malay"
+    },
+    "datemalay": {
+      "option": "malay"
+    },
+    "extrasmalay": {
+      "option": "malay"
+    },
+    "noextrasmalay": {
+      "option": "malay"
+    },
+    "malayhyphenmins": {
+      "option": "malay"
+    },
+    "captionsbahasam": {
+      "option": "bahasam"
+    },
+    "datebahasam": {
+      "option": "bahasam"
+    },
+    "extrasbahasam": {
+      "option": "bahasam"
+    },
+    "noextrasbahasam": {
+      "option": "bahasam"
+    },
+    "bahasamhyphenmins": {
+      "option": "bahasam"
+    },
+    "captionsmelayu": {
+      "option": "melayu"
+    },
+    "datemelayu": {
+      "option": "melayu"
+    },
+    "extrasmelayu": {
+      "option": "melayu"
+    },
+    "noextrasmelayu": {
+      "option": "melayu"
+    },
+    "melayuhyphenmins": {
+      "option": "melayu"
+    },
+    "captionsmeyalu": {
+      "option": "meyalu"
+    },
+    "datemeyalu": {
+      "option": "meyalu"
+    },
+    "extrasmeyalu": {
+      "option": "meyalu"
+    },
+    "noextrasmeyalu": {
+      "option": "meyalu"
+    },
+    "meyaluhyphenmins": {
+      "option": "meyalu"
+    },
+    "captionsmongolian": {
+      "option": "mongolian"
+    },
+    "datemongolian": {
+      "option": "mongolian"
+    },
+    "extrasmongolian": {
+      "option": "mongolian"
+    },
+    "noextrasmongolian": {
+      "option": "mongolian"
+    },
+    "Mongolian": {
+      "option": "mongolian"
+    },
+    "Mon": {
+      "option": "mongolian"
+    },
+    "Useg{}": {
+      "snippet": "Useg{${1:counter}}",
+      "option": "mongolian"
+    },
+    "useg{}": {
+      "snippet": "useg{${1:counter}}",
+      "option": "mongolian"
+    },
+    "nsd": {
+      "option": "mongolian"
+    },
+    "nsk": {
+      "option": "mongolian"
+    },
+    "NSD": {
+      "option": "mongolian"
+    },
+    "NSK": {
+      "option": "mongolian"
+    },
+    "C{}": {
+      "snippet": "C{${1:arg}}",
+      "option": "mongolian"
+    },
+    "CYRAE": {
+      "option": "mongolian"
+    },
+    "cyrae": {
+      "option": "mongolian"
+    },
+    "CYRCHRDSC": {
+      "option": "mongolian"
+    },
+    "cyrchrdsc": {
+      "option": "mongolian"
+    },
+    "CYRCHVCRS": {
+      "option": "mongolian"
+    },
+    "cyrchvcrs": {
+      "option": "mongolian"
+    },
+    "CYRDJE": {
+      "option": "mongolian"
+    },
+    "cyrdje": {
+      "option": "mongolian"
+    },
+    "CYRDZE": {
+      "option": "mongolian"
+    },
+    "cyrdze": {
+      "option": "mongolian"
+    },
+    "CYRDZHE": {
+      "option": "mongolian"
+    },
+    "cyrdzhe": {
+      "option": "mongolian"
+    },
+    "CYREREV": {
+      "option": "mongolian"
+    },
+    "cyrerev": {
+      "option": "mongolian"
+    },
+    "CYRGHCRS": {
+      "option": "mongolian"
+    },
+    "cyrghcrs": {
+      "option": "mongolian"
+    },
+    "CYRHDSC": {
+      "option": "mongolian"
+    },
+    "cyrhdsc": {
+      "option": "mongolian"
+    },
+    "CYRHRDSN": {
+      "option": "mongolian"
+    },
+    "cyrhrdsn": {
+      "option": "mongolian"
+    },
+    "CYRJE": {
+      "option": "mongolian"
+    },
+    "cyrje": {
+      "option": "mongolian"
+    },
+    "CYRKBEAK": {
+      "option": "mongolian"
+    },
+    "cyrkbeak": {
+      "option": "mongolian"
+    },
+    "CYRKDSC": {
+      "option": "mongolian"
+    },
+    "cyrkdsc": {
+      "option": "mongolian"
+    },
+    "CYRKVCRS": {
+      "option": "mongolian"
+    },
+    "cyrkvcrs": {
+      "option": "mongolian"
+    },
+    "cyrlangle": {
+      "option": "mongolian"
+    },
+    "CYRLJE": {
+      "option": "mongolian"
+    },
+    "cyrlje": {
+      "option": "mongolian"
+    },
+    "CYRNDSC": {
+      "option": "mongolian"
+    },
+    "cyrndsc": {
+      "option": "mongolian"
+    },
+    "CYRNG": {
+      "option": "mongolian"
+    },
+    "cyrng": {
+      "option": "mongolian"
+    },
+    "CYRNJE": {
+      "option": "mongolian"
+    },
+    "cyrnje": {
+      "option": "mongolian"
+    },
+    "CYROTLD": {
+      "option": "mongolian"
+    },
+    "cyrotld": {
+      "option": "mongolian"
+    },
+    "CYRpalochka": {
+      "option": "mongolian"
+    },
+    "CYRQ": {
+      "option": "mongolian"
+    },
+    "cyrq": {
+      "option": "mongolian"
+    },
+    "cyrrangle": {
+      "option": "mongolian"
+    },
+    "CYRSCHWA": {
+      "option": "mongolian"
+    },
+    "cyrschwa": {
+      "option": "mongolian"
+    },
+    "CYRSDSC": {
+      "option": "mongolian"
+    },
+    "cyrsdsc": {
+      "option": "mongolian"
+    },
+    "CYRSHHA": {
+      "option": "mongolian"
+    },
+    "cyrshha": {
+      "option": "mongolian"
+    },
+    "CYRTSHE": {
+      "option": "mongolian"
+    },
+    "cyrtshe": {
+      "option": "mongolian"
+    },
+    "CYRUSHRT": {
+      "option": "mongolian"
+    },
+    "cyrushrt": {
+      "option": "mongolian"
+    },
+    "CYRW": {
+      "option": "mongolian"
+    },
+    "cyrw": {
+      "option": "mongolian"
+    },
+    "CYRY": {
+      "option": "mongolian"
+    },
+    "cyry": {
+      "option": "mongolian"
+    },
+    "CYRYHCRS": {
+      "option": "mongolian"
+    },
+    "cyryhcrs": {
+      "option": "mongolian"
+    },
+    "CYRYO": {
+      "option": "mongolian"
+    },
+    "cyryo": {
+      "option": "mongolian"
+    },
+    "CYRZDSC": {
+      "option": "mongolian"
+    },
+    "cyrzdsc": {
+      "option": "mongolian"
+    },
+    "CYRZHDSC": {
+      "option": "mongolian"
+    },
+    "cyrzhdsc": {
+      "option": "mongolian"
+    },
+    "f{}": {
+      "snippet": "f{${1:arg}}",
+      "option": "mongolian"
+    },
+    "k{}": {
+      "snippet": "k{${1:arg}}",
+      "option": "mongolian"
+    },
+    "textquotedbl": {
+      "option": "vietnamese"
+    },
+    "U{}": {
+      "snippet": "U{${1:arg}}",
+      "option": "mongolian"
+    },
+    "captionsnorsk": {
+      "option": "norsk"
+    },
+    "datenorsk": {
+      "option": "norsk"
+    },
+    "extrasnorsk": {
+      "option": "norsk"
+    },
+    "noextrasnorsk": {
+      "option": "norsk"
+    },
+    "captionspiedmontese": {
+      "option": "piedmontese"
+    },
+    "datepiedmontese": {
+      "option": "piedmontese"
+    },
+    "extraspiedmontese": {
+      "option": "piedmontese"
+    },
+    "noextraspiedmontese": {
+      "option": "piedmontese"
+    },
+    "piedmontesehyphenmins": {
+      "option": "piedmontese"
+    },
+    "captionspinyin": {
+      "option": "pinyin"
+    },
+    "datepinyin": {
+      "option": "pinyin"
+    },
+    "extraspinyin": {
+      "option": "pinyin"
+    },
+    "noextraspinyin": {
+      "option": "pinyin"
+    },
+    "captionspolish": {
+      "option": "polish"
+    },
+    "datepolish": {
+      "option": "polish"
+    },
+    "extraspolish": {
+      "option": "polish"
+    },
+    "noextraspolish": {
+      "option": "polish"
+    },
+    "aob": {
+      "option": "polish"
+    },
+    "Aob": {
+      "option": "polish"
+    },
+    "lpb": {
+      "option": "polish"
+    },
+    "Lpb": {
+      "option": "polish"
+    },
+    "zkb": {
+      "option": "polish"
+    },
+    "Zkb": {
+      "option": "polish"
+    },
+    "sob": {
+      "option": "polish"
+    },
+    "spb": {
+      "option": "polish"
+    },
+    "skb": {
+      "option": "polish"
+    },
+    "textpl": {
+      "option": "polish"
+    },
+    "telepl": {
+      "option": "polish"
+    },
+    "polishrz": {
+      "option": "polish"
+    },
+    "polishzx": {
+      "option": "polish"
+    },
+    "captionsportuges": {
+      "option": "portuges"
+    },
+    "dateportuges": {
+      "option": "portuges"
+    },
+    "extrasportuges": {
+      "option": "portuges"
+    },
+    "noextrasportuges": {
+      "option": "portuges"
+    },
+    "ord": {
+      "option": "brazilian"
+    },
+    "orda": {
+      "option": "brazilian"
+    },
+    "ro": {
+      "option": "brazilian"
+    },
+    "ra": {
+      "option": "brazilian"
+    },
+    "captionsportuguese": {
+      "option": "portuguese"
+    },
+    "dateportuguese": {
+      "option": "portuguese"
+    },
+    "extrasportuguese": {
+      "option": "portuguese"
+    },
+    "noextrasportuguese": {
+      "option": "portuguese"
+    },
+    "captionsbrazil": {
+      "option": "brazil"
+    },
+    "datebrazil": {
+      "option": "brazil"
+    },
+    "extrasbrazil": {
+      "option": "brazil"
+    },
+    "noextrasbrazil": {
+      "option": "brazil"
+    },
+    "captionsbrazilian": {
+      "option": "brazilian"
+    },
+    "datebrazilian": {
+      "option": "brazilian"
+    },
+    "extrasbrazilian": {
+      "option": "brazilian"
+    },
+    "noextrasbrazilian": {
+      "option": "brazilian"
+    },
+    "captionsromanian": {
+      "option": "romanian"
+    },
+    "dateromanian": {
+      "option": "romanian"
+    },
+    "extrasromanian": {
+      "option": "romanian"
+    },
+    "noextrasromanian": {
+      "option": "romanian"
+    },
+    "captionsromansh": {
+      "option": "romansh"
+    },
+    "dateromansh": {
+      "option": "romansh"
+    },
+    "extrasromansh": {
+      "option": "romansh"
+    },
+    "noextrasromansh": {
+      "option": "romansh"
+    },
+    "romanshhyphenmins": {
+      "option": "romansh"
+    },
+    "Russian": {
+      "option": "russian.ancient"
+    },
+    "captionsrussian": {
+      "option": "russian.ancient"
+    },
+    "daterussian": {
+      "option": "russian.ancient"
+    },
+    "extrasrussian": {
+      "option": "russian.ancient"
+    },
+    "noextrasrussian": {
+      "option": "russian.ancient"
+    },
+    "captionsspanish": {
+      "option": "spanish"
+    },
+    "datespanish": {
+      "option": "spanish"
+    },
+    "extrasspanish": {
+      "option": "spanish"
+    },
+    "noextrasspanish": {
+      "option": "spanish"
+    },
+    "spanishrefname": {
+      "option": "spanish"
+    },
+    "spanishabstractname": {
+      "option": "spanish"
+    },
+    "spanishbibname": {
+      "option": "spanish"
+    },
+    "spanishchaptername": {
+      "option": "spanish"
+    },
+    "spanishappendixname": {
+      "option": "spanish"
+    },
+    "spanishcontentsname": {
+      "option": "spanish"
+    },
+    "spanishlistfigurename": {
+      "option": "spanish"
+    },
+    "spanishlisttablename": {
+      "option": "spanish"
+    },
+    "spanishindexname": {
+      "option": "spanish"
+    },
+    "spanishfigurename": {
+      "option": "spanish"
+    },
+    "spanishtablename": {
+      "option": "spanish"
+    },
+    "spanishpartname": {
+      "option": "spanish"
+    },
+    "spanishenclname": {
+      "option": "spanish"
+    },
+    "spanishccname": {
+      "option": "spanish"
+    },
+    "spanishheadtoname": {
+      "option": "spanish"
+    },
+    "spanishpagename": {
+      "option": "spanish"
+    },
+    "spanishseename": {
+      "option": "spanish"
+    },
+    "spanishalsoname": {
+      "option": "spanish"
+    },
+    "spanishproofname": {
+      "option": "spanish"
+    },
+    "spanishprefacename": {
+      "option": "spanish"
+    },
+    "spanishglossaryname": {
+      "option": "spanish"
+    },
+    "spanishdashitems": {
+      "option": "spanish"
+    },
+    "spanishsignitems": {
+      "option": "spanish"
+    },
+    "spanishsymbitems": {
+      "option": "spanish"
+    },
+    "spanishindexchars{}{}{}": {
+      "snippet": "spanishindexchars{${1:encap}}{${2:open}}{${3:close}}",
+      "option": "spanish"
+    },
+    "spanishscroman": {
+      "option": "spanish"
+    },
+    "spanishlcroman": {
+      "option": "spanish"
+    },
+    "spanishucroman": {
+      "option": "spanish"
+    },
+    "Today": {
+      "option": "spanish"
+    },
+    "spanishdate{}{}{}": {
+      "snippet": "spanishdate{${1:año}}{${2:mes}}{${3:día}}",
+      "option": "spanish"
+    },
+    "spanishDate{}{}{}": {
+      "snippet": "spanishDate{${1:año}}{${2:mes}}{${3:día}}",
+      "option": "spanish"
+    },
+    "spanishdatedel": {
+      "option": "spanish"
+    },
+    "spanishdatede": {
+      "option": "spanish"
+    },
+    "spanishreverseddate": {
+      "option": "spanish"
+    },
+    "spanishdatefirst{}": {
+      "snippet": "spanishdatefirst{${1:día-uno}}",
+      "option": "spanish"
+    },
+    "spanishdeactivate{}": {
+      "snippet": "spanishdeactivate{${1:caracteres}}",
+      "option": "spanish"
+    },
+    "spanishdecimal{}": {
+      "snippet": "spanishdecimal{${1:math}}",
+      "option": "spanish"
+    },
+    "spanishplainpercent": {
+      "option": "spanish"
+    },
+    "percentsign": {
+      "option": "spanish"
+    },
+    "sen": {
+      "option": "spanish"
+    },
+    "arcsen": {
+      "option": "spanish"
+    },
+    "spanishoperators": {
+      "option": "spanish"
+    },
+    "dotlessi": {
+      "option": "spanish"
+    },
+    "selectspanish": {
+      "option": "spanish"
+    },
+    "spanishoptions": {
+      "option": "spanish"
+    },
+    "textspanish": {
+      "option": "spanish"
+    },
+    "notextspanish": {
+      "option": "spanish"
+    },
+    "mathspanish": {
+      "option": "spanish"
+    },
+    "shorthandsspanish": {
+      "option": "spanish"
+    },
+    "captionssamin": {
+      "option": "samin"
+    },
+    "datesamin": {
+      "option": "samin"
+    },
+    "extrassamin": {
+      "option": "samin"
+    },
+    "noextrassamin": {
+      "option": "samin"
+    },
+    "saminhyphenmins": {
+      "option": "samin"
+    },
+    "captionsscottish": {
+      "option": "scottish"
+    },
+    "datescottish": {
+      "option": "scottish"
+    },
+    "extrasscottish": {
+      "option": "scottish"
+    },
+    "noextrasscottish": {
+      "option": "scottish"
+    },
+    "captionsserbian": {
+      "option": "serbian"
+    },
+    "dateserbian": {
+      "option": "serbian"
+    },
+    "extrasserbian": {
+      "option": "serbian"
+    },
+    "noextrasserbian": {
+      "option": "serbian"
+    },
+    "today*": {
+      "option": "serbian"
+    },
+    "todayRoman*": {
+      "option": "serbianc"
+    },
+    "enumCyr": {
+      "option": "serbianc"
+    },
+    "enumLat": {
+      "option": "serbianc"
+    },
+    "enumEng": {
+      "option": "serbianc"
+    },
+    "arcsec": {
+      "option": "serbianc"
+    },
+    "arccosec": {
+      "option": "serbianc"
+    },
+    "sech": {
+      "option": "serbianc"
+    },
+    "cosech": {
+      "option": "serbianc"
+    },
+    "arsech": {
+      "option": "serbianc"
+    },
+    "arcosech": {
+      "option": "serbianc"
+    },
+    "NZD": {
+      "option": "serbianc"
+    },
+    "nzd": {
+      "option": "serbianc"
+    },
+    "NZS": {
+      "option": "serbianc"
+    },
+    "nzs": {
+      "option": "serbianc"
+    },
+    "captionsserbianc": {
+      "option": "serbianc"
+    },
+    "dateserbianc": {
+      "option": "serbianc"
+    },
+    "extrasserbianc": {
+      "option": "serbianc"
+    },
+    "noextrasserbianc": {
+      "option": "serbianc"
+    },
+    "Serbianc": {
+      "option": "serbianc"
+    },
+    "captionsslovak": {
+      "option": "slovak"
+    },
+    "dateslovak": {
+      "option": "slovak"
+    },
+    "extrasslovak": {
+      "option": "slovak"
+    },
+    "noextrasslovak": {
+      "option": "slovak"
+    },
+    "standardhyphens": {
+      "option": "slovak"
+    },
+    "splithyphens": {
+      "option": "slovak"
+    },
+    "captionsslovene": {
+      "option": "slovene"
+    },
+    "dateslovene": {
+      "option": "slovene"
+    },
+    "extrasslovene": {
+      "option": "slovene"
+    },
+    "noextrasslovene": {
+      "option": "slovene"
+    },
+    "captionslsorbian": {
+      "option": "lsorbian"
+    },
+    "datelsorbian": {
+      "option": "lsorbian"
+    },
+    "extraslsorbian": {
+      "option": "lsorbian"
+    },
+    "noextraslsorbian": {
+      "option": "lsorbian"
+    },
+    "newdatelsorbian": {
+      "option": "lsorbian"
+    },
+    "olddatelsorbian": {
+      "option": "lsorbian"
+    },
+    "captionslowersorbian": {
+      "option": "lowersorbian"
+    },
+    "datelowersorbian": {
+      "option": "lowersorbian"
+    },
+    "extraslowersorbian": {
+      "option": "lowersorbian"
+    },
+    "noextraslowersorbian": {
+      "option": "lowersorbian"
+    },
+    "newdatelowersorbian": {
+      "option": "lowersorbian"
+    },
+    "olddatelowersorbian": {
+      "option": "lowersorbian"
+    },
+    "captionsusorbian": {
+      "option": "usorbian"
+    },
+    "dateusorbian": {
+      "option": "usorbian"
+    },
+    "extrasusorbian": {
+      "option": "usorbian"
+    },
+    "noextrasusorbian": {
+      "option": "usorbian"
+    },
+    "newdateusorbian": {
+      "option": "usorbian"
+    },
+    "olddateusorbian": {
+      "option": "usorbian"
+    },
+    "captionsuppersorbian": {
+      "option": "uppersorbian"
+    },
+    "dateuppersorbian": {
+      "option": "uppersorbian"
+    },
+    "extrasuppersorbian": {
+      "option": "uppersorbian"
+    },
+    "noextrasuppersorbian": {
+      "option": "uppersorbian"
+    },
+    "newdateuppersorbian": {
+      "option": "uppersorbian"
+    },
+    "olddateuppersorbian": {
+      "option": "uppersorbian"
+    },
+    "captionsswedish": {
+      "option": "swedish"
+    },
+    "dateswedish": {
+      "option": "swedish"
+    },
+    "extrasswedish": {
+      "option": "swedish"
+    },
+    "noextrasswedish": {
+      "option": "swedish"
+    },
+    "swedishhyphenmins": {
+      "option": "swedish"
+    },
+    "captionsthai": {
+      "option": "thai"
+    },
+    "datethai": {
+      "option": "thai"
+    },
+    "extrasthai": {
+      "option": "thai"
+    },
+    "noextrasthai": {
+      "option": "thai"
+    },
+    "thaihyphenmins": {
+      "option": "thai"
+    },
+    "thaitext": {
+      "option": "thai"
+    },
+    "textthai{}": {
+      "snippet": "textthai{${1:text}}",
+      "option": "thai"
+    },
+    "textpali{}": {
+      "snippet": "textpali{${1:text}}",
+      "option": "thai"
+    },
+    "wbr": {
+      "option": "thai"
+    },
+    "thainum{}": {
+      "snippet": "thainum{${1:counter}}",
+      "option": "thai"
+    },
+    "thaibracenum{}": {
+      "snippet": "thaibracenum{${1:counter}}",
+      "option": "thai"
+    },
+    "thaialph{}": {
+      "snippet": "thaialph{${1:counter}}",
+      "option": "thai"
+    },
+    "thaiAlph{}": {
+      "snippet": "thaiAlph{${1:counter}}",
+      "option": "thai"
+    },
+    "textyamakkan": {
+      "option": "thai"
+    },
+    "textfongmun": {
+      "option": "thai"
+    },
+    "textangkhankhu": {
+      "option": "thai"
+    },
+    "textkhomut": {
+      "option": "thai"
+    },
+    "textYoYingPali": {
+      "option": "thai"
+    },
+    "textThoThanPali": {
+      "option": "thai"
+    },
+    "thaiKoKai": {
+      "option": "thaicjk"
+    },
+    "thaiKhoKhai": {
+      "option": "thaicjk"
+    },
+    "thaiKhoKhuat": {
+      "option": "thaicjk"
+    },
+    "thaiKhoKhwai": {
+      "option": "thaicjk"
+    },
+    "thaiKhoKhon": {
+      "option": "thaicjk"
+    },
+    "thaiKhoRakhang": {
+      "option": "thaicjk"
+    },
+    "thaiNgoNgu": {
+      "option": "thaicjk"
+    },
+    "thaiChoChan": {
+      "option": "thaicjk"
+    },
+    "thaiChoChing": {
+      "option": "thaicjk"
+    },
+    "thaiChoChang": {
+      "option": "thaicjk"
+    },
+    "thaiSoSo": {
+      "option": "thaicjk"
+    },
+    "thaiChoChoe": {
+      "option": "thaicjk"
+    },
+    "thaiYoYing": {
+      "option": "thaicjk"
+    },
+    "thaiDoChada": {
+      "option": "thaicjk"
+    },
+    "thaiToPatak": {
+      "option": "thaicjk"
+    },
+    "thaiThoThan": {
+      "option": "thaicjk"
+    },
+    "thaiThoNangmontho": {
+      "option": "thaicjk"
+    },
+    "thaiThoPhuthao": {
+      "option": "thaicjk"
+    },
+    "thaiNoNen": {
+      "option": "thaicjk"
+    },
+    "thaiDoDek": {
+      "option": "thaicjk"
+    },
+    "thaiToTao": {
+      "option": "thaicjk"
+    },
+    "thaiThoThung": {
+      "option": "thaicjk"
+    },
+    "thaiThoThahan": {
+      "option": "thaicjk"
+    },
+    "thaiThoThong": {
+      "option": "thaicjk"
+    },
+    "thaiNoNu": {
+      "option": "thaicjk"
+    },
+    "thaiBoBaimai": {
+      "option": "thaicjk"
+    },
+    "thaiPoPla": {
+      "option": "thaicjk"
+    },
+    "thaiPhoPhung": {
+      "option": "thaicjk"
+    },
+    "thaiFoFa": {
+      "option": "thaicjk"
+    },
+    "thaiPhoPhan": {
+      "option": "thaicjk"
+    },
+    "thaiFoFan": {
+      "option": "thaicjk"
+    },
+    "thaiPhoSamphao": {
+      "option": "thaicjk"
+    },
+    "thaiMoMa": {
+      "option": "thaicjk"
+    },
+    "thaiYoYak": {
+      "option": "thaicjk"
+    },
+    "thaiRoRua": {
+      "option": "thaicjk"
+    },
+    "thaiRu": {
+      "option": "thaicjk"
+    },
+    "thaiLoLing": {
+      "option": "thaicjk"
+    },
+    "thaiLu": {
+      "option": "thaicjk"
+    },
+    "thaiWoWaen": {
+      "option": "thaicjk"
+    },
+    "thaiSoSala": {
+      "option": "thaicjk"
+    },
+    "thaiSoRusi": {
+      "option": "thaicjk"
+    },
+    "thaiSoSua": {
+      "option": "thaicjk"
+    },
+    "thaiHoHip": {
+      "option": "thaicjk"
+    },
+    "thaiLoChula": {
+      "option": "thaicjk"
+    },
+    "thaiOAng": {
+      "option": "thaicjk"
+    },
+    "thaiHoNokhuk": {
+      "option": "thaicjk"
+    },
+    "thaiPaiyannoi": {
+      "option": "thaicjk"
+    },
+    "thaiSaraA": {
+      "option": "thaicjk"
+    },
+    "thaiMaiHanakat": {
+      "option": "thaicjk"
+    },
+    "thaiSaraAa": {
+      "option": "thaicjk"
+    },
+    "thaiSaraAm": {
+      "option": "thaicjk"
+    },
+    "thaiSaraI": {
+      "option": "thaicjk"
+    },
+    "thaiSaraIi": {
+      "option": "thaicjk"
+    },
+    "thaiSaraUe": {
+      "option": "thaicjk"
+    },
+    "thaiSaraUee": {
+      "option": "thaicjk"
+    },
+    "thaiSaraU": {
+      "option": "thaicjk"
+    },
+    "thaiSaraUu": {
+      "option": "thaicjk"
+    },
+    "thaiPhinthu": {
+      "option": "thaicjk"
+    },
+    "thaiSaraE": {
+      "option": "thaicjk"
+    },
+    "thaiSaraAe": {
+      "option": "thaicjk"
+    },
+    "thaiSaraO": {
+      "option": "thaicjk"
+    },
+    "thaiSaraAiMaimuan": {
+      "option": "thaicjk"
+    },
+    "thaiSaraAiMaimalai": {
+      "option": "thaicjk"
+    },
+    "thaiLakkhangyao": {
+      "option": "thaicjk"
+    },
+    "thaiMaiyamok": {
+      "option": "thaicjk"
+    },
+    "thaiMaitaikhu": {
+      "option": "thaicjk"
+    },
+    "thaiMaiEk": {
+      "option": "thaicjk"
+    },
+    "thaiMaiTho": {
+      "option": "thaicjk"
+    },
+    "thaiMaiTri": {
+      "option": "thaicjk"
+    },
+    "thaiMaiChattawa": {
+      "option": "thaicjk"
+    },
+    "thaiThanthakhat": {
+      "option": "thaicjk"
+    },
+    "thaiNikhahit": {
+      "option": "thaicjk"
+    },
+    "thaiYamakkan": {
+      "option": "thaicjk"
+    },
+    "thaiFongman": {
+      "option": "thaicjk"
+    },
+    "thaizero": {
+      "option": "thaicjk"
+    },
+    "thaione": {
+      "option": "thaicjk"
+    },
+    "thaitwo": {
+      "option": "thaicjk"
+    },
+    "thaithree": {
+      "option": "thaicjk"
+    },
+    "thaifour": {
+      "option": "thaicjk"
+    },
+    "thaifive": {
+      "option": "thaicjk"
+    },
+    "thaisix": {
+      "option": "thaicjk"
+    },
+    "thaiseven": {
+      "option": "thaicjk"
+    },
+    "thaieight": {
+      "option": "thaicjk"
+    },
+    "thainine": {
+      "option": "thaicjk"
+    },
+    "thaiAngkhankhu": {
+      "option": "thaicjk"
+    },
+    "thaiKhomut": {
+      "option": "thaicjk"
+    },
+    "captionsthaicjk": {
+      "option": "thaicjk"
+    },
+    "datethaicjk": {
+      "option": "thaicjk"
+    },
+    "extrasthaicjk": {
+      "option": "thaicjk"
+    },
+    "noextrasthaicjk": {
+      "option": "thaicjk"
+    },
+    "textbaht": {
+      "option": "thaicjk"
+    },
+    "captionsturkish": {
+      "option": "turkish"
+    },
+    "dateturkish": {
+      "option": "turkish"
+    },
+    "extrasturkish": {
+      "option": "turkish"
+    },
+    "noextrasturkish": {
+      "option": "turkish"
+    },
+    "subjectname": {
+      "option": "turkish"
+    },
+    "Ukrainian": {
+      "option": "ukrainian"
+    },
+    "captionsukrainian": {
+      "option": "ukrainian"
+    },
+    "dateukrainian": {
+      "option": "ukrainian"
+    },
+    "extrasukrainian": {
+      "option": "ukrainian"
+    },
+    "noextrasukrainian": {
+      "option": "ukrainian"
+    },
+    "viettext": {
+      "option": "vietnamese"
+    },
+    "viet": {
+      "option": "vietnamese"
+    },
+    "textviet{}": {
+      "snippet": "textviet{${1:text}}",
+      "option": "vietnamese"
+    },
+    "captionsvietnamese": {
+      "option": "vietnamese"
+    },
+    "datevietnamese": {
+      "option": "vietnamese"
+    },
+    "extrasvietnamese": {
+      "option": "vietnamese"
+    },
+    "noextrasvietnamese": {
+      "option": "vietnamese"
+    },
+    "OHORN": {
+      "option": "vietnamese"
+    },
+    "ohorn": {
+      "option": "vietnamese"
+    },
+    "UHORN": {
+      "option": "vietnamese"
+    },
+    "uhorn": {
+      "option": "vietnamese"
+    },
+    "abreve": {
+      "option": "vietnamese"
+    },
+    "Abreve": {
+      "option": "vietnamese"
+    },
+    "acircumflex": {
+      "option": "vietnamese"
+    },
+    "Acircumflex": {
+      "option": "vietnamese"
+    },
+    "ecircumflex": {
+      "option": "vietnamese"
+    },
+    "Ecircumflex": {
+      "option": "vietnamese"
+    },
+    "ocircumflex": {
+      "option": "vietnamese"
+    },
+    "Ocircumflex": {
+      "option": "vietnamese"
+    },
+    "Ohorn": {
+      "option": "vietnamese"
+    },
+    "Uhorn": {
+      "option": "vietnamese"
+    },
+    "ABREVE": {
+      "option": "vietnamese"
+    },
+    "ACIRCUMFLEX": {
+      "option": "vietnamese"
+    },
+    "ECIRCUMFLEX": {
+      "option": "vietnamese"
+    },
+    "OCIRCUMFLEX": {
+      "option": "vietnamese"
+    },
+    "h{}": {
+      "snippet": "h{${1:arg}}",
+      "option": "vietnamese"
+    },
+    "headpagename": {
+      "option": "vietnamese"
+    },
+    "captionswelsh": {
+      "option": "welsh"
+    },
+    "datewelsh": {
+      "option": "welsh"
+    },
+    "extraswelsh": {
+      "option": "welsh"
+    },
+    "noextraswelsh": {
+      "option": "welsh"
+    },
+    "welshhyphenmins": {
+      "option": "welsh"
+    }
+  },
+  "envs": {
+    "selectlanguage{}": {
+      "name": "selectlanguage",
+      "snippet": "{${1:language}}"
+    },
+    "otherlanguage{}": {
+      "name": "otherlanguage",
+      "snippet": "{${1:language}}"
+    },
+    "otherlanguage*{}": {
+      "name": "otherlanguage*",
+      "snippet": "{${1:language}}"
+    },
+    "otherlanguage*[]{}": {
+      "name": "otherlanguage*",
+      "snippet": "[${2:options}]{${1:language}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "hyphenrules{}": {
+      "name": "hyphenrules",
+      "snippet": "{${1:language}}"
+    },
+    "descriptionFB": {
+      "option": "acadian"
+    },
+    "enumerateFB": {
+      "option": "acadian"
+    },
+    "itemizeFB": {
+      "option": "acadian"
+    },
+    "listFB{}": {
+      "name": "listFB",
+      "snippet": "{${1:symbol}}",
+      "option": "acadian"
+    },
+    "listORI{}": {
+      "name": "listORI",
+      "snippet": "{${1:symbol}}",
+      "option": "acadian"
+    },
+    "quoting": {
+      "option": "spanish"
+    }
+  },
+  "options": [
+    "${1:language}",
+    "modifiers.${1:language}=${2:modifiers}",
+    "KeepShorthandsActive",
+    "activeacute",
+    "activegrave",
+    "shorthands=",
+    "safe=",
+    "math=",
+    "config=${1:file}",
+    "main=${1:language}",
+    "headfoot=${1:language}",
+    "noconfigs",
+    "showlanguages",
+    "silent",
+    "hyphenmap=",
+    "bidi=",
+    "layout=",
+    "provide=*",
+    "provide+=*",
+    "provide*=*",
+    "base",
+    "ensureinfo=off",
+    "es-lcroman",
+    "es-minimal",
+    "es-nodecimaldot",
+    "es-noenumerate",
+    "es-noindentfirst",
+    "es-noitemize",
+    "es-nolayout",
+    "es-nolists",
+    "es-noquoting",
+    "es-nosectiondot",
+    "es-noshorthands",
+    "es-notilde",
+    "es-preindex",
+    "es-sloppy",
+    "es-tabla",
+    "es-tilden",
+    "es-ucroman",
+    "es-uppernames",
+    "mexico",
+    "mexico-com"
+  ],
+  "keyvals": [
+    [
+      "date",
+      "captions"
+    ],
+    [
+      "include=${1:commands}",
+      "exclude=${1:commands}",
+      "fontenc=${1:encoding}"
+    ],
+    [
+      "import",
+      "import=${1:language tag}",
+      "captions=${1:language tag}",
+      "hyphenrules=${1:language list}",
+      "main",
+      "script=${1:script name}",
+      "language=${1:language name}",
+      "alph=${1:counter}",
+      "Alph=${1:counter}",
+      "onchar=",
+      "intraspace=${1:base shrink stretch}",
+      "intrapenalty=${1:penalty}",
+      "transforms=",
+      "justification=",
+      "linebreaking=",
+      "mapfont=",
+      "maparabic",
+      "mapdigits",
+      "calendar=${1:calendar}",
+      "calendar=${1:calendar}.${2:variant}",
+      "casing=",
+      "interchar=${1:interchar-list}"
+    ],
+    [
+      "calendar=${1:calendar}",
+      "variant=${1:variant}",
+      "convert"
+    ],
+    [
+      "label=",
+      "fonts=${1:tag1 tag2 ...}",
+      "attribute=${1:attribute}"
+    ],
+    [
+      "label=${1:label}"
+    ],
+    [
+      "bidi.mapdigits=",
+      "bidi.mirroring=",
+      "bidi.text=",
+      "bidi.math=",
+      "linebreak.sea=",
+      "linebreak.cjk=",
+      "justify.arabic=",
+      "layout.tabular=",
+      "layout.lists=",
+      "autoload.bcp47=",
+      "bcp47.toname=",
+      "autoload.options=",
+      "autoload.bcp47.prefix=",
+      "autoload.bcp47.options=",
+      "prehyphenation.disable=",
+      "select.write=",
+      "select.encoding="
+    ],
+    [
+      "ShowOptions",
+      "StandardLayout",
+      "GlobalLayoutFrench",
+      "IndentFirst",
+      "PartNameFull",
+      "ListItemsAsPar",
+      "StandardListSpacing",
+      "StandardItemizeEnv",
+      "StandardEnumerateEnv",
+      "StandardItemLabels",
+      "ItemLabels=",
+      "ItemLabeli=",
+      "ItemLabelii=",
+      "ItemLabeliii=",
+      "ItemLabeliv=",
+      "StandardLists",
+      "ListOldLayout",
+      "FrenchFootnotes",
+      "AutoSpaceFootnotes",
+      "AutoSpacePunctuation",
+      "ThinColonSpace",
+      "OriginalTypewriter",
+      "UnicodeNoBreakSpaces",
+      "og=",
+      "fg=",
+      "INGuillSpace",
+      "EveryParGuill=",
+      "EveryLineGuill=",
+      "InnerGuillSingle",
+      "ThinSpaceInFrenchNumbers",
+      "SmallCapsFigTabCaptions",
+      "CustomiseFigTabCaptions",
+      "OldFigTabCaptions",
+      "FrenchSuperscripts",
+      "LowercaseSuperscripts",
+      "SuppressWarning"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/backref.json b/dev/packages/backref.json
new file mode 100644
index 000000000..4c1fc0f31
--- /dev/null
+++ b/dev/packages/backref.json
@@ -0,0 +1,59 @@
+{
+  "includes": {
+    "kvoptions": [],
+    "kvsetkeys": [],
+    "rerunfilecheck": []
+  },
+  "macros": {
+    "backrefsetup{}": {
+      "snippet": "backrefsetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ifbackrefparscan": {},
+    "backrefparscanfalse": {},
+    "backrefparscantrue": {},
+    "backrefprint": {},
+    "backcite{}{{}{}{}": {
+      "snippet": "backcite{${1:label}}{{${2:page num}}{${3:current label}}{${4:current anchor}}}"
+    },
+    "backref{}": {
+      "snippet": "backref{${1:backref list}}"
+    },
+    "backrefalt{}{}{}{}": {
+      "snippet": "backrefalt{${1:num w/o dupes}}{${2:backref list w/o dupes}}{${3:num w/ dupes}}{${4:backref list w/ dupes}}"
+    },
+    "backrefpagesname": {},
+    "backrefsectionsname": {},
+    "backrefsep": {},
+    "backreftwosep": {},
+    "backreflastsep": {},
+    "backrefentrycount{}{}": {
+      "snippet": "backrefentrycount{${1:backref entry}}{${2:citation count}}"
+    },
+    "backrefenglish": {},
+    "backrefgerman": {},
+    "backreffrench": {},
+    "backrefspanish": {},
+    "backrefbrazil": {},
+    "backrefafrikaans": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "ref",
+      "pageref",
+      "hyperref",
+      "hyperpageref",
+      "english",
+      "german",
+      "french",
+      "spanish",
+      "brazil",
+      "verbose",
+      "enable",
+      "disable"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/balance.json b/dev/packages/balance.json
new file mode 100644
index 000000000..f45006e6f
--- /dev/null
+++ b/dev/packages/balance.json
@@ -0,0 +1,11 @@
+{
+  "includes": {},
+  "macros": {
+    "balance": {},
+    "nobalance": {},
+    "oldvsize": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/bangla.json b/dev/packages/bangla.json
new file mode 100644
index 000000000..54aa06d1d
--- /dev/null
+++ b/dev/packages/bangla.json
@@ -0,0 +1,72 @@
+{
+  "includes": {
+    "fontspec": [],
+    "etoolbox": [],
+    "polyglossia": [],
+    "CharisSIL": []
+  },
+  "macros": {
+    "banglatext{}": {
+      "snippet": "banglatext{${1:bangla text}}"
+    },
+    "banglabold{}": {
+      "snippet": "banglabold{${1:bangla text}}"
+    },
+    "banglaitalic{}": {
+      "snippet": "banglaitalic{${1:bangla text}}"
+    },
+    "banglatranslit{}": {
+      "snippet": "banglatranslit{${1:bangla text}}"
+    },
+    "banglaipa{}": {
+      "snippet": "banglaipa{${1:bangla text}}"
+    },
+    "banglapage": {},
+    "banglasection": {},
+    "banglaenumerate": {},
+    "banglaequation": {},
+    "banglatable": {},
+    "banglafigure": {},
+    "banglaallcounters": {},
+    "bengalinum{}": {
+      "snippet": "bengalinum{${1:counter}}"
+    },
+    "bengalialpha{}": {
+      "snippet": "bengalialpha{${1:counter}}"
+    },
+    "banglaipafont": {},
+    "bdnhbold": {},
+    "bdnhitalic": {},
+    "bdnhtext": {},
+    "bdnhtranslitfont": {},
+    "doindictrans": {},
+    "fooA": {},
+    "indictrans{}": {
+      "snippet": "indictrans{${1:text}}"
+    },
+    "translitfont{}": {
+      "snippet": "translitfont{${1:text}}"
+    },
+    "xgenerateTransliteration": {},
+    "xxgenerateTransliteration": {},
+    "xxxgenerateTransliteration{}": {
+      "snippet": "xxxgenerateTransliteration{${1:arg}}"
+    },
+    "zzrow{}{}": {
+      "snippet": "zzrow{${1:arg1}}{${2:arg2}}"
+    },
+    "zztable{}": {
+      "snippet": "zztable{${1:arg}}"
+    }
+  },
+  "envs": {
+    "isoindictranse": {}
+  },
+  "options": [
+    "kalpurush",
+    "shimanto",
+    "notosansbengali",
+    "notoserifbengali"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/bargraph-js.json b/dev/packages/bargraph-js.json
index a6294cabb..18863f8ba 100644
--- a/dev/packages/bargraph-js.json
+++ b/dev/packages/bargraph-js.json
@@ -23,6 +23,9 @@
     "inputFor[]{}{}{}{}{}": {
       "snippet": "inputFor[${6:eforms parameters}]{${1:bgenv name}}{${2:bg name}}{${3:bar name}}{${4:width}}{${5:height}}"
     },
+    "populateCommaData()": {
+      "snippet": "populateCommaData(${1:\"${5:bgenv name}\"},${2:\"${6:bg name}\"},${3:str},${4:validate})"
+    },
     "hs{}": {
       "snippet": "hs{${1:skip}}"
     },
diff --git a/dev/packages/beamerbaseframesize.json b/dev/packages/beamerbaseframesize.json
index 967a6e8c0..349c7ecb2 100644
--- a/dev/packages/beamerbaseframesize.json
+++ b/dev/packages/beamerbaseframesize.json
@@ -1,11 +1,24 @@
 {
   "includes": {},
   "macros": {
+    "framezoom<><>()()": {
+      "snippet": "framezoom<${1:button overlay specification}><${2:zoomed overlay specification}>(${3:upper left x},${4:upper left y})(${5:zoom area width},${6:zoom area depth})"
+    },
+    "framezoom<><>[]()()": {
+      "snippet": "framezoom<${2:button overlay specification}><${3:zoomed overlay specification}>[${1:options}](${4:upper left x},${5:upper left y})(${6:zoom area width},${7:zoom area depth})",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
     "insertcontinuationcount": {},
     "insertcontinuationcountroman": {},
     "insertcontinuationtext": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": []
+  "keyvals": [
+    [
+      "border",
+      "border=${1:width in pixels}"
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/beamerprosper.json b/dev/packages/beamerprosper.json
index a0e0e51a2..ec4c1d7d4 100644
--- a/dev/packages/beamerprosper.json
+++ b/dev/packages/beamerprosper.json
@@ -10,6 +10,9 @@
     "Logo{}": {
       "snippet": "Logo{${1:logo text}}"
     },
+    "Logo(){}": {
+      "snippet": "Logo(${2:x},${3:y}){${1:logo text}}"
+    },
     "overlays{}{}": {
       "snippet": "overlays{${1:number}}{${2:slide environment}}"
     },
diff --git a/dev/packages/beamerthemeAmurmaple.json b/dev/packages/beamerthemeAmurmaple.json
index f09b0b915..bb178a8bf 100644
--- a/dev/packages/beamerthemeAmurmaple.json
+++ b/dev/packages/beamerthemeAmurmaple.json
@@ -56,7 +56,7 @@
     },
     "quotation[]": {
       "name": "quotation",
-      "snippet": "[${1:author(s)}]"
+      "snippet": "[${1:author(${2:s})}]"
     },
     "remark": {},
     "remark[]": {
diff --git a/dev/packages/beamerthemeArguelles.json b/dev/packages/beamerthemeArguelles.json
index 03bfe3d62..27aa5b4de 100644
--- a/dev/packages/beamerthemeArguelles.json
+++ b/dev/packages/beamerthemeArguelles.json
@@ -14,6 +14,7 @@
     "tikz": [],
     "tcolorbox": [],
     "tcolorboxlibraryskins": [],
+    "tikzlibrarycalc": [],
     "etoolbox": [
       "splitnav"
     ]
diff --git a/dev/packages/beamerthememoloch.json b/dev/packages/beamerthememoloch.json
index 6d4a83bc5..0ea11ee06 100644
--- a/dev/packages/beamerthememoloch.json
+++ b/dev/packages/beamerthememoloch.json
@@ -1,5 +1,6 @@
 {
   "includes": {
+    "etoolbox": [],
     "pgfopts": [],
     "calc": [],
     "tikz": []
diff --git a/dev/packages/bewerbung.json b/dev/packages/bewerbung.json
new file mode 100644
index 000000000..06d861048
--- /dev/null
+++ b/dev/packages/bewerbung.json
@@ -0,0 +1,163 @@
+{
+  "includes": {
+    "datatool": []
+  },
+  "macros": {
+    "Vorname{}": {
+      "snippet": "Vorname{${1:Vorname}}"
+    },
+    "Name{}": {
+      "snippet": "Name{${1:Vorname}}"
+    },
+    "fullname": {},
+    "fullname[]": {
+      "snippet": "fullname[${1:Reihenfolge}]"
+    },
+    "Street{}": {
+      "snippet": "Street{${1:Straße Hnr.}}"
+    },
+    "Plz{}": {
+      "snippet": "Plz{${1:Postleitzahl}}"
+    },
+    "Stadt{}": {
+      "snippet": "Stadt{${1:Stadt}}"
+    },
+    "anschrift": {},
+    "anschrift[]": {
+      "snippet": "anschrift[${1:Umbruch}]"
+    },
+    "MeinBeruf{}": {
+      "snippet": "MeinBeruf{${1:Berufsbezeichnung}}"
+    },
+    "Tel{}": {
+      "snippet": "Tel{${1:Telefonnummer}}"
+    },
+    "Mobile{}": {
+      "snippet": "Mobile{${1:Mobiltelefonnummer}}"
+    },
+    "EMail{}": {
+      "snippet": "EMail{${1:E-Mail}}"
+    },
+    "Sta{}": {
+      "snippet": "Sta{${1:Staatsangehörigkeit}}"
+    },
+    "GebDatum{}": {
+      "snippet": "GebDatum{${1:Geburtsdatum}}"
+    },
+    "LebenslaufTitel{}": {
+      "snippet": "LebenslaufTitel{${1:Titel}}"
+    },
+    "ID{}": {
+      "snippet": "ID{${1:Identifikation}}"
+    },
+    "Anhang{}{}": {
+      "snippet": "Anhang{${1:Text}}{${2:Artikelliste}}"
+    },
+    "TodayOrt{}": {
+      "snippet": "TodayOrt{${1:Ort}}"
+    },
+    "TodayTime{}": {
+      "snippet": "TodayTime{${1:Time}}"
+    },
+    "makePerson": {},
+    "argetabelle": {},
+    "argetabelle[]": {
+      "snippet": "argetabelle[${1:Datei}]"
+    },
+    "anhang": {},
+    "anhangTmpFlat": {},
+    "anhangTmpList": {},
+    "beruf": {},
+    "bewerbungDatum": {},
+    "BewerbungDatum{}": {
+      "snippet": "BewerbungDatum{${1:arg}}"
+    },
+    "bewerbungFirma": {},
+    "BewerbungFirma": {},
+    "bewerbungFirmaAnrede": {},
+    "BewerbungFirmaAnrede": {},
+    "bewerbungFirmaName": {},
+    "BewerbungFirmaName{}": {
+      "snippet": "BewerbungFirmaName{${1:arg}}"
+    },
+    "bewerbungFirmaOrt": {},
+    "BewerbungFirmaOrt{}": {
+      "snippet": "BewerbungFirmaOrt{${1:arg}}"
+    },
+    "bewerbungFirmaPlz": {},
+    "BewerbungFirmaPlz{}": {
+      "snippet": "BewerbungFirmaPlz{${1:arg}}"
+    },
+    "bewerbungFirmaStr": {},
+    "BewerbungFirmaStr{}": {
+      "snippet": "BewerbungFirmaStr{${1:arg}}"
+    },
+    "bewerbungKW": {},
+    "BewerbungKW{}": {
+      "snippet": "BewerbungKW{${1:arg}}"
+    },
+    "bewerbungRueckmeldung": {},
+    "BewerbungRueckmeldung{}": {
+      "snippet": "BewerbungRueckmeldung{${1:arg}}"
+    },
+    "bewerbungSonstiges": {},
+    "BewerbungSonstiges{}": {
+      "snippet": "BewerbungSonstiges{${1:arg}}"
+    },
+    "bewerbungStelle": {},
+    "BewerbungStelle{}": {
+      "snippet": "BewerbungStelle{${1:arg}}"
+    },
+    "email": {},
+    "firma": {},
+    "firmaAnrede": {},
+    "firmaName": {},
+    "firmaPlz": {},
+    "firmaStadt": {},
+    "firmaStreet": {},
+    "gebDatum": {},
+    "geehrt": {},
+    "getBewerbung": {},
+    "getBewerbung[]": {
+      "snippet": "getBewerbung[${1:file}]"
+    },
+    "id": {},
+    "lebenslaufTitel": {},
+    "meinBeruf": {},
+    "meinberuf": {},
+    "mobile": {},
+    "name": {},
+    "plz": {},
+    "runKomaVar": {},
+    "setzekomma": {},
+    "sta": {},
+    "stadt": {},
+    "street": {},
+    "tel": {},
+    "todayOrt": {},
+    "todayTime": {},
+    "vorname": {}
+  },
+  "envs": {
+    "anschreiben": {},
+    "anschreiben[]": {
+      "name": "anschreiben",
+      "snippet": "[${1:Anrede}]"
+    },
+    "anschreiben[][]": {
+      "name": "anschreiben",
+      "snippet": "[${1:Anrede}][${2:Enlarge}]"
+    },
+    "lebenslauf": {},
+    "lebenslauf[]": {
+      "name": "lebenslauf",
+      "snippet": "[${1:Listensymbol}]"
+    },
+    "lebenslauf[][]": {
+      "name": "lebenslauf",
+      "snippet": "[${1:Listensymbol}][${2:Addendum}]"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/bez123.json b/dev/packages/bez123.json
index 61929e7d0..007a82ed9 100644
--- a/dev/packages/bez123.json
+++ b/dev/packages/bez123.json
@@ -3,6 +3,24 @@
     "multiply": []
   },
   "macros": {
+    "lbezier()()": {
+      "snippet": "lbezier(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "lbezier[]()()": {
+      "snippet": "lbezier[${1:n}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "cbezier()()()()": {
+      "snippet": "cbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "cbezier[]()()()()": {
+      "snippet": "cbezier[${1:n}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "rqbezier()()()()": {
+      "snippet": "rqbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:weight})"
+    },
+    "rqbezier[]()()()()": {
+      "snippet": "rqbezier[${1:n}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:weight})"
+    },
     "setweightscale{}": {
       "snippet": "setweightscale{${1:number}}"
     },
diff --git a/dev/packages/bibentry.json b/dev/packages/bibentry.json
new file mode 100644
index 000000000..94a20a58d
--- /dev/null
+++ b/dev/packages/bibentry.json
@@ -0,0 +1,22 @@
+{
+  "includes": {},
+  "macros": {
+    "nobibliography{}": {
+      "snippet": "nobibliography{${1:bib file}}"
+    },
+    "nobibliography*": {},
+    "bibentry{}": {
+      "snippet": "bibentry{${1:keylist}}"
+    },
+    "urlprefix": {},
+    "url{}": {
+      "snippet": "url{${1:URL}}"
+    },
+    "doi{}": {
+      "snippet": "doi{${1:DOI}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/biblatex-archaeology.json b/dev/packages/biblatex-archaeology.json
index 09f7bb06c..5ef782354 100644
--- a/dev/packages/biblatex-archaeology.json
+++ b/dev/packages/biblatex-archaeology.json
@@ -37,30 +37,66 @@
     "citeissues{}{}": {
       "snippet": "citeissues{${1:bibid}}{${2:bibid}}"
     },
+    "citeissues(){}{}": {
+      "snippet": "citeissues(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "citeissues()(){}{}": {
+      "snippet": "citeissues(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citeissues()()[]{}[]{}": {
+      "snippet": "citeissues(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "citeissues[]{}[]{}": {
       "snippet": "citeissues[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citeissues[][]{}[][]{}": {
       "snippet": "citeissues[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citeissues()()[][]{}[][]{}": {
+      "snippet": "citeissues(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "fciteissues{}{}": {
       "snippet": "fciteissues{${1:bibid}}{${2:bibid}}"
     },
+    "fciteissues(){}{}": {
+      "snippet": "fciteissues(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "fciteissues()(){}{}": {
+      "snippet": "fciteissues(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "fciteissues()()[]{}[]{}": {
+      "snippet": "fciteissues(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "fciteissues[]{}[]{}": {
       "snippet": "fciteissues[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "fciteissues[][]{}[][]{}": {
       "snippet": "fciteissues[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "fciteissues()()[][]{}[][]{}": {
+      "snippet": "fciteissues(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "pciteissues{}{}": {
       "snippet": "pciteissues{${1:bibid}}{${2:bibid}}"
     },
+    "pciteissues(){}{}": {
+      "snippet": "pciteissues(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "pciteissues()(){}{}": {
+      "snippet": "pciteissues(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "pciteissues()()[]{}[]{}": {
+      "snippet": "pciteissues(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "pciteissues[]{}[]{}": {
       "snippet": "pciteissues[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "pciteissues[][]{}[][]{}": {
       "snippet": "pciteissues[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "pciteissues()()[][]{}[][]{}": {
+      "snippet": "pciteissues(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "posscite{}": {
       "snippet": "posscite{${1:bibid}}"
     },
@@ -82,21 +118,45 @@
     "posscites{}{}": {
       "snippet": "posscites{${1:bibid}}{${2:bibid}}"
     },
+    "posscites(){}{}": {
+      "snippet": "posscites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "posscites()(){}{}": {
+      "snippet": "posscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "posscites()()[]{}[]{}": {
+      "snippet": "posscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "posscites[]{}[]{}": {
       "snippet": "posscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "posscites[][]{}[][]{}": {
       "snippet": "posscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "posscites()()[][]{}[][]{}": {
+      "snippet": "posscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Posscites{}{}": {
       "snippet": "Posscites{${1:bibid}}{${2:bibid}}"
     },
+    "Posscites(){}{}": {
+      "snippet": "Posscites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "Posscites()(){}{}": {
+      "snippet": "Posscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Posscites()()[]{}[]{}": {
+      "snippet": "Posscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "Posscites[]{}[]{}": {
       "snippet": "Posscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Posscites[][]{}[][]{}": {
       "snippet": "Posscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Posscites()()[][]{}[][]{}": {
+      "snippet": "Posscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "shortformcite{}": {
       "snippet": "shortformcite{${1:bibid}}"
     },
@@ -109,12 +169,24 @@
     "shortformcites{}{}": {
       "snippet": "shortformcites{${1:bibid}}{${2:bibid}}"
     },
+    "shortformcites(){}{}": {
+      "snippet": "shortformcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "shortformcites()(){}{}": {
+      "snippet": "shortformcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "shortformcites()()[]{}[]{}": {
+      "snippet": "shortformcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "shortformcites[]{}[]{}": {
       "snippet": "shortformcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "shortformcites[][]{}[][]{}": {
       "snippet": "shortformcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "shortformcites()()[][]{}[][]{}": {
+      "snippet": "shortformcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "sfcite{}": {
       "snippet": "sfcite{${1:bibid}}"
     },
@@ -127,12 +199,24 @@
     "sfcites{}{}": {
       "snippet": "sfcites{${1:bibid}}{${2:bibid}}"
     },
+    "sfcites(){}{}": {
+      "snippet": "sfcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "sfcites()(){}{}": {
+      "snippet": "sfcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "sfcites()()[]{}[]{}": {
+      "snippet": "sfcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "sfcites[]{}[]{}": {
       "snippet": "sfcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "sfcites[][]{}[][]{}": {
       "snippet": "sfcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "sfcites()()[][]{}[][]{}": {
+      "snippet": "sfcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "reviewcite{}": {
       "snippet": "reviewcite{${1:bibid}}"
     },
@@ -190,57 +274,129 @@
     "reviewcites{}{}": {
       "snippet": "reviewcites{${1:bibid}}{${2:bibid}}"
     },
+    "reviewcites(){}{}": {
+      "snippet": "reviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "reviewcites()(){}{}": {
+      "snippet": "reviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "reviewcites()()[]{}[]{}": {
+      "snippet": "reviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "reviewcites[]{}[]{}": {
       "snippet": "reviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "reviewcites[][]{}[][]{}": {
       "snippet": "reviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "reviewcites()()[][]{}[][]{}": {
+      "snippet": "reviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "previewcites{}{}": {
       "snippet": "previewcites{${1:bibid}}{${2:bibid}}"
     },
+    "previewcites(){}{}": {
+      "snippet": "previewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "previewcites()(){}{}": {
+      "snippet": "previewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "previewcites()()[]{}[]{}": {
+      "snippet": "previewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "previewcites[]{}[]{}": {
       "snippet": "previewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "previewcites[][]{}[][]{}": {
       "snippet": "previewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "previewcites()()[][]{}[][]{}": {
+      "snippet": "previewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "textreviewcites{}{}": {
       "snippet": "textreviewcites{${1:bibid}}{${2:bibid}}"
     },
+    "textreviewcites(){}{}": {
+      "snippet": "textreviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "textreviewcites()(){}{}": {
+      "snippet": "textreviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "textreviewcites()()[]{}[]{}": {
+      "snippet": "textreviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "textreviewcites[]{}[]{}": {
       "snippet": "textreviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "textreviewcites[][]{}[][]{}": {
       "snippet": "textreviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "textreviewcites()()[][]{}[][]{}": {
+      "snippet": "textreviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Reviewcites{}{}": {
       "snippet": "Reviewcites{${1:bibid}}{${2:bibid}}"
     },
+    "Reviewcites(){}{}": {
+      "snippet": "Reviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "Reviewcites()(){}{}": {
+      "snippet": "Reviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Reviewcites()()[]{}[]{}": {
+      "snippet": "Reviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "Reviewcites[]{}[]{}": {
       "snippet": "Reviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Reviewcites[][]{}[][]{}": {
       "snippet": "Reviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Reviewcites()()[][]{}[][]{}": {
+      "snippet": "Reviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Previewcites{}{}": {
       "snippet": "Previewcites{${1:bibid}}{${2:bibid}}"
     },
+    "Previewcites(){}{}": {
+      "snippet": "Previewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "Previewcites()(){}{}": {
+      "snippet": "Previewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Previewcites()()[]{}[]{}": {
+      "snippet": "Previewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "Previewcites[]{}[]{}": {
       "snippet": "Previewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Previewcites[][]{}[][]{}": {
       "snippet": "Previewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Previewcites()()[][]{}[][]{}": {
+      "snippet": "Previewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Textreviewcites{}{}": {
       "snippet": "Textreviewcites{${1:bibid}}{${2:bibid}}"
     },
+    "Textreviewcites(){}{}": {
+      "snippet": "Textreviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "Textreviewcites()(){}{}": {
+      "snippet": "Textreviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Textreviewcites()()[]{}[]{}": {
+      "snippet": "Textreviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "Textreviewcites[]{}[]{}": {
       "snippet": "Textreviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Textreviewcites[][]{}[][]{}": {
       "snippet": "Textreviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Textreviewcites()()[][]{}[][]{}": {
+      "snippet": "Textreviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "DefineGenitiveApostropheChars{}{}": {
       "snippet": "DefineGenitiveApostropheChars{${1:language}}{${2:csv}}"
     },
diff --git a/dev/packages/biblatex-chicago.json b/dev/packages/biblatex-chicago.json
index 956e2b9bb..d395c3d87 100644
--- a/dev/packages/biblatex-chicago.json
+++ b/dev/packages/biblatex-chicago.json
@@ -7,10 +7,10 @@
   },
   "macros": {
     "suppressbibfield{}": {
-      "snippet": "suppressbibfield{${1:field1,field2,...}}"
+      "snippet": "suppressbibfield{${1:field1,${2:field2},...}}"
     },
     "suppressbibfield[]{}": {
-      "snippet": "suppressbibfield[${2:entrytype1,entrytype2,...}]{${1:field1,field2,...}}"
+      "snippet": "suppressbibfield[${2:entrytype1,${3:entrytype2},${4:...}]{${1:field1},${5:field2},...}}"
     },
     "lositemsep": {},
     "cmsunspecified{}{}": {
@@ -43,12 +43,24 @@
     "citeincites{}{}": {
       "snippet": "citeincites{${1:bibid}}{${2:bibid}}"
     },
+    "citeincites(){}{}": {
+      "snippet": "citeincites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "citeincites()(){}{}": {
+      "snippet": "citeincites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citeincites()()[]{}[]{}": {
+      "snippet": "citeincites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "citeincites[]{}[]{}": {
       "snippet": "citeincites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citeincites[][]{}[][]{}": {
       "snippet": "citeincites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citeincites()()[][]{}[][]{}": {
+      "snippet": "citeincites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "citejournal{}": {
       "snippet": "citejournal{${1:bibid}}"
     },
@@ -61,12 +73,24 @@
     "citetitles{}{}": {
       "snippet": "citetitles{${1:bibid}}{${2:bibid}}"
     },
+    "citetitles(){}{}": {
+      "snippet": "citetitles(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "citetitles()(){}{}": {
+      "snippet": "citetitles(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citetitles()()[]{}[]{}": {
+      "snippet": "citetitles(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "citetitles[]{}[]{}": {
       "snippet": "citetitles[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citetitles[][]{}[][]{}": {
       "snippet": "citetitles[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citetitles()()[][]{}[][]{}": {
+      "snippet": "citetitles(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "fullciteincite{}": {
       "snippet": "fullciteincite{${1:bibid}}"
     },
@@ -79,12 +103,24 @@
     "fullciteincites{}{}": {
       "snippet": "fullciteincites{${1:bibid}}{${2:bibid}}"
     },
+    "fullciteincites(){}{}": {
+      "snippet": "fullciteincites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "fullciteincites()(){}{}": {
+      "snippet": "fullciteincites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "fullciteincites()()[]{}[]{}": {
+      "snippet": "fullciteincites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "fullciteincites[]{}[]{}": {
       "snippet": "fullciteincites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "fullciteincites[][]{}[][]{}": {
       "snippet": "fullciteincites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "fullciteincites()()[][]{}[][]{}": {
+      "snippet": "fullciteincites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "gentextcite{}": {
       "snippet": "gentextcite{${1:bibid}}"
     },
@@ -100,12 +136,36 @@
     "gentextcites{}{}": {
       "snippet": "gentextcites{${1:bibid}}{${2:bibid}}"
     },
+    "gentextcites(){}{}": {
+      "snippet": "gentextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "gentextcites[](){}{}": {
+      "snippet": "gentextcites[${3:ending}](${4:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "gentextcites()(){}{}": {
+      "snippet": "gentextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "gentextcites[]()(){}{}": {
+      "snippet": "gentextcites[${3:ending}](${4:pre})(${5:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "gentextcites()()[]{}[]{}": {
+      "snippet": "gentextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
+    "gentextcites[]()()[]{}[]{}": {
+      "snippet": "gentextcites[${3:ending}](${6:pre})(${7:post})[${4:pre}]{${1:bibid}}[${5:pre}]{${2:bibid}}"
+    },
     "gentextcites[]{}[]{}": {
       "snippet": "gentextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "gentextcites[][]{}[][]{}": {
       "snippet": "gentextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "gentextcites()()[][]{}[][]{}": {
+      "snippet": "gentextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "gentextcites[]()()[][]{}[][]{}": {
+      "snippet": "gentextcites[${3:ending}](${8:pre})(${9:post})[${4:pre}][${5:post}]{${1:bibid}}[${6:pre}][${7:post}]{${2:bibid}}"
+    },
     "Gentextcite{}": {
       "snippet": "Gentextcite{${1:bibid}}"
     },
@@ -121,12 +181,36 @@
     "Gentextcites{}{}": {
       "snippet": "Gentextcites{${1:bibid}}{${2:bibid}}"
     },
+    "Gentextcites(){}{}": {
+      "snippet": "Gentextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "Gentextcites[](){}{}": {
+      "snippet": "Gentextcites[${3:ending}](${4:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "Gentextcites()(){}{}": {
+      "snippet": "Gentextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Gentextcites[]()(){}{}": {
+      "snippet": "Gentextcites[${3:ending}](${4:pre})(${5:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Gentextcites()()[]{}[]{}": {
+      "snippet": "Gentextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
+    "Gentextcites[]()()[]{}[]{}": {
+      "snippet": "Gentextcites[${3:ending}](${6:pre})(${7:post})[${4:pre}]{${1:bibid}}[${5:pre}]{${2:bibid}}"
+    },
     "Gentextcites[]{}[]{}": {
       "snippet": "Gentextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Gentextcites[][]{}[][]{}": {
       "snippet": "Gentextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Gentextcites()()[][]{}[][]{}": {
+      "snippet": "Gentextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Gentextcites[]()()[][]{}[][]{}": {
+      "snippet": "Gentextcites[${3:ending}](${8:pre})(${9:post})[${4:pre}][${5:post}]{${1:bibid}}[${6:pre}][${7:post}]{${2:bibid}}"
+    },
     "headlesscite{}": {
       "snippet": "headlesscite{${1:bibid}}"
     },
@@ -139,12 +223,24 @@
     "headlesscites{}{}": {
       "snippet": "headlesscites{${1:bibid}}{${2:bibid}}"
     },
+    "headlesscites(){}{}": {
+      "snippet": "headlesscites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlesscites()(){}{}": {
+      "snippet": "headlesscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlesscites()()[]{}[]{}": {
+      "snippet": "headlesscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "headlesscites[]{}[]{}": {
       "snippet": "headlesscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlesscites[][]{}[][]{}": {
       "snippet": "headlesscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "headlesscites()()[][]{}[][]{}": {
+      "snippet": "headlesscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "Headlesscite{}": {
       "snippet": "Headlesscite{${1:bibid}}"
     },
@@ -157,12 +253,24 @@
     "Headlesscites{}{}": {
       "snippet": "Headlesscites{${1:bibid}}{${2:bibid}}"
     },
+    "Headlesscites(){}{}": {
+      "snippet": "Headlesscites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "Headlesscites()(){}{}": {
+      "snippet": "Headlesscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Headlesscites()()[]{}[]{}": {
+      "snippet": "Headlesscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "Headlesscites[]{}[]{}": {
       "snippet": "Headlesscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Headlesscites[][]{}[][]{}": {
       "snippet": "Headlesscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "Headlesscites()()[][]{}[][]{}": {
+      "snippet": "Headlesscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "headlessfullcite{}": {
       "snippet": "headlessfullcite{${1:bibid}}"
     },
@@ -175,12 +283,24 @@
     "headlessfullcites{}{}": {
       "snippet": "headlessfullcites{${1:bibid}}{${2:bibid}}"
     },
+    "headlessfullcites(){}{}": {
+      "snippet": "headlessfullcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlessfullcites()(){}{}": {
+      "snippet": "headlessfullcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlessfullcites()()[]{}[]{}": {
+      "snippet": "headlessfullcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "headlessfullcites[]{}[]{}": {
       "snippet": "headlessfullcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlessfullcites[][]{}[][]{}": {
       "snippet": "headlessfullcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "headlessfullcites()()[][]{}[][]{}": {
+      "snippet": "headlessfullcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "shortcite[]{}": {
       "snippet": "shortcite[${2:postnote}]{${1:bibid}}"
     },
@@ -271,12 +391,24 @@
     "surnamecites{}{}": {
       "snippet": "surnamecites{${1:bibid}}{${2:bibid}}"
     },
+    "surnamecites(){}{}": {
+      "snippet": "surnamecites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "surnamecites()(){}{}": {
+      "snippet": "surnamecites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "surnamecites()()[]{}[]{}": {
+      "snippet": "surnamecites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "surnamecites[]{}[]{}": {
       "snippet": "surnamecites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "surnamecites[][]{}[][]{}": {
       "snippet": "surnamecites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "surnamecites()()[][]{}[][]{}": {
+      "snippet": "surnamecites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "runcite{}": {
       "snippet": "runcite{${1:bibid}}"
     },
@@ -298,12 +430,24 @@
     "headlessparencites{}{}": {
       "snippet": "headlessparencites{${1:bibid}}{${2:bibid}}"
     },
+    "headlessparencites(){}{}": {
+      "snippet": "headlessparencites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlessparencites()(){}{}": {
+      "snippet": "headlessparencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlessparencites()()[]{}[]{}": {
+      "snippet": "headlessparencites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "headlessparencites[]{}[]{}": {
       "snippet": "headlessparencites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlessparencites[][]{}[][]{}": {
       "snippet": "headlessparencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "headlessparencites()()[][]{}[][]{}": {
+      "snippet": "headlessparencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "headlessparenshortcite{}": {
       "snippet": "headlessparenshortcite{${1:bibid}}"
     },
@@ -316,12 +460,24 @@
     "headlessparenshortcites{}{}": {
       "snippet": "headlessparenshortcites{${1:bibid}}{${2:bibid}}"
     },
+    "headlessparenshortcites(){}{}": {
+      "snippet": "headlessparenshortcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlessparenshortcites()(){}{}": {
+      "snippet": "headlessparenshortcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "headlessparenshortcites()()[]{}[]{}": {
+      "snippet": "headlessparenshortcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "headlessparenshortcites[]{}[]{}": {
       "snippet": "headlessparenshortcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlessparenshortcites[][]{}[][]{}": {
       "snippet": "headlessparenshortcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "headlessparenshortcites()()[][]{}[][]{}": {
+      "snippet": "headlessparenshortcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "foottextcite{}": {
       "snippet": "foottextcite{${1:bibid}}"
     },
@@ -334,12 +490,24 @@
     "foottextcites{}{}": {
       "snippet": "foottextcites{${1:bibid}}{${2:bibid}}"
     },
+    "foottextcites(){}{}": {
+      "snippet": "foottextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "foottextcites()(){}{}": {
+      "snippet": "foottextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "foottextcites()()[]{}[]{}": {
+      "snippet": "foottextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "foottextcites[]{}[]{}": {
       "snippet": "foottextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "foottextcites[][]{}[][]{}": {
       "snippet": "foottextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "foottextcites()()[][]{}[][]{}": {
+      "snippet": "foottextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "cmsnoopcite{}": {
       "snippet": "cmsnoopcite{${1:bibid}}"
     },
@@ -397,12 +565,24 @@
     "citeincitefs{}{}": {
       "snippet": "citeincitefs{${1:bibid}}{${2:bibid}}"
     },
+    "citeincitefs(){}{}": {
+      "snippet": "citeincitefs(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "citeincitefs()(){}{}": {
+      "snippet": "citeincitefs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citeincitefs()()[]{}[]{}": {
+      "snippet": "citeincitefs(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "citeincitefs[]{}[]{}": {
       "snippet": "citeincitefs[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citeincitefs[][]{}[][]{}": {
       "snippet": "citeincitefs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citeincitefs()()[][]{}[][]{}": {
+      "snippet": "citeincitefs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "reprint": {},
     "partcomp": {},
     "partedit{}": {
diff --git a/dev/packages/biblatex-ext-oa.json b/dev/packages/biblatex-ext-oa.json
index 4f6db16da..1611fcc68 100644
--- a/dev/packages/biblatex-ext-oa.json
+++ b/dev/packages/biblatex-ext-oa.json
@@ -43,7 +43,7 @@
       "snippet": "UndeclareOpenAccessEprintUrl{${1:eprint type}}"
     },
     "DeclareOpenAccessUrlFieldPriority{}": {
-      "snippet": "DeclareOpenAccessUrlFieldPriority{${1:field1,field2,...}}"
+      "snippet": "DeclareOpenAccessUrlFieldPriority{${1:field1,${2:field2},...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/biblatex-ms.json b/dev/packages/biblatex-ms.json
index ba4c1f3df..654493dfd 100644
--- a/dev/packages/biblatex-ms.json
+++ b/dev/packages/biblatex-ms.json
@@ -132,7 +132,7 @@
     "currentmslang": {},
     "currentmslangs": {},
     "DeclareExtradateContext[]{}": {
-      "snippet": "DeclareExtradateContext[${2:entrytype1,entrytype2,...}]{${1:specification}}"
+      "snippet": "DeclareExtradateContext[${2:entrytype1,${3:entrytype2},...}]{${1:specification}}"
     },
     "DeclareExtradateContext{}": {
       "snippet": "DeclareExtradateContext{${1:specification}}"
@@ -991,6 +991,18 @@
       "snippet": "apud{${1:bibid}}{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
+    "apud(){}{}": {
+      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud()(){}{}": {
+      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud()()[]{}[]{}": {
+      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
     "apud[]{}[]{}": {
       "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
@@ -999,6 +1011,10 @@
       "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
+    "apud()()[][]{}[][]{}": {
+      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
     "plaincite[][]{}": {
       "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "style=abnt"
@@ -1251,6 +1267,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "style=apa"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=apa"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=apa"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=apa"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=apa"
@@ -1259,6 +1287,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=apa"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=apa"
+    },
     "arthistoryversion": {
       "option": "style=arthistory-bonn"
     },
@@ -1676,6 +1708,18 @@
       "snippet": "citets{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
+    "citets(){}{}": {
+      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets()(){}{}": {
+      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets()()[]{}[]{}": {
+      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
     "citets[]{}[]{}": {
       "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
@@ -1684,10 +1728,26 @@
       "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
+    "citets()()[][]{}[][]{}": {
+      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
     "Citets{}{}": {
       "snippet": "Citets{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citets(){}{}": {
+      "snippet": "Citets(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets()(){}{}": {
+      "snippet": "Citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets()()[]{}[]{}": {
+      "snippet": "Citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "Citets[]{}[]{}": {
       "snippet": "Citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -1696,10 +1756,26 @@
       "snippet": "Citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citets()()[][]{}[][]{}": {
+      "snippet": "Citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "citealts{}{}": {
       "snippet": "citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "citealts(){}{}": {
+      "snippet": "citealts(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts()(){}{}": {
+      "snippet": "citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts()()[]{}[]{}": {
+      "snippet": "citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "citealts[]{}[]{}": {
       "snippet": "citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -1708,10 +1784,26 @@
       "snippet": "citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "citealts()()[][]{}[][]{}": {
+      "snippet": "citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "Citealts{}{}": {
       "snippet": "Citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citealts(){}{}": {
+      "snippet": "Citealts(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts()(){}{}": {
+      "snippet": "Citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts()()[]{}[]{}": {
+      "snippet": "Citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "Citealts[]{}[]{}": {
       "snippet": "Citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -1720,6 +1812,10 @@
       "snippet": "Citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
+    "Citealts()()[][]{}[][]{}": {
+      "snippet": "Citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
     "mkbibindextruename{}{}{}{}": {
       "snippet": "mkbibindextruename{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}",
       "option": "style=fiwi2"
@@ -2074,6 +2170,18 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -2082,10 +2190,26 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -2094,6 +2218,10 @@
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
     "dealnoathor": {
       "option": "style=thuthesis-author-year"
     },
@@ -2305,6 +2433,18 @@
       "snippet": "detailscites{${1:bibid}}{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
+    "detailscites(){}{}": {
+      "snippet": "detailscites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites()(){}{}": {
+      "snippet": "detailscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites()()[]{}[]{}": {
+      "snippet": "detailscites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
     "detailscites[]{}[]{}": {
       "snippet": "detailscites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
@@ -2313,6 +2453,10 @@
       "snippet": "detailscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
+    "detailscites()()[][]{}[][]{}": {
+      "snippet": "detailscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
     "collectionshelfmarkpunct": {
       "option": "style=oxnum"
     },
@@ -3279,6 +3423,18 @@
       "snippet": "idemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
+    "idemcites(){}{}": {
+      "snippet": "idemcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites()(){}{}": {
+      "snippet": "idemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites()()[]{}[]{}": {
+      "snippet": "idemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "idemcites[]{}[]{}": {
       "snippet": "idemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -3287,6 +3443,10 @@
       "snippet": "idemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
+    "idemcites()()[][]{}[][]{}": {
+      "snippet": "idemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "footidemcite{}": {
       "snippet": "footidemcite{${1:bibid}}",
       "option": "style=windycity"
@@ -3303,6 +3463,18 @@
       "snippet": "footidemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
+    "footidemcites(){}{}": {
+      "snippet": "footidemcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites()(){}{}": {
+      "snippet": "footidemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites()()[]{}[]{}": {
+      "snippet": "footidemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "footidemcites[]{}[]{}": {
       "snippet": "footidemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -3311,6 +3483,10 @@
       "snippet": "footidemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
+    "footidemcites()()[][]{}[][]{}": {
+      "snippet": "footidemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "parenauth{}": {
       "snippet": "parenauth{${1:bibid}}",
       "option": "style=windycity"
@@ -3327,6 +3503,18 @@
       "snippet": "parenauths{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
+    "parenauths(){}{}": {
+      "snippet": "parenauths(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths()(){}{}": {
+      "snippet": "parenauths(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths()()[]{}[]{}": {
+      "snippet": "parenauths(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "parenauths[]{}[]{}": {
       "snippet": "parenauths[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -3335,6 +3523,10 @@
       "snippet": "parenauths[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
+    "parenauths()()[][]{}[][]{}": {
+      "snippet": "parenauths(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
     "mkmonthrange{}{}": {
       "snippet": "mkmonthrange{${1:arg1}}{${2:arg2}}",
       "option": "style=windycity"
diff --git a/dev/packages/biblatex.json b/dev/packages/biblatex.json
new file mode 100644
index 000000000..19557d681
--- /dev/null
+++ b/dev/packages/biblatex.json
@@ -0,0 +1,8530 @@
+{
+  "includes": {
+    "pdftexcmds": [],
+    "etoolbox": [],
+    "keyval": [],
+    "kvoptions": [],
+    "logreq": [],
+    "ifthen": [],
+    "url": [],
+    "xpatch": [
+      "style=abnt",
+      "style=abnt-ibid",
+      "style=abnt-numeric",
+      "style=acmauthoryear",
+      "style=arthistory-bonn",
+      "style=bath",
+      "bibstyle=claves",
+      "style=german-legal-book",
+      "bibstyle=manuscripts",
+      "bibstyle=manuscripts-noautoshorthand",
+      "style=oxalph",
+      "style=oxyear",
+      "style=oxnotes",
+      "style=oxnum",
+      "bibstyle=realauthor",
+      "style=unified"
+    ],
+    "xurl": [
+      "style=acmauthoryear",
+      "style=acmnumeric",
+      "bibstyle=software"
+    ],
+    "ulem": [
+      "style=archaeologie"
+    ],
+    "biblatex-archaeology": [
+      "style=aefkw",
+      "style=afwl",
+      "style=amit",
+      "style=archa",
+      "style=dguf",
+      "style=dguf-alt",
+      "style=dguf-apa",
+      "style=eaz",
+      "style=eaz-alt",
+      "style=foe",
+      "style=jb-halle",
+      "style=jb-kreis-neuss",
+      "style=karl",
+      "style=kunde",
+      "style=maja",
+      "style=mpk",
+      "style=mpkoeaw",
+      "style=niedersachsen",
+      "style=nnu",
+      "style=offa",
+      "style=rgk-inline",
+      "style=rgk-numeric",
+      "style=rgk-verbose",
+      "style=rgk-inline-old",
+      "style=rgk-numeric-old",
+      "style=rgk-verbose-old",
+      "style=rgzm-inline",
+      "style=rgzm-inline",
+      "style=rgzm-verbose",
+      "style=ufg-muenster-inline",
+      "style=ufg-muenster-numeric",
+      "style=ufg-muenster-verbose",
+      "style=volkskunde",
+      "style=zaak",
+      "style=zaes"
+    ],
+    "csquotes": [
+      "style=arthistory-bonn"
+    ],
+    "xstring": [
+      "style=bath",
+      "style=gb7714-2015",
+      "style=gb7714-2015ay",
+      "style=gb7714-2015ms",
+      "style=gb7714-2015mx",
+      "style=gb7714-CCNU",
+      "style=gb7714-NWAFU",
+      "style=gb7714-SEU",
+      "style=chinese-erj",
+      "style=oxalph",
+      "style=oxyear",
+      "style=oxnotes",
+      "style=oxnum",
+      "style=thuthesis-author-year",
+      "style=thuthesis-bachelor",
+      "style=thuthesis-numeric"
+    ],
+    "ragged2e": [
+      "style=fiwi",
+      "style=fiwi2"
+    ],
+    "mfirstuc": [
+      "style=chinese-erj"
+    ],
+    "graphicx": [
+      "style=oxalph",
+      "style=oxyear",
+      "style=oxnotes",
+      "style=oxnum"
+    ],
+    "xcolor": [
+      "style=socialscienceshuberlin"
+    ]
+  },
+  "macros": {
+    "bibname": {},
+    "biblistname": {},
+    "BiblatexManualHyperrefOn": {},
+    "BiblatexManualHyperrefOff": {},
+    "ExecuteBibliographyOptions{}": {
+      "snippet": "ExecuteBibliographyOptions{${1:options}}"
+    },
+    "ExecuteBibliographyOptions[]{}": {
+      "snippet": "ExecuteBibliographyOptions[${2:entrytype list}]{${1:options}}"
+    },
+    "iffieldannotation{}{}{}": {
+      "snippet": "iffieldannotation{${1:annotation}}{${2:true}}{${3:false}}"
+    },
+    "iffieldannotation[]{}{}{}": {
+      "snippet": "iffieldannotation[${4:field}]{${1:annotation}}{${2:true}}{${3:false}}"
+    },
+    "iffieldannotation[][]{}{}{}": {
+      "snippet": "iffieldannotation[${4:field}][${5:annotation name}]{${1:annotation}}{${2:true}}{${3:false}}"
+    },
+    "ifitemannotation{}{}{}": {
+      "snippet": "ifitemannotation{${1:annotation}}{${2:true}}{${3:false}}"
+    },
+    "ifitemannotation[]{}{}{}": {
+      "snippet": "ifitemannotation[${4:field}]{${1:annotation}}{${2:true}}{${3:false}}"
+    },
+    "ifitemannotation[][]{}{}{}": {
+      "snippet": "ifitemannotation[${4:field}][${5:annotation name}]{${1:annotation}}{${2:true}}{${3:false}}"
+    },
+    "ifitemannotation[][][]{}{}{}": {
+      "snippet": "ifitemannotation[${4:field}][${5:annotation name}][${6:item}]{${1:annotation}}{${2:true}}{${3:false}}"
+    },
+    "ifpartannotation{}{}{}{}": {
+      "snippet": "ifpartannotation{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
+    },
+    "ifpartannotation[]{}{}{}{}": {
+      "snippet": "ifpartannotation[${5:field}]{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
+    },
+    "ifpartannotation[][]{}{}{}{}": {
+      "snippet": "ifpartannotation[${5:field}][${6:annotation name}]{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
+    },
+    "ifpartannotation[][][]{}{}{}{}": {
+      "snippet": "ifpartannotation[${5:field}][${6:annotation name}][${7:item}]{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
+    },
+    "ifdateannotation{}{}{}{}": {
+      "snippet": "ifdateannotation{${1:datetype}}{${2:annotation}}{${3:true}}{${4:false}}"
+    },
+    "ifdateannotation[]{}{}{}{}": {
+      "snippet": "ifdateannotation[${5:annotation name}]{${1:datetype}}{${2:annotation}}{${3:true}}{${4:false}}"
+    },
+    "hasfieldannotation{}{}": {
+      "snippet": "hasfieldannotation{${1:true}}{${2:false}}"
+    },
+    "hasfieldannotation[]{}{}": {
+      "snippet": "hasfieldannotation[${3:field}]{${1:true}}{${2:false}}"
+    },
+    "hasfieldannotation[][]{}{}": {
+      "snippet": "hasfieldannotation[${3:field}][${4:annotation name}]{${1:true}}{${2:false}}"
+    },
+    "hasitemannotation{}{}": {
+      "snippet": "hasitemannotation{${1:true}}{${2:false}}"
+    },
+    "hasitemannotation[]{}{}": {
+      "snippet": "hasitemannotation[${3:field}]{${1:true}}{${2:false}}"
+    },
+    "hasitemannotation[][]{}{}": {
+      "snippet": "hasitemannotation[${3:field}][${4:annotation name}]{${1:true}}{${2:false}}"
+    },
+    "hasitemannotation[][][]{}{}": {
+      "snippet": "hasitemannotation[${3:field}][${4:annotation name}][${5:item}]{${1:true}}{${2:false}}"
+    },
+    "haspartannotation{}{}{}": {
+      "snippet": "haspartannotation{${1:part}}{${2:true}}{${3:false}}"
+    },
+    "haspartannotation[]{}{}{}": {
+      "snippet": "haspartannotation[${4:field}]{${1:part}}{${2:true}}{${3:false}}"
+    },
+    "haspartannotation[][]{}{}{}": {
+      "snippet": "haspartannotation[${4:field}][${5:annotation name}]{${1:part}}{${2:true}}{${3:false}}"
+    },
+    "haspartannotation[][][]{}{}{}": {
+      "snippet": "haspartannotation[${4:field}][${5:annotation name}][${6:item}]{${1:part}}{${2:true}}{${3:false}}"
+    },
+    "hasdateannotation{}{}{}": {
+      "snippet": "hasdateannotation{${1:datetype}}{${2:true}}{${3:false}}"
+    },
+    "hasdateannotation[]{}{}{}": {
+      "snippet": "hasdateannotation[${4:annotation name}]{${1:datetype}}{${2:true}}{${3:false}}"
+    },
+    "getfieldannotation": {},
+    "getfieldannotation[]": {
+      "snippet": "getfieldannotation[${1:field}]"
+    },
+    "getfieldannotation[][]": {
+      "snippet": "getfieldannotation[${1:field}][${2:annotation name}]"
+    },
+    "getitemannotation": {},
+    "getitemannotation[]": {
+      "snippet": "getitemannotation[${1:field}]"
+    },
+    "getitemannotation[][]": {
+      "snippet": "getitemannotation[${1:field}][${2:annotation name}]"
+    },
+    "getitemannotation[][][]": {
+      "snippet": "getitemannotation[${1:field}][${2:annotation name}][${3:item}]"
+    },
+    "getpartannotation{}": {
+      "snippet": "getpartannotation{${1:part}}"
+    },
+    "getpartannotation[]{}": {
+      "snippet": "getpartannotation[${2:field}]{${1:part}}"
+    },
+    "getpartannotation[][]{}": {
+      "snippet": "getpartannotation[${2:field}][${3:annotation name}]{${1:part}}"
+    },
+    "getpartannotation[][][]{}": {
+      "snippet": "getpartannotation[${2:field}][${3:annotation name}][${4:item}]{${1:part}}"
+    },
+    "getdateannotation{}": {
+      "snippet": "getdateannotation{${1:datetype}}"
+    },
+    "getdateannotation[]{}": {
+      "snippet": "getdateannotation[${2:annotation name}]{${1:datetype}}"
+    },
+    "addbibresource{}": {
+      "snippet": "addbibresource{${1:bibliographic resource}}"
+    },
+    "addbibresource[]{}": {
+      "snippet": "addbibresource[${2:options}]{${1:bibliographic resource}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "addglobalbib{}": {
+      "snippet": "addglobalbib{${1:bibliographic resource}}"
+    },
+    "addglobalbib[]{}": {
+      "snippet": "addglobalbib[${2:options}]{${1:bibliographic resource}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "addsectionbib{}": {
+      "snippet": "addsectionbib{${1:bibliographic resource}}"
+    },
+    "addsectionbib[]{}": {
+      "snippet": "addsectionbib[${2:options}]{${1:bibliographic resource}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "printbibliography": {},
+    "printbibliography[]": {
+      "snippet": "printbibliography[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "bibbysection": {},
+    "bibbysection[]": {
+      "snippet": "bibbysection[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "bibbysegment": {},
+    "bibbysegment[]": {
+      "snippet": "bibbysegment[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "bibbycategory": {},
+    "bibbycategory[]": {
+      "snippet": "bibbycategory[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "printbibheading": {},
+    "printbibheading[]": {
+      "snippet": "printbibheading[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "DeclarePrintbibliographyDefaults{}": {
+      "snippet": "DeclarePrintbibliographyDefaults{${1:options}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "printbiblist{}": {
+      "snippet": "printbiblist{${1:biblist}}"
+    },
+    "printbiblist[]{}": {
+      "snippet": "printbiblist[${2:options}]{${1:biblist}}",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "printshorthands": {},
+    "printshorthands[]": {
+      "snippet": "printshorthands[${1:options}]",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "newrefsection": {},
+    "newrefsection[]": {
+      "snippet": "newrefsection[${1:bib files}]"
+    },
+    "endrefsection": {},
+    "newrefsegment": {},
+    "endrefsegment": {},
+    "therefsection": {},
+    "therefsegment": {},
+    "DeclareBibliographyCategory{}": {
+      "snippet": "DeclareBibliographyCategory{${1:category}}"
+    },
+    "addtocategory{}{}": {
+      "snippet": "addtocategory{${1:category}}{${2:bibid}}"
+    },
+    "defbibenvironment{}{}{}{}": {
+      "snippet": "defbibenvironment{${1:envname}}{${2:begdef}}{${3:enddef}}{${4:itemcode}}"
+    },
+    "defbibheading{}{}": {
+      "snippet": "defbibheading{${1:name}}{${2:code}}"
+    },
+    "defbibheading{}[]{}": {
+      "snippet": "defbibheading{${1:name}}[${2:title}]{${3:code}}"
+    },
+    "defbibnote{}{}": {
+      "snippet": "defbibnote{${1:name}}{${2:text}}"
+    },
+    "defbibfilter{}{}": {
+      "snippet": "defbibfilter{${1:name}}{${2:expression}}"
+    },
+    "defbibcheck{}{}": {
+      "snippet": "defbibcheck{${1:name}}{${2:code}}"
+    },
+    "skipentry": {},
+    "segment{}": {
+      "snippet": "segment{${1:integer}}"
+    },
+    "type{}": {
+      "snippet": "type{${1:type}}"
+    },
+    "subtype{}": {
+      "snippet": "subtype{${1:subtype}}"
+    },
+    "keyword{}": {
+      "snippet": "keyword{${1:keyword}}"
+    },
+    "category{}": {
+      "snippet": "category{${1:category}}"
+    },
+    "DeclareRefcontext{}{}": {
+      "snippet": "DeclareRefcontext{${1:name}}{${2:options}}",
+      "keyvalindex": 6,
+      "keyvalpos": 1
+    },
+    "newrefcontext{}": {
+      "snippet": "newrefcontext{${1:name}}"
+    },
+    "newrefcontext[]{}": {
+      "snippet": "newrefcontext[${2:options}]{${1:name}}",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "localrefcontext{}": {
+      "snippet": "localrefcontext{${1:name}}"
+    },
+    "localrefcontext[]{}": {
+      "snippet": "localrefcontext[${2:options}]{${1:name}}",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "endrefcontext": {},
+    "assignrefcontextkeyws[]{}": {
+      "snippet": "assignrefcontextkeyws[${2:options}]{${1:keyword1,${3:keyword2},...}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "assignrefcontextkeyws*[]{}": {
+      "snippet": "assignrefcontextkeyws*[${2:options}]{${1:keyword1,${3:keyword2},...}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "assignrefcontextcats[]{}": {
+      "snippet": "assignrefcontextcats[${2:options}]{${1:category1,${3:category2},...}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "assignrefcontextcats*[]{}": {
+      "snippet": "assignrefcontextcats*[${2:options}]{${1:category1,${3:category2},...}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "assignrefcontextentries[]{}": {
+      "snippet": "assignrefcontextentries[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "assignrefcontextentries*[]{}": {
+      "snippet": "assignrefcontextentries*[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "GenRefcontextData{}": {
+      "snippet": "GenRefcontextData{${1:keyvals}}",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "defbibentryset{}{}": {
+      "snippet": "defbibentryset{${1:bibid}}{${2:key1,${3:key2},...}}"
+    },
+    "cite[][]{}": {
+      "snippet": "cite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Cite[][]{}": {
+      "snippet": "Cite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Cite[]{}": {
+      "snippet": "Cite[${2:postnote}]{${1:bibid}}"
+    },
+    "Cite{}": {
+      "snippet": "Cite{${1:bibid}}"
+    },
+    "parencite[][]{}": {
+      "snippet": "parencite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "parencite[]{}": {
+      "snippet": "parencite[${2:postnote}]{${1:bibid}}"
+    },
+    "Parencite[][]{}": {
+      "snippet": "Parencite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Parencite[]{}": {
+      "snippet": "Parencite[${2:postnote}]{${1:bibid}}"
+    },
+    "Parencite{}": {
+      "snippet": "Parencite{${1:bibid}}"
+    },
+    "footcite[][]{}": {
+      "snippet": "footcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "footcite[]{}": {
+      "snippet": "footcite[${2:(${3:postnote:prefix})postnote:stem}]{${1:bibid}}",
+      "option": "style=jura2"
+    },
+    "footcite{}": {
+      "snippet": "footcite{${1:bibid}}"
+    },
+    "footcitetext[][]{}": {
+      "snippet": "footcitetext[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "footcitetext[]{}": {
+      "snippet": "footcitetext[${2:postnote}]{${1:bibid}}"
+    },
+    "footcitetext{}": {
+      "snippet": "footcitetext{${1:bibid}}"
+    },
+    "textcite[][]{}": {
+      "snippet": "textcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "textcite[]{}": {
+      "snippet": "textcite[${2:postnote}]{${1:bibid}}"
+    },
+    "Textcite[][]{}": {
+      "snippet": "Textcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Textcite[]{}": {
+      "snippet": "Textcite[${2:postnote}]{${1:bibid}}"
+    },
+    "Textcite{}": {
+      "snippet": "Textcite{${1:bibid}}"
+    },
+    "smartcite[][]{}": {
+      "snippet": "smartcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "smartcite[]{}": {
+      "snippet": "smartcite[${2:postnote}]{${1:bibid}}"
+    },
+    "smartcite{}": {
+      "snippet": "smartcite{${1:bibid}}"
+    },
+    "Smartcite[][]{}": {
+      "snippet": "Smartcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Smartcite[]{}": {
+      "snippet": "Smartcite[${2:postnote}]{${1:bibid}}"
+    },
+    "Smartcite{}": {
+      "snippet": "Smartcite{${1:bibid}}"
+    },
+    "cite*[][]{}": {
+      "snippet": "cite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "cite*[]{}": {
+      "snippet": "cite*[${2:postnote}]{${1:bibid}}"
+    },
+    "cite*{}": {
+      "snippet": "cite*{${1:bibid}}"
+    },
+    "parencite*[][]{}": {
+      "snippet": "parencite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "parencite*[]{}": {
+      "snippet": "parencite*[${2:postnote}]{${1:bibid}}"
+    },
+    "parencite*{}": {
+      "snippet": "parencite*{${1:bibid}}"
+    },
+    "supercite{}": {
+      "snippet": "supercite{${1:bibid}}"
+    },
+    "cites{}{}": {
+      "snippet": "cites{${1:bibid}}{${2:bibid}}"
+    },
+    "cites(){}{}": {
+      "snippet": "cites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "cites()(){}{}": {
+      "snippet": "cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "cites()()[]{}[]{}": {
+      "snippet": "cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "cites[]{}[]{}": {
+      "snippet": "cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "cites[][]{}[][]{}": {
+      "snippet": "cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "cites()()[][]{}[][]{}": {
+      "snippet": "cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Cites{}{}": {
+      "snippet": "Cites{${1:bibid}}{${2:bibid}}"
+    },
+    "Cites(){}{}": {
+      "snippet": "Cites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Cites()(){}{}": {
+      "snippet": "Cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Cites()()[]{}[]{}": {
+      "snippet": "Cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Cites[]{}[]{}": {
+      "snippet": "Cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Cites[][]{}[][]{}": {
+      "snippet": "Cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Cites()()[][]{}[][]{}": {
+      "snippet": "Cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "parencites{}{}": {
+      "snippet": "parencites{${1:bibid}}{${2:bibid}}"
+    },
+    "parencites(){}{}": {
+      "snippet": "parencites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "parencites()(){}{}": {
+      "snippet": "parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "parencites()()[]{}[]{}": {
+      "snippet": "parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "parencites[]{}[]{}": {
+      "snippet": "parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "parencites[][]{}[][]{}": {
+      "snippet": "parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "parencites()()[][]{}[][]{}": {
+      "snippet": "parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Parencites{}{}": {
+      "snippet": "Parencites{${1:bibid}}{${2:bibid}}"
+    },
+    "Parencites(){}{}": {
+      "snippet": "Parencites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Parencites()(){}{}": {
+      "snippet": "Parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Parencites()()[]{}[]{}": {
+      "snippet": "Parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Parencites[]{}[]{}": {
+      "snippet": "Parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Parencites[][]{}[][]{}": {
+      "snippet": "Parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Parencites()()[][]{}[][]{}": {
+      "snippet": "Parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "footcites{}{}": {
+      "snippet": "footcites{${1:bibid}}{${2:bibid}}"
+    },
+    "footcites(){}{}": {
+      "snippet": "footcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcites()(){}{}": {
+      "snippet": "footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcites()()[]{}[]{}": {
+      "snippet": "footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "footcites[]{}[]{}": {
+      "snippet": "footcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "footcites[][]{}[][]{}": {
+      "snippet": "footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "footcites()()[][]{}[][]{}": {
+      "snippet": "footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "footcitetexts{}{}": {
+      "snippet": "footcitetexts{${1:bibid}}{${2:bibid}}"
+    },
+    "footcitetexts(){}{}": {
+      "snippet": "footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcitetexts()(){}{}": {
+      "snippet": "footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "footcitetexts()()[]{}[]{}": {
+      "snippet": "footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "footcitetexts[]{}[]{}": {
+      "snippet": "footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "footcitetexts[][]{}[][]{}": {
+      "snippet": "footcitetexts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "footcitetexts()()[][]{}[][]{}": {
+      "snippet": "footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "smartcites{}{}": {
+      "snippet": "smartcites{${1:bibid}}{${2:bibid}}"
+    },
+    "smartcites(){}{}": {
+      "snippet": "smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "smartcites()(){}{}": {
+      "snippet": "smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "smartcites()()[]{}[]{}": {
+      "snippet": "smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "smartcites[]{}[]{}": {
+      "snippet": "smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "smartcites[][]{}[][]{}": {
+      "snippet": "smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "smartcites()()[][]{}[][]{}": {
+      "snippet": "smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Smartcites{}{}": {
+      "snippet": "Smartcites{${1:bibid}}{${2:bibid}}"
+    },
+    "Smartcites(){}{}": {
+      "snippet": "Smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Smartcites()(){}{}": {
+      "snippet": "Smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Smartcites()()[]{}[]{}": {
+      "snippet": "Smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Smartcites[]{}[]{}": {
+      "snippet": "Smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Smartcites[][]{}[][]{}": {
+      "snippet": "Smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Smartcites()()[][]{}[][]{}": {
+      "snippet": "Smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "textcites{}{}": {
+      "snippet": "textcites{${1:bibid}}{${2:bibid}}"
+    },
+    "textcites(){}{}": {
+      "snippet": "textcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "textcites()(){}{}": {
+      "snippet": "textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "textcites()()[]{}[]{}": {
+      "snippet": "textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "textcites[]{}[]{}": {
+      "snippet": "textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "textcites[][]{}[][]{}": {
+      "snippet": "textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "textcites()()[][]{}[][]{}": {
+      "snippet": "textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Textcites{}{}": {
+      "snippet": "Textcites{${1:bibid}}{${2:bibid}}"
+    },
+    "Textcites(){}{}": {
+      "snippet": "Textcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Textcites()(){}{}": {
+      "snippet": "Textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Textcites()()[]{}[]{}": {
+      "snippet": "Textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Textcites[]{}[]{}": {
+      "snippet": "Textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Textcites[][]{}[][]{}": {
+      "snippet": "Textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Textcites()()[][]{}[][]{}": {
+      "snippet": "Textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "supercites{}{}": {
+      "snippet": "supercites{${1:bibid}}{${2:bibid}}"
+    },
+    "supercites(){}{}": {
+      "snippet": "supercites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "supercites()(){}{}": {
+      "snippet": "supercites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "supercites()()[]{}[]{}": {
+      "snippet": "supercites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "supercites[]{}[]{}": {
+      "snippet": "supercites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "supercites[][]{}[][]{}": {
+      "snippet": "supercites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "supercites()()[][]{}[][]{}": {
+      "snippet": "supercites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "autocite[][]{}": {
+      "snippet": "autocite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "autocite[]{}": {
+      "snippet": "autocite[${2:postnote}]{${1:bibid}}"
+    },
+    "autocite{}": {
+      "snippet": "autocite{${1:bibid}}"
+    },
+    "Autocite[][]{}": {
+      "snippet": "Autocite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Autocite[]{}": {
+      "snippet": "Autocite[${2:postnote}]{${1:bibid}}"
+    },
+    "Autocite{}": {
+      "snippet": "Autocite{${1:bibid}}"
+    },
+    "autocite*[][]{}": {
+      "snippet": "autocite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "autocite*[]{}": {
+      "snippet": "autocite*[${2:postnote}]{${1:bibid}}"
+    },
+    "autocite*{}": {
+      "snippet": "autocite*{${1:bibid}}"
+    },
+    "Autocite*[][]{}": {
+      "snippet": "Autocite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Autocite*[]{}": {
+      "snippet": "Autocite*[${2:postnote}]{${1:bibid}}"
+    },
+    "Autocite*{}": {
+      "snippet": "Autocite*{${1:bibid}}"
+    },
+    "autocites{}{}": {
+      "snippet": "autocites{${1:bibid}}{${2:bibid}}"
+    },
+    "autocites(){}{}": {
+      "snippet": "autocites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "autocites()(){}{}": {
+      "snippet": "autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "autocites()()[]{}[]{}": {
+      "snippet": "autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "autocites[]{}[]{}": {
+      "snippet": "autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "autocites[][]{}[][]{}": {
+      "snippet": "autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "autocites()()[][]{}[][]{}": {
+      "snippet": "autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Autocites{}{}": {
+      "snippet": "Autocites{${1:bibid}}{${2:bibid}}"
+    },
+    "Autocites(){}{}": {
+      "snippet": "Autocites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Autocites()(){}{}": {
+      "snippet": "Autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Autocites()()[]{}[]{}": {
+      "snippet": "Autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Autocites[]{}[]{}": {
+      "snippet": "Autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Autocites[][]{}[][]{}": {
+      "snippet": "Autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Autocites()()[][]{}[][]{}": {
+      "snippet": "Autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "citeauthor[][]{}": {
+      "snippet": "citeauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citeauthor[]{}": {
+      "snippet": "citeauthor[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citeauthor{}": {
+      "snippet": "citeauthor{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citeauthor[][]{}": {
+      "snippet": "Citeauthor[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Citeauthor[]{}": {
+      "snippet": "Citeauthor[${2:postnote}]{${1:bibid}}"
+    },
+    "Citeauthor{}": {
+      "snippet": "Citeauthor{${1:bibid}}"
+    },
+    "citeauthor*[][]{}": {
+      "snippet": "citeauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citeauthor*[]{}": {
+      "snippet": "citeauthor*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citeauthor*{}": {
+      "snippet": "citeauthor*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citeauthor*[][]{}": {
+      "snippet": "Citeauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Citeauthor*[]{}": {
+      "snippet": "Citeauthor*[${2:postnote}]{${1:bibid}}"
+    },
+    "Citeauthor*{}": {
+      "snippet": "Citeauthor*{${1:bibid}}"
+    },
+    "citetitle[][]{}": {
+      "snippet": "citetitle[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "citetitle[]{}": {
+      "snippet": "citetitle[${2:postnote}]{${1:bibid}}"
+    },
+    "citetitle{}": {
+      "snippet": "citetitle{${1:bibid}}"
+    },
+    "citetitle*[][]{}": {
+      "snippet": "citetitle*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "citetitle*[]{}": {
+      "snippet": "citetitle*[${2:postnote}]{${1:bibid}}"
+    },
+    "citetitle*{}": {
+      "snippet": "citetitle*{${1:bibid}}"
+    },
+    "Citetitle[][]{}": {
+      "snippet": "Citetitle[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Citetitle[]{}": {
+      "snippet": "Citetitle[${2:postnote}]{${1:bibid}}"
+    },
+    "Citetitle{}": {
+      "snippet": "Citetitle{${1:bibid}}"
+    },
+    "Citetitle*[][]{}": {
+      "snippet": "Citetitle*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Citetitle*[]{}": {
+      "snippet": "Citetitle*[${2:postnote}]{${1:bibid}}"
+    },
+    "Citetitle*{}": {
+      "snippet": "Citetitle*{${1:bibid}}"
+    },
+    "citeyear[][]{}": {
+      "snippet": "citeyear[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "citeyear[]{}": {
+      "snippet": "citeyear[${2:postnote}]{${1:bibid}}"
+    },
+    "citeyear*[][]{}": {
+      "snippet": "citeyear*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "citeyear*[]{}": {
+      "snippet": "citeyear*[${2:postnote}]{${1:bibid}}"
+    },
+    "citeyear*{}": {
+      "snippet": "citeyear*{${1:bibid}}"
+    },
+    "citedate[][]{}": {
+      "snippet": "citedate[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "citedate[]{}": {
+      "snippet": "citedate[${2:postnote}]{${1:bibid}}"
+    },
+    "citedate{}": {
+      "snippet": "citedate{${1:bibid}}"
+    },
+    "citedate*[][]{}": {
+      "snippet": "citedate*[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "citedate*[]{}": {
+      "snippet": "citedate*[${2:postnote}]{${1:bibid}}"
+    },
+    "citedate*{}": {
+      "snippet": "citedate*{${1:bibid}}"
+    },
+    "citeurl[][]{}": {
+      "snippet": "citeurl[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "citeurl[]{}": {
+      "snippet": "citeurl[${2:postnote}]{${1:bibid}}"
+    },
+    "citeurl{}": {
+      "snippet": "citeurl{${1:bibid}}"
+    },
+    "parentext{}": {
+      "snippet": "parentext{${1:text}}"
+    },
+    "brackettext{}": {
+      "snippet": "brackettext{${1:text}}"
+    },
+    "fullcite[][]{}": {
+      "snippet": "fullcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "fullcite[]{}": {
+      "snippet": "fullcite[${2:postnote}]{${1:bibid}}"
+    },
+    "fullcite{}": {
+      "snippet": "fullcite{${1:bibid}}"
+    },
+    "footfullcite[][]{}": {
+      "snippet": "footfullcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "footfullcite[]{}": {
+      "snippet": "footfullcite[${2:postnote}]{${1:bibid}}"
+    },
+    "footfullcite{}": {
+      "snippet": "footfullcite{${1:bibid}}"
+    },
+    "volcite{}{}": {
+      "snippet": "volcite{${1:volume}}{${2:bibid}}"
+    },
+    "volcite[]{}{}": {
+      "snippet": "volcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "volcite{}[]{}": {
+      "snippet": "volcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "volcite[]{}[]{}": {
+      "snippet": "volcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "Volcite{}{}": {
+      "snippet": "Volcite{${1:volume}}{${2:bibid}}"
+    },
+    "Volcite[]{}{}": {
+      "snippet": "Volcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "Volcite{}[]{}": {
+      "snippet": "Volcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "Volcite[]{}[]{}": {
+      "snippet": "Volcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "volcites{}{}{}{}": {
+      "snippet": "volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "volcites(){}{}{}{}": {
+      "snippet": "volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "volcites()(){}{}{}{}": {
+      "snippet": "volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "volcites()()[]{}{}[]{}{}": {
+      "snippet": "volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "volcites[]{}{}[]{}{}": {
+      "snippet": "volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "volcites[][]{}{}[][]{}{}": {
+      "snippet": "volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "volcites()()[][]{}{}[][]{}{}": {
+      "snippet": "volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites{}{}{}{}": {
+      "snippet": "Volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites(){}{}{}{}": {
+      "snippet": "Volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites()(){}{}{}{}": {
+      "snippet": "Volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites()()[]{}{}[]{}{}": {
+      "snippet": "Volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites[]{}{}[]{}{}": {
+      "snippet": "Volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites[][]{}{}[][]{}{}": {
+      "snippet": "Volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Volcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcite{}{}": {
+      "snippet": "pvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "pvolcite[]{}{}": {
+      "snippet": "pvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "pvolcite{}[]{}": {
+      "snippet": "pvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "pvolcite[]{}[]{}": {
+      "snippet": "pvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "Pvolcite{}{}": {
+      "snippet": "Pvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "Pvolcite[]{}{}": {
+      "snippet": "Pvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "Pvolcite{}[]{}": {
+      "snippet": "Pvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "Pvolcite[]{}[]{}": {
+      "snippet": "Pvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "pvolcites{}{}{}{}": {
+      "snippet": "pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites(){}{}{}{}": {
+      "snippet": "pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites()(){}{}{}{}": {
+      "snippet": "pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites()()[]{}{}[]{}{}": {
+      "snippet": "pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites[]{}{}[]{}{}": {
+      "snippet": "pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites[][]{}{}[][]{}{}": {
+      "snippet": "pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "pvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites{}{}{}{}": {
+      "snippet": "Pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites(){}{}{}{}": {
+      "snippet": "Pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites()(){}{}{}{}": {
+      "snippet": "Pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites[]{}{}[]{}{}": {
+      "snippet": "Pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites[][]{}{}[][]{}{}": {
+      "snippet": "Pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Pvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcite{}{}": {
+      "snippet": "fvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "fvolcite[]{}{}": {
+      "snippet": "fvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "fvolcite{}[]{}": {
+      "snippet": "fvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "fvolcite[]{}[]{}": {
+      "snippet": "fvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "Fvolcite{}{}": {
+      "snippet": "Fvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "Fvolcite[]{}{}": {
+      "snippet": "Fvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "Fvolcite{}[]{}": {
+      "snippet": "Fvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "Fvolcite[]{}[]{}": {
+      "snippet": "Fvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "fvolcites{}{}{}{}": {
+      "snippet": "fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites(){}{}{}{}": {
+      "snippet": "fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites()(){}{}{}{}": {
+      "snippet": "fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites()()[]{}{}[]{}{}": {
+      "snippet": "fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites[]{}{}[]{}{}": {
+      "snippet": "fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites[][]{}{}[][]{}{}": {
+      "snippet": "fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "fvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites{}{}{}{}": {
+      "snippet": "Fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites(){}{}{}{}": {
+      "snippet": "Fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites()(){}{}{}{}": {
+      "snippet": "Fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites[]{}{}[]{}{}": {
+      "snippet": "Fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites[][]{}{}[][]{}{}": {
+      "snippet": "Fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Fvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcite{}{}": {
+      "snippet": "ftvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "ftvolcite[]{}{}": {
+      "snippet": "ftvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "ftvolcite{}[]{}": {
+      "snippet": "ftvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "ftvolcite[]{}[]{}": {
+      "snippet": "ftvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "Ftvolcite{}{}": {
+      "snippet": "Ftvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "Ftvolcite[]{}{}": {
+      "snippet": "Ftvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "Ftvolcite{}[]{}": {
+      "snippet": "Ftvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "Ftvolcite[]{}[]{}": {
+      "snippet": "Ftvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "ftvolcites{}{}{}{}": {
+      "snippet": "ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites(){}{}{}{}": {
+      "snippet": "ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites()(){}{}{}{}": {
+      "snippet": "ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites()()[]{}{}[]{}{}": {
+      "snippet": "ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites[]{}{}[]{}{}": {
+      "snippet": "ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites[][]{}{}[][]{}{}": {
+      "snippet": "ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "ftvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites{}{}{}{}": {
+      "snippet": "Ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites(){}{}{}{}": {
+      "snippet": "Ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites()(){}{}{}{}": {
+      "snippet": "Ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites[]{}{}[]{}{}": {
+      "snippet": "Ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites[][]{}{}[][]{}{}": {
+      "snippet": "Ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Ftvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "svolcite{}{}": {
+      "snippet": "svolcite{${1:volume}}{${2:bibid}}"
+    },
+    "svolcite[]{}{}": {
+      "snippet": "svolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "svolcite{}[]{}": {
+      "snippet": "svolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "svolcite[]{}[]{}": {
+      "snippet": "svolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "Svolcite{}{}": {
+      "snippet": "Svolcite{${1:volume}}{${2:bibid}}"
+    },
+    "Svolcite[]{}{}": {
+      "snippet": "Svolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "Svolcite{}[]{}": {
+      "snippet": "Svolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "Svolcite[]{}[]{}": {
+      "snippet": "Svolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "svolcites{}{}{}{}": {
+      "snippet": "svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites(){}{}{}{}": {
+      "snippet": "svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites()(){}{}{}{}": {
+      "snippet": "svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites()()[]{}{}[]{}{}": {
+      "snippet": "svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites[]{}{}[]{}{}": {
+      "snippet": "svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites[][]{}{}[][]{}{}": {
+      "snippet": "svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "svolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites{}{}{}{}": {
+      "snippet": "Svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites(){}{}{}{}": {
+      "snippet": "Svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites()(){}{}{}{}": {
+      "snippet": "Svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites()()[]{}{}[]{}{}": {
+      "snippet": "Svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites[]{}{}[]{}{}": {
+      "snippet": "Svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites[][]{}{}[][]{}{}": {
+      "snippet": "Svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Svolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcite{}{}": {
+      "snippet": "tvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "tvolcite[]{}{}": {
+      "snippet": "tvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "tvolcite{}[]{}": {
+      "snippet": "tvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "tvolcite[]{}[]{}": {
+      "snippet": "tvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "Tvolcite{}{}": {
+      "snippet": "Tvolcite{${1:volume}}{${2:bibid}}"
+    },
+    "Tvolcite[]{}{}": {
+      "snippet": "Tvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "Tvolcite{}[]{}": {
+      "snippet": "Tvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "Tvolcite[]{}[]{}": {
+      "snippet": "Tvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "tvolcites{}{}{}{}": {
+      "snippet": "tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites(){}{}{}{}": {
+      "snippet": "tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites()(){}{}{}{}": {
+      "snippet": "tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites()()[]{}{}[]{}{}": {
+      "snippet": "tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites[]{}{}[]{}{}": {
+      "snippet": "tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites[][]{}{}[][]{}{}": {
+      "snippet": "tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "tvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites{}{}{}{}": {
+      "snippet": "Tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites(){}{}{}{}": {
+      "snippet": "Tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites()(){}{}{}{}": {
+      "snippet": "Tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites()()[]{}{}[]{}{}": {
+      "snippet": "Tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites[]{}{}[]{}{}": {
+      "snippet": "Tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites[][]{}{}[][]{}{}": {
+      "snippet": "Tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Tvolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "avolcite{}{}": {
+      "snippet": "avolcite{${1:volume}}{${2:bibid}}"
+    },
+    "avolcite[]{}{}": {
+      "snippet": "avolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "avolcite{}[]{}": {
+      "snippet": "avolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "avolcite[]{}[]{}": {
+      "snippet": "avolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "Avolcite{}{}": {
+      "snippet": "Avolcite{${1:volume}}{${2:bibid}}"
+    },
+    "Avolcite[]{}{}": {
+      "snippet": "Avolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
+    },
+    "Avolcite{}[]{}": {
+      "snippet": "Avolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
+    },
+    "Avolcite[]{}[]{}": {
+      "snippet": "Avolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
+    },
+    "avolcites{}{}{}{}": {
+      "snippet": "avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites(){}{}{}{}": {
+      "snippet": "avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites()(){}{}{}{}": {
+      "snippet": "avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites()()[]{}{}[]{}{}": {
+      "snippet": "avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites[]{}{}[]{}{}": {
+      "snippet": "avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites[][]{}{}[][]{}{}": {
+      "snippet": "avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "avolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites{}{}{}{}": {
+      "snippet": "Avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites(){}{}{}{}": {
+      "snippet": "Avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites()(){}{}{}{}": {
+      "snippet": "Avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites()()[]{}{}[]{}{}": {
+      "snippet": "Avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites[]{}{}[]{}{}": {
+      "snippet": "Avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites[][]{}{}[][]{}{}": {
+      "snippet": "Avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "Avolcites()()[][]{}{}[][]{}{}": {
+      "snippet": "Avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
+    },
+    "notecite[][]{}": {
+      "snippet": "notecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "notecite[]{}": {
+      "snippet": "notecite[${2:postnote}]{${1:bibid}}"
+    },
+    "notecite{}": {
+      "snippet": "notecite{${1:bibid}}"
+    },
+    "Notecite[][]{}": {
+      "snippet": "Notecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Notecite[]{}": {
+      "snippet": "Notecite[${2:postnote}]{${1:bibid}}"
+    },
+    "Notecite{}": {
+      "snippet": "Notecite{${1:bibid}}"
+    },
+    "pnotecite[][]{}": {
+      "snippet": "pnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "pnotecite[]{}": {
+      "snippet": "pnotecite[${2:postnote}]{${1:bibid}}"
+    },
+    "pnotecite{}": {
+      "snippet": "pnotecite{${1:bibid}}"
+    },
+    "Pnotecite[][]{}": {
+      "snippet": "Pnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Pnotecite[]{}": {
+      "snippet": "Pnotecite[${2:postnote}]{${1:bibid}}"
+    },
+    "Pnotecite{}": {
+      "snippet": "Pnotecite{${1:bibid}}"
+    },
+    "fnotecite[][]{}": {
+      "snippet": "fnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "fnotecite[]{}": {
+      "snippet": "fnotecite[${2:postnote}]{${1:bibid}}"
+    },
+    "fnotecite{}": {
+      "snippet": "fnotecite{${1:bibid}}"
+    },
+    "citename[][]{}[]{}": {
+      "snippet": "citename[${3:prenote}][${4:postnote}]{${1:bibid}}[${5:format}]{${2:name list}}"
+    },
+    "citename[]{}[]{}": {
+      "snippet": "citename[${3:postnote}]{${1:bibid}}[${4:format}]{${2:name list}}"
+    },
+    "citename[]{}{}": {
+      "snippet": "citename[${3:postnote}]{${1:bibid}}{${2:name list}}"
+    },
+    "citename{}[]{}": {
+      "snippet": "citename{${1:bibid}}[${2:format}]{${3:name list}}"
+    },
+    "citename{}{}": {
+      "snippet": "citename{${1:bibid}}{${2:name list}}"
+    },
+    "citelist[][]{}[]{}": {
+      "snippet": "citelist[${3:prenote}][${4:postnote}]{${1:bibid}}[${5:format}]{${2:literal list}}"
+    },
+    "citelist[]{}[]{}": {
+      "snippet": "citelist[${3:postnote}]{${1:bibid}}[${4:format}]{${2:literal list}}"
+    },
+    "citelist[]{}{}": {
+      "snippet": "citelist[${3:postnote}]{${1:bibid}}{${2:literal list}}"
+    },
+    "citelist{}[]{}": {
+      "snippet": "citelist{${1:bibid}}[${2:format}]{${3:literal list}}"
+    },
+    "citelist{}{}": {
+      "snippet": "citelist{${1:bibid}}{${2:literal list}}"
+    },
+    "citefield[][]{}[]{}": {
+      "snippet": "citefield[${3:prenote}][${4:postnote}]{${1:bibid}}[${5:format}]{${2:field}}"
+    },
+    "citefield[]{}[]{}": {
+      "snippet": "citefield[${3:postnote}]{${1:bibid}}[${4:format}]{${2:field}}"
+    },
+    "citefield[]{}{}": {
+      "snippet": "citefield[${3:postnote}]{${1:bibid}}{${2:field}}"
+    },
+    "citefield{}[]{}": {
+      "snippet": "citefield{${1:bibid}}[${2:format}]{${3:field}}"
+    },
+    "citefield{}{}": {
+      "snippet": "citefield{${1:bibid}}{${2:field}}"
+    },
+    "citereset": {},
+    "citereset*": {},
+    "mancite": {},
+    "pno": {},
+    "ppno": {},
+    "nopp": {},
+    "psq": {},
+    "psqq": {},
+    "sqspace": {},
+    "ppspace": {},
+    "pnfmt{}": {
+      "snippet": "pnfmt{${1:text}}"
+    },
+    "RN{}": {
+      "snippet": "RN{${1:integer}}"
+    },
+    "RNfont": {},
+    "Rn{}": {
+      "snippet": "Rn{${1:integer}}"
+    },
+    "Rnfont": {},
+    "citet[][]{}": {
+      "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citet[]{}": {
+      "snippet": "citet[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citet{}": {
+      "snippet": "citet{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citet*[][]{}": {
+      "snippet": "citet*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citet*[]{}": {
+      "snippet": "citet*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citet*{}": {
+      "snippet": "citet*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citep[][]{}": {
+      "snippet": "citep[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citep[]{}": {
+      "snippet": "citep[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citep{}": {
+      "snippet": "citep{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citep*[][]{}": {
+      "snippet": "citep*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citep*[]{}": {
+      "snippet": "citep*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citep*{}": {
+      "snippet": "citep*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealt[][]{}": {
+      "snippet": "citealt[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealt[]{}": {
+      "snippet": "citealt[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealt{}": {
+      "snippet": "citealt{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealt*[][]{}": {
+      "snippet": "citealt*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealt*[]{}": {
+      "snippet": "citealt*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealt*{}": {
+      "snippet": "citealt*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealp[][]{}": {
+      "snippet": "citealp[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealp[]{}": {
+      "snippet": "citealp[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealp{}": {
+      "snippet": "citealp{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealp*[][]{}": {
+      "snippet": "citealp*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealp*[]{}": {
+      "snippet": "citealp*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citealp*{}": {
+      "snippet": "citealp*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citeyearpar[][]{}": {
+      "snippet": "citeyearpar[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=acmauthoryear"
+    },
+    "citeyearpar[]{}": {
+      "snippet": "citeyearpar[${2:postnote}]{${1:bibid}}",
+      "option": "style=acmauthoryear"
+    },
+    "citeyearpar{}": {
+      "snippet": "citeyearpar{${1:bibid}}",
+      "option": "style=acmauthoryear"
+    },
+    "Citet[][]{}": {
+      "snippet": "Citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citet[]{}": {
+      "snippet": "Citet[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citet{}": {
+      "snippet": "Citet{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citet*[][]{}": {
+      "snippet": "Citet*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citet*[]{}": {
+      "snippet": "Citet*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citet*{}": {
+      "snippet": "Citet*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citep[][]{}": {
+      "snippet": "Citep[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citep[]{}": {
+      "snippet": "Citep[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citep{}": {
+      "snippet": "Citep{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citep*[][]{}": {
+      "snippet": "Citep*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citep*[]{}": {
+      "snippet": "Citep*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citep*{}": {
+      "snippet": "Citep*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealt[][]{}": {
+      "snippet": "Citealt[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealt[]{}": {
+      "snippet": "Citealt[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealt{}": {
+      "snippet": "Citealt{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealt*[][]{}": {
+      "snippet": "Citealt*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealt*[]{}": {
+      "snippet": "Citealt*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealt*{}": {
+      "snippet": "Citealt*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealp[][]{}": {
+      "snippet": "Citealp[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealp[]{}": {
+      "snippet": "Citealp[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealp{}": {
+      "snippet": "Citealp{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealp*[][]{}": {
+      "snippet": "Citealp*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealp*[]{}": {
+      "snippet": "Citealp*[${2:postnote}]{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "Citealp*{}": {
+      "snippet": "Citealp*{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citefullauthor[][]{}": {
+      "snippet": "citefullauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citefullauthor[]{}": {
+      "snippet": "citefullauthor[${2:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citefullauthor{}": {
+      "snippet": "citefullauthor{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "Citefullauthor[][]{}": {
+      "snippet": "Citefullauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "Citefullauthor[]{}": {
+      "snippet": "Citefullauthor[${2:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "Citefullauthor{}": {
+      "snippet": "Citefullauthor{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citetext{}": {
+      "snippet": "citetext{${1:text}}",
+      "option": "natbib=true"
+    },
+    "defcitealias{}{}": {
+      "snippet": "defcitealias{${1:bibid}}{${2:alias}}",
+      "option": "natbib=true"
+    },
+    "citetalias{}": {
+      "snippet": "citetalias{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "citepalias{}": {
+      "snippet": "citepalias{${1:bibid}}",
+      "option": "natbib=true"
+    },
+    "mcite[][]{}": {
+      "snippet": "mcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mcite[]{}": {
+      "snippet": "mcite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mcite{}": {
+      "snippet": "mcite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mcite[][]{}": {
+      "snippet": "Mcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mcite[]{}": {
+      "snippet": "Mcite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mcite{}": {
+      "snippet": "Mcite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mparencite[][]{}": {
+      "snippet": "mparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mparencite[]{}": {
+      "snippet": "mparencite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mparencite{}": {
+      "snippet": "mparencite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mparencite[][]{}": {
+      "snippet": "Mparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mparencite[]{}": {
+      "snippet": "Mparencite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mparencite{}": {
+      "snippet": "Mparencite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mfootcite[][]{}": {
+      "snippet": "mfootcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mfootcite[]{}": {
+      "snippet": "mfootcite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mfootcite{}": {
+      "snippet": "mfootcite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mfootcitetext[][]{}": {
+      "snippet": "mfootcitetext[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mfootcitetext[]{}": {
+      "snippet": "mfootcitetext[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mfootcitetext{}": {
+      "snippet": "mfootcitetext{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mtextcite[][]{}": {
+      "snippet": "mtextcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mtextcite[]{}": {
+      "snippet": "mtextcite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mtextcite{}": {
+      "snippet": "mtextcite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mtextcite[][]{}": {
+      "snippet": "Mtextcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mtextcite[]{}": {
+      "snippet": "Mtextcite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mtextcite{}": {
+      "snippet": "Mtextcite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "msupercite{}": {
+      "snippet": "msupercite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mcite*[][]{}": {
+      "snippet": "mcite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mcite*[]{}": {
+      "snippet": "mcite*[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mcite*{}": {
+      "snippet": "mcite*{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mparencite*[][]{}": {
+      "snippet": "mparencite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mparencite*[]{}": {
+      "snippet": "mparencite*[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mparencite*{}": {
+      "snippet": "mparencite*{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mautocite[][]{}": {
+      "snippet": "mautocite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mautocite[]{}": {
+      "snippet": "mautocite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mautocite{}": {
+      "snippet": "mautocite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mautocite[][]{}": {
+      "snippet": "Mautocite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mautocite[]{}": {
+      "snippet": "Mautocite[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mautocite{}": {
+      "snippet": "Mautocite{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mautocite*[][]{}": {
+      "snippet": "mautocite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mautocite*[]{}": {
+      "snippet": "mautocite*[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "mautocite*{}": {
+      "snippet": "mautocite*{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mautocite*[][]{}": {
+      "snippet": "Mautocite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mautocite*[]{}": {
+      "snippet": "Mautocite*[${2:postnote}]{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "Mautocite*{}": {
+      "snippet": "Mautocite*{${1:bibid}}",
+      "option": "mcite=true"
+    },
+    "DefineBibliographyStrings{}{}": {
+      "snippet": "DefineBibliographyStrings{${1:language}}{${2:definitions}}"
+    },
+    "DefineBibliographyExtras{}{}": {
+      "snippet": "DefineBibliographyExtras{${1:language}}{${2:code}}"
+    },
+    "UndefineBibliographyExtras{}{}": {
+      "snippet": "UndefineBibliographyExtras{${1:language}}{${2:code}}"
+    },
+    "DefineHyphenationExceptions{}{}": {
+      "snippet": "DefineHyphenationExceptions{${1:language}}{${2:text}}"
+    },
+    "NewBibliographyString{}": {
+      "snippet": "NewBibliographyString{${1:bibid}}"
+    },
+    "ifentryseen{}{}{}": {
+      "snippet": "ifentryseen{${1:entrykey}}{${2:true}}{${3:false}}"
+    },
+    "ifentryinbib{}{}{}": {
+      "snippet": "ifentryinbib{${1:entrykey}}{${2:true}}{${3:false}}"
+    },
+    "ifentrycategory{}{}{}{}": {
+      "snippet": "ifentrycategory{${1:entrykey}}{${2:category}}{${3:true}}{${4:false}}"
+    },
+    "ifentrykeyword{}{}{}{}": {
+      "snippet": "ifentrykeyword{${1:entrykey}}{${2:keyword}}{${3:true}}{${4:false}}"
+    },
+    "bibsetup": {},
+    "bibfont": {},
+    "citesetup": {},
+    "newblockpunct": {},
+    "newunitpunct": {},
+    "finentrypunct": {},
+    "entrysetpunct": {},
+    "bibnamedelima": {},
+    "bibnamedelimb": {},
+    "bibnamedelimc": {},
+    "bibnamedelimd": {},
+    "bibnamedelimi": {},
+    "bibinitperiod": {},
+    "bibinitdelim": {},
+    "bibinithyphendelim": {},
+    "bibindexnamedelima": {},
+    "bibindexnamedelimb": {},
+    "bibindexnamedelimc": {},
+    "bibindexnamedelimd": {},
+    "bibindexnamedelimi": {},
+    "bibindexinitperiod": {},
+    "bibindexinitdelim": {},
+    "bibindexinithyphendelim": {},
+    "revsdnamepunct": {},
+    "bibnamedash": {},
+    "labelnamepunct": {},
+    "subtitlepunct": {},
+    "intitlepunct": {},
+    "bibpagespunct": {},
+    "bibpagerefpunct": {},
+    "bibeidpunct": {},
+    "multinamedelim": {},
+    "finalnamedelim": {},
+    "revsdnamedelim": {},
+    "andothersdelim": {},
+    "multilistdelim": {},
+    "finallistdelim": {},
+    "andmoredelim": {},
+    "multicitedelim": {},
+    "multiciterangedelim": {},
+    "multicitesubentrydelim": {},
+    "multicitesubentryrangedelim": {},
+    "supercitedelim": {},
+    "superciterangedelim": {},
+    "supercitesubentrydelim": {},
+    "supercitesubentryrangedelim": {},
+    "compcitedelim": {},
+    "textcitedelim": {},
+    "nametitledelim": {},
+    "nameyeardelim": {},
+    "namelabeldelim": {},
+    "nonameyeardelim": {},
+    "authortypedelim": {},
+    "editortypedelim": {},
+    "translatortypedelim": {},
+    "labelalphaothers": {},
+    "sortalphaothers": {},
+    "volcitedelim": {},
+    "mkvolcitenote{}{}": {
+      "snippet": "mkvolcitenote{${1:volume}}{${2:pages}}"
+    },
+    "prenotedelim": {},
+    "postnotedelim": {},
+    "extpostnotedelim": {},
+    "multiprenotedelim": {},
+    "multipostnotedelim": {},
+    "mkbibnamefamily{}": {
+      "snippet": "mkbibnamefamily{${1:text}}"
+    },
+    "mkbibnamegiven{}": {
+      "snippet": "mkbibnamegiven{${1:text}}"
+    },
+    "mkbibnameprefix{}": {
+      "snippet": "mkbibnameprefix{${1:text}}"
+    },
+    "mkbibnamesuffix{}": {
+      "snippet": "mkbibnamesuffix{${1:text}}"
+    },
+    "mkbibcompletenamefamily": {},
+    "mkbibcompletenamefamilygiven": {},
+    "mkbibcompletenamegivenfamily": {},
+    "mkbibcompletename": {},
+    "datecircadelim": {},
+    "dateeradelim": {},
+    "dateuncertainprint": {},
+    "enddateuncertainprint": {},
+    "datecircaprint": {},
+    "enddatecircaprint": {},
+    "datecircaprintiso": {},
+    "enddatecircaprintiso": {},
+    "dateeraprint{}": {
+      "snippet": "dateeraprint{${1:yearfield}}"
+    },
+    "dateeraprintpre": {},
+    "relatedpunct": {},
+    "relateddelim": {},
+    "begrelateddelim": {},
+    "bibleftparen": {},
+    "bibrightparen": {},
+    "bibleftbracket": {},
+    "bibrightbracket": {},
+    "DeclareDelimFormat{}{}": {
+      "snippet": "DeclareDelimFormat{${1:name}}{${2:code}}"
+    },
+    "DeclareDelimFormat[]{}{}": {
+      "snippet": "DeclareDelimFormat[${3:context}]{${1:name}}{${2:code}}"
+    },
+    "DeclareDelimFormat*{}{}": {
+      "snippet": "DeclareDelimFormat*{${1:name}}{${2:code}}"
+    },
+    "DeclareDelimFormat*[]{}{}": {
+      "snippet": "DeclareDelimFormat*[${3:context}]{${1:name}}{${2:code}}"
+    },
+    "DeclareDelimAlias{}{}": {
+      "snippet": "DeclareDelimAlias{${1:alias}}{${2:delim}}"
+    },
+    "DeclareDelimAlias[]{}[]{}": {
+      "snippet": "DeclareDelimAlias[${3:alias context}]{${1:alias}}[${4:delim context}]{${2:delim}}"
+    },
+    "DeclareDelimAlias*[]{}[]{}": {
+      "snippet": "DeclareDelimAlias*[${3:alias context}]{${1:alias}}[${4:delim context}]{${2:delim}}"
+    },
+    "printdelim{}": {
+      "snippet": "printdelim{${1:name}}"
+    },
+    "printdelim[]{}": {
+      "snippet": "printdelim[${2:context}]{${1:name}}"
+    },
+    "delimcontext{}": {
+      "snippet": "delimcontext{${1:context}}"
+    },
+    "DeclareDelimcontextAlias{}{}": {
+      "snippet": "DeclareDelimcontextAlias{${1:alias}}{${2:name}}"
+    },
+    "UndeclareDelimcontextAlias{}": {
+      "snippet": "UndeclareDelimcontextAlias{${1:alias}}"
+    },
+    "bibrangedash": {},
+    "bibrangessep": {},
+    "bibdatesep": {},
+    "bibdatendsep": {},
+    "bibdaterangesep": {},
+    "mkbibdatelong{}{}{}": {
+      "snippet": "mkbibdatelong{${1:year}}{${2:month}}{${3:day}}"
+    },
+    "mkbibdateshort{}{}{}": {
+      "snippet": "mkbibdateshort{${1:year}}{${2:month}}{${3:day}}"
+    },
+    "mkbibtimezone{}": {
+      "snippet": "mkbibtimezone{${1:timezone}}"
+    },
+    "bibdateuncertain": {},
+    "bibdateeraprefix": {},
+    "bibdateeraendprefix": {},
+    "bibtimesep": {},
+    "bibutctimezone": {},
+    "bibtimezonesep": {},
+    "bibtzminsep": {},
+    "bibdatetimesep": {
+      "snippet": "bibdatetimesep "
+    },
+    "finalandcomma": {},
+    "finalandsemicolon": {},
+    "mkbibordinal{}": {
+      "snippet": "mkbibordinal{${1:integer}}"
+    },
+    "mkbibmascord{}": {
+      "snippet": "mkbibmascord{${1:integer}}"
+    },
+    "mkbibfemord{}": {
+      "snippet": "mkbibfemord{${1:integer}}"
+    },
+    "mkbibneutord{}": {
+      "snippet": "mkbibneutord{${1:integer}}"
+    },
+    "mkbibordedition{}": {
+      "snippet": "mkbibordedition{${1:integer}}"
+    },
+    "mkbibordseries{}": {
+      "snippet": "mkbibordseries{${1:integer}}"
+    },
+    "bibhang": {},
+    "biblabelsep": {},
+    "bibitemsep": {},
+    "bibnamesep": {},
+    "bibinitsep": {},
+    "bibparsep": {},
+    "theabbrvpenalty": {},
+    "thehighnamepenalty": {},
+    "thelownamepenalty": {},
+    "thebiburlbigbreakpenalty": {},
+    "thebiburlbreakpenalty": {},
+    "thebiburlnumpenalty": {},
+    "thebiburlucpenalty": {},
+    "thebiburllcpenalty": {},
+    "biburlbigskip": {},
+    "biburlnumskip": {},
+    "biburlucskip": {},
+    "biburllcskip": {},
+    "bibellipsis": {},
+    "noligature": {},
+    "hyphenate": {},
+    "hyphen": {},
+    "nbhyphen": {},
+    "nohyphenation": {},
+    "textnohyphenation{}": {
+      "snippet": "textnohyphenation{${1:text}}"
+    },
+    "mknumalph{}": {
+      "snippet": "mknumalph{${1:integer}}"
+    },
+    "mkbibacro{}": {
+      "snippet": "mkbibacro{${1:text}}"
+    },
+    "autocap{}": {
+      "snippet": "autocap{${1:character}}"
+    },
+    "thesmartand": {},
+    "forceE{}": {
+      "snippet": "forceE{${1:text}}"
+    },
+    "forceY{}": {
+      "snippet": "forceY{${1:text}}"
+    },
+    "smartof": {},
+    "forceD{}": {
+      "snippet": "forceD{${1:text}}"
+    },
+    "forceDE{}": {
+      "snippet": "forceDE{${1:text}}"
+    },
+    "bibabstractprefix": {},
+    "bibannotationprefix": {},
+    "ifkomabibtotoc{}{}": {
+      "snippet": "ifkomabibtotoc{${1:true}}{${2:false}}"
+    },
+    "ifkomabibtotocnumbered{}{}": {
+      "snippet": "ifkomabibtotocnumbered{${1:true}}{${2:false}}"
+    },
+    "ifmemoirbibintoc{}{}": {
+      "snippet": "ifmemoirbibintoc{${1:true}}{${2:false}}"
+    },
+    "RequireBibliographyStyle{}": {
+      "snippet": "RequireBibliographyStyle{${1:style}}"
+    },
+    "InitializeBibliographyStyle{}": {
+      "snippet": "InitializeBibliographyStyle{${1:code}}"
+    },
+    "DeclareBibliographyDriver{}{}": {
+      "snippet": "DeclareBibliographyDriver{${1:entrytype}}{${2:code}}"
+    },
+    "DeclareBibliographyAlias{}{}": {
+      "snippet": "DeclareBibliographyAlias{${1:alias}}{${2:entrytype}}"
+    },
+    "DeclareBibliographyOption{}{}": {
+      "snippet": "DeclareBibliographyOption{${1:key}}{${2:code}}"
+    },
+    "DeclareBibliographyOption[]{}{}": {
+      "snippet": "DeclareBibliographyOption[${3:datatype}]{${1:key}}{${2:code}}"
+    },
+    "DeclareBibliographyOption{}[]{}": {
+      "snippet": "DeclareBibliographyOption{${1:key}}[${2:value}]{${3:code}}"
+    },
+    "DeclareBibliographyOption[]{}[]{}": {
+      "snippet": "DeclareBibliographyOption[${3:datatype}]{${1:key}}[${4:value}]{${2:code}}"
+    },
+    "DeclareTypeOption{}{}": {
+      "snippet": "DeclareTypeOption{${1:key}}{${2:code}}"
+    },
+    "DeclareTypeOption[]{}{}": {
+      "snippet": "DeclareTypeOption[${3:datatype}]{${1:key}}{${2:code}}"
+    },
+    "DeclareTypeOption{}[]{}": {
+      "snippet": "DeclareTypeOption{${1:key}}[${2:value}]{${3:code}}"
+    },
+    "DeclareTypeOption[]{}[]{}": {
+      "snippet": "DeclareTypeOption[${3:datatype}]{${1:key}}[${4:value}]{${2:code}}"
+    },
+    "DeclareEntryOption{}{}": {
+      "snippet": "DeclareEntryOption{${1:key}}{${2:code}}"
+    },
+    "DeclareEntryOption[]{}{}": {
+      "snippet": "DeclareEntryOption[${3:datatype}]{${1:key}}{${2:code}}"
+    },
+    "DeclareEntryOption{}[]{}": {
+      "snippet": "DeclareEntryOption{${1:key}}[${2:value}]{${3:code}}"
+    },
+    "DeclareEntryOption[]{}[]{}": {
+      "snippet": "DeclareEntryOption[${3:datatype}]{${1:key}}[${4:value}]{${2:code}}"
+    },
+    "DeclareBiblatexOption{}{}{}": {
+      "snippet": "DeclareBiblatexOption{${1:scope}}{${2:key}}{${3:code}}"
+    },
+    "DeclareBiblatexOption{}[]{}{}": {
+      "snippet": "DeclareBiblatexOption{${1:scope}}[${2:datatype}]{${3:key}}{${4:code}}"
+    },
+    "DeclareBiblatexOption{}{}[]{}": {
+      "snippet": "DeclareBiblatexOption{${1:scope}}{${2:key}}[${3:value}]{${4:code}}"
+    },
+    "DeclareBiblatexOption{}[]{}[]{}": {
+      "snippet": "DeclareBiblatexOption{${1:scope}}[${2:datatype}]{${3:key}}[${4:value}]{${5:code}}"
+    },
+    "RequireCitationStyle{}": {
+      "snippet": "RequireCitationStyle{${1:style}}"
+    },
+    "InitializeCitationStyle{}": {
+      "snippet": "InitializeCitationStyle{${1:code}}"
+    },
+    "OnManualCitation{}": {
+      "snippet": "OnManualCitation{${1:code}}"
+    },
+    "DeclareCiteCommand{}{}{}{}{}": {
+      "snippet": "DeclareCiteCommand{${1:cmd}}{${2:precode}}{${3:loopcode}}{${4:sepcode}}{${5:postcode}}"
+    },
+    "DeclareCiteCommand{}[]{}{}{}{}": {
+      "snippet": "DeclareCiteCommand{${1:cmd}}[${2:wrapper}]{${3:precode}}{${4:loopcode}}{${5:sepcode}}{${6:postcode}}"
+    },
+    "DeclareCiteCommand*{}{}{}{}{}": {
+      "snippet": "DeclareCiteCommand*{${1:cmd}}{${2:precode}}{${3:loopcode}}{${4:sepcode}}{${5:postcode}}"
+    },
+    "DeclareCiteCommand*{}[]{}{}{}{}": {
+      "snippet": "DeclareCiteCommand*{${1:cmd}}[${2:wrapper}]{${3:precode}}{${4:loopcode}}{${5:sepcode}}{${6:postcode}}"
+    },
+    "DeclareMultiCiteCommand{}{}{}": {
+      "snippet": "DeclareMultiCiteCommand{${1:cmd}}{${2:cite}}{${3:delimiter}}"
+    },
+    "DeclareMultiCiteCommand{}[]{}{}": {
+      "snippet": "DeclareMultiCiteCommand{${1:cmd}}[${2:wrapper}]{${3:cite}}{${4:delimiter}}"
+    },
+    "DeclareAutoCiteCommand{}{}{}": {
+      "snippet": "DeclareAutoCiteCommand{${1:name}}{${2:cite}}{${3:multicite}}"
+    },
+    "DeclareAutoCiteCommand{}[]{}{}": {
+      "snippet": "DeclareAutoCiteCommand{${1:name}}[${2:position}]{${3:cite}}{${4:multicite}}"
+    },
+    "DeclareCitePunctuationPosition{}{}": {
+      "snippet": "DeclareCitePunctuationPosition{${1:cmd}}{${2:position}}"
+    },
+    "DeprecateField{}{}": {
+      "snippet": "DeprecateField{${1:field}}{${2:message}}"
+    },
+    "DeprecateList{}{}": {
+      "snippet": "DeprecateList{${1:list}}{${2:message}}"
+    },
+    "DeprecateName{}{}": {
+      "snippet": "DeprecateName{${1:name}}{${2:message}}"
+    },
+    "DeprecateFieldWithReplacement{}{}": {
+      "snippet": "DeprecateFieldWithReplacement{${1:field}}{${2:replacement}}"
+    },
+    "DeprecateListWithReplacement{}{}": {
+      "snippet": "DeprecateListWithReplacement{${1:list}}{${2:replacement}}"
+    },
+    "DeprecateNameWithReplacement{}{}": {
+      "snippet": "DeprecateNameWithReplacement{${1:name}}{${2:replacement}}"
+    },
+    "printfield{}": {
+      "snippet": "printfield{${1:field}}"
+    },
+    "printfield[]{}": {
+      "snippet": "printfield[${2:format}]{${1:field}}"
+    },
+    "printlist{}": {
+      "snippet": "printlist{${1:literal list}}"
+    },
+    "printlist[]{}": {
+      "snippet": "printlist[${2:format}]{${1:literal list}}"
+    },
+    "printlist[][]{}": {
+      "snippet": "printlist[${2:format}][${3:start-stop}]{${1:literal list}}"
+    },
+    "printnames{}": {
+      "snippet": "printnames{${1:name list}}"
+    },
+    "printnames[]{}": {
+      "snippet": "printnames[${2:format}]{${1:name list}}"
+    },
+    "printnames[][]{}": {
+      "snippet": "printnames[${2:format}][${3:start-stop}]{${1:name list}}"
+    },
+    "printtext{}": {
+      "snippet": "printtext{${1:text}}"
+    },
+    "printtext[]{}": {
+      "snippet": "printtext[${2:format}]{${1:text}}"
+    },
+    "printfile{}": {
+      "snippet": "printfile{${1:file}}"
+    },
+    "printfile[]{}": {
+      "snippet": "printfile[${2:format}]{${1:file}}"
+    },
+    "printdate": {},
+    "printdateextra": {},
+    "printlabeldate": {},
+    "printlabeldateextra": {},
+    "printlabeltime": {},
+    "printorigdate": {},
+    "printeventdate": {},
+    "printurldate": {},
+    "printtime": {},
+    "printorigtime": {},
+    "printeventtime": {},
+    "printurltime": {},
+    "indexfield{}": {
+      "snippet": "indexfield{${1:field}}"
+    },
+    "indexfield[]{}": {
+      "snippet": "indexfield[${2:format}]{${1:field}}"
+    },
+    "indexlist{}": {
+      "snippet": "indexlist{${1:literal list}}"
+    },
+    "indexlist[]{}": {
+      "snippet": "indexlist[${2:format}]{${1:literal list}}"
+    },
+    "indexlist[][]{}": {
+      "snippet": "indexlist[${2:format}][${3:start-stop}]{${1:literal list}}"
+    },
+    "indexnames{}": {
+      "snippet": "indexnames{${1:name list}}"
+    },
+    "indexnames[]{}": {
+      "snippet": "indexnames[${2:format}]{${1:name list}}"
+    },
+    "indexnames[][]{}": {
+      "snippet": "indexnames[${2:format}][${3:start-stop}]{${1:name list}}"
+    },
+    "entrydata{}{}": {
+      "snippet": "entrydata{${1:key}}{${2:code}}"
+    },
+    "entrydata*{}{}": {
+      "snippet": "entrydata*{${1:key}}{${2:code}}"
+    },
+    "entryset{}{}": {
+      "snippet": "entryset{${1:precode}}{${2:postcode}}"
+    },
+    "DeclareFieldInputHandler{}{}": {
+      "snippet": "DeclareFieldInputHandler{${1:field}}{${2:code}}"
+    },
+    "DeclareListInputHandler{}{}": {
+      "snippet": "DeclareListInputHandler{${1:list}}{${2:code}}"
+    },
+    "DeclareNameInputHandler{}{}": {
+      "snippet": "DeclareNameInputHandler{${1:name}}{${2:code}}"
+    },
+    "NewCount": {},
+    "NewOption": {},
+    "NewValue": {},
+    "DeclareFieldFormat[]{}{}": {
+      "snippet": "DeclareFieldFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareFieldFormat*{}{}": {
+      "snippet": "DeclareFieldFormat*{${1:format}}{${2:code}}"
+    },
+    "DeclareListFormat[]{}{}": {
+      "snippet": "DeclareListFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareListFormat*{}{}": {
+      "snippet": "DeclareListFormat*{${1:format}}{${2:code}}"
+    },
+    "DeclareNameFormat[]{}{}": {
+      "snippet": "DeclareNameFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareNameFormat*{}{}": {
+      "snippet": "DeclareNameFormat*{${1:format}}{${2:code}}"
+    },
+    "namepartprefix": {},
+    "namepartprefixi": {},
+    "namepartfamily": {},
+    "namepartfamilyi": {},
+    "namepartsuffix": {},
+    "namepartsuffixi": {},
+    "namepartgiven": {},
+    "namepartgiveni": {},
+    "DeclareListWrapperFormat[]{}{}": {
+      "snippet": "DeclareListWrapperFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareListWrapperFormat*{}{}": {
+      "snippet": "DeclareListWrapperFormat*{${1:format}}{${2:code}}"
+    },
+    "DeclareNameWrapperFormat[]{}{}": {
+      "snippet": "DeclareNameWrapperFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareNameWrapperFormat*{}{}": {
+      "snippet": "DeclareNameWrapperFormat*{${1:format}}{${2:code}}"
+    },
+    "DeclareIndexFieldFormat[]{}{}": {
+      "snippet": "DeclareIndexFieldFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareIndexFieldFormat*{}{}": {
+      "snippet": "DeclareIndexFieldFormat*{${1:format}}{${2:code}}"
+    },
+    "DeclareIndexListFormat[]{}{}": {
+      "snippet": "DeclareIndexListFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareIndexListFormat*{}{}": {
+      "snippet": "DeclareIndexListFormat*{${1:format}}{${2:code}}"
+    },
+    "DeclareIndexNameFormat[]{}{}": {
+      "snippet": "DeclareIndexNameFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
+    },
+    "DeclareIndexNameFormat*{}{}": {
+      "snippet": "DeclareIndexNameFormat*{${1:format}}{${2:code}}"
+    },
+    "DeclareFieldAlias[]{}[]{}": {
+      "snippet": "DeclareFieldAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareFieldAlias{}{}": {
+      "snippet": "DeclareFieldAlias{${1:alias}}{${2:format}}"
+    },
+    "DeclareListAlias[]{}[]{}": {
+      "snippet": "DeclareListAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareListAlias{}{}": {
+      "snippet": "DeclareListAlias{${1:alias}}{${2:format}}"
+    },
+    "DeclareNameAlias[]{}[]{}": {
+      "snippet": "DeclareNameAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareNameAlias{}{}": {
+      "snippet": "DeclareNameAlias{${1:alias}}{${2:format}}"
+    },
+    "DeclareListWrapperAlias[]{}[]{}": {
+      "snippet": "DeclareListWrapperAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareListWrapperAlias{}{}": {
+      "snippet": "DeclareListWrapperAlias{${1:alias}}{${2:format}}"
+    },
+    "DeclareNameWrapperAlias[]{}[]{}": {
+      "snippet": "DeclareNameWrapperAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareNameWrapperAlias{}{}": {
+      "snippet": "DeclareNameWrapperAlias{${1:alias}}{${2:format}}"
+    },
+    "DeclareIndexFieldAlias[]{}[]{}": {
+      "snippet": "DeclareIndexFieldAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareIndexFieldAlias{}{}": {
+      "snippet": "DeclareIndexFieldAlias{${1:alias}}{${2:format}}"
+    },
+    "DeclareIndexListAlias[]{}[]{}": {
+      "snippet": "DeclareIndexListAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareIndexListAlias{}{}": {
+      "snippet": "DeclareIndexListAlias{${1:alias}}{${2:format}}"
+    },
+    "DeclareIndexNameAlias[]{}[]{}": {
+      "snippet": "DeclareIndexNameAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeclareIndexNameAlias{}{}": {
+      "snippet": "DeclareIndexNameAlias{${1:alias}}{${2:format}}"
+    },
+    "DeprecateFieldFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateFieldFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateFieldFormatWithReplacement{}{}": {
+      "snippet": "DeprecateFieldFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeprecateListFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateListFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateListFormatWithReplacement{}{}": {
+      "snippet": "DeprecateListFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeprecateNameFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateNameFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateNameFormatWithReplacement{}{}": {
+      "snippet": "DeprecateNameFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeprecateListWrapperFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateListWrapperFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateListWrapperFormatWithReplacement{}{}": {
+      "snippet": "DeprecateListWrapperFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeprecateNameWrapperFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateNameWrapperFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateNameWrapperFormatWithReplacement{}{}": {
+      "snippet": "DeprecateNameWrapperFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeprecateIndexFieldFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateIndexFieldFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateIndexFieldFormatWithReplacement{}{}": {
+      "snippet": "DeprecateIndexFieldFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeprecateIndexListFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateIndexListFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateIndexListFormatWithReplacement{}{}": {
+      "snippet": "DeprecateIndexListFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeprecateIndexNameFormatWithReplacement[]{}[]{}": {
+      "snippet": "DeprecateIndexNameFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
+    },
+    "DeprecateIndexNameFormatWithReplacement{}{}": {
+      "snippet": "DeprecateIndexNameFormatWithReplacement{${1:alias}}{${2:format}}"
+    },
+    "DeclareDatafieldSet{}{}": {
+      "snippet": "DeclareDatafieldSet{${1:name}}{${2:specification}}"
+    },
+    "member": {},
+    "member[]": {
+      "snippet": "member[${1:options}]",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "DeclareSourcemap{}": {
+      "snippet": "DeclareSourcemap{${1:specification}}"
+    },
+    "maps{}": {
+      "snippet": "maps{${1:elements}}"
+    },
+    "maps[]{}": {
+      "snippet": "maps[${2:options}]{${1:elements}}",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "map{}": {
+      "snippet": "map{${1:restrictions,steps}}"
+    },
+    "map[]{}": {
+      "snippet": "map[${2:options}]{${1:restrictions,steps}}",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "regexp{}": {
+      "snippet": "regexp{${1:regexp}}"
+    },
+    "perdatasource{}": {
+      "snippet": "perdatasource{${1:datasource}}"
+    },
+    "pertype{}": {
+      "snippet": "pertype{${1:entrytype}}"
+    },
+    "pernottype{}": {
+      "snippet": "pernottype{${1:entrytype}}"
+    },
+    "step": {},
+    "step[]": {
+      "snippet": "step[${1:options}]",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "DeclareStyleSourcemap{}": {
+      "snippet": "DeclareStyleSourcemap{${1:specification}}"
+    },
+    "DeclareDriverSourcemap{}": {
+      "snippet": "DeclareDriverSourcemap{${1:specification}}"
+    },
+    "DeclareDriverSourcemap[]{}": {
+      "snippet": "DeclareDriverSourcemap[${2:datatype=driver}]{${1:specification}}"
+    },
+    "DeclareDatamodelConstant{}{}": {
+      "snippet": "DeclareDatamodelConstant{${1:name}}{${2:constantdef}}"
+    },
+    "DeclareDatamodelConstant[]{}{}": {
+      "snippet": "DeclareDatamodelConstant[${3:options}]{${1:name}}{${2:constantdef}}",
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "DeclareDatamodelEntrytypes{}": {
+      "snippet": "DeclareDatamodelEntrytypes{${1:entrytypes}}"
+    },
+    "DeclareDatamodelEntrytypes[]{}": {
+      "snippet": "DeclareDatamodelEntrytypes[${2:options}]{${1:entrytypes}}",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "DeclareDatamodelFields{}": {
+      "snippet": "DeclareDatamodelFields{${1:fields}}"
+    },
+    "DeclareDatamodelFields[]{}": {
+      "snippet": "DeclareDatamodelFields[${2:options}]{${1:fields}}",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "DeclareDatamodelEntryfields{}": {
+      "snippet": "DeclareDatamodelEntryfields{${1:fields}}"
+    },
+    "DeclareDatamodelEntryfields[]{}": {
+      "snippet": "DeclareDatamodelEntryfields[${2:entrytypes}]{${1:specification}}"
+    },
+    "DeclareDatamodelConstraints{}": {
+      "snippet": "DeclareDatamodelConstraints{${1:specification}}"
+    },
+    "constraint{}": {
+      "snippet": "constraint{${1:elements}}"
+    },
+    "constraint[]{}": {
+      "snippet": "constraint[${2:options}]{${1:elements}}",
+      "keyvalindex": 15,
+      "keyvalpos": 0
+    },
+    "constraintfieldsor{}": {
+      "snippet": "constraintfieldsor{${1:fields}}"
+    },
+    "constraintfieldsxor{}": {
+      "snippet": "constraintfieldsxor{${1:fields}}"
+    },
+    "antecedent{}": {
+      "snippet": "antecedent{${1:fields}}"
+    },
+    "antecedent[]{}": {
+      "snippet": "antecedent[${2:options}]{${1:fields}}",
+      "keyvalindex": 16,
+      "keyvalpos": 0
+    },
+    "consequent{}": {
+      "snippet": "consequent{${1:fields}}"
+    },
+    "consequent[]{}": {
+      "snippet": "consequent[${2:options}]{${1:fields}}",
+      "keyvalindex": 16,
+      "keyvalpos": 0
+    },
+    "constraintfield{}": {
+      "snippet": "constraintfield{${1:field}}"
+    },
+    "ResetDatamodelEntrytypes": {},
+    "ResetDatamodelFields": {},
+    "ResetDatamodelEntryfields": {},
+    "ResetDatamodelConstraints": {},
+    "DeclareLabelalphaTemplate{}": {
+      "snippet": "DeclareLabelalphaTemplate{${1:specification}}"
+    },
+    "DeclareLabelalphaTemplate[]{}": {
+      "snippet": "DeclareLabelalphaTemplate[${2:entrytypes}]{${1:specification}}"
+    },
+    "labelelement{}": {
+      "snippet": "labelelement{${1:elements}}"
+    },
+    "field{}": {
+      "snippet": "field{${1:field}}"
+    },
+    "field[]{}": {
+      "snippet": "field[${2:options}]{${1:field}}",
+      "keyvalindex": 17,
+      "keyvalpos": 0
+    },
+    "literal{}": {
+      "snippet": "literal{${1:characters}}"
+    },
+    "DeclareLabelalphaNameTemplate{}": {
+      "snippet": "DeclareLabelalphaNameTemplate{${1:specification}}"
+    },
+    "DeclareLabelalphaNameTemplate[]{}": {
+      "snippet": "DeclareLabelalphaNameTemplate[${2:name}]{${1:specification}}"
+    },
+    "namepart{}": {
+      "snippet": "namepart{${1:namepart}}"
+    },
+    "namepart[]{}": {
+      "snippet": "namepart[${2:options}]{${1:namepart}}",
+      "keyvalindex": 18,
+      "keyvalpos": 0
+    },
+    "DeclareNolabel{}": {
+      "snippet": "DeclareNolabel{${1:specification}}"
+    },
+    "nolabel{}": {
+      "snippet": "nolabel{${1:regexp}}"
+    },
+    "DeclareNolabelwidthcount{}": {
+      "snippet": "DeclareNolabelwidthcount{${1:specification}}"
+    },
+    "nolabelwidthcount{}": {
+      "snippet": "nolabelwidthcount{${1:regexp}}"
+    },
+    "DeclareSortingTemplate{}{}": {
+      "snippet": "DeclareSortingTemplate{${1:name}}{${2:specification}}"
+    },
+    "DeclareSortingTemplate[]{}{}": {
+      "snippet": "DeclareSortingTemplate[${3:options}]{${1:name}}{${2:specification}}",
+      "keyvalindex": 19,
+      "keyvalpos": 0
+    },
+    "sort{}": {
+      "snippet": "sort{${1:elements}}"
+    },
+    "sort[]{}": {
+      "snippet": "sort[${2:options}]{${1:elements}}",
+      "keyvalindex": 20,
+      "keyvalpos": 0
+    },
+    "citecount": {},
+    "citeorder": {},
+    "intciteorder": {},
+    "DeclareSortingNamekeyTemplate{}": {
+      "snippet": "DeclareSortingNamekeyTemplate{${1:specification}}"
+    },
+    "DeclareSortingNamekeyTemplate[]{}": {
+      "snippet": "DeclareSortingNamekeyTemplate[${2:name}]{${1:specification}}"
+    },
+    "visibility{}": {
+      "snippet": "visibility{${1:visibility scope}}"
+    },
+    "keypart{}": {
+      "snippet": "keypart{${1:part}}"
+    },
+    "DeclareSortExclusion{}{}": {
+      "snippet": "DeclareSortExclusion{${1:entrytype list}}{${2:field list}}"
+    },
+    "DeclareSortInclusion{}{}": {
+      "snippet": "DeclareSortInclusion{${1:entrytype list}}{${2:field list}}"
+    },
+    "DeclarePresort{}": {
+      "snippet": "DeclarePresort{${1:string}}"
+    },
+    "DeclarePresort[]{}": {
+      "snippet": "DeclarePresort[${2:entrytype list}]{${1:string}}"
+    },
+    "DeclareSortTranslit{}": {
+      "snippet": "DeclareSortTranslit{${1:specification}}"
+    },
+    "DeclareSortTranslit[]{}": {
+      "snippet": "DeclareSortTranslit[${2:entrytype}]{${1:specification}}"
+    },
+    "translit{}{}{}": {
+      "snippet": "translit{${1:field}}{${2:from}}{${3:to}}"
+    },
+    "translit[]{}{}{}": {
+      "snippet": "translit[${4:lang ids}]{${1:field}}{${2:from}}{${3:to}}"
+    },
+    "DeclareBiblistFilter{}{}": {
+      "snippet": "DeclareBiblistFilter{${1:name}}{${2:specification}}"
+    },
+    "filter{}": {
+      "snippet": "filter{${1:filter}}"
+    },
+    "filter[]{}": {
+      "snippet": "filter[${2:filterspec}]{${1:filter}}"
+    },
+    "filteror{}{}": {
+      "snippet": "filteror{${1:type}}{${2:filters}}"
+    },
+    "DeclareNoinit{}": {
+      "snippet": "DeclareNoinit{${1:specification}}"
+    },
+    "noinit{}": {
+      "snippet": "noinit{${1:regexp}}"
+    },
+    "DeclareNosort{}": {
+      "snippet": "DeclareNosort{${1:specification}}"
+    },
+    "nosort{}{}": {
+      "snippet": "nosort{${1:field}}{${2:regexp}}"
+    },
+    "DeclareNonamestring{}": {
+      "snippet": "DeclareNonamestring{${1:specification}}"
+    },
+    "nonamestring{}{}": {
+      "snippet": "nonamestring{${1:field}}{${2:regexp}}"
+    },
+    "DeclareLabelname{}": {
+      "snippet": "DeclareLabelname{${1:specification}}"
+    },
+    "DeclareLabelname[]{}": {
+      "snippet": "DeclareLabelname[${2:entrytype list}]{${1:specification}}"
+    },
+    "DeclareLabeldate{}": {
+      "snippet": "DeclareLabeldate{${1:specification}}"
+    },
+    "DeclareLabeldate[]{}": {
+      "snippet": "DeclareLabeldate[${2:entrytype list}]{${1:specification}}"
+    },
+    "DeclareExtradate{}": {
+      "snippet": "DeclareExtradate{${1:specification}}"
+    },
+    "scope{}": {
+      "snippet": "scope{${1:code}}"
+    },
+    "DeclareExtradateContext{}": {
+      "snippet": "DeclareExtradateContext{${1:specification}}"
+    },
+    "DeclareExtradateContext[]{}": {
+      "snippet": "DeclareExtradateContext[${2:entrytype list}]{${1:specification}}"
+    },
+    "DeclareLabeltitle{}": {
+      "snippet": "DeclareLabeltitle{${1:specification}}"
+    },
+    "DeclareLabeltitle[]{}": {
+      "snippet": "DeclareLabeltitle[${2:entrytype list}]{${1:specification}}"
+    },
+    "DefaultInheritance{}": {
+      "snippet": "DefaultInheritance{${1:options}}",
+      "keyvalindex": 21,
+      "keyvalpos": 0
+    },
+    "DefaultInheritance[]{}": {
+      "snippet": "DefaultInheritance[${2:exceptions}]{${1:options}}",
+      "keyvalindex": 21,
+      "keyvalpos": 1
+    },
+    "except{}{}{}": {
+      "snippet": "except{${1:source}}{${2:target}}{${3:options}}",
+      "keyvalindex": 21,
+      "keyvalpos": 2
+    },
+    "DeclareDataInheritance{}{}{}": {
+      "snippet": "DeclareDataInheritance{${1:source}}{${2:target}}{${3:rules}}"
+    },
+    "DeclareDataInheritance[]{}{}{}": {
+      "snippet": "DeclareDataInheritance[${4:options}]{${1:source}}{${2:target}}{${3:rules}}",
+      "keyvalindex": 22,
+      "keyvalpos": 0
+    },
+    "inherit{}{}": {
+      "snippet": "inherit{${1:source}}{${2:target}}"
+    },
+    "inherit[]{}{}": {
+      "snippet": "inherit[${3:options}]{${1:source}}{${2:target}}",
+      "keyvalindex": 23,
+      "keyvalpos": 0
+    },
+    "noinherit{}": {
+      "snippet": "noinherit{${1:source}}"
+    },
+    "ResetDataInheritance": {},
+    "thefield{}": {
+      "snippet": "thefield{${1:field}}"
+    },
+    "strfield{}": {
+      "snippet": "strfield{${1:field}}"
+    },
+    "csfield{}": {
+      "snippet": "csfield{${1:field}}"
+    },
+    "usefield{}{}": {
+      "snippet": "usefield{${1:command}}{${2:field}}"
+    },
+    "thelist{}": {
+      "snippet": "thelist{${1:literal list}}"
+    },
+    "strlist{}": {
+      "snippet": "strlist{${1:literal list}}"
+    },
+    "thefirstlistitem{}": {
+      "snippet": "thefirstlistitem{${1:literal list}}"
+    },
+    "strfirstlistitem{}": {
+      "snippet": "strfirstlistitem{${1:literal list}}"
+    },
+    "usefirstlistitem{}{}": {
+      "snippet": "usefirstlistitem{${1:cmd}}{${2:literal list}}"
+    },
+    "thename{}": {
+      "snippet": "thename{${1:name list}}"
+    },
+    "strname{}": {
+      "snippet": "strname{${1:name list}}"
+    },
+    "savefield{}{}": {
+      "snippet": "savefield{${1:field}}{${2:cmd}}"
+    },
+    "savefield*{}{}": {
+      "snippet": "savefield*{${1:field}}{${2:cmd}}"
+    },
+    "savelist{}{}": {
+      "snippet": "savelist{${1:literal list}}{${2:cmd}}"
+    },
+    "savelist*{}{}": {
+      "snippet": "savelist*{${1:literal list}}{${2:cmd}}"
+    },
+    "savename{}{}": {
+      "snippet": "savename{${1:name list}}{${2:cmd}}"
+    },
+    "savename*{}{}": {
+      "snippet": "savename*{${1:name list}}{${2:cmd}}"
+    },
+    "savefieldcs{}{}": {
+      "snippet": "savefieldcs{${1:field}}{${2:csname}}"
+    },
+    "savefieldcs*{}{}": {
+      "snippet": "savefieldcs*{${1:field}}{${2:csname}}"
+    },
+    "savelistcs{}{}": {
+      "snippet": "savelistcs{${1:literal list}}{${2:csname}}"
+    },
+    "savelistcs*{}{}": {
+      "snippet": "savelistcs*{${1:literal list}}{${2:csname}}"
+    },
+    "savenamecs{}{}": {
+      "snippet": "savenamecs{${1:name list}}{${2:csname}}"
+    },
+    "savenamecs*{}{}": {
+      "snippet": "savenamecs*{${1:name list}}{${2:csname}}"
+    },
+    "restorefield{}{}": {
+      "snippet": "restorefield{${1:field}}{${2:cmd}}"
+    },
+    "restorelist{}{}": {
+      "snippet": "restorelist{${1:literal list}}{${2:cmd}}"
+    },
+    "restorename{}{}": {
+      "snippet": "restorename{${1:name list}}{${2:cmd}}"
+    },
+    "clearfield{}": {
+      "snippet": "clearfield{${1:field}}"
+    },
+    "clearlist{}": {
+      "snippet": "clearlist{${1:literal list}}"
+    },
+    "clearname{}": {
+      "snippet": "clearname{${1:name list}}"
+    },
+    "ifdatejulian{}{}": {
+      "snippet": "ifdatejulian{${1:true}}{${2:false}}"
+    },
+    "ifenddatejulian{}{}": {
+      "snippet": "ifenddatejulian{${1:true}}{${2:false}}"
+    },
+    "ifdateera{}{}{}": {
+      "snippet": "ifdateera{${1:era}}{${2:true}}{${3:false}}"
+    },
+    "ifenddateera{}{}{}": {
+      "snippet": "ifenddateera{${1:era}}{${2:true}}{${3:false}}"
+    },
+    "ifdatecirca{}{}": {
+      "snippet": "ifdatecirca{${1:true}}{${2:false}}"
+    },
+    "ifenddatecirca{}{}": {
+      "snippet": "ifenddatecirca{${1:true}}{${2:false}}"
+    },
+    "ifdateuncertain{}{}": {
+      "snippet": "ifdateuncertain{${1:true}}{${2:false}}"
+    },
+    "ifenddateuncertain{}{}": {
+      "snippet": "ifenddateuncertain{${1:true}}{${2:false}}"
+    },
+    "ifdateunknown{}{}": {
+      "snippet": "ifdateunknown{${1:true}}{${2:false}}"
+    },
+    "ifenddateunknown{}{}": {
+      "snippet": "ifenddateunknown{${1:true}}{${2:false}}"
+    },
+    "iflabeldateisdate{}{}": {
+      "snippet": "iflabeldateisdate{${1:true}}{${2:false}}"
+    },
+    "ifdatehasyearonlyprecision{}{}{}": {
+      "snippet": "ifdatehasyearonlyprecision{${1:datetype}}{${2:true}}{${3:false}}"
+    },
+    "ifdatehastime{}{}{}": {
+      "snippet": "ifdatehastime{${1:datetype}}{${2:true}}{${3:false}}"
+    },
+    "ifdateshavedifferentprecision{}{}{}{}": {
+      "snippet": "ifdateshavedifferentprecision{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
+    },
+    "ifdateyearsequal{}{}{}{}": {
+      "snippet": "ifdateyearsequal{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
+    },
+    "ifdatesequal{}{}{}{}": {
+      "snippet": "ifdatesequal{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
+    },
+    "ifdaterangesequal{}{}{}{}": {
+      "snippet": "ifdaterangesequal{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
+    },
+    "ifcaselang{}{}": {
+      "snippet": "ifcaselang{${1:true}}{${2:false}}"
+    },
+    "ifcaselang[]{}{}": {
+      "snippet": "ifcaselang[${3:language}]{${1:true}}{${2:false}}"
+    },
+    "ifsortingnamekeytemplatename{}{}{}": {
+      "snippet": "ifsortingnamekeytemplatename{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "ifuniquenametemplatename{}{}{}": {
+      "snippet": "ifuniquenametemplatename{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "iflabelalphanametemplatename{}{}{}": {
+      "snippet": "iflabelalphanametemplatename{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "ifnamehashtemplatename{}{}{}": {
+      "snippet": "ifnamehashtemplatename{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "iffieldundef{}{}{}": {
+      "snippet": "iffieldundef{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "iflistundef{}{}{}": {
+      "snippet": "iflistundef{${1:literal list}}{${2:true}}{${3:false}}"
+    },
+    "ifnameundef{}{}{}": {
+      "snippet": "ifnameundef{${1:name list}}{${2:true}}{${3:false}}"
+    },
+    "iffieldsequal{}{}{}{}": {
+      "snippet": "iffieldsequal{${1:field1}}{${2:field2}}{${3:true}}{${4:false}}"
+    },
+    "iflistsequal{}{}{}{}": {
+      "snippet": "iflistsequal{${1:literal list1}}{${2:literal list2}}{${3:true}}{${4:false}}"
+    },
+    "ifnamesequal{}{}{}{}": {
+      "snippet": "ifnamesequal{${1:name list1}}{${2:name list2}}{${3:true}}{${4:false}}"
+    },
+    "iffieldequals{}{}{}{}": {
+      "snippet": "iffieldequals{${1:field}}{${2:cmd}}{${3:true}}{${4:false}}"
+    },
+    "iflistequals{}{}{}{}": {
+      "snippet": "iflistequals{${1:literal list}}{${2:cmd}}{${3:true}}{${4:false}}"
+    },
+    "ifnameequals{}{}{}{}": {
+      "snippet": "ifnameequals{${1:name list}}{${2:cmd}}{${3:true}}{${4:false}}"
+    },
+    "iffieldequalcs{}{}{}{}": {
+      "snippet": "iffieldequalcs{${1:field}}{${2:csname}}{${3:true}}{${4:false}}"
+    },
+    "iflistequalcs{}{}{}{}": {
+      "snippet": "iflistequalcs{${1:literal list}}{${2:csname}}{${3:true}}{${4:false}}"
+    },
+    "ifnameequalcs{}{}{}{}": {
+      "snippet": "ifnameequalcs{${1:name list}}{${2:csname}}{${3:true}}{${4:false}}"
+    },
+    "iffieldequalstr{}{}{}{}": {
+      "snippet": "iffieldequalstr{${1:field}}{${2:string}}{${3:true}}{${4:false}}"
+    },
+    "iffieldxref{}{}{}": {
+      "snippet": "iffieldxref{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "iflistxref{}{}{}": {
+      "snippet": "iflistxref{${1:literal list}}{${2:true}}{${3:false}}"
+    },
+    "ifnamexref{}{}{}": {
+      "snippet": "ifnamexref{${1:name list}}{${2:true}}{${3:false}}"
+    },
+    "ifcurrentfield{}{}{}": {
+      "snippet": "ifcurrentfield{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "ifcurrentlist{}{}{}": {
+      "snippet": "ifcurrentlist{${1:literal list}}{${2:true}}{${3:false}}"
+    },
+    "ifcurrentname{}{}{}": {
+      "snippet": "ifcurrentname{${1:name list}}{${2:true}}{${3:false}}"
+    },
+    "ifuseprefix{}{}": {
+      "snippet": "ifuseprefix{${1:true}}{${2:false}}"
+    },
+    "ifuseauthor{}{}": {
+      "snippet": "ifuseauthor{${1:true}}{${2:false}}"
+    },
+    "ifuseeditor{}{}": {
+      "snippet": "ifuseeditor{${1:true}}{${2:false}}"
+    },
+    "ifusetranslator{}{}": {
+      "snippet": "ifusetranslator{${1:true}}{${2:false}}"
+    },
+    "ifcrossrefsource{}{}": {
+      "snippet": "ifcrossrefsource{${1:true}}{${2:false}}"
+    },
+    "ifxrefsource{}{}": {
+      "snippet": "ifxrefsource{${1:true}}{${2:false}}"
+    },
+    "ifsingletitle{}{}": {
+      "snippet": "ifsingletitle{${1:true}}{${2:false}}"
+    },
+    "ifnocite{}{}": {
+      "snippet": "ifnocite{${1:true}}{${2:false}}"
+    },
+    "ifuniquetitle{}{}": {
+      "snippet": "ifuniquetitle{${1:true}}{${2:false}}"
+    },
+    "ifuniquebaretitle{}{}": {
+      "snippet": "ifuniquebaretitle{${1:true}}{${2:false}}"
+    },
+    "ifuniquework{}{}": {
+      "snippet": "ifuniquework{${1:true}}{${2:false}}"
+    },
+    "ifuniqueprimaryauthor{}{}": {
+      "snippet": "ifuniqueprimaryauthor{${1:true}}{${2:false}}"
+    },
+    "ifandothers{}{}{}": {
+      "snippet": "ifandothers{${1:list}}{${2:true}}{${3:false}}"
+    },
+    "ifmorenames{}{}": {
+      "snippet": "ifmorenames{${1:true}}{${2:false}}"
+    },
+    "ifmoreitems{}{}": {
+      "snippet": "ifmoreitems{${1:true}}{${2:false}}"
+    },
+    "ifterseinits{}{}": {
+      "snippet": "ifterseinits{${1:true}}{${2:false}}"
+    },
+    "ifentrytype{}{}{}": {
+      "snippet": "ifentrytype{${1:type}}{${2:true}}{${3:false}}"
+    },
+    "ifkeyword{}{}{}": {
+      "snippet": "ifkeyword{${1:keyword}}{${2:true}}{${3:false}}"
+    },
+    "ifcategory{}{}{}": {
+      "snippet": "ifcategory{${1:category}}{${2:true}}{${3:false}}"
+    },
+    "ifciteseen{}{}": {
+      "snippet": "ifciteseen{${1:true}}{${2:false}}"
+    },
+    "iffirstcitekey{}{}": {
+      "snippet": "iffirstcitekey{${1:true}}{${2:false}}"
+    },
+    "iflastcitekey{}{}": {
+      "snippet": "iflastcitekey{${1:true}}{${2:false}}"
+    },
+    "ifciteibid{}{}": {
+      "snippet": "ifciteibid{${1:true}}{${2:false}}"
+    },
+    "ifciteidem{}{}": {
+      "snippet": "ifciteidem{${1:true}}{${2:false}}"
+    },
+    "ifopcit{}{}": {
+      "snippet": "ifopcit{${1:true}}{${2:false}}"
+    },
+    "ifloccit{}{}": {
+      "snippet": "ifloccit{${1:true}}{${2:false}}"
+    },
+    "iffirstonpage{}{}": {
+      "snippet": "iffirstonpage{${1:true}}{${2:false}}"
+    },
+    "ifsamepage{}{}{}{}": {
+      "snippet": "ifsamepage{${1:instance1}}{${2:instance2}}{${3:true}}{${4:false}}"
+    },
+    "ifinteger{}{}{}": {
+      "snippet": "ifinteger{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "hascomputableequivalent{}{}{}": {
+      "snippet": "hascomputableequivalent{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "ifiscomputable{}{}{}": {
+      "snippet": "ifiscomputable{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "getcomputableequivalent{}{}": {
+      "snippet": "getcomputableequivalent{${1:string}}{${2:macro}}"
+    },
+    "ifnumeral{}{}{}": {
+      "snippet": "ifnumeral{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "ifnumerals{}{}{}": {
+      "snippet": "ifnumerals{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "ifpages{}{}{}": {
+      "snippet": "ifpages{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "iffieldint{}{}{}": {
+      "snippet": "iffieldint{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "fieldhascomputableequivalent{}{}{}": {
+      "snippet": "fieldhascomputableequivalent{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "iffieldiscomputable{}{}{}": {
+      "snippet": "iffieldiscomputable{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "iffieldnum{}{}{}": {
+      "snippet": "iffieldnum{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "iffieldnums{}{}{}": {
+      "snippet": "iffieldnums{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "iffieldpages{}{}{}": {
+      "snippet": "iffieldpages{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "ifbibstring{}{}{}": {
+      "snippet": "ifbibstring{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "ifbibxstring{}{}{}": {
+      "snippet": "ifbibxstring{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "iffieldbibstring{}{}{}": {
+      "snippet": "iffieldbibstring{${1:field}}{${2:true}}{${3:false}}"
+    },
+    "iffieldplusstringbibstring{}{}{}{}": {
+      "snippet": "iffieldplusstringbibstring{${1:field}}{${2:string}}{${3:true}}{${4:false}}"
+    },
+    "ifdriver{}{}{}": {
+      "snippet": "ifdriver{${1:entrytype}}{${2:true}}{${3:false}}"
+    },
+    "ifcapital{}{}": {
+      "snippet": "ifcapital{${1:true}}{${2:false}}"
+    },
+    "ifcitation{}{}": {
+      "snippet": "ifcitation{${1:true}}{${2:false}}"
+    },
+    "ifvolcite{}{}": {
+      "snippet": "ifvolcite{${1:true}}{${2:false}}"
+    },
+    "ifbibliography{}{}": {
+      "snippet": "ifbibliography{${1:true}}{${2:false}}"
+    },
+    "ifnatbibmode{}{}": {
+      "snippet": "ifnatbibmode{${1:true}}{${2:false}}"
+    },
+    "ifciteindex{}{}": {
+      "snippet": "ifciteindex{${1:true}}{${2:false}}"
+    },
+    "ifbibindex{}{}": {
+      "snippet": "ifbibindex{${1:true}}{${2:false}}"
+    },
+    "iffootnote{}{}": {
+      "snippet": "iffootnote{${1:true}}{${2:false}}"
+    },
+    "thecitecounter": {},
+    "themaxcitecounter": {},
+    "thesavedcitecounter": {},
+    "theuniquename": {},
+    "theuniquelist": {},
+    "theparenlevel": {},
+    "themaxparens": {},
+    "ifboolexpr{}{}{}": {
+      "snippet": "ifboolexpr{${1:expression}}{${2:true}}{${3:false}}"
+    },
+    "ifthenelse{}{}{}": {
+      "snippet": "ifthenelse{${1:tests}}{${2:true}}{${3:false}}"
+    },
+    "newbibmacro{}{}": {
+      "snippet": "newbibmacro{${1:name}}{${2:definition}}"
+    },
+    "newbibmacro{}[]{}": {
+      "snippet": "newbibmacro{${1:name}}[${2:args}]{${3:definition}}"
+    },
+    "newbibmacro{}[][]{}": {
+      "snippet": "newbibmacro{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
+    },
+    "newbibmacro*{}{}": {
+      "snippet": "newbibmacro*{${1:name}}{${2:definition}}"
+    },
+    "newbibmacro*{}[]{}": {
+      "snippet": "newbibmacro*{${1:name}}[${2:args}]{${3:definition}}"
+    },
+    "newbibmacro*{}[][]{}": {
+      "snippet": "newbibmacro*{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
+    },
+    "renewbibmacro{}{}": {
+      "snippet": "renewbibmacro{${1:name}}{${2:definition}}"
+    },
+    "renewbibmacro{}[]{}": {
+      "snippet": "renewbibmacro{${1:name}}[${2:args}]{${3:definition}}"
+    },
+    "renewbibmacro{}[][]{}": {
+      "snippet": "renewbibmacro{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
+    },
+    "renewbibmacro*{}{}": {
+      "snippet": "renewbibmacro*{${1:name}}{${2:definition}}"
+    },
+    "renewbibmacro*{}[]{}": {
+      "snippet": "renewbibmacro*{${1:name}}[${2:args}]{${3:definition}}"
+    },
+    "renewbibmacro*{}[][]{}": {
+      "snippet": "renewbibmacro*{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
+    },
+    "providebibmacro{}{}": {
+      "snippet": "providebibmacro{${1:name}}{${2:definition}}"
+    },
+    "providebibmacro{}[]{}": {
+      "snippet": "providebibmacro{${1:name}}[${2:args}]{${3:definition}}"
+    },
+    "providebibmacro{}[][]{}": {
+      "snippet": "providebibmacro{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
+    },
+    "providebibmacro*{}{}": {
+      "snippet": "providebibmacro*{${1:name}}{${2:definition}}"
+    },
+    "providebibmacro*{}[]{}": {
+      "snippet": "providebibmacro*{${1:name}}[${2:args}]{${3:definition}}"
+    },
+    "providebibmacro*{}[][]{}": {
+      "snippet": "providebibmacro*{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
+    },
+    "letbibmacro{}{}": {
+      "snippet": "letbibmacro{${1:alias}}{${2:name}}"
+    },
+    "letbibmacro*{}{}": {
+      "snippet": "letbibmacro*{${1:alias}}{${2:name}}"
+    },
+    "usebibmacro{}": {
+      "snippet": "usebibmacro{${1:name}}"
+    },
+    "usebibmacro*{}": {
+      "snippet": "usebibmacro*{${1:name}}"
+    },
+    "savecommand{}": {
+      "snippet": "savecommand{${1:cmd}}"
+    },
+    "restorecommand{}": {
+      "snippet": "restorecommand{${1:cmd}}"
+    },
+    "savebibmacro{}": {
+      "snippet": "savebibmacro{${1:name}}"
+    },
+    "restorebibmacro{}": {
+      "snippet": "restorebibmacro{${1:name}}"
+    },
+    "savefieldformat{}": {
+      "snippet": "savefieldformat{${1:format}}"
+    },
+    "savefieldformat[]{}": {
+      "snippet": "savefieldformat[${2:entrytype}]{${1:format}}"
+    },
+    "restorefieldformat{}": {
+      "snippet": "restorefieldformat{${1:format}}"
+    },
+    "restorefieldformat[]{}": {
+      "snippet": "restorefieldformat[${2:entrytype}]{${1:format}}"
+    },
+    "savelistformat{}": {
+      "snippet": "savelistformat{${1:format}}"
+    },
+    "savelistformat[]{}": {
+      "snippet": "savelistformat[${2:entrytype}]{${1:format}}"
+    },
+    "restorelistformat{}": {
+      "snippet": "restorelistformat{${1:format}}"
+    },
+    "restorelistformat[]{}": {
+      "snippet": "restorelistformat[${2:entrytype}]{${1:format}}"
+    },
+    "savenameformat{}": {
+      "snippet": "savenameformat{${1:format}}"
+    },
+    "savenameformat[]{}": {
+      "snippet": "savenameformat[${2:entrytype}]{${1:format}}"
+    },
+    "restorenameformat{}": {
+      "snippet": "restorenameformat{${1:format}}"
+    },
+    "restorenameformat[]{}": {
+      "snippet": "restorenameformat[${2:entrytype}]{${1:format}}"
+    },
+    "savelistwrapperformat{}": {
+      "snippet": "savelistwrapperformat{${1:format}}"
+    },
+    "savelistwrapperformat[]{}": {
+      "snippet": "savelistwrapperformat[${2:entrytype}]{${1:format}}"
+    },
+    "restorelistwrapperformat{}": {
+      "snippet": "restorelistwrapperformat{${1:format}}"
+    },
+    "restorelistwrapperformat[]{}": {
+      "snippet": "restorelistwrapperformat[${2:entrytype}]{${1:format}}"
+    },
+    "savenamewrapperformat{}": {
+      "snippet": "savenamewrapperformat{${1:format}}"
+    },
+    "savenamewrapperformat[]{}": {
+      "snippet": "savenamewrapperformat[${2:entrytype}]{${1:format}}"
+    },
+    "restorenamewrapperformat{}": {
+      "snippet": "restorenamewrapperformat{${1:format}}"
+    },
+    "restorenamewrapperformat[]{}": {
+      "snippet": "restorenamewrapperformat[${2:entrytype}]{${1:format}}"
+    },
+    "ifbibmacroundef{}{}{}": {
+      "snippet": "ifbibmacroundef{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "iffieldformatundef{}{}{}": {
+      "snippet": "iffieldformatundef{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "iffieldformatundef[]{}{}{}": {
+      "snippet": "iffieldformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "iflistformatundef{}{}{}": {
+      "snippet": "iflistformatundef{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "iflistformatundef[]{}{}{}": {
+      "snippet": "iflistformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "ifnameformatundef{}{}{}": {
+      "snippet": "ifnameformatundef{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "ifnameformatundef[]{}{}{}": {
+      "snippet": "ifnameformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "iflistwrapperformatundef{}{}{}": {
+      "snippet": "iflistwrapperformatundef{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "iflistwrapperformatundef[]{}{}{}": {
+      "snippet": "iflistwrapperformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "ifnamewrapperformatundef{}{}{}": {
+      "snippet": "ifnamewrapperformatundef{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "ifnamewrapperformatundef[]{}{}{}": {
+      "snippet": "ifnamewrapperformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "usedriver{}{}": {
+      "snippet": "usedriver{${1:code}}{${2:entrytype}}"
+    },
+    "bibhypertarget{}{}": {
+      "snippet": "bibhypertarget{${1:name}}{${2:text}}"
+    },
+    "bibhyperlink{}{}": {
+      "snippet": "bibhyperlink{${1:name}}{${2:text}}"
+    },
+    "bibhyperref{}": {
+      "snippet": "bibhyperref{${1:text}}"
+    },
+    "bibhyperref[]{}": {
+      "snippet": "bibhyperref[${2:entrykey}]{${1:text}}"
+    },
+    "ifhyperref{}{}": {
+      "snippet": "ifhyperref{${1:true}}{${2:false}}"
+    },
+    "docsvfield{}": {
+      "snippet": "docsvfield{${1:field}}"
+    },
+    "forcsvfield{}{}": {
+      "snippet": "forcsvfield{${1:handler}}{${2:field}}"
+    },
+    "MakeCapital{}": {
+      "snippet": "MakeCapital{${1:text}}"
+    },
+    "MakeSentenceCase{}": {
+      "snippet": "MakeSentenceCase{${1:text}}"
+    },
+    "MakeSentenceCase*{}": {
+      "snippet": "MakeSentenceCase*{${1:text}}"
+    },
+    "mkpageprefix{}": {
+      "snippet": "mkpageprefix{${1:text}}"
+    },
+    "mkpageprefix[]{}": {
+      "snippet": "mkpageprefix[${2:pagination}]{${1:text}}"
+    },
+    "mkpageprefix[][]{}": {
+      "snippet": "mkpageprefix[${2:pagination}][${3:postpro}]{${1:text}}"
+    },
+    "mkpagetotal{}": {
+      "snippet": "mkpagetotal{${1:text}}"
+    },
+    "mkpagetotal[]{}": {
+      "snippet": "mkpagetotal[${2:pagination}]{${1:text}}"
+    },
+    "mkpagetotal[][]{}": {
+      "snippet": "mkpagetotal[${2:pagination}][${3:postpro}]{${1:text}}"
+    },
+    "themincomprange": {},
+    "themaxcomprange": {},
+    "themincompwidth": {},
+    "mkcomprange{}": {
+      "snippet": "mkcomprange{${1:text}}"
+    },
+    "mkcomprange[]{}": {
+      "snippet": "mkcomprange[${2:postpro}]{${1:text}}"
+    },
+    "mkcomprange[][]{}": {
+      "snippet": "mkcomprange[${2:postpro}][${3:itempostpro}]{${1:text}}"
+    },
+    "mkcomprange*{}": {
+      "snippet": "mkcomprange*{${1:text}}"
+    },
+    "mkcomprange*[]{}": {
+      "snippet": "mkcomprange*[${2:postpro}]{${1:text}}"
+    },
+    "mkcomprange*[][]{}": {
+      "snippet": "mkcomprange*[${2:postpro}][${3:itempostpro}]{${1:text}}"
+    },
+    "mknormrange{}": {
+      "snippet": "mknormrange{${1:text}}"
+    },
+    "mknormrange[]{}": {
+      "snippet": "mknormrange[${2:postpro}]{${1:text}}"
+    },
+    "mknormrange[][]{}": {
+      "snippet": "mknormrange[${2:postpro}][${3:itempostpro}]{${1:text}}"
+    },
+    "mknormrange*{}": {
+      "snippet": "mknormrange*{${1:text}}"
+    },
+    "mknormrange*[]{}": {
+      "snippet": "mknormrange*[${2:postpro}]{${1:text}}"
+    },
+    "mknormrange*[][]{}": {
+      "snippet": "mknormrange*[${2:postpro}][${3:itempostpro}]{${1:text}}"
+    },
+    "mkfirstpage{}": {
+      "snippet": "mkfirstpage{${1:text}}"
+    },
+    "mkfirstpage[]{}": {
+      "snippet": "mkfirstpage[${2:postpro}]{${1:text}}"
+    },
+    "mkfirstpage[][]{}": {
+      "snippet": "mkfirstpage[${2:postpro}][${3:itempostpro}]{${1:text}}"
+    },
+    "mkfirstpage*{}": {
+      "snippet": "mkfirstpage*{${1:text}}"
+    },
+    "mkfirstpage*[]{}": {
+      "snippet": "mkfirstpage*[${2:postpro}]{${1:text}}"
+    },
+    "mkfirstpage*[][]{}": {
+      "snippet": "mkfirstpage*[${2:postpro}][${3:itempostpro}]{${1:text}}"
+    },
+    "rangelen{}": {
+      "snippet": "rangelen{${1:rangefield}}"
+    },
+    "DeclareNumChars{}": {
+      "snippet": "DeclareNumChars{${1:characters}}"
+    },
+    "DeclareNumChars*{}": {
+      "snippet": "DeclareNumChars*{${1:characters}}"
+    },
+    "DeclareRangeChars{}": {
+      "snippet": "DeclareRangeChars{${1:characters}}"
+    },
+    "DeclareRangeChars*{}": {
+      "snippet": "DeclareRangeChars*{${1:characters}}"
+    },
+    "DeclareRangeCommands{}": {
+      "snippet": "DeclareRangeCommands{${1:cmds}}"
+    },
+    "DeclareRangeCommands*{}": {
+      "snippet": "DeclareRangeCommands*{${1:cmds}}"
+    },
+    "DeclarePageCommands{}": {
+      "snippet": "DeclarePageCommands{${1:cmds}}"
+    },
+    "DeclarePageCommands*{}": {
+      "snippet": "DeclarePageCommands*{${1:cmds}}"
+    },
+    "NumCheckSetup{}": {
+      "snippet": "NumCheckSetup{${1:code}}"
+    },
+    "NumcheckSetup{}": {
+      "snippet": "NumcheckSetup{${1:code}}"
+    },
+    "NumsCheckSetup{}": {
+      "snippet": "NumsCheckSetup{${1:code}}"
+    },
+    "PagesCheckSetup{}": {
+      "snippet": "PagesCheckSetup{${1:code}}"
+    },
+    "DeclareBabelToExplLanguageMapping{}{}": {
+      "snippet": "DeclareBabelToExplLanguageMapping{${1:babel language}}{${2:expl language}}"
+    },
+    "UndeclareBabelToExplLanguageMapping{}": {
+      "snippet": "UndeclareBabelToExplLanguageMapping{${1:babel language}}"
+    },
+    "DeclareCaseLangs{}": {
+      "snippet": "DeclareCaseLangs{${1:languages}}"
+    },
+    "DeclareCaseLangs*{}": {
+      "snippet": "DeclareCaseLangs*{${1:languages}}"
+    },
+    "BibliographyWarning{}": {
+      "snippet": "BibliographyWarning{${1:message}}"
+    },
+    "pagetrackertrue": {},
+    "pagetrackerfalse": {},
+    "citetrackertrue": {},
+    "citetrackerfalse": {},
+    "backtrackertrue": {},
+    "backtrackerfalse": {},
+    "newblock": {},
+    "newunit": {},
+    "finentry": {},
+    "setunit{}": {
+      "snippet": "setunit{${1:punctuation}}"
+    },
+    "setunit*{}": {
+      "snippet": "setunit*{${1:punctuation}}"
+    },
+    "printunit{}": {
+      "snippet": "printunit{${1:punctuation}}"
+    },
+    "printunit*{}": {
+      "snippet": "printunit*{${1:punctuation}}"
+    },
+    "setpunctfont{}": {
+      "snippet": "setpunctfont{${1:cmd}}"
+    },
+    "resetpunctfont": {},
+    "ifpunct{}{}": {
+      "snippet": "ifpunct{${1:true}}{${2:false}}"
+    },
+    "ifterm{}{}": {
+      "snippet": "ifterm{${1:true}}{${2:false}}"
+    },
+    "ifpunctmark{}{}{}": {
+      "snippet": "ifpunctmark{${1:character}}{${2:true}}{${3:false}}"
+    },
+    "ifprefchar{}{}": {
+      "snippet": "ifprefchar{${1:true}}{${2:false}}"
+    },
+    "adddot": {},
+    "addcomma": {},
+    "addsemicolon": {},
+    "addcolon": {},
+    "addperiod": {},
+    "addexclam": {},
+    "addquestion": {},
+    "isdot": {},
+    "nopunct": {},
+    "unspace": {},
+    "addspace": {},
+    "addnbspace": {},
+    "addthinspace": {},
+    "addnbthinspace": {},
+    "addlowpenspace": {},
+    "addhighpenspace": {},
+    "addlpthinspace": {},
+    "addhpthinspace": {},
+    "addabbrvspace": {},
+    "addabthinspace": {},
+    "adddotspace": {},
+    "addslash": {},
+    "DeclarePrefChars{}": {
+      "snippet": "DeclarePrefChars{${1:characters}}"
+    },
+    "DeclarePrefChars*{}": {
+      "snippet": "DeclarePrefChars*{${1:characters}}"
+    },
+    "DeclareAutoPunctuation{}": {
+      "snippet": "DeclareAutoPunctuation{${1:characters}}"
+    },
+    "DeclareCapitalPunctuation{}": {
+      "snippet": "DeclareCapitalPunctuation{${1:characters}}"
+    },
+    "DeclarePunctuationPairs{}{}": {
+      "snippet": "DeclarePunctuationPairs{${1:identifier}}{${2:characters}}"
+    },
+    "DeclareQuotePunctuation{}": {
+      "snippet": "DeclareQuotePunctuation{${1:characters}}"
+    },
+    "uspunctuation": {},
+    "stdpunctuation": {},
+    "bibsentence": {},
+    "midsentence": {},
+    "midsentence*": {},
+    "bibstring{}": {
+      "snippet": "bibstring{${1:string key}}"
+    },
+    "bibstring[]{}": {
+      "snippet": "bibstring[${2:wrapper}]{${1:string key}}"
+    },
+    "biblstring{}": {
+      "snippet": "biblstring{${1:string key}}"
+    },
+    "biblstring[]{}": {
+      "snippet": "biblstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibsstring{}": {
+      "snippet": "bibsstring{${1:string key}}"
+    },
+    "bibsstring[]{}": {
+      "snippet": "bibsstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibcpstring{}": {
+      "snippet": "bibcpstring{${1:string key}}"
+    },
+    "bibcpstring[]{}": {
+      "snippet": "bibcpstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibcplstring{}": {
+      "snippet": "bibcplstring{${1:string key}}"
+    },
+    "bibcplstring[]{}": {
+      "snippet": "bibcplstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibcpsstring{}": {
+      "snippet": "bibcpsstring{${1:string key}}"
+    },
+    "bibcpsstring[]{}": {
+      "snippet": "bibcpsstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibucstring{}": {
+      "snippet": "bibucstring{${1:string key}}"
+    },
+    "bibucstring[]{}": {
+      "snippet": "bibucstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibuclstring{}": {
+      "snippet": "bibuclstring{${1:string key}}"
+    },
+    "bibuclstring[]{}": {
+      "snippet": "bibuclstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibucsstring{}": {
+      "snippet": "bibucsstring{${1:string key}}"
+    },
+    "bibucsstring[]{}": {
+      "snippet": "bibucsstring[${2:wrapper}]{${1:string key}}"
+    },
+    "biblcstring{}": {
+      "snippet": "biblcstring{${1:string key}}"
+    },
+    "biblcstring[]{}": {
+      "snippet": "biblcstring[${2:wrapper}]{${1:string key}}"
+    },
+    "biblclstring{}": {
+      "snippet": "biblclstring{${1:string key}}"
+    },
+    "biblclstring[]{}": {
+      "snippet": "biblclstring[${2:wrapper}]{${1:string key}}"
+    },
+    "biblcsstring{}": {
+      "snippet": "biblcsstring{${1:string key}}"
+    },
+    "biblcsstring[]{}": {
+      "snippet": "biblcsstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibxstring{}": {
+      "snippet": "bibxstring{${1:string key}}"
+    },
+    "bibxstring[]{}": {
+      "snippet": "bibxstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibxlstring{}": {
+      "snippet": "bibxlstring{${1:string key}}"
+    },
+    "bibxlstring[]{}": {
+      "snippet": "bibxlstring[${2:wrapper}]{${1:string key}}"
+    },
+    "bibxsstring{}": {
+      "snippet": "bibxsstring{${1:string key}}"
+    },
+    "bibxsstring[]{}": {
+      "snippet": "bibxsstring[${2:wrapper}]{${1:string key}}"
+    },
+    "mainlang": {},
+    "textmainlang{}": {
+      "snippet": "textmainlang{${1:text}}"
+    },
+    "texouterlang{}": {
+      "snippet": "texouterlang{${1:text}}"
+    },
+    "DeclareBibstringSet{}{}": {
+      "snippet": "DeclareBibstringSet{${1:name}}{${2:key1,${3:key2},...}}"
+    },
+    "UndeclareBibstringSet{}": {
+      "snippet": "UndeclareBibstringSet{${1:name}}"
+    },
+    "UndeclareBibstringSets": {},
+    "DeclareBibstringSetFormat{}{}": {
+      "snippet": "DeclareBibstringSetFormat{${1:name}}{${2:code}}"
+    },
+    "UneclareBibstringSetFormat{}": {
+      "snippet": "UneclareBibstringSetFormat{${1:name}}"
+    },
+    "DeclareLanguageMapping{}{}": {
+      "snippet": "DeclareLanguageMapping{${1:language}}{${2:file}}"
+    },
+    "DeclareLanguageMappingSuffix{}": {
+      "snippet": "DeclareLanguageMappingSuffix{${1:suffix}}"
+    },
+    "mkbibemph{}": {
+      "snippet": "mkbibemph{${1:text}}"
+    },
+    "mkbibitalic{}": {
+      "snippet": "mkbibitalic{${1:text}}"
+    },
+    "mkbibbold{}": {
+      "snippet": "mkbibbold{${1:text}}"
+    },
+    "mkbibquote{}": {
+      "snippet": "mkbibquote{${1:text}}"
+    },
+    "mkbibparens{}": {
+      "snippet": "mkbibparens{${1:text}}"
+    },
+    "mkbibbrackets{}": {
+      "snippet": "mkbibbrackets{${1:text}}"
+    },
+    "bibopenparen": {},
+    "bibcloseparen": {},
+    "bibopenbracket": {},
+    "bibclosebracket": {},
+    "mkbibfootnote{}": {
+      "snippet": "mkbibfootnote{${1:text}}"
+    },
+    "mkbibfootnotetext{}": {
+      "snippet": "mkbibfootnotetext{${1:text}}"
+    },
+    "mkbibendnote{}": {
+      "snippet": "mkbibendnote{${1:text}}"
+    },
+    "mkbibendnotetext{}": {
+      "snippet": "mkbibendnotetext{${1:text}}"
+    },
+    "bibfootnotewrapper{}": {
+      "snippet": "bibfootnotewrapper{${1:text}}"
+    },
+    "bibendnotewrapper{}": {
+      "snippet": "bibendnotewrapper{${1:text}}"
+    },
+    "mkbibsuperscript{}": {
+      "snippet": "mkbibsuperscript{${1:text}}"
+    },
+    "mkbibmonth{}": {
+      "snippet": "mkbibmonth{${1:integer}}"
+    },
+    "mkbibseason{}": {
+      "snippet": "mkbibseason{${1:string}}"
+    },
+    "mkyearzeros{}": {
+      "snippet": "mkyearzeros{${1:integer}}"
+    },
+    "mkmonthzeros{}": {
+      "snippet": "mkmonthzeros{${1:integer}}"
+    },
+    "mkdayzeros{}": {
+      "snippet": "mkdayzeros{${1:integer}}"
+    },
+    "mktimezeros{}": {
+      "snippet": "mktimezeros{${1:integer}}"
+    },
+    "forcezerosy{}": {
+      "snippet": "forcezerosy{${1:integer}}"
+    },
+    "forcezerosmdt{}": {
+      "snippet": "forcezerosmdt{${1:integer}}"
+    },
+    "stripzeros{}": {
+      "snippet": "stripzeros{${1:integer}}"
+    },
+    "labelnumberwidth": {},
+    "labelalphawidth": {},
+    "themaxextraalpha": {},
+    "themaxextradate": {},
+    "themaxextraname": {},
+    "themaxextratitle": {},
+    "themaxextratitleyear": {},
+    "themaxnames": {},
+    "theminnames": {},
+    "themaxitems": {},
+    "theminitems": {},
+    "theinstcount": {},
+    "thecitetotal": {},
+    "thecitecount": {},
+    "themulticitetotal": {},
+    "themulticitecount": {},
+    "thelisttotal": {},
+    "thelistcount": {},
+    "theliststart": {},
+    "theliststop": {},
+    "currentlang": {},
+    "currentfield": {},
+    "currentlist": {},
+    "currentname": {},
+    "AtBeginRefsection{}": {
+      "snippet": "AtBeginRefsection{${1:code}}"
+    },
+    "AtNextRefsection{}": {
+      "snippet": "AtNextRefsection{${1:code}}"
+    },
+    "AtFollowingRefsections{}": {
+      "snippet": "AtFollowingRefsections{${1:code}}"
+    },
+    "AtBeginBibliography{}": {
+      "snippet": "AtBeginBibliography{${1:code}}"
+    },
+    "AtBeginShorthands{}": {
+      "snippet": "AtBeginShorthands{${1:code}}"
+    },
+    "AtBeginBiblist{}{}": {
+      "snippet": "AtBeginBiblist{${1:biblistname}}{${2:code}}"
+    },
+    "AtEveryBibitem{}": {
+      "snippet": "AtEveryBibitem{${1:code}}"
+    },
+    "AtEveryLositem{}": {
+      "snippet": "AtEveryLositem{${1:code}}"
+    },
+    "AtEveryBiblistitem{}{}": {
+      "snippet": "AtEveryBiblistitem{${1:biblistname}}{${2:code}}"
+    },
+    "AtNextBibliography{}": {
+      "snippet": "AtNextBibliography{${1:code}}"
+    },
+    "AtUsedriver{}": {
+      "snippet": "AtUsedriver{${1:code}}"
+    },
+    "AtUsedriver*{}": {
+      "snippet": "AtUsedriver*{${1:code}}"
+    },
+    "AtEveryCite{}": {
+      "snippet": "AtEveryCite{${1:code}}"
+    },
+    "AtEveryCitekey{}": {
+      "snippet": "AtEveryCitekey{${1:code}}"
+    },
+    "AtEveryMultiCite{}": {
+      "snippet": "AtEveryMultiCite{${1:code}}"
+    },
+    "AtNextCite{}": {
+      "snippet": "AtNextCite{${1:code}}"
+    },
+    "AtEachCitekey{}": {
+      "snippet": "AtEachCitekey{${1:code}}"
+    },
+    "AtNextCitekey{}": {
+      "snippet": "AtNextCitekey{${1:code}}"
+    },
+    "AtNextMultiCite{}": {
+      "snippet": "AtNextMultiCite{${1:code}}"
+    },
+    "AtVolcite{}": {
+      "snippet": "AtVolcite{${1:code}}"
+    },
+    "AtVolcite*{}": {
+      "snippet": "AtVolcite*{${1:code}}"
+    },
+    "AtDataInput{}": {
+      "snippet": "AtDataInput{${1:code}}"
+    },
+    "AtDataInput[]{}": {
+      "snippet": "AtDataInput[${2:entrytype}]{${1:code}}"
+    },
+    "UseBibitemHook": {},
+    "UseUsedriverHook": {},
+    "UseEveryCiteHook": {},
+    "UseEveryCitekeyHook": {},
+    "UseEveryMultiCiteHook": {},
+    "UseNextCiteHook": {},
+    "UseNextCitekeyHook": {},
+    "UseNextMultiCiteHook": {},
+    "UseVolciteHook": {},
+    "DeferNextCitekeyHook": {},
+    "AtEveryEntrykey{}{}{}": {
+      "snippet": "AtEveryEntrykey{${1:code}}{${2:success}}{${3:failure}}"
+    },
+    "DeclareUniquenameTemplate{}": {
+      "snippet": "DeclareUniquenameTemplate{${1:specification}}"
+    },
+    "DeclareUniquenameTemplate[]{}": {
+      "snippet": "DeclareUniquenameTemplate[${2:name}]{${1:specification}}"
+    },
+    "DeclareNamehashTemplate{}": {
+      "snippet": "DeclareNamehashTemplate{${1:specification}}"
+    },
+    "DeclareNamehashTemplate[]{}": {
+      "snippet": "DeclareNamehashTemplate[${2:name}]{${1:specification}}"
+    },
+    "actualoperator": {},
+    "begrelateddelimmultivolume": {},
+    "BiblatexHungarianWarningOff": {},
+    "BiblatexLatvianWarningOff": {},
+    "BiblatexSplitbibDefernumbersWarningOff": {},
+    "biburlsetup": {},
+    "blxcitecmd{}{}{}{}{}": {
+      "snippet": "blxcitecmd{${1:name}}{${2:prenote}}{${3:postnote}}{${4:citekey}}{${5:punct}}"
+    },
+    "blxciteicmd{}{}{}{}{}": {
+      "snippet": "blxciteicmd{${1:name}}{${2:prenote}}{${3:postnote}}{${4:citekey}}{${5:punct}}"
+    },
+    "blxendmcites": {},
+    "blxmciteicmd{}{}{}{}{}{}": {
+      "snippet": "blxmciteicmd{${1:multicitecount}}{${2:<name>}}{${3:prenote}}{${4:postnote}}{${5:citekey}}{${6:punct}}"
+    },
+    "blxmcites{}{}{}": {
+      "snippet": "blxmcites{${1:multicitetotal}}{${2:multiprenote}}{${3:multipostnote}}"
+    },
+    "iffinalcitedelim{}{}": {
+      "snippet": "iffinalcitedelim{${1:true}}{${2:false}}"
+    },
+    "iftextcitepunct{}{}": {
+      "snippet": "iftextcitepunct{${1:true}}{${2:false}}"
+    },
+    "mkbibindexentry{}{}": {
+      "snippet": "mkbibindexentry{${1:entry}}{${2:text}}"
+    },
+    "mkbibindexfield{}{}": {
+      "snippet": "mkbibindexfield{${1:entry}}{${2:text}}"
+    },
+    "mkbibindexname{}{}{}{}": {
+      "snippet": "mkbibindexname{${1:family name}}{${2:given name}}{${3:prefix}}{${4:suffix}}"
+    },
+    "mkbibindexsubentry{}{}": {
+      "snippet": "mkbibindexsubentry{${1:csname1}}{${2:csname2}}"
+    },
+    "mkdaterangecomp{}": {
+      "snippet": "mkdaterangecomp{${1:datetype}}"
+    },
+    "mkdaterangecompextra{}": {
+      "snippet": "mkdaterangecompextra{${1:datetype}}"
+    },
+    "mkdaterangefull{}{}": {
+      "snippet": "mkdaterangefull{${1:short|long}}{${2:datetype}}"
+    },
+    "mkdaterangefullextra{}{}": {
+      "snippet": "mkdaterangefullextra{${1:short|long}}{${2:datetype}}"
+    },
+    "mkdaterangeiso{}": {
+      "snippet": "mkdaterangeiso{${1:datetype}}"
+    },
+    "mkdaterangeisoextra{}": {
+      "snippet": "mkdaterangeisoextra{${1:datetype}}"
+    },
+    "mkdaterangelong{}": {
+      "snippet": "mkdaterangelong{${1:datetype}}"
+    },
+    "mkdaterangelongextra{}": {
+      "snippet": "mkdaterangelongextra{${1:datetype}}"
+    },
+    "mkdaterangeshort{}": {
+      "snippet": "mkdaterangeshort{${1:datetype}}"
+    },
+    "mkdaterangeshortextra{}": {
+      "snippet": "mkdaterangeshortextra{${1:datetype}}"
+    },
+    "mkdaterangeterse{}": {
+      "snippet": "mkdaterangeterse{${1:datetype}}"
+    },
+    "mkdaterangeterseextra{}": {
+      "snippet": "mkdaterangeterseextra{${1:datetype}}"
+    },
+    "mkdaterangetrunc{}{}": {
+      "snippet": "mkdaterangetrunc{${1:short|long}}{${2:datetype}}"
+    },
+    "mkdaterangetruncextra{}{}": {
+      "snippet": "mkdaterangetruncextra{${1:short|long}}{${2:datetype}}"
+    },
+    "mkdaterangeyear{}": {
+      "snippet": "mkdaterangeyear{${1:datetype}}"
+    },
+    "mkdaterangeyearextra{}": {
+      "snippet": "mkdaterangeyearextra{${1:datetype}}"
+    },
+    "mkdaterangeymd{}": {
+      "snippet": "mkdaterangeymd{${1:datetype}}"
+    },
+    "mkdaterangeymdextra{}": {
+      "snippet": "mkdaterangeymdextra{${1:datetype}}"
+    },
+    "mkrelatedstringtext{}": {
+      "snippet": "mkrelatedstringtext{${1:text}}"
+    },
+    "mktimehh{}": {
+      "snippet": "mktimehh{${1:number}}"
+    },
+    "multivolcitecmd": {},
+    "shorthandwidth": {},
+    "shortjournalwidth": {},
+    "shortserieswidth": {},
+    "subentryoperator": {},
+    "thetextcitecount": {},
+    "thetextcitemaxnames": {},
+    "thetextcitetotal": {},
+    "volcitecmd": {},
+    "Fnotecite[]{}": {
+      "snippet": "Fnotecite[${2:postnote}]{${1:bibid}}"
+    },
+    "Fnotecite[][]{}": {
+      "snippet": "Fnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Fnotecite{}": {
+      "snippet": "Fnotecite{${1:bibid}}"
+    },
+    "Footcite[]{}": {
+      "snippet": "Footcite[${2:postnote}]{${1:bibid}}"
+    },
+    "Footcite[][]{}": {
+      "snippet": "Footcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Footcite{}": {
+      "snippet": "Footcite{${1:bibid}}"
+    },
+    "Footcites()()[][]{}[][]{}": {
+      "snippet": "Footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Footcites()()[]{}[]{}": {
+      "snippet": "Footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Footcites()(){}{}": {
+      "snippet": "Footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Footcites(){}{}": {
+      "snippet": "Footcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Footcites[][]{}[][]{}": {
+      "snippet": "Footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Footcites[]{}[]{}": {
+      "snippet": "Footcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Footcites{}{}": {
+      "snippet": "Footcites{${1:bibid}}{${2:bibid}}"
+    },
+    "Footcitetext[]{}": {
+      "snippet": "Footcitetext[${2:postnote}]{${1:bibid}}"
+    },
+    "Footcitetext[][]{}": {
+      "snippet": "Footcitetext[${2:prenote}][${3:postnote}]{${1:bibid}}"
+    },
+    "Footcitetext{}": {
+      "snippet": "Footcitetext{${1:bibid}}"
+    },
+    "Footcitetexts(){}{}": {
+      "snippet": "Footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Footcitetexts()()[]{}[]{}": {
+      "snippet": "Footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Footcitetexts()()[][]{}[][]{}": {
+      "snippet": "Footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Footcitetexts()(){}{}": {
+      "snippet": "Footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "Footcitetexts[]{}[]{}": {
+      "snippet": "Footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
+    "Footcitetexts[][]{}[][]{}": {
+      "snippet": "Footcitetexts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "Footcitetexts{}{}": {
+      "snippet": "Footcitetexts{${1:bibid}}{${2:bibid}}"
+    },
+    "origbibsetup": {
+      "option": "style=abnt-numeric"
+    },
+    "FirstWordUpper{}": {
+      "snippet": "FirstWordUpper{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "FirstWordSC{}": {
+      "snippet": "FirstWordSC{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "FirstWordLCSC{}": {
+      "snippet": "FirstWordLCSC{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "traceparam{}": {
+      "snippet": "traceparam{${1:arg}}",
+      "option": "style=abnt-numeric"
+    },
+    "paramL": {
+      "option": "style=abnt-numeric"
+    },
+    "traceparamA": {
+      "option": "style=abnt-numeric"
+    },
+    "traceparamB": {
+      "option": "style=abnt-numeric"
+    },
+    "traceparamS": {
+      "option": "style=abnt-numeric"
+    },
+    "traceparamC{}": {
+      "snippet": "traceparamC{${1:arg}}",
+      "option": "style=abnt-numeric"
+    },
+    "traceparamD{}": {
+      "snippet": "traceparamD{${1:arg}}",
+      "option": "style=abnt-numeric"
+    },
+    "traceparamE": {
+      "option": "style=abnt-numeric"
+    },
+    "smartuppercase{}": {
+      "snippet": "smartuppercase{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "smartlowercase{}": {
+      "snippet": "smartlowercase{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "smartlcsc{}": {
+      "snippet": "smartlcsc{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "smartsc{}": {
+      "snippet": "smartsc{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "UpperOrSC{}": {
+      "snippet": "UpperOrSC{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "NormalOrSC{}": {
+      "snippet": "NormalOrSC{${1:text}}",
+      "option": "style=abnt-numeric"
+    },
+    "iffieldregex{}{}{}{}": {
+      "snippet": "iffieldregex{${1:field}}{${2:regex}}{${3:true}}{${4:false}}",
+      "option": "style=abnt-numeric"
+    },
+    "iffieldendswithpunct{}{}{}": {
+      "snippet": "iffieldendswithpunct{${1:field}}{${2:true}}{${3:false}}",
+      "option": "style=abnt-numeric"
+    },
+    "IfGivenIsInitial{}{}": {
+      "snippet": "IfGivenIsInitial{${1:arg1}}{${2:arg2}}",
+      "option": "style=abnt-numeric"
+    },
+    "multinamedelimorig": {
+      "option": "style=abnt-numeric"
+    },
+    "finalnamedelimorig": {
+      "option": "style=abnt-numeric"
+    },
+    "abntnum{}": {
+      "snippet": "abntnum{${1:number}}",
+      "option": "style=abnt-numeric"
+    },
+    "bibnameunderscore": {
+      "option": "style=abnt-numeric"
+    },
+    "nopunctdash": {
+      "option": "style=abnt-numeric"
+    },
+    "UpperOrSCCite{}": {
+      "snippet": "UpperOrSCCite{${1:text}}",
+      "option": "style=abnt-ibid"
+    },
+    "NormalOrSCCite{}": {
+      "snippet": "NormalOrSCCite{${1:text}}",
+      "option": "style=abnt-ibid"
+    },
+    "IfGivenIsInit{}{}": {
+      "snippet": "IfGivenIsInit{${1:arg1}}{${2:arg2}}",
+      "option": "style=abnt"
+    },
+    "origmkbibnamefamily": {
+      "option": "style=abnt-ibid"
+    },
+    "origmkbibnamegiven": {
+      "option": "style=abnt-ibid"
+    },
+    "origmkbibnameprefix": {
+      "option": "style=abnt-ibid"
+    },
+    "origmkbibnamesuffix": {
+      "option": "style=abnt-ibid"
+    },
+    "FirstWord{}": {
+      "snippet": "FirstWord{${1:text}}",
+      "option": "style=abnt"
+    },
+    "addapud": {
+      "option": "style=abnt-ibid"
+    },
+    "apud{}{}": {
+      "snippet": "apud{${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud(){}{}": {
+      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud()(){}{}": {
+      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud()()[]{}[]{}": {
+      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud[]{}[]{}": {
+      "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud[][]{}[][]{}": {
+      "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "apud()()[][]{}[][]{}": {
+      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=abnt-ibid"
+    },
+    "plaincite[][]{}": {
+      "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "plaincite[]{}": {
+      "snippet": "plaincite[${2:postnote}]{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "plaincite{}": {
+      "snippet": "plaincite{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "citelastname[][]{}": {
+      "snippet": "citelastname[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "citelastname[]{}": {
+      "snippet": "citelastname[${2:postnote}]{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "citelastname{}": {
+      "snippet": "citelastname{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "textapud{}{}": {
+      "snippet": "textapud{${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt"
+    },
+    "textapud{}[]{}": {
+      "snippet": "textapud{${1:bibid}}[${2:post}]{${3:bibid}}",
+      "option": "style=abnt"
+    },
+    "textapud[]{}{}": {
+      "snippet": "textapud[${3:post}]{${1:bibid}}{${2:bibid}}",
+      "option": "style=abnt"
+    },
+    "textapud[]{}[]{}": {
+      "snippet": "textapud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=abnt"
+    },
+    "textapud[][]{}[][]{}": {
+      "snippet": "textapud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=abnt"
+    },
+    "citeyearorsh*[][]{}": {
+      "snippet": "citeyearorsh*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "citeyearorsh*[]{}": {
+      "snippet": "citeyearorsh*[${2:postnote}]{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "citeyearorsh*{}": {
+      "snippet": "citeyearorsh*{${1:bibid}}",
+      "option": "style=abnt"
+    },
+    "IfInitial{}{}{}": {
+      "snippet": "IfInitial{${1:arg1}}{${2:arg2}}{${3:arg3}}",
+      "option": "style=abnt-ibid"
+    },
+    "mkidem{}": {
+      "snippet": "mkidem{${1:arg}}",
+      "option": "style=biblatex-juradiss"
+    },
+    "mkibid{}": {
+      "snippet": "mkibid{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkopcit{}": {
+      "snippet": "mkopcit{${1:arg}}",
+      "option": "style=abnt-ibid"
+    },
+    "mkloccit{}": {
+      "snippet": "mkloccit{${1:arg}}",
+      "option": "style=abnt-ibid"
+    },
+    "newcommaunit": {
+      "option": "style=trad-unsrt"
+    },
+    "newcommaunit*": {
+      "option": "style=trad-unsrt"
+    },
+    "newcommaunitStar": {
+      "option": "style=trad-unsrt"
+    },
+    "newcommaunitNoStar": {
+      "option": "style=trad-unsrt"
+    },
+    "volumenumberdelim": {
+      "option": "style=trad-unsrt"
+    },
+    "archDate": {
+      "option": "style=archaeologie"
+    },
+    "archVersion": {
+      "option": "style=archaeologie"
+    },
+    "archaeologieversion": {
+      "option": "style=archaeologie"
+    },
+    "archaeologiedate": {
+      "option": "style=archaeologie"
+    },
+    "labwidthsameline": {
+      "option": "style=arthistory-bonn"
+    },
+    "labwidthsamelineVALUE": {
+      "option": "style=archaeologie"
+    },
+    "archaeologieoptions": {
+      "option": "style=archaeologie"
+    },
+    "seperator": {
+      "option": "style=archaeologie"
+    },
+    "maintitlepunct": {
+      "option": "style=archaeologie"
+    },
+    "locationdelim": {
+      "option": "style=archaeologie"
+    },
+    "relateddelimmultivolume": {
+      "option": "style=archaeologie"
+    },
+    "volnumdelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "yearnumdelim": {
+      "option": "style=archaeologie"
+    },
+    "jourvoldelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "bibdatesubseqesep": {
+      "option": "style=archaeologie"
+    },
+    "bibdaterangesepx{}": {
+      "snippet": "bibdaterangesepx{${1:arg}}",
+      "option": "style=archaeologie"
+    },
+    "labelyeardelim": {
+      "option": "style=archaeologie"
+    },
+    "citeauthorformatVALUE": {
+      "option": "style=archaeologie"
+    },
+    "citetranslator[][]{}": {
+      "snippet": "citetranslator[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=archaeologie"
+    },
+    "citetranslator[]{}": {
+      "snippet": "citetranslator[${2:postnote}]{${1:bibid}}",
+      "option": "style=archaeologie"
+    },
+    "citetranslator{}": {
+      "snippet": "citetranslator{${1:bibid}}",
+      "option": "style=archaeologie"
+    },
+    "citetranslator*[][]{}": {
+      "snippet": "citetranslator*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=archaeologie"
+    },
+    "citetranslator*[]{}": {
+      "snippet": "citetranslator*[${2:postnote}]{${1:bibid}}",
+      "option": "style=archaeologie"
+    },
+    "citetranslator*{}": {
+      "snippet": "citetranslator*{${1:bibid}}",
+      "option": "style=archaeologie"
+    },
+    "archaeobibstyletitle": {
+      "option": "style=zaes"
+    },
+    "archaeocitestyletitle": {
+      "option": "style=zaes"
+    },
+    "ifuselabeltitle{}{}": {
+      "snippet": "ifuselabeltitle{${1:true}}{${2:false}}",
+      "option": "style=ufg-muenster-verbose"
+    },
+    "foreverunspace": {
+      "option": "style=apa"
+    },
+    "printtexte{}": {
+      "snippet": "printtexte{${1:text}}",
+      "option": "style=apa"
+    },
+    "printtexte[]{}": {
+      "snippet": "printtexte[${2:format}]{${1:text}}",
+      "option": "style=apa"
+    },
+    "maxprtauth": {
+      "option": "style=apa6"
+    },
+    "apanum{}": {
+      "snippet": "apanum{${1:arg}}",
+      "option": "style=apa6"
+    },
+    "mkdaterangeapalong{}": {
+      "snippet": "mkdaterangeapalong{${1:arg}}",
+      "option": "style=apa6"
+    },
+    "mkdaterangeapalongextra{}": {
+      "snippet": "mkdaterangeapalongextra{${1:arg}}",
+      "option": "style=apa6"
+    },
+    "begrelateddelimcommenton": {
+      "option": "style=apa"
+    },
+    "begrelateddelimreviewof": {
+      "option": "style=apa6"
+    },
+    "begrelateddelimreprintfrom": {
+      "option": "style=apa"
+    },
+    "urldatecomma": {
+      "option": "style=apa"
+    },
+    "apashortdash": {
+      "option": "style=apa6"
+    },
+    "citeresetapa": {
+      "option": "style=apa6"
+    },
+    "fullcitebib[][]{}": {
+      "snippet": "fullcitebib[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=apa6"
+    },
+    "fullcitebib[]{}": {
+      "snippet": "fullcitebib[${2:postnote}]{${1:bibid}}",
+      "option": "style=apa6"
+    },
+    "fullcitebib{}": {
+      "snippet": "fullcitebib{${1:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcite[][]{}": {
+      "snippet": "nptextcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcite[]{}": {
+      "snippet": "nptextcite[${2:postnote}]{${1:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcite{}": {
+      "snippet": "nptextcite{${1:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites{}{}": {
+      "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites[]{}[]{}": {
+      "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites[][]{}[][]{}": {
+      "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=apa6"
+    },
+    "arthistoryversion": {
+      "option": "style=arthistory-bonn"
+    },
+    "arthistorydate": {
+      "option": "style=arthistory-bonn"
+    },
+    "titleaddondelim": {
+      "option": "style=arthistory-bonn"
+    },
+    "volissuedelim": {
+      "option": "style=arthistory-bonn"
+    },
+    "exhibbibdaterangesep": {
+      "option": "style=arthistory-bonn"
+    },
+    "Version": {
+      "option": "style=oxnum"
+    },
+    "dononameyeardelim": {
+      "option": "style=bath"
+    },
+    "mknoyeardaterangefull{}{}": {
+      "snippet": "mknoyeardaterangefull{${1:arg1}}{${2:arg2}}",
+      "option": "style=oxyear"
+    },
+    "mknoyeardaterangetrunc{}{}": {
+      "snippet": "mknoyeardaterangetrunc{${1:arg1}}{${2:arg2}}",
+      "option": "style=oxyear"
+    },
+    "ifrelatedloop{}{}": {
+      "snippet": "ifrelatedloop{${1:true}}{${2:false}}",
+      "option": "style=bath"
+    },
+    "mkbibnocomma{}": {
+      "snippet": "mkbibnocomma{${1:arg}}",
+      "option": "style=chem-angew"
+    },
+    "mkbibsuperbracket{}": {
+      "snippet": "mkbibsuperbracket{${1:text}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "mkgroupeddigits{}": {
+      "snippet": "mkgroupeddigits{${1:arg}}",
+      "option": "style=chem-rsc"
+    },
+    "AddBiblatexClavis{}": {
+      "snippet": "AddBiblatexClavis{${1:abbrev}}",
+      "option": "bibstyle=claves"
+    },
+    "multiclavesseparator": {
+      "option": "bibstyle=claves"
+    },
+    "clavisseparator": {
+      "option": "bibstyle=claves"
+    },
+    "clavisformat{}": {
+      "snippet": "clavisformat{${1:text}}",
+      "option": "bibstyle=claves"
+    },
+    "citeallclaves": {
+      "option": "bibstyle=claves"
+    },
+    "clavesadddashinset": {
+      "option": "bibstyle=claves"
+    },
+    "shorthandsep": {
+      "option": "style=biblatex-juradiss"
+    },
+    "jourvolstring": {
+      "option": "style=biblatex-juradiss"
+    },
+    "jourvolnumsep": {
+      "option": "style=biblatex-juradiss"
+    },
+    "journumstring": {
+      "option": "style=biblatex-juradiss"
+    },
+    "seriespunct": {
+      "option": "style=biblatex-juradiss"
+    },
+    "sernumstring": {
+      "option": "style=biblatex-juradiss"
+    },
+    "shorthandpunct": {
+      "option": "style=biblatex-juradiss"
+    },
+    "shorthandinbibpunct": {
+      "option": "style=biblatex-juradiss"
+    },
+    "titleaddonpunct": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "locationdatepunct": {
+      "option": "style=biblatex-juradiss"
+    },
+    "locationpublisherpunct": {
+      "option": "style=biblatex-juradiss"
+    },
+    "publisherdatepunct": {
+      "option": "style=biblatex-juradiss"
+    },
+    "origfieldspunct": {
+      "option": "style=biblatex-juradiss"
+    },
+    "bibleftpseudo": {
+      "option": "style=biblatex-juradiss"
+    },
+    "bibrightpseudo": {
+      "option": "style=biblatex-juradiss"
+    },
+    "bibrevsdnamedelim": {
+      "option": "style=biblatex-juradiss"
+    },
+    "bibmultinamedelim": {
+      "option": "style=biblatex-juradiss"
+    },
+    "bibfinalnamedelim": {
+      "option": "style=biblatex-juradiss"
+    },
+    "annotationfont": {
+      "option": "style=philosophy-verbose"
+    },
+    "libraryfont": {
+      "option": "style=philosophy-verbose"
+    },
+    "citenamepunct": {
+      "option": "style=footnote-dw"
+    },
+    "citerevsdnamedelim": {
+      "option": "style=footnote-dw"
+    },
+    "citemultinamedelim": {
+      "option": "style=footnote-dw"
+    },
+    "citefinalnamedelim": {
+      "option": "style=footnote-dw"
+    },
+    "textcitesdelim": {
+      "option": "style=footnote-dw"
+    },
+    "titleyeardelim": {
+      "option": "style=authortitle-dw"
+    },
+    "mkfootnotecite{}": {
+      "snippet": "mkfootnotecite{${1:arg}}",
+      "option": "style=footnote-dw"
+    },
+    "mkparencite{}": {
+      "snippet": "mkparencite{${1:arg}}",
+      "option": "style=footnote-dw"
+    },
+    "footnotecheck": {
+      "option": "style=footnote-dw"
+    },
+    "thebibitem": {
+      "option": "style=enc"
+    },
+    "thelositem": {
+      "option": "style=enc"
+    },
+    "mkoutercitedelims{}": {
+      "snippet": "mkoutercitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkinnercitedelims{}": {
+      "snippet": "mkinnercitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkouterparencitedelims{}": {
+      "snippet": "mkouterparencitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkinnerparencitedelims{}": {
+      "snippet": "mkinnerparencitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkoutertextcitedelims{}": {
+      "snippet": "mkoutertextcitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkinnertextcitedelims{}": {
+      "snippet": "mkinnertextcitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkouterfootcitedelims{}": {
+      "snippet": "mkouterfootcitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkinnerfootcitedelims{}": {
+      "snippet": "mkinnerfootcitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkoutersupercitedelims{}": {
+      "snippet": "mkoutersupercitedelims{${1:arg}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "namenumberdelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "nonamenumberdelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "innametitledelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "extradateonlycompcitedelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "extradateonlycompciterangedelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "extranameonlycompcitedelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "extranameonlycompciterangedelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "DeclareOuterCiteDelims{}{}{}": {
+      "snippet": "DeclareOuterCiteDelims{${1:cite cmd}}{${2:open delim}}{${3:close delim}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "DeclareInnerCiteDelims{}{}{}": {
+      "snippet": "DeclareInnerCiteDelims{${1:cite cmd}}{${2:open delim}}{${3:close delim}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "UndeclareOuterCiteDelims{}": {
+      "snippet": "UndeclareOuterCiteDelims{${1:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "UndeclareInnerCiteDelims{}": {
+      "snippet": "UndeclareInnerCiteDelims{${1:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "UndeclareCiteDelims{}": {
+      "snippet": "UndeclareCiteDelims{${1:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "DeclareOuterCiteDelimsAlias{}{}": {
+      "snippet": "DeclareOuterCiteDelimsAlias{${1:cite alias}}{${2:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "DeclareOuterCiteDelimsAlias*{}{}": {
+      "snippet": "DeclareOuterCiteDelimsAlias*{${1:cite alias}}{${2:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "DeclareInnerCiteDelimsAlias{}{}": {
+      "snippet": "DeclareInnerCiteDelimsAlias{${1:cite alias}}{${2:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "DeclareInnerCiteDelimsAlias*{}{}": {
+      "snippet": "DeclareInnerCiteDelimsAlias*{${1:cite alias}}{${2:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "RegisterCiteDelims{}{}": {
+      "snippet": "RegisterCiteDelims{${1:modifier}}{${2:cite cmd}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkextblxsupercite{}": {
+      "snippet": "mkextblxsupercite{${1:text}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkextblxfootcite{}": {
+      "snippet": "mkextblxfootcite{${1:text}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkextblxfootcitetext{}": {
+      "snippet": "mkextblxfootcitetext{${1:text}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "mksmartcite{}": {
+      "snippet": "mksmartcite{${1:text}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "introcitepunct": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "introcitebreak": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "introcitewidth": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "introcitesep": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "AtIntrocite{}": {
+      "snippet": "AtIntrocite{${1:code}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "AtIntrocite*{}": {
+      "snippet": "AtIntrocite*{${1:code}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "AtXrefcite{}": {
+      "snippet": "AtXrefcite{${1:code}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "AtXrefcite*{}": {
+      "snippet": "AtXrefcite*{${1:code}}",
+      "option": "style=socialscienceshuberlin"
+    },
+    "titlemaintitledelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "maintitletitledelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "voltitledelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "jourserdelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "servoldelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "volnumdatedelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "sernumdelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "locdatedelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "locpubdelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "publocdelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "pubdatedelim": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "filmruntime": {
+      "option": "style=fiwi2"
+    },
+    "nopublisher": {
+      "option": "style=oscola"
+    },
+    "noseries": {
+      "option": "style=fiwi2"
+    },
+    "nociteprefix": {
+      "option": "style=fiwi2"
+    },
+    "ignoreaddendumtrue": {
+      "option": "style=fiwi2"
+    },
+    "ignoreaddendumfalse": {
+      "option": "style=fiwi2"
+    },
+    "ignoreforewordtrue": {
+      "option": "style=fiwi2"
+    },
+    "ignoreforewordfalse": {
+      "option": "style=fiwi2"
+    },
+    "ignoreafterwordtrue": {
+      "option": "style=fiwi2"
+    },
+    "ignoreafterwordfalse": {
+      "option": "style=fiwi2"
+    },
+    "ignoreintroductiontrue": {
+      "option": "style=fiwi2"
+    },
+    "ignoreintroductionfalse": {
+      "option": "style=fiwi2"
+    },
+    "ignorepublisherfalse": {
+      "option": "style=fiwi2"
+    },
+    "ignorepublishertrue": {
+      "option": "style=fiwi2"
+    },
+    "ignoreaddresstrue": {
+      "option": "style=fiwi2"
+    },
+    "ignoreaddressfalse": {
+      "option": "style=fiwi2"
+    },
+    "ignorelocationtrue": {
+      "option": "style=fiwi2"
+    },
+    "ignorelocationfalse": {
+      "option": "style=fiwi2"
+    },
+    "ifpseudo{}{}": {
+      "snippet": "ifpseudo{${1:true}}{${2:false}}",
+      "option": "style=fiwi2"
+    },
+    "mkfinalnamedelimfirst{}": {
+      "snippet": "mkfinalnamedelimfirst{${1:text}}",
+      "option": "style=fiwi2"
+    },
+    "film{}": {
+      "snippet": "film{${1:text}}",
+      "option": "style=fiwi2"
+    },
+    "fullcitefilm": {
+      "option": "style=fiwi2"
+    },
+    "completecitefilm": {
+      "option": "style=fiwi2"
+    },
+    "sortentry{}": {
+      "snippet": "sortentry{${1:arg}}",
+      "option": "style=fiwi2"
+    },
+    "xindy": {
+      "option": "style=fiwi2"
+    },
+    "citets{}{}": {
+      "snippet": "citets{${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets(){}{}": {
+      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets()(){}{}": {
+      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets()()[]{}[]{}": {
+      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets[]{}[]{}": {
+      "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets[][]{}[][]{}": {
+      "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "citets()()[][]{}[][]{}": {
+      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-author-year"
+    },
+    "Citets{}{}": {
+      "snippet": "Citets{${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets(){}{}": {
+      "snippet": "Citets(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets()(){}{}": {
+      "snippet": "Citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets()()[]{}[]{}": {
+      "snippet": "Citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets[]{}[]{}": {
+      "snippet": "Citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets[][]{}[][]{}": {
+      "snippet": "Citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citets()()[][]{}[][]{}": {
+      "snippet": "Citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts{}{}": {
+      "snippet": "citealts{${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts(){}{}": {
+      "snippet": "citealts(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts()(){}{}": {
+      "snippet": "citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts()()[]{}[]{}": {
+      "snippet": "citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts[]{}[]{}": {
+      "snippet": "citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts[][]{}[][]{}": {
+      "snippet": "citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealts()()[][]{}[][]{}": {
+      "snippet": "citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts{}{}": {
+      "snippet": "Citealts{${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts(){}{}": {
+      "snippet": "Citealts(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts()(){}{}": {
+      "snippet": "Citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts()()[]{}[]{}": {
+      "snippet": "Citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts[]{}[]{}": {
+      "snippet": "Citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts[][]{}[][]{}": {
+      "snippet": "Citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "Citealts()()[][]{}[][]{}": {
+      "snippet": "Citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "mkbibindextruename{}{}{}{}": {
+      "snippet": "mkbibindextruename{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}",
+      "option": "style=fiwi2"
+    },
+    "inparencite{}": {
+      "snippet": "inparencite{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "inparencite[]{}": {
+      "snippet": "inparencite[${2:postnote}]{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "inparencite[][]{}": {
+      "snippet": "inparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealtnoibidem{}": {
+      "snippet": "citealtnoibidem{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealtnoibidem[]{}": {
+      "snippet": "citealtnoibidem[${2:postnote}]{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citealtnoibidem[][]{}": {
+      "snippet": "citealtnoibidem[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citetnoibidem{}": {
+      "snippet": "citetnoibidem{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citetnoibidem[]{}": {
+      "snippet": "citetnoibidem[${2:postnote}]{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citetnoibidem[][]{}": {
+      "snippet": "citetnoibidem[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citeepisode{}": {
+      "snippet": "citeepisode{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citefilm{}": {
+      "snippet": "citefilm{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citecfilm{}": {
+      "snippet": "citecfilm{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citefullfilm{}": {
+      "snippet": "citefullfilm{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "citefilmnoindex{}": {
+      "snippet": "citefilmnoindex{${1:bibid}}",
+      "option": "style=fiwi2"
+    },
+    "versionofgbtstyle": {
+      "option": "style=thuthesis-numeric"
+    },
+    "versionofbiblatex": {
+      "option": "style=thuthesis-numeric"
+    },
+    "defversion{}{}{}": {
+      "snippet": "defversion{${1:arg1}}{${2:arg2}}{${3:arg3}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "switchversion{}{}": {
+      "snippet": "switchversion{${1:arg1}}{${2:arg2}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "testCJKfirst{}": {
+      "snippet": "testCJKfirst{${1:field}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "multivolparser{}": {
+      "snippet": "multivolparser{${1:arg}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "multinumberparser{}": {
+      "snippet": "multinumberparser{${1:arg}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "BracketLift": {
+      "option": "style=chinese-erj"
+    },
+    "gbleftparen": {
+      "option": "style=chinese-erj"
+    },
+    "gbrightparen": {
+      "option": "style=chinese-erj"
+    },
+    "gbleftbracket": {
+      "option": "style=chinese-erj"
+    },
+    "gbrightbracket": {
+      "option": "style=chinese-erj"
+    },
+    "execgbfootbibfmt": {
+      "option": "style=chinese-erj"
+    },
+    "SlashFont": {
+      "option": "style=chinese-erj"
+    },
+    "footbibmargin": {
+      "option": "style=thuthesis-numeric"
+    },
+    "footbiblabelsep": {
+      "option": "style=thuthesis-numeric"
+    },
+    "execgbfootbib": {
+      "option": "style=thuthesis-numeric"
+    },
+    "thegbnamefmtcase": {
+      "option": "style=thuthesis-numeric"
+    },
+    "mkgbnumlabel{}": {
+      "snippet": "mkgbnumlabel{${1:arg}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "thegbalignlabel": {
+      "option": "style=thuthesis-numeric"
+    },
+    "thegbcitelocalcase": {
+      "option": "style=thuthesis-numeric"
+    },
+    "thegbbiblocalcase": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lancnorder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lanjporder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lankrorder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lanenorder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lanfrorder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lanruorder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "execlanodeah": {
+      "option": "style=thuthesis-numeric"
+    },
+    "thelanordernum": {
+      "option": "style=thuthesis-numeric"
+    },
+    "execlanodudf{}": {
+      "snippet": "execlanodudf{${1:string}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "setlocalbibstring{}{}": {
+      "snippet": "setlocalbibstring{${1:string}}{${2:text}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "setlocalbiblstring{}{}": {
+      "snippet": "setlocalbiblstring{${1:string}}{${2:text}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "dealsortlan": {
+      "option": "style=thuthesis-numeric"
+    },
+    "bibitemindent": {
+      "option": "style=thuthesis-numeric"
+    },
+    "biblabelextend": {
+      "option": "style=thuthesis-numeric"
+    },
+    "setaligngbstyle": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lengthid": {
+      "option": "style=thuthesis-numeric"
+    },
+    "lengthlw": {
+      "option": "style=thuthesis-numeric"
+    },
+    "itemcmd": {
+      "option": "style=thuthesis-numeric"
+    },
+    "setaligngbstyleay": {
+      "option": "style=thuthesis-numeric"
+    },
+    "publocpunct": {
+      "option": "style=thuthesis-numeric"
+    },
+    "bibtitlefont": {
+      "option": "style=thuthesis-numeric"
+    },
+    "bibauthorfont": {
+      "option": "style=thuthesis-numeric"
+    },
+    "bibpubfont": {
+      "option": "style=thuthesis-numeric"
+    },
+    "execgbfdfmtstd": {
+      "option": "style=thuthesis-numeric"
+    },
+    "aftertransdelim": {
+      "option": "style=thuthesis-numeric"
+    },
+    "gbcaselocalset": {
+      "option": "style=thuthesis-numeric"
+    },
+    "gbpinyinlocalset": {
+      "option": "style=thuthesis-numeric"
+    },
+    "gbquanpinlocalset": {
+      "option": "style=thuthesis-numeric"
+    },
+    "defdoublelangentry{}{}": {
+      "snippet": "defdoublelangentry{${1:entrykey1}}{${2:entrykey2}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "addEntryField{}{}{}": {
+      "snippet": "addEntryField{${1:entrykeys}}{${2:field}}{${3:fieldvalue}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "entrykeya": {
+      "option": "style=thuthesis-numeric"
+    },
+    "entrykeyb": {
+      "option": "style=thuthesis-numeric"
+    },
+    "userfieldabcde": {
+      "option": "style=thuthesis-numeric"
+    },
+    "mkbibleftborder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "mkbibrightborder": {
+      "option": "style=thuthesis-numeric"
+    },
+    "mkbibsuperscriptusp{}": {
+      "snippet": "mkbibsuperscriptusp{${1:text}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "upcite{}": {
+      "snippet": "upcite{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "upcite[]{}": {
+      "snippet": "upcite[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "upcite[][]{}": {
+      "snippet": "upcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "pagescite{}": {
+      "snippet": "pagescite{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "pagescite[]{}": {
+      "snippet": "pagescite[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "pagescite[][]{}": {
+      "snippet": "pagescite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "yearpagescite{}": {
+      "snippet": "yearpagescite{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "yearpagescite[]{}": {
+      "snippet": "yearpagescite[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "yearpagescite[][]{}": {
+      "snippet": "yearpagescite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "yearcite{}": {
+      "snippet": "yearcite{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "yearcite[]{}": {
+      "snippet": "yearcite[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "yearcite[][]{}": {
+      "snippet": "yearcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcite{}": {
+      "snippet": "authornumcite{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcite[]{}": {
+      "snippet": "authornumcite[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcite[][]{}": {
+      "snippet": "authornumcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citetns{}": {
+      "snippet": "citetns{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citetns[]{}": {
+      "snippet": "citetns[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citetns[][]{}": {
+      "snippet": "citetns[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citepns{}": {
+      "snippet": "citepns{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citepns[]{}": {
+      "snippet": "citepns[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citepns[][]{}": {
+      "snippet": "citepns[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "inlinecite{}": {
+      "snippet": "inlinecite{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "inlinecite[]{}": {
+      "snippet": "inlinecite[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "inlinecite[][]{}": {
+      "snippet": "inlinecite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citec{}": {
+      "snippet": "citec{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citec[]{}": {
+      "snippet": "citec[${2:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citec[][]{}": {
+      "snippet": "citec[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs{}{}": {
+      "snippet": "citecs{${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs[]{}[]{}": {
+      "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs[][]{}[][]{}": {
+      "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites{}{}": {
+      "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites[]{}[]{}": {
+      "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites[][]{}[][]{}": {
+      "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=thuthesis-numeric"
+    },
+    "dealnoathor": {
+      "option": "style=thuthesis-author-year"
+    },
+    "therefnumeric": {
+      "option": "style=thuthesis-author-year"
+    },
+    "biblabelbox": {
+      "option": "style=gb7714-2015ay"
+    },
+    "setaligngbnumeric": {
+      "option": "style=thuthesis-author-year"
+    },
+    "pubdatadelim": {
+      "option": "style=thuthesis-numeric"
+    },
+    "locnopubdelim": {
+      "option": "style=chinese-erj"
+    },
+    "compextradelim": {
+      "option": "style=thuthesis-author-year"
+    },
+    "localsetchinesecode": {
+      "option": "style=gb7714-2015ms"
+    },
+    "setaystylesection{}": {
+      "snippet": "setaystylesection{${1:number}}",
+      "option": "style=gb7714-2015mx"
+    },
+    "gbpunctdot": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctdotlanen": {
+      "option": "style=gb7714-CCNU"
+    },
+    "gbpunctmark": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctcomma": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctcommalanen": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctcolon": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctcolonlanen": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctsemicolon": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctsemicolonlanen": {
+      "option": "style=gb7714-CCNU"
+    },
+    "gbpunctparenl": {
+      "option": "style=gb7714-CCNU"
+    },
+    "gbpunctparenr": {
+      "option": "style=gb7714-CCNU"
+    },
+    "execpuncten": {
+      "option": "style=gb7714-CCNU"
+    },
+    "nwafubibfont": {
+      "option": "style=gb7714-NWAFU"
+    },
+    "gbpunctttl": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctttr": {
+      "option": "style=chinese-erj"
+    },
+    "execerjpuncten": {
+      "option": "style=chinese-erj"
+    },
+    "thenumberwithoutzero": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctmarkcite": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctsemicoloncite": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctparenlcite": {
+      "option": "style=chinese-erj"
+    },
+    "gbpunctparenrcite": {
+      "option": "style=chinese-erj"
+    },
+    "exegbpunctencite": {
+      "option": "style=chinese-erj"
+    },
+    "commentator{}": {
+      "snippet": "commentator{${1:bibid}}",
+      "option": "style=german-legal-book"
+    },
+    "mkpagegrouped{}": {
+      "snippet": "mkpagegrouped{${1:text}}",
+      "option": "style=ieee-alphabetic"
+    },
+    "mkonepagegrouped{}": {
+      "snippet": "mkonepagegrouped{${1:text}}",
+      "option": "style=ieee-alphabetic"
+    },
+    "stdidentifierspunct": {
+      "option": "style=iso-numeric"
+    },
+    "dateaddonpunct": {
+      "option": "style=iso-numeric"
+    },
+    "numerationpunct": {
+      "option": "style=iso-numeric"
+    },
+    "addspacecolon": {
+      "option": "style=iso-numeric"
+    },
+    "familynameformat{}": {
+      "snippet": "familynameformat{${1:text}}",
+      "option": "style=iso-numeric"
+    },
+    "mainlangbibstring{}": {
+      "snippet": "mainlangbibstring{${1:string}}",
+      "option": "style=iso-numeric"
+    },
+    "mainlangbibstring[]{}": {
+      "snippet": "mainlangbibstring[${2:wrapper}]{${1:string}}",
+      "option": "style=iso-numeric"
+    },
+    "mainlangbiblstring{}": {
+      "snippet": "mainlangbiblstring{${1:string}}",
+      "option": "style=iso-numeric"
+    },
+    "mainlangbiblstring[]{}": {
+      "snippet": "mainlangbiblstring[${2:wrapper}]{${1:string}}",
+      "option": "style=iso-numeric"
+    },
+    "mainlangbibsstring{}": {
+      "snippet": "mainlangbibsstring{${1:string}}",
+      "option": "style=iso-numeric"
+    },
+    "mainlangbibsstring[]{}": {
+      "snippet": "mainlangbibsstring[${2:wrapper}]{${1:string}}",
+      "option": "style=iso-numeric"
+    },
+    "mkmlpagetotal{}": {
+      "snippet": "mkmlpagetotal{${1:text}}",
+      "option": "style=iso-numeric"
+    },
+    "mkmlpagetotal[]{}": {
+      "snippet": "mkmlpagetotal[${2:pagination}]{${1:text}}",
+      "option": "style=iso-numeric"
+    },
+    "mkmlpageprefix{}": {
+      "snippet": "mkmlpageprefix{${1:prefix}}",
+      "option": "style=iso-numeric"
+    },
+    "mkmlpageprefix[]{}": {
+      "snippet": "mkmlpageprefix[${2:pagination}]{${1:prefix}}",
+      "option": "style=iso-numeric"
+    },
+    "addspcolon": {
+      "option": "style=iso-numeric"
+    },
+    "mkopenendeddaterange": {
+      "option": "style=iso-numeric"
+    },
+    "ifdatehasyearonly{}{}": {
+      "snippet": "ifdatehasyearonly{${1:true}}{${2:false}}",
+      "option": "style=iso-authoryear"
+    },
+    "qverweis{}": {
+      "snippet": "qverweis{${1:label}}",
+      "option": "style=biblatex-juradiss"
+    },
+    "oldpostnotedelim": {
+      "option": "style=jura2"
+    },
+    "mkpostnote{}": {
+      "snippet": "mkpostnote{${1:arg}}",
+      "option": "style=jura2"
+    },
+    "LNIversion": {
+      "option": "style=LNI"
+    },
+    "LNIdate": {
+      "option": "style=LNI"
+    },
+    "aftertitledelim": {
+      "option": "style=LNI"
+    },
+    "shcite{}": {
+      "snippet": "shcite{${1:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "shcite[]{}": {
+      "snippet": "shcite[${2:postnote}]{${1:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "shcite[][]{}": {
+      "snippet": "shcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscite{}": {
+      "snippet": "detailscite{${1:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscite[]{}": {
+      "snippet": "detailscite[${2:postnote}]{${1:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscite[][]{}": {
+      "snippet": "detailscite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites{}{}": {
+      "snippet": "detailscites{${1:bibid}}{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites(){}{}": {
+      "snippet": "detailscites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites()(){}{}": {
+      "snippet": "detailscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites()()[]{}[]{}": {
+      "snippet": "detailscites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites[]{}[]{}": {
+      "snippet": "detailscites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites[][]{}[][]{}": {
+      "snippet": "detailscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "detailscites()()[][]{}[][]{}": {
+      "snippet": "detailscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "collectionshelfmarkpunct": {
+      "option": "style=oxnum"
+    },
+    "datingpagespunct": {
+      "option": "style=oxnum"
+    },
+    "librarycollectionpunct": {
+      "option": "style=oxnum"
+    },
+    "mkcolumns{}": {
+      "snippet": "mkcolumns{${1:text}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "mklayer{}": {
+      "snippet": "mklayer{${1:text}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "mkcolumnslayer{}": {
+      "snippet": "mkcolumnslayer{${1:text}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "mklocation{}": {
+      "snippet": "mklocation{${1:text}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "mkmanuscriptdescriptionlabel{}": {
+      "snippet": "mkmanuscriptdescriptionlabel{${1:text}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "mkmanuscriptdescriptionlabelparagraphed{}": {
+      "snippet": "mkmanuscriptdescriptionlabelparagraphed{${1:text}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "mkshcite{}": {
+      "snippet": "mkshcite{${1:text}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "locationlibrarypunct": {
+      "option": "style=oxnum"
+    },
+    "manuscriptdescriptionlabelpunct": {
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "moreinterpunct": {
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "pagetotalpagespunct": {
+      "option": "style=oxnum"
+    },
+    "columnslayerpunct": {
+      "option": "style=oxnum"
+    },
+    "multidetailscitedelim": {
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "recto": {
+      "option": "style=oxnum"
+    },
+    "verso": {
+      "option": "style=oxnum"
+    },
+    "manuscriptaddshortened{}": {
+      "snippet": "manuscriptaddshortened{${1:arg}}",
+      "option": "bibstyle=manuscripts-noautoshorthand"
+    },
+    "openrangeformat{}": {
+      "snippet": "openrangeformat{${1:arg}}",
+      "option": "style=mla-new"
+    },
+    "openrangemark": {
+      "option": "style=mla-new"
+    },
+    "mlanamedash": {
+      "option": "style=mla-new"
+    },
+    "splitfootnoterule": {
+      "option": "style=mla-new"
+    },
+    "pagefootnoterule": {
+      "option": "style=mla-new"
+    },
+    "mlasymbolfootnote": {
+      "option": "style=mla-new"
+    },
+    "themladraftnote": {
+      "option": "style=mla-new"
+    },
+    "headlesscite[][]{}": {
+      "snippet": "headlesscite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "headlesscite[]{}": {
+      "snippet": "headlesscite[${2:postnote}]{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "headlesscite{}": {
+      "snippet": "headlesscite{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "headlessfullcite[][]{}": {
+      "snippet": "headlessfullcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "headlessfullcite[]{}": {
+      "snippet": "headlessfullcite[${2:postnote}]{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "headlessfullcite{}": {
+      "snippet": "headlessfullcite{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "titleandsubtitle[][]{}": {
+      "snippet": "titleandsubtitle[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "titleandsubtitle[]{}": {
+      "snippet": "titleandsubtitle[${2:postnote}]{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "titleandsubtitle{}": {
+      "snippet": "titleandsubtitle{${1:bibid}}",
+      "option": "style=mla-new"
+    },
+    "biblatexnejmversionbbx": {
+      "option": "style=nejm"
+    },
+    "biblatexnejmpackagenamebbx": {
+      "option": "style=nejm"
+    },
+    "biblatexnejmsvnbbx": {
+      "option": "style=nejm"
+    },
+    "oldbibnamedelima": {
+      "option": "style=oscola"
+    },
+    "oldbibnamedelimb": {
+      "option": "style=oscola"
+    },
+    "oldbibnamedelimc": {
+      "option": "style=oscola"
+    },
+    "oldbibnamedelimd": {
+      "option": "style=oscola"
+    },
+    "oldbibnamedelimi": {
+      "option": "style=oscola"
+    },
+    "bbxinitsep": {
+      "option": "style=oscola"
+    },
+    "bibyearwatershed": {
+      "option": "style=oscola"
+    },
+    "nameaddonpseud": {
+      "option": "style=oscola"
+    },
+    "subtypemag": {
+      "option": "style=oscola"
+    },
+    "subtypenewsp": {
+      "option": "style=oxnum"
+    },
+    "subtypeclassic": {
+      "option": "style=oscola"
+    },
+    "subtypebiblical": {
+      "option": "style=oscola"
+    },
+    "subtypeearlybook": {
+      "option": "style=oscola"
+    },
+    "subtypevideo": {
+      "option": "style=oscola"
+    },
+    "entrytypearchive": {
+      "option": "style=oscola"
+    },
+    "subtypevolume": {
+      "option": "style=oscola"
+    },
+    "subtypeonline": {
+      "option": "style=oscola"
+    },
+    "subtypedatabase": {
+      "option": "style=oscola"
+    },
+    "subtypeblog": {
+      "option": "style=oscola"
+    },
+    "subtypelistmessage": {
+      "option": "style=oscola"
+    },
+    "subtypebooklike": {
+      "option": "style=oscola"
+    },
+    "subtypepublicdocument": {
+      "option": "style=oscola"
+    },
+    "authortypeanon": {
+      "option": "style=oscola"
+    },
+    "authortypeunsure": {
+      "option": "style=oscola"
+    },
+    "authortyperedundant": {
+      "option": "style=oscola"
+    },
+    "authortypealternate": {
+      "option": "style=oscola"
+    },
+    "authortypejournal": {
+      "option": "style=oscola"
+    },
+    "subtypeintro": {
+      "option": "style=oscola"
+    },
+    "subtypeexcerpt": {
+      "option": "style=oscola"
+    },
+    "subtypenone": {
+      "option": "style=oscola"
+    },
+    "edtypecorp": {
+      "option": "style=oscola"
+    },
+    "entrytypeper": {
+      "option": "style=oscola"
+    },
+    "entrytypemanual": {
+      "option": "style=oscola"
+    },
+    "entrytypecoll": {
+      "option": "style=oscola"
+    },
+    "entrytypebook": {
+      "option": "style=oscola"
+    },
+    "subtypeprimarylegislation": {
+      "option": "style=oxnum"
+    },
+    "subtypesecondarylegislation": {
+      "option": "style=oscola"
+    },
+    "subtypecourtrules": {
+      "option": "style=oxnum"
+    },
+    "entrytyperef": {
+      "option": "style=oscola"
+    },
+    "entrytypeproc": {
+      "option": "style=oscola"
+    },
+    "entrytypereport": {
+      "option": "style=oscola"
+    },
+    "entrytypebooklet": {
+      "option": "style=oscola"
+    },
+    "entrytypemisc": {
+      "option": "style=oscola"
+    },
+    "entrytypeonline": {
+      "option": "style=oscola"
+    },
+    "entrytypevideo": {
+      "option": "style=oscola"
+    },
+    "entrytypeaudio": {
+      "option": "style=oscola"
+    },
+    "entrytypebookinbook": {
+      "option": "style=oscola"
+    },
+    "entrytypearticle": {
+      "option": "style=oscola"
+    },
+    "entrytypelegislation": {
+      "option": "style=oscola"
+    },
+    "entrytypeletter": {
+      "option": "style=oscola"
+    },
+    "entrytypeperformance": {
+      "option": "style=oscola"
+    },
+    "optionaddoriginal": {
+      "option": "style=oscola"
+    },
+    "optionnoreprints": {
+      "option": "style=oscola"
+    },
+    "optionorigfirst": {
+      "option": "style=oscola"
+    },
+    "optiontransfromorig": {
+      "option": "style=oscola"
+    },
+    "optionorigtransas": {
+      "option": "style=oscola"
+    },
+    "optiondoubledate": {
+      "option": "style=oscola"
+    },
+    "noplace": {
+      "option": "style=oscola"
+    },
+    "officialjournaltitle": {
+      "option": "style=oxnum"
+    },
+    "ojspecedtitle": {
+      "option": "style=oxnum"
+    },
+    "ecrreporttitle": {
+      "option": "style=oxnum"
+    },
+    "commission": {
+      "option": "style=oxnum"
+    },
+    "Commission": {
+      "option": "style=oxnum"
+    },
+    "pcijrep": {
+      "option": "style=oscola"
+    },
+    "explanatorynote": {
+      "option": "style=oxnum"
+    },
+    "eudirective": {
+      "option": "style=oscola"
+    },
+    "euregulation": {
+      "option": "style=oscola"
+    },
+    "eudecision": {
+      "option": "style=oscola"
+    },
+    "treatysubtype": {
+      "option": "style=oxnum"
+    },
+    "comdocsubtype": {
+      "option": "style=oscola"
+    },
+    "jurisechr": {
+      "option": "style=oscola"
+    },
+    "eutreaty": {
+      "option": "style=oscola"
+    },
+    "casenote": {
+      "option": "style=oxnum"
+    },
+    "pagemarkings": {
+      "option": "style=oscola"
+    },
+    "paragraphmarkings": {
+      "option": "style=oxnum"
+    },
+    "paragraphtext": {
+      "option": "style=oscola"
+    },
+    "seriesa": {
+      "option": "style=oxnum"
+    },
+    "echrreports": {
+      "option": "style=oxnum"
+    },
+    "decisionsandreports": {
+      "option": "style=oxnum"
+    },
+    "collectionofdecisions": {
+      "option": "style=oxnum"
+    },
+    "parliamentarytype": {
+      "option": "style=oxnum"
+    },
+    "houseofcommons": {
+      "option": "style=oscola"
+    },
+    "houseoflords": {
+      "option": "style=oscola"
+    },
+    "undoctype": {
+      "option": "style=oscola"
+    },
+    "extracitedelim": {
+      "option": "style=oscola"
+    },
+    "casenotetext": {
+      "option": "style=oxnum"
+    },
+    "firstpublishedstr": {
+      "option": "style=oscola"
+    },
+    "legalstarturl": {
+      "option": "style=oscola"
+    },
+    "legalendurl": {
+      "option": "style=oscola"
+    },
+    "paratextformatted{}": {
+      "snippet": "paratextformatted{${1:text}}",
+      "option": "style=oscola"
+    },
+    "csusebibmacro{}": {
+      "snippet": "csusebibmacro{${1:name}}",
+      "option": "style=oscola"
+    },
+    "forbbxrange": {
+      "option": "style=oscola"
+    },
+    "rangesplit{}": {
+      "snippet": "rangesplit{${1:arg}}",
+      "option": "style=oscola"
+    },
+    "formatpostnote{}": {
+      "snippet": "formatpostnote{${1:text}}",
+      "option": "style=oscola"
+    },
+    "ifnumeralfirst{}{}{}": {
+      "snippet": "ifnumeralfirst{${1:arg1}}{${2:arg2}}{${3:arg3}}",
+      "option": "style=oscola"
+    },
+    "ifnumeralsfirst{}{}{}": {
+      "snippet": "ifnumeralsfirst{${1:arg1}}{${2:arg2}}{${3:arg3}}",
+      "option": "style=oscola"
+    },
+    "numeraljustfirst{}{}{}": {
+      "snippet": "numeraljustfirst{${1:arg1}}{${2:arg2}}{${3:arg3}}",
+      "option": "style=oscola"
+    },
+    "siganddate{}": {
+      "snippet": "siganddate{${1:arg}}",
+      "option": "style=oxnum"
+    },
+    "treatypartysep": {
+      "option": "style=oxnum"
+    },
+    "SetStandardIndices": {
+      "option": "style=oscola"
+    },
+    "DeclareIndexAssociation{}{}": {
+      "snippet": "DeclareIndexAssociation{${1:category}}{${2:index}}",
+      "option": "style=oscola"
+    },
+    "ShowIndexAssociation{}": {
+      "snippet": "ShowIndexAssociation{${1:category}}",
+      "option": "style=oscola"
+    },
+    "legislationindex": {
+      "option": "style=oscola"
+    },
+    "iflistcontains{}{}{}{}": {
+      "snippet": "iflistcontains{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}",
+      "option": "style=oscola"
+    },
+    "printindexearly": {
+      "option": "style=oscola"
+    },
+    "printindexearly[]": {
+      "snippet": "printindexearly[${1:name}]",
+      "option": "style=oscola"
+    },
+    "DNI": {
+      "option": "style=oscola"
+    },
+    "reponly[][]{}": {
+      "snippet": "reponly[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "reponly[]{}": {
+      "snippet": "reponly[${2:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "reponly{}": {
+      "snippet": "reponly{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "footciteref[][]{}": {
+      "snippet": "footciteref[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "footciteref[]{}": {
+      "snippet": "footciteref[${2:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "footciteref{}": {
+      "snippet": "footciteref{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "dopipedlist": {
+      "option": "style=oscola"
+    },
+    "setuppostnotes": {
+      "option": "style=sbl"
+    },
+    "postnotefirst": {
+      "option": "style=sbl"
+    },
+    "postnotesecond": {
+      "option": "style=oscola"
+    },
+    "citeinindex[][]{}": {
+      "snippet": "citeinindex[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "citeinindex[]{}": {
+      "snippet": "citeinindex[${2:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "citeinindex{}": {
+      "snippet": "citeinindex{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "citeinindexnum[][]{}": {
+      "snippet": "citeinindexnum[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "citeinindexnum[]{}": {
+      "snippet": "citeinindexnum[${2:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "citeinindexnum{}": {
+      "snippet": "citeinindexnum{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "indexonly[][]{}": {
+      "snippet": "indexonly[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "indexonly[]{}": {
+      "snippet": "indexonly[${2:postnote}]{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "indexonly{}": {
+      "snippet": "indexonly{${1:bibid}}",
+      "option": "style=oscola"
+    },
+    "cacasetitlepunct": {
+      "option": "style=oxnum"
+    },
+    "DeclareAbbrEndChars{}": {
+      "snippet": "DeclareAbbrEndChars{${1:characters}}",
+      "option": "style=oxnum"
+    },
+    "ifabbrev{}{}{}": {
+      "snippet": "ifabbrev{${1:field}}{${2:true}}{${3:false}}",
+      "option": "style=oxnum"
+    },
+    "iflistcontains{}{}": {
+      "snippet": "iflistcontains{${1:list}}{${2:string}}",
+      "option": "style=oxnum"
+    },
+    "legreport": {
+      "option": "style=oxnum"
+    },
+    "mkbibnametitle{}": {
+      "snippet": "mkbibnametitle{${1:text}}",
+      "option": "style=oxnum"
+    },
+    "mkrawpageprefix": {
+      "option": "style=oxnum"
+    },
+    "mkrawpageprefix[]": {
+      "snippet": "mkrawpageprefix[${1:type}]",
+      "option": "style=oxnum"
+    },
+    "mkusbibordinal{}": {
+      "snippet": "mkusbibordinal{${1:number}}",
+      "option": "style=oxnum"
+    },
+    "oxrefand": {
+      "option": "style=oxnum"
+    },
+    "oxrefanon": {
+      "option": "style=oxnum"
+    },
+    "recordseriespunct": {
+      "option": "style=oxnum"
+    },
+    "thelocpubpairs": {
+      "option": "style=oxnum"
+    },
+    "thenamepairs": {
+      "option": "style=oxnum"
+    },
+    "titlebyauthordelim": {
+      "option": "style=oxnum"
+    },
+    "uscasetitlepunct": {
+      "option": "style=oxnum"
+    },
+    "iflabeldateisanydate{}{}": {
+      "snippet": "iflabeldateisanydate{${1:true}}{${2:false}}",
+      "option": "style=oxyear"
+    },
+    "iflabeldateispubstate{}{}": {
+      "snippet": "iflabeldateispubstate{${1:true}}{${2:false}}",
+      "option": "style=oxyear"
+    },
+    "sdcite{}": {
+      "snippet": "sdcite{${1:bibid}}",
+      "option": "style=philosophy-modern"
+    },
+    "footcitet{}": {
+      "snippet": "footcitet{${1:bibid}}",
+      "option": "style=philosophy-modern"
+    },
+    "volnumpunct": {
+      "option": "style=philosophy-verbose"
+    },
+    "editorstrgdelim": {
+      "option": "style=philosophy-verbose"
+    },
+    "ccite{}": {
+      "snippet": "ccite{${1:bibid}}",
+      "option": "style=philosophy-verbose"
+    },
+    "ExecutePublistOptions{}": {
+      "snippet": "ExecutePublistOptions{${1:options}}",
+      "option": "style=publist"
+    },
+    "setplnum{}": {
+      "snippet": "setplnum{${1:integer}}",
+      "option": "style=publist"
+    },
+    "plauthorname{}": {
+      "snippet": "plauthorname{${1:surname}}",
+      "option": "bibstyle=publist"
+    },
+    "plauthorname[]{}": {
+      "snippet": "plauthorname[${2:first name}]{${1:surname}}",
+      "option": "bibstyle=publist"
+    },
+    "plauthorname[][]{}": {
+      "snippet": "plauthorname[${2:first name}][${3:von part}]{${1:surname}}",
+      "option": "bibstyle=publist"
+    },
+    "plnameomission": {
+      "option": "bibstyle=publist"
+    },
+    "plmarginyear{}": {
+      "snippet": "plmarginyear{${1:text}}",
+      "option": "bibstyle=publist"
+    },
+    "plyearhl{}": {
+      "snippet": "plyearhl{${1:text}}",
+      "option": "style=publist"
+    },
+    "plauthorhl{}": {
+      "snippet": "plauthorhl{${1:text}}",
+      "option": "bibstyle=publist"
+    },
+    "bplopenoa": {
+      "option": "style=publist"
+    },
+    "bplcloseoa": {
+      "option": "style=publist"
+    },
+    "plextrainfosep": {
+      "option": "style=publist"
+    },
+    "extralabelnumberwidth": {
+      "option": "bibstyle=publist"
+    },
+    "shiftplnum{}": {
+      "snippet": "shiftplnum{${1:integer}}",
+      "option": "style=publist"
+    },
+    "publistbasestyle": {
+      "option": "bibstyle=publist"
+    },
+    "plisbnlink{}": {
+      "snippet": "plisbnlink{${1:ISBN}}",
+      "option": "bibstyle=publist"
+    },
+    "plissnlink{}": {
+      "snippet": "plissnlink{${1:ISSN}}",
+      "option": "bibstyle=publist"
+    },
+    "mkbibdesc{}": {
+      "snippet": "mkbibdesc{${1:number}}",
+      "option": "bibstyle=publist"
+    },
+    "mkbibsecstart{}": {
+      "snippet": "mkbibsecstart{${1:number}}",
+      "option": "bibstyle=publist"
+    },
+    "thenonplauthors": {
+      "option": "bibstyle=publist"
+    },
+    "thenonpleditors": {
+      "option": "bibstyle=publist"
+    },
+    "theplauthor": {
+      "option": "bibstyle=publist"
+    },
+    "thepleditor": {
+      "option": "bibstyle=publist"
+    },
+    "theplauthors": {
+      "option": "bibstyle=publist"
+    },
+    "thepleditors": {
+      "option": "bibstyle=publist"
+    },
+    "therealliststop": {
+      "option": "bibstyle=publist"
+    },
+    "thenonplauthor": {
+      "option": "bibstyle=publist"
+    },
+    "thenonpleditor": {
+      "option": "bibstyle=publist"
+    },
+    "ExecuteDepPublistOptions{}": {
+      "snippet": "ExecuteDepPublistOptions{${1:arg}}",
+      "option": "bibstyle=publist"
+    },
+    "thebplitems": {
+      "option": "bibstyle=publist"
+    },
+    "thebplsecitems": {
+      "option": "bibstyle=publist"
+    },
+    "thebplbgitems": {
+      "option": "bibstyle=publist"
+    },
+    "theplnumgroup": {
+      "option": "bibstyle=publist"
+    },
+    "resetplnumgroup": {
+      "option": "bibstyle=publist"
+    },
+    "GetTotalCount": {
+      "option": "bibstyle=publist"
+    },
+    "GetSectionCount": {
+      "option": "bibstyle=publist"
+    },
+    "GetSectionCount[]": {
+      "snippet": "GetSectionCount[${1:section number}]",
+      "option": "bibstyle=publist"
+    },
+    "citeitem[][]{}": {
+      "snippet": "citeitem[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citeitem[]{}": {
+      "snippet": "citeitem[${2:postnote}]{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citeitem{}": {
+      "snippet": "citeitem{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitem[][]{}": {
+      "snippet": "citesecitem[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitem[]{}": {
+      "snippet": "citesecitem[${2:postnote}]{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitem{}": {
+      "snippet": "citesecitem{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitem*{}": {
+      "snippet": "citesecitem*{${1:bibid}}",
+      "option": "style=publist"
+    },
+    "citeitemrange{}{}": {
+      "snippet": "citeitemrange{${1:bibid}}{${2:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitemrange{}{}": {
+      "snippet": "citesecitemrange{${1:bibid}}{${2:bibid}}",
+      "option": "style=publist"
+    },
+    "citesecitemrange*{}{}": {
+      "snippet": "citesecitemrange*{${1:bibid}}{${2:bibid}}",
+      "option": "style=publist"
+    },
+    "itemrangesep": {
+      "option": "style=publist"
+    },
+    "shiftciteitem{}": {
+      "snippet": "shiftciteitem{${1:integer}}",
+      "option": "style=publist"
+    },
+    "mkrefdesc{}": {
+      "snippet": "mkrefdesc{${1:number}}",
+      "option": "style=publist"
+    },
+    "secitemsecref": {
+      "option": "style=publist"
+    },
+    "theprevcrefsection": {
+      "option": "style=publist"
+    },
+    "shiftbplnum{}": {
+      "snippet": "shiftbplnum{${1:integer}}",
+      "option": "bibstyle=publist"
+    },
+    "printprinfo{}": {
+      "snippet": "printprinfo{${1:string}}",
+      "option": "bibstyle=publist"
+    },
+    "mkbibrealauthor{}": {
+      "snippet": "mkbibrealauthor{${1:arg}}",
+      "option": "bibstyle=realauthor"
+    },
+    "mkrealauthor{}": {
+      "snippet": "mkrealauthor{${1:arg}}",
+      "option": "bibstyle=realauthor"
+    },
+    "realauthorequalsign": {
+      "option": "bibstyle=realauthor"
+    },
+    "mkbibrealeditor{}": {
+      "snippet": "mkbibrealeditor{${1:arg}}",
+      "option": "bibstyle=realauthor"
+    },
+    "mkrealeditor{}": {
+      "snippet": "mkrealeditor{${1:arg}}",
+      "option": "bibstyle=realauthor"
+    },
+    "realeditorequalsign": {
+      "option": "bibstyle=realauthor"
+    },
+    "printsblversion": {
+      "option": "style=sbl"
+    },
+    "printsbldate": {
+      "option": "style=sbl"
+    },
+    "xprintsbldateiso": {
+      "option": "style=sbl"
+    },
+    "xprintsbldateau": {
+      "option": "style=sbl"
+    },
+    "ifciteidemsbl{}{}": {
+      "snippet": "ifciteidemsbl{${1:true}}{${2:false}}",
+      "option": "style=sbl"
+    },
+    "namedashpunct": {
+      "option": "style=sbl"
+    },
+    "lexiconfinalnamedelim": {
+      "option": "style=sbl"
+    },
+    "volpostnotedelim": {
+      "option": "style=sbl"
+    },
+    "addskipentry{}": {
+      "snippet": "addskipentry{${1:arg}}",
+      "option": "style=sbl"
+    },
+    "addincludeentry{}": {
+      "snippet": "addincludeentry{${1:arg}}",
+      "option": "style=sbl"
+    },
+    "abbrevwidth": {
+      "option": "style=sbl"
+    },
+    "setmaxlength{}{}": {
+      "snippet": "setmaxlength{${1:length1}}{${2:length2}}",
+      "option": "style=sbl"
+    },
+    "iffirstcharsec{}{}{}": {
+      "snippet": "iffirstcharsec{${1:arg}}{${2:true}}{${3:false}}",
+      "option": "style=sbl"
+    },
+    "iffirstcharnum{}{}{}": {
+      "snippet": "iffirstcharnum{${1:arg}}{${2:true}}{${3:false}}",
+      "option": "style=sbl"
+    },
+    "thecurrentpublisher": {
+      "option": "style=sbl"
+    },
+    "thecurrentlocation": {
+      "option": "style=sbl"
+    },
+    "thecurrentorganization": {
+      "option": "style=sbl"
+    },
+    "thecurrentinstitution": {
+      "option": "style=sbl"
+    },
+    "thepublishertotal": {
+      "option": "style=sbl"
+    },
+    "thelocationtotal": {
+      "option": "style=sbl"
+    },
+    "theorganizationtotal": {
+      "option": "style=sbl"
+    },
+    "theinstitutiontotal": {
+      "option": "style=sbl"
+    },
+    "savepostnotes": {
+      "option": "style=sbl"
+    },
+    "postnotelast": {
+      "option": "style=sbl"
+    },
+    "splitpostnote": {
+      "option": "style=sbl"
+    },
+    "volsplitpostnote{}{}": {
+      "snippet": "volsplitpostnote{${1:arg1}}{${2:arg2}}",
+      "option": "style=sbl"
+    },
+    "volvol": {
+      "option": "style=sbl"
+    },
+    "citefullauthor*{}": {
+      "snippet": "citefullauthor*{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citefullauthor*[]{}": {
+      "snippet": "citefullauthor*[${2:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citefullauthor*[][]{}": {
+      "snippet": "citefullauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "Citefullauthor*{}": {
+      "snippet": "Citefullauthor*{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "Citefullauthor*[]{}": {
+      "snippet": "Citefullauthor*[${2:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "Citefullauthor*[][]{}": {
+      "snippet": "Citefullauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citejournal{}": {
+      "snippet": "citejournal{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citeseries{}": {
+      "snippet": "citeseries{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "citeshorthand{}": {
+      "snippet": "citeshorthand{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "bibentrycite{}": {
+      "snippet": "bibentrycite{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "biblistcite{}": {
+      "snippet": "biblistcite{${1:bibid}}",
+      "option": "style=sbl"
+    },
+    "DeclareNestableCiteCommand{}{}": {
+      "snippet": "DeclareNestableCiteCommand{${1:cmd}}{${2:def}}",
+      "option": "style=sbl"
+    },
+    "socialscienceshuberlinversion": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "socialscienceshuberlindate": {
+      "option": "style=socialscienceshuberlin"
+    },
+    "mkbibdateunified{}{}{}": {
+      "snippet": "mkbibdateunified{${1:arg1}}{${2:arg2}}{${3:arg3}}",
+      "option": "style=univie-ling"
+    },
+    "iflinkparens{}{}": {
+      "snippet": "iflinkparens{${1:true}}{${2:false}}",
+      "option": "style=unified"
+    },
+    "pgcitep{}{}": {
+      "snippet": "pgcitep{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "pgcitealt{}{}": {
+      "snippet": "pgcitealt{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "pgcitet{}{}": {
+      "snippet": "pgcitet{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "pgposscitet{}{}": {
+      "snippet": "pgposscitet{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "seccitealt{}{}": {
+      "snippet": "seccitealt{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "seccitep{}{}": {
+      "snippet": "seccitep{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "seccitet{}{}": {
+      "snippet": "seccitet{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "secposscitet{}{}": {
+      "snippet": "secposscitet{${1:bibid}}{${2:text}}",
+      "option": "style=unified"
+    },
+    "posscitet{}": {
+      "snippet": "posscitet{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "posscitet[]{}": {
+      "snippet": "posscitet[${2:postnote}]{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "posscitet[][]{}": {
+      "snippet": "posscitet[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "posscitealt{}": {
+      "snippet": "posscitealt{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "posscitealt[]{}": {
+      "snippet": "posscitealt[${2:postnote}]{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "posscitealt[][]{}": {
+      "snippet": "posscitealt[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "possciteauthor{}": {
+      "snippet": "possciteauthor{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "possciteauthor[]{}": {
+      "snippet": "possciteauthor[${2:postnote}]{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "possciteauthor[][]{}": {
+      "snippet": "possciteauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=unified"
+    },
+    "idemcite{}": {
+      "snippet": "idemcite{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcite[]{}": {
+      "snippet": "idemcite[${2:postnote}]{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcite[][]{}": {
+      "snippet": "idemcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites{}{}": {
+      "snippet": "idemcites{${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites(){}{}": {
+      "snippet": "idemcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites()(){}{}": {
+      "snippet": "idemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites()()[]{}[]{}": {
+      "snippet": "idemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites[]{}[]{}": {
+      "snippet": "idemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites[][]{}[][]{}": {
+      "snippet": "idemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "idemcites()()[][]{}[][]{}": {
+      "snippet": "idemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcite{}": {
+      "snippet": "footidemcite{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcite[]{}": {
+      "snippet": "footidemcite[${2:postnote}]{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcite[][]{}": {
+      "snippet": "footidemcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites{}{}": {
+      "snippet": "footidemcites{${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites(){}{}": {
+      "snippet": "footidemcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites()(){}{}": {
+      "snippet": "footidemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites()()[]{}[]{}": {
+      "snippet": "footidemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites[]{}[]{}": {
+      "snippet": "footidemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites[][]{}[][]{}": {
+      "snippet": "footidemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "footidemcites()()[][]{}[][]{}": {
+      "snippet": "footidemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauth{}": {
+      "snippet": "parenauth{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauth[]{}": {
+      "snippet": "parenauth[${2:postnote}]{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauth[][]{}": {
+      "snippet": "parenauth[${2:prenote}][${3:postnote}]{${1:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths{}{}": {
+      "snippet": "parenauths{${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths(){}{}": {
+      "snippet": "parenauths(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths()(){}{}": {
+      "snippet": "parenauths(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths()()[]{}[]{}": {
+      "snippet": "parenauths(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths[]{}[]{}": {
+      "snippet": "parenauths[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths[][]{}[][]{}": {
+      "snippet": "parenauths[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "parenauths()()[][]{}[][]{}": {
+      "snippet": "parenauths(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=windycity"
+    },
+    "mkmonthrange{}{}": {
+      "snippet": "mkmonthrange{${1:arg1}}{${2:arg2}}",
+      "option": "style=windycity"
+    },
+    "mkmonthdayrange{}{}": {
+      "snippet": "mkmonthdayrange{${1:arg1}}{${2:arg2}}",
+      "option": "style=windycity"
+    },
+    "mkmonthdayyearrange{}{}": {
+      "snippet": "mkmonthdayyearrange{${1:arg1}}{${2:arg2}}",
+      "option": "style=windycity"
+    },
+    "anona": {
+      "option": "style=windycity"
+    },
+    "anonb": {
+      "option": "style=windycity"
+    },
+    "crossreflist": {
+      "option": "style=windycity"
+    },
+    "pluga": {
+      "option": "style=windycity"
+    },
+    "plugb": {
+      "option": "style=windycity"
+    },
+    "xtitle": {
+      "option": "style=windycity"
+    },
+    "xeditor": {
+      "option": "style=windycity"
+    },
+    "yeditor": {
+      "option": "style=windycity"
+    },
+    "edtypes": {
+      "option": "style=windycity"
+    },
+    "transtypes": {
+      "option": "style=windycity"
+    },
+    "AtBeginLists": {
+      "option": "style=windycity"
+    },
+    "AtEveryItem": {
+      "option": "style=windycity"
+    },
+    "authtypes": {
+      "option": "style=windycity"
+    },
+    "iffieldstart{}{}{}{}": {
+      "snippet": "iffieldstart{${1:field}}{${2:sym}}{${3:true}}{${4:false}}",
+      "option": "style=windycity"
+    }
+  },
+  "envs": {
+    "refsection": {},
+    "refsection[]": {
+      "name": "refsection",
+      "snippet": "[${1:bib files}]"
+    },
+    "refsegment": {},
+    "refcontext{}": {
+      "name": "refcontext",
+      "snippet": "{${1:name}}"
+    },
+    "refcontext[]{}": {
+      "name": "refcontext",
+      "snippet": "[${2:options}]{${1:name}}",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "fullexpotherlanguage{}": {
+      "name": "fullexpotherlanguage",
+      "snippet": "{${1:language}}",
+      "option": "style=archaeologie"
+    },
+    "theshorthands": {
+      "option": "style=enc"
+    },
+    "plnumgroup": {
+      "option": "style=publist"
+    }
+  },
+  "options": [
+    "backend=",
+    "style=",
+    "bibstyle=",
+    "citestyle=",
+    "natbib",
+    "mcite",
+    "casechanger=",
+    "datamodel=${1:model}",
+    "sorting=",
+    "sortcase",
+    "sortupper",
+    "sortlocale=",
+    "sortcites",
+    "sortsets",
+    "pluralothers",
+    "maxnames=${1:integer}",
+    "minnames=${1:integer}",
+    "maxbibnames=${1:integer}",
+    "minbibnames=${1:integer}",
+    "maxcitenames=${1:integer}",
+    "mincitenames=${1:integer}",
+    "maxsortnames=${1:integer}",
+    "minsortnames=${1:integer}",
+    "maxitems=${1:integer}",
+    "minitems=${1:integer}",
+    "autocite=",
+    "autopunct",
+    "language=",
+    "clearlang",
+    "autolang=",
+    "langhook=",
+    "block=",
+    "locallabelwidth",
+    "notetype=",
+    "hyperref=",
+    "backref",
+    "backrefstyle=",
+    "backrefsetstyle=",
+    "backreffloats",
+    "indexing=",
+    "loadfiles",
+    "refsection=",
+    "refsegment=",
+    "citereset=",
+    "abbreviate",
+    "date=",
+    "labeldate=",
+    "eventdate=",
+    "origdate=",
+    "urldate=",
+    "alldates=",
+    "julian",
+    "gregorianstart=${1:YYYY-MM-DD}",
+    "datezeros",
+    "timezeros",
+    "timezones",
+    "seconds",
+    "dateabbrev",
+    "datecirca",
+    "dateuncertain",
+    "dateera=",
+    "dateeraauto=${1:integer}",
+    "time=",
+    "labeltime=",
+    "eventtime=",
+    "origtime=",
+    "urltime=",
+    "alltimes=",
+    "dateusetime",
+    "labeldateusetime",
+    "eventdateusetime",
+    "origdateusetime",
+    "urldateusetime",
+    "alldatesusetime",
+    "defernumbers",
+    "punctfont",
+    "arxiv=",
+    "texencoding=",
+    "bibencoding=",
+    "safeinputenc",
+    "bibwarn",
+    "mincrossrefs=${1:integer}",
+    "minxrefs=${1:integer}",
+    "bibtexcaseprotection",
+    "isbn",
+    "url",
+    "doi",
+    "eprint",
+    "related",
+    "subentry",
+    "subentrycomp",
+    "dashed",
+    "mergedate=",
+    "ibidpage",
+    "citepages=",
+    "strict",
+    "pagetracker=",
+    "citecounter=",
+    "citetracker=",
+    "ibidtracker=",
+    "opcittracker=",
+    "loccittracker=",
+    "idemtracker=",
+    "trackfloats",
+    "parentracker",
+    "maxparens=${1:integer}",
+    "giveninits",
+    "terseinits",
+    "labelalpha",
+    "maxalphanames=${1:integer}",
+    "minalphanames=${1:integer}",
+    "labelnumber",
+    "noroman",
+    "labeltitle",
+    "labeltitleyear",
+    "labeldateparts",
+    "singletitle",
+    "uniquetitle",
+    "uniquebaretitle",
+    "uniquework",
+    "uniqueprimaryauthor",
+    "uniquename=",
+    "uniquelist=",
+    "nohashothers",
+    "nosortothers",
+    "useauthor",
+    "useeditor",
+    "usetranslator",
+    "useprefix",
+    "indexing=",
+    "skipbib",
+    "skipbiblist",
+    "skiplab",
+    "dataonly",
+    "ittitles",
+    "scbib",
+    "nosl",
+    "nosn",
+    "noslsn",
+    "repeattitles",
+    "repeatfirstfields",
+    "repeatfields",
+    "usedashes",
+    "indent",
+    "extradate",
+    "extrayear",
+    "justify",
+    "pretty",
+    "citecount",
+    "sccite",
+    "ittitles",
+    "scbib",
+    "nosl",
+    "nosn",
+    "noslsn",
+    "repeattitles",
+    "repeatfirstfields",
+    "repeatfields",
+    "usedashes",
+    "indent",
+    "extradate",
+    "extrayear",
+    "justify",
+    "pretty",
+    "citecount",
+    "sccite",
+    "ittitles",
+    "scbib",
+    "nosl",
+    "nosn",
+    "noslsn",
+    "repeattitles",
+    "repeatfirstfields",
+    "repeatfields",
+    "usedashes",
+    "indent",
+    "extradate",
+    "extrayear",
+    "justify",
+    "pretty",
+    "citecount",
+    "comp",
+    "halid",
+    "swhid",
+    "shortswhid",
+    "swlabels",
+    "vcs",
+    "license",
+    "halid",
+    "swhid",
+    "shortswhid",
+    "swlabels",
+    "vcs",
+    "license",
+    "bibancient",
+    "bibcorpora",
+    "lstabbrv",
+    "lstlocations",
+    "lstpublishers",
+    "bibfullname",
+    "scshape",
+    "edby",
+    "publisher",
+    "translation",
+    "yearseries",
+    "width=",
+    "counter",
+    "jstor",
+    "arachne",
+    "zenon",
+    "urn",
+    "biblabel=",
+    "inreferencesasfullcite",
+    "eventdatelanguage",
+    "citeauthorformat=",
+    "seenote",
+    "yearinparens",
+    "nametracker",
+    "apamaxprtauth=${1:number}",
+    "apamaxprtauth=${1:number}",
+    "width=",
+    "publisher",
+    "jstor",
+    "urn",
+    "arthist",
+    "enddot",
+    "pagesfull",
+    "firstcitefull",
+    "allnamesfamilygiven",
+    "namelinked",
+    "nonodate",
+    "utf8",
+    "gbk",
+    "cparen",
+    "utf8",
+    "gbk",
+    "cparen",
+    "articletitle",
+    "chaptertitle",
+    "pageranges",
+    "biblabel=",
+    "articletitle",
+    "chaptertitle",
+    "pageranges",
+    "biblabel=",
+    "articletitle",
+    "chaptertitle",
+    "pageranges",
+    "biblabel=",
+    "articletitle",
+    "chaptertitle",
+    "pageranges",
+    "biblabel=",
+    "acronyms",
+    "shorthandinbib",
+    "shorthandwidth=",
+    "shortjournal",
+    "terselos",
+    "xref",
+    "pagetotal",
+    "journalnumber=",
+    "bernhard",
+    "series=",
+    "seriesformat=",
+    "annotation",
+    "edbyidem",
+    "editionstring",
+    "edsuper",
+    "idembib",
+    "library",
+    "nolocation",
+    "nopublisher",
+    "oldauthor",
+    "origfields",
+    "pseudoauthor",
+    "origfieldsformat=",
+    "namefont=",
+    "firstnamefont=",
+    "idemfont=",
+    "ibidemfont=",
+    "idembibformat=",
+    "editorstring=",
+    "editorstringfont=",
+    "citedas",
+    "edstringincitations",
+    "omiteditor",
+    "shorthandibid",
+    "citeauthor=",
+    "citeauthorname=",
+    "ibidpage",
+    "pageref",
+    "citepages=",
+    "addyear",
+    "firstfull",
+    "inreference=",
+    "acronyms",
+    "shorthandinbib",
+    "shorthandwidth=",
+    "shortjournal",
+    "terselos",
+    "xref",
+    "pagetotal",
+    "journalnumber=",
+    "bernhard",
+    "series=",
+    "seriesformat=",
+    "annotation",
+    "edbyidem",
+    "editionstring",
+    "edsuper",
+    "idembib",
+    "library",
+    "nolocation",
+    "nopublisher",
+    "oldauthor",
+    "origfields",
+    "pseudoauthor",
+    "origfieldsformat=",
+    "namefont=",
+    "firstnamefont=",
+    "idemfont=",
+    "ibidemfont=",
+    "idembibformat=",
+    "editorstring=",
+    "editorstringfont=",
+    "citedas",
+    "edstringincitations",
+    "omiteditor",
+    "shorthandibid",
+    "citeauthor=",
+    "citeauthorname=",
+    "ibidpage",
+    "pageref",
+    "citepages=",
+    "annotatedBibliography",
+    "postnote=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "ignoreaddendum=",
+    "ignoreforeword=",
+    "ignoreafterword=",
+    "ignoreintroduction=",
+    "ignoreparatext=",
+    "publisher",
+    "parensvolume",
+    "script",
+    "actor",
+    "ignorearticle",
+    "partofcited",
+    "germ",
+    "translatedas",
+    "directorreplace",
+    "noseries",
+    "series",
+    "nopublisher",
+    "parensfilmnote",
+    "filmruntime",
+    "citeprefix",
+    "yearatbeginning",
+    "origyearwithyear",
+    "origyearsuperscript",
+    "pages=",
+    "origcite=",
+    "filmindex=",
+    "splitfilmindex",
+    "titleindex=",
+    "fullcitefilm",
+    "compactcite",
+    "citefilm=",
+    "xindy",
+    "ignoreaddendum=",
+    "ignoreforeword=",
+    "ignoreafterword=",
+    "ignoreintroduction=",
+    "ignoreparatext=",
+    "publisher",
+    "parensvolume",
+    "script",
+    "actor",
+    "ignorearticle",
+    "partofcited",
+    "germ",
+    "translatedas",
+    "directorreplace",
+    "noseries",
+    "series",
+    "nopublisher",
+    "parensfilmnote",
+    "filmruntime",
+    "citeprefix",
+    "yearatbeginning",
+    "origyearwithyear",
+    "origyearsuperscript",
+    "pages=",
+    "origcite=",
+    "filmindex=",
+    "splitfilmindex",
+    "titleindex=",
+    "fullcitefilm",
+    "compactcite",
+    "citefilm=",
+    "xindy",
+    "citexref",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitecomp",
+    "gbcitelabel=",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitelabel=",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitecomp",
+    "gbcitelabel=",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "CCNUpunctcn",
+    "citexref",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitecomp",
+    "gbcitelabel=",
+    "citexref",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitelabel=",
+    "citexref",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitecomp",
+    "gbcitelabel=",
+    "gbpunctcn",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfootbibfmt",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gbcitepunctcn",
+    "gblabelref",
+    "gbcitelabel=",
+    "edsuper",
+    "switchprefix",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "spacecolon",
+    "pagetotal",
+    "shortnumeration",
+    "thesisinfoinnotes",
+    "articlepubinfo",
+    "currentlang",
+    "noenddot",
+    "spacecolon",
+    "pagetotal",
+    "shortnumeration",
+    "thesisinfoinnotes",
+    "articlepubinfo",
+    "currentlang",
+    "noenddot",
+    "spacecolon",
+    "pagetotal",
+    "shortnumeration",
+    "thesisinfoinnotes",
+    "articlepubinfo",
+    "currentlang",
+    "noenddot",
+    "spacecolon",
+    "pagetotal",
+    "shortnumeration",
+    "thesisinfoinnotes",
+    "articlepubinfo",
+    "currentlang",
+    "noenddot",
+    "acronyms",
+    "shorthandinbib",
+    "shorthandwidth=",
+    "shortjournal",
+    "terselos",
+    "xref",
+    "pagetotal",
+    "journalnumber=",
+    "bernhard",
+    "series=",
+    "seriesformat=",
+    "annotation",
+    "edbyidem",
+    "editionstring",
+    "edsuper",
+    "idembib",
+    "library",
+    "nolocation",
+    "nopublisher",
+    "oldauthor",
+    "origfields",
+    "pseudoauthor",
+    "origfieldsformat=",
+    "namefont=",
+    "firstnamefont=",
+    "idemfont=",
+    "ibidemfont=",
+    "idembibformat=",
+    "editorstring=",
+    "editorstringfont=",
+    "citedas",
+    "edstringincitations",
+    "omiteditor",
+    "shorthandibid",
+    "citeauthor=",
+    "citeauthorname=",
+    "ibidpage",
+    "pageref",
+    "citepages=",
+    "addyear",
+    "firstfull",
+    "inreference=",
+    "citedbytitle",
+    "howcited",
+    "bearbeiterin",
+    "fshowcited",
+    "citedbypage",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "acronym",
+    "series=",
+    "conference=",
+    "annotation",
+    "showlocation",
+    "longdash",
+    "noremoteinfo",
+    "isan",
+    "ismn",
+    "isrn",
+    "issn",
+    "firstlonghand",
+    "nofullfootnote",
+    "mancitepar",
+    "footnoterulestrict",
+    "mladraft",
+    "annotation",
+    "showlocation",
+    "longdash",
+    "noremoteinfo",
+    "isan",
+    "ismn",
+    "isrn",
+    "issn",
+    "firstlonghand",
+    "nofullfootnote",
+    "mancitepar",
+    "footnoterulestrict",
+    "mladraft",
+    "annotation",
+    "showlocation",
+    "longdash",
+    "noremoteinfo",
+    "isan",
+    "ismn",
+    "isrn",
+    "issn",
+    "firstlonghand",
+    "nofullfootnote",
+    "mancitepar",
+    "footnoterulestrict",
+    "mladraft",
+    "articletitle",
+    "intitle",
+    "articledoi",
+    "articlein",
+    "printlang",
+    "caseshorthands",
+    "ecli=",
+    "ibidstyle=",
+    "shortindex",
+    "eutreaty",
+    "anon=",
+    "bookseries=",
+    "court-plain",
+    "ecli=",
+    "isourls",
+    "issuedate-plain",
+    "issuestyle=",
+    "mergedate=",
+    "nolocation",
+    "nonodate",
+    "nopublisher",
+    "norelatedin",
+    "relationpunct=",
+    "thesis=",
+    "timefirst",
+    "usenametitles",
+    "anon=",
+    "bookseries=",
+    "court-plain",
+    "ecli=",
+    "isourls",
+    "issuedate-plain",
+    "issuestyle=",
+    "mergedate=",
+    "nolocation",
+    "nonodate",
+    "nopublisher",
+    "norelatedin",
+    "relationpunct=",
+    "thesis=",
+    "timefirst",
+    "usenametitles",
+    "anon=",
+    "bookseries=",
+    "court-plain",
+    "ecli=",
+    "isourls",
+    "issuedate-plain",
+    "issuestyle=",
+    "nolocation",
+    "nopublisher",
+    "norelatedin",
+    "relationpunct=",
+    "scnames",
+    "thesis=",
+    "timefirst",
+    "usenametitles",
+    "anon=",
+    "bookseries=",
+    "court-plain",
+    "ecli=",
+    "isourls",
+    "issuedate-plain",
+    "issuestyle=",
+    "nolocation",
+    "nopublisher",
+    "norelatedin",
+    "relationpunct=",
+    "scnames",
+    "thesis=",
+    "timefirst",
+    "usenametitles",
+    "relatedformat=",
+    "publocformat=",
+    "volnumformat=",
+    "volumeformat=",
+    "editionformat=",
+    "scauthors=",
+    "lowscauthors",
+    "shorthandintro",
+    "inbeforejournal",
+    "classical",
+    "library",
+    "annotation",
+    "latinemph",
+    "square",
+    "nodate",
+    "relatedformat=",
+    "publocformat=",
+    "volnumformat=",
+    "volumeformat=",
+    "editionformat=",
+    "scauthors=",
+    "lowscauthors",
+    "shorthandintro",
+    "inbeforejournal",
+    "classical",
+    "library",
+    "annotation",
+    "latinemph",
+    "square",
+    "nodate",
+    "yearleft",
+    "restoreclassic",
+    "relatedformat=",
+    "publocformat=",
+    "volnumformat=",
+    "volumeformat=",
+    "editionformat=",
+    "scauthors=",
+    "lowscauthors",
+    "shorthandintro",
+    "inbeforejournal",
+    "classical",
+    "library",
+    "annotation",
+    "latinemph",
+    "iviemph",
+    "commacit",
+    "articletitle",
+    "chaptertitle",
+    "pageranges",
+    "biblabel=",
+    "plauthorname=${1:surname}",
+    "plauthorfirstname=${1:first name}",
+    "plauthornameprefix=${1:von-part}",
+    "plauthorhandling=",
+    "nameorder=",
+    "fixyear",
+    "hlyear",
+    "marginyear",
+    "plsorting=${1:sorting scheme}",
+    "plauthorfirstinit",
+    "jifinfo",
+    "oainfo=",
+    "prinfo",
+    "linktitles=",
+    "pubstateextra",
+    "plnumbering=",
+    "plauthorname=${1:surname}",
+    "plauthorfirstname=${1:first name}",
+    "plauthornameprefix=${1:von part}",
+    "plauthorhandling=",
+    "nameorder=",
+    "boldyear",
+    "pubstateextra",
+    "marginyear",
+    "plnumbered=",
+    "reversenumbering",
+    "plauthorfirstinit",
+    "prinfo",
+    "linktitleall",
+    "linktitledoi",
+    "linktitleurl",
+    "linktitleisbn",
+    "linktitleissn",
+    "accessdate",
+    "citepages=",
+    "eprintdate=",
+    "fullbibrefs",
+    "idemtracker=",
+    "sblfootnotes",
+    "shorthand=",
+    "useshorttitle",
+    "usefullcite",
+    "usevolume",
+    "useseries",
+    "articletitle",
+    "colornames",
+    "dashed=",
+    "articlein",
+    "citexref",
+    "innamebeforetitle",
+    "innameidem",
+    "maintitleaftertitle",
+    "introcite=",
+    "halid",
+    "swhid",
+    "shortswhid",
+    "swlabels",
+    "vcs",
+    "license",
+    "pubstate",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitelabel=",
+    "citexref",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitecomp",
+    "gbcitelabel=",
+    "citexref",
+    "gbmedium",
+    "gbannote",
+    "gbfieldtype",
+    "gbfnperpage",
+    "gbfootbib",
+    "gbstyle",
+    "gbtype",
+    "gbcodegbk",
+    "gbstrict",
+    "gbtitlelink",
+    "gbctexset",
+    "gbnoauthor",
+    "gbfieldstd",
+    "gbpub",
+    "gbpunctin",
+    "gblanorder=",
+    "gbcitelocal=",
+    "gbbiblocal=",
+    "gblocal=",
+    "gbbiblabel=",
+    "gbnamefmt=",
+    "gbalign=",
+    "gblabelref",
+    "gbcitecomp",
+    "gbcitelabel=",
+    "issueandeditor",
+    "compactlinks",
+    "alllinks",
+    "issueeditor",
+    "annotate",
+    "collsonly",
+    "ibid",
+    "issn",
+    "library",
+    "noetal",
+    "nolos",
+    "nopages",
+    "reflist",
+    "sentencecase",
+    "short",
+    "shortafter",
+    "shortfirst",
+    "shortlinks",
+    "swapvol"
+  ],
+  "keyvals": [
+    [
+      "bibencoding=",
+      "label=",
+      "location=",
+      "type=",
+      "datatype=",
+      "glob"
+    ],
+    [
+      "env=${1:name}",
+      "heading=${1:name}",
+      "title=${1:text}",
+      "label=",
+      "block=",
+      "prenote=${1:name}",
+      "postnote=${1:name}",
+      "section=${1:integer}",
+      "segment=${1:integer}",
+      "type=${1:entrytype}",
+      "nottype=${1:entrytype}",
+      "subtype=${1:subtype}",
+      "notsubtype=${1:subtype}",
+      "keyword=${1:keyword}",
+      "notkeyword=${1:keyword}",
+      "category=${1:category}",
+      "notcategory=${1:category}",
+      "filter=${1:name}",
+      "check=${1:name}",
+      "resetnumbers=",
+      "omitnumbers",
+      "locallabelwidth"
+    ],
+    [
+      "env=${1:name}",
+      "heading=${1:name}",
+      "prenote=${1:name}",
+      "postnote=${1:name}"
+    ],
+    [
+      "heading=${1:name}",
+      "title=${1:text}",
+      "label="
+    ],
+    [
+      "env=${1:name}",
+      "heading=${1:name}",
+      "title=${1:text}",
+      "prenote=${1:name}",
+      "postnote=${1:name}",
+      "filter=${1:name}"
+    ],
+    [
+      "env=${1:name}",
+      "heading=${1:name}",
+      "title=${1:text}",
+      "label=",
+      "block=",
+      "prenote=${1:name}",
+      "postnote=${1:name}",
+      "section=${1:integer}",
+      "segment=${1:integer}",
+      "type=${1:entrytype}",
+      "nottype=${1:entrytype}",
+      "subtype=${1:subtype}",
+      "notsubtype=${1:subtype}",
+      "keyword=${1:keyword}",
+      "notkeyword=${1:keyword}",
+      "category=${1:category}",
+      "notcategory=${1:category}",
+      "filter=${1:name}",
+      "check=${1:name}",
+      "locallabelwidth",
+      "driver=",
+      "biblistfilter="
+    ],
+    [
+      "sorting=${1:name}",
+      "sortingnamekeytemplatename=${1:name}",
+      "uniquenametemplatename=${1:name}",
+      "labelalphanametemplatename=${1:name}",
+      "namehashtemplatename=${1:name}",
+      "nametemplates=${1:name}",
+      "labelprefix=${1:string}"
+    ],
+    [
+      "sorting=${1:name}",
+      "sortingnamekeytemplatename=${1:name}",
+      "uniquenametemplatename=${1:name}",
+      "labelalphanametemplatename=${1:name}",
+      "namehashtemplatename=${1:name}",
+      "nametemplates=${1:name}",
+      "labelprefix=${1:string}",
+      "name=${1:refcontextname}"
+    ],
+    [
+      "fieldtype=",
+      "datatype=",
+      "field="
+    ],
+    [
+      "datatype=",
+      "overwrite"
+    ],
+    [
+      "overwrite",
+      "foreach=${1:loopval}",
+      "refsection=${1:integer}"
+    ],
+    [
+      "typesource=${1:entrytype}",
+      "typetarget=${1:entrytype}",
+      "fieldsource=${1:entryfield}",
+      "notfield=${1:entryfield}",
+      "fieldtarget=${1:entryfield}",
+      "match=${1:regexp}",
+      "matchi=${1:regexp}",
+      "notmatch=${1:regexp}",
+      "notmatchi=${1:regexp}",
+      "replace=${1:regexp}",
+      "fieldset=${1:entryfield}",
+      "fieldvalue=${1:string}",
+      "entryclone=${1:clonekey}",
+      "entrynew=${1:entrynewkey}",
+      "entrynewtype=${1:string}",
+      "entrytarget=${1:string}",
+      "cited",
+      "nocited",
+      "citedornocited",
+      "allnocited",
+      "starnocited",
+      "entrynocite",
+      "entrynull",
+      "append",
+      "appendstrict",
+      "final",
+      "null",
+      "origfield",
+      "origfieldval",
+      "origentrytype"
+    ],
+    [
+      "type="
+    ],
+    [
+      "skipout"
+    ],
+    [
+      "type=${1:field type}",
+      "format=${1:field format}",
+      "datatype=${1:field datatype}",
+      "nullok",
+      "skipout",
+      "label"
+    ],
+    [
+      "type=",
+      "datatype=",
+      "rangemin=${1:number}",
+      "rangemax=${1:number}",
+      "pattern="
+    ],
+    [
+      "quantifier="
+    ],
+    [
+      "final",
+      "lowercase",
+      "strwidth=${1:integer}",
+      "strside=",
+      "padside=",
+      "padwidth=${1:integer}",
+      "padchar=${1:character}",
+      "uppercase",
+      "varwidth",
+      "varwidthnorm",
+      "varwidthlist",
+      "strwidthmax=${1:integer}",
+      "strfixedcount=${1:integer}",
+      "ifnames=${1:range}",
+      "names=${1:range}",
+      "namessep=${1:string}",
+      "noalphaothers"
+    ],
+    [
+      "use",
+      "pre",
+      "compound",
+      "strwidth=${1:integer}",
+      "strside=",
+      "inits",
+      "base",
+      "disambiguation=",
+      "hashscope="
+    ],
+    [
+      "locale="
+    ],
+    [
+      "locale=",
+      "direction=",
+      "final",
+      "sortcase",
+      "sortupper"
+    ],
+    [
+      "all",
+      "override",
+      "ignore=${1:csv list of uniqueness options}"
+    ],
+    [
+      "ignore=${1:csv list of uniqueness options}"
+    ],
+    [
+      "override"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/bibleref.json b/dev/packages/bibleref.json
index 81574b431..6eb707655 100644
--- a/dev/packages/bibleref.json
+++ b/dev/packages/bibleref.json
@@ -9,6 +9,9 @@
     "bibleverse{}": {
       "snippet": "bibleverse{${1:book title}}"
     },
+    "bibleverse{}()": {
+      "snippet": "bibleverse{${1:book title}}(${2:chapter:verse})"
+    },
     "BRvrsep": {},
     "BRvsep": {},
     "BRchsep": {},
@@ -33,16 +36,40 @@
     "ibibleverse{}": {
       "snippet": "ibibleverse{${1:book title}}"
     },
+    "ibibleverse{}()": {
+      "snippet": "ibibleverse{${1:book title}}(${2:chapter:verse})"
+    },
+    "ibibleverse[]{}()": {
+      "snippet": "ibibleverse[${2:format}]{${1:book title}}(${3:chapter:verse})"
+    },
     "bvidxpgformat": {},
     "ibiblechvs{}": {
       "snippet": "ibiblechvs{${1:book title}}"
     },
+    "ibiblechvs{}()": {
+      "snippet": "ibiblechvs{${1:book title}}(${2:chapter:verse})"
+    },
+    "ibiblechvs[]{}()": {
+      "snippet": "ibiblechvs[${2:format}]{${1:book title}}(${3:chapter:verse})"
+    },
     "ibiblevs{}": {
       "snippet": "ibiblevs{${1:book title}}"
     },
+    "ibiblevs{}()": {
+      "snippet": "ibiblevs{${1:book title}}(${2:chapter:verse})"
+    },
+    "ibiblevs[]{}()": {
+      "snippet": "ibiblevs[${2:format}]{${1:book title}}(${3:chapter:verse})"
+    },
     "ibible{}": {
       "snippet": "ibible{${1:book title}}"
     },
+    "ibible{}()": {
+      "snippet": "ibible{${1:book title}}(${2:chapter:verse})"
+    },
+    "ibible[]{}()": {
+      "snippet": "ibible[${2:format}]{${1:book title}}(${3:chapter:verse})"
+    },
     "biblerefcategory{}": {
       "snippet": "biblerefcategory{${1:category title}}"
     },
diff --git a/dev/packages/bibpes.json b/dev/packages/bibpes.json
new file mode 100644
index 000000000..373bde2f8
--- /dev/null
+++ b/dev/packages/bibpes.json
@@ -0,0 +1,29 @@
+{
+  "includes": {
+    "xkeyval": []
+  },
+  "macros": {
+    "reportOnBibPes": {},
+    "readbackDefFile": {},
+    "bibpesBody": {},
+    "ifreadOK": {},
+    "readOKtrue": {},
+    "readOKfalse": {},
+    "inbiblepassage": {},
+    "outbiblepassage": {},
+    "iwo": {},
+    "FN": {},
+    "CO": {},
+    "CF": {}
+  },
+  "envs": {},
+  "options": [
+    "infolder=${1:file path}",
+    "outfolder=${1:file path}",
+    "txtfilein=${1:base name}",
+    "deffileout=${1:base name}",
+    "build",
+    "!build"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/bidi.json b/dev/packages/bidi.json
new file mode 100644
index 000000000..55bb06238
--- /dev/null
+++ b/dev/packages/bidi.json
@@ -0,0 +1,341 @@
+{
+  "includes": {
+    "xetex": [],
+    "iftex": [],
+    "biditools": [],
+    "zref-abspage": [],
+    "auxhook": [],
+    "ltxcmds": [],
+    "xkeyval": [],
+    "bidi-perpage": [
+      "perpagefootnote",
+      "perpagefootnote=on"
+    ]
+  },
+  "macros": {
+    "normalfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "twocolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "threecolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "fourcolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "fivecolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "sixcolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "sevencolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "eightcolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "ninecolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "tencolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "RTLcolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "LTRcolumnfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "paragraphfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "setLTRparagraphfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "setRTLparagraphfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "TwoColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "ThreeColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "FourColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "FiveColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "SixColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "SevenColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "EightColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "NineColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "TenColumnFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "ParagraphFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "NormalRTLParaLTRFootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "AddExtraParaSkip{}": {
+      "snippet": "AddExtraParaSkip{${1:arg}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "extrafeetendmini": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "extrafeetendminihook": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "extrafeetins": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "extrafeetinshook": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "FeetAboveFloat": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "FeetAtBottom": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "FeetBelowFloat": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "FeetBelowRagged": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "footfootmark": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "footfudgefactor": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "footinsdim": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "footmarkstyle{}": {
+      "snippet": "footmarkstyle{${1:text}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "footmarkwidth": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "footscript{}": {
+      "snippet": "footscript{${1:arg}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "foottextfont": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "LTRfootfootmark": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "LTRfootmarkstyle{}": {
+      "snippet": "LTRfootmarkstyle{${1:text}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "LTRfootscript{}": {
+      "snippet": "LTRfootscript{${1:arg}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "LTRfoottextfont": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "multiplefootnotemarker": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "normalRTLparaLTRfootnotes": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "RTLfootfootmark": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "RTLfootmarkstyle{}": {
+      "snippet": "RTLfootmarkstyle{${1:text}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "RTLfootscript{}": {
+      "snippet": "RTLfootscript{${1:arg}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "RTLfoottextfont": {
+      "option": "extrafootnotefeatures=on"
+    },
+    "setSingleSpace{}": {
+      "snippet": "setSingleSpace{${1:number}}",
+      "option": "extrafootnotefeatures=on"
+    },
+    "DetectColumn{}{}": {
+      "snippet": "DetectColumn{${1:arg1}}{${2:arg2}}",
+      "option": "DetectColumn=on"
+    },
+    "DetectColumn[]{}{}": {
+      "snippet": "DetectColumn[${3:opt}]{${1:arg1}}{${2:arg2}}",
+      "option": "DetectColumn=on"
+    },
+    "bidiversion": {},
+    "bididate": {},
+    "bidireleasename": {},
+    "TeXXeTOn": {},
+    "TeXXeTOff": {},
+    "setLTR": {},
+    "setLR": {},
+    "unsetRL": {},
+    "unsetRTL": {},
+    "setRTL": {},
+    "setRL": {},
+    "unsetLTR": {},
+    "LRE{}": {
+      "snippet": "LRE{${1:text}}"
+    },
+    "LR{}": {
+      "snippet": "LR{${1:text}}"
+    },
+    "RLE{}": {
+      "snippet": "RLE{${1:text}}"
+    },
+    "RL{}": {
+      "snippet": "RL{${1:text}}"
+    },
+    "LTRfootnote{}": {
+      "snippet": "LTRfootnote{${1:text}}"
+    },
+    "LTRfootnote[]{}": {
+      "snippet": "LTRfootnote[${2:num}]{${1:text}}"
+    },
+    "RTLfootnote{}": {
+      "snippet": "RTLfootnote{${1:text}}"
+    },
+    "RTLfootnote[]{}": {
+      "snippet": "RTLfootnote[${2:num}]{${1:text}}"
+    },
+    "setfootnoteRL": {},
+    "setfootnoteLR": {},
+    "unsetfootnoteRL": {},
+    "LTRthanks{}": {
+      "snippet": "LTRthanks{${1:text}}"
+    },
+    "RTLthanks{}": {
+      "snippet": "RTLthanks{${1:text}}"
+    },
+    "LTRfootnotetext{}": {
+      "snippet": "LTRfootnotetext{${1:text}}"
+    },
+    "LTRfootnotetext[]{}": {
+      "snippet": "LTRfootnotetext[${2:num}]{${1:text}}"
+    },
+    "RTLfootnotetext{}": {
+      "snippet": "RTLfootnotetext{${1:text}}"
+    },
+    "RTLfootnotetext[]{}": {
+      "snippet": "RTLfootnotetext[${2:num}]{${1:text}}"
+    },
+    "autofootnoterule": {},
+    "rightfootnoterule": {},
+    "leftfootnoterule": {},
+    "LRfootnoterule": {},
+    "textwidthfootnoterule": {},
+    "SplitFootnoteRule": {},
+    "debugfootnotedirection": {},
+    "RTLdblcol": {},
+    "LTRdblcol": {},
+    "XeTeX": {},
+    "XeLaTeX": {},
+    "SepMark{}": {
+      "snippet": "SepMark{${1:mark}}"
+    },
+    "hboxR{}": {
+      "snippet": "hboxR{${1:text}}"
+    },
+    "hboxL{}": {
+      "snippet": "hboxL{${1:text}}"
+    },
+    "vboxR{}": {
+      "snippet": "vboxR{${1:text}}"
+    },
+    "vboxL{}": {
+      "snippet": "vboxL{${1:text}}"
+    },
+    "bidillap": {},
+    "bidirlap": {},
+    "setLTRbibitems": {},
+    "setRTLbibitems": {},
+    "setdefaultbibitems": {},
+    "setRTLmarginpar": {},
+    "setLTRmarginpar": {},
+    "setdefaultmarginpar": {},
+    "LTRmarginpar[]{}": {
+      "snippet": "LTRmarginpar[${2:left-text}]{${1:right-text}}"
+    },
+    "RTLmarginpar[]{}": {
+      "snippet": "RTLmarginpar[${2:left-text}]{${1:right-text}}"
+    },
+    "RTLdfnmakecol": {},
+    "LTRdfnmakecol": {},
+    "RTLmulticolcolumns": {},
+    "LTRmulticolcolumns": {},
+    "bracetext": {},
+    "DigitsDotDashInterCharToks": {},
+    "IfbidiPackageVersion{}{}{}": {
+      "snippet": "IfbidiPackageVersion{${1:version}}{${2:true}}{${3:false}}"
+    },
+    "IfbidiPackageVersionBefore{}{}{}": {
+      "snippet": "IfbidiPackageVersionBefore{${1:version}}{${2:true}}{${3:false}}"
+    },
+    "IfbidiPackageVersionLater{}{}{}": {
+      "snippet": "IfbidiPackageVersionLater{${1:version}}{${2:true}}{${3:false}}"
+    },
+    "pdfencryptsetup{}": {
+      "snippet": "pdfencryptsetup{${1:keyvals}}"
+    },
+    "pLRE": {},
+    "pRLE": {},
+    "setlatin": {},
+    "setLTRtable": {},
+    "setnonlatin": {},
+    "setRTLtable": {},
+    "moreLRE": {},
+    "moreRLE": {}
+  },
+  "envs": {
+    "LTR": {},
+    "RTL": {},
+    "LTRitems": {},
+    "RTLitems": {},
+    "LTRbibitems": {},
+    "RTLbibitems": {},
+    "LTR*": {},
+    "RTL*": {}
+  },
+  "options": [
+    "RTLdocument",
+    "documentdirection=",
+    "tabledirection=",
+    "script=",
+    "rldocument",
+    "footnoterule=",
+    "footnotedirection=",
+    "debugfootnotedirection",
+    "extrafootnotefeatures",
+    "DetectColumn",
+    "logo",
+    "pdfinfo",
+    "perpagefootnote"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/bidishadowtext.json b/dev/packages/bidishadowtext.json
index 41dedfd35..03413beb5 100644
--- a/dev/packages/bidishadowtext.json
+++ b/dev/packages/bidishadowtext.json
@@ -16,7 +16,7 @@
       "snippet": "bidishadowcolor{${1:color}}"
     },
     "bidishadowrgb{}": {
-      "snippet": "bidishadowrgb{${1:r,g,b}}"
+      "snippet": "bidishadowrgb{${1:r,${2:g},b}}"
     },
     "bidishadowtext{}": {
       "snippet": "bidishadowtext{${1:text}}"
diff --git a/dev/packages/bm.json b/dev/packages/bm.json
new file mode 100644
index 000000000..10e091440
--- /dev/null
+++ b/dev/packages/bm.json
@@ -0,0 +1,39 @@
+{
+  "includes": {},
+  "macros": {
+    "bm{}": {
+      "snippet": "bm{${1:math expression}}"
+    },
+    "hm{}": {
+      "snippet": "hm{${1:math expression}}"
+    },
+    "bmdefine{}{}": {
+      "snippet": "bmdefine{${1:cmd}}{${2:def}}"
+    },
+    "hmdefine{}{}": {
+      "snippet": "hmdefine{${1:cmd}}{${2:def}}"
+    },
+    "boldsymbol{}": {
+      "snippet": "boldsymbol{${1:math expression}}"
+    },
+    "heavysymbol{}": {
+      "snippet": "heavysymbol{${1:math expression}}"
+    },
+    "DeclareBoldMathCommand[]{}{}": {
+      "snippet": "DeclareBoldMathCommand[${3:math version}]{${1:cmd}}{${2:def}}"
+    },
+    "DeclareBoldMathCommand{}{}": {
+      "snippet": "DeclareBoldMathCommand{${1:cmd}}{${2:def}}"
+    },
+    "bmmax": {},
+    "hmmax": {}
+  },
+  "envs": {},
+  "options": [
+    "nopmb",
+    "warn",
+    "info",
+    "silent"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/bondcolor.json b/dev/packages/bondcolor.json
index 6ff348748..3a714844e 100644
--- a/dev/packages/bondcolor.json
+++ b/dev/packages/bondcolor.json
@@ -36,6 +36,12 @@
     "redx{}": {
       "snippet": "redx{${1:content}}"
     },
+    "replaceSKbond()(){}{}": {
+      "snippet": "replaceSKbond(${3:xstart},${4:ystart})(${5:xslope},${6:yslope}){${1:bdlength}}{${2:skelbcolor}}"
+    },
+    "replaceSKbond[]()(){}{}": {
+      "snippet": "replaceSKbond[${3:thickness}](${4:xstart},${5:ystart})(${6:xslope},${7:yslope}){${1:bdlength}}{${2:skelbcolor}}"
+    },
     "thinLineWidth": {},
     "white": {},
     "whitex{}": {
diff --git a/dev/packages/booktabs.json b/dev/packages/booktabs.json
new file mode 100644
index 000000000..e315bafad
--- /dev/null
+++ b/dev/packages/booktabs.json
@@ -0,0 +1,47 @@
+{
+  "includes": {},
+  "macros": {
+    "toprule": {},
+    "toprule[]": {
+      "snippet": "toprule[${1:line width}]"
+    },
+    "midrule": {},
+    "midrule[]": {
+      "snippet": "midrule[${1:line width}]"
+    },
+    "bottomrule": {},
+    "bottomrule[]": {
+      "snippet": "bottomrule[${1:line width}]"
+    },
+    "cmidrule{}": {
+      "snippet": "cmidrule{${1:a-b}}"
+    },
+    "cmidrule(){}": {
+      "snippet": "cmidrule(${2:trim}){${1:a-b}}"
+    },
+    "cmidrule[](){}": {
+      "snippet": "cmidrule[${2:line width}](${3:trim}){${1:a-b}}"
+    },
+    "morecmidrules": {},
+    "specialrule{}{}{}": {
+      "snippet": "specialrule{${1:line width}}{${2:above space}}{${3:below space}}"
+    },
+    "addlinespace": {},
+    "addlinespace[]": {
+      "snippet": "addlinespace[${1:vspace}]"
+    },
+    "heavyrulewidth": {},
+    "lightrulewidth": {},
+    "cmidrulewidth": {},
+    "belowrulesep": {},
+    "belowbottomsep": {},
+    "aboverulesep": {},
+    "abovetopsep": {},
+    "cmidrulesep": {},
+    "cmidrulekern": {},
+    "defaultaddspace": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/bxeepic.json b/dev/packages/bxeepic.json
index ee98abb15..32a660df5 100644
--- a/dev/packages/bxeepic.json
+++ b/dev/packages/bxeepic.json
@@ -16,8 +16,26 @@
     "flushjoin": {},
     "noeepicdottedlines": {},
     "spacewidth": {},
+    "multiputlist()(){}": {
+      "snippet": "multiputlist(${2:x},${3:y})(${4:Δx},${5:Δy}){${1:item1,${6:item2},...}}"
+    },
+    "multiputlist()()[]{}": {
+      "snippet": "multiputlist(${3:x},${4:y})(${5:Δx},${6:Δy})[${2:pos}]{${1:item1,${7:item2},...}}"
+    },
+    "matrixput()(){}(){}{}": {
+      "snippet": "matrixput(${4:x},${5:y})(${6:Δx1},${7:Δy1}){${1:n1}}(${8:Δx2},${9:Δy2}){${2:n2}}{${3:object}}"
+    },
+    "grid()()": {
+      "snippet": "grid(${1:width},${2:height})(${3:Δwidth},${4:Δheight})"
+    },
+    "grid()()[]": {
+      "snippet": "grid(${2:width},${3:height})(${4:Δwidth},${5:Δheight})[${1:x0,y0}]"
+    },
     "dashlinestretch": {},
     "drawlinestretch": {},
+    "jput(){}": {
+      "snippet": "jput(${2:x},${3:y}){${1:object}}"
+    },
     "picsquare": {},
     "putfile{}{}": {
       "snippet": "putfile{${1:file}}{${2:object}}"
@@ -28,12 +46,21 @@
     "enddashjoin": {},
     "enddottedjoin": {},
     "enddrawjoin": {},
+    "line(){}": {
+      "snippet": "line(${2:x},${3:y}){${1:length}}"
+    },
     "circle{}": {
       "snippet": "circle{${1:diameter}}"
     },
     "circle*{}": {
       "snippet": "circle*{${1:diameter}}"
     },
+    "oval()": {
+      "snippet": "oval(${1:width},${2:height})"
+    },
+    "oval()[]": {
+      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
+    },
     "maxovaldiam": {},
     "allinethickness{}": {
       "snippet": "allinethickness{${1:dimen}}"
diff --git a/dev/packages/bxorigcapt.json b/dev/packages/bxorigcapt.json
index 6f968b4dd..caabc8707 100644
--- a/dev/packages/bxorigcapt.json
+++ b/dev/packages/bxorigcapt.json
@@ -7,7 +7,7 @@
       "snippet": "bxDebug{${1:message}}"
     },
     "bxorigcaptDeprecateCommand{}": {
-      "snippet": "bxorigcaptDeprecateCommand{${1:csname1,csname2,...}}"
+      "snippet": "bxorigcaptDeprecateCommand{${1:csname1,${2:csname2},...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/calc.json b/dev/packages/calc.json
new file mode 100644
index 000000000..5ad2bef91
--- /dev/null
+++ b/dev/packages/calc.json
@@ -0,0 +1,47 @@
+{
+  "includes": {},
+  "macros": {
+    "setcounter{}{}": {
+      "snippet": "setcounter{${1:ctr}}{${2:num}}"
+    },
+    "addtocounter{}{}": {
+      "snippet": "addtocounter{${1:ctr}}{${2:num}}"
+    },
+    "setlength{}{}": {
+      "snippet": "setlength{${1:cmd}}{${2:len}}"
+    },
+    "addtolength{}{}": {
+      "snippet": "addtolength{${1:cmd}}{${2:len}}"
+    },
+    "real{}": {
+      "snippet": "real{${1:decimal constant}}"
+    },
+    "ratio{}{}": {
+      "snippet": "ratio{${1:dimen expression}}{${2:dimen expression}}"
+    },
+    "widthof{}": {
+      "snippet": "widthof{${1:text}}"
+    },
+    "heightof{}": {
+      "snippet": "heightof{${1:text}}"
+    },
+    "depthof{}": {
+      "snippet": "depthof{${1:text}}"
+    },
+    "totalheightof{}": {
+      "snippet": "totalheightof{${1:text}}"
+    },
+    "settototalheight{}{}": {
+      "snippet": "settototalheight{${1:cmd}}{${2:text}}"
+    },
+    "maxof{}{}": {
+      "snippet": "maxof{${1:type expression}}{${2:type expression}}"
+    },
+    "minof{}{}": {
+      "snippet": "minof{${1:type expression}}{${2:type expression}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/callouts.json b/dev/packages/callouts.json
new file mode 100644
index 000000000..0500e17d7
--- /dev/null
+++ b/dev/packages/callouts.json
@@ -0,0 +1,42 @@
+{
+  "includes": {
+    "tikz": [],
+    "tikzlibrarycalc": [],
+    "xifthen": [],
+    "kvoptions": []
+  },
+  "macros": {
+    "helpgrid": {},
+    "helpgrid[]": {
+      "snippet": "helpgrid[${1:color}]"
+    },
+    "callout{}{}{}": {
+      "snippet": "callout{${1:center-coords}}{${2:note}}{${3:tip-coords}}"
+    },
+    "note{}{}": {
+      "snippet": "note{${1:coords}}{${2:note}}"
+    },
+    "arrow{}{}": {
+      "snippet": "arrow{${1:center-coords}}{${2:tip-coords}}"
+    },
+    "focol": {},
+    "bgcol": {},
+    "arcol": {},
+    "xtic": {},
+    "ytic": {}
+  },
+  "envs": {
+    "annotate{}{}": {
+      "name": "annotate",
+      "snippet": "{${1:object}}{${2:width-factor}}"
+    }
+  },
+  "options": [
+    "bwr",
+    "wby",
+    "bww",
+    "background=",
+    "arrow="
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/caption.json b/dev/packages/caption.json
new file mode 100644
index 000000000..e597820dc
--- /dev/null
+++ b/dev/packages/caption.json
@@ -0,0 +1,153 @@
+{
+  "includes": {
+    "caption3": [],
+    "ltcaption": [],
+    "setspace": [
+      "font=onehalfspacing",
+      "labelfont=onehalfspacing",
+      "textfont=onehalfspacing",
+      "font+=onehalfspacing",
+      "labelfont+=onehalfspacing",
+      "textfont+=onehalfspacing",
+      "font=doublespacing",
+      "labelfont=doublespacing",
+      "textfont=doublespacing",
+      "font+=doublespacing",
+      "labelfont+=doublespacing",
+      "textfont+=doublespacing"
+    ],
+    "sansmath": [
+      "font=sansmath",
+      "labelfont=sansmath",
+      "textfont=sansmath",
+      "font+=sansmath",
+      "labelfont+=sansmath",
+      "textfont+=sansmath"
+    ],
+    "ragged2e": [
+      "justification=RaggedRight",
+      "justification=RaggedLeft",
+      "justification=Justified",
+      "justification=Centering",
+      "justification=RaggedRight",
+      "justification=RaggedLeft"
+    ]
+  },
+  "macros": {
+    "caption*{}": {
+      "snippet": "caption*{${1:heading}}"
+    },
+    "captionof{}[]{}": {
+      "snippet": "captionof{${1:float type}}[${2:list entry}]{${3:heading}}"
+    },
+    "captionof{}{}": {
+      "snippet": "captionof{${1:float type}}{${2:heading}}"
+    },
+    "captionof*{}{}": {
+      "snippet": "captionof*{${1:float type}}{${2:heading}}"
+    },
+    "captionlistentry[]{}": {
+      "snippet": "captionlistentry[${2:float type}]{${1:list entry}}"
+    },
+    "captionlistentry{}": {
+      "snippet": "captionlistentry{${1:list entry}}"
+    },
+    "ContinuedFloat": {},
+    "ContinuedFloat*": {},
+    "theContinuedFloat": {},
+    "piccaptiontype{}": {
+      "snippet": "piccaptiontype{${1:float type}}"
+    },
+    "captionbox*{}[][]{}": {
+      "snippet": "captionbox*{${1:heading}}[${2:width}][${3:inner-pos}]{${4:content}}"
+    },
+    "captionbox*{}[]{}": {
+      "snippet": "captionbox*{${1:heading}}[${2:width}]{${3:content}}"
+    },
+    "captionbox*{}{}": {
+      "snippet": "captionbox*{${1:heading}}{${2:content}}"
+    },
+    "captionbox[]{}[][]{}": {
+      "snippet": "captionbox[${3:list entry}]{${1:heading}}[${4:width}][${5:inner-pos}]{${2:content}}"
+    },
+    "captionbox[]{}[]{}": {
+      "snippet": "captionbox[${3:list entry}]{${1:heading}}[${4:width}]{${2:content}}"
+    },
+    "captionbox[]{}{}": {
+      "snippet": "captionbox[${3:list entry}]{${1:heading}}{${2:content}}"
+    },
+    "captionbox{}[][]{}": {
+      "snippet": "captionbox{${1:heading}}[${2:width}][${3:inner-pos}]{${4:content}}"
+    },
+    "captionbox{}[]{}": {
+      "snippet": "captionbox{${1:heading}}[${2:width}]{${3:content}}"
+    },
+    "captionbox{}{}": {
+      "snippet": "captionbox{${1:heading}}{${2:content}}"
+    },
+    "captiontext*[]{}": {
+      "snippet": "captiontext*[${2:number}]{${1:text}}"
+    },
+    "captiontext*{}": {
+      "snippet": "captiontext*{${1:text}}"
+    },
+    "captiontext[]{}": {
+      "snippet": "captiontext[${2:number}]{${1:text}}"
+    },
+    "captiontext{}": {
+      "snippet": "captiontext{${1:text}}"
+    },
+    "flushsubcaptionlistentries": {},
+    "nextfloat": {},
+    "nextfloat*": {},
+    "phantomcaption": {},
+    "setcaptionsubtype*": {},
+    "setcaptionsubtype{}": {
+      "snippet": "setcaptionsubtype{${1:float type}}"
+    },
+    "setcaptiontype*": {},
+    "setcaptiontype{}": {
+      "snippet": "setcaptiontype{${1:float type}}"
+    },
+    "subcaptionsetup[]{}": {
+      "snippet": "subcaptionsetup[${2:float type}]{${1:options}}"
+    },
+    "subcaptionsetup{}": {
+      "snippet": "subcaptionsetup{${1:options}}"
+    },
+    "subcaptionsetup*[]{}": {
+      "snippet": "subcaptionsetup*[${2:float type}]{${1:options}}"
+    },
+    "subcaptionsetup*{}": {
+      "snippet": "subcaptionsetup*{${1:options}}"
+    },
+    "continuedfloat": {},
+    "thecontinuedfloat": {}
+  },
+  "envs": {
+    "captionblock{}": {
+      "name": "captionblock",
+      "snippet": "{${1:width}}"
+    },
+    "captionblock[]{}": {
+      "name": "captionblock",
+      "snippet": "[${2:position}]{${1:width}}"
+    },
+    "captionblock[][]{}": {
+      "name": "captionblock",
+      "snippet": "[${2:position}][${3:height}]{${1:width}}"
+    },
+    "captionblock[][][]{}": {
+      "name": "captionblock",
+      "snippet": "[${2:position}][${3:height}][${4:inner-pos}]{${1:width}}"
+    },
+    "captiongroup": {},
+    "captiongroup*": {},
+    "longtable*": {}
+  },
+  "options": [
+    "compatibility",
+    "config=${1:file name}"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/catppuccinpalette.json b/dev/packages/catppuccinpalette.json
new file mode 100644
index 000000000..9e2cbd0f6
--- /dev/null
+++ b/dev/packages/catppuccinpalette.json
@@ -0,0 +1,15 @@
+{
+  "includes": {
+    "pgfopts": [],
+    "xcolor": []
+  },
+  "macros": {},
+  "envs": {},
+  "options": [
+    "style=",
+    "textcolor",
+    "pagecolor",
+    "styleAll"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/censor.json b/dev/packages/censor.json
new file mode 100644
index 000000000..31c704337
--- /dev/null
+++ b/dev/packages/censor.json
@@ -0,0 +1,60 @@
+{
+  "includes": {
+    "pbox": [],
+    "tokcycle": []
+  },
+  "macros": {
+    "blackout{}": {
+      "snippet": "blackout{${1:text}}"
+    },
+    "blackoutenv": {},
+    "censor*{}": {
+      "snippet": "censor*{${1:width multiplier}}"
+    },
+    "censor{}": {
+      "snippet": "censor{${1:text}}"
+    },
+    "censorbox*[]{}{}{}": {
+      "snippet": "censorbox*[${4:pre-commands}]{${1:width mult}}{${2:height mult}}{${3:depth mult}}"
+    },
+    "censorbox*{}{}{}": {
+      "snippet": "censorbox*{${1:width mult}}{${2:height mult}}{${3:depth mult}}"
+    },
+    "censorbox[]{}": {
+      "snippet": "censorbox[${2:pre-commands}]{${1:contents}}"
+    },
+    "censorbox{}": {
+      "snippet": "censorbox{${1:contents}}"
+    },
+    "censordot": {},
+    "censormathgreekfalse": {},
+    "censormathgreektrue": {},
+    "censorrule{}": {
+      "snippet": "censorrule{${1:length}}"
+    },
+    "censorruledepth": {},
+    "censorruleheight": {},
+    "endblackoutenv": {},
+    "endxblackoutenv": {},
+    "RestartCensoring": {},
+    "StopCensoring": {},
+    "xblackout{}": {
+      "snippet": "xblackout{${1:text}}"
+    },
+    "xblackoutenv": {},
+    "ccenspace": {},
+    "censorfalse": {},
+    "censortrue": {},
+    "censorversiondate": {},
+    "censorversionnumber": {},
+    "censpace": {},
+    "expandargfalse": {},
+    "expandargtrue": {},
+    "ifcensor": {},
+    "ifcensormathgreek": {},
+    "ifexpandarg": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/cesenaexam.json b/dev/packages/cesenaexam.json
new file mode 100644
index 000000000..23ae3fb27
--- /dev/null
+++ b/dev/packages/cesenaexam.json
@@ -0,0 +1,74 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "graphicx": [],
+    "tikz": [],
+    "circuitikz": [],
+    "tikzlibraryintersections": [],
+    "tikzlibrarypositioning": [],
+    "tikzlibraryfit": [],
+    "tikzlibrarycalc": [],
+    "tikzlibrarythrough": [],
+    "tikzlibrarybabel": [],
+    "tikzlibrarydecorations.pathmorphing": [],
+    "tikzlibrarybackgrounds": [],
+    "titlesec": []
+  },
+  "macros": {
+    "examsection{}{}": {
+      "snippet": "examsection{${1:title}}{${2:italic text}}"
+    },
+    "examsection*{}{}": {
+      "snippet": "examsection*{${1:title}}{${2:italic text}}"
+    },
+    "boxempty": {},
+    "boxcheck": {},
+    "examparts{}": {
+      "snippet": "examparts{${1:content}}"
+    },
+    "maketitle{}{}{}{}{}": {
+      "snippet": "maketitle{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}"
+    },
+    "maketitle[]{}{}{}{}{}": {
+      "snippet": "maketitle[${6:options}]{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "maketitle*{}{}{}{}{}": {
+      "snippet": "maketitle*{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}"
+    },
+    "maketitle*[]{}{}{}{}{}": {
+      "snippet": "maketitle*[${6:options}]{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "examtwoblocks{}{}{}{}": {
+      "snippet": "examtwoblocks{${1:length1}}{${2:length2}}{${3:block1}}{${4:block2}}"
+    },
+    "examtwoblockstop{}{}{}{}": {
+      "snippet": "examtwoblockstop{${1:length1}}{${2:length2}}{${3:block1}}{${4:block2}}"
+    },
+    "examoneblocktop{}{}": {
+      "snippet": "examoneblocktop{${1:length}}{${2:block}}"
+    },
+    "sectionfont": {},
+    "boxlen": {},
+    "cesenaexamversion": {},
+    "lastboxlen": {},
+    "minheighttypebox": {}
+  },
+  "envs": {},
+  "options": [
+    "boxed"
+  ],
+  "keyvals": [
+    [
+      "textboxheight=",
+      "whiteboxheight=",
+      "textboxone={${1:content}}",
+      "textboxtwo={${1:content}}",
+      "textboxthree={${1:content}}",
+      "textboxfour={${1:content}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/cgloss4e.json b/dev/packages/cgloss4e.json
index 8e293074f..4bcb47bbe 100644
--- a/dev/packages/cgloss4e.json
+++ b/dev/packages/cgloss4e.json
@@ -22,6 +22,9 @@
       "snippet": "lastword{${1:each}}{${2:line box}}{${3:word box}}"
     },
     "testdone": {},
+    "getwords()": {
+      "snippet": "getwords(${1:line box},${2:each})"
+    },
     "more": {},
     "donewords": {},
     "twosent": {},
diff --git a/dev/packages/chapterbib.json b/dev/packages/chapterbib.json
new file mode 100644
index 000000000..38328bff3
--- /dev/null
+++ b/dev/packages/chapterbib.json
@@ -0,0 +1,38 @@
+{
+  "includes": {},
+  "macros": {
+    "cbinput{}": {
+      "snippet": "cbinput{${1:file}}"
+    },
+    "sectionbib{}{}": {
+      "snippet": "sectionbib{${1:section cmd}}{${2:section name}}"
+    },
+    "CitationPrefix{}": {
+      "snippet": "CitationPrefix{${1:prefix code}}"
+    },
+    "FinalBibTitles": {},
+    "FinalBibPrefix": {},
+    "StartFinalBibs": {},
+    "CBMainSectioning": {},
+    "citeform{}": {
+      "snippet": "citeform{${1:arg}}"
+    },
+    "citepunct": {},
+    "bibname": {},
+    "bibcite{}": {
+      "snippet": "bibcite{${1:arg}}"
+    },
+    "bibsection": {}
+  },
+  "envs": {
+    "cbunit": {}
+  },
+  "options": [
+    "sectionbib",
+    "draft",
+    "rootbib",
+    "duplicate",
+    "gather"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/chemcompounds.json b/dev/packages/chemcompounds.json
index de42bf0b8..cf85df32d 100644
--- a/dev/packages/chemcompounds.json
+++ b/dev/packages/chemcompounds.json
@@ -8,10 +8,10 @@
       "snippet": "declarecompound[${2:name}]{${1:label}}"
     },
     "compound{}": {
-      "snippet": "compound{${1:label1,label2,...}}"
+      "snippet": "compound{${1:label1,${2:label2},...}}"
     },
     "compound*{}": {
-      "snippet": "compound*{${1:label1,label2,...}}"
+      "snippet": "compound*{${1:label1,${2:label2},...}}"
     },
     "compoundseparator": {},
     "compoundglobalprefix": {},
diff --git a/dev/packages/chemfig.json b/dev/packages/chemfig.json
new file mode 100644
index 000000000..272bed015
--- /dev/null
+++ b/dev/packages/chemfig.json
@@ -0,0 +1,243 @@
+{
+  "includes": {
+    "simplekv": [],
+    "tikz": []
+  },
+  "macros": {
+    "chemfig{}": {
+      "snippet": "chemfig{${1:code}}"
+    },
+    "chemfig[]{}": {
+      "snippet": "chemfig[${2:options}]{${1:code}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "setchemfig{}": {
+      "snippet": "setchemfig{${1:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "resetchemfig": {},
+    "printatom{}": {
+      "snippet": "printatom{${1:code}}"
+    },
+    "hflipnext": {},
+    "vflipnext": {},
+    "definesubmol{}{}": {
+      "snippet": "definesubmol{${1:name}}{${2:code}}"
+    },
+    "definesubmol{}[]{}": {
+      "snippet": "definesubmol{${1:name}}[${2:code1}]{${3:code2}}"
+    },
+    "redefinesubmol{}{}": {
+      "snippet": "redefinesubmol{${1:name}}{${2:code}}"
+    },
+    "redefinesubmol{}[]{}": {
+      "snippet": "redefinesubmol{${1:name}}[${2:code1}]{${3:code2}}"
+    },
+    "chemskipalign": {},
+    "setcharge{}": {
+      "snippet": "setcharge{${1:options}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "resetcharge": {},
+    "chargeangle": {},
+    "chemabove{}{}": {
+      "snippet": "chemabove{${1:txt1}}{${2:txt2}}"
+    },
+    "chemabove[]{}{}": {
+      "snippet": "chemabove[${3:dim}]{${1:txt1}}{${2:txt2}}"
+    },
+    "chembelow{}{}": {
+      "snippet": "chembelow{${1:txt1}}{${2:txt2}}"
+    },
+    "chembelow[]{}{}": {
+      "snippet": "chembelow[${3:dim}]{${1:txt1}}{${2:txt2}}"
+    },
+    "Chemabove{}{}": {
+      "snippet": "Chemabove{${1:txt1}}{${2:txt2}}"
+    },
+    "Chemabove[]{}{}": {
+      "snippet": "Chemabove[${3:dim}]{${1:txt1}}{${2:txt2}}"
+    },
+    "Chembelow{}{}": {
+      "snippet": "Chembelow{${1:txt1}}{${2:txt2}}"
+    },
+    "Chembelow[]{}{}": {
+      "snippet": "Chembelow[${3:dim}]{${1:txt1}}{${2:txt2}}"
+    },
+    "chemname{}{}": {
+      "snippet": "chemname{${1:molecule}}{${2:name}}"
+    },
+    "chemname[]{}{}": {
+      "snippet": "chemname[${3:dim}]{${1:molecule}}{${2:name}}"
+    },
+    "chemname*{}": {
+      "snippet": "chemname*{${1:name}}"
+    },
+    "chemnameinit{}": {
+      "snippet": "chemnameinit{${1:arg}}"
+    },
+    "schemestart": {},
+    "schemestart[]": {
+      "snippet": "schemestart[${1:angle,${2:coeff},style}]"
+    },
+    "schemestart[][]": {
+      "snippet": "schemestart[${1:angle,${3:coeff},style}][${2:position}]"
+    },
+    "schemestop": {},
+    "arrow": {},
+    "arrow[]": {
+      "snippet": "arrow[${1:angle,${2:coeff},style}]"
+    },
+    "arrow{}": {
+      "snippet": "arrow{${1:type}}"
+    },
+    "arrow{}[]": {
+      "snippet": "arrow{${1:type}}[${2:angle,${3:coeff},style}]"
+    },
+    "setcompoundstyle{}": {
+      "snippet": "setcompoundstyle{${1:TikZ code}}"
+    },
+    "subscheme{}": {
+      "snippet": "subscheme{${1:code}}"
+    },
+    "definearrow{}{}{}": {
+      "snippet": "definearrow{${1:number}}{${2:name}}{${3:code}}"
+    },
+    "chemleft{}": {
+      "snippet": "chemleft{${1:delim}}"
+    },
+    "chemright{}": {
+      "snippet": "chemright{${1:delim}}"
+    },
+    "chemup{}": {
+      "snippet": "chemup{${1:delim}}"
+    },
+    "chemdown{}": {
+      "snippet": "chemdown{${1:delim}}"
+    },
+    "polymerdelim{}{}": {
+      "snippet": "polymerdelim{${1:node1}}{${2:node2}}"
+    },
+    "polymerdelim[]{}{}": {
+      "snippet": "polymerdelim[${3:options}]{${1:node1}}{${2:node2}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "CFver": {},
+    "CFname": {},
+    "CFdate": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "chemfig style={${1:TikZ keys}}",
+      "atom style={${1:TikZ keys}}",
+      "bond join",
+      "fixed length",
+      "cram rectangle",
+      "cram width=",
+      "cram dash width=",
+      "cram dash sep=",
+      "atom sep=",
+      "bond offset=",
+      "double bond sep=",
+      "angle increment=${1:degrees}",
+      "node style={${1:TikZ keys}}",
+      "bond style={${1:TikZ keys}}",
+      "cycle radius coeff=",
+      "stack sep=",
+      "show cntcycle",
+      "autoreset cntcycle",
+      "compound style={${1:TikZ keys}}",
+      "compound sep=",
+      "arrow offset=",
+      "arrow angle=${1:degrees}",
+      "arrow coeff=${1:decimal}",
+      "arrow style={${1:TikZ keys}}",
+      "arrow double sep=",
+      "arrow double coeff=",
+      "arrow double harpoon",
+      "arrow label sep=",
+      "arrow head=",
+      "+ sep left=",
+      "+ sep right=",
+      "+ vshift=",
+      "gchemname",
+      "schemestart code=${1:code}",
+      "schemestop code=${1:code}",
+      "baseline="
+    ],
+    [
+      "chemfig style={${1:TikZ keys}}",
+      "atom style={${1:TikZ keys}}",
+      "bond join",
+      "fixed length",
+      "cram rectangle",
+      "cram width=",
+      "cram dash width=",
+      "cram dash sep=",
+      "atom sep=",
+      "bond offset=",
+      "double bond sep=",
+      "angle increment=${1:degrees}",
+      "node style={${1:TikZ keys}}",
+      "bond style={${1:TikZ keys}}",
+      "cycle radius coeff=",
+      "stack sep=",
+      "show cntcycle",
+      "autoreset cntcycle",
+      "compound style={${1:TikZ keys}}",
+      "compound sep=",
+      "arrow offset=",
+      "arrow angle=${1:degrees}",
+      "arrow coeff=${1:decimal}",
+      "arrow style={${1:TikZ keys}}",
+      "arrow double sep=",
+      "arrow double coeff=",
+      "arrow double harpoon",
+      "arrow label sep=",
+      "arrow head=",
+      "+ sep left=",
+      "+ sep right=",
+      "+ vshift=",
+      "gchemname",
+      "schemestart code=${1:code}",
+      "schemestop code=${1:code}",
+      "baseline=",
+      "debug",
+      "scheme debug"
+    ],
+    [
+      "debug",
+      "macro atom=${1:cmd}",
+      "circle",
+      "macro charge=${1:cmd}",
+      "extra sep=",
+      "overlay",
+      "shortcuts",
+      "lewisautorot",
+      ".radius=",
+      ":sep=",
+      ".style={${1:TikZ keys}}",
+      "\"length=",
+      "\"width=",
+      "\"style={${1:TikZ keys}}",
+      "|style={${1:TikZ keys}}"
+    ],
+    [
+      "delimiters=",
+      "height=",
+      "depth=",
+      "h align",
+      "auto rotate",
+      "rotate=${1:degrees}",
+      "open xshift=",
+      "close x shift=",
+      "indice=${1:integer}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/chemformula-ru.json b/dev/packages/chemformula-ru.json
index f5daacc88..aa30379be 100644
--- a/dev/packages/chemformula-ru.json
+++ b/dev/packages/chemformula-ru.json
@@ -1,5 +1,7 @@
 {
-  "includes": {},
+  "includes": {
+    "chemformula": []
+  },
   "macros": {},
   "envs": {},
   "options": [
diff --git a/dev/packages/chemformula.json b/dev/packages/chemformula.json
index 26d290ca6..38486ecd5 100644
--- a/dev/packages/chemformula.json
+++ b/dev/packages/chemformula.json
@@ -115,6 +115,9 @@
     "charrow{}[][]": {
       "snippet": "charrow{${1:type}}[${2:above}][${3:below}]"
     },
+    "chname()()": {
+      "snippet": "chname(${1:text 1})(${2:text 2})"
+    },
     "chlewis{}{}": {
       "snippet": "chlewis{${1:electron spec}}{${2:atom}}"
     },
diff --git a/dev/packages/chemist.json b/dev/packages/chemist.json
new file mode 100644
index 000000000..b941145a7
--- /dev/null
+++ b/dev/packages/chemist.json
@@ -0,0 +1,470 @@
+{
+  "includes": {
+    "assurechemist": []
+  },
+  "macros": {
+    "bury{}": {
+      "snippet": "bury{${1:content}}"
+    },
+    "cdonecell{}{}{}": {
+      "snippet": "cdonecell{${1:dimenA}}{${2:dimenB}}{${3:content}}"
+    },
+    "cdtwocell{}{}{}{}": {
+      "snippet": "cdtwocell{${1:dimenA}}{${2:dimenB}}{${3:content}}{${4:label}}"
+    },
+    "ChemEqFont": {},
+    "ChemForm{}": {
+      "snippet": "ChemForm{${1:formula}}"
+    },
+    "chemform{}": {
+      "snippet": "chemform{${1:formula}}"
+    },
+    "chemistsw": {},
+    "ChemStrut": {},
+    "compd": {},
+    "compdlabel{}": {
+      "snippet": "compdlabel{${1:label}}"
+    },
+    "cref{}": {
+      "snippet": "cref{${1:label}}"
+    },
+    "dbond": {},
+    "degC": {},
+    "degF": {},
+    "deriv": {},
+    "deriva": {},
+    "derivalabel{}": {
+      "snippet": "derivalabel{${1:label}}"
+    },
+    "derivlabel{}": {
+      "snippet": "derivlabel{${1:label}}"
+    },
+    "derivnum": {},
+    "doublebond": {},
+    "eqlbarrowstretch": {},
+    "Equilibarrow": {},
+    "equilibarrow": {},
+    "Equiliblongarrow": {},
+    "equiliblongarrow": {},
+    "fboxit{}{}": {
+      "snippet": "fboxit{${1:width}}{${2:text}}"
+    },
+    "leftshfbox{}": {
+      "snippet": "leftshfbox{${1:text}}"
+    },
+    "leftshframe{}{}": {
+      "snippet": "leftshframe{${1:width}}{${2:text}}"
+    },
+    "Lllongleftarrow": {},
+    "lllongleftarrow": {},
+    "lllongleftharpoondown": {},
+    "lllongleftharpoonup": {},
+    "Lllongleftrightarrow": {},
+    "lllongleftrightarrow": {},
+    "Lllongrightarrow": {},
+    "lllongrightarrow": {},
+    "lllongrightharpoondown": {},
+    "lllongrightharpoonup": {},
+    "Llongleftarrow": {},
+    "llongleftarrow": {},
+    "llongleftharpoondown": {},
+    "llongleftharpoonup": {},
+    "Llongleftrightarrow": {},
+    "llongleftrightarrow": {},
+    "Llongrightarrow": {},
+    "llongrightarrow": {},
+    "llongrightharpoondown": {},
+    "llongrightharpoonup": {},
+    "newchemenvironment{}{}": {
+      "snippet": "newchemenvironment{${1:envname}}{${2:old envname}}"
+    },
+    "nocompd": {},
+    "nocompdlabel{}": {
+      "snippet": "nocompdlabel{${1:label}}"
+    },
+    "noderiv": {},
+    "noderiva": {},
+    "noderivalabel{}": {
+      "snippet": "noderivalabel{${1:label}}"
+    },
+    "noderivlabel{}": {
+      "snippet": "noderivlabel{${1:label}}"
+    },
+    "reactarrowsep": {},
+    "reactarrowseprate": {},
+    "reactdarrow{}{}{}{}": {
+      "snippet": "reactdarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactDEqarrow{}{}{}{}": {
+      "snippet": "reactDEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactdeqarrow{}{}{}{}": {
+      "snippet": "reactdeqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactdlrarrow{}{}{}{}": {
+      "snippet": "reactdlrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactduarrow{}{}{}{}": {
+      "snippet": "reactduarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactEqarrow{}{}{}{}": {
+      "snippet": "reactEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reacteqarrow{}{}{}{}": {
+      "snippet": "reacteqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactlarrow{}{}{}{}": {
+      "snippet": "reactlarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactLEqarrow{}{}{}{}": {
+      "snippet": "reactLEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactleqarrow{}{}{}{}": {
+      "snippet": "reactleqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactlrarrow{}{}{}{}": {
+      "snippet": "reactlrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactnearrow{}{}{}{}": {
+      "snippet": "reactnearrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactnwarrow{}{}{}{}": {
+      "snippet": "reactnwarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactrarrow{}{}{}{}": {
+      "snippet": "reactrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactREqarrow{}{}{}{}": {
+      "snippet": "reactREqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactreqarrow{}{}{}{}": {
+      "snippet": "reactreqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactsearrow{}{}{}{}": {
+      "snippet": "reactsearrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactswarrow{}{}{}{}": {
+      "snippet": "reactswarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactuarrow{}{}{}{}": {
+      "snippet": "reactuarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactUEqarrow{}{}{}{}": {
+      "snippet": "reactUEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactueqarrow{}{}{}{}": {
+      "snippet": "reactueqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactulrarrow{}{}{}{}": {
+      "snippet": "reactulrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactVEqarrow{}{}{}{}": {
+      "snippet": "reactVEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "reactveqarrow{}{}{}{}": {
+      "snippet": "reactveqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "rightshfbox{}": {
+      "snippet": "rightshfbox{${1:text}}"
+    },
+    "rightshframe{}{}": {
+      "snippet": "rightshframe{${1:width}}{${2:text}}"
+    },
+    "schemelarrow{}{}{}{}": {
+      "snippet": "schemelarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "schemelrarrow{}{}{}{}": {
+      "snippet": "schemelrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "schemerarrow{}{}{}{}": {
+      "snippet": "schemerarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
+    },
+    "tbond": {},
+    "tboxtitle": {},
+    "thecompd": {},
+    "triplebond": {},
+    "aaa": {},
+    "agx": {},
+    "agxdv": {},
+    "agxlatent": {},
+    "bbb": {},
+    "Bib": {},
+    "BibTeX": {},
+    "calcontrolpoints{}": {
+      "snippet": "calcontrolpoints{${1:arg1}}"
+    },
+    "Cent": {},
+    "changespace{}": {
+      "snippet": "changespace{${1:arg1}}"
+    },
+    "chapinitial": {},
+    "ChemAccent{}{}{}": {
+      "snippet": "ChemAccent{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "chemcorr": {},
+    "chemGreekletter{}{}": {
+      "snippet": "chemGreekletter{${1:arg1}}{${2:arg2}}"
+    },
+    "chemtimesfalse": {},
+    "chemtimestrue": {},
+    "chemUpGreekletter{}{}{}": {
+      "snippet": "chemUpGreekletter{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "compdfbox{}{}{}": {
+      "snippet": "compdfbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "compdmbox{}{}{}": {
+      "snippet": "compdmbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "cyandv": {},
+    "cyandye": {},
+    "deHBr": {},
+    "derivfbox{}{}{}": {
+      "snippet": "derivfbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "derivlist{}": {
+      "snippet": "derivlist{${1:arg1}}"
+    },
+    "derivmbox{}{}{}": {
+      "snippet": "derivmbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "downwardarrowcalcA": {},
+    "downwardarrowcalcB": {},
+    "endash": {},
+    "eqproton": {},
+    "ffparbox{}{}": {
+      "snippet": "ffparbox{${1:arg1}}{${2:arg2}}"
+    },
+    "fgcaption": {},
+    "horizon": {},
+    "ifchemtimes": {},
+    "ifupgreekrm": {},
+    "ifverbswitch": {},
+    "jBibTeX": {},
+    "jLaTeX": {},
+    "journalID": {},
+    "jTeX": {},
+    "kanzanchi": {},
+    "kanzanhalf": {},
+    "kkk": {},
+    "La": {},
+    "lbcompdpbox{}{}{}": {
+      "snippet": "lbcompdpbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "lbderivpbox{}{}{}": {
+      "snippet": "lbderivpbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "leavechemcorr": {},
+    "Leftarrowfill": {},
+    "Leftrightarrowfill": {},
+    "leftrightarrowfill": {},
+    "lethead{}{}{}": {
+      "snippet": "lethead{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "magentadv": {},
+    "magentadye": {},
+    "member": {},
+    "miniscreentoprule": {},
+    "next": {},
+    "nrep": {},
+    "nrepmax": {},
+    "oldalpha": {},
+    "oldbeta": {},
+    "oldcal": {},
+    "oldchi": {},
+    "oldDelta": {},
+    "olddelta": {},
+    "oldepsilon": {},
+    "oldEquilibarrow": {},
+    "oldequilibarrow": {},
+    "oldEquiliblongarrow": {},
+    "oldequiliblongarrow": {},
+    "oldeta": {},
+    "oldGamma": {},
+    "oldgamma": {},
+    "oldiota": {},
+    "oldkappa": {},
+    "oldlambda": {},
+    "oldLamda": {},
+    "oldLllongleftarrow": {},
+    "oldlllongleftarrow": {},
+    "oldlllongleftharpoondown": {},
+    "oldLllongleftrightarrow": {},
+    "oldlllongleftrightarrow": {},
+    "oldLllongrightarrow": {},
+    "oldlllongrightarrow": {},
+    "oldlllongrightharpoonup": {},
+    "oldLlongleftarrow": {},
+    "oldllongleftarrow": {},
+    "oldllongleftharpoondown": {},
+    "oldLlongleftrightarrow": {},
+    "oldllongleftrightarrow": {},
+    "oldLlongrightarrow": {},
+    "oldllongrightarrow": {},
+    "oldllongrightharpoonup": {},
+    "oldmathcal": {},
+    "oldmathnormal": {},
+    "oldmu": {},
+    "oldnu": {},
+    "oldOmega": {},
+    "oldomega": {},
+    "oldPhi": {},
+    "oldphi": {},
+    "oldPi": {},
+    "oldpi": {},
+    "oldPsi": {},
+    "oldpsi": {},
+    "oldreactdarrow": {},
+    "oldreactdeqarrow": {},
+    "oldreactdlrarrow": {},
+    "oldreactduarrow": {},
+    "oldreacteqarrow": {},
+    "oldreactlarrow": {},
+    "oldreactleqarrow": {},
+    "oldreactlrarrow": {},
+    "oldreactnearrow": {},
+    "oldreactnwarrow": {},
+    "oldreactrarrow": {},
+    "oldreactreqarrow": {},
+    "oldreactsearrow": {},
+    "oldreactswarrow": {},
+    "oldreactuarrow": {},
+    "oldreactueqarrow": {},
+    "oldreactulrarrow": {},
+    "oldreactveqarrow": {},
+    "oldrho": {},
+    "oldschemelarrow{}{}{}{}": {
+      "snippet": "oldschemelarrow{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "oldschemelrarrow{}{}{}{}": {
+      "snippet": "oldschemelrarrow{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "oldschemerarrow{}{}{}{}": {
+      "snippet": "oldschemerarrow{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "oldSigma": {},
+    "oldsigma": {},
+    "oldstyle": {},
+    "oldtau": {},
+    "oldTheta": {},
+    "oldtheta": {},
+    "oldUpsilon": {},
+    "oldupsilon": {},
+    "oldvarepsilon": {},
+    "oldvarphi": {},
+    "oldvarpi": {},
+    "oldvarrho": {},
+    "oldvarsigma": {},
+    "oldvartheta": {},
+    "oldXi": {},
+    "oldxi": {},
+    "oldzeta": {},
+    "penetrate{}{}": {
+      "snippet": "penetrate{${1:arg1}}{${2:arg2}}"
+    },
+    "PiC": {},
+    "PiCTeX": {},
+    "Post": {},
+    "PostScript": {},
+    "pTeX": {},
+    "pushtowall": {},
+    "resetfontsize": {},
+    "Rightarrowfill": {},
+    "rshfboxit{}": {
+      "snippet": "rshfboxit{${1:arg1}}"
+    },
+    "sboxit{}{}": {
+      "snippet": "sboxit{${1:arg1}}{${2:arg2}}"
+    },
+    "Script": {},
+    "SetChemSymbol": {},
+    "smcaption": {},
+    "Sub": {},
+    "SubBib": {},
+    "tbaselineshift": {},
+    "tbcaption": {},
+    "tboxscreentoprule": {},
+    "TestCount": {},
+    "thederiv": {},
+    "tmpkern": {},
+    "tpic": {},
+    "upgreekrmfalse": {},
+    "upgreekrmtrue": {},
+    "upwardarrowcalcA": {},
+    "upwardarrowcalcB": {},
+    "verbatimbaselineskip": {},
+    "verbatimleftmargin": {},
+    "verbatimsize": {},
+    "verbswitchfalse": {},
+    "verbswitchtrue": {},
+    "xlethead{}": {
+      "snippet": "xlethead{${1:arg1}}"
+    },
+    "xymrefa": {},
+    "xymrefb": {},
+    "ybaselineshift": {},
+    "yellowdv": {},
+    "yellowdye": {},
+    "yen": {
+      "detail": "¥",
+      "documentation": "YEN SIGN"
+    },
+    "yubin": {},
+    "Yubin{}": {
+      "snippet": "Yubin{${1:arg1}}"
+    }
+  },
+  "envs": {
+    "ChemEqnarray": {},
+    "ChemEqnarray*": {},
+    "ChemEquation": {},
+    "XyMcompd(width,height)(xshift,yshift){}{}": {
+      "name": "XyMcompd",
+      "snippet": "(${3:width},${4:height})(${5:xshift},${6:yshift}){${1:refkey}}{${2:subkey}}"
+    },
+    "XyMtab{}": {
+      "name": "XyMtab",
+      "snippet": "{${1:cols}}"
+    },
+    "chemeqn": {},
+    "chemeqnarray": {},
+    "chemeqnarraya": {},
+    "chemmath": {},
+    "frameboxit{}": {
+      "name": "frameboxit",
+      "snippet": "{${1:width}}"
+    },
+    "glshfboxit{}": {
+      "name": "glshfboxit",
+      "snippet": "{${1:width}}"
+    },
+    "grshfboxit{}": {
+      "name": "grshfboxit",
+      "snippet": "{${1:width}}"
+    },
+    "lshfboxit{}": {
+      "name": "lshfboxit",
+      "snippet": "{${1:width}}"
+    },
+    "miniscreen{}": {
+      "name": "miniscreen",
+      "snippet": "{${1:width}}"
+    },
+    "rshfboxit{}": {
+      "name": "rshfboxit",
+      "snippet": "{${1:width}}"
+    },
+    "screen": {},
+    "tboxminiscreen{}": {
+      "name": "tboxminiscreen",
+      "snippet": "{${1:width}}"
+    },
+    "tboxscreen": {},
+    "ffboxit": {},
+    "XyMderiv": {}
+  },
+  "options": [
+    "chemtimes"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/chemmacros.json b/dev/packages/chemmacros.json
index 55cb61cd6..22221e33b 100644
--- a/dev/packages/chemmacros.json
+++ b/dev/packages/chemmacros.json
@@ -323,6 +323,11 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
+    "newman[](){}": {
+      "snippet": "newman[${2:options}](${3:angle}){${1:part-list}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "orbital{}": {
       "snippet": "orbital{${1:type}}"
     },
@@ -465,22 +470,55 @@
     "OX{}": {
       "snippet": "OX{${1:name,atom}}"
     },
+    "redox(){}": {
+      "snippet": "redox(${2:name1},${3:name2}){${1:text}}"
+    },
+    "redox()[]{}": {
+      "snippet": "redox(${3:name1},${4:name2})[${2:TikZ-options}]{${1:text}}"
+    },
+    "redox()[][]{}": {
+      "snippet": "redox(${4:name1},${5:name2})[${2:TikZ-options}][${3:vertical-factor}]{${1:text}}"
+    },
     "listschemename": {},
     "schemename": {},
     "listofschemes": {},
+    "NMR{}()[]": {
+      "snippet": "NMR{${1:isotope,element}}(${3:frequency})[${2:solvent}]"
+    },
+    "NMR{}()": {
+      "snippet": "NMR{${1:isotope,element}}(${2:frequency})"
+    },
     "NMR{}": {
       "snippet": "NMR{${1:isotope,element}}"
     },
     "NMR{}[]": {
       "snippet": "NMR{${1:isotope,element}}[${2:solvent}]"
     },
+    "NMR()[]": {
+      "snippet": "NMR(${2:frequency})[${1:solvent}]"
+    },
+    "NMR()": {
+      "snippet": "NMR(${1:frequency})"
+    },
     "NMR": {},
+    "NMR*{}()[]": {
+      "snippet": "NMR*{${1:isotope,element}}(${3:frequency})[${2:solvent}]"
+    },
+    "NMR*{}()": {
+      "snippet": "NMR*{${1:isotope,element}}(${2:frequency})"
+    },
     "NMR*{}": {
       "snippet": "NMR*{${1:isotope,element}}"
     },
     "NMR*{}[]": {
       "snippet": "NMR*{${1:isotope,element}}[${2:solvent}]"
     },
+    "NMR*()[]": {
+      "snippet": "NMR*(${2:frequency})[${1:solvent}]"
+    },
+    "NMR*()": {
+      "snippet": "NMR*(${1:frequency})"
+    },
     "NMR*": {},
     "data{}": {
       "snippet": "data{${1:type}}"
@@ -494,6 +532,12 @@
     "data*{}[]": {
       "snippet": "data*{${1:type}}[${2:specification}]"
     },
+    "J()[]{}": {
+      "snippet": "J(${3:bonds;nuclei})[${2:unit}]{${1:num-list}}"
+    },
+    "J(){}": {
+      "snippet": "J(${2:bonds;nuclei}){${1:num-list}}"
+    },
     "J[]{}": {
       "snippet": "J[${2:unit}]{${1:num-list}}"
     },
@@ -527,51 +571,99 @@
       "keyvalindex": 6,
       "keyvalpos": 0
     },
+    "enthalpy[](){}": {
+      "snippet": "enthalpy[${2:options}](${3:subscript}){${1:value}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
     "enthalpy[]{}": {
       "snippet": "enthalpy[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
+    "enthalpy(){}": {
+      "snippet": "enthalpy(${2:subscript}){${1:value}}"
+    },
     "enthalpy{}": {
       "snippet": "enthalpy{${1:value}}"
     },
+    "enthalpy*[](){}": {
+      "snippet": "enthalpy*[${2:options}](${3:subscript}){${1:value}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
     "enthalpy*[]{}": {
       "snippet": "enthalpy*[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
+    "enthalpy*(){}": {
+      "snippet": "enthalpy*(${2:subscript}){${1:value}}"
+    },
     "enthalpy*{}": {
       "snippet": "enthalpy*{${1:value}}"
     },
+    "entropy[](){}": {
+      "snippet": "entropy[${2:options}](${3:subscript}){${1:value}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
     "entropy[]{}": {
       "snippet": "entropy[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
+    "entropy(){}": {
+      "snippet": "entropy(${2:subscript}){${1:value}}"
+    },
     "entropy{}": {
       "snippet": "entropy{${1:value}}"
     },
+    "entropy*[](){}": {
+      "snippet": "entropy*[${2:options}](${3:subscript}){${1:value}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
     "entropy*[]{}": {
       "snippet": "entropy*[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
+    "entropy*(){}": {
+      "snippet": "entropy*(${2:subscript}){${1:value}}"
+    },
     "entropy*{}": {
       "snippet": "entropy*{${1:value}}"
     },
+    "gibbs[](){}": {
+      "snippet": "gibbs[${2:options}](${3:subscript}){${1:value}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
     "gibbs[]{}": {
       "snippet": "gibbs[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
+    "gibbs(){}": {
+      "snippet": "gibbs(${2:subscript}){${1:value}}"
+    },
     "gibbs{}": {
       "snippet": "gibbs{${1:value}}"
     },
+    "gibbs*[](){}": {
+      "snippet": "gibbs*[${2:options}](${3:subscript}){${1:value}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
     "gibbs*[]{}": {
       "snippet": "gibbs*[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
+    "gibbs*(){}": {
+      "snippet": "gibbs*(${2:subscript}){${1:value}}"
+    },
     "gibbs*{}": {
       "snippet": "gibbs*{${1:value}}"
     },
diff --git a/dev/packages/chemplants.json b/dev/packages/chemplants.json
index ec00cc724..5fb0ab6c3 100644
--- a/dev/packages/chemplants.json
+++ b/dev/packages/chemplants.json
@@ -8,10 +8,10 @@
   },
   "macros": {
     "measure{}{}{}": {
-      "snippet": "measure{${1:(${4:x1,y1})}}{${2:(${5:x2,y2})}}{${3:label}}"
+      "snippet": "measure{${1:(${4:x1},${5:y1})}}{${2:(${6:x2},${7:y2})}}{${3:label}}"
     },
     "measure[]{}{}{}": {
-      "snippet": "measure[${4:anchor spec}]{${1:(${5:x1,y1})}}{${2:(${6:x2,y2})}}{${3:label}}"
+      "snippet": "measure[${4:anchor spec}]{${1:(${5:x1},${6:y1})}}{${2:(${7:x2},${8:y2})}}{${3:label}}"
     },
     "setchpblockfontsize{}": {
       "snippet": "setchpblockfontsize{${1:fontsize}}"
diff --git a/dev/packages/chemstr.json b/dev/packages/chemstr.json
index c4e9115b8..5f5f2855a 100644
--- a/dev/packages/chemstr.json
+++ b/dev/packages/chemstr.json
@@ -6,9 +6,15 @@
     "addbscolor{}{}": {
       "snippet": "addbscolor{${1:bondcolor}}{${2:substituent}}"
     },
+    "ayl(){}": {
+      "snippet": "ayl(${2:x},${3:y}){${1:stuff}}"
+    },
     "ayl{}": {
       "snippet": "ayl{${1:stuff}}"
     },
+    "BiFunc(){}{}{}": {
+      "snippet": "BiFunc(${4:xslope},${5:yslope}){${1:length}}{${2:moietyA}}{${3:moietyB}}"
+    },
     "bscolorswOFF": {},
     "bscolorswON": {},
     "changeunitlength{}": {
@@ -23,6 +29,9 @@
     "lmoiety{}": {
       "snippet": "lmoiety{${1:substituent}}"
     },
+    "lyl(){}": {
+      "snippet": "lyl(${2:link}){${1:ylgroup}}"
+    },
     "member": {},
     "originalpicture": {},
     "origptfalse": {},
@@ -44,6 +53,9 @@
     "rmoiety{}": {
       "snippet": "rmoiety{${1:substituent}}"
     },
+    "ryl(){}": {
+      "snippet": "ryl(${2:link}){${1:ylgroup}}"
+    },
     "SetTwoAtoms{}": {
       "snippet": "SetTwoAtoms{${1:frontobject}}"
     },
diff --git a/dev/packages/chet.json b/dev/packages/chet.json
new file mode 100644
index 000000000..938191a4f
--- /dev/null
+++ b/dev/packages/chet.json
@@ -0,0 +1,243 @@
+{
+  "includes": {
+    "kvoptions": [],
+    "xspace": [],
+    "datetime": [],
+    "amsmath": [],
+    "caption": [],
+    "tocloft": [],
+    "cite": [],
+    "collref": [],
+    "color": [],
+    "microtype": [],
+    "manyfoot": [],
+    "footmisc": [],
+    "filecontents": [],
+    "geometry": [],
+    "hyperref": []
+  },
+  "macros": {
+    "draftmode": {},
+    "titlemath{}": {
+      "snippet": "titlemath{${1:math}}"
+    },
+    "email{}": {
+      "snippet": "email{${1:email}}"
+    },
+    "emailV{}": {
+      "snippet": "emailV{${1:email}}"
+    },
+    "emails{}": {
+      "snippet": "emails{${1:emails}}"
+    },
+    "newsec{}": {
+      "snippet": "newsec{${1:title}}"
+    },
+    "newsec{}[]": {
+      "snippet": "newsec{${1:title}}[${2:label}]"
+    },
+    "subsec{}": {
+      "snippet": "subsec{${1:title}}"
+    },
+    "subsec{}[]": {
+      "snippet": "subsec{${1:title}}[${2:label}]"
+    },
+    "subsubsec{}": {
+      "snippet": "subsubsec{${1:title}}"
+    },
+    "subsubsec{}[]": {
+      "snippet": "subsubsec{${1:title}}[${2:label}]"
+    },
+    "eqn{}": {
+      "snippet": "eqn{${1:math}}"
+    },
+    "eqn{}[]": {
+      "snippet": "eqn{${1:math}}[${2:label}]"
+    },
+    "eqna{}": {
+      "snippet": "eqna{${1:math}}"
+    },
+    "eqna{}[]": {
+      "snippet": "eqna{${1:math}}[${2:label}]"
+    },
+    "twoseqn{}{}": {
+      "snippet": "twoseqn{${1:math1}}{${2:math2}}"
+    },
+    "twoseqn{}{}[]": {
+      "snippet": "twoseqn{${1:math1}}{${2:math2}}[${3:label2}]"
+    },
+    "twoseqn{}{}[][]": {
+      "snippet": "twoseqn{${1:math1}}{${2:math2}}[${3:label2}][${4:overall-label}]"
+    },
+    "twoseqn{}[]{}": {
+      "snippet": "twoseqn{${1:math1}}[${2:label1}]{${3:math2}}"
+    },
+    "twoseqn{}[]{}[]": {
+      "snippet": "twoseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]"
+    },
+    "twoseqn{}[]{}[][]": {
+      "snippet": "twoseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}][${5:overall-label}]"
+    },
+    "threeseqn{}{}{}": {
+      "snippet": "threeseqn{${1:math1}}{${2:math2}}{${3:math3}}"
+    },
+    "threeseqn{}{}{}[]": {
+      "snippet": "threeseqn{${1:math1}}{${2:math2}}{${3:math3}}[${4:label3}]"
+    },
+    "threeseqn{}{}[]{}": {
+      "snippet": "threeseqn{${1:math1}}{${2:math2}}[${3:label2}]{${4:math3}}"
+    },
+    "threeseqn{}[]{}{}": {
+      "snippet": "threeseqn{${1:math1}}[${2:label1}]{${3:math2}}{${4:math3}}"
+    },
+    "threeseqn{}[]{}[]{}[]": {
+      "snippet": "threeseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}]"
+    },
+    "threeseqn{}[]{}[]{}[][]": {
+      "snippet": "threeseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}][${7:overall-label}]"
+    },
+    "fourseqn{}{}{}{}": {
+      "snippet": "fourseqn{${1:math1}}{${2:math2}}{${3:math3}}{${4:math4}}"
+    },
+    "fourseqn{}{}{}{}[]": {
+      "snippet": "fourseqn{${1:math1}}{${2:math2}}{${3:math3}}{${4:math4}}[${5:label4}]"
+    },
+    "fourseqn{}{}{}[]{}": {
+      "snippet": "fourseqn{${1:math1}}{${2:math2}}{${3:math3}}[${4:label3}]{${5:math4}}"
+    },
+    "fourseqn{}{}[]{}{}": {
+      "snippet": "fourseqn{${1:math1}}{${2:math2}}[${3:label2}]{${4:math3}}{${5:math4}}"
+    },
+    "fourseqn{}[]{}{}{}": {
+      "snippet": "fourseqn{${1:math1}}[${2:label1}]{${3:math2}}{${4:math3}}{${5:math4}}"
+    },
+    "fourseqn{}[]{}[]{}[]{}[]": {
+      "snippet": "fourseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}]{${7:math4}}[${8:label4}]"
+    },
+    "fourseqn{}[]{}[]{}[]{}[][]": {
+      "snippet": "fourseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}]{${7:math4}}[${8:label4}][${9:overall-label}]"
+    },
+    "rcite{}": {
+      "snippet": "rcite{${1:bibid}}"
+    },
+    "rcite[]{}": {
+      "snippet": "rcite[${2:add. text}]{${1:bibid}}"
+    },
+    "toc": {},
+    "foot{}": {
+      "snippet": "foot{${1:text}}"
+    },
+    "foot[]{}": {
+      "snippet": "foot[${2:number}]{${1:text}}"
+    },
+    "ack{}": {
+      "snippet": "ack{${1:acknowledgments}}"
+    },
+    "appendices": {},
+    "preprint{}": {
+      "snippet": "preprint{${1:preprint}}"
+    },
+    "affiliation{}": {
+      "snippet": "affiliation{${1:affiliation}}"
+    },
+    "abstract{}": {
+      "snippet": "abstract{${1:text}}"
+    },
+    "mytitlefont": {},
+    "rcitedraft{}": {
+      "snippet": "rcitedraft{${1:bibid}}"
+    },
+    "showkeyslabelformat{}": {
+      "snippet": "showkeyslabelformat{${1:text}}"
+    },
+    "footinsE": {},
+    "thefootnoteE": {},
+    "FootnoteE{}{}": {
+      "snippet": "FootnoteE{${1:marker}}{${2:text}}"
+    },
+    "FootnotemarkE{}": {
+      "snippet": "FootnotemarkE{${1:marker}}"
+    },
+    "FootnotetextE{}{}": {
+      "snippet": "FootnotetextE{${1:marker}}{${2:text}}"
+    },
+    "footnoteE{}": {
+      "snippet": "footnoteE{${1:text}}"
+    },
+    "footnoteE[]{}": {
+      "snippet": "footnoteE[${2:number}]{${1:text}}"
+    },
+    "footnotemarkE": {},
+    "footnotemarkE[]": {
+      "snippet": "footnotemarkE[${1:number}]"
+    },
+    "footnotetextE{}": {
+      "snippet": "footnotetextE{${1:text}}"
+    },
+    "footnotetextE[]{}": {
+      "snippet": "footnotetextE[${2:number}]{${1:text}}"
+    },
+    "footinsEE": {},
+    "thefootnoteEE": {},
+    "FootnoteEE{}{}": {
+      "snippet": "FootnoteEE{${1:marker}}{${2:text}}"
+    },
+    "FootnotemarkEE{}": {
+      "snippet": "FootnotemarkEE{${1:marker}}"
+    },
+    "FootnotetextEE{}{}": {
+      "snippet": "FootnotetextEE{${1:marker}}{${2:text}}"
+    },
+    "footnoteEE{}": {
+      "snippet": "footnoteEE{${1:text}}"
+    },
+    "footnoteEE[]{}": {
+      "snippet": "footnoteEE[${2:number}]{${1:text}}"
+    },
+    "footnotemarkEE": {},
+    "footnotemarkEE[]": {
+      "snippet": "footnotemarkEE[${1:number}]"
+    },
+    "footnotetextEE{}": {
+      "snippet": "footnotetextEE{${1:text}}"
+    },
+    "footnotetextEE[]{}": {
+      "snippet": "footnotetextEE[${2:number}]{${1:text}}"
+    },
+    "footinsEEE": {},
+    "thefootnoteEEE": {},
+    "FootnoteEEE{}{}": {
+      "snippet": "FootnoteEEE{${1:marker}}{${2:text}}"
+    },
+    "FootnotemarkEEE{}": {
+      "snippet": "FootnotemarkEEE{${1:marker}}"
+    },
+    "FootnotetextEEE{}{}": {
+      "snippet": "FootnotetextEEE{${1:marker}}{${2:text}}"
+    },
+    "footnoteEEE{}": {
+      "snippet": "footnoteEEE{${1:text}}"
+    },
+    "footnoteEEE[]{}": {
+      "snippet": "footnoteEEE[${2:number}]{${1:text}}"
+    },
+    "footnotemarkEEE": {},
+    "footnotemarkEEE[]": {
+      "snippet": "footnotemarkEEE[${1:number}]"
+    },
+    "footnotetextEEE{}": {
+      "snippet": "footnotetextEEE{${1:text}}"
+    },
+    "footnotetextEEE[]{}": {
+      "snippet": "footnotetextEEE[${2:number}]{${1:text}}"
+    }
+  },
+  "envs": {
+    "acknowledgments": {},
+    "appendices": {}
+  },
+  "options": [
+    "macrosonly"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/chextras.json b/dev/packages/chextras.json
index ae5591264..0bef3c6db 100644
--- a/dev/packages/chextras.json
+++ b/dev/packages/chextras.json
@@ -328,6 +328,9 @@
     "fgii": {
       "option": "french"
     },
+    "fprimo)": {
+      "option": "french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/chmst-pdf.json b/dev/packages/chmst-pdf.json
index 5362095d6..991de3cd4 100644
--- a/dev/packages/chmst-pdf.json
+++ b/dev/packages/chmst-pdf.json
@@ -5,6 +5,60 @@
   },
   "macros": {
     "chmstpdfsw": {},
+    "electronHldshiftarrow()()": {
+      "snippet": "electronHldshiftarrow(${1:xend},${2:yend})(${3:xstart},${4:ystart})"
+    },
+    "electronHldshiftarrow[]()()": {
+      "snippet": "electronHldshiftarrow[${1:direction}](${2:xend},${3:yend})(${4:xstart},${5:ystart})"
+    },
+    "electronHlushiftarrow()()": {
+      "snippet": "electronHlushiftarrow(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "electronHlushiftarrow[]()()": {
+      "snippet": "electronHlushiftarrow[${1:direction}](${2:xstart},${3:ystart})(${4:xend},${5:yend})"
+    },
+    "electronHrdshiftarrow()()": {
+      "snippet": "electronHrdshiftarrow(${1:xend},${2:yend})(${3:xstart},${4:ystart})"
+    },
+    "electronHrdshiftarrow[]()()": {
+      "snippet": "electronHrdshiftarrow[${1:direction}](${2:xend},${3:yend})(${4:xstart},${5:ystart})"
+    },
+    "electronHrushiftarrow()()": {
+      "snippet": "electronHrushiftarrow(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "electronHrushiftarrow[]()()": {
+      "snippet": "electronHrushiftarrow[${1:direction}](${2:xstart},${3:ystart})(${4:xend},${5:yend})"
+    },
+    "electronlshiftarrow()()": {
+      "snippet": "electronlshiftarrow(${1:xend},${2:yend})(${3:xstart},${4:ystart})"
+    },
+    "electronlshiftarrow[]()()": {
+      "snippet": "electronlshiftarrow[${1:direction}](${2:xend},${3:yend})(${4:xstart},${5:ystart})"
+    },
+    "electronrshiftarrow()()": {
+      "snippet": "electronrshiftarrow(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "electronrshiftarrow[]()()": {
+      "snippet": "electronrshiftarrow[${1:direction}](${2:xstart},${3:ystart})(${4:xend},${5:yend})"
+    },
+    "electronshiftArrowl()()()()": {
+      "snippet": "electronshiftArrowl(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
+    },
+    "electronshiftArrowr()()()()": {
+      "snippet": "electronshiftArrowr(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
+    },
+    "electronshiftHld()()()()": {
+      "snippet": "electronshiftHld(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
+    },
+    "electronshiftHlu()()()()": {
+      "snippet": "electronshiftHlu(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
+    },
+    "electronshiftHrd()()()()": {
+      "snippet": "electronshiftHrd(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
+    },
+    "electronshiftHru()()()()": {
+      "snippet": "electronshiftHru(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
+    },
     "futuresubst{}": {
       "snippet": "futuresubst{${1:content}}"
     },
diff --git a/dev/packages/circuitikz.json b/dev/packages/circuitikz.json
index 10d7aa748..b9d0a4c89 100644
--- a/dev/packages/circuitikz.json
+++ b/dev/packages/circuitikz.json
@@ -69,7 +69,7 @@
       "snippet": "ctikztextnot{${1:text}}"
     },
     "ctikzsubcircuitdef{}{}{}": {
-      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,anchor2,...}}{${3:definition}}"
+      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,${4:anchor2},...}}{${3:definition}}"
     },
     "ctikzsubcircuitactivate{}": {
       "snippet": "ctikzsubcircuitactivate{${1:name}}"
diff --git a/dev/packages/citation-style-language.json b/dev/packages/citation-style-language.json
index dba06d8ed..45d160a1a 100644
--- a/dev/packages/citation-style-language.json
+++ b/dev/packages/citation-style-language.json
@@ -79,6 +79,14 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
+    "fullcite{}": {
+      "snippet": "fullcite{${1:keylist}}"
+    },
+    "fullcite[]{}": {
+      "snippet": "fullcite[${2:options}]{${1:keylist}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "printbibliography": {},
     "printbibliography[]": {
       "snippet": "printbibliography[${1:options}]",
diff --git a/dev/packages/cite.json b/dev/packages/cite.json
new file mode 100644
index 000000000..b0f2c1e09
--- /dev/null
+++ b/dev/packages/cite.json
@@ -0,0 +1,44 @@
+{
+  "includes": {},
+  "macros": {
+    "citeform": {},
+    "citepunct": {},
+    "citeleft": {},
+    "citeright": {},
+    "citemid": {},
+    "citedash": {},
+    "CiteMoveChars": {},
+    "OverciteFont": {},
+    "citeprepenalty": {},
+    "citemidpenalty": {},
+    "citepunctpenalty": {},
+    "citenum{}": {
+      "snippet": "citenum{${1:bibid}}"
+    },
+    "citen{}": {
+      "snippet": "citen{${1:bibid}}"
+    },
+    "citeonline{}": {
+      "snippet": "citeonline{${1:bibid}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "superscript",
+    "super",
+    "ref",
+    "nospace",
+    "space",
+    "nobreak",
+    "nosort",
+    "sort",
+    "nomove",
+    "move",
+    "noadjust",
+    "adjust",
+    "nocompress",
+    "compress",
+    "biblabel"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/class-abntex2.json b/dev/packages/class-abntex2.json
index f76e22c15..15a50190b 100644
--- a/dev/packages/class-abntex2.json
+++ b/dev/packages/class-abntex2.json
@@ -23,7 +23,7 @@
     },
     "imprimirtituloestrangeiro": {},
     "autor{}": {
-      "snippet": "autor{${1:nome do(s) autor(${2:es})}}"
+      "snippet": "autor{${1:nome do(${2:s}) autor(${3:es})}}"
     },
     "imprimirautor": {},
     "data{}": {
@@ -47,18 +47,18 @@
     },
     "imprimirtipotrabalho": {},
     "orientador{}": {
-      "snippet": "orientador{${1:nome do(s) orientador(${2:es})}}"
+      "snippet": "orientador{${1:nome do(${2:s}) orientador(${3:es})}}"
     },
     "orientador[]{}": {
-      "snippet": "orientador[${2:rótulo}]{${1:nome do(s) orientador(${3:es})}}"
+      "snippet": "orientador[${2:rótulo}]{${1:nome do(${3:s}) orientador(${4:es})}}"
     },
     "imprimirorientador": {},
     "imprimirorientadorRotulo": {},
     "coorientador{}": {
-      "snippet": "coorientador{${1:nome do(s) coorientador(${2:es})}}"
+      "snippet": "coorientador{${1:nome do(${2:s}) coorientador(${3:es})}}"
     },
     "coorientador[]{}": {
-      "snippet": "coorientador[${2:rótulo}]{${1:nome do(s) coorientador(${3:es})}}"
+      "snippet": "coorientador[${2:rótulo}]{${1:nome do(${3:s}) coorientador(${4:es})}}"
     },
     "imprimircoorientador": {},
     "imprimircoorientadorRotulo": {},
diff --git a/dev/packages/class-acmart.json b/dev/packages/class-acmart.json
index 7e8c9899c..6f97bbe1f 100644
--- a/dev/packages/class-acmart.json
+++ b/dev/packages/class-acmart.json
@@ -581,6 +581,9 @@
     "fgii": {
       "option": "language=french"
     },
+    "fprimo)": {
+      "option": "language=french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "language=french"
diff --git a/dev/packages/class-altacv.json b/dev/packages/class-altacv.json
index b69421c99..bbd266cda 100644
--- a/dev/packages/class-altacv.json
+++ b/dev/packages/class-altacv.json
@@ -145,7 +145,7 @@
     "xetexorluatextrue": {},
     "xetexorluatexfalse": {},
     "mynames{}": {
-      "snippet": "mynames{${1:name1,name2,...}}"
+      "snippet": "mynames{${1:name1,${2:name2},...}}"
     },
     "utffriendlydetokenize{}": {
       "snippet": "utffriendlydetokenize{${1:arg}}"
diff --git a/dev/packages/class-aomart.json b/dev/packages/class-aomart.json
index 88af9a753..85b0a709c 100644
--- a/dev/packages/class-aomart.json
+++ b/dev/packages/class-aomart.json
@@ -4,6 +4,7 @@
     "fancyhdr": [],
     "lastpage": [],
     "ifpdf": [],
+    "graphicx": [],
     "environ": [],
     "yhmath": [],
     "cmtiup": [],
diff --git a/dev/packages/class-apa6.json b/dev/packages/class-apa6.json
index 9eaffb201..be33be5c6 100644
--- a/dev/packages/class-apa6.json
+++ b/dev/packages/class-apa6.json
@@ -432,6 +432,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "biblatex"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "biblatex"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "biblatex"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "biblatex"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "biblatex"
@@ -440,6 +452,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "biblatex"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "biblatex"
+    },
     "maskparencite[][]{}": {
       "snippet": "maskparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "mask"
@@ -585,7 +601,7 @@
       "snippet": "keywords{${1:keywords}}"
     },
     "leftheader{}": {
-      "snippet": "leftheader{${1:author last name(s)}}"
+      "snippet": "leftheader{${1:author last name(${2:s})}}"
     },
     "note{}": {
       "snippet": "note{${1:text}}"
diff --git a/dev/packages/class-asmeconf.json b/dev/packages/class-asmeconf.json
index e3f285519..8b376f211 100644
--- a/dev/packages/class-asmeconf.json
+++ b/dev/packages/class-asmeconf.json
@@ -678,6 +678,9 @@
     "fgii": {
       "option": "french"
     },
+    "fprimo)": {
+      "option": "french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
@@ -2283,7 +2286,7 @@
       "snippet": "SetAffiliation{${1:number}}{${2:address}}"
     },
     "SetAuthors{}": {
-      "snippet": "SetAuthors{${1:name1,name2,...}}"
+      "snippet": "SetAuthors{${1:name1,${2:name2},...}}"
     },
     "sfalpha": {},
     "sfbeta": {},
diff --git a/dev/packages/class-asmejour.json b/dev/packages/class-asmejour.json
index 38ab1542c..65d39bb4d 100644
--- a/dev/packages/class-asmejour.json
+++ b/dev/packages/class-asmejour.json
@@ -677,6 +677,9 @@
     "fgii": {
       "option": "french"
     },
+    "fprimo)": {
+      "option": "french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-bfhpub.json b/dev/packages/class-bfhpub.json
index 01801a089..ad736de12 100644
--- a/dev/packages/class-bfhpub.json
+++ b/dev/packages/class-bfhpub.json
@@ -71,11 +71,11 @@
       "option": "type=projectproposal"
     },
     "DisplayCompetenceRatingChart{}": {
-      "snippet": "DisplayCompetenceRatingChart{${1:name1=val1,name2=val2,...}}",
+      "snippet": "DisplayCompetenceRatingChart{${1:name1=val1,${2:name2=val2},...}}",
       "option": "type=projectproposal"
     },
     "DisplayCompetenceRatingChart[]{}": {
-      "snippet": "DisplayCompetenceRatingChart[${2:options}]{${1:name1=val1,name2=val2,...}}",
+      "snippet": "DisplayCompetenceRatingChart[${2:options}]{${1:name1=val1,${3:name2=val2},...}}",
       "option": "type=projectproposal",
       "keyvalindex": 0,
       "keyvalpos": 0
diff --git a/dev/packages/class-bitart.json b/dev/packages/class-bitart.json
index 17860e6eb..dab782ec7 100644
--- a/dev/packages/class-bitart.json
+++ b/dev/packages/class-bitart.json
@@ -342,6 +342,18 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -350,10 +362,26 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -361,6 +389,10 @@
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-bitbook.json b/dev/packages/class-bitbook.json
index 26c05377b..06ccd9df8 100644
--- a/dev/packages/class-bitbook.json
+++ b/dev/packages/class-bitbook.json
@@ -215,20 +215,44 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-bjfuthesis.json b/dev/packages/class-bjfuthesis.json
index fff4636cd..9c7bdcdf0 100644
--- a/dev/packages/class-bjfuthesis.json
+++ b/dev/packages/class-bjfuthesis.json
@@ -23,10 +23,10 @@
     },
     "kaiti": {},
     "keywordscn{}": {
-      "snippet": "keywordscn{${1:keyword1,keyword2,...}}"
+      "snippet": "keywordscn{${1:keyword1,${2:keyword2},...}}"
     },
     "keywordsen{}": {
-      "snippet": "keywordsen{${1:keyword1,keyword2,...}}"
+      "snippet": "keywordsen{${1:keyword1,${2:keyword2},...}}"
     },
     "oldbackmatter": {},
     "oldfrontmatter": {},
@@ -216,20 +216,44 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-bookcover.json b/dev/packages/class-bookcover.json
index 8d7e6b7a3..7c9574de4 100644
--- a/dev/packages/class-bookcover.json
+++ b/dev/packages/class-bookcover.json
@@ -13,7 +13,7 @@
       "snippet": "bookcovercomponent{${1:type}}{${2:part}}{${3:content}}"
     },
     "bookcovercomponent{}{}[]{}": {
-      "snippet": "bookcovercomponent{${1:type}}{${2:part}}[${3:left,bottom,right,top}]{${4:content}}"
+      "snippet": "bookcovercomponent{${1:type}}{${2:part}}[${3:left,${5:bottom},${6:right},top}]{${4:content}}"
     },
     "partheight": {},
     "partwidth": {},
@@ -34,7 +34,7 @@
       "option": "trimmed=true"
     },
     "bookcovertrimmedpart{}[]": {
-      "snippet": "bookcovertrimmedpart{${1:trimmed part}}[${2:left,bottom,right,top}]",
+      "snippet": "bookcovertrimmedpart{${1:trimmed part}}[${2:left,${3:bottom},${4:right},top}]",
       "option": "trimmed=true"
     },
     "setbookcover{}": {
@@ -70,7 +70,7 @@
       "snippet": "letnamebookcoverpart{${1:new part}}{${2:defined part}}"
     },
     "letnamebookcoverpart{}{}[]": {
-      "snippet": "letnamebookcoverpart{${1:new part}}{${2:defined part}}[${3:left,bottom,right,top}]"
+      "snippet": "letnamebookcoverpart{${1:new part}}{${2:defined part}}[${3:left,${4:bottom},${5:right},top}]"
     },
     "newbookcovercomponenttype{}{}": {
       "snippet": "newbookcovercomponenttype{${1:new type}}{${2:formatting}}"
@@ -96,7 +96,7 @@
     },
     "bookcoverelement{}{}[]": {
       "name": "bookcoverelement",
-      "snippet": "{${1:type}}{${2:part}}[${3:left,bottom,right,top}]"
+      "snippet": "{${1:type}}{${2:part}}[${3:left,${4:bottom},${5:right},top}]"
     },
     "bookcoverdescription": {}
   },
diff --git a/dev/packages/class-cquthesis.json b/dev/packages/class-cquthesis.json
index 2665d01db..9395a72b8 100644
--- a/dev/packages/class-cquthesis.json
+++ b/dev/packages/class-cquthesis.json
@@ -54,7 +54,7 @@
     },
     "cdate": {},
     "cec{}": {
-      "snippet": "cec{${1:molecule1,molecule2,...}}"
+      "snippet": "cec{${1:molecule1,${2:molecule2},...}}"
     },
     "cftafterequENtitle": {},
     "cftafterequtitle": {},
@@ -66,7 +66,7 @@
       "snippet": "chapterstar{${1:title}}"
     },
     "ckeywords{}": {
-      "snippet": "ckeywords{${1:关键词 1,关键词 2,...}}"
+      "snippet": "ckeywords{${1:关键词 1,${2:关键词 2},...}}"
     },
     "colsep": {},
     "colsep[]": {
@@ -80,7 +80,7 @@
     "cquthesis": {},
     "edate": {},
     "ekeywords{}": {
-      "snippet": "ekeywords{${1:keyword1,keyword2,...}}"
+      "snippet": "ekeywords{${1:keyword1,${2:keyword2},...}}"
     },
     "eqlist{}": {
       "snippet": "eqlist{${1:中文 name}}"
diff --git a/dev/packages/class-droit-fr.json b/dev/packages/class-droit-fr.json
index ba0906154..800f03ed3 100644
--- a/dev/packages/class-droit-fr.json
+++ b/dev/packages/class-droit-fr.json
@@ -211,6 +211,9 @@
     "fgii": {
       "option": "french"
     },
+    "fprimo)": {
+      "option": "french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-elegantbook.json b/dev/packages/class-elegantbook.json
index 7bd66309e..f750654f7 100644
--- a/dev/packages/class-elegantbook.json
+++ b/dev/packages/class-elegantbook.json
@@ -459,6 +459,9 @@
     "fgii": {
       "option": "fr"
     },
+    "fprimo)": {
+      "option": "fr"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "fr"
diff --git a/dev/packages/class-elteikthesis.json b/dev/packages/class-elteikthesis.json
index b22d325bb..0f1aef589 100644
--- a/dev/packages/class-elteikthesis.json
+++ b/dev/packages/class-elteikthesis.json
@@ -196,6 +196,12 @@
     "Apageref{}": {
       "snippet": "Apageref{${1:label}}"
     },
+    "aref({})": {
+      "snippet": "aref(${2:{${1:label}}})"
+    },
+    "Aref({})": {
+      "snippet": "Aref(${2:{${1:label}}})"
+    },
     "aref*{}": {
       "snippet": "aref*{${1:label}}"
     },
diff --git a/dev/packages/class-fei.json b/dev/packages/class-fei.json
index a716a5f63..4046f2920 100644
--- a/dev/packages/class-fei.json
+++ b/dev/packages/class-fei.json
@@ -479,12 +479,24 @@
     "apud{}{}": {
       "snippet": "apud{${1:bibid}}{${2:bibid}}"
     },
+    "apud(){}{}": {
+      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "apud()(){}{}": {
+      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "apud()()[]{}[]{}": {
+      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "apud[]{}[]{}": {
       "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "apud[][]{}[][]{}": {
       "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "apud()()[][]{}[][]{}": {
+      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "plaincite[][]{}": {
       "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}"
     },
diff --git a/dev/packages/class-gztarticle.json b/dev/packages/class-gztarticle.json
index 2ffafa800..df2e9a891 100644
--- a/dev/packages/class-gztarticle.json
+++ b/dev/packages/class-gztarticle.json
@@ -264,6 +264,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-hecthese.json b/dev/packages/class-hecthese.json
index d8673aaf2..d13f0ec2e 100644
--- a/dev/packages/class-hecthese.json
+++ b/dev/packages/class-hecthese.json
@@ -377,6 +377,9 @@
     "fgii": {
       "option": "french"
     },
+    "fprimo)": {
+      "option": "french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-hgbarticle.json b/dev/packages/class-hgbarticle.json
index f0b5d329b..cd31f0c99 100644
--- a/dev/packages/class-hgbarticle.json
+++ b/dev/packages/class-hgbarticle.json
@@ -86,6 +86,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "apa"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -93,6 +105,10 @@
     "nptextcites[][]{}[][]{}": {
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
+    },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-hgbreport.json b/dev/packages/class-hgbreport.json
index 00ca88868..e38470192 100644
--- a/dev/packages/class-hgbreport.json
+++ b/dev/packages/class-hgbreport.json
@@ -87,6 +87,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "apa"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -94,6 +106,10 @@
     "nptextcites[][]{}[][]{}": {
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
+    },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-hgbthesis.json b/dev/packages/class-hgbthesis.json
index 1be4e6494..ffd1ee5cd 100644
--- a/dev/packages/class-hgbthesis.json
+++ b/dev/packages/class-hgbthesis.json
@@ -85,6 +85,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "apa"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -93,6 +105,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa"
+    },
     "advisor{}": {
       "snippet": "advisor{${1:name}}"
     },
diff --git a/dev/packages/class-iopart.json b/dev/packages/class-iopart.json
index 7854b06b7..3f5af7f43 100644
--- a/dev/packages/class-iopart.json
+++ b/dev/packages/class-iopart.json
@@ -370,6 +370,9 @@
     "pcal": {},
     "pmit": {},
     "psemicolon": {},
+    "pt()": {
+      "snippet": "pt(${1:arg})"
+    },
     "sssty": {},
     "ssty": {},
     "theeqnval": {},
diff --git a/dev/packages/class-l3doc.json b/dev/packages/class-l3doc.json
index 50c715965..219863e77 100644
--- a/dev/packages/class-l3doc.json
+++ b/dev/packages/class-l3doc.json
@@ -185,11 +185,11 @@
     },
     "macro{}": {
       "name": "macro",
-      "snippet": "{${1:macro1,macro2,...}}"
+      "snippet": "{${1:macro1,${2:macro2},...}}"
     },
     "macro[]{}": {
       "name": "macro",
-      "snippet": "[${2:options}]{${1:macro1,macro2,...}}",
+      "snippet": "[${2:options}]{${1:macro1,${3:macro2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -231,14 +231,11 @@
     "full",
     "onlydoc",
     "check",
-    "nocheck",
     "checktest",
-    "nochecktest",
     "kernel",
     "stdmodule",
-    "cm-default",
     "lm-default",
-    "cs-break-off",
+    "cs-break",
     "cs-break-nohyphen",
     "show-notes",
     "hide-notes",
@@ -271,11 +268,19 @@
       "replace"
     ],
     [
-      "int",
+      "EXP",
+      "rEXP",
       "TF",
       "pTF",
       "noTF",
-      "verb"
+      "added=${1:date}",
+      "updated=${1:date}",
+      "deprecated",
+      "no-user-doc",
+      "label=",
+      "verb",
+      "module=",
+      "int"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/class-langscibook.json b/dev/packages/class-langscibook.json
index ac08f2732..083887d1c 100644
--- a/dev/packages/class-langscibook.json
+++ b/dev/packages/class-langscibook.json
@@ -276,6 +276,9 @@
     "fgii": {
       "option": "booklanguage=french"
     },
+    "fprimo)": {
+      "option": "booklanguage=french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "booklanguage=french"
diff --git a/dev/packages/class-letgut.json b/dev/packages/class-letgut.json
index 1917e1c02..1434c1131 100644
--- a/dev/packages/class-letgut.json
+++ b/dev/packages/class-letgut.json
@@ -389,6 +389,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-lni.json b/dev/packages/class-lni.json
index 82d98aa41..7ded5a36b 100644
--- a/dev/packages/class-lni.json
+++ b/dev/packages/class-lni.json
@@ -337,7 +337,7 @@
     "doihoffset": {},
     "doivoffset": {},
     "editor{}": {
-      "snippet": "editor{${1:name(s)}}"
+      "snippet": "editor{${1:name(${2:s})}}"
     },
     "eg": {},
     "email{}": {
@@ -369,6 +369,9 @@
     "lniinitialism{}{}": {
       "snippet": "lniinitialism{${1:cmd}}{${2:text}}"
     },
+    "multiaffil{}{}{}": {
+      "snippet": "multiaffil{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
     "nofontsfalse": {},
     "nofontstrue": {},
     "norunningheadsfalse": {},
diff --git a/dev/packages/class-ltugboat.json b/dev/packages/class-ltugboat.json
index 86b0f2998..5e5d8f6c5 100644
--- a/dev/packages/class-ltugboat.json
+++ b/dev/packages/class-ltugboat.json
@@ -549,6 +549,9 @@
     "tubhideheight{}": {
       "snippet": "tubhideheight{${1:height}}"
     },
+    "tubissue{}()": {
+      "snippet": "tubissue{${1:volume}}(${2:issue})"
+    },
     "tubjustifiedpar": {},
     "tubline{}": {
       "snippet": "tubline{${1:text}}"
diff --git a/dev/packages/class-matapli.json b/dev/packages/class-matapli.json
index 62e03dcd9..0f6dbe75e 100644
--- a/dev/packages/class-matapli.json
+++ b/dev/packages/class-matapli.json
@@ -199,6 +199,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-meetingmins.json b/dev/packages/class-meetingmins.json
index e61971a29..d3024935f 100644
--- a/dev/packages/class-meetingmins.json
+++ b/dev/packages/class-meetingmins.json
@@ -15,10 +15,10 @@
   },
   "macros": {
     "absent{}": {
-      "snippet": "absent{${1:name1,name2,...}}"
+      "snippet": "absent{${1:name1,${2:name2},...}}"
     },
     "alsopresent{}": {
-      "snippet": "alsopresent{${1:name1,name2,...}}"
+      "snippet": "alsopresent{${1:name1,${2:name2},...}}"
     },
     "chair{}": {
       "snippet": "chair{${1:name}}"
@@ -40,10 +40,10 @@
       "snippet": "setdate{${1:date}}"
     },
     "setmembers{}": {
-      "snippet": "setmembers{${1:name1,name2,...}}"
+      "snippet": "setmembers{${1:name1,${2:name2},...}}"
     },
     "setpresent{}": {
-      "snippet": "setpresent{${1:name1,name2,...}}"
+      "snippet": "setpresent{${1:name1,${2:name2},...}}"
     },
     "DH": {},
     "dh": {},
diff --git a/dev/packages/class-memoir.json b/dev/packages/class-memoir.json
index b82ea65b8..86844323f 100644
--- a/dev/packages/class-memoir.json
+++ b/dev/packages/class-memoir.json
@@ -835,6 +835,9 @@
     "glossary[]{}{}": {
       "snippet": "glossary[${3:file}]{${1:term}}{${2:description}}"
     },
+    "glossary[](){}{}": {
+      "snippet": "glossary[${3:file}](${4:key}){${1:term}}{${2:description}}"
+    },
     "glossarycolsep": {},
     "glossaryintoc": {},
     "glossarymark": {},
@@ -1048,6 +1051,9 @@
     "justlastraggedleft": {},
     "keepthetitle": {},
     "killtitle": {},
+    "label(){}": {
+      "snippet": "label(${2:bookmark}){${1:label}}"
+    },
     "LastFrameCommand": {},
     "lastlineparrule": {},
     "lastlinerulefill": {},
diff --git a/dev/packages/class-mitthesis.json b/dev/packages/class-mitthesis.json
index 8116ae7e1..76ba8a317 100644
--- a/dev/packages/class-mitthesis.json
+++ b/dev/packages/class-mitthesis.json
@@ -83,6 +83,12 @@
     "CClicense{}{}": {
       "snippet": "CClicense{${1:license type}}{${2:URL}}"
     },
+    "Institution{}": {
+      "snippet": "Institution{${1:institution}}"
+    },
+    "SupervisorDesignation{}": {
+      "snippet": "SupervisorDesignation{${1:title}}"
+    },
     "PDFRightsText": {},
     "SuppressMonthError": {},
     "SuppressAcceptorError": {},
diff --git a/dev/packages/class-moderncv.json b/dev/packages/class-moderncv.json
index f95c8cb4d..ad8fc51b6 100644
--- a/dev/packages/class-moderncv.json
+++ b/dev/packages/class-moderncv.json
@@ -37,6 +37,9 @@
     "homepage{}": {
       "snippet": "homepage{${1:URL}}"
     },
+    "homepage[]{}": {
+      "snippet": "homepage[${2:protocol}]{${1:URL}}"
+    },
     "phone{}": {
       "snippet": "phone{${1:number}}"
     },
@@ -83,6 +86,17 @@
     "signalsocialsymbol": {},
     "codebergsocialsymbol": {},
     "discordsocialsymbol": {},
+    "twitchsocialsymbol": {},
+    "youtubesocialsymbol": {},
+    "tiktoksocialsymbol": {},
+    "instagramsocialsymbol": {},
+    "soundcloudsocialsymbol": {},
+    "steamsocialsymbol": {},
+    "xboxsocialsymbol": {},
+    "playstationsocialsymbol": {},
+    "battlenetsocialsymbol": {},
+    "arxivsocialsymbol": {},
+    "inspiresocialsymbol": {},
     "enclname": {},
     "makefooter": {},
     "moderncvstyle{}": {
@@ -144,6 +158,12 @@
     "namestyle{}": {
       "snippet": "namestyle{${1:text}}"
     },
+    "firstnamestyle{}": {
+      "snippet": "firstnamestyle{${1:text}}"
+    },
+    "lastnamestyle{}": {
+      "snippet": "lastnamestyle{${1:text}}"
+    },
     "titlestyle{}": {
       "snippet": "titlestyle{${1:text}}"
     },
@@ -185,6 +205,12 @@
     "cvdoubleitem[]{}{}{}{}": {
       "snippet": "cvdoubleitem[${5:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}"
     },
+    "cvtripleitem{}{}{}{}{}{}": {
+      "snippet": "cvtripleitem{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
+    },
+    "cvtripleitem[]{}{}{}{}{}{}": {
+      "snippet": "cvtripleitem[${7:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
+    },
     "cvlistitem{}": {
       "snippet": "cvlistitem{${1:item}}"
     },
@@ -262,12 +288,18 @@
     "recipient{}{}": {
       "snippet": "recipient{${1:recipient}}{${2:recipient address}}"
     },
+    "subject{}": {
+      "snippet": "subject{${1:subject}}"
+    },
     "opening{}": {
       "snippet": "opening{${1:opening}}"
     },
     "closing{}": {
       "snippet": "closing{${1:closing}}"
     },
+    "signature{}{}": {
+      "snippet": "signature{${1:scale}}{${2:imagefile}}"
+    },
     "enclosure{}": {
       "snippet": "enclosure{${1:enclosure}}"
     },
@@ -282,13 +314,16 @@
     "makeletterhead": {},
     "makeletterfoot": {},
     "makeletterclosing": {},
+    "hintscolumnwidth": {},
     "separatorcolumnwidth": {},
     "maincolumnwidth": {},
     "doubleitemcolumnwidth": {},
+    "tripleitemcolumnwidth": {},
     "separatorrulewidth": {},
     "listitemsymbolwidth": {},
     "listitemcolumnwidth": {},
     "listdoubleitemcolumnwidth": {},
+    "listitemsymbolspace": {},
     "cventryyearbox": {},
     "cventrytitleboxwidth": {},
     "cvskill{}": {
diff --git a/dev/packages/class-msu-thesis.json b/dev/packages/class-msu-thesis.json
index 60b293580..77d524c12 100644
--- a/dev/packages/class-msu-thesis.json
+++ b/dev/packages/class-msu-thesis.json
@@ -38,6 +38,7 @@
     "msuabbrevwidth{}": {
       "snippet": "msuabbrevwidth{${1:width}}"
     },
+    "msuappendixdelim": {},
     "msuappendixnumformat": {},
     "msucaptiondelim": {},
     "msutocdelim": {},
diff --git a/dev/packages/class-mucproc.json b/dev/packages/class-mucproc.json
index be8492cbb..64cc77c40 100644
--- a/dev/packages/class-mucproc.json
+++ b/dev/packages/class-mucproc.json
@@ -150,12 +150,24 @@
     "nptextcites{}{}": {
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "nptextcites[][]{}[][]{}": {
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "DH": {},
     "dh": {},
     "dj": {},
diff --git a/dev/packages/class-newlfm.json b/dev/packages/class-newlfm.json
index 15402aa15..b81075645 100644
--- a/dev/packages/class-newlfm.json
+++ b/dev/packages/class-newlfm.json
@@ -315,7 +315,7 @@
     },
     "monthname": {},
     "multletter{}": {
-      "snippet": "multletter{${1:id1,id2,...}}"
+      "snippet": "multletter{${1:id1,${2:id2},...}}"
     },
     "newlfmParam": {},
     "noFootline": {},
diff --git a/dev/packages/class-njuthesis.json b/dev/packages/class-njuthesis.json
index ecddce84f..131549551 100644
--- a/dev/packages/class-njuthesis.json
+++ b/dev/packages/class-njuthesis.json
@@ -408,6 +408,18 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -416,10 +428,26 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -427,6 +455,10 @@
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "style=gb7714-2015"
     }
   },
   "envs": {
diff --git a/dev/packages/class-novel.json b/dev/packages/class-novel.json
index 6a81bc588..40d71af0c 100644
--- a/dev/packages/class-novel.json
+++ b/dev/packages/class-novel.json
@@ -252,13 +252,13 @@
       "snippet": "charscale{${1:text}}"
     },
     "charscale[]{}": {
-      "snippet": "charscale[${2:scale,hoffset,voffset}]{${1:text}}"
+      "snippet": "charscale[${2:scale,${3:hoffset},voffset}]{${1:text}}"
     },
     "charscale*{}": {
       "snippet": "charscale*{${1:text}}"
     },
     "charscale*[]{}": {
-      "snippet": "charscale*[${2:scale,hoffset,voffset}]{${1:text}}"
+      "snippet": "charscale*[${2:scale,${3:hoffset},voffset}]{${1:text}}"
     },
     "TotalYpos": {},
     "PosTolerance": {},
@@ -307,7 +307,7 @@
       "snippet": "sidebyside{${1:content1}}{${2:content2}}"
     },
     "sidebyside[]{}{}": {
-      "snippet": "sidebyside[${3:a,b,c,d}]{${1:content1}}{${2:content2}}"
+      "snippet": "sidebyside[${3:a,${4:b},${5:c},d}]{${1:content1}}{${2:content2}}"
     },
     "myparindent{}": {
       "snippet": "myparindent{${1:length}}"
@@ -453,7 +453,7 @@
       "snippet": "FloatImage{${1:imagefile}}"
     },
     "FloatImage[]{}": {
-      "snippet": "FloatImage[${2:pos,xoffset,yoffset}]{${1:imagefile}}"
+      "snippet": "FloatImage[${2:pos,${3:xoffset},yoffset}]{${1:imagefile}}"
     },
     "WrapImage{}": {
       "snippet": "WrapImage{${1:imagefile}}"
@@ -484,10 +484,10 @@
     "realmarker": {},
     "fakemarker": {},
     "SetMarkerStyle{}": {
-      "snippet": "SetMarkerStyle{${1:astersk,dagger,number}}"
+      "snippet": "SetMarkerStyle{${1:astersk,${2:dagger},number}}"
     },
     "SetMarkerStyle[]{}": {
-      "snippet": "SetMarkerStyle[${2:real,fake}]{${1:astersk,dagger,number}}"
+      "snippet": "SetMarkerStyle[${2:real,${3:fake}]{${1:astersk},${4:dagger},number}}"
     },
     "SetMarkers": {},
     "endnote{}": {
diff --git a/dev/packages/class-nwafuthesis.json b/dev/packages/class-nwafuthesis.json
index 03dbe6fff..235b08f57 100644
--- a/dev/packages/class-nwafuthesis.json
+++ b/dev/packages/class-nwafuthesis.json
@@ -251,12 +251,24 @@
     "citets{}{}": {
       "snippet": "citets{${1:bibid}}{${2:bibid}}"
     },
+    "citets(){}{}": {
+      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citets()(){}{}": {
+      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citets()()[]{}[]{}": {
+      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "citets[]{}[]{}": {
       "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citets[][]{}[][]{}": {
       "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citets()()[][]{}[][]{}": {
+      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "citetns{}": {
       "snippet": "citetns{${1:bibid}}"
     },
@@ -296,20 +308,44 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-nwejmart.json b/dev/packages/class-nwejmart.json
index 17f61baae..1336bd0f5 100644
--- a/dev/packages/class-nwejmart.json
+++ b/dev/packages/class-nwejmart.json
@@ -233,6 +233,9 @@
     "fgii": {
       "option": "french"
     },
+    "fprimo)": {
+      "option": "french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-oup-authoring-template.json b/dev/packages/class-oup-authoring-template.json
index 38dccd249..f491f62c5 100644
--- a/dev/packages/class-oup-authoring-template.json
+++ b/dev/packages/class-oup-authoring-template.json
@@ -100,7 +100,7 @@
       "snippet": "journaltitle{${1:title}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:keyword1,keyword2,...}}"
+      "snippet": "keywords{${1:keyword1,${2:keyword2},...}}"
     },
     "midrule": {},
     "noappendicestocpagenum": {},
diff --git a/dev/packages/class-philosophersimprint.json b/dev/packages/class-philosophersimprint.json
index bc886eddd..06b30574f 100644
--- a/dev/packages/class-philosophersimprint.json
+++ b/dev/packages/class-philosophersimprint.json
@@ -33,7 +33,7 @@
       "snippet": "journalvolume{${1:number}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:keyword1,keyword2,...}}"
+      "snippet": "keywords{${1:keyword1,${2:keyword2},...}}"
     },
     "subject{}": {
       "snippet": "subject{${1:subject}}"
diff --git a/dev/packages/class-prtec.json b/dev/packages/class-prtec.json
index 284ae20a9..456a0835a 100644
--- a/dev/packages/class-prtec.json
+++ b/dev/packages/class-prtec.json
@@ -1,8 +1,6 @@
 {
   "includes": {
     "ifthen": [],
-    "kvoptions": [],
-    "kvsetkeys": [],
     "geometry": [],
     "parskip": [],
     "natbib": [],
@@ -12,7 +10,6 @@
     "array": [],
     "dcolumn": [],
     "mathtools": [],
-    "inputenc": [],
     "newtxtext": [],
     "newtxmath": [],
     "bm": [],
@@ -20,13 +17,10 @@
     "fnpos": [],
     "caption": [],
     "subcaption": [],
-    "textcase": [],
     "titlesec": [],
-    "hyperxmp": [],
     "hyperref": [],
     "doi": [],
     "etoolbox": [],
-    "xpatch": [],
     "multicol": [],
     "xcoffins": [],
     "metalogo": [],
@@ -49,7 +43,7 @@
       "snippet": "papertitle{${1:text}}"
     },
     "SetAuthors{}": {
-      "snippet": "SetAuthors{${1:name1,name2,...}}"
+      "snippet": "SetAuthors{${1:name1,${2:name2},...}}"
     },
     "affil{}": {
       "snippet": "affil{${1:number}}"
@@ -76,15 +70,6 @@
     "section*[]{}": {
       "snippet": "section*[${2:short title}]{${1:title}}"
     },
-    "svsection{}": {
-      "snippet": "svsection{${1:title}}"
-    },
-    "svsection[]{}": {
-      "snippet": "svsection[${2:short title}]{${1:title}}"
-    },
-    "svsection*{}": {
-      "snippet": "svsection*{${1:title}}"
-    },
     "ifCD": {},
     "CDtrue": {},
     "CDfalse": {},
@@ -127,7 +112,6 @@
     }
   },
   "options": [
-    "nodefaultsups",
     "nofoot",
     "upint",
     "smallerops",
@@ -137,6 +121,7 @@
     "frenchmath",
     "varbb",
     "cmbraces",
+    "subscriptcorrection",
     "largesc"
   ],
   "keyvals": []
diff --git a/dev/packages/class-randexam.json b/dev/packages/class-randexam.json
index 64bdba41e..d8b8eb30e 100644
--- a/dev/packages/class-randexam.json
+++ b/dev/packages/class-randexam.json
@@ -264,6 +264,18 @@
       "detail": "𝑅",
       "documentation": "MATHEMATICAL ITALIC CAPITAL R"
     },
+    "jacobi{}{}": {
+      "snippet": "jacobi{${1:arg1}}{${2:arg2}}",
+      "option": "moremath"
+    },
+    "ii": {
+      "option": "moremath",
+      "detail": "ⅈ",
+      "documentation": "DOUBLE-STRUCK ITALIC SMALL I"
+    },
+    "Zi": {
+      "option": "moremath"
+    },
     "arccot": {
       "option": "math=all"
     },
diff --git a/dev/packages/class-resphilosophica.json b/dev/packages/class-resphilosophica.json
index 3045f4b13..be3d42d89 100644
--- a/dev/packages/class-resphilosophica.json
+++ b/dev/packages/class-resphilosophica.json
@@ -33,7 +33,7 @@
       "snippet": "doinumber{${1:DOI}}"
     },
     "ECSelect{}": {
-      "snippet": "ECSelect{${1:level1,level2,...}}"
+      "snippet": "ECSelect{${1:level1,${2:level2},...}}"
     },
     "EditorialComment[]{}": {
       "snippet": "EditorialComment[${2:level}]{${1:comments}}"
@@ -45,7 +45,7 @@
       "snippet": "endpage{${1:number}}"
     },
     "issuenumber{}": {
-      "snippet": "issuenumber{${1:number(s)}}"
+      "snippet": "issuenumber{${1:number(${2:s})}}"
     },
     "manuscriptid{}": {
       "snippet": "manuscriptid{${1:id}}"
@@ -63,10 +63,10 @@
       "snippet": "prevpaper{${1:previous paper}}"
     },
     "publicationmonth[]{}": {
-      "snippet": "publicationmonth[${2:abbrev month(s)}]{${1:month(s)}}"
+      "snippet": "publicationmonth[${2:abbrev month(${3:s})}]{${1:month(${4:s})}}"
     },
     "publicationmonth{}": {
-      "snippet": "publicationmonth{${1:month(s)}}"
+      "snippet": "publicationmonth{${1:month(${2:s})}}"
     },
     "publicationyear{}": {
       "snippet": "publicationyear{${1:year}}"
@@ -82,16 +82,16 @@
       "snippet": "TC{${1:text}}"
     },
     "TCSelect[]{}": {
-      "snippet": "TCSelect[${2:color}]{${1:level1,level2,...}}"
+      "snippet": "TCSelect[${2:color}]{${1:level1,${3:level2},...}}"
     },
     "TCSelect{}": {
-      "snippet": "TCSelect{${1:level1,level2,...}}"
+      "snippet": "TCSelect{${1:level1,${2:level2},...}}"
     },
     "titlenote{}": {
       "snippet": "titlenote{${1:note}}"
     },
     "volumenumber{}": {
-      "snippet": "volumenumber{${1:number(s)}}"
+      "snippet": "volumenumber{${1:number(${2:s})}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-sagej.json b/dev/packages/class-sagej.json
index 45ced4c76..eb43ec58b 100644
--- a/dev/packages/class-sagej.json
+++ b/dev/packages/class-sagej.json
@@ -68,7 +68,7 @@
     "journalclassshort": {},
     "journalname": {},
     "keywords{}": {
-      "snippet": "keywords{${1:word1,word2,...}}"
+      "snippet": "keywords{${1:word1,${2:word2},...}}"
     },
     "refsize": {},
     "runninghead{}": {
diff --git a/dev/packages/class-sapthesis.json b/dev/packages/class-sapthesis.json
index fa5767772..a272d1973 100644
--- a/dev/packages/class-sapthesis.json
+++ b/dev/packages/class-sapthesis.json
@@ -96,10 +96,10 @@
     "eu": {},
     "iu": {},
     "der{}{}": {
-      "snippet": "der{${1:function}}{${2:var1,var2,...}}"
+      "snippet": "der{${1:function}}{${2:var1,${3:var2},...}}"
     },
     "pder{}{}": {
-      "snippet": "pder{${1:function}}{${2:var1,var2,...}}"
+      "snippet": "pder{${1:function}}{${2:var1,${3:var2},...}}"
     },
     "rb{}": {
       "snippet": "rb{${1:sub}}"
diff --git a/dev/packages/class-schulma-klausur.json b/dev/packages/class-schulma-klausur.json
index 5e8e9d29c..1613e2cbe 100644
--- a/dev/packages/class-schulma-klausur.json
+++ b/dev/packages/class-schulma-klausur.json
@@ -43,6 +43,15 @@
     "Aufgabe[][]": {
       "snippet": "Aufgabe[${1:Thema}][${2:Bearbeitungszeit}]"
     },
+    "Aufgabe()": {
+      "snippet": "Aufgabe(${1:Punktzahl})"
+    },
+    "Aufgabe[]()": {
+      "snippet": "Aufgabe[${1:Thema}](${2:Punktzahl})"
+    },
+    "Aufgabe[][]()": {
+      "snippet": "Aufgabe[${1:Thema}][${2:Bearbeitungszeit}](${3:Punktzahl})"
+    },
     "Aufgabe*": {},
     "Aufgabe*[]": {
       "snippet": "Aufgabe*[${1:Thema}]"
@@ -50,6 +59,15 @@
     "Aufgabe*[][]": {
       "snippet": "Aufgabe*[${1:Thema}][${2:Bearbeitungszeit}]"
     },
+    "Aufgabe*()": {
+      "snippet": "Aufgabe*(${1:Punktzahl})"
+    },
+    "Aufgabe*[]()": {
+      "snippet": "Aufgabe*[${1:Thema}](${2:Punktzahl})"
+    },
+    "Aufgabe*[][]()": {
+      "snippet": "Aufgabe*[${1:Thema}][${2:Bearbeitungszeit}](${3:Punktzahl})"
+    },
     "schulmaalph{}": {
       "snippet": "schulmaalph{${1:counter}}"
     },
diff --git a/dev/packages/class-scrlttr2.json b/dev/packages/class-scrlttr2.json
index b8030dca6..7a15b64dc 100644
--- a/dev/packages/class-scrlttr2.json
+++ b/dev/packages/class-scrlttr2.json
@@ -268,6 +268,14 @@
     "edgesize": {
       "option": "visualize"
     },
+    "showenvelope()()": {
+      "snippet": "showenvelope(${1:width},${2:height})(${3:h-offset},${4:v-offset})",
+      "option": "visualize"
+    },
+    "showenvelope()()[]": {
+      "snippet": "showenvelope(${2:width},${3:height})(${4:h-offset},${5:v-offset})[${1:instructions}]",
+      "option": "visualize"
+    },
     "showISOenvelope{}": {
       "snippet": "showISOenvelope{${1:format}}",
       "option": "visualize"
diff --git a/dev/packages/class-se2thesis.json b/dev/packages/class-se2thesis.json
index 609db58ad..7130749c4 100644
--- a/dev/packages/class-se2thesis.json
+++ b/dev/packages/class-se2thesis.json
@@ -63,6 +63,9 @@
     "signatureBox[]{}": {
       "snippet": "signatureBox[${2:width}]{${1:signature-name}}"
     },
+    "summarybox{}{}": {
+      "snippet": "summarybox{${1:label text}}{${2:text}}"
+    },
     "headingdot": {}
   },
   "envs": {
diff --git a/dev/packages/class-skdoc.json b/dev/packages/class-skdoc.json
index 6c236b0e5..8af71c976 100644
--- a/dev/packages/class-skdoc.json
+++ b/dev/packages/class-skdoc.json
@@ -92,10 +92,10 @@
       "snippet": "Option{${1:option}}"
     },
     "Options{}": {
-      "snippet": "Options{${1:option1,option2,...}}"
+      "snippet": "Options{${1:option1,${2:option2},...}}"
     },
     "WithValues{}": {
-      "snippet": "WithValues{${1:value1,value2,...}}"
+      "snippet": "WithValues{${1:value1,${2:value2},...}}"
     },
     "AndDefault{}": {
       "snippet": "AndDefault{${1:default value}}"
diff --git a/dev/packages/class-sn-jnl.json b/dev/packages/class-sn-jnl.json
index 1cfd4ae44..eab5be8b4 100644
--- a/dev/packages/class-sn-jnl.json
+++ b/dev/packages/class-sn-jnl.json
@@ -551,7 +551,7 @@
     },
     "keywordname": {},
     "keywords{}": {
-      "snippet": "keywords{${1:word1,word2,...}}"
+      "snippet": "keywords{${1:word1,${2:word2},...}}"
     },
     "labelwidthi": {},
     "labelwidthii": {},
diff --git a/dev/packages/class-standalone.json b/dev/packages/class-standalone.json
index 732db975e..a9c8b6f6c 100644
--- a/dev/packages/class-standalone.json
+++ b/dev/packages/class-standalone.json
@@ -41,7 +41,7 @@
       "snippet": "standaloneconfig{${1:options}}"
     },
     "standaloneenv{}": {
-      "snippet": "standaloneenv{${1:envname1,envname2,...}}"
+      "snippet": "standaloneenv{${1:envname1,${2:envname2},...}}"
     },
     "standaloneignore": {},
     "thesapage": {},
diff --git a/dev/packages/class-thuthesis.json b/dev/packages/class-thuthesis.json
index b01dd7f33..ea7a75ffa 100644
--- a/dev/packages/class-thuthesis.json
+++ b/dev/packages/class-thuthesis.json
@@ -294,6 +294,7 @@
       "math-ellipsis=",
       "real-part=",
       "math-font=",
+      "eqn-paren-style=",
       "cite-style=",
       "toc-depth=${1:integer}",
       "spine-font={${1:font commands}}",
diff --git a/dev/packages/class-tkz-doc.json b/dev/packages/class-tkz-doc.json
index 4387550c4..cbc3f213f 100644
--- a/dev/packages/class-tkz-doc.json
+++ b/dev/packages/class-tkz-doc.json
@@ -111,6 +111,9 @@
     "NameSys{}": {
       "snippet": "NameSys{${1:os}}"
     },
+    "nodeshadowedone(){}": {
+      "snippet": "nodeshadowedone(${2:x},${3:y}){${1:arg}}"
+    },
     "ntt": {},
     "oarg{}": {
       "snippet": "oarg{${1:arg}}"
diff --git a/dev/packages/class-tudapub.json b/dev/packages/class-tudapub.json
index 5fdc0a838..188e74154 100644
--- a/dev/packages/class-tudapub.json
+++ b/dev/packages/class-tudapub.json
@@ -159,7 +159,7 @@
       "snippet": "setupReviewName[${2:num}]{${1:Referent}}"
     },
     "setupReviewName*{}": {
-      "snippet": "setupReviewName*{${1:Bezeicher1,Bezeicher2,...}}"
+      "snippet": "setupReviewName*{${1:Bezeicher1,${2:Bezeicher2},...}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-udes-genie-these.json b/dev/packages/class-udes-genie-these.json
index 9ecb686b4..053cc25d6 100644
--- a/dev/packages/class-udes-genie-these.json
+++ b/dev/packages/class-udes-genie-these.json
@@ -135,6 +135,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-ulthese.json b/dev/packages/class-ulthese.json
index 13593368e..e958b44fa 100644
--- a/dev/packages/class-ulthese.json
+++ b/dev/packages/class-ulthese.json
@@ -6,14 +6,10 @@
     "natbib": [],
     "babel": [],
     "numprint": [],
-    "etoolbox": [],
     "hyperref": [],
     "graphicx": [],
     "xcolor": [],
-    "chapterbib": [
-      "bibchapitre",
-      "bibsection"
-    ]
+    "microtype": []
   },
   "macros": {
     "captionsenglish": {
@@ -252,6 +248,9 @@
     "fgii": {
       "option": "french"
     },
+    "fprimo)": {
+      "option": "french"
+    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
@@ -616,8 +615,6 @@
   },
   "options": [
     "nonatbib",
-    "bibchapitre",
-    "bibsection",
     "nobabel",
     "nohyperref",
     "10pt",
@@ -634,10 +631,10 @@
     "LLM",
     "MErg",
     "MMus",
-    "MPht",
     "MSc",
     "MScGeogr",
     "MServSoc",
+    "MTravSoc",
     "MPsEd",
     "multifacultaire",
     "cotutelle",
diff --git a/dev/packages/class-univie-ling-expose.json b/dev/packages/class-univie-ling-expose.json
index 44e9fc582..23278f569 100644
--- a/dev/packages/class-univie-ling-expose.json
+++ b/dev/packages/class-univie-ling-expose.json
@@ -21,6 +21,7 @@
     "biblatex": [],
     "varioref": [],
     "prettyref": [],
+    "isodate": [],
     "draftwatermark": [
       "draftmark",
       "draftmark=true",
@@ -109,6 +110,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -117,6 +130,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -409,6 +426,18 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
+    "weblink{}": {
+      "snippet": "weblink{${1:URL}}"
+    },
+    "weblink{}[]": {
+      "snippet": "weblink{${1:URL}}[${2:date}]"
+    },
+    "SetURLDate{}": {
+      "snippet": "SetURLDate{${1:date}}"
+    },
+    "urldate{}": {
+      "snippet": "urldate{${1:date}}"
+    },
     "footnumwidth": {},
     "lecsemshort": {},
     "lecsemverb": {},
diff --git a/dev/packages/class-univie-ling-handout.json b/dev/packages/class-univie-ling-handout.json
index 642cb4e90..d02c0db0d 100644
--- a/dev/packages/class-univie-ling-handout.json
+++ b/dev/packages/class-univie-ling-handout.json
@@ -112,6 +112,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -120,6 +132,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -502,6 +518,18 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
+    "weblink{}": {
+      "snippet": "weblink{${1:URL}}"
+    },
+    "weblink{}[]": {
+      "snippet": "weblink{${1:URL}}[${2:date}]"
+    },
+    "SetURLDate{}": {
+      "snippet": "SetURLDate{${1:date}}"
+    },
+    "urldate{}": {
+      "snippet": "urldate{${1:date}}"
+    },
     "aftertitle": {},
     "beforedate": {},
     "beforeevent": {},
diff --git a/dev/packages/class-univie-ling-paper.json b/dev/packages/class-univie-ling-paper.json
index f8be12eda..a7c932bf4 100644
--- a/dev/packages/class-univie-ling-paper.json
+++ b/dev/packages/class-univie-ling-paper.json
@@ -19,6 +19,7 @@
     "biblatex": [],
     "varioref": [],
     "prettyref": [],
+    "isodate": [],
     "draftwatermark": [
       "draftmark",
       "draftmark=true",
@@ -107,6 +108,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -115,6 +128,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -411,6 +428,18 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
+    "weblink{}": {
+      "snippet": "weblink{${1:URL}}"
+    },
+    "weblink{}[]": {
+      "snippet": "weblink{${1:URL}}[${2:date}]"
+    },
+    "SetURLDate{}": {
+      "snippet": "SetURLDate{${1:date}}"
+    },
+    "urldate{}": {
+      "snippet": "urldate{${1:date}}"
+    },
     "footnumwidth": {},
     "lecsemshort": {},
     "lecsemverb": {},
diff --git a/dev/packages/class-univie-ling-poster.json b/dev/packages/class-univie-ling-poster.json
index 2de79ae0f..6bfc22218 100644
--- a/dev/packages/class-univie-ling-poster.json
+++ b/dev/packages/class-univie-ling-poster.json
@@ -19,6 +19,7 @@
     "prettyref": [],
     "tikzpagenodes": [],
     "tikzlibrarycalc": [],
+    "isodate": [],
     "fontspec": [
       "fonts=otf",
       "polyglossia",
@@ -107,6 +108,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -115,6 +128,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -420,6 +437,18 @@
     "restspace[]": {
       "snippet": "restspace[${1:label}]"
     },
+    "weblink{}": {
+      "snippet": "weblink{${1:URL}}"
+    },
+    "weblink{}[]": {
+      "snippet": "weblink{${1:URL}}[${2:date}]"
+    },
+    "SetURLDate{}": {
+      "snippet": "SetURLDate{${1:date}}"
+    },
+    "urldate{}": {
+      "snippet": "urldate{${1:date}}"
+    },
     "headeroffset": {},
     "titleoffset": {},
     "beforetitling": {},
@@ -431,12 +460,14 @@
     "umbruch[]": {
       "snippet": "umbruch[${1:length}]"
     },
+    "lmoffset": {},
     "lsoffset": {},
     "titleindent": {},
     "restwidth": {},
     "leadingzero{}": {
       "snippet": "leadingzero{${1:arg}}"
     },
+    "unitindent": {},
     "urlprefix": {},
     "DH": {},
     "dh": {},
@@ -500,6 +531,7 @@
     "cd=",
     "pagesize=",
     "portrait",
+    "smallmargins",
     "scale=${1:factor}",
     "polyglossia",
     "all",
diff --git a/dev/packages/class-univie-ling-thesis.json b/dev/packages/class-univie-ling-thesis.json
index a281cd61c..c099491e1 100644
--- a/dev/packages/class-univie-ling-thesis.json
+++ b/dev/packages/class-univie-ling-thesis.json
@@ -20,6 +20,7 @@
     "biblatex": [],
     "varioref": [],
     "prettyref": [],
+    "isodate": [],
     "draftwatermark": [
       "draftmark",
       "draftmark=true",
@@ -112,6 +113,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa=true"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -120,6 +133,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa=true"
+    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -419,6 +436,18 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
+    "weblink{}": {
+      "snippet": "weblink{${1:URL}}"
+    },
+    "weblink{}[]": {
+      "snippet": "weblink{${1:URL}}[${2:date}]"
+    },
+    "SetURLDate{}": {
+      "snippet": "SetURLDate{${1:date}}"
+    },
+    "urldate{}": {
+      "snippet": "urldate{${1:date}}"
+    },
     "footnumwidth": {},
     "lecsemshort": {},
     "lecsemverb": {},
diff --git a/dev/packages/class-univie-ling-wlg.json b/dev/packages/class-univie-ling-wlg.json
index 70ee9449b..1a86f297d 100644
--- a/dev/packages/class-univie-ling-wlg.json
+++ b/dev/packages/class-univie-ling-wlg.json
@@ -27,6 +27,7 @@
     "multirow": [],
     "varioref": [],
     "prettyref": [],
+    "isodate": [],
     "biblatex": [
       "biblatex",
       "biblatex=true"
@@ -118,7 +119,7 @@
       "snippet": "jeditors{${1:name}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:word1,word2,...}}"
+      "snippet": "keywords{${1:word1,${2:word2},...}}"
     },
     "lastpageref": {},
     "ljobname": {},
@@ -150,7 +151,19 @@
     "versal{}": {
       "snippet": "versal{${1:text}}"
     },
-    "wlgurl": {}
+    "wlgurl": {},
+    "weblink{}": {
+      "snippet": "weblink{${1:URL}}"
+    },
+    "weblink{}[]": {
+      "snippet": "weblink{${1:URL}}[${2:date}]"
+    },
+    "SetURLDate{}": {
+      "snippet": "SetURLDate{${1:date}}"
+    },
+    "urldate{}": {
+      "snippet": "urldate{${1:date}}"
+    }
   },
   "envs": {},
   "options": [
diff --git a/dev/packages/class-utexasthesis.json b/dev/packages/class-utexasthesis.json
index 3e1e76fad..04043f6d7 100644
--- a/dev/packages/class-utexasthesis.json
+++ b/dev/packages/class-utexasthesis.json
@@ -29,7 +29,7 @@
     },
     "maketableofcontents": {},
     "othercommitteemembers{}": {
-      "snippet": "othercommitteemembers{${1:name1,name2,...}}"
+      "snippet": "othercommitteemembers{${1:name1,${2:name2},...}}"
     },
     "supervisor{}": {
       "snippet": "supervisor{${1:name}}"
diff --git a/dev/packages/class-xdupgthesis.json b/dev/packages/class-xdupgthesis.json
index c39a81328..3067c29b8 100644
--- a/dev/packages/class-xdupgthesis.json
+++ b/dev/packages/class-xdupgthesis.json
@@ -228,20 +228,44 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-xduugthesis.json b/dev/packages/class-xduugthesis.json
index 0e66cd14c..b0a7589cc 100644
--- a/dev/packages/class-xduugthesis.json
+++ b/dev/packages/class-xduugthesis.json
@@ -210,20 +210,44 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-xduugtp.json b/dev/packages/class-xduugtp.json
index 3d29b1339..96d81db5b 100644
--- a/dev/packages/class-xduugtp.json
+++ b/dev/packages/class-xduugtp.json
@@ -206,20 +206,44 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
+    "citecs(){}{}": {
+      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()(){}{}": {
+      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "citecs()()[]{}[]{}": {
+      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "citecs()()[][]{}[][]{}": {
+      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
+    "authornumcites(){}{}": {
+      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()(){}{}": {
+      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "authornumcites()()[]{}[]{}": {
+      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
+    "authornumcites()()[][]{}[][]{}": {
+      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-yathesis.json b/dev/packages/class-yathesis.json
index 1596d19ba..339b43305 100644
--- a/dev/packages/class-yathesis.json
+++ b/dev/packages/class-yathesis.json
@@ -337,6 +337,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/clock.json b/dev/packages/clock.json
new file mode 100644
index 000000000..6d4fbb590
--- /dev/null
+++ b/dev/packages/clock.json
@@ -0,0 +1,22 @@
+{
+  "includes": {},
+  "macros": {
+    "clock{}{}": {
+      "snippet": "clock{${1:hour}}{${2:minute}}"
+    },
+    "clocktime": {},
+    "clockfont": {},
+    "bigclockfont": {},
+    "ifClockFrame": {},
+    "ClockFrametrue": {},
+    "ClockFramefalse": {},
+    "texthours": {},
+    "textminutes": {},
+    "texttime": {},
+    "LaTeXclock": {},
+    "TeXclock": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/cmdtrack.json b/dev/packages/cmdtrack.json
index 348b912f8..64c0786d5 100644
--- a/dev/packages/cmdtrack.json
+++ b/dev/packages/cmdtrack.json
@@ -3,7 +3,7 @@
   "macros": {
     "commandlist": {},
     "untrack{}": {
-      "snippet": "untrack{${1:cmd1,cmd2,...}}"
+      "snippet": "untrack{${1:cmd1,${2:cmd2},...}}"
     },
     "logcmd{}{}": {
       "snippet": "logcmd{${1:cmd1}}{${2:cmd2}}"
diff --git a/dev/packages/codeanatomy.json b/dev/packages/codeanatomy.json
index 8f8d95a64..b28f464f3 100644
--- a/dev/packages/codeanatomy.json
+++ b/dev/packages/codeanatomy.json
@@ -57,7 +57,10 @@
       "snippet": "bgcode{${1:code}}"
     },
     "ptab": {},
-    "phspace": {}
+    "phspace": {},
+    "codeAnnotation{}(){}": {
+      "snippet": "codeAnnotation{${1:node name}}(${3:coordinate}){${2:label text}}"
+    }
   },
   "envs": {},
   "options": [],
diff --git a/dev/packages/codelisting.json b/dev/packages/codelisting.json
new file mode 100644
index 000000000..aa3e289dd
--- /dev/null
+++ b/dev/packages/codelisting.json
@@ -0,0 +1,76 @@
+{
+  "includes": {
+    "listings": [],
+    "scontents": []
+  },
+  "macros": {
+    "tscode{}": {
+      "snippet": "tscode{${1:st-name}}"
+    },
+    "tscode[]{}": {
+      "snippet": "tscode[${2:code-keys}]{${1:st-name}}"
+    },
+    "tscode*{}": {
+      "snippet": "tscode*{${1:st-name}}"
+    },
+    "tscode*[]{}": {
+      "snippet": "tscode*[${2:code-keys}]{${1:st-name}}"
+    },
+    "tsdemo{}": {
+      "snippet": "tsdemo{${1:st-name}}"
+    },
+    "tsdemo[]{}": {
+      "snippet": "tsdemo[${2:code-keys}]{${1:st-name}}"
+    },
+    "tsdemo*{}": {
+      "snippet": "tsdemo*{${1:st-name}}"
+    },
+    "tsdemo*[]{}": {
+      "snippet": "tsdemo*[${2:code-keys}]{${1:st-name}}"
+    },
+    "tsresult{}": {
+      "snippet": "tsresult{${1:st-name}}"
+    },
+    "tsresult[]{}": {
+      "snippet": "tsresult[${2:code-keys}]{${1:st-name}}"
+    },
+    "tsresult*{}": {
+      "snippet": "tsresult*{${1:st-name}}"
+    },
+    "tsresult*[]{}": {
+      "snippet": "tsresult*[${2:code-keys}]{${1:st-name}}"
+    },
+    "setcodekeys{}": {
+      "snippet": "setcodekeys{${1:code-keys}}"
+    },
+    "PkgDescription{}": {
+      "snippet": "PkgDescription{${1:arg}}"
+    },
+    "PkgInfo{}{}": {
+      "snippet": "PkgInfo{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {
+    "codestore": {},
+    "codestore[]": {
+      "name": "codestore",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "${1:st-name}",
+      "st=${1:st-name}",
+      "store-at=${1:st-name}",
+      "store-env=${1:seq name}",
+      "print-env",
+      "write-env=${1:file.ext}",
+      "write-out=${1:file.ext}",
+      "overwrite",
+      "force-eol"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/color.json b/dev/packages/color.json
new file mode 100644
index 000000000..27b5e9caf
--- /dev/null
+++ b/dev/packages/color.json
@@ -0,0 +1,79 @@
+{
+  "includes": {},
+  "macros": {
+    "textcolor{}{}": {
+      "snippet": "textcolor{${1:color}}{${2:text}}"
+    },
+    "textcolor[]{}{}": {
+      "snippet": "textcolor[${3:model}]{${1:color}}{${2:text}}"
+    },
+    "mathcolor{}{}": {
+      "snippet": "mathcolor{${1:color}}{${2:math}}"
+    },
+    "mathcolor[]{}{}": {
+      "snippet": "mathcolor[${3:model}]{${1:color}}{${2:math}}"
+    },
+    "pagecolor{}": {
+      "snippet": "pagecolor{${1:color}}"
+    },
+    "nopagecolor": {},
+    "definecolor{}{}{}": {
+      "snippet": "definecolor{${1:name}}{${2:model}}{${3:color-spec}}"
+    },
+    "DefineNamedColor{}{}{}{}": {
+      "snippet": "DefineNamedColor{${1:type}}{${2:name}}{${3:model}}{${4:spec}}"
+    },
+    "normalcolor": {},
+    "color[]{}": {
+      "snippet": "color[${2:model}]{${1:color}}"
+    },
+    "color{}": {
+      "snippet": "color{${1:color}}"
+    },
+    "colorbox[]{}{}": {
+      "snippet": "colorbox[${3:model}]{${1:color}}{${2:text}}"
+    },
+    "colorbox{}{}": {
+      "snippet": "colorbox{${1:color}}{${2:text}}"
+    },
+    "fcolorbox[]{}{}{}": {
+      "snippet": "fcolorbox[${4:model}]{${1:color}}{${2:color}}{${3:text}}"
+    },
+    "fcolorbox{}{}{}": {
+      "snippet": "fcolorbox{${1:color}}{${2:color}}{${3:text}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "monochrome",
+    "debugshow",
+    "setpagesize",
+    "nosetpagesize",
+    "dvips",
+    "xdvi",
+    "dvipdf",
+    "dvipdfm",
+    "dvipdfmx",
+    "pdftex",
+    "luatex",
+    "dvisvgm",
+    "xetex",
+    "dvipsone",
+    "dviwindo",
+    "emtex",
+    "dviwin",
+    "oztex",
+    "textures",
+    "pctexps",
+    "pctexwin",
+    "pctexhp",
+    "pctex32",
+    "truetex",
+    "tcidvi",
+    "vtex",
+    "dvipsnames",
+    "nodvipsnames",
+    "usenames"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/colorblind.json b/dev/packages/colorblind.json
new file mode 100644
index 000000000..78405358b
--- /dev/null
+++ b/dev/packages/colorblind.json
@@ -0,0 +1,27 @@
+{
+  "includes": {
+    "xcolor": [],
+    "ifthen": [],
+    "tikz": [],
+    "tikzlibrarymath": [],
+    "pgfplots": []
+  },
+  "macros": {
+    "drawScheme{}": {
+      "snippet": "drawScheme{${1:scheme}}"
+    },
+    "drawSchemeC{}": {
+      "snippet": "drawSchemeC{${1:scheme}}"
+    },
+    "drawSchemeC[]{}": {
+      "snippet": "drawSchemeC[${2:width}]{${1:scheme}}"
+    },
+    "theColorNum": {}
+  },
+  "envs": {},
+  "options": [
+    "Tol",
+    "OkabeIto"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/colortbl.json b/dev/packages/colortbl.json
new file mode 100644
index 000000000..764bfe2f4
--- /dev/null
+++ b/dev/packages/colortbl.json
@@ -0,0 +1,88 @@
+{
+  "includes": {
+    "array": [],
+    "color": []
+  },
+  "macros": {
+    "arrayrulecolor{}": {
+      "snippet": "arrayrulecolor{${1:color}}"
+    },
+    "arrayrulecolor[]{}": {
+      "snippet": "arrayrulecolor[${2:color model}]{${1:color}}"
+    },
+    "cellcolor{}": {
+      "snippet": "cellcolor{${1:color}}"
+    },
+    "cellcolor[]{}[][]": {
+      "snippet": "cellcolor[${2:color model}]{${1:color}}[${3:left overhang}][${4:right overhang}]"
+    },
+    "columncolor{}": {
+      "snippet": "columncolor{${1:color}}"
+    },
+    "columncolor[]{}[][]": {
+      "snippet": "columncolor[${2:color model}]{${1:color}}[${3:left overhang}][${4:right overhang}]"
+    },
+    "doublerulesepcolor{}": {
+      "snippet": "doublerulesepcolor{${1:color}}"
+    },
+    "doublerulesepcolor[]{}": {
+      "snippet": "doublerulesepcolor[${2:color model}]{${1:color}}"
+    },
+    "rowcolor{}": {
+      "snippet": "rowcolor{${1:color}}"
+    },
+    "rowcolor[]{}[][]": {
+      "snippet": "rowcolor[${2:color model}]{${1:color}}[${3:left overhang}][${4:right overhang}]"
+    },
+    "minrowclearance": {},
+    "rowcolors{}{}{}": {
+      "snippet": "rowcolors{${1:row}}{${2:color}}{${3:color}}"
+    },
+    "rowcolors[]{}{}{}": {
+      "snippet": "rowcolors[${4:commands}]{${1:row}}{${2:color}}{${3:color}}"
+    },
+    "rowcolors*{}{}{}": {
+      "snippet": "rowcolors*{${1:row}}{${2:color}}{${3:color}}"
+    },
+    "rowcolors*[]{}{}{}": {
+      "snippet": "rowcolors*[${4:commands}]{${1:row}}{${2:color}}{${3:color}}"
+    },
+    "showrowcolors": {},
+    "hiderowcolors": {},
+    "rownum": {},
+    "therownum": {}
+  },
+  "envs": {},
+  "options": [
+    "monochrome",
+    "debugshow",
+    "setpagesize",
+    "nosetpagesize",
+    "dvips",
+    "xdvi",
+    "dvipdf",
+    "dvipdfm",
+    "dvipdfmx",
+    "pdftex",
+    "luatex",
+    "dvisvgm",
+    "xetex",
+    "dvipsone",
+    "dviwindo",
+    "emtex",
+    "dviwin",
+    "oztex",
+    "textures",
+    "pctexps",
+    "pctexwin",
+    "pctexhp",
+    "pctex32",
+    "truetex",
+    "tcidvi",
+    "vtex",
+    "dvipsnames",
+    "nodvipsnames",
+    "usenames"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/comma.json b/dev/packages/comma.json
new file mode 100644
index 000000000..6e4891350
--- /dev/null
+++ b/dev/packages/comma.json
@@ -0,0 +1,15 @@
+{
+  "includes": {},
+  "macros": {
+    "commaform{}": {
+      "snippet": "commaform{${1:counter}}"
+    },
+    "commaformtoken": {},
+    "addcomma{}{}{}{}": {
+      "snippet": "addcomma{${1:digit1}}{${2:digit2}}{${3:digit3}}{${4:digit4 or \\relax}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/comment.json b/dev/packages/comment.json
new file mode 100644
index 000000000..b4e49ab56
--- /dev/null
+++ b/dev/packages/comment.json
@@ -0,0 +1,69 @@
+{
+  "includes": {},
+  "macros": {
+    "includecomment{}": {
+      "snippet": "includecomment{${1:envname}}"
+    },
+    "excludecomment{}": {
+      "snippet": "excludecomment{${1:envname}}"
+    },
+    "CommentCutFile": {},
+    "ProcessCutFile": {},
+    "generalcomment{}{}{}": {
+      "snippet": "generalcomment{${1:envname}}{${2:begdef}}{${3:enddef}}"
+    },
+    "specialcomment{}{}{}": {
+      "snippet": "specialcomment{${1:envname}}{${2:begdef}}{${3:enddef}}"
+    },
+    "Thiscomment{}": {
+      "snippet": "Thiscomment{${1:line stuff}}"
+    },
+    "WriteCommentLine{}": {
+      "snippet": "WriteCommentLine{${1:line stuff}}"
+    },
+    "ThisComment{}": {
+      "snippet": "ThisComment{${1:line stuff}}"
+    },
+    "processcomment{}{}{}{}": {
+      "snippet": "processcomment{${1:envname}}{${2:def}}{${3:begdef}}{${4:enddef}}"
+    },
+    "makeinnocent{}": {
+      "snippet": "makeinnocent{${1:arg}}"
+    },
+    "csarg{}{}": {
+      "snippet": "csarg{${1:arg1}}{${2:arg2}}"
+    },
+    "latexname": {},
+    "latexename": {},
+    "CommentStream": {},
+    "DefaultCutFileName": {},
+    "ProcessComment{}": {
+      "snippet": "ProcessComment{${1:arg}}"
+    },
+    "CurrentComment": {},
+    "xComment{}": {
+      "snippet": "xComment{${1:arg}}"
+    },
+    "ProcessCommentLine{}": {
+      "snippet": "ProcessCommentLine{${1:arg}}"
+    },
+    "SetUpCutFile": {},
+    "PrepareCutFile": {},
+    "CloseAndInputCutFile": {},
+    "FinalizeCutFile": {},
+    "leveledcomment{}{}": {
+      "snippet": "leveledcomment{${1:arg1}}{${2:arg2}}"
+    },
+    "EndOfComment{}": {
+      "snippet": "EndOfComment{${1:arg}}"
+    },
+    "CommentEndDef{}": {
+      "snippet": "CommentEndDef{${1:arg}}"
+    }
+  },
+  "envs": {
+    "comment": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/commutative-diagrams.json b/dev/packages/commutative-diagrams.json
new file mode 100644
index 000000000..82c9946d6
--- /dev/null
+++ b/dev/packages/commutative-diagrams.json
@@ -0,0 +1,49 @@
+{
+  "includes": {
+    "tikz": [],
+    "tikzlibrarycommutative-diagrams": []
+  },
+  "macros": {},
+  "envs": {
+    "codi": {},
+    "codi[]": {
+      "name": "codi",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "prompter",
+      "expand=",
+      "replace character=${1:character1} with ${2:character2}",
+      "replace charcode=${1:charcode} with ${2:character}",
+      "remove characters=${1:characters}",
+      "remove character=${1:character}",
+      "remove charcode=${1:charcode}",
+      "overwrite=",
+      "every diagram/.append style={${1:TikZ options}}",
+      "every layout/.append style={${1:TikZ options}}",
+      "every object/.append style={${1:TikZ options}}",
+      "every arrow/.append style={${1:TikZ options}}",
+      "every label/.append style={${1:TikZ options}}",
+      "tetragonal",
+      "tetragonal=base ${1:<length>} height ${2:<length>}",
+      "hexagonal",
+      "hexagonal=${1:<direction>} side ${2:<length>} angle ${3:<angle>}",
+      "square=",
+      "golden=",
+      "arrows/crossing over",
+      "arrows/crossing over/clearance=",
+      "arrows/crossing over/color=",
+      "arrows/slide=",
+      "arrows/shove=",
+      "%color",
+      "x=",
+      "y=",
+      "node distance="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/competences.json b/dev/packages/competences.json
index 4f16e8b72..3fd19db0a 100644
--- a/dev/packages/competences.json
+++ b/dev/packages/competences.json
@@ -28,7 +28,7 @@
       "snippet": "tableaupartie{${1:partie}}"
     },
     "tableauprefix{}": {
-      "snippet": "tableauprefix{${1:partie1,partie2,...}}"
+      "snippet": "tableauprefix{${1:partie1,${2:partie2},...}}"
     },
     "cstotal": {},
     "dummyMacro": {},
diff --git a/dev/packages/contour.json b/dev/packages/contour.json
new file mode 100644
index 000000000..b8685689b
--- /dev/null
+++ b/dev/packages/contour.json
@@ -0,0 +1,34 @@
+{
+  "includes": {
+    "color": []
+  },
+  "macros": {
+    "contour{}{}": {
+      "snippet": "contour{${1:color}}{${2:text}}"
+    },
+    "contour*{}{}": {
+      "snippet": "contour*{${1:color}}{${2:text}}"
+    },
+    "contour[]{}{}": {
+      "snippet": "contour[${3:number}]{${1:color}}{${2:text}}"
+    },
+    "contourlength{}": {
+      "snippet": "contourlength{${1:length}}"
+    },
+    "contournumber{}": {
+      "snippet": "contournumber{${1:number}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "auto",
+    "dvips",
+    "xdvi",
+    "pdftex",
+    "vtex",
+    "dvipsone",
+    "outline",
+    "copies"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/contracard.json b/dev/packages/contracard.json
new file mode 100644
index 000000000..7fd39e856
--- /dev/null
+++ b/dev/packages/contracard.json
@@ -0,0 +1,538 @@
+{
+  "includes": {
+    "calc": [],
+    "intcalc": [],
+    "ifthen": [],
+    "tocloft": [],
+    "imakeidx": [
+      "enableidx"
+    ]
+  },
+  "macros": {
+    "defaultcontraenv": {},
+    "dancetitleenv": {},
+    "dancetitleformat": {},
+    "danceauthorformat": {},
+    "danceformformat": {},
+    "movedelimiter": {},
+    "partdelimiter": {},
+    "midpartdelimiter": {},
+    "phrasevspace": {},
+    "phraseseparator": {},
+    "showcountbefore": {},
+    "showcountafter": {},
+    "hidecountbefore": {},
+    "hidecountafter": {},
+    "countleftbracket{}": {
+      "snippet": "countleftbracket{${1:bracket}}"
+    },
+    "countrightbracket{}": {
+      "snippet": "countrightbracket{${1:bracket}}"
+    },
+    "setdefaultnotesenv{}": {
+      "snippet": "setdefaultnotesenv{${1:envname}}"
+    },
+    "prenotevspace": {},
+    "thedancecount": {},
+    "thepartcount": {},
+    "thephrasecount": {},
+    "thedancepart": {},
+    "thedancephrase": {},
+    "thedancepartlength": {},
+    "thedancephraselength": {},
+    "resetdancepartlength": {},
+    "resetdancephraselength": {},
+    "resetdancephrase": {},
+    "resetdancephrase*": {},
+    "resetdancepart": {},
+    "resetdancepart*": {},
+    "newdancephrase": {},
+    "newdancepart": {},
+    "thephrasemovenum": {},
+    "thepartmovenum": {},
+    "thehalfpartmovenum": {},
+    "thedancemovenum": {},
+    "move{}": {
+      "snippet": "move{${1:move}}"
+    },
+    "move[]{}": {
+      "snippet": "move[${2:beats}]{${1:move}}"
+    },
+    "move*{}": {
+      "snippet": "move*{${1:move}}"
+    },
+    "move*[]{}": {
+      "snippet": "move*[${2:beats}]{${1:move}}"
+    },
+    "themovecount": {},
+    "allemande{}{}": {
+      "snippet": "allemande{${1:beats}}{${2:direction}}"
+    },
+    "allemande[]{}{}": {
+      "snippet": "allemande[${3:person}]{${1:beats}}{${2:direction}}"
+    },
+    "allemande*{}{}": {
+      "snippet": "allemande*{${1:beats}}{${2:direction}}"
+    },
+    "allemande*[]{}{}": {
+      "snippet": "allemande*[${3:person}]{${1:beats}}{${2:direction}}"
+    },
+    "balance": {},
+    "balance[]": {
+      "snippet": "balance[${1:post-text}]"
+    },
+    "balance*": {},
+    "balance*[]": {
+      "snippet": "balance*[${1:pre-text}]"
+    },
+    "balanceand": {},
+    "balanceand[]": {
+      "snippet": "balanceand[${1:post-text}]"
+    },
+    "balanceand*": {},
+    "balanceand*[]": {
+      "snippet": "balanceand*[${1:pre-text}]"
+    },
+    "butterflywhirl{}": {
+      "snippet": "butterflywhirl{${1:beats}}"
+    },
+    "butterflywhirl[]{}": {
+      "snippet": "butterflywhirl[${2:post-text}]{${1:beats}}"
+    },
+    "butterflywhirl*{}": {
+      "snippet": "butterflywhirl*{${1:beats}}"
+    },
+    "butterflywhirl*[]{}": {
+      "snippet": "butterflywhirl*[${2:pre-text}]{${1:beats}}"
+    },
+    "circleleft{}": {
+      "snippet": "circleleft{${1:beats}}"
+    },
+    "circleleft[]{}": {
+      "snippet": "circleleft[${2:post-text}]{${1:beats}}"
+    },
+    "circleleft*{}": {
+      "snippet": "circleleft*{${1:beats}}"
+    },
+    "circleleft*[]{}": {
+      "snippet": "circleleft*[${2:pre-text}]{${1:beats}}"
+    },
+    "circleright{}": {
+      "snippet": "circleright{${1:beats}}"
+    },
+    "circleright[]{}": {
+      "snippet": "circleright[${2:post-text}]{${1:beats}}"
+    },
+    "circleright*{}": {
+      "snippet": "circleright*{${1:beats}}"
+    },
+    "circleright*[]{}": {
+      "snippet": "circleright*[${2:pre-text}]{${1:beats}}"
+    },
+    "courtesyturn{}": {
+      "snippet": "courtesyturn{${1:beats}}"
+    },
+    "courtesyturn[]{}": {
+      "snippet": "courtesyturn[${2:person}]{${1:beats}}"
+    },
+    "courtesyturn*{}": {
+      "snippet": "courtesyturn*{${1:beats}}"
+    },
+    "courtesyturn*[]{}": {
+      "snippet": "courtesyturn*[${2:person}]{${1:beats}}"
+    },
+    "dosido{}": {
+      "snippet": "dosido{${1:beats}}"
+    },
+    "dosido[]{}": {
+      "snippet": "dosido[${2:person}]{${1:beats}}"
+    },
+    "dosido*{}": {
+      "snippet": "dosido*{${1:beats}}"
+    },
+    "dosido*[]{}": {
+      "snippet": "dosido*[${2:person}]{${1:beats}}"
+    },
+    "seesaw{}": {
+      "snippet": "seesaw{${1:beats}}"
+    },
+    "seesaw[]{}": {
+      "snippet": "seesaw[${2:person}]{${1:beats}}"
+    },
+    "seesaw*{}": {
+      "snippet": "seesaw*{${1:beats}}"
+    },
+    "seesaw*[]{}": {
+      "snippet": "seesaw*[${2:person}]{${1:beats}}"
+    },
+    "walkaround{}": {
+      "snippet": "walkaround{${1:beats}}"
+    },
+    "walkaround[]{}": {
+      "snippet": "walkaround[${2:person}]{${1:beats}}"
+    },
+    "walkaround*{}": {
+      "snippet": "walkaround*{${1:beats}}"
+    },
+    "walkaround*[]{}": {
+      "snippet": "walkaround*[${2:person}]{${1:beats}}"
+    },
+    "walkaroundleft{}": {
+      "snippet": "walkaroundleft{${1:beats}}"
+    },
+    "walkaroundleft[]{}": {
+      "snippet": "walkaroundleft[${2:person}]{${1:beats}}"
+    },
+    "walkaroundleft*{}": {
+      "snippet": "walkaroundleft*{${1:beats}}"
+    },
+    "walkaroundleft*[]{}": {
+      "snippet": "walkaroundleft*[${2:person}]{${1:beats}}"
+    },
+    "walkaroundright{}": {
+      "snippet": "walkaroundright{${1:beats}}"
+    },
+    "walkaroundright[]{}": {
+      "snippet": "walkaroundright[${2:person}]{${1:beats}}"
+    },
+    "walkaroundright*{}": {
+      "snippet": "walkaroundright*{${1:beats}}"
+    },
+    "walkaroundright*[]{}": {
+      "snippet": "walkaroundright*[${2:person}]{${1:beats}}"
+    },
+    "heyforfour": {},
+    "heyforfour[]": {
+      "snippet": "heyforfour[${1:post-text}]"
+    },
+    "heyforfour*": {},
+    "heyforfour*[]": {
+      "snippet": "heyforfour*[${1:pre-text}]"
+    },
+    "halfhey": {},
+    "halfhey[]": {
+      "snippet": "halfhey[${1:post-text}]"
+    },
+    "halfhey*": {},
+    "halfhey*[]": {
+      "snippet": "halfhey*[${1:pre-text}]"
+    },
+    "halfheyricochet": {},
+    "halfheyricochet[]": {
+      "snippet": "halfheyricochet[${1:post-text}]"
+    },
+    "halfheyricochet*": {},
+    "halfheyricochet*[]": {
+      "snippet": "halfheyricochet*[${1:pre-text}]"
+    },
+    "fullhey": {},
+    "fullhey[]": {
+      "snippet": "fullhey[${1:post-text}]"
+    },
+    "fullhey*": {},
+    "fullhey*[]": {
+      "snippet": "fullhey*[${1:pre-text}]"
+    },
+    "fullheyricochet": {},
+    "fullheyricochet[]": {
+      "snippet": "fullheyricochet[${1:post-text}]"
+    },
+    "fullheyricochet*": {},
+    "fullheyricochet*[]": {
+      "snippet": "fullheyricochet*[${1:pre-text}]"
+    },
+    "ladieschain": {},
+    "ladieschain[]": {
+      "snippet": "ladieschain[${1:post-text}]"
+    },
+    "ladieschain*": {},
+    "ladieschain*[]": {
+      "snippet": "ladieschain*[${1:pre-text}]"
+    },
+    "menchain": {},
+    "menchain[]": {
+      "snippet": "menchain[${1:post-text}]"
+    },
+    "menchain*": {},
+    "menchain*[]": {
+      "snippet": "menchain*[${1:pre-text}]"
+    },
+    "halfladieschain": {},
+    "halfladieschain[]": {
+      "snippet": "halfladieschain[${1:post-text}]"
+    },
+    "halfladieschain*": {},
+    "halfladieschain*[]": {
+      "snippet": "halfladieschain*[${1:pre-text}]"
+    },
+    "halfmenchain": {},
+    "halfmenchain[]": {
+      "snippet": "halfmenchain[${1:post-text}]"
+    },
+    "halfmenchain*": {},
+    "halfmenchain*[]": {
+      "snippet": "halfmenchain*[${1:pre-text}]"
+    },
+    "fullladieschain": {},
+    "fullladieschain[]": {
+      "snippet": "fullladieschain[${1:post-text}]"
+    },
+    "fullladieschain*": {},
+    "fullladieschain*[]": {
+      "snippet": "fullladieschain*[${1:pre-text}]"
+    },
+    "fullmenchain": {},
+    "fullmenchain[]": {
+      "snippet": "fullmenchain[${1:post-text}]"
+    },
+    "fullmenchain*": {},
+    "fullmenchain*[]": {
+      "snippet": "fullmenchain*[${1:pre-text}]"
+    },
+    "lines": {},
+    "lines[]": {
+      "snippet": "lines[${1:type}]"
+    },
+    "lines*": {},
+    "lines*[]": {
+      "snippet": "lines*[${1:type}]"
+    },
+    "longlines": {},
+    "longlines[]": {
+      "snippet": "longlines[${1:type}]"
+    },
+    "longlines*": {},
+    "longlines*[]": {
+      "snippet": "longlines*[${1:type}]"
+    },
+    "madrobin": {},
+    "madrobin[]": {
+      "snippet": "madrobin[${1:post-text}]"
+    },
+    "madrobin*": {},
+    "madrobin*[]": {
+      "snippet": "madrobin*[${1:pre-text}]"
+    },
+    "petronella": {},
+    "petronella[]": {
+      "snippet": "petronella[${1:post-text}]"
+    },
+    "petronella*": {},
+    "petronella*[]": {
+      "snippet": "petronella*[${1:pre-text}]"
+    },
+    "petronellanella": {},
+    "petronellanella[]": {
+      "snippet": "petronellanella[${1:post-text}]"
+    },
+    "petronellanella*": {},
+    "petronellanella*[]": {
+      "snippet": "petronellanella*[${1:pre-text}]"
+    },
+    "promenade{}": {
+      "snippet": "promenade{${1:beats}}"
+    },
+    "promenade[]{}": {
+      "snippet": "promenade[${2:person}]{${1:beats}}"
+    },
+    "promenade*{}": {
+      "snippet": "promenade*{${1:beats}}"
+    },
+    "promenade*[]{}": {
+      "snippet": "promenade*[${2:person}]{${1:beats}}"
+    },
+    "halfpromenade": {},
+    "halfpromenade[]": {
+      "snippet": "halfpromenade[${1:person}]"
+    },
+    "halfpromenade*": {},
+    "halfpromenade*[]": {
+      "snippet": "halfpromenade*[${1:person}]"
+    },
+    "rightandleftthrough": {},
+    "rightandleftthrough[]": {
+      "snippet": "rightandleftthrough[${1:post-text}]"
+    },
+    "rightandleftthrough*": {},
+    "rightandleftthrough*[]": {
+      "snippet": "rightandleftthrough*[${1:pre-text}]"
+    },
+    "rightsandlefts": {},
+    "rightsandlefts[]": {
+      "snippet": "rightsandlefts[${1:post-text}]"
+    },
+    "rightsandlefts*": {},
+    "rightsandlefts*[]": {
+      "snippet": "rightsandlefts*[${1:pre-text}]"
+    },
+    "rollaway": {},
+    "rollaway[]": {
+      "snippet": "rollaway[${1:post-text}]"
+    },
+    "rollaway*{}": {
+      "snippet": "rollaway*{${1:post-text}}"
+    },
+    "rollaway*[]{}": {
+      "snippet": "rollaway*[${2:pre-text}]{${1:post-text}}"
+    },
+    "rollawaysashay": {},
+    "rollawaysashay[]": {
+      "snippet": "rollawaysashay[${1:post-text}]"
+    },
+    "rollawaysashay*{}": {
+      "snippet": "rollawaysashay*{${1:post-text}}"
+    },
+    "rollawaysashay*[]{}": {
+      "snippet": "rollawaysashay*[${2:pre-text}]{${1:post-text}}"
+    },
+    "starleft{}": {
+      "snippet": "starleft{${1:beats}}"
+    },
+    "starleft*{}": {
+      "snippet": "starleft*{${1:beats}}"
+    },
+    "starright{}": {
+      "snippet": "starright{${1:beats}}"
+    },
+    "starright*{}": {
+      "snippet": "starright*{${1:beats}}"
+    },
+    "sashay{}": {
+      "snippet": "sashay{${1:beats}}"
+    },
+    "sashay[]{}": {
+      "snippet": "sashay[${2:post-text}]{${1:beats}}"
+    },
+    "sashay*{}{}": {
+      "snippet": "sashay*{${1:beats}}{${2:pre-text}}"
+    },
+    "sashay*[]{}{}": {
+      "snippet": "sashay*[${3:post-text}]{${1:beats}}{${2:pre-text}}"
+    },
+    "swing": {},
+    "swing[]": {
+      "snippet": "swing[${1:post-text}]"
+    },
+    "swing*": {},
+    "swing*[]": {
+      "snippet": "swing*[${1:pre-text}]"
+    },
+    "turnalone": {},
+    "turnalone[]": {
+      "snippet": "turnalone[${1:post-text}]"
+    },
+    "turnalone*{}": {
+      "snippet": "turnalone*{${1:beats}}"
+    },
+    "turnalone*[]{}": {
+      "snippet": "turnalone*[${2:post-text}]{${1:beats}}"
+    },
+    "turncouple": {},
+    "turncouple[]": {
+      "snippet": "turncouple[${1:post-text}]"
+    },
+    "turncouple*{}": {
+      "snippet": "turncouple*{${1:beats}}"
+    },
+    "turncouple*[]{}": {
+      "snippet": "turncouple*[${2:post-text}]{${1:beats}}"
+    },
+    "turntogether": {},
+    "turntogether[]": {
+      "snippet": "turntogether[${1:post-text}]"
+    },
+    "turntogether*{}": {
+      "snippet": "turntogether*{${1:beats}}"
+    },
+    "turntogether*[]{}": {
+      "snippet": "turntogether*[${2:post-text}]{${1:beats}}"
+    },
+    "twirltoswap": {},
+    "californiatwirl": {},
+    "starthrough": {},
+    "starthru": {},
+    "boxthegnat": {},
+    "swattheflea": {},
+    "jerseytwirl": {},
+    "arizonatwirl": {},
+    "downthehall{}": {
+      "snippet": "downthehall{${1:beats}}"
+    },
+    "downthehall[]{}": {
+      "snippet": "downthehall[${2:post-text}]{${1:beats}}"
+    },
+    "downthehall*{}": {
+      "snippet": "downthehall*{${1:beats}}"
+    },
+    "downthehall*[]{}": {
+      "snippet": "downthehall*[${2:pre-text}]{${1:beats}}"
+    },
+    "upthehall{}": {
+      "snippet": "upthehall{${1:beats}}"
+    },
+    "upthehall[]{}": {
+      "snippet": "upthehall[${2:post-text}]{${1:beats}}"
+    },
+    "upthehall*{}": {
+      "snippet": "upthehall*{${1:beats}}"
+    },
+    "upthehall*[]{}": {
+      "snippet": "upthehall*[${2:pre-text}]{${1:beats}}"
+    },
+    "dancetitle": {},
+    "danceauthor": {},
+    "danceform": {},
+    "listofdance": {},
+    "listofdances": {},
+    "thedance": {},
+    "lodtitle": {},
+    "enableidx": {},
+    "pauseindexing": {},
+    "resumeindexing": {},
+    "dbtname": {},
+    "dbaname": {},
+    "mvpname": {},
+    "mvdname": {},
+    "moveindex{}": {
+      "snippet": "moveindex{${1:entry}}"
+    },
+    "moveindex*{}": {
+      "snippet": "moveindex*{${1:entry}}"
+    },
+    "moveindexNoStar{}": {
+      "snippet": "moveindexNoStar{${1:entry}}"
+    },
+    "moveindexStar{}": {
+      "snippet": "moveindexStar{${1:entry}}"
+    },
+    "timesaround{}{}": {
+      "snippet": "timesaround{${1:beats-around}}{${2:total-beats}}"
+    },
+    "thetimesaround": {},
+    "thequartertimesaround": {},
+    "notes{}": {
+      "snippet": "notes{${1:text}}"
+    },
+    "spelldosido": {},
+    "spellDosido": {},
+    "setdosidospelling{}": {
+      "snippet": "setdosidospelling{${1:spelling}}"
+    }
+  },
+  "envs": {
+    "contra{}{}{}": {
+      "name": "contra",
+      "snippet": "{${1:title}}{${2:author}}{${3:form}}"
+    },
+    "contra[]{}{}{}": {
+      "name": "contra",
+      "snippet": "[${4:envname}]{${1:title}}{${2:author}}{${3:form}}"
+    }
+  },
+  "options": [
+    "showcountafter",
+    "showcountbefore",
+    "enableidx"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/conv-xkv.json b/dev/packages/conv-xkv.json
index 0bcebafac..624c12e01 100644
--- a/dev/packages/conv-xkv.json
+++ b/dev/packages/conv-xkv.json
@@ -6,6 +6,15 @@
     "cxkvsetkeys{}{}": {
       "snippet": "cxkvsetkeys{${1:family}}{${2:keyval pairs}}"
     },
+    "cxkvsetkeys(){}{}": {
+      "snippet": "cxkvsetkeys(${3:name}){${1:family}}{${2:keyval pairs}}"
+    },
+    "cxkvsetkeys()[]{}{}": {
+      "snippet": "cxkvsetkeys(${4:name})[${3:prefix}]{${1:family}}{${2:keyval pairs}}"
+    },
+    "cxkvsetkeys()[]{}[]{}": {
+      "snippet": "cxkvsetkeys(${5:name})[${3:prefix}]{${1:family}}[${4:na}]{${2:keyval pairs}}"
+    },
     "DeclareDelimiter{}{}": {
       "snippet": "DeclareDelimiter{${1:name}}{${2:delimiter}}"
     },
diff --git a/dev/packages/coordsys.json b/dev/packages/coordsys.json
index 487bf54a7..20a7802c7 100644
--- a/dev/packages/coordsys.json
+++ b/dev/packages/coordsys.json
@@ -25,6 +25,96 @@
     "vnumbline*[]{}{}": {
       "snippet": "vnumbline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
+    "coordsys()()": {
+      "snippet": "coordsys(${1:lower-left})(${2:upper-right})"
+    },
+    "coordsys[]()()": {
+      "snippet": "coordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordsys[][]()()": {
+      "snippet": "coordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "coordsys*()()": {
+      "snippet": "coordsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "coordsys*[]()()": {
+      "snippet": "coordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordsys*[][]()()": {
+      "snippet": "coordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "fcoordsys()()": {
+      "snippet": "fcoordsys(${1:lower-left})(${2:upper-right})"
+    },
+    "fcoordsys[]()()": {
+      "snippet": "fcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "fcoordsys[][]()()": {
+      "snippet": "fcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "fcoordsys*()()": {
+      "snippet": "fcoordsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "fcoordsys*[]()()": {
+      "snippet": "fcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "fcoordsys*[][]()()": {
+      "snippet": "fcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "bcoordsys()()": {
+      "snippet": "bcoordsys(${1:lower-left})(${2:upper-right})"
+    },
+    "bcoordsys[]()()": {
+      "snippet": "bcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "bcoordsys[][]()()": {
+      "snippet": "bcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "bcoordsys*()()": {
+      "snippet": "bcoordsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "bcoordsys*[]()()": {
+      "snippet": "bcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "bcoordsys*[][]()()": {
+      "snippet": "bcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "window()()": {
+      "snippet": "window(${1:lower-left})(${2:upper-right})"
+    },
+    "window[]()()": {
+      "snippet": "window[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "window[][]()()": {
+      "snippet": "window[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "window*()()": {
+      "snippet": "window*(${1:lower-left})(${2:upper-right})"
+    },
+    "window*[]()()": {
+      "snippet": "window*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "window*[][]()()": {
+      "snippet": "window*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "coordgrid()()": {
+      "snippet": "coordgrid(${1:lower-left})(${2:upper-right})"
+    },
+    "coordgrid[]()()": {
+      "snippet": "coordgrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordgrid[][]()()": {
+      "snippet": "coordgrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "coordgrid*()()": {
+      "snippet": "coordgrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "coordgrid*[]()()": {
+      "snippet": "coordgrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "coordgrid*[][]()()": {
+      "snippet": "coordgrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
     "gridstyle{}{}": {
       "snippet": "gridstyle{${1:thin-declaration}}{${2:thick-declaration}}"
     },
diff --git a/dev/packages/cquthesis.json b/dev/packages/cquthesis.json
new file mode 100644
index 000000000..bda6129a1
--- /dev/null
+++ b/dev/packages/cquthesis.json
@@ -0,0 +1,53 @@
+{
+  "includes": {
+    "dirtree": []
+  },
+  "macros": {
+    "speakyourlove": {},
+    "speakyourlove[]": {
+      "snippet": "speakyourlove[${1:name}]"
+    },
+    "qthis{}": {
+      "snippet": "qthis{${1:text}}"
+    },
+    "figref{}": {
+      "snippet": "figref{${1:label}}"
+    },
+    "tabref{}": {
+      "snippet": "tabref{${1:label}}"
+    },
+    "cmd{}": {
+      "snippet": "cmd{${1:cmd}}"
+    },
+    "cs{}": {
+      "snippet": "cs{${1:csname}}"
+    },
+    "csgo{}{}": {
+      "snippet": "csgo{${1:csname}}{${2:arg}}"
+    },
+    "meta{}": {
+      "snippet": "meta{${1:arg}}"
+    },
+    "marg{}": {
+      "snippet": "marg{${1:arg}}"
+    },
+    "oarg{}": {
+      "snippet": "oarg{${1:arg}}"
+    },
+    "parg{}": {
+      "snippet": "parg{${1:arg}}"
+    },
+    "pkg{}": {
+      "snippet": "pkg{${1:package}}"
+    },
+    "myicon{}": {
+      "snippet": "myicon{${1:color}}"
+    },
+    "myfolder{}{}": {
+      "snippet": "myfolder{${1:color}}{${2:folder}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/cropmark.json b/dev/packages/cropmark.json
new file mode 100644
index 000000000..46e7de734
--- /dev/null
+++ b/dev/packages/cropmark.json
@@ -0,0 +1,21 @@
+{
+  "includes": {},
+  "macros": {
+    "croplength": {},
+    "cropwidth": {},
+    "cropsep": {},
+    "croppadtop": {},
+    "croppadbot": {},
+    "croppadlr": {},
+    "crophrule": {},
+    "cropvrule": {},
+    "shipAfterBox": {},
+    "shipAfterRegister": {},
+    "SomeBox": {},
+    "xshipout": {},
+    "yshipout": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/cursor.json b/dev/packages/cursor.json
new file mode 100644
index 000000000..b9339feaf
--- /dev/null
+++ b/dev/packages/cursor.json
@@ -0,0 +1,29 @@
+{
+  "includes": {},
+  "macros": {
+    "cursorformula{}": {
+      "snippet": "cursorformula{${1:formula}}"
+    },
+    "Lc{}": {
+      "snippet": "Lc{${1:arg}}"
+    },
+    "Rc{}": {
+      "snippet": "Rc{${1:arg}}"
+    },
+    "LRc{}{}": {
+      "snippet": "LRc{${1:arg1}}{${2:arg2}}"
+    },
+    "cursorheight{}": {
+      "snippet": "cursorheight{${1:arg}}"
+    },
+    "ruled": {},
+    "ruleh": {},
+    "rulew": {},
+    "rulewr": {},
+    "rulewl": {},
+    "cursorlinew": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/curve2e.json b/dev/packages/curve2e.json
index 305dc3da8..4cea17578 100644
--- a/dev/packages/curve2e.json
+++ b/dev/packages/curve2e.json
@@ -5,12 +5,21 @@
     "pict2e": []
   },
   "macros": {
+    "Arc()(){}": {
+      "snippet": "Arc(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
+    },
     "AutoGrid": {},
+    "AutoGrid()": {
+      "snippet": "AutoGrid(${1:coordinates})"
+    },
     "ChangeDir<>": {
       "snippet": "ChangeDir<${1:cmd}>"
     },
     "CurveEnd": {},
     "CurveFinish": {},
+    "Dashline()(){}": {
+      "snippet": "Dashline(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dash length}}"
+    },
     "defaultlinethickness{}": {
       "snippet": "defaultlinethickness{${1:dimension}}"
     },
@@ -19,6 +28,12 @@
     "Divvect{}{}{}": {
       "snippet": "Divvect{${1:vector1}}{${2:vector2}}{${3:vector macro}}"
     },
+    "Dotline()(){}": {
+      "snippet": "Dotline(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dot gap}}"
+    },
+    "Dotline()(){}[]": {
+      "snippet": "Dotline(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dot gap}}[${2:dot diameter}]"
+    },
     "FillCurve": {},
     "fillstroke": {},
     "fpdowhile{}{}": {
@@ -30,13 +45,25 @@
     "fpwhiledo{}{}": {
       "snippet": "fpwhiledo{${1:test}}{${2:code}}"
     },
+    "GetCoord(){}{}": {
+      "snippet": "GetCoord(${3:cmd}){${1:x}}{${2:y}}"
+    },
+    "GraphGrid()": {
+      "snippet": "GraphGrid(${1:coordinates})"
+    },
     "Integer{}": {
       "snippet": "Integer{${1:number}}"
     },
     "IsPolar{}": {
       "snippet": "IsPolar{${1:arg1}}"
     },
+    "legenda(){}": {
+      "snippet": "legenda(${2:coordinates}){${1:formula}}"
+    },
     "legendbox": {},
+    "LIne()": {
+      "snippet": "LIne(${1:cmd})"
+    },
     "ModDirDot": {},
     "Multvect{}*{}*{}": {
       "snippet": "Multvect{${1:vector1}}*{${2:vector2}}*{${3:vector macro}}"
@@ -55,12 +82,105 @@
       "snippet": "Numero{${1:cmd}}{${2:dimen}}"
     },
     "PbDim": {},
+    "Pbox()[]{}": {
+      "snippet": "Pbox(${3:coordinates})[${2:position}]{${1:formula}}"
+    },
+    "Pbox()[]{}*": {
+      "snippet": "Pbox(${3:coordinates})[${2:position}]{${1:formula}}*"
+    },
+    "Pbox()[]{}*<>": {
+      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}*<${3:angle}>"
+    },
+    "Pbox()[]{}[]": {
+      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]"
+    },
+    "Pbox()[]{}[]*": {
+      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]*"
+    },
+    "Pbox()[]{}[]*<>": {
+      "snippet": "Pbox(${5:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]*<${4:angle}>"
+    },
+    "Pbox()[]{}[]<>": {
+      "snippet": "Pbox(${5:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]<${4:angle}>"
+    },
+    "Pbox()[]{}<>": {
+      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}<${3:angle}>"
+    },
+    "Pbox(){}": {
+      "snippet": "Pbox(${2:coordinates}){${1:formula}}"
+    },
+    "Pbox(){}*": {
+      "snippet": "Pbox(${2:coordinates}){${1:formula}}*"
+    },
+    "Pbox(){}*<>": {
+      "snippet": "Pbox(${3:coordinates}){${1:formula}}*<${2:angle}>"
+    },
+    "Pbox(){}[]": {
+      "snippet": "Pbox(${3:coordinates}){${1:formula}}[${2:dot diameter}]"
+    },
+    "Pbox(){}[]*": {
+      "snippet": "Pbox(${3:coordinates}){${1:formula}}[${2:dot diameter}]*"
+    },
+    "Pbox(){}[]*<>": {
+      "snippet": "Pbox(${4:coordinates}){${1:formula}}[${2:dot diameter}]*<${3:angle}>"
+    },
+    "Pbox(){}[]<>": {
+      "snippet": "Pbox(${4:coordinates}){${1:formula}}[${2:dot diameter}]<${3:angle}>"
+    },
+    "Pbox(){}<>": {
+      "snippet": "Pbox(${3:coordinates}){${1:formula}}<${2:angle}>"
+    },
     "Rapp": {},
+    "segment()()": {
+      "snippet": "segment(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
     "Segno": {},
+    "SplitCartesian(){}{}": {
+      "snippet": "SplitCartesian(${3:x},${4:y}){${1:xmacro}}{${2:ymacro}}"
+    },
+    "SplitPolar(){}{}": {
+      "snippet": "SplitPolar(${3:angle:radius}){${1:anglemacro}}{${2:radiusmacro}}"
+    },
     "TROF": {},
     "TRON": {},
+    "VECTOR()()": {
+      "snippet": "VECTOR(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "VectorArc()(){}": {
+      "snippet": "VectorArc(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
+    },
+    "VectorARC()(){}": {
+      "snippet": "VectorARC(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
+    },
+    "VVECTOR()()": {
+      "snippet": "VVECTOR(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "VVectorArc()(){}": {
+      "snippet": "VVectorArc(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
+    },
+    "xmultiput()(){}{}": {
+      "snippet": "xmultiput(${3:x},${4:y})(${5:Δx},${6:Δy}){${1:copies}}{${2:object}}"
+    },
+    "xmultiput[]()(){}{}": {
+      "snippet": "xmultiput[${3:center}](${4:x},${5:y})(${6:Δx},${7:Δy}){${1:copies}}{${2:object}}"
+    },
+    "Zbox()[]{}": {
+      "snippet": "Zbox(${3:coordinates})[${2:position}]{${1:formula}}"
+    },
+    "Zbox()[]{}[]": {
+      "snippet": "Zbox(${4:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]"
+    },
+    "Zbox(){}": {
+      "snippet": "Zbox(${2:coordinates}){${1:formula}}"
+    },
+    "Zbox(){}[]": {
+      "snippet": "Zbox(${3:coordinates}){${1:formula}}[${2:dot diameter}]"
+    },
     "DivideFN": {},
     "DivVect": {},
+    "Dline()(){}": {
+      "snippet": "Dline(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dash length}}"
+    },
     "MultiplyFN": {},
     "MultVect": {},
     "originalcurveto": {},
diff --git a/dev/packages/curves.json b/dev/packages/curves.json
index 36ad3708f..3afedf55f 100644
--- a/dev/packages/curves.json
+++ b/dev/packages/curves.json
@@ -25,11 +25,38 @@
     "xscaley": {},
     "yscale": {},
     "yscalex": {},
+    "arc(){}": {
+      "snippet": "arc(${2:x},${3:y}){${1:angle}}"
+    },
+    "arc[](){}": {
+      "snippet": "arc[${2:n}](${3:x},${4:y}){${1:angle}}"
+    },
     "bigcircle{}": {
       "snippet": "bigcircle{${1:diameter}}"
     },
     "bigcircle[]{}": {
       "snippet": "bigcircle[${2:n}]{${1:diameter}}"
+    },
+    "closecurve()": {
+      "snippet": "closecurve(${1:coords})"
+    },
+    "closecurve[]()": {
+      "snippet": "closecurve[${1:n}](${2:coords})"
+    },
+    "curve()": {
+      "snippet": "curve(${1:coords})"
+    },
+    "curve[]()": {
+      "snippet": "curve[${1:n}](${2:coords})"
+    },
+    "scaleput(){}": {
+      "snippet": "scaleput(${2:x},${3:y}){${1:object}}"
+    },
+    "tagcurve()": {
+      "snippet": "tagcurve(${1:coords})"
+    },
+    "tagcurve[]()": {
+      "snippet": "tagcurve[${1:n}](${2:coords})"
     }
   },
   "envs": {},
diff --git a/dev/packages/cyber.json b/dev/packages/cyber.json
index 2d7210c36..a5b3e135d 100644
--- a/dev/packages/cyber.json
+++ b/dev/packages/cyber.json
@@ -65,7 +65,7 @@
     "Cyberindexingenabledfalse": {},
     "complianceaux": {},
     "foreach{}{}{}{}": {
-      "snippet": "foreach{${1:macro}}{${2:arg1}}{${3:arg2}}{${4:item1,item2,...}}"
+      "snippet": "foreach{${1:macro}}{${2:arg1}}{${3:arg2}}{${4:item1,${5:item2},...}}"
     },
     "requirement{}{}": {
       "snippet": "requirement{${1:document id}}{${2:requirement name}}"
diff --git a/dev/packages/dad.json b/dev/packages/dad.json
new file mode 100644
index 000000000..40670a49c
--- /dev/null
+++ b/dev/packages/dad.json
@@ -0,0 +1,25 @@
+{
+  "includes": {
+    "luatex": [],
+    "luatex85": []
+  },
+  "macros": {
+    "arab{}": {
+      "snippet": "arab{${1:arabic text}}"
+    },
+    "arabttexample{}": {
+      "snippet": "arabttexample{${1:arabic text}}"
+    },
+    "arabtt{}": {
+      "snippet": "arabtt{${1:arabic text}}"
+    },
+    "kesh": {},
+    "arabdottedcircle": {},
+    "arabttsep{}{}": {
+      "snippet": "arabttsep{${1:arabic text}}{${2:text}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/dbshow.json b/dev/packages/dbshow.json
index a862250dd..b3b9d5c6d 100644
--- a/dev/packages/dbshow.json
+++ b/dev/packages/dbshow.json
@@ -2,13 +2,13 @@
   "includes": {},
   "macros": {
     "dbNewDatabase{}{}": {
-      "snippet": "dbNewDatabase{${1:database}}{${2:attr1=val1,attr2=val2,...}}"
+      "snippet": "dbNewDatabase{${1:database}}{${2:attr1=val1,${3:attr2=val2},...}}"
     },
     "dbNewDatabase[]{}{}": {
-      "snippet": "dbNewDatabase[${3:base database}]{${1:database}}{${2:attr1=val1,attr2=val2,...}}"
+      "snippet": "dbNewDatabase[${3:base database}]{${1:database}}{${2:attr1=val1,${4:attr2=val2},...}}"
     },
     "dbNewDatabase*{}{}": {
-      "snippet": "dbNewDatabase*{${1:database}}{${2:attr1=val1,attr2=val2,...}}"
+      "snippet": "dbNewDatabase*{${1:database}}{${2:attr1=val1,${3:attr2=val2},...}}"
     },
     "dbshow{}{}": {
       "snippet": "dbshow{${1:style}}{${2:database}}"
@@ -84,7 +84,7 @@
       "snippet": "dbitemkv{${1:database}}"
     },
     "dbitemkv{}[]": {
-      "snippet": "dbitemkv{${1:database}}[${2:attr1=val1,attr2=val2,...}]"
+      "snippet": "dbitemkv{${1:database}}[${2:attr1=val1,${3:attr2=val2},...}]"
     },
     "dbsave{}{}": {
       "snippet": "dbsave{${1:attr}}{${2:data}}"
@@ -164,7 +164,7 @@
     },
     "dbitem{}[]": {
       "name": "dbitem",
-      "snippet": "{${1:database}}[${2:attr1=val1,attr2=val2,...}]"
+      "snippet": "{${1:database}}[${2:attr1=val1,${3:attr2=val2},...}]"
     }
   },
   "options": [],
diff --git a/dev/packages/delim.json b/dev/packages/delim.json
new file mode 100644
index 000000000..40e58246a
--- /dev/null
+++ b/dev/packages/delim.json
@@ -0,0 +1,20 @@
+{
+  "includes": {},
+  "macros": {
+    "delimdef{}{}": {
+      "snippet": "delimdef{${1:cmd}}{${2:def}}"
+    },
+    "dleft": {},
+    "dright": {},
+    "dmiddle": {},
+    "mnorm": {},
+    "mbig": {},
+    "mBig": {},
+    "mbigg": {},
+    "mBigg": {},
+    "mauto": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/delimset.json b/dev/packages/delimset.json
index a2d0d4f7c..8de940f87 100644
--- a/dev/packages/delimset.json
+++ b/dev/packages/delimset.json
@@ -4,18 +4,47 @@
     "keyval": []
   },
   "macros": {
+    "delimsize": {},
+    "kerndelim{}": {
+      "snippet": "kerndelim{${1:width}}"
+    },
+    "usedelim": {},
     "DeclareMathDelimiterSet{}{}": {
       "snippet": "DeclareMathDelimiterSet{${1:command}}{${2:definition}}"
     },
     "DeclareMathDelimiterSet{}[]{}": {
       "snippet": "DeclareMathDelimiterSet{${1:command}}[${2:args}]{${3:definition}}"
     },
+    "selectdeliml{}": {
+      "snippet": "selectdeliml{${1:delim}}"
+    },
+    "selectdeliml*{}": {
+      "snippet": "selectdeliml*{${1:delim}}"
+    },
     "selectdelim{}": {
       "snippet": "selectdelim{${1:delim}}"
     },
+    "selectdelim*{}": {
+      "snippet": "selectdelim*{${1:delim}}"
+    },
     "selectdelim[]{}": {
       "snippet": "selectdelim[${2:class}]{${1:delim}}"
     },
+    "selectdelim[]*{}": {
+      "snippet": "selectdelim[${2:class}]*{${1:delim}}"
+    },
+    "selectdelimr{}": {
+      "snippet": "selectdelimr{${1:delim}}"
+    },
+    "selectdelimr*{}": {
+      "snippet": "selectdelimr*{${1:delim}}"
+    },
+    "DeclareMathDelimiterSel{}{}{}": {
+      "snippet": "DeclareMathDelimiterSel{${1:command}}{${2:left-def}}{${3:right-def}}"
+    },
+    "parsedelimflags{}{}": {
+      "snippet": "parsedelimflags{${1:compositor}}{${2:selector}}"
+    },
     "brk[]": {
       "snippet": "brk[${1:options}]",
       "keyvalindex": 0,
@@ -39,7 +68,11 @@
     "Biggp": {},
     "Bigp": {},
     "biggb": {},
-    "biggp": {}
+    "biggp": {},
+    "bigi": {},
+    "Bigi": {},
+    "biggi": {},
+    "Biggi": {}
   },
   "envs": {},
   "options": [
diff --git a/dev/packages/democodetools.json b/dev/packages/democodetools.json
index ba84873ef..c1460ab34 100644
--- a/dev/packages/democodetools.json
+++ b/dev/packages/democodetools.json
@@ -127,10 +127,10 @@
       "snippet": "Key[${2:pre}]{${1:key}}"
     },
     "Keylst{}": {
-      "snippet": "Keylst{${1:key1,key2,...}}"
+      "snippet": "Keylst{${1:key1,${2:key2},...}}"
     },
     "Keylst[]{}": {
-      "snippet": "Keylst[${2:default}]{${1:key1,key2,...}}"
+      "snippet": "Keylst[${2:default}]{${1:key1,${3:key2},...}}"
     },
     "KeyUse{}{}": {
       "snippet": "KeyUse{${1:key}}{${2:value}}"
@@ -142,10 +142,10 @@
       "snippet": "Env[${2:pre}]{${1:envname}}"
     },
     "Envlst{}": {
-      "snippet": "Envlst{${1:env1,env2,...}}"
+      "snippet": "Envlst{${1:env1,${2:env2},...}}"
     },
     "Envlst[]{}": {
-      "snippet": "Envlst[${2:pre}]{${1:env1,env2,...}}"
+      "snippet": "Envlst[${2:pre}]{${1:env1,${3:env2},...}}"
     },
     "Option{}": {
       "snippet": "Option{${1:option}}"
@@ -154,10 +154,10 @@
       "snippet": "Option[${2:pre}]{${1:option}}"
     },
     "Optionlst{}": {
-      "snippet": "Optionlst{${1:opt1,opt2,...}}"
+      "snippet": "Optionlst{${1:opt1,${2:opt2},...}}"
     },
     "Optionlst[]{}": {
-      "snippet": "Optionlst[${2:pre}]{${1:opt1,opt2,...}}"
+      "snippet": "Optionlst[${2:pre}]{${1:opt1,${3:opt2},...}}"
     },
     "Pack{}": {
       "snippet": "Pack{${1:package}}"
@@ -166,10 +166,10 @@
       "snippet": "Pack[${2:pre}]{${1:package}}"
     },
     "Packlst{}": {
-      "snippet": "Packlst{${1:package1,package2,...}}"
+      "snippet": "Packlst{${1:package1,${2:package2},...}}"
     },
     "Packlst[]{}": {
-      "snippet": "Packlst[${2:pre}]{${1:package1,package2,...}}"
+      "snippet": "Packlst[${2:pre}]{${1:package1,${3:package2},...}}"
     },
     "Value{}": {
       "snippet": "Value{${1:value}}"
@@ -178,10 +178,10 @@
       "snippet": "Value[${2:pre}]{${1:value}}"
     },
     "Valuelst{}": {
-      "snippet": "Valuelst{${1:val1,val2,...}}"
+      "snippet": "Valuelst{${1:val1,${2:val2},...}}"
     },
     "Valuelst[]{}": {
-      "snippet": "Valuelst[${2:pre}]{${1:val1,val2,...}}"
+      "snippet": "Valuelst[${2:pre}]{${1:val1,${3:val2},...}}"
     },
     "MetaFmt": {},
     "MetaFmt[]": {
diff --git a/dev/packages/diagbox.json b/dev/packages/diagbox.json
new file mode 100644
index 000000000..797a38a78
--- /dev/null
+++ b/dev/packages/diagbox.json
@@ -0,0 +1,60 @@
+{
+  "includes": {
+    "keyval": [],
+    "pict2e": [],
+    "calc": [],
+    "array": [],
+    "fp": []
+  },
+  "macros": {
+    "diagbox{}{}": {
+      "snippet": "diagbox{${1:left}}{${2:right}}"
+    },
+    "diagbox[]{}{}": {
+      "snippet": "diagbox[${3:options}]{${1:left}}{${2:right}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "diagbox{}{}{}": {
+      "snippet": "diagbox{${1:left}}{${2:middle}}{${3:right}}"
+    },
+    "backslashbox{}{}": {
+      "snippet": "backslashbox{${1:left}}{${2:right}}"
+    },
+    "backslashbox[]{}{}": {
+      "snippet": "backslashbox[${3:width}]{${1:left}}{${2:right}}"
+    },
+    "backslashbox[][]{}{}": {
+      "snippet": "backslashbox[${3:width}][${4:trim}]{${1:left}}{${2:right}}"
+    },
+    "slashbox{}{}": {
+      "snippet": "slashbox{${1:left}}{${2:right}}"
+    },
+    "slashbox[]{}{}": {
+      "snippet": "slashbox[${3:width}]{${1:left}}{${2:right}}"
+    },
+    "slashbox[][]{}{}": {
+      "snippet": "slashbox[${3:width}][${4:trim}]{${1:left}}{${2:right}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "width=",
+      "height=",
+      "dir=",
+      "innerwidth=",
+      "innerleftsep=",
+      "innerrightsep=",
+      "outerleftsep=",
+      "outerrightsep=",
+      "leftsep=",
+      "rightsep=",
+      "trim=",
+      "font=${1:font commands}",
+      "linewidth=",
+      "linecolor="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/diagram.json b/dev/packages/diagram.json
new file mode 100644
index 000000000..70e9fb467
--- /dev/null
+++ b/dev/packages/diagram.json
@@ -0,0 +1,278 @@
+{
+  "includes": {
+    "ifthen": [],
+    "calc": [],
+    "pstricks": []
+  },
+  "macros": {
+    "putsol": {},
+    "normalnames": {},
+    "reversednames": {},
+    "Dr": {},
+    "Prof": {},
+    "ProfDr": {},
+    "pieces{}": {
+      "snippet": "pieces{${1:pieces}}"
+    },
+    "pieces[]{}": {
+      "snippet": "pieces[${2:white+black}]{${1:pieces}}"
+    },
+    "fen{}": {
+      "snippet": "fen{${1:pieces}}"
+    },
+    "fen[]{}": {
+      "snippet": "fen[${2:white+black}]{${1:pieces}}"
+    },
+    "stipulation{}": {
+      "snippet": "stipulation{${1:stipulation}}"
+    },
+    "stip{}": {
+      "snippet": "stip{${1:stipulation}}"
+    },
+    "city{}": {
+      "snippet": "city{${1:city}}"
+    },
+    "specialdiagnum{}": {
+      "snippet": "specialdiagnum{${1:number}}"
+    },
+    "sourcenr{}": {
+      "snippet": "sourcenr{${1:number}}"
+    },
+    "source{}": {
+      "snippet": "source{${1:source}}"
+    },
+    "issue{}": {
+      "snippet": "issue{${1:number}}"
+    },
+    "pages{}": {
+      "snippet": "pages{${1:pages}}"
+    },
+    "day{}": {
+      "snippet": "day{${1:day}}"
+    },
+    "month{}": {
+      "snippet": "month{${1:month}}"
+    },
+    "months{}": {
+      "snippet": "months{${1:months}}"
+    },
+    "year{}": {
+      "snippet": "year{${1:year}}"
+    },
+    "tournament{}": {
+      "snippet": "tournament{${1:name}}"
+    },
+    "tourn{}": {
+      "snippet": "tourn{${1:name}}"
+    },
+    "award{}": {
+      "snippet": "award{${1:name}}"
+    },
+    "dedication{}": {
+      "snippet": "dedication{${1:text}}"
+    },
+    "dedic{}": {
+      "snippet": "dedic{${1:text}}"
+    },
+    "condition{}": {
+      "snippet": "condition{${1:text}}"
+    },
+    "cond{}": {
+      "snippet": "cond{${1:text}}"
+    },
+    "twins{}": {
+      "snippet": "twins{${1:text}}"
+    },
+    "remark{}": {
+      "snippet": "remark{${1:text}}"
+    },
+    "rem{}": {
+      "snippet": "rem{${1:text}}"
+    },
+    "piecedefs{{}{}{}": {
+      "snippet": "piecedefs{{${1:piece1}}{${2:piece2}}{${3:text};...}}"
+    },
+    "solution{}": {
+      "snippet": "solution{${1:text}}"
+    },
+    "sol{}": {
+      "snippet": "sol{${1:text}}"
+    },
+    "judgement{}": {
+      "snippet": "judgement{${1:text}}"
+    },
+    "comment{}": {
+      "snippet": "comment{${1:text}}"
+    },
+    "themes{}": {
+      "snippet": "themes{${1:text}}"
+    },
+    "verticalcylinder": {},
+    "horizontalcylinder": {},
+    "noframe": {},
+    "noinnerframe": {},
+    "gridchess": {},
+    "stdgrid": {},
+    "diagleft": {},
+    "diagcenter": {},
+    "diagright": {},
+    "widedias": {},
+    "dianamestyle{}": {
+      "snippet": "dianamestyle{${1:option}}"
+    },
+    "solnamestyle{}": {
+      "snippet": "solnamestyle{${1:option}}"
+    },
+    "diagnumbering{}": {
+      "snippet": "diagnumbering{${1:numstyle}}"
+    },
+    "setmonthstyle{}": {
+      "snippet": "setmonthstyle{${1:numstyle}}"
+    },
+    "nocomputer": {},
+    "showcomputer": {},
+    "notcomputerproofedsymbol": {},
+    "computerproofedsymbol": {},
+    "selectelchfont{}": {
+      "snippet": "selectelchfont{${1:type}}"
+    },
+    "diagramx": {},
+    "diagramxi": {},
+    "diagramxii": {},
+    "diagnum{}": {
+      "snippet": "diagnum{${1:number}}"
+    },
+    "diagnum[]{}": {
+      "snippet": "diagnum[${2:prefix}]{${1:number}}"
+    },
+    "spacelayout{}": {
+      "snippet": "spacelayout{${1:type}}"
+    },
+    "allwhite": {},
+    "switchcolors": {},
+    "nofields{}": {
+      "snippet": "nofields{${1:list of squares}}"
+    },
+    "nosquares{}": {
+      "snippet": "nosquares{${1:list of squares}}"
+    },
+    "fieldframe{}": {
+      "snippet": "fieldframe{${1:list of fields}}"
+    },
+    "magic{}": {
+      "snippet": "magic{${1:list of fields}}"
+    },
+    "gridlines{}": {
+      "snippet": "gridlines{${1:list of lines}}"
+    },
+    "fieldtext{{}": {
+      "snippet": "fieldtext{{${1:text1}piece1,...}}"
+    },
+    "swL": {},
+    "ssL": {},
+    "wNr": {},
+    "nNr": {},
+    "sNr": {},
+    "wGh": {},
+    "nGh": {},
+    "sGh": {},
+    "Imi": {},
+    "wC": {},
+    "nC": {},
+    "sC": {},
+    "wE": {},
+    "sE": {},
+    "nE": {},
+    "wX": {},
+    "sX": {},
+    "nX": {},
+    "set": {},
+    "ra": {},
+    "lra": {},
+    "OO": {},
+    "OOO": {},
+    "x": {
+      "detail": "𝑥",
+      "documentation": "MATHEMATICAL ITALIC SMALL X"
+    },
+    "any": {},
+    "DefinePieces{}{}{}": {
+      "snippet": "DefinePieces{${1:color letters}}{${2:piece letters}}{${3:rotation letters}}"
+    },
+    "develop": {},
+    "makeaindex": {},
+    "authorindex": {},
+    "makesindex": {},
+    "sourceindex": {},
+    "maketindex": {},
+    "themeindex": {},
+    "solpar": {},
+    "after{}": {
+      "snippet": "after{${1:arg}}"
+    },
+    "authorfont": {},
+    "awardfont": {},
+    "cityfont": {},
+    "Co{}": {
+      "snippet": "Co{${1:arg}}"
+    },
+    "correction{}": {
+      "snippet": "correction{${1:arg}}"
+    },
+    "dedicfont": {},
+    "DefaultDiagramSize": {},
+    "defaultelchfont": {},
+    "elchfont": {},
+    "fidealbum{}": {
+      "snippet": "fidealbum{${1:arg}}"
+    },
+    "further": {},
+    "ifimitator": {},
+    "imitatorfalse": {},
+    "imitatortrue": {},
+    "labelfont": {},
+    "legendfont": {},
+    "nodiagnumbering": {},
+    "normalboardwidth": {},
+    "nowidedias": {},
+    "remfont": {},
+    "rla": {},
+    "setboardwidth": {},
+    "showlabel{}": {
+      "snippet": "showlabel{${1:arg}}"
+    },
+    "showtypis{}": {
+      "snippet": "showtypis{${1:arg}}"
+    },
+    "solafterdiagram": {},
+    "solhead{}": {
+      "snippet": "solhead{${1:arg}}"
+    },
+    "sourcefont": {},
+    "spacehorizontal": {},
+    "stipfont": {},
+    "textproblem": {},
+    "thediag": {},
+    "topdist": {},
+    "version{}": {
+      "snippet": "version{${1:arg}}"
+    },
+    "wF": {}
+  },
+  "envs": {
+    "diagram": {},
+    "diagram[]": {
+      "name": "diagram",
+      "snippet": "[${1:<${2:cols}>x<${3:rows}>}]"
+    },
+    "stereodiagram": {},
+    "spacediagram": {},
+    "figurine": {}
+  },
+  "options": [
+    "10pt",
+    "11pt",
+    "12pt"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/dichokey.json b/dev/packages/dichokey.json
new file mode 100644
index 000000000..d349e8849
--- /dev/null
+++ b/dev/packages/dichokey.json
@@ -0,0 +1,39 @@
+{
+  "includes": {
+    "calc": [],
+    "ifthen": []
+  },
+  "macros": {
+    "alter": {},
+    "name{}": {
+      "snippet": "name{${1:name}}"
+    },
+    "name[]{}": {
+      "snippet": "name[${2:prefix}]{${1:name}}"
+    },
+    "altindent": {},
+    "hang": {},
+    "keylabelwidth": {},
+    "oldparindent": {},
+    "panic{}": {
+      "snippet": "panic{${1:arg}}"
+    },
+    "thebacksteps": {},
+    "thebinarycounter": {},
+    "thebincouplet": {},
+    "thecouplet": {},
+    "thedelta": {},
+    "theindentcounter": {},
+    "thelastcouplet": {},
+    "thetemp": {},
+    "gprefix": {}
+  },
+  "envs": {
+    "Key{}": {
+      "name": "Key",
+      "snippet": "{${1:prefix}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/diffcoeff.json b/dev/packages/diffcoeff.json
index 08af17d8d..aa2b543c6 100644
--- a/dev/packages/diffcoeff.json
+++ b/dev/packages/diffcoeff.json
@@ -5,196 +5,196 @@
   },
   "macros": {
     "diff{}{}": {
-      "snippet": "diff{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diff{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "diff{}{}[]": {
-      "snippet": "diff{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diff{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diff[]{}{}": {
-      "snippet": "diff[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diff[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "diff[]{}{}[]": {
-      "snippet": "diff[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diff[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diff*{}{}": {
-      "snippet": "diff*{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diff*{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "diff*{}{}[]": {
-      "snippet": "diff*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diff*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diff*[]{}{}": {
-      "snippet": "diff*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diff*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "diff*[]{}{}[]": {
-      "snippet": "diff*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diff*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diff**{}{}": {
-      "snippet": "diff**{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diff**{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "diff**{}{}[]": {
-      "snippet": "diff**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diff**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diff**[]{}{}": {
-      "snippet": "diff**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diff**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "diff**[]{}{}[]": {
-      "snippet": "diff**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diff**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difs{}{}": {
-      "snippet": "difs{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difs{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difs{}{}[]": {
-      "snippet": "difs{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difs{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difs[]{}{}": {
-      "snippet": "difs[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difs[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difs[]{}{}[]": {
-      "snippet": "difs[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difs[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difs*{}{}": {
-      "snippet": "difs*{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difs*{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difs*{}{}[]": {
-      "snippet": "difs*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difs*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difs*[]{}{}": {
-      "snippet": "difs*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difs*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difs*[]{}{}[]": {
-      "snippet": "difs*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difs*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difs**{}{}": {
-      "snippet": "difs**{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difs**{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difs**{}{}[]": {
-      "snippet": "difs**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difs**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difs**[]{}{}": {
-      "snippet": "difs**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difs**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difs**[]{}{}[]": {
-      "snippet": "difs**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difs**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difc{}{}": {
-      "snippet": "difc{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difc{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difc{}{}[]": {
-      "snippet": "difc{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difc{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difc[]{}{}": {
-      "snippet": "difc[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difc[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difc[]{}{}[]": {
-      "snippet": "difc[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difc[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difc**{}{}": {
-      "snippet": "difc**{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difc**{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difc**{}{}[]": {
-      "snippet": "difc**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difc**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difc**[]{}{}": {
-      "snippet": "difc**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difc**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difc**[]{}{}[]": {
-      "snippet": "difc**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difc**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diffp{}{}": {
-      "snippet": "diffp{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diffp{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "diffp{}{}[]": {
-      "snippet": "diffp{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diffp{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diffp[]{}{}": {
-      "snippet": "diffp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diffp[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "diffp[]{}{}[]": {
-      "snippet": "diffp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diffp[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diffp*{}{}": {
-      "snippet": "diffp*{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diffp*{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "diffp*{}{}[]": {
-      "snippet": "diffp*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diffp*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diffp*[]{}{}": {
-      "snippet": "diffp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diffp*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "diffp*[]{}{}[]": {
-      "snippet": "diffp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diffp*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diffp**{}{}": {
-      "snippet": "diffp**{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diffp**{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "diffp**{}{}[]": {
-      "snippet": "diffp**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diffp**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diffp**[]{}{}": {
-      "snippet": "diffp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "diffp**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "diffp**[]{}{}[]": {
-      "snippet": "diffp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diffp**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difsp{}{}": {
-      "snippet": "difsp{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difsp{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difsp{}{}[]": {
-      "snippet": "difsp{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difsp{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difsp[]{}{}": {
-      "snippet": "difsp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difsp[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difsp[]{}{}[]": {
-      "snippet": "difsp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difsp[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difsp*{}{}": {
-      "snippet": "difsp*{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difsp*{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difsp*{}{}[]": {
-      "snippet": "difsp*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difsp*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difsp*[]{}{}": {
-      "snippet": "difsp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difsp*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difsp*[]{}{}[]": {
-      "snippet": "difsp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difsp*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difsp**{}{}": {
-      "snippet": "difsp**{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difsp**{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difsp**{}{}[]": {
-      "snippet": "difsp**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difsp**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difsp**[]{}{}": {
-      "snippet": "difsp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difsp**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difsp**[]{}{}[]": {
-      "snippet": "difsp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difsp**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difcp{}{}": {
-      "snippet": "difcp{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difcp{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difcp{}{}[]": {
-      "snippet": "difcp{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difcp{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difcp[]{}{}": {
-      "snippet": "difcp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difcp[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difcp[]{}{}[]": {
-      "snippet": "difcp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difcp[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difcp**{}{}": {
-      "snippet": "difcp**{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difcp**{${1:variable(${3:s})}}{${2:differentiand}}"
     },
     "difcp**{}{}[]": {
-      "snippet": "difcp**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difcp**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difcp**[]{}{}": {
-      "snippet": "difcp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
+      "snippet": "difcp**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
     },
     "difcp**[]{}{}[]": {
-      "snippet": "difcp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difcp**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "negmu": {},
     "nilmu": {},
@@ -209,16 +209,16 @@
       "keyvalpos": 2
     },
     "dl{}": {
-      "snippet": "dl{${1:variable(s)}}"
+      "snippet": "dl{${1:variable(${2:s})}}"
     },
     "dl[]{}": {
-      "snippet": "dl[${2:order-spec}]{${1:variable(s)}}"
+      "snippet": "dl[${2:order-spec}]{${1:variable(${3:s})}}"
     },
     "difl{}": {
-      "snippet": "difl{${1:variable(s)}}"
+      "snippet": "difl{${1:variable(${2:s})}}"
     },
     "difl[]{}": {
-      "snippet": "difl[${2:order-spec}]{${1:variable(s)}}"
+      "snippet": "difl[${2:order-spec}]{${1:variable(${3:s})}}"
     },
     "jacob{}{}": {
       "snippet": "jacob{${1:numer}}{${2:denom}}"
diff --git a/dev/packages/digicap-pro.json b/dev/packages/digicap-pro.json
index f3b9a0049..352827b9c 100644
--- a/dev/packages/digicap-pro.json
+++ b/dev/packages/digicap-pro.json
@@ -45,7 +45,7 @@
       "option": "display1"
     },
     "presentationOrder{}": {
-      "snippet": "presentationOrder{${1:name1,name2,...}}",
+      "snippet": "presentationOrder{${1:name1,${2:name2},...}}",
       "option": "display1"
     },
     "digiDisplaySpace{}{}": {
diff --git a/dev/packages/dline.json b/dev/packages/dline.json
new file mode 100644
index 000000000..f71e52a49
--- /dev/null
+++ b/dev/packages/dline.json
@@ -0,0 +1,51 @@
+{
+  "includes": {
+    "lineno": [],
+    "vplref": [
+      "addpageno"
+    ],
+    "ednmath0": [
+      "mathrefs"
+    ],
+    "edtable": [
+      "edtable",
+      "longtable",
+      "nolongtablepatch"
+    ],
+    "longtable": [
+      "longtable",
+      "nolongtablepatch"
+    ],
+    "ltabptch": [
+      "longtable"
+    ]
+  },
+  "macros": {
+    "dlinebox": {},
+    "dlinerule": {},
+    "ddlinerule": {},
+    "dlinesep": {},
+    "ddlinesep": {}
+  },
+  "envs": {
+    "dline": {}
+  },
+  "options": [
+    "addpageno",
+    "mathrefs",
+    "edtable",
+    "longtable",
+    "nolongtablepatch",
+    "left",
+    "right",
+    "switch",
+    "switch*",
+    "columnwise",
+    "pagewise",
+    "running",
+    "modulo",
+    "modulo*",
+    "mathlines"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/dljslib.json b/dev/packages/dljslib.json
index 46222e9a3..e0ed43a53 100644
--- a/dev/packages/dljslib.json
+++ b/dev/packages/dljslib.json
@@ -48,6 +48,9 @@
     "dljsRegister{}": {
       "snippet": "dljsRegister{${1:name}}"
     },
+    "emptyCompComplexMsg()": {
+      "snippet": "emptyCompComplexMsg(${1:arg})"
+    },
     "eqDuplEntries": {},
     "eqNonzeroEntries": {},
     "eqSyntaxErrorNoParens": {},
@@ -74,6 +77,9 @@
     "notifyWrongNumEntries": {},
     "NoTrigAllowedErrorMsg": {},
     "NoTrigLogAllowedErrorMsg": {},
+    "pointEmptyCompMsgiv()": {
+      "snippet": "pointEmptyCompMsgiv(${1:arg})"
+    },
     "pointErrorMsgi": {},
     "pointErrorMsgii": {},
     "pointErrorMsgiii": {},
@@ -81,6 +87,9 @@
     "sciNotNormalForm": {},
     "sciNotSyntaxError": {},
     "SyntaxErrorAuthor": {},
+    "vectorEmptyCompMsgiv()": {
+      "snippet": "vectorEmptyCompMsgiv(${1:arg})"
+    },
     "vectorsErrorMsgi": {},
     "vectorsErrorMsgii": {},
     "vectorsErrorMsgiii": {},
diff --git a/dev/packages/doc.json b/dev/packages/doc.json
new file mode 100644
index 000000000..9e0a3b11d
--- /dev/null
+++ b/dev/packages/doc.json
@@ -0,0 +1,269 @@
+{
+  "includes": {
+    "l3keys2e": [],
+    "multicol": [],
+    "hypdoc": []
+  },
+  "macros": {
+    "SetupDoc{}": {
+      "snippet": "SetupDoc{${1:options}}"
+    },
+    "DocInput{}": {
+      "snippet": "DocInput{${1:file}}"
+    },
+    "IndexInput{}": {
+      "snippet": "IndexInput{${1:file}}"
+    },
+    "DescribeMacro{}": {
+      "snippet": "DescribeMacro{${1:macro}}"
+    },
+    "DescribeMacro[]{}": {
+      "snippet": "DescribeMacro[${2:options}]{${1:macro}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "DescribeEnv{}": {
+      "snippet": "DescribeEnv{${1:envname}}"
+    },
+    "DescribeEnv[]{}": {
+      "snippet": "DescribeEnv[${2:options}]{${1:envname}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "MacrocodeTopsep": {},
+    "MacroTopsep": {},
+    "MacroIndent": {},
+    "MacroFont": {},
+    "PrintDescribeMacro{}": {
+      "snippet": "PrintDescribeMacro{${1:macro}}"
+    },
+    "PrintDescribeEnv{}": {
+      "snippet": "PrintDescribeEnv{${1:envname}}"
+    },
+    "PrintMacroName{}": {
+      "snippet": "PrintMacroName{${1:macro}}"
+    },
+    "PrintEnvName{}": {
+      "snippet": "PrintEnvName{${1:envname}}"
+    },
+    "NewDocElement{}{}": {
+      "snippet": "NewDocElement{${1:element}}{${2:envname}}"
+    },
+    "NewDocElement[]{}{}": {
+      "snippet": "NewDocElement[${3:options}]{${1:element}}{${2:envname}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "RenewDocElement{}{}": {
+      "snippet": "RenewDocElement{${1:element}}{${2:envname}}"
+    },
+    "RenewDocElement[]{}{}": {
+      "snippet": "RenewDocElement[${3:options}]{${1:element}}{${2:envname}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "ProvideDocElement{}{}": {
+      "snippet": "ProvideDocElement{${1:element}}{${2:envname}}"
+    },
+    "ProvideDocElement[]{}{}": {
+      "snippet": "ProvideDocElement[${3:options}]{${1:element}}{${2:envname}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "SpecialEscapechar": {},
+    "DisableCrossrefs": {},
+    "EnableCrossrefs": {},
+    "DoNotIndex{}": {
+      "snippet": "DoNotIndex{${1:macro list}}"
+    },
+    "PageIndex": {},
+    "CodelineIndex": {},
+    "theCodelineNo": {},
+    "CodelineNumbered": {},
+    "actualchar": {},
+    "quotechar": {},
+    "encapchar": {},
+    "levelchar": {},
+    "SpecialMainMacroIndex{}": {
+      "snippet": "SpecialMainMacroIndex{${1:cmd}}"
+    },
+    "SpecialMainEnvIndex{}": {
+      "snippet": "SpecialMainEnvIndex{${1:envname}}"
+    },
+    "SpecialMacroIndex{}": {
+      "snippet": "SpecialMacroIndex{${1:cmd}}"
+    },
+    "SpecialEnvIndex{}": {
+      "snippet": "SpecialEnvIndex{${1:envname}}"
+    },
+    "SpecialIndex{}": {
+      "snippet": "SpecialIndex{${1:cmd}}"
+    },
+    "SpecialShortIndex{}": {
+      "snippet": "SpecialShortIndex{${1:cmd}}"
+    },
+    "SpecialMainIndex{}": {
+      "snippet": "SpecialMainIndex{${1:cmd}}"
+    },
+    "SpecialUsageIndex{}": {
+      "snippet": "SpecialUsageIndex{${1:cmd}}"
+    },
+    "SortIndex{}{}": {
+      "snippet": "SortIndex{${1:sort key}}{${2:index entry}}"
+    },
+    "verbatimchar": {},
+    "*": {
+      "detail": "*",
+      "documentation": "(high) ASTERISK, star"
+    },
+    "PrintIndex": {},
+    "IndexMin": {},
+    "IndexPrologue{}": {
+      "snippet": "IndexPrologue{${1:text}}"
+    },
+    "IndexParms": {},
+    "main{}": {
+      "snippet": "main{${1:text}}"
+    },
+    "usage{}": {
+      "snippet": "usage{${1:text}}"
+    },
+    "code{}": {
+      "snippet": "code{${1:text}}"
+    },
+    "DocstyleParms": {},
+    "MakeShortVerb{}": {
+      "snippet": "MakeShortVerb{${1:definition}}"
+    },
+    "MakeShortVerb*{}": {
+      "snippet": "MakeShortVerb*{${1:definition}}"
+    },
+    "DeleteShortVerb{}": {
+      "snippet": "DeleteShortVerb{${1:definition}}"
+    },
+    "Web": {},
+    "AmSTeX": {},
+    "BibTeX": {},
+    "SliTeX": {},
+    "PlainTeX": {},
+    "meta{}": {
+      "snippet": "meta{${1:arg}}"
+    },
+    "OnlyDescription": {},
+    "MaybeStop{}": {
+      "snippet": "MaybeStop{${1:finale code}}"
+    },
+    "StopEventually{}": {
+      "snippet": "StopEventually{${1:finale code}}"
+    },
+    "Finale": {},
+    "AlsoImplementation": {},
+    "changes{}{}{}": {
+      "snippet": "changes{${1:version}}{${2:date}}{${3:text}}"
+    },
+    "generalname": {},
+    "cs{}": {
+      "snippet": "cs{${1:csname}}"
+    },
+    "RecordChanges": {},
+    "PrintChanges": {},
+    "GlossaryMin": {},
+    "GlossaryPrologue{}": {
+      "snippet": "GlossaryPrologue{${1:text}}"
+    },
+    "GlossaryParms": {},
+    "bslash": {},
+    "MakePrivateLetters": {},
+    "DontCheckModules": {},
+    "CheckModules": {},
+    "Module{}": {
+      "snippet": "Module{${1:directive}}"
+    },
+    "AltMacroFont": {},
+    "theStandardModuleDepth": {},
+    "OldMakeindex": {},
+    "percentchar": {},
+    "CharacterTable{}": {
+      "snippet": "CharacterTable{${1:contents}}"
+    },
+    "CharTableChanges": {},
+    "CheckSum{}": {
+      "snippet": "CheckSum{${1:number}}"
+    },
+    "efill": {},
+    "filedate": {},
+    "fileinfo": {},
+    "filename": {},
+    "fileversion": {},
+    "GetFileInfo{}": {
+      "snippet": "GetFileInfo{${1:file}}"
+    },
+    "LeftBraceIndex": {},
+    "MakePercentComment": {},
+    "MakePercentIgnore": {},
+    "PercentIndex": {},
+    "pfill": {},
+    "RecordIndexType{}{}": {
+      "snippet": "RecordIndexType{${1:cmd}}{${2:type}}"
+    },
+    "RecordIndexTypeAux{}{}": {
+      "snippet": "RecordIndexTypeAux{${1:cmd}}{${2:type}}"
+    },
+    "RightBraceIndex": {},
+    "ShowIndexingState": {}
+  },
+  "envs": {
+    "macrocode": {},
+    "macrocode*": {},
+    "macro{}": {
+      "name": "macro",
+      "snippet": "{${1:macro}}"
+    },
+    "macro[]{}": {
+      "name": "macro",
+      "snippet": "[${2:options}]{${1:macro}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "environment{}": {
+      "name": "environment",
+      "snippet": "{${1:envname}}"
+    },
+    "environment[]{}": {
+      "name": "environment",
+      "snippet": "[${2:options}]{${1:envname}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "theglossary": {}
+  },
+  "options": [
+    "hyperref",
+    "nohyperref",
+    "multicol",
+    "nomulticol",
+    "debugshow",
+    "noindex",
+    "noprint",
+    "reportchangedates",
+    "toplevel",
+    "notoplevel"
+  ],
+  "keyvals": [
+    [
+      "noindex",
+      "noprint"
+    ],
+    [
+      "macrolike",
+      "envlike",
+      "toplevel",
+      "notoplevel",
+      "idxtype=${1:string}",
+      "printtype=${1:string}",
+      "idxgroup=${1:string}",
+      "noindex",
+      "noprint"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/drawstack.json b/dev/packages/drawstack.json
index 6aa5841c2..323257690 100644
--- a/dev/packages/drawstack.json
+++ b/dev/packages/drawstack.json
@@ -27,7 +27,7 @@
       "snippet": "cellround{${1:text}}"
     },
     "drawstruct{}": {
-      "snippet": "drawstruct{${1:(${2:x,y})}}"
+      "snippet": "drawstruct{${1:(${2:x},${3:y})}}"
     },
     "ebp": {},
     "esp": {},
diff --git a/dev/packages/dsptricks.json b/dev/packages/dsptricks.json
index 136266c6d..220368d66 100644
--- a/dev/packages/dsptricks.json
+++ b/dev/packages/dsptricks.json
@@ -17,6 +17,9 @@
     "dspCustomTicks[]{}": {
       "snippet": "dspCustomTicks[${2:options}]{${1:pos1 label1 pos2 label2 ...}}"
     },
+    "dspText(){}": {
+      "snippet": "dspText(${2:x},${3:y}){${1:label}}"
+    },
     "dspTaps{}": {
       "snippet": "dspTaps{${1:data}}"
     },
@@ -200,11 +203,11 @@
   "envs": {
     "dspPlot{}{}": {
       "name": "dspPlot",
-      "snippet": "{${1:xmin,xmax}}{${2:ymin,ymax}}"
+      "snippet": "{${1:xmin,${3:xmax}}{${2:ymin},ymax}}"
     },
     "dspPlot[]{}{}": {
       "name": "dspPlot",
-      "snippet": "[${3:options}]{${1:xmin,xmax}}{${2:ymin,ymax}}"
+      "snippet": "[${3:options}]{${1:xmin,${4:xmax}}{${2:ymin},ymax}}"
     },
     "dspClip": {},
     "dspPZPlot{}": {
diff --git a/dev/packages/dtk-url.json b/dev/packages/dtk-url.json
index d81a49dec..4aae3eca5 100644
--- a/dev/packages/dtk-url.json
+++ b/dev/packages/dtk-url.json
@@ -9,6 +9,9 @@
     "embedfile": []
   },
   "macros": {
+    "File{}": {
+      "snippet": "File{${1:file}}"
+    },
     "CTANurl{}": {
       "snippet": "CTANurl{${1:URL}}"
     },
diff --git a/dev/packages/dynkin-diagrams.json b/dev/packages/dynkin-diagrams.json
index 1d9c065af..ac17f611d 100644
--- a/dev/packages/dynkin-diagrams.json
+++ b/dev/packages/dynkin-diagrams.json
@@ -114,6 +114,9 @@
     "Bdynkin": {},
     "braceYshift": {},
     "Cdynkin": {},
+    "centerarc[]()()": {
+      "snippet": "centerarc[${1:TikZ keys}](${2:center})(${3:initangle:finalangle:radius})"
+    },
     "convertRootNumber{}": {
       "snippet": "convertRootNumber{${1:n}}"
     },
@@ -730,6 +733,7 @@
       "Bourbaki arrow",
       "ceref",
       "Coxeter",
+      "Coxeter above",
       "double edges",
       "double fold",
       "double fold left",
diff --git a/dev/packages/easybase.json b/dev/packages/easybase.json
index 14247e408..585db846e 100644
--- a/dev/packages/easybase.json
+++ b/dev/packages/easybase.json
@@ -47,12 +47,22 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "tableofcontents[]()": {
+      "snippet": "tableofcontents[${1:options}](${2:代码钩子})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "tableofcontents*": {},
     "tableofcontents*[]": {
       "snippet": "tableofcontents*[${1:options}]",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "tableofcontents*[]()": {
+      "snippet": "tableofcontents*[${1:options}](${2:代码钩子})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "listoffigures[]": {
       "snippet": "listoffigures[${1:options}]",
       "keyvalindex": 0,
@@ -129,6 +139,12 @@
     "appendix[]": {
       "snippet": "appendix[${1:前名字,后名字}]"
     },
+    "appendix[]()": {
+      "snippet": "appendix[${1:前名字,后名字}](${2:数字输出命令})"
+    },
+    "appendix()": {
+      "snippet": "appendix(${1:数字输出命令})"
+    },
     "BeforeAddBitoc{}": {
       "snippet": "BeforeAddBitoc{${1:英文标题加入目录前的代码}}"
     },
@@ -179,10 +195,10 @@
       "keyvalpos": 0
     },
     "DeclareThemeColor{}": {
-      "snippet": "DeclareThemeColor{${1:name,frame color,emph color,verb color}}"
+      "snippet": "DeclareThemeColor{${1:name,${2:frame color},${3:emph color},verb color}}"
     },
     "DeclareLinkColor{}": {
-      "snippet": "DeclareLinkColor{${1:name,link color,url color,cite color}}"
+      "snippet": "DeclareLinkColor{${1:name,${2:link color},${3:url color},cite color}}"
     },
     "addtosubfont{}{}": {
       "snippet": "addtosubfont{${1:字体类型}}{${2:字体命令}}"
@@ -197,6 +213,9 @@
     "markrule{}": {
       "snippet": "markrule{${1:线宽}}"
     },
+    "markrule[](){}[]": {
+      "snippet": "markrule[${2:长度}](${4:颜色名}){${1:线宽}}[${3:上间距|下间距}]"
+    },
     "fnfirstindent": {},
     "fnafterindent": {},
     "fnparskip": {},
@@ -232,9 +251,15 @@
     "tocrule{}": {
       "snippet": "tocrule{${1:引导点}}"
     },
+    "tocrule[](){}[]": {
+      "snippet": "tocrule[${2:引导点间距}](${4:放大因子}){${1:引导点}}[${3:页码格式}]"
+    },
     "tocrule*{}": {
       "snippet": "tocrule*{${1:引导点}}"
     },
+    "tocrule*[](){}[]": {
+      "snippet": "tocrule*[${2:引导点间距}](${4:放大因子}){${1:引导点}}[${3:页码格式}]"
+    },
     "RegisterTocName{}": {
       "snippet": "RegisterTocName{${1:条目名}}"
     },
@@ -268,9 +293,15 @@
     "counteruse{}": {
       "snippet": "counteruse{${1:计数器}}"
     },
+    "counteruse[](){}[]": {
+      "snippet": "counteruse[${2:编号}](${4:分隔符}){${1:计数器}}[${3:父计数器}]"
+    },
     "counteruse*{}": {
       "snippet": "counteruse*{${1:计数器}}"
     },
+    "counteruse*[](){}[]": {
+      "snippet": "counteruse*[${2:编号}](${4:分隔符}){${1:计数器}}[${3:父计数器}]"
+    },
     "counterwithin[]{}{}": {
       "snippet": "counterwithin[${3:⟨格式⟩}]{${1:⟨计数器⟩}}{${2:⟨父计数器⟩}}"
     },
diff --git a/dev/packages/easylist.json b/dev/packages/easylist.json
new file mode 100644
index 000000000..295580441
--- /dev/null
+++ b/dev/packages/easylist.json
@@ -0,0 +1,85 @@
+{
+  "includes": {},
+  "macros": {
+    "ListProperties()": {
+      "snippet": "ListProperties(${1:options})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "NewList()": {
+      "snippet": "NewList(${1:options})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ifPilcrow": {},
+    "Pilcrowtrue": {},
+    "Pilcrowfalse": {},
+    "ifAt": {},
+    "Attrue": {},
+    "Atfalse": {},
+    "ifSharp": {},
+    "Sharptrue": {},
+    "Sharpfalse": {},
+    "ifAmpersand": {},
+    "Ampersandtrue": {},
+    "Ampersandfalse": {},
+    "ifDubiousFigure": {},
+    "DubiousFiguretrue": {},
+    "DubiousFigurefalse": {}
+  },
+  "envs": {
+    "easylist": {
+      "option": "ampersand"
+    },
+    "easylist[]": {
+      "name": "easylist",
+      "snippet": "[${1:style}]",
+      "option": "ampersand"
+    }
+  },
+  "options": [
+    "pilcrow",
+    "at",
+    "sharp",
+    "ampersand",
+    "${1:number of counters}"
+  ],
+  "keyvals": [
+    [
+      "Start${1:n}=${2:number}",
+      "Start${1:n}*=${2:counter}",
+      "Mark=${1:punctuation}",
+      "Mark${1:n}=${2:punctuation}",
+      "FinalMark=${1:punctuation}",
+      "FinalMark${1:n}=${2:punctuation}",
+      "Numbers=",
+      "Numbers${1:n}=",
+      "Hide=${1:number}",
+      "Hide${1:n}=${2:number}",
+      "Style=${1:format}",
+      "Style${1:n}=${2:format}",
+      "Style*=${1:format}",
+      "Style${1:n}*=${2:format}",
+      "Style**=${1:format}",
+      "Style${1:n}**=${2:format}",
+      "CtrCom=${1:command}",
+      "CtrCom${1:n}=${2:command}",
+      "Hang",
+      "Hang${1:n}",
+      "Align=${1:move, fixed, or <dimen>}",
+      "Align${1:n}=${2:move, fixed, or <dimen>}",
+      "Margin=",
+      "Margin${1:n}=",
+      "Progressive=",
+      "Progressive${1:n}=",
+      "Space=",
+      "Space${1:n}=",
+      "Space*=",
+      "Space${1:n}*=",
+      "Indent=",
+      "Indent${1:n}=",
+      "FinalSpace=",
+      "FinalSpace${1:n}="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/easyvector.json b/dev/packages/easyvector.json
index cb2cf1d7e..081284c72 100644
--- a/dev/packages/easyvector.json
+++ b/dev/packages/easyvector.json
@@ -4,6 +4,9 @@
     "newvector[]{}": {
       "snippet": "newvector[${2:scalar macro,vector macro}]{${1:text}}"
     },
+    "newvector()[]": {
+      "snippet": "newvector(${2:letter})[${1:text}]"
+    },
     "newvectora{}{}": {
       "snippet": "newvectora{${1:macro}}{${2:text}}"
     },
diff --git a/dev/packages/ebook.json b/dev/packages/ebook.json
new file mode 100644
index 000000000..45114e1c3
--- /dev/null
+++ b/dev/packages/ebook.json
@@ -0,0 +1,18 @@
+{
+  "includes": {
+    "geometry": [],
+    "graphicx": [],
+    "hyperref": [],
+    "moreverb": []
+  },
+  "macros": {
+    "pagefill": {},
+    "pagefill[]": {
+      "snippet": "pagefill[${1:length}]"
+    },
+    "ebook": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ed.json b/dev/packages/ed.json
new file mode 100644
index 000000000..a1fc40063
--- /dev/null
+++ b/dev/packages/ed.json
@@ -0,0 +1,157 @@
+{
+  "includes": {
+    "paralist": [],
+    "xcolor": [],
+    "verbatim": []
+  },
+  "macros": {
+    "ednote{}": {
+      "snippet": "ednote{${1:text}}"
+    },
+    "ednote[]{}": {
+      "snippet": "ednote[${2:label}]{${1:text}}"
+    },
+    "Ednote{}": {
+      "snippet": "Ednote{${1:text}}"
+    },
+    "Ednote[]{}": {
+      "snippet": "Ednote[${2:label}]{${1:text}}"
+    },
+    "edissue{}": {
+      "snippet": "edissue{${1:text}}"
+    },
+    "edissue[]{}": {
+      "snippet": "edissue[${2:label}]{${1:text}}"
+    },
+    "edIssue{}": {
+      "snippet": "edIssue{${1:text}}"
+    },
+    "edIssue[]{}": {
+      "snippet": "edIssue[${2:label}]{${1:text}}"
+    },
+    "tweak{}": {
+      "snippet": "tweak{${1:text}}"
+    },
+    "tweak[]{}": {
+      "snippet": "tweak[${2:label}]{${1:text}}"
+    },
+    "Tweak{}": {
+      "snippet": "Tweak{${1:text}}"
+    },
+    "Tweak[]{}": {
+      "snippet": "Tweak[${2:label}]{${1:text}}"
+    },
+    "edstubURI{}": {
+      "snippet": "edstubURI{${1:URI}}"
+    },
+    "ednoteshape": {},
+    "ifshowednotes": {},
+    "showednotestrue": {},
+    "showednotesfalse": {},
+    "ifmargins": {},
+    "marginstrue": {},
+    "marginsfalse": {},
+    "theednote": {},
+    "ednotelabel{}": {
+      "snippet": "ednotelabel{${1:text}}"
+    },
+    "ednotemargin{}": {
+      "snippet": "ednotemargin{${1:text}}"
+    },
+    "tweaklabel{}": {
+      "snippet": "tweaklabel{${1:text}}"
+    },
+    "tweakmargin{}": {
+      "snippet": "tweakmargin{${1:text}}"
+    },
+    "edissuelabel{}": {
+      "snippet": "edissuelabel{${1:text}}"
+    },
+    "edissuemargin{}": {
+      "snippet": "edissuemargin{${1:text}}"
+    },
+    "newpartmargins{}{}": {
+      "snippet": "newpartmargins{${1:text1}}{${2:text2}}"
+    },
+    "oldpartlabels{}{}": {
+      "snippet": "oldpartlabels{${1:text1}}{${2:text2}}"
+    },
+    "oldpartmargins{}{}": {
+      "snippet": "oldpartmargins{${1:text1}}{${2:text2}}"
+    },
+    "todolabels{}{}": {
+      "snippet": "todolabels{${1:text1}}{${2:text2}}"
+    },
+    "todomargins{}{}": {
+      "snippet": "todomargins{${1:text1}}{${2:text2}}"
+    },
+    "ifhref": {},
+    "hreftrue": {},
+    "hreffalse": {},
+    "issue{}": {
+      "snippet": "issue{${1:text}}"
+    },
+    "issue[]{}": {
+      "snippet": "issue[${2:label}]{${1:text}}"
+    },
+    "Issue{}": {
+      "snippet": "Issue{${1:text}}"
+    },
+    "Issue[]{}": {
+      "snippet": "Issue[${2:label}]{${1:text}}"
+    },
+    "edexplanation": {},
+    "ednotemessage": {}
+  },
+  "envs": {
+    "todo{}": {
+      "name": "todo",
+      "snippet": "{${1:comment}}"
+    },
+    "Todo{}": {
+      "name": "Todo",
+      "snippet": "{${1:comment}}"
+    },
+    "todolist{}": {
+      "name": "todolist",
+      "snippet": "{${1:comment}}"
+    },
+    "Todolist{}": {
+      "name": "Todolist",
+      "snippet": "{${1:comment}}"
+    },
+    "newpart{}": {
+      "name": "newpart",
+      "snippet": "{${1:comment}}"
+    },
+    "Newpart{}": {
+      "name": "Newpart",
+      "snippet": "{${1:comment}}"
+    },
+    "oldpart{}": {
+      "name": "oldpart",
+      "snippet": "{${1:comment}}"
+    },
+    "Oldpart{}": {
+      "name": "Oldpart",
+      "snippet": "{${1:comment}}"
+    },
+    "edstub{}": {
+      "name": "edstub",
+      "snippet": "{${1:file}}"
+    },
+    "edstub[]{}": {
+      "name": "edstub",
+      "snippet": "[${2:desc}]{${1:file}}"
+    },
+    "musings": {}
+  },
+  "options": [
+    "show",
+    "hide",
+    "nomargins",
+    "draft",
+    "final"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/eepic.json b/dev/packages/eepic.json
new file mode 100644
index 000000000..69c7ea358
--- /dev/null
+++ b/dev/packages/eepic.json
@@ -0,0 +1,46 @@
+{
+  "includes": {},
+  "macros": {
+    "line(){}": {
+      "snippet": "line(${2:x},${3:y}){${1:length}}"
+    },
+    "circle{}": {
+      "snippet": "circle{${1:diameter}}"
+    },
+    "circle*{}": {
+      "snippet": "circle*{${1:diameter}}"
+    },
+    "oval()": {
+      "snippet": "oval(${1:width},${2:height})"
+    },
+    "oval()[]": {
+      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
+    },
+    "maxovaldiam": {},
+    "allinethickness{}": {
+      "snippet": "allinethickness{${1:dimen}}"
+    },
+    "Thicklines": {},
+    "ellipse{}{}": {
+      "snippet": "ellipse{${1:x diameter}}{${2:y diameter}}"
+    },
+    "ellipse*{}{}": {
+      "snippet": "ellipse*{${1:x diameter}}{${2:y diameter}}"
+    },
+    "arc{}{}{}": {
+      "snippet": "arc{${1:diameter}}{${2:start angle}}{${3:end angle}}"
+    },
+    "filltype{}": {
+      "snippet": "filltype{${1:type}}"
+    },
+    "blacken": {},
+    "whiten": {},
+    "shade": {},
+    "texture{}": {
+      "snippet": "texture{${1:hex nums}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/egpeirce.json b/dev/packages/egpeirce.json
index d9debae17..9668aa9c1 100644
--- a/dev/packages/egpeirce.json
+++ b/dev/packages/egpeirce.json
@@ -84,10 +84,10 @@
       "snippet": "longinversevscroll*{${1:top-width}}{${2:top}}{${3:middle-width}}{${4:bottom}}{${5:bottom-width}}"
     },
     "nscroll{}": {
-      "snippet": "nscroll{${1:A,B,C,...}}"
+      "snippet": "nscroll{${1:A,${2:B},${3:C},...}}"
     },
     "nscroll*{}{}": {
-      "snippet": "nscroll*{${1:A,B,C,...}}{${2:center}}"
+      "snippet": "nscroll*{${1:A,${3:B},${4:C},...}}{${2:center}}"
     },
     "nscrollwidth{}": {
       "snippet": "nscrollwidth{${1:factor}}"
diff --git a/dev/packages/elements.json b/dev/packages/elements.json
new file mode 100644
index 000000000..a3a0efc38
--- /dev/null
+++ b/dev/packages/elements.json
@@ -0,0 +1,83 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "translations": []
+  },
+  "macros": {
+    "elementname{}": {
+      "snippet": "elementname{${1:atomic number|element symbol}}"
+    },
+    "setatomname{}{}": {
+      "snippet": "setatomname{${1:atomic number}}{${2:element name}}"
+    },
+    "setatomname[]{}{}": {
+      "snippet": "setatomname[${3:alt name}]{${1:atomic number}}{${2:element name}}"
+    },
+    "DeclareAtomName{}{}": {
+      "snippet": "DeclareAtomName{${1:atomic number}}{${2:element name}}"
+    },
+    "DeclareAtomName[]{}{}": {
+      "snippet": "DeclareAtomName[${3:alt name}]{${1:atomic number}}{${2:element name}}"
+    },
+    "saveelementname{}{}": {
+      "snippet": "saveelementname{${1:cmd}}{${2:atomic number|element symbol|element name}}"
+    },
+    "elementsymbol{}": {
+      "snippet": "elementsymbol{${1:atomic number|element name}}"
+    },
+    "setatomsymbol{}{}": {
+      "snippet": "setatomsymbol{${1:atomic number}}{${2:element symbol}}"
+    },
+    "DeclareAtomSymbol{}{}": {
+      "snippet": "DeclareAtomSymbol{${1:atomic number}}{${2:element symbol}}"
+    },
+    "saveelementsymbol{}{}": {
+      "snippet": "saveelementsymbol{${1:cmd}}{${2:atomic number|element symbol|element name}}"
+    },
+    "atomicnumber{}": {
+      "snippet": "atomicnumber{${1:element symbol|element name}}"
+    },
+    "Z{}": {
+      "snippet": "Z{${1:element symbol|element name}}"
+    },
+    "saveatomicnumber{}{}": {
+      "snippet": "saveatomicnumber{${1:cmd}}{${2:atomic number|element symbol|element name}}"
+    },
+    "elconf{}": {
+      "snippet": "elconf{${1:atomic number|element symbol|element name}}"
+    },
+    "writeelconf{}": {
+      "snippet": "writeelconf{${1:electron distribution}}"
+    },
+    "setelectrondistribution{}{}": {
+      "snippet": "setelectrondistribution{${1:atomic number}}{${2:element distribution}}"
+    },
+    "DeclareElectronDistribution{}{}": {
+      "snippet": "DeclareElectronDistribution{${1:atomic number}}{${2:element distribution}}"
+    },
+    "setangularmomentum{}{}": {
+      "snippet": "setangularmomentum{${1:type}}{${2:output}}"
+    },
+    "printangularmomentum{}": {
+      "snippet": "printangularmomentum{${1:value}}"
+    },
+    "setatomisotopes{}{}": {
+      "snippet": "setatomisotopes{${1:atomic number}}{${2:isotope list}}"
+    },
+    "DeclareAtomIsotopes{}{}": {
+      "snippet": "DeclareAtomIsotopes{${1:atomic number}}{${2:isotope list}}"
+    },
+    "saveelementisotopes{}{}": {
+      "snippet": "saveelementisotopes{${1:cmd}}{${2:atomic number|element symbol|element name}}"
+    },
+    "savemainelementisotope{}{}": {
+      "snippet": "savemainelementisotope{${1:cmd}}{${2:atomic number|element symbol|element name}}"
+    },
+    "mainelementisotope{}": {
+      "snippet": "mainelementisotope{${1:atomic number|element symbol|element name}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ellipsis.json b/dev/packages/ellipsis.json
new file mode 100644
index 000000000..01dbb5796
--- /dev/null
+++ b/dev/packages/ellipsis.json
@@ -0,0 +1,19 @@
+{
+  "includes": {
+    "xspace": [
+      "xspace"
+    ]
+  },
+  "macros": {
+    "ellipsisgap": {},
+    "ellipsispunctuation": {},
+    "midwordellipsis": {}
+  },
+  "envs": {},
+  "options": [
+    "chicago",
+    "mla",
+    "xspace"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/emarks.json b/dev/packages/emarks.json
new file mode 100644
index 000000000..18fb02553
--- /dev/null
+++ b/dev/packages/emarks.json
@@ -0,0 +1,55 @@
+{
+  "includes": {
+    "etex": []
+  },
+  "macros": {
+    "marksthe{}{}": {
+      "snippet": "marksthe{${1:named-mark}}{${2:content}}"
+    },
+    "marksthe*{}{}": {
+      "snippet": "marksthe*{${1:named-mark}}{${2:content}}"
+    },
+    "marksthecs{}{}": {
+      "snippet": "marksthecs{${1:named-mark}}{${2:csname}}"
+    },
+    "marksthecs*{}{}": {
+      "snippet": "marksthecs*{${1:named-mark}}{${2:csname}}"
+    },
+    "thefirstmarks{}": {
+      "snippet": "thefirstmarks{${1:named-mark}}"
+    },
+    "thebotmarks{}": {
+      "snippet": "thebotmarks{${1:named-mark}}"
+    },
+    "thetopmarks{}": {
+      "snippet": "thetopmarks{${1:named-mark}}"
+    },
+    "getthemarks{}{}{}": {
+      "snippet": "getthemarks{${1:marks}}{${2:named-mark}}{${3:cmd}}"
+    },
+    "getthefirstmarks{}{}": {
+      "snippet": "getthefirstmarks{${1:named-mark}}{${2:cmd}}"
+    },
+    "getthebotmarks{}{}": {
+      "snippet": "getthebotmarks{${1:named-mark}}{${2:cmd}}"
+    },
+    "getthetopmarks{}{}": {
+      "snippet": "getthetopmarks{${1:named-mark}}{${2:cmd}}"
+    },
+    "firstmarks": {},
+    "botmarks": {},
+    "topmarks": {},
+    "ifmarksvoid{}{}{}{}": {
+      "snippet": "ifmarksvoid{${1:marks}}{${2:named-mark}}{${3:true}}{${4:false}}"
+    },
+    "ifmarksequal{}{}{}{}{}": {
+      "snippet": "ifmarksequal{${1:marks1}}{${2:marks2}}{${3:named-mark}}{${4:true}}{${5:false}}"
+    },
+    "showthemarks{}": {
+      "snippet": "showthemarks{${1:named-mark}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/embrac.json b/dev/packages/embrac.json
index ff715b07c..52e6b7134 100644
--- a/dev/packages/embrac.json
+++ b/dev/packages/embrac.json
@@ -19,19 +19,19 @@
       "snippet": "AddEmph{${1:o}}{${2:c}}"
     },
     "AddEmph{}[]{}[]": {
-      "snippet": "AddEmph{${1:o}}[${2:io-kern,oo-kern}]{${3:c}}[${4:ic-kern,oc-kern}]"
+      "snippet": "AddEmph{${1:o}}[${2:io-kern,${5:oo-kern}]{${3:c}}[${4:ic-kern},oc-kern}]"
     },
     "ChangeEmph{}{}": {
       "snippet": "ChangeEmph{${1:o}}{${2:c}}"
     },
     "ChangeEmph{}[]{}[]": {
-      "snippet": "ChangeEmph{${1:o}}[${2:io-kern,oo-kern}]{${3:c}}[${4:ic-kern,oc-kern}]"
+      "snippet": "ChangeEmph{${1:o}}[${2:io-kern,${5:oo-kern}]{${3:c}}[${4:ic-kern},oc-kern}]"
     },
     "RenewEmph{}{}": {
       "snippet": "RenewEmph{${1:o}}{${2:c}}"
     },
     "RenewEmph{}[]{}[]": {
-      "snippet": "RenewEmph{${1:o}}[${2:io-kern,oo-kern}]{${3:c}}[${4:ic-kern,oc-kern}]"
+      "snippet": "RenewEmph{${1:o}}[${2:io-kern,${5:oo-kern}]{${3:c}}[${4:ic-kern},oc-kern}]"
     },
     "DeleteEmph{}{}": {
       "snippet": "DeleteEmph{${1:o}}{${2:c}}"
diff --git a/dev/packages/emo.json b/dev/packages/emo.json
new file mode 100644
index 000000000..cc56b22aa
--- /dev/null
+++ b/dev/packages/emo.json
@@ -0,0 +1,32 @@
+{
+  "includes": {
+    "inputenc": [],
+    "iftex": [],
+    "graphicx": [],
+    "xcolor": [],
+    "xspace": [
+      "extra"
+    ],
+    "index": [
+      "index"
+    ]
+  },
+  "macros": {
+    "lingchi": {
+      "option": "extra"
+    },
+    "YHWH": {
+      "option": "extra"
+    },
+    "emo{}": {
+      "snippet": "emo{${1:emoji-name}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "extra",
+    "index",
+    "debug"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/emoji.json b/dev/packages/emoji.json
new file mode 100644
index 000000000..10c446e84
--- /dev/null
+++ b/dev/packages/emoji.json
@@ -0,0 +1,20 @@
+{
+  "includes": {
+    "luatex": [],
+    "fontspec": []
+  },
+  "macros": {
+    "setemojifont{}": {
+      "snippet": "setemojifont{${1:font}}"
+    },
+    "setemojifont{}[]": {
+      "snippet": "setemojifont{${1:font}}[${2:font features}]"
+    },
+    "emoji{}": {
+      "snippet": "emoji{${1:name}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/emp.json b/dev/packages/emp.json
index 343b793b1..8607d59c4 100644
--- a/dev/packages/emp.json
+++ b/dev/packages/emp.json
@@ -33,10 +33,28 @@
       "snippet": "empfile[${1:METAPOST file}]"
     },
     "endempfile": {},
+    "emp()": {
+      "snippet": "emp(${1:width},${2:height})"
+    },
+    "emp[]()": {
+      "snippet": "emp[${1:name}](${2:width},${3:height})"
+    },
     "endemp": {},
+    "empdef()": {
+      "snippet": "empdef(${1:width},${2:height})"
+    },
+    "empdef[]()": {
+      "snippet": "empdef[${1:name}](${2:width},${3:height})"
+    },
     "endempdef": {},
     "empcmds": {},
     "endempcmds": {},
+    "empgraph()": {
+      "snippet": "empgraph(${1:width},${2:height})"
+    },
+    "empgraph[]()": {
+      "snippet": "empgraph[${1:name}](${2:width},${3:height})"
+    },
     "endempgraph": {},
     "filedate": {},
     "filemaintainer": {},
@@ -50,7 +68,31 @@
       "name": "empfile",
       "snippet": "[${1:METAPOST file}]"
     },
-    "empcmds": {}
+    "emp(width,height)": {
+      "name": "emp",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "emp[](width,height)": {
+      "name": "emp",
+      "snippet": "[${1:name}](${2:width},${3:height})"
+    },
+    "empdef(width,height)": {
+      "name": "empdef",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "empdef[](width,height)": {
+      "name": "empdef",
+      "snippet": "[${1:name}](${2:width},${3:height})"
+    },
+    "empcmds": {},
+    "empgraph(width,height)": {
+      "name": "empgraph",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "empgraph[](width,height)": {
+      "name": "empgraph",
+      "snippet": "[${1:name}](${2:width},${3:height})"
+    }
   },
   "options": [
     "unknownkeysallowed",
diff --git a/dev/packages/endiagram.json b/dev/packages/endiagram.json
index 4f8791882..15ce85235 100644
--- a/dev/packages/endiagram.json
+++ b/dev/packages/endiagram.json
@@ -17,10 +17,10 @@
       "keyvalpos": 1
     },
     "ENcurve{}": {
-      "snippet": "ENcurve{${1:level1,level2,level3,...}}"
+      "snippet": "ENcurve{${1:level1,${2:level2},${3:level3},...}}"
     },
     "ENcurve[]{}": {
-      "snippet": "ENcurve[${2:options}]{${1:level1,level2,level3,...}}",
+      "snippet": "ENcurve[${2:options}]{${1:level1,${3:level2},${4:level3},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
diff --git a/dev/packages/endnotes.json b/dev/packages/endnotes.json
new file mode 100644
index 000000000..7d8358f2e
--- /dev/null
+++ b/dev/packages/endnotes.json
@@ -0,0 +1,36 @@
+{
+  "includes": {},
+  "macros": {
+    "endnote{}": {
+      "snippet": "endnote{${1:text}}"
+    },
+    "endnote[]{}": {
+      "snippet": "endnote[${2:number}]{${1:text}}"
+    },
+    "endnotemark": {},
+    "endnotemark[]": {
+      "snippet": "endnotemark[${1:number}]"
+    },
+    "endnotetext{}": {
+      "snippet": "endnotetext{${1:text}}"
+    },
+    "endnotetext[]{}": {
+      "snippet": "endnotetext[${2:number}]{${1:text}}"
+    },
+    "addtoendnotes{}": {
+      "snippet": "addtoendnotes{${1:text}}"
+    },
+    "enotesize": {},
+    "theendnotes": {},
+    "theendnote": {},
+    "theenmark": {},
+    "makeenmark": {},
+    "enoteformat": {},
+    "enoteheading": {},
+    "notesname": {},
+    "endnotesep": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/enumerate.json b/dev/packages/enumerate.json
new file mode 100644
index 000000000..b485bf624
--- /dev/null
+++ b/dev/packages/enumerate.json
@@ -0,0 +1,12 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {
+    "enumerate[]": {
+      "name": "enumerate",
+      "snippet": "[${1:option}]"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/epic.json b/dev/packages/epic.json
new file mode 100644
index 000000000..95d0bbc3d
--- /dev/null
+++ b/dev/packages/epic.json
@@ -0,0 +1,80 @@
+{
+  "includes": {},
+  "macros": {
+    "multiputlist()(){}": {
+      "snippet": "multiputlist(${2:x},${3:y})(${4:Δx},${5:Δy}){${1:item1,${6:item2},...}}"
+    },
+    "multiputlist()()[]{}": {
+      "snippet": "multiputlist(${3:x},${4:y})(${5:Δx},${6:Δy})[${2:pos}]{${1:item1,${7:item2},...}}"
+    },
+    "to{}": {
+      "snippet": "to{${1:arg}}"
+    },
+    "lopoff": {},
+    "matrixput()(){}(){}{}": {
+      "snippet": "matrixput(${4:x},${5:y})(${6:Δx1},${7:Δy1}){${1:n1}}(${8:Δx2},${9:Δy2}){${2:n2}}{${3:object}}"
+    },
+    "grid()()": {
+      "snippet": "grid(${1:width},${2:height})(${3:Δwidth},${4:Δheight})"
+    },
+    "grid()()[]": {
+      "snippet": "grid(${2:width},${3:height})(${4:Δwidth},${5:Δheight})[${1:x0,y0}]"
+    },
+    "dashlinestretch": {},
+    "drawlinestretch": {},
+    "lineslope": {},
+    "jput(){}": {
+      "snippet": "jput(${2:x},${3:y}){${1:object}}"
+    },
+    "picsquare": {},
+    "putfile{}{}": {
+      "snippet": "putfile{${1:file}}{${2:object}}"
+    },
+    "sqrtandstuff{}{}{}": {
+      "snippet": "sqrtandstuff{${1:Δx}}{${2:Δy}}{${3:dotgap}}"
+    },
+    "dashjoin": {},
+    "dottedjoin": {},
+    "drawjoin": {},
+    "enddashjoin": {},
+    "enddottedjoin": {},
+    "enddrawjoin": {},
+    "splittwoargs": {},
+    "iflistnonempty": {},
+    "listnonemptytrue": {},
+    "listnonemptyfalse": {}
+  },
+  "envs": {
+    "dottedjoin{}": {
+      "name": "dottedjoin",
+      "snippet": "{${1:dotgap}}"
+    },
+    "dottedjoin[]{}": {
+      "name": "dottedjoin",
+      "snippet": "[${2:character}]{${1:dotgap}}"
+    },
+    "dashjoin{}": {
+      "name": "dashjoin",
+      "snippet": "{${1:dashlength}}"
+    },
+    "dashjoin{}[]": {
+      "name": "dashjoin",
+      "snippet": "{${1:dashlength}}[${2:dashgap}]"
+    },
+    "dashjoin[]{}": {
+      "name": "dashjoin",
+      "snippet": "[${2:stretch}]{${1:dashlength}}"
+    },
+    "dashjoin[]{}[]": {
+      "name": "dashjoin",
+      "snippet": "[${2:stretch}]{${1:dashlength}}[${3:dashgap}]"
+    },
+    "drawjoin": {},
+    "drawjoin[]": {
+      "name": "drawjoin",
+      "snippet": "[${1:stretch}]"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/esami.json b/dev/packages/esami.json
index 36881d7c9..984a15afe 100644
--- a/dev/packages/esami.json
+++ b/dev/packages/esami.json
@@ -98,7 +98,7 @@
       "snippet": "newproblem{${1:text}}"
     },
     "esercizi{}": {
-      "snippet": "esercizi{${1:file1,file2,...}}"
+      "snippet": "esercizi{${1:file1,${2:file2},...}}"
     },
     "selectrandomlyn{}{}": {
       "snippet": "selectrandomlyn{${1:exercise number}}{${2:file}}"
diff --git a/dev/packages/esk.json b/dev/packages/esk.json
index c7ee1ac39..59df345a7 100644
--- a/dev/packages/esk.json
+++ b/dev/packages/esk.json
@@ -30,6 +30,12 @@
     "esk[]": {
       "snippet": "esk[${1:name}]"
     },
+    "esk()": {
+      "snippet": "esk(${1:def1},${2:def2},${3:...})"
+    },
+    "esk[]()": {
+      "snippet": "esk[${1:name}](${2:def1},${3:def2},${4:...})"
+    },
     "endesk": {},
     "eskdef{}": {
       "snippet": "eskdef{${1:name}}"
diff --git a/dev/packages/eso-pic.json b/dev/packages/eso-pic.json
new file mode 100644
index 000000000..b2aa30bcf
--- /dev/null
+++ b/dev/packages/eso-pic.json
@@ -0,0 +1,85 @@
+{
+  "includes": {
+    "keyval": [],
+    "xcolor": []
+  },
+  "macros": {
+    "AddToShipoutPictureBG{}": {
+      "snippet": "AddToShipoutPictureBG{${1:code}}"
+    },
+    "AddToShipoutPictureBG*{}": {
+      "snippet": "AddToShipoutPictureBG*{${1:code}}"
+    },
+    "AddToShipoutPicture{}": {
+      "snippet": "AddToShipoutPicture{${1:code}}"
+    },
+    "AddToShipoutPicture*{}": {
+      "snippet": "AddToShipoutPicture*{${1:code}}"
+    },
+    "AddToShipoutPictureFG{}": {
+      "snippet": "AddToShipoutPictureFG{${1:code}}"
+    },
+    "AddToShipoutPictureFG*{}": {
+      "snippet": "AddToShipoutPictureFG*{${1:code}}"
+    },
+    "ClearShipoutPictureBG{}": {
+      "snippet": "ClearShipoutPictureBG{${1:code}}"
+    },
+    "ClearShipoutPicture{}": {
+      "snippet": "ClearShipoutPicture{${1:code}}"
+    },
+    "LenToUnit{}": {
+      "snippet": "LenToUnit{${1:arg}}"
+    },
+    "gridSetup{}{}{}{}{}": {
+      "snippet": "gridSetup{${1:unit}}{${2:label factor}}{${3:delta}}{${4:Delta}}{${5:gap}}"
+    },
+    "gridSetup[]{}{}{}{}{}": {
+      "snippet": "gridSetup[${6:unit name}]{${1:unit}}{${2:label factor}}{${3:delta}}{${4:Delta}}{${5:gap}}"
+    },
+    "AtPageUpperLeft{}": {
+      "snippet": "AtPageUpperLeft{${1:code}}"
+    },
+    "AtPageLowerLeft{}": {
+      "snippet": "AtPageLowerLeft{${1:code}}"
+    },
+    "AtPageCenter{}": {
+      "snippet": "AtPageCenter{${1:code}}"
+    },
+    "AtTextUpperLeft{}": {
+      "snippet": "AtTextUpperLeft{${1:code}}"
+    },
+    "AtTextLowerLeft{}": {
+      "snippet": "AtTextLowerLeft{${1:code}}"
+    },
+    "AtTextCenter{}": {
+      "snippet": "AtTextCenter{${1:code}}"
+    },
+    "AtStockUpperLeft{}": {
+      "snippet": "AtStockUpperLeft{${1:code}}"
+    },
+    "AtStockLowerLeft{}": {
+      "snippet": "AtStockLowerLeft{${1:code}}"
+    },
+    "AtStockCenter{}": {
+      "snippet": "AtStockCenter{${1:code}}"
+    },
+    "ProcessOptionsWithKV{}": {
+      "snippet": "ProcessOptionsWithKV{${1:family}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "pscoord",
+    "texcoord",
+    "grid",
+    "gridBG",
+    "gridunit=",
+    "gridcolor=",
+    "subgridcolor=",
+    "subgridstyle=",
+    "colorgrid",
+    "dvips"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/etaremune.json b/dev/packages/etaremune.json
index 1194e1f3f..2b42c8cb6 100644
--- a/dev/packages/etaremune.json
+++ b/dev/packages/etaremune.json
@@ -24,7 +24,8 @@
       "listparindent=",
       "itemindent=",
       "labelwidth=",
-      "labelsep="
+      "labelsep=",
+      "start=${1:integer}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/etoc.json b/dev/packages/etoc.json
new file mode 100644
index 000000000..02ee1ae08
--- /dev/null
+++ b/dev/packages/etoc.json
@@ -0,0 +1,366 @@
+{
+  "includes": {
+    "kvoptions": [],
+    "multicol": []
+  },
+  "macros": {
+    "locallistoffigures": {
+      "option": "lof"
+    },
+    "etoclocallistoffigureshook": {
+      "option": "lof"
+    },
+    "locallistoftables": {
+      "option": "lot"
+    },
+    "etoclocallistoftableshook": {
+      "option": "lot"
+    },
+    "etocsetup{}": {
+      "snippet": "etocsetup{${1:keyvals}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "tableofcontents*": {},
+    "localtableofcontents": {},
+    "localtableofcontents*": {},
+    "etocclasstocstyle": {},
+    "etocetoclocaltocstyle": {},
+    "etocusertocstyle": {},
+    "etocstandardlines": {},
+    "etoctoclines": {},
+    "etocdefaultlines": {},
+    "etocstoretocstyleinto{}": {
+      "snippet": "etocstoretocstyleinto{${1:cmd}}"
+    },
+    "etocstorelinestylesinto{}": {
+      "snippet": "etocstorelinestylesinto{${1:cmd}}"
+    },
+    "etocstorethislinestyleinto{}{}": {
+      "snippet": "etocstorethislinestyleinto{${1:name or number}}{${2:cmd}}"
+    },
+    "etocifislocal{}{}": {
+      "snippet": "etocifislocal{${1:true}}{${2:false}}"
+    },
+    "etocifislocaltoc{}{}": {
+      "snippet": "etocifislocaltoc{${1:true}}{${2:false}}"
+    },
+    "etocifislocallof{}{}": {
+      "snippet": "etocifislocallof{${1:true}}{${2:false}}"
+    },
+    "etocifislocallot{}{}": {
+      "snippet": "etocifislocallot{${1:true}}{${2:false}}"
+    },
+    "etocifmaintoctotoc{}{}": {
+      "snippet": "etocifmaintoctotoc{${1:true}}{${2:false}}"
+    },
+    "etociflocaltoctotoc{}{}": {
+      "snippet": "etociflocaltoctotoc{${1:true}}{${2:false}}"
+    },
+    "etociflocalloftotoc{}{}": {
+      "snippet": "etociflocalloftotoc{${1:true}}{${2:false}}"
+    },
+    "etociflocallottotoc{}{}": {
+      "snippet": "etociflocallottotoc{${1:true}}{${2:false}}"
+    },
+    "etocifisstarred{}{}": {
+      "snippet": "etocifisstarred{${1:true}}{${2:false}}"
+    },
+    "etoclocalheadtotoc{}{}": {
+      "snippet": "etoclocalheadtotoc{${1:level name}}{${2:text}}"
+    },
+    "etocglobalheadtotoc{}{}": {
+      "snippet": "etocglobalheadtotoc{${1:level name}}{${2:text}}"
+    },
+    "etoclevel{}": {
+      "snippet": "etoclevel{${1:level name}}"
+    },
+    "etocthelevel{}": {
+      "snippet": "etocthelevel{${1:level name}}"
+    },
+    "etocthemaxlevel": {},
+    "etocifunknownlevelTF{}{}{}": {
+      "snippet": "etocifunknownlevelTF{${1:level name}}{${2:true}}{${3:false}}"
+    },
+    "etocdivisionnameatlevel{}": {
+      "snippet": "etocdivisionnameatlevel{${1:number}}"
+    },
+    "etocetoclocaltocmaketitle": {},
+    "etocetoclistoffiguresmaketitle": {},
+    "etocetoclistoftablesmaketitle": {},
+    "localcontentsname": {},
+    "locallistfigurename": {},
+    "locallisttablename": {},
+    "etocclasslocaltocmaketitle": {},
+    "etocclasslocallofmaketitle": {},
+    "etocclasslocallotmaketitle": {},
+    "etocclassmaintocaddtotoc": {},
+    "etocclasslocaltocaddtotoc": {},
+    "etocclasslocallofaddtotoc": {},
+    "etocclasslocallotaddtotoc": {},
+    "etocsettocstyle{}{}": {
+      "snippet": "etocsettocstyle{${1:before toc}}{${2:after toc}}"
+    },
+    "etocarticlestyle": {},
+    "etocarticlestylenomarks": {},
+    "etocreportstyle": {},
+    "etocreportstylenomarks": {},
+    "etocbookstyle": {},
+    "etocbookstylenomarks": {},
+    "etocmemoirstyle": {},
+    "etocscrartclstyle": {},
+    "etocscrreprtstyle": {},
+    "etocscrbookstyle": {},
+    "etoctocloftstyle": {},
+    "etocinline": {},
+    "etocnopar": {},
+    "etocdisplay": {},
+    "etocmulticolstyle{}": {
+      "snippet": "etocmulticolstyle{${1:heading}}"
+    },
+    "etocmulticolstyle[]{}": {
+      "snippet": "etocmulticolstyle[${2:num of cols}]{${1:heading}}"
+    },
+    "etocmulticol{}": {
+      "snippet": "etocmulticol{${1:heading}}"
+    },
+    "etocmulticol[]{}": {
+      "snippet": "etocmulticol[${2:num of cols}]{${1:heading}}"
+    },
+    "etocmulticol*{}": {
+      "snippet": "etocmulticol*{${1:heading}}"
+    },
+    "etocmulticol*[]{}": {
+      "snippet": "etocmulticol*[${2:num of cols}]{${1:heading}}"
+    },
+    "etoclocalmulticol{}": {
+      "snippet": "etoclocalmulticol{${1:heading}}"
+    },
+    "etoclocalmulticol[]{}": {
+      "snippet": "etoclocalmulticol[${2:num of cols}]{${1:heading}}"
+    },
+    "etoctocstyle{}{}": {
+      "snippet": "etoctocstyle{${1:num of cols}}{${2:title}}"
+    },
+    "etoctocstyle[]{}{}": {
+      "snippet": "etoctocstyle[${3:kind}]{${1:num of cols}}{${2:title}}"
+    },
+    "etoctocstylewithmarks{}{}{}": {
+      "snippet": "etoctocstylewithmarks{${1:num of cols}}{${2:title}}{${3:mark}}"
+    },
+    "etoctocstylewithmarks[]{}{}{}": {
+      "snippet": "etoctocstylewithmarks[${4:kind}]{${1:num of cols}}{${2:title}}{${3:mark}}"
+    },
+    "etoctocstylewithmarksnouc{}{}{}": {
+      "snippet": "etoctocstylewithmarksnouc{${1:num of cols}}{${2:title}}{${3:mark}}"
+    },
+    "etoctocstylewithmarksnouc[]{}{}{}": {
+      "snippet": "etoctocstylewithmarksnouc[${4:kind}]{${1:num of cols}}{${2:title}}{${3:mark}}"
+    },
+    "etocruledstyle{}": {
+      "snippet": "etocruledstyle{${1:title}}"
+    },
+    "etocruledstyle[]{}": {
+      "snippet": "etocruledstyle[${2:num of cols}]{${1:title}}"
+    },
+    "etocruled{}": {
+      "snippet": "etocruled{${1:title}}"
+    },
+    "etocruled[]{}": {
+      "snippet": "etocruled[${2:num of cols}]{${1:title}}"
+    },
+    "etoclocalruled{}": {
+      "snippet": "etoclocalruled{${1:title}}"
+    },
+    "etoclocalruled[]{}": {
+      "snippet": "etoclocalruled[${2:num of cols}]{${1:title}}"
+    },
+    "etocframedstyle{}": {
+      "snippet": "etocframedstyle{${1:title}}"
+    },
+    "etocframedstyle[]{}": {
+      "snippet": "etocframedstyle[${2:num of cols}]{${1:title}}"
+    },
+    "etocframed{}": {
+      "snippet": "etocframed{${1:title}}"
+    },
+    "etocframed[]{}": {
+      "snippet": "etocframed[${2:num of cols}]{${1:title}}"
+    },
+    "etoclocalframed{}": {
+      "snippet": "etoclocalframed{${1:title}}"
+    },
+    "etoclocalframed[]{}": {
+      "snippet": "etoclocalframed[${2:num of cols}]{${1:title}}"
+    },
+    "etocabovetocskip": {},
+    "etocbelowtocskip": {},
+    "etoccolumnsep": {},
+    "etocmulticolsep": {},
+    "etocmulticolpretolerance": {},
+    "etocmulticoltolerance": {},
+    "etocdefaultnbcol": {},
+    "etocinnertopsep": {},
+    "etoctoprule": {},
+    "etoctoprulecolorcmd": {},
+    "etocinnerleftsep": {},
+    "etocinnerrightsep": {},
+    "etocinnerbottomsep": {},
+    "etocleftrule": {},
+    "etocrightrule": {},
+    "etocbottomrule": {},
+    "etocleftrulecolorcmd": {},
+    "etocrightrulecolorcmd": {},
+    "etocbottomrulecolorcmd": {},
+    "etocbkgcolorcmd": {},
+    "etocframedmphook": {},
+    "etocoldpar": {},
+    "etocaftertitlehook": {},
+    "etocaftercontentshook": {},
+    "etocbeforetitlehook": {},
+    "etocaftertochook": {},
+    "etocsetstyle{}{}{}{}{}": {
+      "snippet": "etocsetstyle{${1:level name}}{${2:start}}{${3:prefix}}{${4:contents}}{${5:finish}}"
+    },
+    "etocname": {},
+    "etocnumber": {},
+    "etocpage": {},
+    "etocskipfirstprefix": {},
+    "etociffirst{}{}": {
+      "snippet": "etociffirst{${1:true}}{${2:false}}"
+    },
+    "etocxiffirst{}{}": {
+      "snippet": "etocxiffirst{${1:true}}{${2:false}}"
+    },
+    "etocifnumbered{}{}": {
+      "snippet": "etocifnumbered{${1:true}}{${2:false}}"
+    },
+    "etocxifnumbered{}{}": {
+      "snippet": "etocxifnumbered{${1:true}}{${2:false}}"
+    },
+    "etocthename": {},
+    "etocthenumber": {},
+    "etocthepage": {},
+    "etoclink{}": {
+      "snippet": "etoclink{${1:text}}"
+    },
+    "etocthelinkedname": {},
+    "etocthelinkednumber": {},
+    "etocthelinkedpage": {},
+    "etocthelink": {},
+    "etocsetlevel{}{}": {
+      "snippet": "etocsetlevel{${1:level name}}{${2:number}}"
+    },
+    "etocglobaldefs": {},
+    "etoclocaldefs": {},
+    "etocfontminustwo": {},
+    "etocfontminusone": {},
+    "etocfontzero": {},
+    "etocfontone": {},
+    "etocfonttwo": {},
+    "etocfontthree": {},
+    "etocsepminustwo": {},
+    "etocsepminusone": {},
+    "etocsepzero": {},
+    "etocsepone": {},
+    "etocseptwo": {},
+    "etocsepthree": {},
+    "etocminustwoleftmargin": {},
+    "etocminustworightmargin": {},
+    "etocminusoneleftmargin": {},
+    "etocminusonerightmargin": {},
+    "etocbaselinespreadminustwo": {},
+    "etocbaselinespreadminusone": {},
+    "etocbaselinespreadzero": {},
+    "etocbaselinespreadone": {},
+    "etocbaselinespreadtwo": {},
+    "etocbaselinespreadthree": {},
+    "etoctoclineleaders": {},
+    "etocabbrevpagename": {},
+    "etocpartname": {},
+    "etocbookname": {},
+    "etoctableofcontents": {},
+    "etockeeporiginaltableofcontents": {},
+    "localtableofcontentswithrelativedepth{}": {
+      "snippet": "localtableofcontentswithrelativedepth{${1:number}}"
+    },
+    "invisibletableofcontents": {},
+    "invisiblelocaltableofcontents": {},
+    "etocsettocdepth{}": {
+      "snippet": "etocsettocdepth{${1:level}}"
+    },
+    "etocsetnexttocdepth{}": {
+      "snippet": "etocsetnexttocdepth{${1:level}}"
+    },
+    "etocobeytoctocdepth": {},
+    "etocignoretoctocdepth": {},
+    "etocsettagdepth{}{}": {
+      "snippet": "etocsettagdepth{${1:tag name}}{${2:level}}"
+    },
+    "etocobeydepthtags": {},
+    "etocignoredepthtags": {},
+    "etoclocaltop": {},
+    "etocchecksemptiness": {},
+    "etocdoesnotcheckemptiness": {},
+    "etocnotocifnotoc": {},
+    "etocifwasempty{}{}": {
+      "snippet": "etocifwasempty{${1:true}}{${2:false}}"
+    },
+    "etocxifwasempty{}{}": {
+      "snippet": "etocxifwasempty{${1:true}}{${2:false}}"
+    },
+    "etoctoccontentsline{}{}": {
+      "snippet": "etoctoccontentsline{${1:level name}}{${2:name}}"
+    },
+    "etoctoccontentsline*{}{}{}": {
+      "snippet": "etoctoccontentsline*{${1:level name}}{${2:name}}{${3:bookmark level}}"
+    },
+    "etocimmediatetoccontentsline{}{}": {
+      "snippet": "etocimmediatetoccontentsline{${1:level name}}{${2:name}}"
+    },
+    "etocimmediatetoccontentsline*{}{}{}": {
+      "snippet": "etocimmediatetoccontentsline*{${1:level name}}{${2:name}}{${3:bookmark level}}"
+    },
+    "etocnoprotrusion": {},
+    "etocclasslocalperhapsaddtotoc{}": {
+      "snippet": "etocclasslocalperhapsaddtotoc{${1:arg}}"
+    },
+    "etoclocaltableofcontentshook": {},
+    "etocmarkbothnouc{}": {
+      "snippet": "etocmarkbothnouc{${1:text}}"
+    },
+    "etocmarkboth{}": {
+      "snippet": "etocmarkboth{${1:text}}"
+    },
+    "etocoriginaltableofcontents": {},
+    "etocsettoclineforclasstoc{}{}": {
+      "snippet": "etocsettoclineforclasstoc{${1:arg1}}{${2:arg2}}"
+    },
+    "etocsettoclineforclasslistof{}{}{}": {
+      "snippet": "etocsettoclineforclasslistof{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "etoctocloftlocalperhapsaddtotoc{}": {
+      "snippet": "etoctocloftlocalperhapsaddtotoc{${1:arg}}"
+    },
+    "etoctocbibindstyle": {},
+    "etocstandarddisplaystyle": {},
+    "etocmemoirtoctotocfmt{}{}": {
+      "snippet": "etocmemoirtoctotocfmt{${1:kind}}{${2:name}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "lof",
+    "lot",
+    "deeplevels"
+  ],
+  "keyvals": [
+    [
+      "maintoctotoc",
+      "localtoctotoc",
+      "localloftotoc",
+      "locallottotoc",
+      "ouroboros"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/euclideangeometry.json b/dev/packages/euclideangeometry.json
index f2f31b79b..5a9843205 100644
--- a/dev/packages/euclideangeometry.json
+++ b/dev/packages/euclideangeometry.json
@@ -17,14 +17,50 @@
     "Cuno": {},
     "Den": {},
     "Dird": {},
+    "EllipseWithFocus()()()()": {
+      "snippet": "EllipseWithFocus(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
+    },
+    "EllipseWithFocus*()()()()": {
+      "snippet": "EllipseWithFocus*(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
+    },
     "ellisse*{}{}": {
       "snippet": "ellisse*{${1:semiaxis-h}}{${2:semiaxis-v}}"
     },
     "ellisse{}{}": {
       "snippet": "ellisse{${1:semiaxis-h}}{${2:semiaxis-v}}"
     },
+    "EllisseConFuoco()()()()": {
+      "snippet": "EllisseConFuoco(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
+    },
+    "EllisseConFuoco*()()()()": {
+      "snippet": "EllisseConFuoco*(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
+    },
+    "EllisseSteiner()()()": {
+      "snippet": "EllisseSteiner(${1:vertex1})(${2:vertex2})(${3:vertex3})"
+    },
+    "EllisseSteiner()()()[]": {
+      "snippet": "EllisseSteiner(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
+    },
+    "EllisseSteiner*()()()": {
+      "snippet": "EllisseSteiner*(${1:vertex1})(${2:vertex2})(${3:vertex3})"
+    },
+    "EllisseSteiner*()()()[]": {
+      "snippet": "EllisseSteiner*(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
+    },
+    "EUGpolyvector()": {
+      "snippet": "EUGpolyvector(${1:arg})"
+    },
     "EUGpreviouspoint": {},
+    "EUGsplitArgs(){}{}": {
+      "snippet": "EUGsplitArgs(${3:x},${4:y}){${1:xmacro}}{${2:ymacro}}"
+    },
     "Int": {},
+    "IntersectionOfLines()() and ()() to ()": {
+      "snippet": "IntersectionOfLines(${1:point1})(${2:dir1}) and (${3:point2})(${4:dir2}) to (${5:vector})"
+    },
+    "IntersectionOfSegments()() and ()() to ()": {
+      "snippet": "IntersectionOfSegments(${1:point1})(${2:dir1}) and (${3:point2})(${4:dir2}) to (${5:vector})"
+    },
     "IntPd": {},
     "IntPu": {},
     "K": {
@@ -42,6 +78,24 @@
       "documentation": "MATHEMATICAL ITALIC CAPITAL R"
     },
     "Rdue": {},
+    "RegPolygon(){}{}": {
+      "snippet": "RegPolygon(${3:center}){${1:radius}}{${2:sides}}"
+    },
+    "RegPolygon(){}{}[]": {
+      "snippet": "RegPolygon(${4:center}){${1:radius}}{${2:sides}}[${3:angle}]"
+    },
+    "RegPolygon(){}{}[]<>": {
+      "snippet": "RegPolygon(${5:center}){${1:radius}}{${2:sides}}[${3:angle}]<${4:settings}>"
+    },
+    "RegPolygon*(){}{}": {
+      "snippet": "RegPolygon*(${3:center}){${1:radius}}{${2:sides}}"
+    },
+    "RegPolygon*(){}{}[]": {
+      "snippet": "RegPolygon*(${4:center}){${1:radius}}{${2:sides}}[${3:angle}]"
+    },
+    "RegPolygon*(){}{}[]<>": {
+      "snippet": "RegPolygon*(${5:center}){${1:radius}}{${2:sides}}[${3:angle}]<${4:settings}>"
+    },
     "Runo": {},
     "Sangdue": {},
     "Sellisse*{}{}": {
@@ -62,10 +116,55 @@
     "setfontsize{}": {
       "snippet": "setfontsize{${1:size}}"
     },
+    "SteinerEllipse()()()": {
+      "snippet": "SteinerEllipse(${1:vertex1})(${2:vertex2})(${3:vertex3})"
+    },
+    "SteinerEllipse()()()[]": {
+      "snippet": "SteinerEllipse(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
+    },
+    "SteinerEllipse*()()()": {
+      "snippet": "SteinerEllipse*(${1:vertex1})(${2:vertex2})(${3:vertex3})"
+    },
+    "SteinerEllipse*()()()[]": {
+      "snippet": "SteinerEllipse*(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
+    },
     "TCIdiffR": {},
+    "ThreePointCircle()()()": {
+      "snippet": "ThreePointCircle(${1:point1})(${2:point2})(${3:point3})"
+    },
+    "ThreePointCircle*()()()": {
+      "snippet": "ThreePointCircle*(${1:point1})(${2:point2})(${3:point3})"
+    },
+    "TriangleCircummcircle()()()": {
+      "snippet": "TriangleCircummcircle(${1:point1})(${2:point2})(${3:point3})"
+    },
     "Ud": {},
     "Uu": {},
     "VScale": {},
+    "Xellisse()[]<>{}{}[][]": {
+      "snippet": "Xellisse(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
+    },
+    "Xellisse(){}{}": {
+      "snippet": "Xellisse(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
+    },
+    "Xellisse*()[]<>{}{}[][]": {
+      "snippet": "Xellisse*(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
+    },
+    "Xellisse*(){}{}": {
+      "snippet": "Xellisse*(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
+    },
+    "XSellisse()[]<>{}{}[][]": {
+      "snippet": "XSellisse(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
+    },
+    "XSellisse(){}{}": {
+      "snippet": "XSellisse(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
+    },
+    "XSellisse*()[]<>{}{}[][]": {
+      "snippet": "XSellisse*(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
+    },
+    "XSellisse*(){}{}": {
+      "snippet": "XSellisse*(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
+    },
     "Ys": {},
     "ZTesto": {}
   },
diff --git a/dev/packages/euler.json b/dev/packages/euler.json
new file mode 100644
index 000000000..0fe8b6fbd
--- /dev/null
+++ b/dev/packages/euler.json
@@ -0,0 +1,32 @@
+{
+  "includes": {},
+  "macros": {
+    "mathfrak{}": {
+      "snippet": "mathfrak{${1:text}}"
+    },
+    "MathOldstyle{}": {
+      "snippet": "MathOldstyle{${1:text}}"
+    },
+    "TextOldstyle{}": {
+      "snippet": "TextOldstyle{${1:text}}"
+    },
+    "frak{}": {
+      "snippet": "frak{${1:text}}"
+    },
+    "scr{}": {
+      "snippet": "scr{${1:text}}"
+    },
+    "ifCorkEncoding": {},
+    "CorkEncodingtrue": {},
+    "CorkEncodingfalse": {},
+    "fileversion": {},
+    "filedate": {}
+  },
+  "envs": {},
+  "options": [
+    "mathbf",
+    "mathcal",
+    "text-hat-accent"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/example.json b/dev/packages/example.json
new file mode 100644
index 000000000..16d0d6102
--- /dev/null
+++ b/dev/packages/example.json
@@ -0,0 +1,13 @@
+{
+  "includes": {},
+  "macros": {
+    "ExampleWidth": {},
+    "ExampleSet": {},
+    "ExampleVerb": {}
+  },
+  "envs": {
+    "example": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/exercise.json b/dev/packages/exercise.json
new file mode 100644
index 000000000..e0d688677
--- /dev/null
+++ b/dev/packages/exercise.json
@@ -0,0 +1,280 @@
+{
+  "includes": {
+    "keyval": [],
+    "ifthen": []
+  },
+  "macros": {
+    "shipoutAnswer": {},
+    "shipoutExercise": {},
+    "Exercise": {},
+    "Exercise[]": {
+      "snippet": "Exercise[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Exercise*": {},
+    "Exercise*[]": {
+      "snippet": "Exercise*[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Answer": {},
+    "Answer[]": {
+      "snippet": "Answer[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "ExePart": {},
+    "ExePart[]": {
+      "snippet": "ExePart[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "ExePart*": {},
+    "ExePart*[]": {
+      "snippet": "ExePart*[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Question": {
+      "detail": "⁇",
+      "documentation": "DOUBLE QUESTION MARK"
+    },
+    "Question[]": {
+      "snippet": "Question[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "subQuestion": {},
+    "subQuestion[]": {
+      "snippet": "subQuestion[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "subsubQuestion": {},
+    "subsubQuestion[]": {
+      "snippet": "subsubQuestion[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "ExeText": {},
+    "ExerciseSelect": {},
+    "ExerciseSelect[]": {
+      "snippet": "ExerciseSelect[${1:options}]"
+    },
+    "ExerciseSelect*": {},
+    "ExerciseSelect*[]": {
+      "snippet": "ExerciseSelect*[${1:options}]"
+    },
+    "ExerciseStopSelect": {},
+    "refAnswer{}": {
+      "snippet": "refAnswer{${1:label}}"
+    },
+    "ExerciseLabel": {},
+    "marker{}{}": {
+      "snippet": "marker{${1:symbol}}{${2:number}}"
+    },
+    "DifficultyMarker": {},
+    "listofexercises": {},
+    "ListOfExerciseInToc": {},
+    "ExerciseLevelInToc{}": {
+      "snippet": "ExerciseLevelInToc{${1:level}}"
+    },
+    "ExerciseTitle": {},
+    "ExerciseName": {},
+    "ExerciseListName": {},
+    "AnswerName": {},
+    "AnswerListName": {},
+    "ExePartName": {},
+    "ExerciseHeaderTitle": {},
+    "ExerciseHeaderDifficulty": {},
+    "ExerciseHeaderOrigin": {},
+    "ExerciseHeaderNB": {},
+    "ExerciseHeader": {},
+    "ExerciseListHeader": {},
+    "AnswerHeader": {},
+    "AnswerListHeader": {},
+    "ExePartHeaderTitle": {},
+    "ExePartHeaderDifficulty": {},
+    "ExePartHeaderNB": {},
+    "ExePartHeader": {},
+    "ExePartListHeader": {},
+    "ExePartTitle": {},
+    "ExePartDifficulty": {},
+    "theExePart": {},
+    "AtBeginExercise": {},
+    "AtBeginAnswer": {},
+    "QuestionHeaderTitle": {},
+    "QuestionHeaderDifficulty": {},
+    "QuestionHeaderNB": {},
+    "subQuestionHeaderTitle": {},
+    "subQuestionHeaderDifficulty": {},
+    "subQuestionHeaderNB": {},
+    "subsubQuestionHeaderTitle": {},
+    "subsubQuestionHeaderDifficulty": {},
+    "subsubQuestionHeaderNB": {},
+    "ExerciseSkipBefore": {},
+    "ExerciseSkipAfter": {},
+    "AnswerSkipBefore": {},
+    "AnswerSkipAfter": {},
+    "Exesep": {},
+    "Exetopsep": {},
+    "Exeparsep": {},
+    "Exepartopsep": {},
+    "Exeleftmargin": {},
+    "Exerightmargin": {},
+    "Exelabelwidth": {},
+    "Exelabelsep": {},
+    "QuestionBefore": {},
+    "QuestionIndent": {},
+    "subQuestionBefore": {},
+    "subQuestionIndent": {},
+    "subsubQuestionBefore": {},
+    "subsubQuestionIndent": {},
+    "renewcounter{}": {
+      "snippet": "renewcounter{${1:name}}"
+    },
+    "renewcounter{}[]": {
+      "snippet": "renewcounter{${1:name}}[${2:counter}]"
+    },
+    "EndCurrentQuestion": {},
+    "EndCurrentsubQuestion": {},
+    "EndCurrentsubsubQuestion": {},
+    "AnswerCmd": {},
+    "AnswerHeaderRef": {},
+    "AnswerListHeaderRef": {},
+    "AnswerNB": {},
+    "AnswerRef": {},
+    "ArticleOf": {},
+    "beginAnswerEnv": {},
+    "beginExerciseEnv": {},
+    "beginExerciseListEnv": {},
+    "colonnesLevel": {},
+    "defineAnswerCmd": {},
+    "defineAnswerEnv": {},
+    "defineExePartInEnv": {},
+    "defineExePartInList": {},
+    "defineExerciseCmd": {},
+    "defineExerciseEnv": {},
+    "deuxcolonnes": {},
+    "endAnswerEnv": {},
+    "endExerciseEnv": {},
+    "endExerciseListEnv": {},
+    "ExerciseBefore": {},
+    "ExerciseClass": {},
+    "ExerciseCmd": {},
+    "ExerciseDifficulty": {},
+    "ExerciseExam": {},
+    "ExerciseHeaderExam": {},
+    "ExerciseHeaderLabel": {},
+    "ExerciseHeaderType": {},
+    "ExerciseHeaderYear": {},
+    "ExerciseLocalNB": {},
+    "ExerciseOrigin": {},
+    "ExerciseSelectClass": {},
+    "ExerciseSelectDifficulty": {},
+    "ExerciseSelectExam": {},
+    "ExerciseSelectLabel": {},
+    "ExerciseSelectOrigin": {},
+    "ExerciseSelectType": {},
+    "ExerciseSelectYear": {},
+    "ExerciseTrueLabel": {},
+    "ExerciseType": {},
+    "ExerciseYear": {},
+    "listexercisename": {},
+    "QuestionDifficulty": {},
+    "QuestionNB": {},
+    "QuestionTitle": {},
+    "recordExerciseLabel{}": {
+      "snippet": "recordExerciseLabel{${1:label}}"
+    },
+    "refstepExecounter": {},
+    "subQuestionDifficulty": {},
+    "subQuestionHeader": {},
+    "subQuestionNB": {},
+    "subQuestionTitle": {},
+    "subsubQuestionDifficulty": {},
+    "subsubQuestionHeader": {},
+    "subsubQuestionNB": {},
+    "subsubQuestionTitle": {},
+    "tempskipa": {},
+    "tempskipb": {},
+    "termineliste{}": {
+      "snippet": "termineliste{${1:number}}"
+    },
+    "theAnswer": {},
+    "theExePartDifficulty": {},
+    "theExercise": {},
+    "theExerciseDifficulty": {},
+    "theQuestion": {},
+    "theQuestionDifficulty": {},
+    "thesavedQuestion": {},
+    "thesavedsubQuestion": {},
+    "thesavedsubsubQuestion": {},
+    "thesubQuestion": {},
+    "thesubQuestionDifficulty": {},
+    "thesubsubQuestion": {},
+    "thesubsubQuestionDifficulty": {}
+  },
+  "envs": {
+    "Exercise": {},
+    "Exercise[]": {
+      "name": "Exercise",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Exercise*": {},
+    "Exercise*[]": {
+      "name": "Exercise*",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Answer": {},
+    "Answer[]": {
+      "name": "Answer",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "ExerciseList": {}
+  },
+  "options": [
+    "noanswer",
+    "answeronly",
+    "noexercise",
+    "exerciseonly",
+    "outputnothing",
+    "exercisedelayed",
+    "answerdelayed",
+    "lastexercise",
+    "showlabel"
+  ],
+  "keyvals": [
+    [
+      "label=",
+      "title={${1:text}}",
+      "difficulty=${1:number}",
+      "origin={${1:text}}",
+      "name={${1:text}}",
+      "counter=${1:counter}",
+      "number={${1:string}}",
+      "exam={${1:text}}",
+      "year=${1:year}"
+    ],
+    [
+      "ref=${1:label}",
+      "number={${1:string}}"
+    ],
+    [
+      "title={${1:text}}",
+      "difficulty=${1:number}",
+      "name={${1:text}}"
+    ],
+    [
+      "title={${1:text}}",
+      "difficulty=${1:number}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/exerquiz.json b/dev/packages/exerquiz.json
index 33c624a73..f3b3d25e8 100644
--- a/dev/packages/exerquiz.json
+++ b/dev/packages/exerquiz.json
@@ -89,6 +89,10 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
+    "ccatCurrQzWith()": {
+      "snippet": "ccatCurrQzWith(${1:arg})",
+      "option": "usesumrytbls"
+    },
     "pbPopulateSumTable": {
       "option": "usesumrytbls"
     },
@@ -238,6 +242,9 @@
     "answersEndHook{}": {
       "snippet": "answersEndHook{${1:content}}"
     },
+    "Array()": {
+      "snippet": "Array(${1:JS funcs})"
+    },
     "autoAnsFldRaiseBox{}": {
       "snippet": "autoAnsFldRaiseBox{${1:length}}"
     },
@@ -262,7 +269,7 @@
       "snippet": "CorrAnsButton{${1:display answer}}*{${2:JS function}}"
     },
     "CorrAnsButtonGrp{}": {
-      "snippet": "CorrAnsButtonGrp{${1:n1,n2,...}}"
+      "snippet": "CorrAnsButtonGrp{${1:n1,${2:n2},...}}"
     },
     "CorrButton[]{}": {
       "snippet": "CorrButton[${2:eforms params}]{${1:field}}"
@@ -612,6 +619,15 @@
     "noPeekArgs{}": {
       "snippet": "noPeekArgs{${1:arg}}"
     },
+    "postDenyForm()": {
+      "snippet": "postDenyForm(${1:regexp})"
+    },
+    "preDenyForm()": {
+      "snippet": "preDenyForm(${1:regexp},${2:cMsg})"
+    },
+    "preReqForm()": {
+      "snippet": "preReqForm(${1:regexp},${2:cMsg})"
+    },
     "reany": {},
     "rebstr": {},
     "rechrclass{}": {
diff --git a/dev/packages/exesheet.json b/dev/packages/exesheet.json
new file mode 100644
index 000000000..3e147e22a
--- /dev/null
+++ b/dev/packages/exesheet.json
@@ -0,0 +1,370 @@
+{
+  "includes": {
+    "kvoptions": [],
+    "ifthen": [],
+    "geometry": [],
+    "xcolor": [],
+    "enumitem": [],
+    "tasks": [],
+    "versions": [],
+    "fancybox": [],
+    "translations": [],
+    "ragged2e": []
+  },
+  "macros": {
+    "exesheetset{}": {
+      "snippet": "exesheetset{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "exercise": {},
+    "exercise[]": {
+      "snippet": "exercise[${1:text}]"
+    },
+    "exercisename": {},
+    "labelexercise": {},
+    "theexercise": {},
+    "labelexercisestyle": {},
+    "exercise*{}": {
+      "snippet": "exercise*{${1:label}}"
+    },
+    "exercise*[]{}": {
+      "snippet": "exercise*[${2:text}]{${1:label}}"
+    },
+    "subpart": {},
+    "subpart[]": {
+      "snippet": "subpart[${1:text}]"
+    },
+    "thesubpart": {},
+    "subpartname": {},
+    "labelsubpart": {},
+    "labelsubpartstyle": {},
+    "subpart*{}": {
+      "snippet": "subpart*{${1:label}}"
+    },
+    "subpart*[]{}": {
+      "snippet": "subpart*[${2:text}]{${1:label}}"
+    },
+    "annex": {},
+    "annex[]": {
+      "snippet": "annex[${1:text}]"
+    },
+    "annexname": {},
+    "annexstyle": {},
+    "exe": {},
+    "exname": {},
+    "exlabel": {},
+    "exsepmark": {},
+    "exe*": {},
+    "labelenumone": {},
+    "labelenuma": {},
+    "enumfont": {},
+    "correctionstyle": {},
+    "correctionname": {},
+    "question{}": {
+      "snippet": "question{${1:question}}"
+    },
+    "question*{}": {
+      "snippet": "question*{${1:question}}"
+    },
+    "answer{}": {
+      "snippet": "answer{${1:answer}}"
+    },
+    "answer*{}": {
+      "snippet": "answer*{${1:answer}}"
+    },
+    "answerspace{}": {
+      "snippet": "answerspace{${1:height}}"
+    },
+    "points{}": {
+      "snippet": "points{${1:number}}"
+    },
+    "pointsname": {},
+    "pointname": {},
+    "pointsstyle": {},
+    "pts{}": {
+      "snippet": "pts{${1:number}}"
+    },
+    "ptsname": {},
+    "ptname": {},
+    "ptsstyle": {},
+    "totalexe{}": {
+      "snippet": "totalexe{${1:number}}"
+    },
+    "note{}": {
+      "snippet": "note{${1:comment}}"
+    },
+    "note[]{}": {
+      "snippet": "note[${2:points}]{${1:comment}}"
+    },
+    "note*{}": {
+      "snippet": "note*{${1:points}}"
+    },
+    "markingstyle": {},
+    "ptsboxlength": {},
+    "notestyle": {},
+    "totalpoints{}": {
+      "snippet": "totalpoints{${1:number}}"
+    },
+    "totalsheet{}": {
+      "snippet": "totalsheet{${1:number}}"
+    },
+    "largemarginwidthfactor": {},
+    "leftnotemarginwidth{}": {
+      "snippet": "leftnotemarginwidth{${1:length}}"
+    },
+    "noteragged": {},
+    "noteraggedleft": {},
+    "noteraggedright": {},
+    "ptsmark": {},
+    "refenuma": {},
+    "rightnotemarginwidth{}": {
+      "snippet": "rightnotemarginwidth{${1:length}}"
+    },
+    "standardmarginwidthfactor": {},
+    "questionsonly": {},
+    "answersonly": {},
+    "displaypts": {},
+    "displaypoints": {},
+    "displaynotes": {},
+    "displaynotes[]": {
+      "snippet": "displaynotes[${1:align cmd}]"
+    },
+    "displaynotesright": {},
+    "displaynotesright[]": {
+      "snippet": "displaynotesright[${1:align cmd}]"
+    }
+  },
+  "envs": {
+    "exenumerate": {},
+    "exenumerate[]": {
+      "name": "exenumerate",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "colsenum{}": {
+      "name": "colsenum",
+      "snippet": "{${1:cols}}"
+    },
+    "colsenum[]{}": {
+      "name": "colsenum",
+      "snippet": "[${2:options}]{${1:cols}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "colsenum*{}": {
+      "name": "colsenum*",
+      "snippet": "{${1:cols}}"
+    },
+    "colsenum*[]{}": {
+      "name": "colsenum*",
+      "snippet": "[${2:options}]{${1:cols}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "colsitem{}": {
+      "name": "colsitem",
+      "snippet": "{${1:cols}}"
+    },
+    "colsitem[]{}": {
+      "name": "colsitem",
+      "snippet": "[${2:options}]{${1:cols}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "colsitem*{}": {
+      "name": "colsitem*",
+      "snippet": "{${1:cols}}"
+    },
+    "colsitem*[]{}": {
+      "name": "colsitem*",
+      "snippet": "[${2:options}]{${1:cols}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "tablenum1": {},
+    "tablenum1(cols)": {
+      "name": "tablenum1",
+      "snippet": "(${1:cols})"
+    },
+    "tablenum1[](cols)": {
+      "name": "tablenum1",
+      "snippet": "[${1:options}](${2:cols})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "tablenuma": {},
+    "tablenuma(cols)": {
+      "name": "tablenuma",
+      "snippet": "(${1:cols})"
+    },
+    "tablenuma[](cols)": {
+      "name": "tablenuma",
+      "snippet": "[${1:options}](${2:cols})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "tablenuma*": {},
+    "tablitem": {},
+    "tablitem(cols)": {
+      "name": "tablitem",
+      "snippet": "(${1:cols})"
+    },
+    "tablitem[](cols)": {
+      "name": "tablitem",
+      "snippet": "[${1:options}](${2:cols})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "tablitem*": {},
+    "questions": {},
+    "answers": {},
+    "answers[]": {
+      "name": "answers",
+      "snippet": "[${1:level}]"
+    },
+    "answers*": {}
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "exetoc",
+      "setlist",
+      "output=",
+      "display=",
+      "answerspace",
+      "marginpos=",
+      "marginwidth=",
+      "noteragged=",
+      "checkpts",
+      "correct="
+    ],
+    [
+      "topsep=",
+      "partopsep=",
+      "parsep=",
+      "itemsep=",
+      "leftmargin=",
+      "rightmargin=",
+      "listparindent=",
+      "labelwidth=",
+      "labelsep=",
+      "itemindent=",
+      "label=${1:commands}",
+      "label*=${1:commands}",
+      "ref=${1:commands}",
+      "font=${1:commands}",
+      "format=${1:commands}",
+      "align=",
+      "labelindent=",
+      "left=${1:labelindent}",
+      "left=${1:labelindent} .. ${2:leftmargin}",
+      "widest",
+      "widest=${1:string}",
+      "widest*=${1:integer}",
+      "labelsep*=",
+      "labelindent*=",
+      "start=${1:integer}",
+      "resume",
+      "resume=${1:series name}",
+      "resume*",
+      "resume*=${1:series name}",
+      "series=${1:series name}",
+      "beginpenalty=${1:integer}",
+      "midpenalty=${1:integer}",
+      "endpenalty=${1:integer}",
+      "before=${1:code}",
+      "before*=${1:code}",
+      "after=${1:code}",
+      "after*=${1:code}",
+      "first=${1:code}",
+      "first*=${1:code}",
+      "style=",
+      "noitemsep",
+      "nosep",
+      "wide",
+      "wide=${1:parindent}",
+      "itemjoin=${1:string}",
+      "itemjoin*=${1:string}",
+      "afterlabel=${1:string}",
+      "mode=",
+      "%enumitemkey",
+      "A",
+      "a",
+      "I",
+      "i",
+      "1"
+    ],
+    [
+      "topsep=",
+      "partopsep=",
+      "parsep=",
+      "itemsep=",
+      "leftmargin=",
+      "rightmargin=",
+      "listparindent=",
+      "labelwidth=",
+      "labelsep=",
+      "itemindent=",
+      "label=${1:commands}",
+      "label*=${1:commands}",
+      "ref=${1:commands}",
+      "font=${1:commands}",
+      "format=${1:commands}",
+      "align=",
+      "labelindent=",
+      "left=${1:labelindent}",
+      "left=${1:labelindent} .. ${2:leftmargin}",
+      "widest",
+      "widest=${1:string}",
+      "widest*=${1:integer}",
+      "labelsep*=",
+      "labelindent*=",
+      "start=${1:integer}",
+      "resume",
+      "resume=${1:series name}",
+      "resume*",
+      "resume*=${1:series name}",
+      "series=${1:series name}",
+      "beginpenalty=${1:integer}",
+      "midpenalty=${1:integer}",
+      "endpenalty=${1:integer}",
+      "before=${1:code}",
+      "before*=${1:code}",
+      "after=${1:code}",
+      "after*=${1:code}",
+      "first=${1:code}",
+      "first*=${1:code}",
+      "style=",
+      "noitemsep",
+      "nosep",
+      "wide",
+      "wide=${1:parindent}",
+      "itemjoin=${1:string}",
+      "itemjoin*=${1:string}",
+      "afterlabel=${1:string}",
+      "mode=",
+      "%enumitemkey"
+    ],
+    [
+      "style=",
+      "label-format=${1:code}",
+      "label=${1:code}",
+      "ref=${1:code}",
+      "label-width=",
+      "label-offset=",
+      "item-format=${1:code}",
+      "item-indent=",
+      "column-sep=",
+      "label-align=",
+      "before-skip=",
+      "after-skip=",
+      "after-item-skip=",
+      "resume",
+      "start=${1:integer}",
+      "counter=${1:counter}",
+      "debug"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/expex-acro.json b/dev/packages/expex-acro.json
index 268aeef88..bfe1e4128 100644
--- a/dev/packages/expex-acro.json
+++ b/dev/packages/expex-acro.json
@@ -24,10 +24,10 @@
       "snippet": "exrefnil[${2:tag1}]{${1:tag2}}"
     },
     "mexref{}": {
-      "snippet": "mexref{${1:tag1,tag2,...}}"
+      "snippet": "mexref{${1:tag1,${2:tag2},...}}"
     },
     "mexref[]{}": {
-      "snippet": "mexref[${2:separator}]{${1:tag1,tag2,...}}"
+      "snippet": "mexref[${2:separator}]{${1:tag1,${3:tag2},...}}"
     },
     "gl{}": {
       "snippet": "gl{${1:id}}"
diff --git a/dev/packages/expex.json b/dev/packages/expex.json
index ac0188733..ca8f187b8 100644
--- a/dev/packages/expex.json
+++ b/dev/packages/expex.json
@@ -144,7 +144,7 @@
       "snippet": "rightcomment{${1:text}}"
     },
     "defineglwlevels{}": {
-      "snippet": "defineglwlevels{${1:name1,name2,...}}"
+      "snippet": "defineglwlevels{${1:name1,${2:name2},...}}"
     },
     "beginglpanel": {},
     "beginglpanel[]": {
diff --git a/dev/packages/export.json b/dev/packages/export.json
new file mode 100644
index 000000000..c8b532280
--- /dev/null
+++ b/dev/packages/export.json
@@ -0,0 +1,53 @@
+{
+  "includes": {},
+  "macros": {
+    "openexport{}": {
+      "snippet": "openexport{${1:file}}"
+    },
+    "openexport[]{}": {
+      "snippet": "openexport[${2:extension}]{${1:file}}"
+    },
+    "closeexport": {},
+    "Export{}": {
+      "snippet": "Export{${1:counter}}"
+    },
+    "ExportLength{}": {
+      "snippet": "ExportLength{${1:length}}"
+    },
+    "PreciseExportLength{}": {
+      "snippet": "PreciseExportLength{${1:length}}"
+    },
+    "ExportMuskip{}": {
+      "snippet": "ExportMuskip{${1:muskip}}"
+    },
+    "ExportParameter{}": {
+      "snippet": "ExportParameter{${1:parameter}}"
+    },
+    "ExportIf{}": {
+      "snippet": "ExportIf{${1:ifname}}"
+    },
+    "ExportPageLayout": {},
+    "ExportArrayParams": {},
+    "Import{}": {
+      "snippet": "Import{${1:file}}"
+    },
+    "Import[]{}": {
+      "snippet": "Import[${2:extension}]{${1:file}}"
+    },
+    "xcaption{}": {
+      "snippet": "xcaption{${1:float}}"
+    },
+    "xcaptionf{}": {
+      "snippet": "xcaptionf{${1:caption}}"
+    },
+    "xcaptiont{}": {
+      "snippet": "xcaptiont{${1:caption}}"
+    },
+    "AddInputInAux{}": {
+      "snippet": "AddInputInAux{${1:secondary document.aux}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/extract.json b/dev/packages/extract.json
new file mode 100644
index 000000000..8a768ab6f
--- /dev/null
+++ b/dev/packages/extract.json
@@ -0,0 +1,47 @@
+{
+  "includes": {
+    "verbatim": [],
+    "xkeyval": []
+  },
+  "macros": {
+    "extractionlabel{}": {
+      "snippet": "extractionlabel{${1:name}}"
+    },
+    "extractline": {},
+    "extractline*": {}
+  },
+  "envs": {
+    "extract": {},
+    "extract[]": {
+      "name": "extract",
+      "snippet": "[${1:name}]"
+    },
+    "extract*": {},
+    "extract*[]": {
+      "name": "extract*",
+      "snippet": "[${1:name}]"
+    },
+    "extractskip": {},
+    "extractskip[]": {
+      "name": "extractskip",
+      "snippet": "[${1:name}]"
+    }
+  },
+  "options": [
+    "active",
+    "header",
+    "handles",
+    "copydocumentclass",
+    "generate=${1:file}",
+    "extract-env={${1:env1,env2,...}}",
+    "extract-cmd=${1:cmd}",
+    "extract-cmdline=${1:cmd}",
+    "line-nrs=${1:number spec}",
+    "line-labels={${1:label1,label2,...}}",
+    "extract-nrs=${1:number spec}",
+    "extract-labels={${1:label1,label2,...}}",
+    "extractskip-nrs=${1:number spec}",
+    "extractskip-labels={${1:label1,label2,...}}"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/fancybox.json b/dev/packages/fancybox.json
index b89e35d42..416d7a604 100644
--- a/dev/packages/fancybox.json
+++ b/dev/packages/fancybox.json
@@ -22,10 +22,37 @@
     "cornersize*{}": {
       "snippet": "cornersize*{${1:dimen}}"
     },
+    "fancyoval()": {
+      "snippet": "fancyoval(${1:width},${2:height})"
+    },
+    "fancyoval()[]": {
+      "snippet": "fancyoval(${2:width},${3:height})[${1:portion}]"
+    },
     "TheSbox": {},
     "GenericCaption{}": {
       "snippet": "GenericCaption{${1:text}}"
     },
+    "item()": {
+      "snippet": "item(${1:vspace})"
+    },
+    "item()[]": {
+      "snippet": "item(${2:vspace})[${1:label}]"
+    },
+    "boxput(){}{}": {
+      "snippet": "boxput(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
+    },
+    "boxput*(){}{}": {
+      "snippet": "boxput*(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
+    },
+    "fancyput(){}": {
+      "snippet": "fancyput(${2:x},${3:y}){${1:contents}}"
+    },
+    "fancyput*(){}": {
+      "snippet": "fancyput*(${2:x},${3:y}){${1:contents}}"
+    },
+    "thisfancyput*(){}": {
+      "snippet": "thisfancyput*(${2:x},${3:y}){${1:contents}}"
+    },
     "fancypage{}{}": {
       "snippet": "fancypage{${1:cmds1}}{${2:cmds2}}"
     },
diff --git a/dev/packages/fancyhdr.json b/dev/packages/fancyhdr.json
new file mode 100644
index 000000000..1f9d3a02d
--- /dev/null
+++ b/dev/packages/fancyhdr.json
@@ -0,0 +1,132 @@
+{
+  "includes": {},
+  "macros": {
+    "fancyfoot[]{}": {
+      "snippet": "fancyfoot[${2:places}]{${1:footer}}"
+    },
+    "fancyfoot{}": {
+      "snippet": "fancyfoot{${1:footer}}"
+    },
+    "fancyhead[]{}": {
+      "snippet": "fancyhead[${2:places}]{${1:header}}"
+    },
+    "fancyhead{}": {
+      "snippet": "fancyhead{${1:header}}"
+    },
+    "fancyhf[]{}": {
+      "snippet": "fancyhf[${2:places}]{${1:output}}"
+    },
+    "fancyhf{}": {
+      "snippet": "fancyhf{${1:output}}"
+    },
+    "fancyfootoffset[]{}": {
+      "snippet": "fancyfootoffset[${2:places}]{${1:length}}"
+    },
+    "fancyfootoffset{}": {
+      "snippet": "fancyfootoffset{${1:length}}"
+    },
+    "fancyheadoffset[]{}": {
+      "snippet": "fancyheadoffset[${2:places}]{${1:length}}"
+    },
+    "fancyheadoffset{}": {
+      "snippet": "fancyheadoffset{${1:length}}"
+    },
+    "fancyhfoffset[]{}": {
+      "snippet": "fancyhfoffset[${2:places}]{${1:length}}"
+    },
+    "fancyhfoffset{}": {
+      "snippet": "fancyhfoffset{${1:length}}"
+    },
+    "fancypagestyle{}[]{}": {
+      "snippet": "fancypagestyle{${1:style name}}[${2:base style}]{${3:definitions}}"
+    },
+    "fancypagestyle{}{}": {
+      "snippet": "fancypagestyle{${1:style name}}{${2:definitions}}"
+    },
+    "iftopfloat{}{}": {
+      "snippet": "iftopfloat{${1:float page}}{${2:other}}"
+    },
+    "ifbotfloat{}{}": {
+      "snippet": "ifbotfloat{${1:float page}}{${2:other}}"
+    },
+    "iffloatpage{}{}": {
+      "snippet": "iffloatpage{${1:float page}}{${2:other}}"
+    },
+    "iffootnote{}{}": {
+      "snippet": "iffootnote{${1:float page}}{${2:other}}"
+    },
+    "headrulewidth": {},
+    "footrulewidth": {},
+    "headruleskip": {},
+    "footruleskip": {},
+    "headrule": {},
+    "footrule": {},
+    "headwidth": {},
+    "fancyheadinit{}": {
+      "snippet": "fancyheadinit{${1:code}}"
+    },
+    "fancyfootinit{}": {
+      "snippet": "fancyfootinit{${1:code}}"
+    },
+    "fancyhfinit{}": {
+      "snippet": "fancyhfinit{${1:code}}"
+    },
+    "fancycenter[][]{}{}{}": {
+      "snippet": "fancycenter[${4:distance}][${5:stretch}]{${1:left-mark}}{${2:center-mark}}{${3:right-mark}}"
+    },
+    "fancycenter[]{}{}{}": {
+      "snippet": "fancycenter[${4:distance}]{${1:left-mark}}{${2:center-mark}}{${3:right-mark}}"
+    },
+    "fancycenter{}{}{}": {
+      "snippet": "fancycenter{${1:left-mark}}{${2:center-mark}}{${3:right-mark}}"
+    },
+    "nouppercase{}": {
+      "snippet": "nouppercase{${1:text}}"
+    },
+    "chead[]{}": {
+      "snippet": "chead[${2:CH-even}]{${1:CH-odd}}"
+    },
+    "chead{}": {
+      "snippet": "chead{${1:header}}"
+    },
+    "cfoot[]{}": {
+      "snippet": "cfoot[${2:CF-even}]{${1:CF-odd}}"
+    },
+    "cfoot{}": {
+      "snippet": "cfoot{${1:footer}}"
+    },
+    "lhead[]{}": {
+      "snippet": "lhead[${2:LH-even}]{${1:LH-odd}}"
+    },
+    "lhead{}": {
+      "snippet": "lhead{${1:header}}"
+    },
+    "lfoot[]{}": {
+      "snippet": "lfoot[${2:LF-even}]{${1:LF-odd}}"
+    },
+    "lfoot{}": {
+      "snippet": "lfoot{${1:footer}}"
+    },
+    "rhead[]{}": {
+      "snippet": "rhead[${2:RH-even}]{${1:RH-odd}}"
+    },
+    "rhead{}": {
+      "snippet": "rhead{${1:header}}"
+    },
+    "rfoot[]{}": {
+      "snippet": "rfoot[${2:RF-even}]{${1:RF-odd}}"
+    },
+    "rfoot{}": {
+      "snippet": "rfoot{${1:footer}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "nocheck",
+    "compatV3",
+    "twoside",
+    "myheadings",
+    "headings"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/fancyvrb-ex.json b/dev/packages/fancyvrb-ex.json
index 426974a6e..d7869c4bd 100644
--- a/dev/packages/fancyvrb-ex.json
+++ b/dev/packages/fancyvrb-ex.json
@@ -11,6 +11,22 @@
     "showgrid": {}
   },
   "envs": {
+    "PCenterExample(x1,y1)(x2,y2)": {
+      "name": "PCenterExample",
+      "snippet": "(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "PCenterExample[](x1,y1)(x2,y2)": {
+      "name": "PCenterExample",
+      "snippet": "[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "PSideBySideExample(x1,y1)(x2,y2)": {
+      "name": "PSideBySideExample",
+      "snippet": "(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "PSideBySideExample[](x1,y1)(x2,y2)": {
+      "name": "PSideBySideExample",
+      "snippet": "[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
     "Example": {},
     "Example[]": {
       "name": "Example",
diff --git a/dev/packages/fapapersize.json b/dev/packages/fapapersize.json
index 0c0eba729..50ec8b101 100644
--- a/dev/packages/fapapersize.json
+++ b/dev/packages/fapapersize.json
@@ -5,7 +5,7 @@
       "snippet": "usefastocksize{${1:width,height}}"
     },
     "usefapapersize{}": {
-      "snippet": "usefapapersize{${1:width,height,lmargin,rmargin,tmargin,bmargin}}"
+      "snippet": "usefapapersize{${1:width,${2:height},${3:lmargin},${4:rmargin},${5:tmargin},bmargin}}"
     },
     "definefageometry{}{}": {
       "snippet": "definefageometry{${1:name}}{${2:layout}}"
diff --git a/dev/packages/fbox.json b/dev/packages/fbox.json
new file mode 100644
index 000000000..165f272ba
--- /dev/null
+++ b/dev/packages/fbox.json
@@ -0,0 +1,50 @@
+{
+  "includes": {
+    "xkeyval": [],
+    "xcolor": []
+  },
+  "macros": {
+    "fbox[]{}": {
+      "snippet": "fbox[${2:options}]{${1:text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "fbox*{}": {
+      "snippet": "fbox*{${1:text}}"
+    },
+    "fbox*[]{}": {
+      "snippet": "fbox*[${2:options}]{${1:text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "fparbox{}": {
+      "snippet": "fparbox{${1:text}}"
+    },
+    "fparbox[]{}": {
+      "snippet": "fparbox[${2:options}]{${1:text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "fparbox*{}": {
+      "snippet": "fparbox*{${1:text}}"
+    },
+    "fparbox*[]{}": {
+      "snippet": "fparbox*[${2:options}]{${1:text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "boxrule=",
+      "boxsep=",
+      "lcolor=",
+      "tcolor=",
+      "rcolor=",
+      "bcolor=",
+      "linewidth="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/fdsymbol.json b/dev/packages/fdsymbol.json
index 003c97db8..c90558f4b 100644
--- a/dev/packages/fdsymbol.json
+++ b/dev/packages/fdsymbol.json
@@ -81,6 +81,7 @@
       "detail": "⊦",
       "documentation": "ASSERTION (ver short dash)"
     },
+    "awint,": {},
     "backcong": {
       "detail": "≌",
       "documentation": "ALL EQUAL TO"
@@ -146,6 +147,7 @@
     "bigcurlyvee": {},
     "bigcurlywedge": {},
     "bigdoublevee": {},
+    "bigdoublewedge,": {},
     "bigoast": {},
     "bigplus": {},
     "bigsqcap": {
diff --git a/dev/packages/fetchbibpes.json b/dev/packages/fetchbibpes.json
index e7a7519d5..a874e4cad 100644
--- a/dev/packages/fetchbibpes.json
+++ b/dev/packages/fetchbibpes.json
@@ -113,6 +113,9 @@
       "snippet": "sr{${1:text}}{${2:passages}}",
       "option": "usesr"
     },
+    "BV()": {
+      "snippet": "BV(${1:verse ref})"
+    },
     "null": {},
     "markverse{}": {
       "snippet": "markverse{${1:book ch:vrs}}",
diff --git a/dev/packages/feyn.json b/dev/packages/feyn.json
new file mode 100644
index 000000000..60bd5ea77
--- /dev/null
+++ b/dev/packages/feyn.json
@@ -0,0 +1,70 @@
+{
+  "includes": {},
+  "macros": {
+    "feyn{}": {
+      "snippet": "feyn{${1:chars}}"
+    },
+    "Feyn{}": {
+      "snippet": "Feyn{${1:chars}}"
+    },
+    "FEYN{}": {
+      "snippet": "FEYN{${1:chars}}"
+    },
+    "momentum{}{}": {
+      "snippet": "momentum{${1:chars}}{${2:text}}"
+    },
+    "momentum[]{}{}": {
+      "snippet": "momentum[${3:pos}]{${1:chars}}{${2:text}}"
+    },
+    "belowl{}": {
+      "snippet": "belowl{${1:chars}}"
+    },
+    "belowr{}": {
+      "snippet": "belowr{${1:chars}}"
+    },
+    "Diagram{}": {
+      "snippet": "Diagram{${1:array}}"
+    },
+    "Diagram[]{}": {
+      "snippet": "Diagram[${2:alignment}]{${1:array}}"
+    },
+    "DIAGRAM{}": {
+      "snippet": "DIAGRAM{${1:array}}"
+    },
+    "DIAGRAM[]{}": {
+      "snippet": "DIAGRAM[${2:alignment}]{${1:array}}"
+    },
+    "maxis{}": {
+      "snippet": "maxis{${1:arg}}"
+    },
+    "vertexlabel": {},
+    "feynstrut{}{}": {
+      "snippet": "feynstrut{${1:height}}{${2:depth}}"
+    },
+    "annotate{}{}{}": {
+      "snippet": "annotate{${1:x}}{${2:y}}{${3:text}}"
+    },
+    "tannotate{}{}{}": {
+      "snippet": "tannotate{${1:x}}{${2:y}}{${3:text}}"
+    },
+    "FeynSpaceChar": {},
+    "FeynxSpaceChar": {},
+    "wfermion": {},
+    "hfermion": {},
+    "shfermion": {},
+    "whfermion": {},
+    "gvcropped": {},
+    "bigbosonloop": {},
+    "smallbosonloop": {},
+    "bigbosonloopA": {},
+    "smallbosonloopA": {},
+    "bigbosonloopV": {},
+    "smallbosonloopV": {}
+  },
+  "envs": {},
+  "options": [
+    "globalbang",
+    "noglobalbang"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/feynmf.json b/dev/packages/feynmf.json
index ff99b9e7e..49e575914 100644
--- a/dev/packages/feynmf.json
+++ b/dev/packages/feynmf.json
@@ -2,16 +2,16 @@
   "includes": {},
   "macros": {
     "fmf{}{}": {
-      "snippet": "fmf{${1:style,opt=val,...}}{${2:v1,v2,...}}"
+      "snippet": "fmf{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
     },
     "fmfblob{}{}": {
-      "snippet": "fmfblob{${1:diameter}}{${2:v1,v2,...}}"
+      "snippet": "fmfblob{${1:diameter}}{${2:v1,${3:v2},...}}"
     },
     "fmfblobn{}{}{}": {
       "snippet": "fmfblobn{${1:diameter}}{${2:v}}{${3:n}}"
     },
     "fmfbottom{}": {
-      "snippet": "fmfbottom{${1:v1,v2,...}}"
+      "snippet": "fmfbottom{${1:v1,${2:v2},...}}"
     },
     "fmfbottomn{}{}": {
       "snippet": "fmfbottomn{${1:v}}{${2:n}}"
@@ -25,27 +25,30 @@
     },
     "fmfdisplay": {},
     "fmfdot{}": {
-      "snippet": "fmfdot{${1:v1,v2,...}}"
+      "snippet": "fmfdot{${1:v1,${2:v2},...}}"
     },
     "fmfdotn{}{}": {
       "snippet": "fmfdotn{${1:v}}{${2:n}}"
     },
     "fmfdraw": {},
     "fmffixed{}{}": {
-      "snippet": "fmffixed{${1:dist}}{${2:v1,v2,...}}"
+      "snippet": "fmffixed{${1:dist}}{${2:v1,${3:v2},...}}"
     },
     "fmffixedx{}{}": {
-      "snippet": "fmffixedx{${1:dx}}{${2:v1,v2,...}}"
+      "snippet": "fmffixedx{${1:dx}}{${2:v1,${3:v2},...}}"
     },
     "fmffixedy{}{}": {
-      "snippet": "fmffixedy{${1:dy}}{${2:v1,v2,...}}"
+      "snippet": "fmffixedy{${1:dy}}{${2:v1,${3:v2},...}}"
     },
     "fmfforce{}{}": {
-      "snippet": "fmfforce{${1:pos}}{${2:v1,v2,...}}"
+      "snippet": "fmfforce{${1:pos}}{${2:v1,${3:v2},...}}"
+    },
+    "fmfframe(left,top}(){": {
+      "snippet": "fmfframe(${2:left},top}(${3:right},${4:bottom}){${1:box}}"
     },
     "fmffreeze": {},
     "fmfi{}{}": {
-      "snippet": "fmfi{${1:style,opt=val,...}}{${2:p}}"
+      "snippet": "fmfi{${1:style,${3:opt=val},...}}{${2:p}}"
     },
     "fmfiequ{}{}": {
       "snippet": "fmfiequ{${1:lval}}{${2:rval}}"
@@ -60,7 +63,7 @@
       "snippet": "fmfiset{${1:lval}}{${2:rval}}"
     },
     "fmfiv{}{}": {
-      "snippet": "fmfiv{${1:shape=val,opt=val,...}}{${2:v}}"
+      "snippet": "fmfiv{${1:shape=val,${3:opt=val},...}}{${2:v}}"
     },
     "fmfkeep{}": {
       "snippet": "fmfkeep{${1:name}}"
@@ -69,23 +72,23 @@
       "snippet": "fmflabel{${1:label}}{${2:v}}"
     },
     "fmfleft{}": {
-      "snippet": "fmfleft{${1:v1,v2,...}}"
+      "snippet": "fmfleft{${1:v1,${2:v2},...}}"
     },
     "fmfleftn{}{}": {
       "snippet": "fmfleftn{${1:v}}{${2:n}}"
     },
     "fmfn{}{}{}": {
-      "snippet": "fmfn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
     },
     "fmfnotrace": {},
     "fmfpen{}": {
       "snippet": "fmfpen{${1:weight}}"
     },
     "fmfpoly{}{}": {
-      "snippet": "fmfpoly{${1:style,opt=val,...}}{${2:v1,v2,...}}"
+      "snippet": "fmfpoly{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
     },
     "fmfpolyn{}{}{}": {
-      "snippet": "fmfpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
     },
     "fmfposition": {},
     "fmfrcyclen{}{}{}": {
@@ -95,37 +98,37 @@
       "snippet": "fmfreuse{${1:name}}"
     },
     "fmfright{}": {
-      "snippet": "fmfright{${1:v1,v2,...}}"
+      "snippet": "fmfright{${1:v1,${2:v2},...}}"
     },
     "fmfrightn{}{}": {
       "snippet": "fmfrightn{${1:v}}{${2:n}}"
     },
     "fmfrpolyn{}{}{}": {
-      "snippet": "fmfrpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfrpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
     },
     "fmfset{}{}": {
       "snippet": "fmfset{${1:parameter}}{${2:value}}"
     },
     "fmfshift{}{}": {
-      "snippet": "fmfshift{${1:dist}}{${2:v1,v2,...}}"
+      "snippet": "fmfshift{${1:dist}}{${2:v1,${3:v2},...}}"
     },
     "fmfstopdisplay": {},
     "fmfstraight": {},
     "fmfsurround{}": {
-      "snippet": "fmfsurround{${1:v1,v2,...}}"
+      "snippet": "fmfsurround{${1:v1,${2:v2},...}}"
     },
     "fmfsurroundn{}{}": {
       "snippet": "fmfsurroundn{${1:v}}{${2:n}}"
     },
     "fmftop{}": {
-      "snippet": "fmftop{${1:v1,v2,...}}"
+      "snippet": "fmftop{${1:v1,${2:v2},...}}"
     },
     "fmftopn{}{}": {
       "snippet": "fmftopn{${1:v}}{${2:n}}"
     },
     "fmftrace": {},
     "fmfv{}{}": {
-      "snippet": "fmfv{${1:opt=val,...}}{${2:v1,v2,...}}"
+      "snippet": "fmfv{${1:opt=val,${3:...}}{${2:v1},${4:v2},...}}"
     },
     "fmfvn{}{}{}": {
       "snippet": "fmfvn{${1:opt=val,...}}{${2:v}}{${3:n}}"
@@ -200,14 +203,34 @@
       "name": "fmffile",
       "snippet": "{${1:METAFONT-file}}"
     },
+    "fmfchar(width,height)": {
+      "name": "fmfchar",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "fmfchar*(width,height)": {
+      "name": "fmfchar*",
+      "snippet": "(${1:width},${2:height})"
+    },
     "fmffor{}{}{}{}": {
       "name": "fmffor",
       "snippet": "{${1:var}}{${2:from}}{${3:step}}{${4:to}}"
     },
+    "fmfgraph(width,height)": {
+      "name": "fmfgraph",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "fmfgraph*(width,height)": {
+      "name": "fmfgraph*",
+      "snippet": "(${1:width},${2:height})"
+    },
     "fmfgroup": {},
     "fmfshrink{}": {
       "name": "fmfshrink",
       "snippet": "{${1:factor}}"
+    },
+    "fmfsubgraph(x,y)(width,height)": {
+      "name": "fmfsubgraph",
+      "snippet": "(${1:x},${2:y})(${3:width},${4:height})"
     }
   },
   "options": [
diff --git a/dev/packages/feynmp.json b/dev/packages/feynmp.json
index 15376ffcf..70d6fa29b 100644
--- a/dev/packages/feynmp.json
+++ b/dev/packages/feynmp.json
@@ -4,16 +4,16 @@
   },
   "macros": {
     "fmf{}{}": {
-      "snippet": "fmf{${1:style,opt=val,...}}{${2:v1,v2,...}}"
+      "snippet": "fmf{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
     },
     "fmfblob{}{}": {
-      "snippet": "fmfblob{${1:diameter}}{${2:v1,v2,...}}"
+      "snippet": "fmfblob{${1:diameter}}{${2:v1,${3:v2},...}}"
     },
     "fmfblobn{}{}{}": {
       "snippet": "fmfblobn{${1:diameter}}{${2:v}}{${3:n}}"
     },
     "fmfbottom{}": {
-      "snippet": "fmfbottom{${1:v1,v2,...}}"
+      "snippet": "fmfbottom{${1:v1,${2:v2},...}}"
     },
     "fmfbottomn{}{}": {
       "snippet": "fmfbottomn{${1:v}}{${2:n}}"
@@ -27,27 +27,30 @@
     },
     "fmfdisplay": {},
     "fmfdot{}": {
-      "snippet": "fmfdot{${1:v1,v2,...}}"
+      "snippet": "fmfdot{${1:v1,${2:v2},...}}"
     },
     "fmfdotn{}{}": {
       "snippet": "fmfdotn{${1:v}}{${2:n}}"
     },
     "fmfdraw": {},
     "fmffixed{}{}": {
-      "snippet": "fmffixed{${1:dist}}{${2:v1,v2,...}}"
+      "snippet": "fmffixed{${1:dist}}{${2:v1,${3:v2},...}}"
     },
     "fmffixedx{}{}": {
-      "snippet": "fmffixedx{${1:dx}}{${2:v1,v2,...}}"
+      "snippet": "fmffixedx{${1:dx}}{${2:v1,${3:v2},...}}"
     },
     "fmffixedy{}{}": {
-      "snippet": "fmffixedy{${1:dy}}{${2:v1,v2,...}}"
+      "snippet": "fmffixedy{${1:dy}}{${2:v1,${3:v2},...}}"
     },
     "fmfforce{}{}": {
-      "snippet": "fmfforce{${1:pos}}{${2:v1,v2,...}}"
+      "snippet": "fmfforce{${1:pos}}{${2:v1,${3:v2},...}}"
+    },
+    "fmfframe(left,top}(){": {
+      "snippet": "fmfframe(${2:left},top}(${3:right},${4:bottom}){${1:box}}"
     },
     "fmffreeze": {},
     "fmfi{}{}": {
-      "snippet": "fmfi{${1:style,opt=val,...}}{${2:p}}"
+      "snippet": "fmfi{${1:style,${3:opt=val},...}}{${2:p}}"
     },
     "fmfiequ{}{}": {
       "snippet": "fmfiequ{${1:lval}}{${2:rval}}"
@@ -62,7 +65,7 @@
       "snippet": "fmfiset{${1:lval}}{${2:rval}}"
     },
     "fmfiv{}{}": {
-      "snippet": "fmfiv{${1:shape=val,opt=val,...}}{${2:v}}"
+      "snippet": "fmfiv{${1:shape=val,${3:opt=val},...}}{${2:v}}"
     },
     "fmfkeep{}": {
       "snippet": "fmfkeep{${1:name}}"
@@ -71,23 +74,23 @@
       "snippet": "fmflabel{${1:label}}{${2:v}}"
     },
     "fmfleft{}": {
-      "snippet": "fmfleft{${1:v1,v2,...}}"
+      "snippet": "fmfleft{${1:v1,${2:v2},...}}"
     },
     "fmfleftn{}{}": {
       "snippet": "fmfleftn{${1:v}}{${2:n}}"
     },
     "fmfn{}{}{}": {
-      "snippet": "fmfn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
     },
     "fmfnotrace": {},
     "fmfpen{}": {
       "snippet": "fmfpen{${1:weight}}"
     },
     "fmfpoly{}{}": {
-      "snippet": "fmfpoly{${1:style,opt=val,...}}{${2:v1,v2,...}}"
+      "snippet": "fmfpoly{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
     },
     "fmfpolyn{}{}{}": {
-      "snippet": "fmfpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
     },
     "fmfposition": {},
     "fmfrcyclen{}{}{}": {
@@ -97,37 +100,37 @@
       "snippet": "fmfreuse{${1:name}}"
     },
     "fmfright{}": {
-      "snippet": "fmfright{${1:v1,v2,...}}"
+      "snippet": "fmfright{${1:v1,${2:v2},...}}"
     },
     "fmfrightn{}{}": {
       "snippet": "fmfrightn{${1:v}}{${2:n}}"
     },
     "fmfrpolyn{}{}{}": {
-      "snippet": "fmfrpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfrpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
     },
     "fmfset{}{}": {
       "snippet": "fmfset{${1:parameter}}{${2:value}}"
     },
     "fmfshift{}{}": {
-      "snippet": "fmfshift{${1:dist}}{${2:v1,v2,...}}"
+      "snippet": "fmfshift{${1:dist}}{${2:v1,${3:v2},...}}"
     },
     "fmfstopdisplay": {},
     "fmfstraight": {},
     "fmfsurround{}": {
-      "snippet": "fmfsurround{${1:v1,v2,...}}"
+      "snippet": "fmfsurround{${1:v1,${2:v2},...}}"
     },
     "fmfsurroundn{}{}": {
       "snippet": "fmfsurroundn{${1:v}}{${2:n}}"
     },
     "fmftop{}": {
-      "snippet": "fmftop{${1:v1,v2,...}}"
+      "snippet": "fmftop{${1:v1,${2:v2},...}}"
     },
     "fmftopn{}{}": {
       "snippet": "fmftopn{${1:v}}{${2:n}}"
     },
     "fmftrace": {},
     "fmfv{}{}": {
-      "snippet": "fmfv{${1:opt=val,...}}{${2:v1,v2,...}}"
+      "snippet": "fmfv{${1:opt=val,${3:...}}{${2:v1},${4:v2},...}}"
     },
     "fmfvn{}{}{}": {
       "snippet": "fmfvn{${1:opt=val,...}}{${2:v}}{${3:n}}"
@@ -197,14 +200,34 @@
       "name": "fmffile",
       "snippet": "{${1:METAPOST-file}}"
     },
+    "fmfchar(width,height)": {
+      "name": "fmfchar",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "fmfchar*(width,height)": {
+      "name": "fmfchar*",
+      "snippet": "(${1:width},${2:height})"
+    },
     "fmffor{}{}{}{}": {
       "name": "fmffor",
       "snippet": "{${1:var}}{${2:from}}{${3:step}}{${4:to}}"
     },
+    "fmfgraph(width,height)": {
+      "name": "fmfgraph",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "fmfgraph*(width,height)": {
+      "name": "fmfgraph*",
+      "snippet": "(${1:width},${2:height})"
+    },
     "fmfgroup": {},
     "fmfshrink{}": {
       "name": "fmfshrink",
       "snippet": "{${1:factor}}"
+    },
+    "fmfsubgraph(x,y)(width,height)": {
+      "name": "fmfsubgraph",
+      "snippet": "(${1:x},${2:y})(${3:width},${4:height})"
     }
   },
   "options": [
diff --git a/dev/packages/filehook.json b/dev/packages/filehook.json
new file mode 100644
index 000000000..ebeadac9b
--- /dev/null
+++ b/dev/packages/filehook.json
@@ -0,0 +1,81 @@
+{
+  "includes": {},
+  "macros": {
+    "AtBeginOfEveryFile{}": {
+      "snippet": "AtBeginOfEveryFile{${1:code}}"
+    },
+    "AtEndOfEveryFile{}": {
+      "snippet": "AtEndOfEveryFile{${1:code}}"
+    },
+    "AtBeginOfFiles{}": {
+      "snippet": "AtBeginOfFiles{${1:code}}"
+    },
+    "AtEndOfFiles{}": {
+      "snippet": "AtEndOfFiles{${1:code}}"
+    },
+    "AtBeginOfFile{}{}": {
+      "snippet": "AtBeginOfFile{${1:file}}{${2:code}}"
+    },
+    "AtEndOfFile{}{}": {
+      "snippet": "AtEndOfFile{${1:file}}{${2:code}}"
+    },
+    "AtBeginOfIncludes{}": {
+      "snippet": "AtBeginOfIncludes{${1:code}}"
+    },
+    "AtEndOfIncludes{}": {
+      "snippet": "AtEndOfIncludes{${1:code}}"
+    },
+    "AfterIncludes{}": {
+      "snippet": "AfterIncludes{${1:code}}"
+    },
+    "AtBeginOfIncludeFile{}{}": {
+      "snippet": "AtBeginOfIncludeFile{${1:file}}{${2:code}}"
+    },
+    "AtEndOfIncludeFile{}{}": {
+      "snippet": "AtEndOfIncludeFile{${1:file}}{${2:code}}"
+    },
+    "AfterIncludeFile{}{}": {
+      "snippet": "AfterIncludeFile{${1:file}}{${2:code}}"
+    },
+    "AtBeginOfInputs{}": {
+      "snippet": "AtBeginOfInputs{${1:code}}"
+    },
+    "AtEndOfInputs{}": {
+      "snippet": "AtEndOfInputs{${1:code}}"
+    },
+    "AtBeginOfInputFile{}{}": {
+      "snippet": "AtBeginOfInputFile{${1:file}}{${2:code}}"
+    },
+    "AtEndOfInputFile{}{}": {
+      "snippet": "AtEndOfInputFile{${1:file}}{${2:code}}"
+    },
+    "AtBeginOfPackageFile{}{}": {
+      "snippet": "AtBeginOfPackageFile{${1:package}}{${2:code}}"
+    },
+    "AtEndOfPackageFile{}{}": {
+      "snippet": "AtEndOfPackageFile{${1:package}}{${2:code}}"
+    },
+    "AtBeginOfPackageFile*{}{}": {
+      "snippet": "AtBeginOfPackageFile*{${1:package}}{${2:code}}"
+    },
+    "AtEndOfPackageFile*{}{}": {
+      "snippet": "AtEndOfPackageFile*{${1:package}}{${2:code}}"
+    },
+    "AtBeginOfClassFile{}{}": {
+      "snippet": "AtBeginOfClassFile{${1:class}}{${2:code}}"
+    },
+    "AtEndOfClassFile{}{}": {
+      "snippet": "AtEndOfClassFile{${1:class}}{${2:code}}"
+    },
+    "AtBeginOfClassFile*{}{}": {
+      "snippet": "AtBeginOfClassFile*{${1:class}}{${2:code}}"
+    },
+    "AtEndOfClassFile*{}{}": {
+      "snippet": "AtEndOfClassFile*{${1:class}}{${2:code}}"
+    },
+    "ClearHook": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/fitch.json b/dev/packages/fitch.json
new file mode 100644
index 000000000..cc5120336
--- /dev/null
+++ b/dev/packages/fitch.json
@@ -0,0 +1,141 @@
+{
+  "includes": {
+    "kvoptions": []
+  },
+  "macros": {
+    "hypo{}{}": {
+      "snippet": "hypo{${1:label}}{${2:formula}}"
+    },
+    "hypo[]{}{}": {
+      "snippet": "hypo[${3:symbol}]{${1:label}}{${2:formula}}"
+    },
+    "hypo[][]{}{}": {
+      "snippet": "hypo[${3:symbol}][${4:offset}]{${1:label}}{${2:formula}}"
+    },
+    "have{}{}": {
+      "snippet": "have{${1:label}}{${2:formula}}"
+    },
+    "have[]{}{}": {
+      "snippet": "have[${3:symbol}]{${1:label}}{${2:formula}}"
+    },
+    "have[][]{}{}": {
+      "snippet": "have[${3:symbol}][${4:offset}]{${1:label}}{${2:formula}}"
+    },
+    "open": {},
+    "open[]": {
+      "snippet": "open[${1:guard}]"
+    },
+    "close": {},
+    "close[]": {
+      "snippet": "close[${1:guard}]"
+    },
+    "r{}": {
+      "snippet": "r{${1:ref list}}"
+    },
+    "ii{}": {
+      "snippet": "ii{${1:ref list}}"
+    },
+    "ie{}": {
+      "snippet": "ie{${1:ref list}}"
+    },
+    "ai{}": {
+      "snippet": "ai{${1:ref list}}"
+    },
+    "ae{}": {
+      "snippet": "ae{${1:ref list}}"
+    },
+    "oi{}": {
+      "snippet": "oi{${1:ref list}}"
+    },
+    "oe{}": {
+      "snippet": "oe{${1:ref list}}"
+    },
+    "ni{}": {
+      "snippet": "ni{${1:ref list}}"
+    },
+    "ne{}": {
+      "snippet": "ne{${1:ref list}}"
+    },
+    "be{}": {
+      "snippet": "be{${1:ref list}}"
+    },
+    "nne{}": {
+      "snippet": "nne{${1:ref list}}"
+    },
+    "Ai{}": {
+      "snippet": "Ai{${1:ref list}}"
+    },
+    "Ae{}": {
+      "snippet": "Ae{${1:ref list}}"
+    },
+    "Ei{}": {
+      "snippet": "Ei{${1:ref list}}"
+    },
+    "Ee{}": {
+      "snippet": "Ee{${1:ref list}}"
+    },
+    "guard{}": {
+      "snippet": "guard{${1:guard}}"
+    },
+    "guard[]{}": {
+      "snippet": "guard[${2:n}]{${1:guard}}"
+    },
+    "by{}{}": {
+      "snippet": "by{${1:text}}{${2:ref list}}"
+    },
+    "ndref{}": {
+      "snippet": "ndref{${1:ref list}}"
+    },
+    "hypocont{}": {
+      "snippet": "hypocont{${1:formula}}"
+    },
+    "havecont{}": {
+      "snippet": "havecont{${1:formula}}"
+    },
+    "ndrules": {},
+    "ndjustformat": {},
+    "ndrefformat": {},
+    "nddim{}{}{}{}{}{}{}{}": {
+      "snippet": "nddim{${1:height}}{${2:topheight}}{${3:depth}}{${4:labelsep}}{${5:indent}}{${6:hsep}}{${7:justsep}}{${8:linethickness}}"
+    }
+  },
+  "envs": {
+    "nd": {},
+    "nd[]": {
+      "name": "nd",
+      "snippet": "[${1:options}]"
+    },
+    "fitchproof": {},
+    "fitchproof[]": {
+      "name": "fitchproof",
+      "snippet": "[${1:options}]"
+    },
+    "ndresume": {},
+    "ndresume[]": {
+      "name": "ndresume",
+      "snippet": "[${1:options}]"
+    },
+    "fitchproof*": {},
+    "fitchproof*[]": {
+      "name": "fitchproof*",
+      "snippet": "[${1:options}]"
+    }
+  },
+  "options": [
+    "rules=${1:csname}",
+    "arrayenv=${1:envname}",
+    "justformat=${1:csname}",
+    "refformat=${1:csname}",
+    "height=",
+    "topheight=",
+    "depth=",
+    "labelsep=",
+    "indent=",
+    "hsep=",
+    "justsep=",
+    "linethickness=",
+    "cindent=",
+    "outerline"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/float.json b/dev/packages/float.json
new file mode 100644
index 000000000..f278bff1d
--- /dev/null
+++ b/dev/packages/float.json
@@ -0,0 +1,29 @@
+{
+  "includes": {},
+  "macros": {
+    "newfloat{}{}{}": {
+      "snippet": "newfloat{${1:float type}}{${2:placement}}{${3:ext}}"
+    },
+    "newfloat{}{}{}[]": {
+      "snippet": "newfloat{${1:float type}}{${2:placement}}{${3:ext}}[${4:within}]"
+    },
+    "floatstyle{}": {
+      "snippet": "floatstyle{${1:default style}}"
+    },
+    "floatname{}{}": {
+      "snippet": "floatname{${1:float type}}{${2:name}}"
+    },
+    "floatplacement{}{}": {
+      "snippet": "floatplacement{${1:float type}}{${2:default placement}}"
+    },
+    "restylefloat{}": {
+      "snippet": "restylefloat{${1:float type}}"
+    },
+    "listof{}{}": {
+      "snippet": "listof{${1:float type}}{${2:title}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/floatrow.json b/dev/packages/floatrow.json
index ee438e73e..0a161a9e3 100644
--- a/dev/packages/floatrow.json
+++ b/dev/packages/floatrow.json
@@ -121,10 +121,10 @@
     },
     "RawFloats": {},
     "RawFloats[]": {
-      "snippet": "RawFloats[${1:type1,type2,...}]"
+      "snippet": "RawFloats[${1:type1,${2:type2},...}]"
     },
     "RawFloats[][]": {
-      "snippet": "RawFloats[${1:type}][${2:subtype1,subtype2,...}]"
+      "snippet": "RawFloats[${1:type}][${2:subtype1,${3:subtype2},...}]"
     },
     "RawCaption{}": {
       "snippet": "RawCaption{${1:arg}}"
diff --git a/dev/packages/fltrace.json b/dev/packages/fltrace.json
new file mode 100644
index 000000000..253a5a145
--- /dev/null
+++ b/dev/packages/fltrace.json
@@ -0,0 +1,11 @@
+{
+  "includes": {},
+  "macros": {
+    "tracefloats": {},
+    "tracefloatsoff": {},
+    "tracefloatvals": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/fontspec.json b/dev/packages/fontspec.json
new file mode 100644
index 000000000..848549b92
--- /dev/null
+++ b/dev/packages/fontspec.json
@@ -0,0 +1,351 @@
+{
+  "includes": {},
+  "macros": {
+    "liningnums{}": {
+      "snippet": "liningnums{${1:text}}"
+    },
+    "strong{}": {
+      "snippet": "strong{${1:text}}"
+    },
+    "strongfontdeclare{}": {
+      "snippet": "strongfontdeclare{${1:font-switching list}}"
+    },
+    "strongreset": {},
+    "setmainfont{}": {
+      "snippet": "setmainfont{${1:font}}"
+    },
+    "setmainfont[]{}": {
+      "snippet": "setmainfont[${2:font features}]{${1:font}}"
+    },
+    "setmainfont{}[]": {
+      "snippet": "setmainfont{${1:font}}[${2:font features}]"
+    },
+    "setmainfont[]{}[]": {
+      "snippet": "setmainfont[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "setromanfont{}": {
+      "snippet": "setromanfont{${1:font}}"
+    },
+    "setromanfont[]{}": {
+      "snippet": "setromanfont[${2:font features}]{${1:font}}"
+    },
+    "setromanfont{}[]": {
+      "snippet": "setromanfont{${1:font}}[${2:font features}]"
+    },
+    "setromanfont[]{}[]": {
+      "snippet": "setromanfont[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "setsansfont{}": {
+      "snippet": "setsansfont{${1:font}}"
+    },
+    "setsansfont[]{}": {
+      "snippet": "setsansfont[${2:font features}]{${1:font}}"
+    },
+    "setsansfont{}[]": {
+      "snippet": "setsansfont{${1:font}}[${2:font features}]"
+    },
+    "setsansfont[]{}[]": {
+      "snippet": "setsansfont[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "setmonofont{}": {
+      "snippet": "setmonofont{${1:font}}"
+    },
+    "setmonofont[]{}": {
+      "snippet": "setmonofont[${2:font features}]{${1:font}}"
+    },
+    "setmonofont{}[]": {
+      "snippet": "setmonofont{${1:font}}[${2:font features}]"
+    },
+    "setmonofont[]{}[]": {
+      "snippet": "setmonofont[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "newfontfamily{}{}": {
+      "snippet": "newfontfamily{${1:cmd}}{${2:font}}"
+    },
+    "newfontfamily{}[]{}": {
+      "snippet": "newfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "newfontfamily{}{}[]": {
+      "snippet": "newfontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "newfontfamily{}[]{}[]": {
+      "snippet": "newfontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "setfontfamily{}{}": {
+      "snippet": "setfontfamily{${1:cmd}}{${2:font}}"
+    },
+    "setfontfamily{}[]{}": {
+      "snippet": "setfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "setfontfamily{}{}[]": {
+      "snippet": "setfontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "setfontfamily{}[]{}[]": {
+      "snippet": "setfontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "renewfontfamily{}{}": {
+      "snippet": "renewfontfamily{${1:cmd}}{${2:font}}"
+    },
+    "renewfontfamily{}[]{}": {
+      "snippet": "renewfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "renewfontfamily{}{}[]": {
+      "snippet": "renewfontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "renewfontfamily{}[]{}[]": {
+      "snippet": "renewfontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "providefontfamily{}{}": {
+      "snippet": "providefontfamily{${1:cmd}}{${2:font}}"
+    },
+    "providefontfamily{}[]{}": {
+      "snippet": "providefontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "providefontfamily{}{}[]": {
+      "snippet": "providefontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "providefontfamily{}[]{}[]": {
+      "snippet": "providefontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "fontspec{}": {
+      "snippet": "fontspec{${1:font}}"
+    },
+    "fontspec[]{}": {
+      "snippet": "fontspec[${2:font features}]{${1:font}}"
+    },
+    "fontspec{}[]": {
+      "snippet": "fontspec{${1:font}}[${2:font features}]"
+    },
+    "fontspec[]{}[]": {
+      "snippet": "fontspec[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "IfFontExistsTF{}{}{}": {
+      "snippet": "IfFontExistsTF{${1:font name}}{${2:true}}{${3:false}}"
+    },
+    "newfontface{}{}": {
+      "snippet": "newfontface{${1:cmd}}{${2:font}}"
+    },
+    "newfontface{}[]{}": {
+      "snippet": "newfontface{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "newfontface{}{}[]": {
+      "snippet": "newfontface{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "newfontface{}[]{}[]": {
+      "snippet": "newfontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "setfontface{}{}": {
+      "snippet": "setfontface{${1:cmd}}{${2:font}}"
+    },
+    "setfontface{}[]{}": {
+      "snippet": "setfontface{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "setfontface{}{}[]": {
+      "snippet": "setfontface{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "setfontface{}[]{}[]": {
+      "snippet": "setfontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "renewfontface{}{}": {
+      "snippet": "renewfontface{${1:cmd}}{${2:font}}"
+    },
+    "renewfontface{}[]{}": {
+      "snippet": "renewfontface{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "renewfontface{}{}[]": {
+      "snippet": "renewfontface{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "renewfontface{}[]{}[]": {
+      "snippet": "renewfontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "providefontface{}{}": {
+      "snippet": "providefontface{${1:cmd}}{${2:font}}"
+    },
+    "providefontface{}[]{}": {
+      "snippet": "providefontface{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "providefontface{}{}[]": {
+      "snippet": "providefontface{${1:cmd}}{${2:font}}[${3:font features}]"
+    },
+    "providefontface{}[]{}[]": {
+      "snippet": "providefontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
+    },
+    "setmathrm{}": {
+      "snippet": "setmathrm{${1:font}}"
+    },
+    "setmathrm[]{}": {
+      "snippet": "setmathrm[${2:font features}]{${1:font}}"
+    },
+    "setmathrm{}[]": {
+      "snippet": "setmathrm{${1:font}}[${2:font features}]"
+    },
+    "setmathrm[]{}[]": {
+      "snippet": "setmathrm[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "setmathsf{}": {
+      "snippet": "setmathsf{${1:font}}"
+    },
+    "setmathsf[]{}": {
+      "snippet": "setmathsf[${2:font features}]{${1:font}}"
+    },
+    "setmathsf{}[]": {
+      "snippet": "setmathsf{${1:font}}[${2:font features}]"
+    },
+    "setmathsf[]{}[]": {
+      "snippet": "setmathsf[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "setmathtt{}": {
+      "snippet": "setmathtt{${1:font}}"
+    },
+    "setmathtt[]{}": {
+      "snippet": "setmathtt[${2:font features}]{${1:font}}"
+    },
+    "setmathtt{}[]": {
+      "snippet": "setmathtt{${1:font}}[${2:font features}]"
+    },
+    "setmathtt[]{}[]": {
+      "snippet": "setmathtt[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "setboldmathrm{}": {
+      "snippet": "setboldmathrm{${1:font}}"
+    },
+    "setboldmathrm[]{}": {
+      "snippet": "setboldmathrm[${2:font features}]{${1:font}}"
+    },
+    "setboldmathrm{}[]": {
+      "snippet": "setboldmathrm{${1:font}}[${2:font features}]"
+    },
+    "setboldmathrm[]{}[]": {
+      "snippet": "setboldmathrm[${2:font features}]{${1:font}}[${3:font features}]"
+    },
+    "defaultfontfeatures{}": {
+      "snippet": "defaultfontfeatures{${1:font features}}"
+    },
+    "defaultfontfeatures[]{}": {
+      "snippet": "defaultfontfeatures[${2:font name list}]{${1:font features}}"
+    },
+    "IfFontFeatureActiveTF{}{}{}": {
+      "snippet": "IfFontFeatureActiveTF{${1:font feature}}{${2:true}}{${3:false}}"
+    },
+    "addfontfeatures{}": {
+      "snippet": "addfontfeatures{${1:font features}}"
+    },
+    "addfontfeature{}": {
+      "snippet": "addfontfeature{${1:font features}}"
+    },
+    "EncodingCommand{}[][]{}": {
+      "snippet": "EncodingCommand{${1:cmd}}[${2:num}][${3:default}]{${4:code}}"
+    },
+    "EncodingAccent{}{}": {
+      "snippet": "EncodingAccent{${1:cmd}}{${2:code}}"
+    },
+    "EncodingSymbol{}{}": {
+      "snippet": "EncodingSymbol{${1:cmd}}{${2:code}}"
+    },
+    "EncodingComposite{}{}{}": {
+      "snippet": "EncodingComposite{${1:cmd}}{${2:letter}}{${3:slot}}"
+    },
+    "EncodingCompositeCommand(){}{}": {
+      "snippet": "EncodingCompositeCommand(${3:cmd}){${1:letter}}{${2:code}}"
+    },
+    "UndeclareSymbol{}": {
+      "snippet": "UndeclareSymbol{${1:cmd}}"
+    },
+    "UndeclareAccent{}": {
+      "snippet": "UndeclareAccent{${1:cmd}}"
+    },
+    "UndeclareCommand{}": {
+      "snippet": "UndeclareCommand{${1:cmd}}"
+    },
+    "UndeclareComposite{}{}": {
+      "snippet": "UndeclareComposite{${1:cmd}}{${2:letter}}"
+    },
+    "newAATfeature{}{}{}{}": {
+      "snippet": "newAATfeature{${1:feature}}{${2:option}}{${3:feature code}}{${4:selector code}}"
+    },
+    "newopentypefeature{}{}{}": {
+      "snippet": "newopentypefeature{${1:feature}}{${2:option}}{${3:feature tag}}"
+    },
+    "newfontfeature{}{}": {
+      "snippet": "newfontfeature{${1:name}}{${2:input string}}"
+    },
+    "newfontscript{}{}": {
+      "snippet": "newfontscript{${1:fontspec name}}{${2:OpenType tag list}}"
+    },
+    "newfontlanguage{}{}": {
+      "snippet": "newfontlanguage{${1:fontspec name}}{${2:OpenType tag list}}"
+    },
+    "aliasfontfeature{}{}": {
+      "snippet": "aliasfontfeature{${1:existing name}}{${2:new name}}"
+    },
+    "aliasfontfeatureoption{}{}{}": {
+      "snippet": "aliasfontfeatureoption{${1:font feature}}{${2:existing name}}{${3:new name}}"
+    },
+    "cyrillicencoding": {},
+    "latinencoding": {},
+    "UTFencname": {},
+    "emfontdeclare{}": {
+      "snippet": "emfontdeclare{${1:font-switching list}}"
+    },
+    "FontspecSetCheckBoolFalse": {},
+    "FontspecSetCheckBoolTrue": {},
+    "scitdefault": {},
+    "scsldefault": {},
+    "scswdefault": {},
+    "UnicodeEncodingName": {},
+    "UnicodeFontTeXLigatures": {},
+    "UnicodeFontFile{}{}": {
+      "snippet": "UnicodeFontFile{${1:arg1}}{${2:arg2}}"
+    },
+    "UnicodeFontName{}{}": {
+      "snippet": "UnicodeFontName{${1:arg1}}{${2:arg2}}"
+    },
+    "DeclareUnicodeAccent{}{}{}": {
+      "snippet": "DeclareUnicodeAccent{${1:cmd}}{${2:encoding}}{${3:char code}}"
+    },
+    "DeclareUnicodeCommand{}{}": {
+      "snippet": "DeclareUnicodeCommand{${1:command}}{${2:slot}}"
+    },
+    "DeclareUnicodeComposite{}{}{}": {
+      "snippet": "DeclareUnicodeComposite{${1:cmd}}{${2:letter}}{${3:definition}}"
+    },
+    "DeclareUnicodeSymbol{}{}": {
+      "snippet": "DeclareUnicodeSymbol{${1:command}}{${2:definition}}"
+    },
+    "textquotedbl": {},
+    "guillemetleft": {},
+    "guillemotleft": {},
+    "guillemetright": {},
+    "guillemotright": {},
+    "DH": {},
+    "TH": {},
+    "dh": {},
+    "th": {},
+    "DJ": {},
+    "dj": {},
+    "NG": {},
+    "ng": {},
+    "quotesinglbase": {},
+    "quotedblbase": {},
+    "guilsinglleft": {},
+    "guilsinglright": {},
+    "Hwithstroke": {},
+    "hwithstroke": {},
+    "k{}": {
+      "snippet": "k{${1:arg}}"
+    }
+  },
+  "envs": {
+    "strongenv": {}
+  },
+  "options": [
+    "math",
+    "no-math",
+    "config",
+    "no-config",
+    "quiet",
+    "silent",
+    "verbose"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/fonttable.json b/dev/packages/fonttable.json
new file mode 100644
index 000000000..a2bec2bd2
--- /dev/null
+++ b/dev/packages/fonttable.json
@@ -0,0 +1,77 @@
+{
+  "includes": {},
+  "macros": {
+    "fnthours": {},
+    "fonttable{}": {
+      "snippet": "fonttable{${1:test font}}"
+    },
+    "xfonttable{}{}{}{}": {
+      "snippet": "xfonttable{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
+    },
+    "pikfont{}{}{}{}": {
+      "snippet": "pikfont{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
+    },
+    "fontrange{}{}": {
+      "snippet": "fontrange{${1:low}}{${2:high}}"
+    },
+    "decimals": {},
+    "nodecimals": {},
+    "hexoct": {},
+    "nohexoct": {},
+    "ftablewidth": {},
+    "fntcolwidth": {},
+    "fonttext{}": {
+      "snippet": "fonttext{${1:test font}}"
+    },
+    "simpletext": {},
+    "fulltext": {},
+    "regulartext{}": {
+      "snippet": "regulartext{${1:font spec}}"
+    },
+    "fonttexts{}{}": {
+      "snippet": "fonttexts{${1:test font}}{${2:text}}"
+    },
+    "regulartexts{}{}": {
+      "snippet": "regulartexts{${1:font spec}}{${2:text}}"
+    },
+    "germanparatext": {},
+    "latinparatext": {},
+    "aztext": {},
+    "AZtext": {},
+    "digitstext": {},
+    "punctext": {},
+    "glyphmixture{}{}{}": {
+      "snippet": "glyphmixture{${1:test glyph}}{${2:start glyph}}{${3:end glyph}}"
+    },
+    "glyphalternation{}{}{}": {
+      "snippet": "glyphalternation{${1:test glyph}}{${2:start glyph}}{${3:end glyph}}"
+    },
+    "glyphseries{}{}{}": {
+      "snippet": "glyphseries{${1:test glyph}}{${2:start glyph}}{${3:end glyph}}"
+    },
+    "glyphalphabet{}": {
+      "snippet": "glyphalphabet{${1:test glyph}}"
+    },
+    "GLYPHALPHABET{}": {
+      "snippet": "GLYPHALPHABET{${1:test glyph}}"
+    },
+    "glyphlowers": {},
+    "glyphuppers": {},
+    "glyphdigits": {},
+    "glyphpunct": {},
+    "sevenrm": {},
+    "ifhexoct": {},
+    "ftable": {},
+    "knutext": {},
+    "moreknutext": {},
+    "capknutext": {},
+    "knunames": {},
+    "guillemotleft": {},
+    "guillemotright": {},
+    "flqq": {},
+    "frqq": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/fontwrap.json b/dev/packages/fontwrap.json
index 778c0fcfe..0ef4e5755 100644
--- a/dev/packages/fontwrap.json
+++ b/dev/packages/fontwrap.json
@@ -20,10 +20,10 @@
       "snippet": "fontwrap{${1:text}}"
     },
     "setfontwrapallowedmacros{}": {
-      "snippet": "setfontwrapallowedmacros{${1:csname1,csname2,...}}"
+      "snippet": "setfontwrapallowedmacros{${1:csname1,${2:csname2},...}}"
     },
     "setfontwrapallowedenvironments{}": {
-      "snippet": "setfontwrapallowedenvironments{${1:envname1,envname2,...}}"
+      "snippet": "setfontwrapallowedenvironments{${1:envname1,${2:envname2},...}}"
     },
     "autfontunicodedata": {},
     "fontwrapallowedenvironments": {},
diff --git a/dev/packages/footnote.json b/dev/packages/footnote.json
new file mode 100644
index 000000000..1d2a9ca4b
--- /dev/null
+++ b/dev/packages/footnote.json
@@ -0,0 +1,36 @@
+{
+  "includes": {},
+  "macros": {
+    "savenotes": {},
+    "spewnotes": {},
+    "makesavenoteenv{}": {
+      "snippet": "makesavenoteenv{${1:environment}}"
+    },
+    "makesavenoteenv[]{}": {
+      "snippet": "makesavenoteenv[${2:new_envname}]{${1:environment}}"
+    }
+  },
+  "envs": {
+    "savenotes": {},
+    "minipage*{}": {
+      "name": "minipage*",
+      "snippet": "{${1:width}}"
+    },
+    "minipage*[]{}": {
+      "name": "minipage*",
+      "snippet": "[${2:position}]{${1:width}}"
+    },
+    "minipage*[][][]{}": {
+      "name": "minipage*",
+      "snippet": "[${2:position}][${3:height}][${4:inner-pos}]{${1:width}}"
+    },
+    "footnote": {},
+    "footnote[]": {
+      "name": "footnote",
+      "snippet": "[${1:number}]"
+    },
+    "footnotetext": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/forest-index.json b/dev/packages/forest-index.json
index 66ce2b4d4..8903a8ae7 100644
--- a/dev/packages/forest-index.json
+++ b/dev/packages/forest-index.json
@@ -6,6 +6,12 @@
     "index[]{}": {
       "snippet": "index[${2:index options}]{${1:content}}"
     },
+    "index(){}": {
+      "snippet": "index(${2:early options}){${1:content}}"
+    },
+    "index()[]{}": {
+      "snippet": "index(${3:early options})[${2:index options}]{${1:content}}"
+    },
     "indexdef{}": {
       "snippet": "indexdef{${1:option>content}}"
     },
@@ -18,6 +24,9 @@
     "indexitem{}": {
       "snippet": "indexitem{${1:option>content}}"
     },
+    "indexitem(){}": {
+      "snippet": "indexitem(${2:default}){${1:option>content}}"
+    },
     "indexset[]>{}": {
       "snippet": "indexset[${2:index options}]>{${1:entry}}"
     },
diff --git a/dev/packages/forest.json b/dev/packages/forest.json
index d15a3b8d2..7c4bc4990 100644
--- a/dev/packages/forest.json
+++ b/dev/packages/forest.json
@@ -23,9 +23,15 @@
     "Forest{}": {
       "snippet": "Forest{${1:tree}}"
     },
+    "Forest(){}": {
+      "snippet": "Forest(${2:config}){${1:tree}}"
+    },
     "Forest*{}": {
       "snippet": "Forest*{${1:tree}}"
     },
+    "Forest*(){}": {
+      "snippet": "Forest*(${2:config}){${1:tree}}"
+    },
     "forestset{}": {
       "snippet": "forestset{${1:specs}}"
     },
@@ -117,6 +123,12 @@
     "forestdebugtempfalse": {},
     "forestdebugtemptrue": {},
     "forestdebugtrue": {},
+    "forestdebugtypeouttree()": {
+      "snippet": "forestdebugtypeouttree(${1:arg})"
+    },
+    "forestdebugtypeouttree()[]": {
+      "snippet": "forestdebugtypeouttree(${2:arg})[${1:opt}]"
+    },
     "forestdebugtypeouttreenodeinfo": {},
     "forestdebugtypeouttrees": {},
     "forestdebugtypeouttrees[]": {
diff --git a/dev/packages/forloop.json b/dev/packages/forloop.json
new file mode 100644
index 000000000..754c01bc0
--- /dev/null
+++ b/dev/packages/forloop.json
@@ -0,0 +1,22 @@
+{
+  "includes": {
+    "ifthen": []
+  },
+  "macros": {
+    "forloop{}{}{}{}": {
+      "snippet": "forloop{${1:counter}}{${2:initial value}}{${3:condition}}{${4:code}}"
+    },
+    "forloop[]{}{}{}{}": {
+      "snippet": "forloop[${5:step}]{${1:counter}}{${2:initial value}}{${3:condition}}{${4:code}}"
+    },
+    "forLoop{}{}{}{}": {
+      "snippet": "forLoop{${1:start}}{${2:stop}}{${3:counter}}{${4:code}}"
+    },
+    "forLoop[]{}{}{}{}": {
+      "snippet": "forLoop[${5:step}]{${1:start}}{${2:stop}}{${3:counter}}{${4:code}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/forms16be.json b/dev/packages/forms16be.json
index 937689d1d..cf7229f22 100644
--- a/dev/packages/forms16be.json
+++ b/dev/packages/forms16be.json
@@ -4,12 +4,18 @@
     "defUniStr{}{}": {
       "snippet": "defUniStr{${1:name}}{${2:string}}"
     },
+    "unicodeStr()": {
+      "snippet": "unicodeStr(${1:name})"
+    },
     "EURO": {},
     "BSLASH": {},
     "LBRACE": {},
     "RBRACE": {},
     "DQUOTE": {},
     "ucspace": {},
+    "aref()": {
+      "snippet": "aref(${1:arg})"
+    },
     "convertChriiUnicode{}{}": {
       "snippet": "convertChriiUnicode{${1:char}}{${2:codepoint}}"
     },
diff --git a/dev/packages/fp.json b/dev/packages/fp.json
new file mode 100644
index 000000000..150f569c6
--- /dev/null
+++ b/dev/packages/fp.json
@@ -0,0 +1,22 @@
+{
+  "includes": {
+    "defpattern": [],
+    "fp-basic": [],
+    "fp-addons": [],
+    "fp-snap": [],
+    "fp-exp": [],
+    "fp-trigo": [],
+    "fp-pas": [],
+    "fp-random": [],
+    "fp-eqn": [],
+    "fp-upn": [],
+    "fp-eval": []
+  },
+  "macros": {},
+  "envs": {},
+  "options": [
+    "nomessages",
+    "debug"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/framed.json b/dev/packages/framed.json
new file mode 100644
index 000000000..f30e27c62
--- /dev/null
+++ b/dev/packages/framed.json
@@ -0,0 +1,38 @@
+{
+  "includes": {},
+  "macros": {
+    "MakeFramed{}": {
+      "snippet": "MakeFramed{${1:settings}}"
+    },
+    "endMakeFramed": {},
+    "FrameCommand": {},
+    "FirstFrameCommand": {},
+    "LastFrameCommand": {},
+    "MidFrameCommand": {},
+    "FrameRestore": {},
+    "FrameRule": {},
+    "FrameSep": {},
+    "FrameHeightAdjust": {},
+    "OuterFrameSep": {},
+    "CustomFBox{}{}{}{}{}{}": {
+      "snippet": "CustomFBox{${1:after-top}}{${2:above-bottom}}{${3:trulewidth}}{${4:brulewidth}}{${5:lrulewidth}}{${6:rrulewidth}}"
+    },
+    "OpenFBox{}{}": {
+      "snippet": "OpenFBox{${1:trulewidth}}{${2:brulewidth}}"
+    },
+    "TitleBarFrame[]{}{}": {
+      "snippet": "TitleBarFrame[${3:marker}]{${1:title}}{${2:contents}}"
+    }
+  },
+  "envs": {
+    "framed": {},
+    "oframed": {},
+    "shaded": {},
+    "shaded*": {},
+    "snugshade": {},
+    "snugshade*": {},
+    "leftbar": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/fullpict.json b/dev/packages/fullpict.json
index a033e9c8f..1eb1e78de 100644
--- a/dev/packages/fullpict.json
+++ b/dev/packages/fullpict.json
@@ -43,9 +43,94 @@
     "origin{}": {
       "snippet": "origin{${1:size}}"
     },
+    "cput(){}": {
+      "snippet": "cput(${2:x},${3:y}){${1:text}}"
+    },
+    "nput(){}": {
+      "snippet": "nput(${2:x},${3:y}){${1:text}}"
+    },
+    "sput(){}": {
+      "snippet": "sput(${2:x},${3:y}){${1:text}}"
+    },
+    "eput(){}": {
+      "snippet": "eput(${2:x},${3:y}){${1:text}}"
+    },
+    "wput(){}": {
+      "snippet": "wput(${2:x},${3:y}){${1:text}}"
+    },
+    "neput(){}": {
+      "snippet": "neput(${2:x},${3:y}){${1:text}}"
+    },
+    "seput(){}": {
+      "snippet": "seput(${2:x},${3:y}){${1:text}}"
+    },
+    "nwput(){}": {
+      "snippet": "nwput(${2:x},${3:y}){${1:text}}"
+    },
+    "swput(){}": {
+      "snippet": "swput(${2:x},${3:y}){${1:text}}"
+    },
+    "angleput{}(){}": {
+      "snippet": "angleput{${1:angle}}(${3:x},${4:y}){${2:text}}"
+    },
+    "angleput{}[](){}": {
+      "snippet": "angleput{${1:angle}}[${2:radius}](${4:x},${5:y}){${3:text}}"
+    },
+    "Vector(){}": {
+      "snippet": "Vector(${2:x},${3:y}){${1:length}}"
+    },
     "lcm": {}
   },
-  "envs": {},
+  "envs": {
+    "fullpicture(width,height)": {
+      "name": "fullpicture",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "fullpicture(width,height)(xoffset,yoffset)": {
+      "name": "fullpicture",
+      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
+    },
+    "halfpicture(width,height)": {
+      "name": "halfpicture",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "halfpicture(width,height)(xoffset,yoffset)": {
+      "name": "halfpicture",
+      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
+    },
+    "scalepicture{}(width,height)": {
+      "name": "scalepicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})"
+    },
+    "scalepicture{}(width,height)(xoffset,yoffset)": {
+      "name": "scalepicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
+    },
+    "Scalepicture{}(width,height)": {
+      "name": "Scalepicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})"
+    },
+    "Scalepicture{}(width,height)(xoffset,yoffset)": {
+      "name": "Scalepicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
+    },
+    "scaledpicture{}(width,height)": {
+      "name": "scaledpicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})"
+    },
+    "scaledpicture{}(width,height)(xoffset,yoffset)": {
+      "name": "scaledpicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
+    },
+    "Scaledpicture{}(width,height)": {
+      "name": "Scaledpicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})"
+    },
+    "Scaledpicture{}(width,height)(xoffset,yoffset)": {
+      "name": "Scaledpicture",
+      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
+    }
+  },
   "options": [],
   "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/functional.json b/dev/packages/functional.json
new file mode 100644
index 000000000..e35a030cd
--- /dev/null
+++ b/dev/packages/functional.json
@@ -0,0 +1,1186 @@
+{
+  "includes": {},
+  "macros": {
+    "IgnoreSpacesOn": {},
+    "IgnoreSpacesOff": {},
+    "Functional{}": {
+      "snippet": "Functional{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "prgNewFunction{}{}{}": {
+      "snippet": "prgNewFunction{${1:cmd}}{${2:xargs}}{${3:def}}"
+    },
+    "prgSetEqFunction{}": {
+      "snippet": "prgSetEqFunction{${1:cmd}}"
+    },
+    "prgNewConditional{}{}{}": {
+      "snippet": "prgNewConditional{${1:cmd}}{${2:xargs}}{${3:def}}"
+    },
+    "prgReturn{}": {
+      "snippet": "prgReturn{${1:tokens}}"
+    },
+    "prgPrint{}": {
+      "snippet": "prgPrint{${1:tokens}}"
+    },
+    "gResultTl": {},
+    "prgDo{}": {
+      "snippet": "prgDo{${1:code}}"
+    },
+    "prgRunOneArgCode{}{}": {
+      "snippet": "prgRunOneArgCode{${1:arg1}}{${2:code}}"
+    },
+    "prgRunTwoArgCode{}{}{}": {
+      "snippet": "prgRunTwoArgCode{${1:arg1}}{${2:arg2}}{${3:code}}"
+    },
+    "prgRunThreeArgCode{}{}{}{}": {
+      "snippet": "prgRunThreeArgCode{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:code}}"
+    },
+    "prgRunFourArgCode{}{}{}{}{}": {
+      "snippet": "prgRunFourArgCode{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:code}}"
+    },
+    "evalWhole{}": {
+      "snippet": "evalWhole{${1:tokens}}"
+    },
+    "evalNone{}": {
+      "snippet": "evalNone{${1:tokens}}"
+    },
+    "expName{}": {
+      "snippet": "expName{${1:csname}}"
+    },
+    "expWhole{}": {
+      "snippet": "expWhole{${1:tokens}}"
+    },
+    "unExpand{}": {
+      "snippet": "unExpand{${1:tokens}}"
+    },
+    "onlyName{}": {
+      "snippet": "onlyName{${1:tokens}}"
+    },
+    "onlyValue{}": {
+      "snippet": "onlyValue{${1:tokens}}"
+    },
+    "useOne{}": {
+      "snippet": "useOne{${1:arg}}"
+    },
+    "gobbleOne{}": {
+      "snippet": "gobbleOne{${1:arg}}"
+    },
+    "useGobble{}{}": {
+      "snippet": "useGobble{${1:arg1}}{${2:arg2}}"
+    },
+    "gobbleUse{}{}": {
+      "snippet": "gobbleUse{${1:arg1}}{${2:arg2}}"
+    },
+    "cTrueBool": {},
+    "cFalseBool": {},
+    "lTmpaBool": {},
+    "lTmpbBool": {},
+    "lTmpcBool": {},
+    "lTmpiBool": {},
+    "lTmpjBool": {},
+    "lTmpkBool": {},
+    "gTmpaBool": {},
+    "gTmpbBool": {},
+    "gTmpcBool": {},
+    "gTmpiBool": {},
+    "gTmpjBool": {},
+    "gTmpkBool": {},
+    "boolNew{}": {
+      "snippet": "boolNew{${1:cmd}}"
+    },
+    "boolConst{}": {
+      "snippet": "boolConst{${1:cmd}}"
+    },
+    "boolSet{}": {
+      "snippet": "boolSet{${1:cmd}}"
+    },
+    "boolLog {}": {
+      "snippet": "boolLog {${1:bool expr}}"
+    },
+    "boolShow {}": {
+      "snippet": "boolShow {${1:bool expr}}"
+    },
+    "cSpaceTl": {},
+    "cEmptyTl": {},
+    "lTmpaTl": {},
+    "lTmpbTl": {},
+    "lTmpcTl": {},
+    "lTmpiTl": {},
+    "lTmpjTl": {},
+    "lTmpkTl": {},
+    "gTmpaTl": {},
+    "gTmpbTl": {},
+    "gTmpcTl": {},
+    "gTmpiTl": {},
+    "gTmpjTl": {},
+    "gTmpkTl": {},
+    "tlNew{}": {
+      "snippet": "tlNew{${1:cmd}}"
+    },
+    "tlConst{}{}": {
+      "snippet": "tlConst{${1:cmd}}{${2:def}}"
+    },
+    "tlToStr {}": {
+      "snippet": "tlToStr {${1:tokens}}"
+    },
+    "tlToStr{}": {
+      "snippet": "tlToStr{${1:tokens}}"
+    },
+    "tlLog {}": {
+      "snippet": "tlLog {${1:tokens}}"
+    },
+    "tlLog{}": {
+      "snippet": "tlLog{${1:tokens}}"
+    },
+    "tlShow {}": {
+      "snippet": "tlShow {${1:tokens}}"
+    },
+    "tlShow{}": {
+      "snippet": "tlShow{${1:tokens}}"
+    },
+    "tlSet{}{}": {
+      "snippet": "tlSet{${1:cmd}}{${2:def}}"
+    },
+    "tlSetEq{}": {
+      "snippet": "tlSetEq{${1:cmd}}"
+    },
+    "tlClearNew{}": {
+      "snippet": "tlClearNew{${1:cmd}}"
+    },
+    "tlConcat{}": {
+      "snippet": "tlConcat{${1:cmd}}"
+    },
+    "tlTrimSpaces {}": {
+      "snippet": "tlTrimSpaces {${1:tokens}}"
+    },
+    "tlCount {}": {
+      "snippet": "tlCount {${1:tokens}}"
+    },
+    "tlCount{}": {
+      "snippet": "tlCount{${1:tokens}}"
+    },
+    "tlHead {}": {
+      "snippet": "tlHead {${1:tokens}}"
+    },
+    "tlTail {}": {
+      "snippet": "tlTail {${1:tokens}}"
+    },
+    "tlItem {} {}": {
+      "snippet": "tlItem {${1:tokens}} {${2:int expr}}"
+    },
+    "tlRandItem {}": {
+      "snippet": "tlRandItem {${1:tokens}}"
+    },
+    "tlMapInline {} {}": {
+      "snippet": "tlMapInline {${1:tokens}} {${2:inline function}}"
+    },
+    "tlMapVariable{}{}{}": {
+      "snippet": "tlMapVariable{${1:tokens}}{${2:cmd}}{${3:def}}"
+    },
+    "tlVarMapVariable{}{}{}": {
+      "snippet": "tlVarMapVariable{${1:tlvar}}{${2:cmd}}{${3:def}}"
+    },
+    "tlIfEmpty {}": {
+      "snippet": "tlIfEmpty {${1:tokens}}"
+    },
+    "tlIfEmptyT {} {}": {
+      "snippet": "tlIfEmptyT {${1:tokens}} {${2:true code}}"
+    },
+    "tlIfEmptyF {} {}": {
+      "snippet": "tlIfEmptyF {${1:tokens}} {${2:false code}}"
+    },
+    "tlIfEmptyTF {} {} {}": {
+      "snippet": "tlIfEmptyTF {${1:tokens}} {${2:true code}} {${3:false code}}"
+    },
+    "tlIfBlank {}": {
+      "snippet": "tlIfBlank {${1:tokens}}"
+    },
+    "tlIfBlankT {} {}": {
+      "snippet": "tlIfBlankT {${1:tokens}} {${2:true code}}"
+    },
+    "tlIfBlankF {} {}": {
+      "snippet": "tlIfBlankF {${1:tokens}} {${2:false code}}"
+    },
+    "tlIfBlankTF {} {} {}": {
+      "snippet": "tlIfBlankTF {${1:tokens}} {${2:true code}} {${3:false code}}"
+    },
+    "tlIfEq {} {}": {
+      "snippet": "tlIfEq {${1:tokens1}} {${2:tokens2}}"
+    },
+    "tlIfEqT {} {} {}": {
+      "snippet": "tlIfEqT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
+    },
+    "tlIfEqF {} {} {}": {
+      "snippet": "tlIfEqF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
+    },
+    "tlIfEqTF {} {} {} {}": {
+      "snippet": "tlIfEqTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
+    },
+    "tlIfIn {} {}": {
+      "snippet": "tlIfIn {${1:tokens1}} {${2:tokens2}}"
+    },
+    "tlIfInT {} {} {}": {
+      "snippet": "tlIfInT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
+    },
+    "tlIfInF {} {} {}": {
+      "snippet": "tlIfInF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
+    },
+    "tlIfInTF {} {} {} {}": {
+      "snippet": "tlIfInTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
+    },
+    "tlIfSingle {}": {
+      "snippet": "tlIfSingle {${1:tokens}}"
+    },
+    "tlIfSingleT {} {}": {
+      "snippet": "tlIfSingleT {${1:tokens}} {${2:true code}}"
+    },
+    "tlIfSingleF {} {}": {
+      "snippet": "tlIfSingleF {${1:tokens}} {${2:false code}}"
+    },
+    "tlIfSingleTF {} {} {}": {
+      "snippet": "tlIfSingleTF {${1:tokens}} {${2:true code}} {${3:false code}}"
+    },
+    "cAmpersandStr": {},
+    "cAtsignStr": {},
+    "cBackslashStr": {},
+    "cLeftBraceStr": {},
+    "cRightBraceStr": {},
+    "cCircumflexStr": {},
+    "cColonStr": {},
+    "cDollarStr": {},
+    "cHashStr": {},
+    "cPercentStr": {},
+    "cTildeStr": {},
+    "cUnderscoreStr": {},
+    "cZeroStr": {},
+    "lTmpaStr": {},
+    "lTmpbStr": {},
+    "lTmpcStr": {},
+    "lTmpiStr": {},
+    "lTmpjStr": {},
+    "lTmpkStr": {},
+    "gTmpaStr": {},
+    "gTmpbStr": {},
+    "gTmpcStr": {},
+    "gTmpiStr": {},
+    "gTmpjStr": {},
+    "gTmpkStr": {},
+    "strNew{}": {
+      "snippet": "strNew{${1:cmd}}"
+    },
+    "strConst{}{}": {
+      "snippet": "strConst{${1:cmd}}{${2:def}}"
+    },
+    "strLog {}": {
+      "snippet": "strLog {${1:tokens}}"
+    },
+    "strLog{}": {
+      "snippet": "strLog{${1:tokens}}"
+    },
+    "strShow {}": {
+      "snippet": "strShow {${1:tokens}}"
+    },
+    "strShow{}": {
+      "snippet": "strShow{${1:tokens}}"
+    },
+    "strSet{}{}": {
+      "snippet": "strSet{${1:cmd}}{${2:def}}"
+    },
+    "strClearNew{}": {
+      "snippet": "strClearNew{${1:cmd}}"
+    },
+    "strConcat{}": {
+      "snippet": "strConcat{${1:cmd}}"
+    },
+    "strCount {}": {
+      "snippet": "strCount {${1:tokens}}"
+    },
+    "strCount{}": {
+      "snippet": "strCount{${1:tokens}}"
+    },
+    "strSize {}": {
+      "snippet": "strSize {${1:tokens}}"
+    },
+    "strSize{}": {
+      "snippet": "strSize{${1:tokens}}"
+    },
+    "strHead {}": {
+      "snippet": "strHead {${1:tokens}}"
+    },
+    "strTail {}": {
+      "snippet": "strTail {${1:tokens}}"
+    },
+    "strItem {} {}": {
+      "snippet": "strItem {${1:tokens}} {${2:int expr}}"
+    },
+    "strMapInline {} {}": {
+      "snippet": "strMapInline {${1:tokens}} {${2:inline function}}"
+    },
+    "strMapVariable{}{}{}": {
+      "snippet": "strMapVariable{${1:tokens}}{${2:cmd}}{${3:def}}"
+    },
+    "strVarMapVariable{}{}{}": {
+      "snippet": "strVarMapVariable{${1:strvar}}{${2:cmd}}{${3:def}}"
+    },
+    "strIfEq {} {}": {
+      "snippet": "strIfEq {${1:tokens1}} {${2:tokens2}}"
+    },
+    "strIfEqT {} {} {}": {
+      "snippet": "strIfEqT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
+    },
+    "strIfEqF {} {} {}": {
+      "snippet": "strIfEqF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
+    },
+    "strIfEqTF {} {} {} {}": {
+      "snippet": "strIfEqTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
+    },
+    "strIfIn {} {}": {
+      "snippet": "strIfIn {${1:tokens1}} {${2:tokens2}}"
+    },
+    "strIfInT {} {} {}": {
+      "snippet": "strIfInT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
+    },
+    "strIfInF {} {} {}": {
+      "snippet": "strIfInF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
+    },
+    "strIfInTF {} {} {} {}": {
+      "snippet": "strIfInTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
+    },
+    "cZeroInt": {},
+    "cOneInt": {},
+    "cMaxInt": {},
+    "cMaxRegisterInt": {},
+    "cMaxCharInt": {},
+    "lTmpaInt": {},
+    "lTmpbInt": {},
+    "lTmpcInt": {},
+    "lTmpiInt": {},
+    "lTmpjInt": {},
+    "lTmpkInt": {},
+    "gTmpaInt": {},
+    "gTmpbInt": {},
+    "gTmpcInt": {},
+    "gTmpiInt": {},
+    "gTmpjInt": {},
+    "gTmpkInt": {},
+    "intEval {}": {
+      "snippet": "intEval {${1:int expr}}"
+    },
+    "intMathAdd {} {}": {
+      "snippet": "intMathAdd {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathSub {} {}": {
+      "snippet": "intMathSub {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathMult {} {}": {
+      "snippet": "intMathMult {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathDiv {} {}": {
+      "snippet": "intMathDiv {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathDivTruncate {} {}": {
+      "snippet": "intMathDivTruncate {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathSign {}": {
+      "snippet": "intMathSign {${1:int expr}}"
+    },
+    "intMathAbs {}": {
+      "snippet": "intMathAbs {${1:int expr}}"
+    },
+    "intMathMax {} {}": {
+      "snippet": "intMathMax {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathMin {} {}": {
+      "snippet": "intMathMin {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathMod {} {}": {
+      "snippet": "intMathMod {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intMathRand {} {}": {
+      "snippet": "intMathRand {${1:int expr1}} {${2:int expr2}}"
+    },
+    "intNew{}": {
+      "snippet": "intNew{${1:cmd}}"
+    },
+    "intConst{}": {
+      "snippet": "intConst{${1:cmd}}"
+    },
+    "intLog {}": {
+      "snippet": "intLog {${1:int expr}}"
+    },
+    "intShow {}": {
+      "snippet": "intShow {${1:int expr}}"
+    },
+    "intSet{}": {
+      "snippet": "intSet{${1:cmd}}"
+    },
+    "intSetEq{}": {
+      "snippet": "intSetEq{${1:cmd}}"
+    },
+    "intZeroNew{}": {
+      "snippet": "intZeroNew{${1:cmd}}"
+    },
+    "intReplicate {} {}": {
+      "snippet": "intReplicate {${1:int expr}} {${2:tokens}}"
+    },
+    "intStepInline {} {} {} {}": {
+      "snippet": "intStepInline {${1:init value}} {${2:step}} {${3:final value}} {${4:code}}"
+    },
+    "intStepOneInline {} {} {}": {
+      "snippet": "intStepOneInline {${1:init value}} {${2:final value}} {${3:code}}"
+    },
+    "intStepVariable{}{}{}{}{}": {
+      "snippet": "intStepVariable{${1:init value}}{${2:step}}{${3:final value}}{${4:cmd}}{${5:code}}"
+    },
+    "intStepOneVariable{}{}{}{}": {
+      "snippet": "intStepOneVariable{${1:init value}}{${2:final value}}{${3:cmd}}{${4:code}}"
+    },
+    "intIfOdd {}": {
+      "snippet": "intIfOdd {${1:int expr}}"
+    },
+    "intIfOddT {} {}": {
+      "snippet": "intIfOddT {${1:int expr}} {${2:true code}}"
+    },
+    "intIfOddF {} {}": {
+      "snippet": "intIfOddF {${1:int expr}} {${2:false code}}"
+    },
+    "intIfOddTF {} {} {}": {
+      "snippet": "intIfOddTF {${1:int expr}} {${2:true code}} {${3:false code}}"
+    },
+    "intIfEven {}": {
+      "snippet": "intIfEven {${1:int expr}}"
+    },
+    "intIfEvenT {} {}": {
+      "snippet": "intIfEvenT {${1:int expr}} {${2:true code}}"
+    },
+    "intIfEvenF {} {}": {
+      "snippet": "intIfEvenF {${1:int expr}} {${2:false code}}"
+    },
+    "intIfEvenTF {} {} {}": {
+      "snippet": "intIfEvenTF {${1:int expr}} {${2:true code}} {${3:false code}}"
+    },
+    "cZeroFp": {},
+    "cMinusZeroFp": {},
+    "cOneFp": {},
+    "cInfFp": {},
+    "cMinusInfFp": {},
+    "cEFp": {},
+    "cPiFp": {},
+    "cOneDegreeFp": {},
+    "lTmpaFp": {},
+    "lTmpbFp": {},
+    "lTmpcFp": {},
+    "lTmpiFp": {},
+    "lTmpjFp": {},
+    "lTmpkFp": {},
+    "gTmpaFp": {},
+    "gTmpbFp": {},
+    "gTmpcFp": {},
+    "gTmpiFp": {},
+    "gTmpjFp": {},
+    "gTmpkFp": {},
+    "fpEval {}": {
+      "snippet": "fpEval {${1:fp expr}}"
+    },
+    "fpMathAdd {} {}": {
+      "snippet": "fpMathAdd {${1:fp expr1}} {${2:fp expr2}}"
+    },
+    "fpMathSub {} {}": {
+      "snippet": "fpMathSub {${1:fp expr1}} {${2:fp expr2}}"
+    },
+    "fpMathMult {} {}": {
+      "snippet": "fpMathMult {${1:fp expr1}} {${2:fp expr2}}"
+    },
+    "fpMathDiv {} {}": {
+      "snippet": "fpMathDiv {${1:fp expr1}} {${2:fp expr2}}"
+    },
+    "fpMathSign {}": {
+      "snippet": "fpMathSign {${1:fp expr}}"
+    },
+    "fpMathAbs {}": {
+      "snippet": "fpMathAbs {${1:fp expr}}"
+    },
+    "fpMathMax {} {}": {
+      "snippet": "fpMathMax {${1:fp expr1}} {${2:fp expr2}}"
+    },
+    "fpMathMin {} {}": {
+      "snippet": "fpMathMin {${1:fp expr1}} {${2:fp expr2}}"
+    },
+    "fpNew{}": {
+      "snippet": "fpNew{${1:cmd}}"
+    },
+    "fpConst{}": {
+      "snippet": "fpConst{${1:cmd}}"
+    },
+    "fpLog {}": {
+      "snippet": "fpLog {${1:fp expr}}"
+    },
+    "fpShow {}": {
+      "snippet": "fpShow {${1:fp expr}}"
+    },
+    "fpSet{}": {
+      "snippet": "fpSet{${1:cmd}}"
+    },
+    "fpSetEq{}": {
+      "snippet": "fpSetEq{${1:cmd}}"
+    },
+    "fpZeroNew{}": {
+      "snippet": "fpZeroNew{${1:cmd}}"
+    },
+    "fpStepInline {} {} {} {}": {
+      "snippet": "fpStepInline {${1:init value}} {${2:step}} {${3:final value}} {${4:code}}"
+    },
+    "fpStepVariable{}{}{}{}{}": {
+      "snippet": "fpStepVariable{${1:init value}}{${2:step}}{${3:final value}}{${4:cmd}}{${5:code}}"
+    },
+    "cMaxDim": {},
+    "cZeroDim": {},
+    "lTmpaDim": {},
+    "lTmpbDim": {},
+    "lTmpcDim": {},
+    "lTmpiDim": {},
+    "lTmpjDim": {},
+    "lTmpkDim": {},
+    "gTmpaDim": {},
+    "gTmpbDim": {},
+    "gTmpcDim": {},
+    "gTmpiDim": {},
+    "gTmpjDim": {},
+    "gTmpkDim": {},
+    "dimEval {}": {
+      "snippet": "dimEval {${1:dim expr}}"
+    },
+    "dimMathAdd {} {}": {
+      "snippet": "dimMathAdd {${1:dim expr1}} {${2:dim expr2}}"
+    },
+    "dimMathSub {} {}": {
+      "snippet": "dimMathSub {${1:dim expr1}} {${2:dim expr2}}"
+    },
+    "dimMathRatio {} {}": {
+      "snippet": "dimMathRatio {${1:dim expr1}} {${2:dim expr2}}"
+    },
+    "dimMathSign {}": {
+      "snippet": "dimMathSign {${1:dim expr}}"
+    },
+    "dimMathAbs {}": {
+      "snippet": "dimMathAbs {${1:dim expr}}"
+    },
+    "dimMathMax {} {}": {
+      "snippet": "dimMathMax {${1:dim expr1}} {${2:dim expr2}}"
+    },
+    "dimMathMin {} {}": {
+      "snippet": "dimMathMin {${1:dim expr1}} {${2:dim expr2}}"
+    },
+    "dimNew{}": {
+      "snippet": "dimNew{${1:cmd}}"
+    },
+    "dimConst{}": {
+      "snippet": "dimConst{${1:cmd}}"
+    },
+    "dimLog {}": {
+      "snippet": "dimLog {${1:dim expr}}"
+    },
+    "dimShow {}": {
+      "snippet": "dimShow {${1:dim expr}}"
+    },
+    "dimSet{}": {
+      "snippet": "dimSet{${1:cmd}}"
+    },
+    "dimSetEq{}": {
+      "snippet": "dimSetEq{${1:cmd}}"
+    },
+    "dimZeroNew{}": {
+      "snippet": "dimZeroNew{${1:cmd}}"
+    },
+    "dimStepInline {} {} {} {}": {
+      "snippet": "dimStepInline {${1:init value}} {${2:step}} {${3:final value}} {${4:code}}"
+    },
+    "dimStepVariable{}{}{}{}{}": {
+      "snippet": "dimStepVariable{${1:init value}}{${2:step}}{${3:final value}}{${4:cmd}}{${5:code}}"
+    },
+    "cEmptyClist": {},
+    "lTmpaClist": {},
+    "lTmpbClist": {},
+    "lTmpcClist": {},
+    "lTmpiClist": {},
+    "lTmpjClist": {},
+    "lTmpkClist": {},
+    "gTmpaClist": {},
+    "gTmpbClist": {},
+    "gTmpcClist": {},
+    "gTmpiClist": {},
+    "gTmpjClist": {},
+    "gTmpkClist": {},
+    "clistNew{}": {
+      "snippet": "clistNew{${1:cmd}}"
+    },
+    "clistConst{}": {
+      "snippet": "clistConst{${1:cmd}}"
+    },
+    "clistJoin {} {}": {
+      "snippet": "clistJoin {${1:comma list}} {${2:separator}}"
+    },
+    "clistJoinExtended {} {} {} {}": {
+      "snippet": "clistJoinExtended {${1:comma list}} {${2:sep for 2}} {${3:sep for >2}} {${4:sep for final 2}}"
+    },
+    "clistLog {}": {
+      "snippet": "clistLog {${1:comma list}}"
+    },
+    "clistShow {}": {
+      "snippet": "clistShow {${1:comma list}}"
+    },
+    "clistSet{}": {
+      "snippet": "clistSet{${1:cmd}}"
+    },
+    "clistSetEq{}": {
+      "snippet": "clistSetEq{${1:cmd}}"
+    },
+    "clistSetFromSeq{}{}": {
+      "snippet": "clistSetFromSeq{${1:cmd}}{${2:arg}}"
+    },
+    "clistClearNew{}": {
+      "snippet": "clistClearNew{${1:cmd}}"
+    },
+    "clistCount {}": {
+      "snippet": "clistCount {${1:comma list}}"
+    },
+    "clistItem {} {}": {
+      "snippet": "clistItem {${1:comma list}} {${2:int expr}}"
+    },
+    "clistRandItem {}": {
+      "snippet": "clistRandItem {${1:comma list}}"
+    },
+    "clistGet{}{}": {
+      "snippet": "clistGet{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistGetT{}{}": {
+      "snippet": "clistGetT{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistGetF{}{}": {
+      "snippet": "clistGetF{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistGetTF{}{}": {
+      "snippet": "clistGetTF{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistPop{}{}": {
+      "snippet": "clistPop{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistPopT{}{}": {
+      "snippet": "clistPopT{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistPopF{}{}": {
+      "snippet": "clistPopF{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistPopTF{}{}": {
+      "snippet": "clistPopTF{${1:clistvar}}{${2:cmd}}"
+    },
+    "clistMapInline {} {}": {
+      "snippet": "clistMapInline {${1:comma list}} {${2:inline function}}"
+    },
+    "clistMapVariable{}{}{}": {
+      "snippet": "clistMapVariable{${1:comma list}}{${2:cmd}}{${3:def}}"
+    },
+    "clistVarMapVariable{}{}{}": {
+      "snippet": "clistVarMapVariable{${1:clistvar}}{${2:cmd}}{${3:def}}"
+    },
+    "clistIfEmpty {}": {
+      "snippet": "clistIfEmpty {${1:comma list}}"
+    },
+    "clistIfEmptyT {} {}": {
+      "snippet": "clistIfEmptyT {${1:comma list}} {${2:true code}}"
+    },
+    "clistIfEmptyF {} {}": {
+      "snippet": "clistIfEmptyF {${1:comma list}} {${2:false code}}"
+    },
+    "clistIfEmptyTF {} {} {}": {
+      "snippet": "clistIfEmptyTF {${1:comma list}} {${2:true code}} {${3:false code}}"
+    },
+    "clistIfIn {} {}": {
+      "snippet": "clistIfIn {${1:comma list}} {${2:item}}"
+    },
+    "clistIfInT {} {} {}": {
+      "snippet": "clistIfInT {${1:comma list}} {${2:item}} {${3:true code}}"
+    },
+    "clistIfInF {} {} {}": {
+      "snippet": "clistIfInF {${1:comma list}} {${2:item}} {${3:false code}}"
+    },
+    "clistIfInTF {} {} {} {}": {
+      "snippet": "clistIfInTF {${1:comma list}} {${2:item}} {${3:true code}} {${4:false code}}"
+    },
+    "cEmptySeq": {},
+    "lTmpaSeq": {},
+    "lTmpbSeq": {},
+    "lTmpcSeq": {},
+    "lTmpiSeq": {},
+    "lTmpjSeq": {},
+    "lTmpkSeq": {},
+    "gTmpaSeq": {},
+    "gTmpbSeq": {},
+    "gTmpcSeq": {},
+    "gTmpiSeq": {},
+    "gTmpjSeq": {},
+    "gTmpkSeq": {},
+    "seqNew{}": {
+      "snippet": "seqNew{${1:cmd}}"
+    },
+    "seqConstFromClist{}": {
+      "snippet": "seqConstFromClist{${1:cmd}}"
+    },
+    "seqSetFromClist{}": {
+      "snippet": "seqSetFromClist{${1:cmd}}"
+    },
+    "seqSetSplit{}": {
+      "snippet": "seqSetSplit{${1:cmd}}"
+    },
+    "seqSetEq{}": {
+      "snippet": "seqSetEq{${1:cmd}}"
+    },
+    "seqClearNew{}": {
+      "snippet": "seqClearNew{${1:cmd}}"
+    },
+    "seqVarMapVariable{}{}{}": {
+      "snippet": "seqVarMapVariable{${1:seqvar}}{${2:cmd}}{${3:def}}"
+    },
+    "cEmptyProp": {},
+    "lTmpaProp": {},
+    "lTmpbProp": {},
+    "lTmpcProp": {},
+    "lTmpiProp": {},
+    "lTmpjProp": {},
+    "lTmpkProp": {},
+    "gTmpaProp": {},
+    "gTmpbProp": {},
+    "gTmpcProp": {},
+    "gTmpiProp": {},
+    "gTmpjProp": {},
+    "gTmpkProp": {},
+    "propNew{}": {
+      "snippet": "propNew{${1:cmd}}"
+    },
+    "propConstFromKeyval{}": {
+      "snippet": "propConstFromKeyval{${1:cmd}}"
+    },
+    "propSetFromKeyval{}": {
+      "snippet": "propSetFromKeyval{${1:cmd}}"
+    },
+    "propSetEq{}": {
+      "snippet": "propSetEq{${1:cmd}}"
+    },
+    "propClearNew{}": {
+      "snippet": "propClearNew{${1:cmd}}"
+    },
+    "propGet{}{}{}": {
+      "snippet": "propGet{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "propGetT{}{}{}": {
+      "snippet": "propGetT{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "propGetF{}{}{}": {
+      "snippet": "propGetF{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "propGetTF{}{}{}": {
+      "snippet": "propGetTF{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "propPop{}{}{}": {
+      "snippet": "propPop{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "propPopT{}{}{}": {
+      "snippet": "propPopT{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "propPopF{}{}{}": {
+      "snippet": "propPopF{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "propPopTF{}{}{}": {
+      "snippet": "propPopTF{${1:propvar}}{${2:key}}{${3:cmd}}"
+    },
+    "lTmpaRegex": {},
+    "lTmpbRegex": {},
+    "lTmpcRegex": {},
+    "lTmpiRegex": {},
+    "lTmpjRegex": {},
+    "lTmpkRegex": {},
+    "gTmpaRegex": {},
+    "gTmpbRegex": {},
+    "gTmpcRegex": {},
+    "gTmpiRegex": {},
+    "gTmpjRegex": {},
+    "gTmpkRegex": {},
+    "regex{}": {
+      "snippet": "regex{${1:cmd}}"
+    },
+    "regexSet{}{}": {
+      "snippet": "regexSet{${1:cmd}}{${2:def}}"
+    },
+    "regexConst{}{}": {
+      "snippet": "regexConst{${1:cmd}}{${2:def}}"
+    },
+    "regexLog {}": {
+      "snippet": "regexLog {${1:regex}}"
+    },
+    "regexShow {}": {
+      "snippet": "regexShow {${1:regex}}"
+    },
+    "regexMatch {} {}": {
+      "snippet": "regexMatch {${1:regex}} {${2:tokens}}"
+    },
+    "regexMatchT {} {} {}": {
+      "snippet": "regexMatchT {${1:regex}} {${2:tokens}} {${3:true code}}"
+    },
+    "regexMatchF {} {} {}": {
+      "snippet": "regexMatchF {${1:regex}} {${2:tokens}} {${3:false code}}"
+    },
+    "regexMatchTF {} {} {} {}": {
+      "snippet": "regexMatchTF {${1:regex}} {${2:tokens}} {${3:true code}} {${4:false code}}"
+    },
+    "regexExtractOnce{}{}{}": {
+      "snippet": "regexExtractOnce{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexExtractOnceT{}{}{}": {
+      "snippet": "regexExtractOnceT{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexExtractOnceF{}{}{}": {
+      "snippet": "regexExtractOnceF{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexExtractOnceTF{}{}{}": {
+      "snippet": "regexExtractOnceTF{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractOnce{}{}{}": {
+      "snippet": "regexVarExtractOnce{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractOnceT{}{}{}": {
+      "snippet": "regexVarExtractOnceT{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractOnceF{}{}{}": {
+      "snippet": "regexVarExtractOnceF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractOnceTF{}{}{}": {
+      "snippet": "regexVarExtractOnceTF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexExtractAll{}{}{}": {
+      "snippet": "regexExtractAll{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexExtractAllT{}{}{}": {
+      "snippet": "regexExtractAllT{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexExtractAllF{}{}{}": {
+      "snippet": "regexExtractAllF{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexExtractAllTF{}{}{}": {
+      "snippet": "regexExtractAllTF{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractAll{}{}{}": {
+      "snippet": "regexVarExtractAll{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractAllT{}{}{}": {
+      "snippet": "regexVarExtractAllT{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractAllF{}{}{}": {
+      "snippet": "regexVarExtractAllF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarExtractAllTF{}{}{}": {
+      "snippet": "regexVarExtractAllTF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexSplit{}{}{}": {
+      "snippet": "regexSplit{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexSplitT{}{}{}": {
+      "snippet": "regexSplitT{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexSplitF{}{}{}": {
+      "snippet": "regexSplitF{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexSplitTF{}{}{}": {
+      "snippet": "regexSplitTF{${1:regex}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarSplit{}{}{}": {
+      "snippet": "regexVarSplit{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarSplitT{}{}{}": {
+      "snippet": "regexVarSplitT{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarSplitF{}{}{}": {
+      "snippet": "regexVarSplitF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "regexVarSplitTF{}{}{}": {
+      "snippet": "regexVarSplitTF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
+    },
+    "x{}": {
+      "snippet": "x{${1:hh}}"
+    },
+    "a": {
+      "detail": "𝑎",
+      "documentation": "MATHEMATICAL ITALIC SMALL A"
+    },
+    "e": {
+      "detail": "𝑒",
+      "documentation": "MATHEMATICAL ITALIC SMALL E"
+    },
+    "f": {
+      "detail": "𝑓",
+      "documentation": "MATHEMATICAL ITALIC SMALL F"
+    },
+    "n": {
+      "detail": "𝑛",
+      "documentation": "MATHEMATICAL ITALIC SMALL N"
+    },
+    "r": {
+      "detail": "𝑟",
+      "documentation": "MATHEMATICAL ITALIC SMALL R"
+    },
+    "t": {
+      "detail": "𝑡",
+      "documentation": "MATHEMATICAL ITALIC SMALL T"
+    },
+    "d": {
+      "detail": "𝑑",
+      "documentation": "MATHEMATICAL ITALIC SMALL D"
+    },
+    "h": {
+      "detail": "h",
+      "documentation": "LATIN SMALL LETTER H"
+    },
+    "s": {
+      "detail": "𝑠",
+      "documentation": "MATHEMATICAL ITALIC SMALL S"
+    },
+    "v": {
+      "detail": "𝑣",
+      "documentation": "MATHEMATICAL ITALIC SMALL V"
+    },
+    "w": {
+      "detail": "𝑤",
+      "documentation": "MATHEMATICAL ITALIC SMALL W"
+    },
+    "D": {
+      "detail": "𝐷",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL D"
+    },
+    "H": {
+      "detail": "𝐻",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL H"
+    },
+    "N": {
+      "detail": "𝑁",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL N"
+    },
+    "S": {
+      "detail": "𝑆",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL S"
+    },
+    "V": {
+      "detail": "𝑉",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL V"
+    },
+    "W": {
+      "detail": "𝑊",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL W"
+    },
+    "K": {
+      "detail": "𝐾",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL K"
+    },
+    "c{}": {
+      "snippet": "c{${1:regex}}"
+    },
+    "cC": {},
+    "cB": {},
+    "cE": {},
+    "cM": {},
+    "cT": {},
+    "cP": {},
+    "cU": {},
+    "cD": {},
+    "cS": {},
+    "cL": {},
+    "cO": {},
+    "cA": {},
+    "u{}": {
+      "snippet": "u{${1:var name}}"
+    },
+    "ur{}": {
+      "snippet": "ur{${1:var name}}"
+    },
+    "b": {
+      "detail": "𝑏",
+      "documentation": "MATHEMATICAL ITALIC SMALL B"
+    },
+    "B": {
+      "detail": "𝐵",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL B"
+    },
+    "A": {
+      "detail": "𝐴",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
+    },
+    "Z": {
+      "detail": "𝑍",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL Z"
+    },
+    "z": {
+      "detail": "𝑧",
+      "documentation": "MATHEMATICAL ITALIC SMALL Z"
+    },
+    "G": {
+      "detail": "𝐺",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL G"
+    },
+    "charSetLccode {} {}": {
+      "snippet": "charSetLccode {${1:int expr1}} {${2:int expr2}}"
+    },
+    "charSetUccode {} {}": {
+      "snippet": "charSetUccode {${1:int expr1}} {${2:int expr2}}"
+    },
+    "charValueLccode {}": {
+      "snippet": "charValueLccode {${1:int expr}}"
+    },
+    "charValueUccode {}": {
+      "snippet": "charValueUccode {${1:int expr}}"
+    },
+    "textExpand {}": {
+      "snippet": "textExpand {${1:text}}"
+    },
+    "textLowercase {}": {
+      "snippet": "textLowercase {${1:text}}"
+    },
+    "textUppercase {}": {
+      "snippet": "textUppercase {${1:text}}"
+    },
+    "textTitlecase {}": {
+      "snippet": "textTitlecase {${1:text}}"
+    },
+    "textTitlecaseFirst {}": {
+      "snippet": "textTitlecaseFirst {${1:text}}"
+    },
+    "textLangLowercase {} {}": {
+      "snippet": "textLangLowercase {${1:language}} {${2:text}}"
+    },
+    "textLangUppercase {} {}": {
+      "snippet": "textLangUppercase {${1:language}} {${2:text}}"
+    },
+    "textLangTitlecase {} {}": {
+      "snippet": "textLangTitlecase {${1:language}} {${2:text}}"
+    },
+    "textLangTitlecaseFirst {} {}": {
+      "snippet": "textLangTitlecaseFirst {${1:language}} {${2:text}}"
+    },
+    "fileInput {}": {
+      "snippet": "fileInput {${1:file name}}"
+    },
+    "fileInput{}": {
+      "snippet": "fileInput{${1:file}}"
+    },
+    "fileIfExistInput {}": {
+      "snippet": "fileIfExistInput {${1:file name}}"
+    },
+    "fileIfExistInput{}": {
+      "snippet": "fileIfExistInput{${1:file}}"
+    },
+    "fileIfExistInputF {} {}": {
+      "snippet": "fileIfExistInputF {${1:file name}} {${2:false code}}"
+    },
+    "fileIfExistInputF{}{}": {
+      "snippet": "fileIfExistInputF{${1:file}}{${2:false code}}"
+    },
+    "fileGet{}{}{}": {
+      "snippet": "fileGet{${1:file name}}{${2:setup}}{${3:cmd}}"
+    },
+    "fileGetT{}{}{}{}": {
+      "snippet": "fileGetT{${1:file name}}{${2:setup}}{${3:cmd}}{${4:true code}}"
+    },
+    "fileGetF{}{}{}{}": {
+      "snippet": "fileGetF{${1:file name}}{${2:setup}}{${3:cmd}}{${4:false code}}"
+    },
+    "fileGetTF{}{}{}{}{}": {
+      "snippet": "fileGetTF{${1:file name}}{${2:setup}}{${3:cmd}}{${4:true code}}{${5:false code}}"
+    },
+    "fileIfExist {}": {
+      "snippet": "fileIfExist {${1:file name}}"
+    },
+    "fileIfExistT {} {}": {
+      "snippet": "fileIfExistT {${1:file name}} {${2:true code}}"
+    },
+    "fileIfExistF {} {}": {
+      "snippet": "fileIfExistF {${1:file name}} {${2:false code}}"
+    },
+    "fileIfExistTF {} {} {}": {
+      "snippet": "fileIfExistTF {${1:file name}} {${2:true code}} {${3:false code}}"
+    },
+    "qNoValue": {},
+    "legacyIf {}": {
+      "snippet": "legacyIf {${1:name}}"
+    },
+    "legacyIfT {} {}": {
+      "snippet": "legacyIfT {${1:name}} {${2:true code}}"
+    },
+    "legacyIfF {} {}": {
+      "snippet": "legacyIfF {${1:name}} {${2:false code}}"
+    },
+    "legacyIfTF {} {} {}": {
+      "snippet": "legacyIfTF {${1:name}} {${2:true code}} {${3:false code}}"
+    },
+    "legacyIfSetTrue {}": {
+      "snippet": "legacyIfSetTrue {${1:name}}"
+    },
+    "legacyIfSetFalse {}": {
+      "snippet": "legacyIfSetFalse {${1:name}}"
+    },
+    "legacyIfSet {} {}": {
+      "snippet": "legacyIfSet {${1:name}} {${2:bool expr}}"
+    },
+    "clistMapBreak": {},
+    "clistVarSort{}{}": {
+      "snippet": "clistVarSort{${1:arg1}}{${2:arg2}}"
+    },
+    "cNoValueTl": {},
+    "expOnce{}": {
+      "snippet": "expOnce{${1:arg}}"
+    },
+    "expPartial{}": {
+      "snippet": "expPartial{${1:arg}}"
+    },
+    "fileInputStop": {},
+    "prgLocal": {},
+    "noExpand{}": {
+      "snippet": "noExpand{${1:tokens}}"
+    },
+    "onlyOnce{}": {
+      "snippet": "onlyOnce{${1:tokens}}"
+    },
+    "onlyPartial{}": {
+      "snippet": "onlyPartial{${1:tokens}}"
+    },
+    "prgBreak": {},
+    "prgBreakDo": {},
+    "propMapBreak": {},
+    "seqJoin{}{}": {
+      "snippet": "seqJoin{${1:arg1}}{${2:arg2}}"
+    },
+    "seqJoinExtended{}{}{}{}": {
+      "snippet": "seqJoinExtended{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "seqMapBreak": {},
+    "seqVarSort{}{}": {
+      "snippet": "seqVarSort{${1:arg1}}{${2:arg2}}"
+    },
+    "sortReturnSame": {},
+    "sortReturnSwapped": {},
+    "Result{}": {
+      "snippet": "Result{${1:tokens}}"
+    },
+    "PrgNewFunction{}{}{}": {
+      "snippet": "PrgNewFunction{${1:cmd}}{${2:xargs}}{${3:def}}"
+    },
+    "PrgNewConditional{}{}{}": {
+      "snippet": "PrgNewConditional{${1:cmd}}{${2:xargs}}{${3:def}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "scoping",
+      "tracing"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/fusering.json b/dev/packages/fusering.json
index f233052ca..0c15ad8a1 100644
--- a/dev/packages/fusering.json
+++ b/dev/packages/fusering.json
@@ -18,6 +18,18 @@
     "fivefuseh[]{}{}{}[]": {
       "snippet": "fivefuseh[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "fivefuseh(){}{}{}": {
+      "snippet": "fivefuseh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefuseh(){}{}{}[]": {
+      "snippet": "fivefuseh(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "fivefuseh()[]{}{}{}": {
+      "snippet": "fivefuseh(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefuseh()[]{}{}{}[]": {
+      "snippet": "fivefuseh(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "fivefusehi{}{}{}": {
       "snippet": "fivefusehi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -30,6 +42,18 @@
     "fivefusehi[]{}{}{}[]": {
       "snippet": "fivefusehi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "fivefusehi(){}{}{}": {
+      "snippet": "fivefusehi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefusehi(){}{}{}[]": {
+      "snippet": "fivefusehi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "fivefusehi()[]{}{}{}": {
+      "snippet": "fivefusehi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefusehi()[]{}{}{}[]": {
+      "snippet": "fivefusehi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "fivefusev{}{}{}": {
       "snippet": "fivefusev{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -42,6 +66,18 @@
     "fivefusev[]{}{}{}[]": {
       "snippet": "fivefusev[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "fivefusev(){}{}{}": {
+      "snippet": "fivefusev(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefusev(){}{}{}[]": {
+      "snippet": "fivefusev(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "fivefusev()[]{}{}{}": {
+      "snippet": "fivefusev(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefusev()[]{}{}{}[]": {
+      "snippet": "fivefusev(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "fivefusevi{}{}{}": {
       "snippet": "fivefusevi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -54,6 +90,18 @@
     "fivefusevi[]{}{}{}[]": {
       "snippet": "fivefusevi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "fivefusevi(){}{}{}": {
+      "snippet": "fivefusevi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefusevi(){}{}{}[]": {
+      "snippet": "fivefusevi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "fivefusevi()[]{}{}{}": {
+      "snippet": "fivefusevi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fivefusevi()[]{}{}{}[]": {
+      "snippet": "fivefusevi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "fourfuse{}{}{}": {
       "snippet": "fourfuse{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -66,6 +114,18 @@
     "fourfuse[]{}{}{}[]": {
       "snippet": "fourfuse[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "fourfuse(){}{}{}": {
+      "snippet": "fourfuse(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fourfuse(){}{}{}[]": {
+      "snippet": "fourfuse(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "fourfuse()[]{}{}{}": {
+      "snippet": "fourfuse(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "fourfuse()[]{}{}{}[]": {
+      "snippet": "fourfuse(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "sixfuseh{}{}{}": {
       "snippet": "sixfuseh{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -78,6 +138,18 @@
     "sixfuseh[]{}{}{}[]": {
       "snippet": "sixfuseh[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "sixfuseh(){}{}{}": {
+      "snippet": "sixfuseh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfuseh(){}{}{}[]": {
+      "snippet": "sixfuseh(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "sixfuseh()[]{}{}{}": {
+      "snippet": "sixfuseh(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfuseh()[]{}{}{}[]": {
+      "snippet": "sixfuseh(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "sixfusehi{}{}{}": {
       "snippet": "sixfusehi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -90,6 +162,18 @@
     "sixfusehi[]{}{}{}[]": {
       "snippet": "sixfusehi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "sixfusehi(){}{}{}": {
+      "snippet": "sixfusehi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfusehi(){}{}{}[]": {
+      "snippet": "sixfusehi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "sixfusehi()[]{}{}{}": {
+      "snippet": "sixfusehi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfusehi()[]{}{}{}[]": {
+      "snippet": "sixfusehi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "sixfusev{}{}{}": {
       "snippet": "sixfusev{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -102,6 +186,18 @@
     "sixfusev[]{}{}{}[]": {
       "snippet": "sixfusev[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "sixfusev(){}{}{}": {
+      "snippet": "sixfusev(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfusev(){}{}{}[]": {
+      "snippet": "sixfusev(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "sixfusev()[]{}{}{}": {
+      "snippet": "sixfusev(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfusev()[]{}{}{}[]": {
+      "snippet": "sixfusev(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "sixfusevi{}{}{}": {
       "snippet": "sixfusevi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -114,6 +210,18 @@
     "sixfusevi[]{}{}{}[]": {
       "snippet": "sixfusevi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "sixfusevi(){}{}{}": {
+      "snippet": "sixfusevi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfusevi(){}{}{}[]": {
+      "snippet": "sixfusevi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "sixfusevi()[]{}{}{}": {
+      "snippet": "sixfusevi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "sixfusevi()[]{}{}{}[]": {
+      "snippet": "sixfusevi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "threefuseh{}{}{}": {
       "snippet": "threefuseh{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -126,6 +234,18 @@
     "threefuseh[]{}{}{}[]": {
       "snippet": "threefuseh[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "threefuseh(){}{}{}": {
+      "snippet": "threefuseh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefuseh(){}{}{}[]": {
+      "snippet": "threefuseh(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "threefuseh()[]{}{}{}": {
+      "snippet": "threefuseh(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefuseh()[]{}{}{}[]": {
+      "snippet": "threefuseh(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "threefusehi{}{}{}": {
       "snippet": "threefusehi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -138,6 +258,18 @@
     "threefusehi[]{}{}{}[]": {
       "snippet": "threefusehi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "threefusehi(){}{}{}": {
+      "snippet": "threefusehi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefusehi(){}{}{}[]": {
+      "snippet": "threefusehi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "threefusehi()[]{}{}{}": {
+      "snippet": "threefusehi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefusehi()[]{}{}{}[]": {
+      "snippet": "threefusehi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "threefusev{}{}{}": {
       "snippet": "threefusev{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -150,6 +282,18 @@
     "threefusev[]{}{}{}[]": {
       "snippet": "threefusev[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "threefusev(){}{}{}": {
+      "snippet": "threefusev(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefusev(){}{}{}[]": {
+      "snippet": "threefusev(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "threefusev()[]{}{}{}": {
+      "snippet": "threefusev(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefusev()[]{}{}{}[]": {
+      "snippet": "threefusev(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "threefusevi{}{}{}": {
       "snippet": "threefusevi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -162,6 +306,18 @@
     "threefusevi[]{}{}{}[]": {
       "snippet": "threefusevi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
+    "threefusevi(){}{}{}": {
+      "snippet": "threefusevi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefusevi(){}{}{}[]": {
+      "snippet": "threefusevi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
+    },
+    "threefusevi()[]{}{}{}": {
+      "snippet": "threefusevi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
+    },
+    "threefusevi()[]{}{}{}[]": {
+      "snippet": "threefusevi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
+    },
     "fivefuseposhi{}": {
       "snippet": "fivefuseposhi{${1:arg1}}"
     },
diff --git a/dev/packages/fvextra.json b/dev/packages/fvextra.json
index 9c2a7f550..e48bf5d90 100644
--- a/dev/packages/fvextra.json
+++ b/dev/packages/fvextra.json
@@ -37,6 +37,12 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
+    "VerbatimClearBuffer": {},
+    "VerbatimClearBuffer[]": {
+      "snippet": "VerbatimClearBuffer[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "FancyVerbBreakStart": {},
     "FancyVerbBreakStop": {},
     "FancyVerbBreakAnywhereBreak": {},
diff --git a/dev/packages/gastex.json b/dev/packages/gastex.json
index 6e5bfddc8..4f98f70a7 100644
--- a/dev/packages/gastex.json
+++ b/dev/packages/gastex.json
@@ -27,6 +27,178 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
+    "node()(){}": {
+      "snippet": "node(${2:name})(${3:x},${4:y}){${1:label text}}"
+    },
+    "node[]()(){}": {
+      "snippet": "node[${2:options}](${3:name})(${4:x},${5:y}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "rpnode()()(){}": {
+      "snippet": "rpnode(${2:name})(${3:x},${4:y})(${5:n},${6:r}){${1:label text}}"
+    },
+    "rpnode[]()()(){}": {
+      "snippet": "rpnode[${2:options}](${3:name})(${4:x},${5:y})(${6:n},${7:r}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "imark()": {
+      "snippet": "imark(${1:node name})"
+    },
+    "imark[]()": {
+      "snippet": "imark[${1:options}](${2:node name})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "fmark()": {
+      "snippet": "fmark(${1:node name})"
+    },
+    "fmark[]()": {
+      "snippet": "fmark[${1:options}](${2:node name})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "rmark()": {
+      "snippet": "rmark(${1:node name})"
+    },
+    "rmark[]()": {
+      "snippet": "rmark[${1:options}](${2:node name})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "nodelabel(){}": {
+      "snippet": "nodelabel(${2:node name}){${1:label text}}"
+    },
+    "nodelabel[](){}": {
+      "snippet": "nodelabel[${2:options}](${3:node name}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawedge(){}": {
+      "snippet": "drawedge(${2:startNode},${3:endNode}){${1:label text}}"
+    },
+    "drawedge[](){}": {
+      "snippet": "drawedge[${2:options}](${3:startNode},${4:endNode}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawloop(){}": {
+      "snippet": "drawloop(${2:node name}){${1:label text}}"
+    },
+    "drawloop[](){}": {
+      "snippet": "drawloop[${2:options}](${3:node name}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawqbedge(){}": {
+      "snippet": "drawqbedge(${2:startNode},${3:x},${4:y},${5:endNode}){${1:label text}}"
+    },
+    "drawqbedge[](){}": {
+      "snippet": "drawqbedge[${2:options}](${3:startNode},${4:x},${5:y},${6:endNode}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawqbpedge(){}": {
+      "snippet": "drawqbpedge(${2:startNode},${3:sa},${4:endNode},${5:ea}){${1:label text}}"
+    },
+    "drawqbpedge[](){}": {
+      "snippet": "drawqbpedge[${2:options}](${3:startNode},${4:sa},${5:endNode},${6:ea}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawbcedge(){}": {
+      "snippet": "drawbcedge(${2:startNode},${3:xs},${4:ys},${5:endNode},${6:xe},${7:ye}){${1:label text}}"
+    },
+    "drawbcedge[](){}": {
+      "snippet": "drawbcedge[${2:options}](${3:startNode},${4:xs},${5:ys},${6:endNode},${7:xe},${8:ye}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawcbedge(){}": {
+      "snippet": "drawcbedge(${2:startNode},${3:xs},${4:ys},${5:endNode},${6:xe},${7:ye}){${1:label text}}"
+    },
+    "drawcbedge[](){}": {
+      "snippet": "drawcbedge[${2:options}](${3:startNode},${4:xs},${5:ys},${6:endNode},${7:xe},${8:ye}){${1:label text}}"
+    },
+    "drawbpedge(){}": {
+      "snippet": "drawbpedge(${2:startNode},${3:sa},${4:sr},${5:endNode},${6:ea},${7:er}){${1:label text}}"
+    },
+    "drawbpedge[](){}": {
+      "snippet": "drawbpedge[${2:options}](${3:startNode},${4:sa},${5:sr},${6:endNode},${7:ea},${8:er}){${1:label text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawcbpedge(){}": {
+      "snippet": "drawcbpedge(${2:startNode},${3:sa},${4:sr},${5:endNode},${6:ea},${7:er}){${1:label text}}"
+    },
+    "drawcbpedge[](){}": {
+      "snippet": "drawcbpedge[${2:options}](${3:startNode},${4:sa},${5:sr},${6:endNode},${7:ea},${8:er}){${1:label text}}"
+    },
+    "drawcircle()": {
+      "snippet": "drawcircle(${1:x},${2:y},${3:d})"
+    },
+    "drawcircle[]()": {
+      "snippet": "drawcircle[${1:options}](${2:x},${3:y},${4:d})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawarc()": {
+      "snippet": "drawarc(${1:x},${2:y},${3:r},${4:a},${5:b})"
+    },
+    "drawarc[]()": {
+      "snippet": "drawarc[${1:options}](${2:x},${3:y},${4:r},${5:a},${6:b})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawrect()": {
+      "snippet": "drawrect(${1:x0},${2:y0},${3:x1},${4:y1})"
+    },
+    "drawrect[]()": {
+      "snippet": "drawrect[${1:options}](${2:x0},${3:y0},${4:x1},${5:y1})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawoval()": {
+      "snippet": "drawoval(${1:x},${2:y},${3:w},${4:h},${5:mr})"
+    },
+    "drawoval[]()": {
+      "snippet": "drawoval[${1:options}](${2:x},${3:y},${4:w},${5:h},${6:mr})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawrpolygon()()": {
+      "snippet": "drawrpolygon(${1:x},${2:y})(${3:n},${4:r})"
+    },
+    "drawrpolygon[]()()": {
+      "snippet": "drawrpolygon[${1:options}](${2:x},${3:y})(${4:n},${5:r})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawqbezier()": {
+      "snippet": "drawqbezier(${1:x0},${2:y0},${3:x1},${4:y1},${5:x2},${6:y2})"
+    },
+    "drawqbezier[]()": {
+      "snippet": "drawqbezier[${1:options}](${2:x0},${3:y0},${4:x1},${5:y1},${6:x2},${7:y2})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawcbezier()": {
+      "snippet": "drawcbezier(${1:x0},${2:y0},${3:x1},${4:y1},${5:x2},${6:y2},${7:x3},${8:y3})"
+    },
+    "drawcbezier[]()": {
+      "snippet": "drawcbezier[${1:options}](${2:x0},${3:y0},${4:x1},${5:y1},${6:x2},${7:y2},${8:x3},${9:y3})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "drawsnake()()": {
+      "snippet": "drawsnake(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "drawsnake[]()()": {
+      "snippet": "drawsnake[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "ifgastexslide": {},
     "gastexslidetrue": {},
     "gastexslidefalse": {},
@@ -76,11 +248,31 @@
   },
   "envs": {
     "gpicture": {},
+    "gpicture(width,height)": {
+      "name": "gpicture",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "gpicture(width,height)(xoffset,yoffset)": {
+      "name": "gpicture",
+      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
+    },
     "gpicture[]": {
       "name": "gpicture",
       "snippet": "[${1:options}]",
       "keyvalindex": 2,
       "keyvalpos": 0
+    },
+    "gpicture[](width,height)": {
+      "name": "gpicture",
+      "snippet": "[${1:options}](${2:width},${3:height})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "gpicture[](width,height)(xoffset,yoffset)": {
+      "name": "gpicture",
+      "snippet": "[${1:options}](${2:width},${3:height})(${4:xoffset},${5:yoffset})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
     }
   },
   "options": [
diff --git a/dev/packages/gb4e.json b/dev/packages/gb4e.json
new file mode 100644
index 000000000..d26e8ad13
--- /dev/null
+++ b/dev/packages/gb4e.json
@@ -0,0 +1,180 @@
+{
+  "includes": {
+    "cgloss4e": []
+  },
+  "macros": {
+    "exewidth{}": {
+      "snippet": "exewidth{${1:string}}"
+    },
+    "ex[]{}": {
+      "snippet": "ex[${2:judgment}]{${1:example}}"
+    },
+    "judgewidth{}": {
+      "snippet": "judgewidth{${1:string}}"
+    },
+    "exi{}": {
+      "snippet": "exi{${1:identifier}}"
+    },
+    "exi{}[]{}": {
+      "snippet": "exi{${1:identifier}}[${2:judgment}]{${3:example}}"
+    },
+    "exr{}": {
+      "snippet": "exr{${1:label}}"
+    },
+    "exr{}[]{}": {
+      "snippet": "exr{${1:label}}[${2:judgment}]{${3:example}}"
+    },
+    "exp{}": {
+      "snippet": "exp{${1:label}}"
+    },
+    "exp{}[]{}": {
+      "snippet": "exp{${1:label}}[${2:judgment}]{${3:example}}"
+    },
+    "sn[]{}": {
+      "snippet": "sn[${2:judgment}]{${1:example}}"
+    },
+    "obar{}": {
+      "snippet": "obar{${1:arg}}"
+    },
+    "mbar{}": {
+      "snippet": "mbar{${1:arg}}"
+    },
+    "ibar{}": {
+      "snippet": "ibar{${1:arg}}"
+    },
+    "iibar{}": {
+      "snippet": "iibar{${1:arg}}"
+    },
+    "primebars": {},
+    "lb{}": {
+      "snippet": "lb{${1:arg}}"
+    },
+    "lb{}[]": {
+      "snippet": "lb{${1:arg}}[${2:sub}]"
+    },
+    "rb{}": {
+      "snippet": "rb{${1:arg}}"
+    },
+    "rb{}[]": {
+      "snippet": "rb{${1:arg}}[${2:sub}]"
+    },
+    "th": {},
+    "al": {},
+    "be": {},
+    "ga": {},
+    "de": {},
+    "noautomath": {},
+    "automath": {},
+    "attop{}": {
+      "snippet": "attop{${1:content}}"
+    },
+    "atcenter{}": {
+      "snippet": "atcenter{${1:content}}"
+    },
+    "fillright{}": {
+      "snippet": "fillright{${1:arg}}"
+    },
+    "fillleft{}": {
+      "snippet": "fillleft{${1:arg}}"
+    },
+    "arrowalign{}": {
+      "snippet": "arrowalign{${1:content}}"
+    },
+    "pu": {},
+    "pd": {},
+    "lf": {},
+    "link{}": {
+      "snippet": "link{${1:arg}}"
+    },
+    "spacer": {},
+    "centr{}": {
+      "snippet": "centr{${1:arg}}"
+    },
+    "prmbrs": {},
+    "spec{}": {
+      "snippet": "spec{${1:arg}}"
+    },
+    "ct{}": {
+      "snippet": "ct{${1:arg}}"
+    },
+    "tx": {},
+    "indexgroupmark{}": {
+      "snippet": "indexgroupmark{${1:text}}"
+    },
+    "theexx": {},
+    "thexnumi": {},
+    "thexnumii": {},
+    "thexnumiii": {},
+    "thexnumiv": {},
+    "therxnumi": {},
+    "therxnumii": {},
+    "therxnumiii": {},
+    "therxnumiv": {},
+    "bu": {},
+    "ea": {},
+    "z": {
+      "detail": "𝑧",
+      "documentation": "MATHEMATICAL ITALIC SMALL Z"
+    },
+    "lcommentsep": {},
+    "lcomment{}": {
+      "snippet": "lcomment{${1:text}}"
+    },
+    "leaderfill": {},
+    "pointerup": {},
+    "pointerdown": {},
+    "elevenex": {},
+    "pijl": {},
+    "bb{}": {
+      "snippet": "bb{${1:arg}}"
+    },
+    "boven{}{}": {
+      "snippet": "boven{${1:arg1}}{${2:arg2}}"
+    },
+    "bovenop{}{}": {
+      "snippet": "bovenop{${1:arg1}}{${2:arg2}}"
+    },
+    "vl": {},
+    "gbVersion": {}
+  },
+  "envs": {
+    "exe": {},
+    "exe[]": {
+      "name": "exe",
+      "snippet": "[${1:string}]"
+    },
+    "xlist": {},
+    "xlist[]": {
+      "name": "xlist",
+      "snippet": "[${1:string}]"
+    },
+    "xlista": {},
+    "xlista[]": {
+      "name": "xlista",
+      "snippet": "[${1:string}]"
+    },
+    "xlisti": {},
+    "xlisti[]": {
+      "name": "xlisti",
+      "snippet": "[${1:string}]"
+    },
+    "xlistn": {},
+    "xlistn[]": {
+      "name": "xlistn",
+      "snippet": "[${1:string}]"
+    },
+    "xlistA": {},
+    "xlistA[]": {
+      "name": "xlistA",
+      "snippet": "[${1:string}]"
+    },
+    "xlistI": {},
+    "xlistI[]": {
+      "name": "xlistI",
+      "snippet": "[${1:string}]"
+    },
+    "qlist": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/gchords.json b/dev/packages/gchords.json
index af481e318..b803bbb59 100644
--- a/dev/packages/gchords.json
+++ b/dev/packages/gchords.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "chord{}{}{}": {
-      "snippet": "chord{${1:modifiers}}{${2:x1,x2,...}}{${3:name}}"
+      "snippet": "chord{${1:modifiers}}{${2:x1,${4:x2},...}}{${3:name}}"
     },
     "chords{}": {
       "snippet": "chords{${1:chords}}"
diff --git a/dev/packages/gelasiomath.json b/dev/packages/gelasiomath.json
new file mode 100644
index 000000000..c0f422b15
--- /dev/null
+++ b/dev/packages/gelasiomath.json
@@ -0,0 +1,35 @@
+{
+  "includes": {
+    "iftex": [],
+    "etoolbox": [],
+    "xkeyval": [],
+    "ifthen": [],
+    "newtx": []
+  },
+  "macros": {
+    "textSC{}": {
+      "snippet": "textSC{${1:text}}"
+    },
+    "textsmde{}": {
+      "snippet": "textsmde{${1:text}}"
+    },
+    "capsescape{}": {
+      "snippet": "capsescape{${1:text}}"
+    },
+    "geltextfrac{}{}": {
+      "snippet": "geltextfrac{${1:arg1}}{${2:arg2}}"
+    },
+    "geltextfrac[]{}{}": {
+      "snippet": "geltextfrac[${3:opt}]{${1:arg1}}{${2:arg2}}"
+    },
+    "textULC{}": {
+      "snippet": "textULC{${1:text}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "scale=${1:factor}",
+    "scosf"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/geometry.json b/dev/packages/geometry.json
new file mode 100644
index 000000000..eef512d7d
--- /dev/null
+++ b/dev/packages/geometry.json
@@ -0,0 +1,269 @@
+{
+  "includes": {},
+  "macros": {
+    "geometry{}": {
+      "snippet": "geometry{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "newgeometry{}": {
+      "snippet": "newgeometry{${1:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "restoregeometry": {},
+    "savegeometry{}": {
+      "snippet": "savegeometry{${1:name}}"
+    },
+    "loadgeometry{}": {
+      "snippet": "loadgeometry{${1:name}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "paper=",
+      "papername=",
+      "a0paper",
+      "a1paper",
+      "a2paper",
+      "a3paper",
+      "a4paper",
+      "a5paper",
+      "a6paper",
+      "b0paper",
+      "b1paper",
+      "b2paper",
+      "b3paper",
+      "b4paper",
+      "b5paper",
+      "b6paper",
+      "c0paper",
+      "c1paper",
+      "c2paper",
+      "c3paper",
+      "c4paper",
+      "c5paper",
+      "c6paper",
+      "b0j",
+      "b1j",
+      "b2j",
+      "b3j",
+      "b4j",
+      "b5j",
+      "b6j",
+      "ansiapaper",
+      "ansibpaper",
+      "ansicpaper",
+      "ansidpaper",
+      "ansiepaper",
+      "letterpaper",
+      "executivepaper",
+      "legalpaper",
+      "screen",
+      "paperwidth=",
+      "paperheight=",
+      "papersize=",
+      "papersize={${1:width},${2:height}}",
+      "landscape",
+      "portrait",
+      "layout=",
+      "layoutwidth=",
+      "layoutheight=",
+      "layoutsize=",
+      "layoutsize={${1:width},${2:height}}",
+      "layouthoffset=",
+      "layoutvoffset=",
+      "layoutoffset=",
+      "layoutoffset={${1:hoffset},${2:voffset}}",
+      "hscale=${1:scale}",
+      "vscale=${1:scale}",
+      "scale=${1:scale}",
+      "scale={${1:hscale},${2:vscale}}",
+      "width=",
+      "totalwidth=",
+      "height=",
+      "totalheight=",
+      "total=",
+      "total={${1:width},${2:height}}",
+      "textwidth=",
+      "textheight=",
+      "text=",
+      "body={${1:width},${2:height}}",
+      "lines=${1:integer}",
+      "includehead",
+      "includefoot",
+      "includeheadfoot",
+      "includemp",
+      "includeall",
+      "ignorehead",
+      "ignorefoot",
+      "ignoreheadfoot",
+      "ignoremp",
+      "ignoreall",
+      "heightrounded",
+      "hdivide={${1:left margin},${2:width},${3:right margin}}",
+      "vdivide={${1:top margin},${2:height},${3:bottom margin}}",
+      "divide={${1:left/top margin},${2:width/height},${3:right/bottom margin}}",
+      "left=",
+      "lmargin=",
+      "inner=",
+      "right=",
+      "rmargin=",
+      "outer=",
+      "top=",
+      "tmargin=",
+      "bottom=",
+      "bmargin=",
+      "hmargin=",
+      "hmargin={${1:left margin},${2:right margin}}",
+      "vmargin=",
+      "vmargin={${1:top margin},${2:bottom margin}}",
+      "margin=",
+      "margin={${1:left/top margin},${2:right/bottom margin}}",
+      "hmarginratio=${1:left}:${2:right}",
+      "vmarginratio=${1:top}:${2:bottom}",
+      "marginratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
+      "marginratio=${1:left/top}:${2:right/bottom}",
+      "ratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
+      "ratio=${1:left/top}:${2:right/bottom}",
+      "hcentering",
+      "vcentering",
+      "centering",
+      "twoside",
+      "asymmetric",
+      "bindingoffset=",
+      "headheight=",
+      "head=",
+      "headsep=",
+      "footskip=",
+      "foot=",
+      "nohead",
+      "nofoot",
+      "noheadfoot",
+      "footnotesep=",
+      "marginparwidth=",
+      "marginpar=",
+      "marginparsep=",
+      "nomarginpar",
+      "columnsep=",
+      "hoffset=",
+      "voffset=",
+      "offset=",
+      "offset={${1:hoffset},${2:voffset}}",
+      "twocolumn",
+      "onecolumn",
+      "twoside",
+      "reversemp",
+      "reversemarginpar",
+      "driver=",
+      "dvips",
+      "dvipdfm",
+      "pdftex",
+      "luatex",
+      "xetex",
+      "vtex",
+      "dvipdfmx",
+      "xdvipdfmx",
+      "verbose",
+      "reset",
+      "mag=${1:magnification}",
+      "truedimen",
+      "pass",
+      "showframe",
+      "showcrop"
+    ],
+    [
+      "layout=",
+      "layoutwidth=",
+      "layoutheight=",
+      "layoutsize=",
+      "layoutsize={${1:width},${2:height}}",
+      "layouthoffset=",
+      "layoutvoffset=",
+      "layoutoffset=",
+      "layoutoffset={${1:hoffset},${2:voffset}}",
+      "hscale=${1:scale}",
+      "vscale=${1:scale}",
+      "scale=${1:scale}",
+      "scale={${1:hscale},${2:vscale}}",
+      "width=",
+      "totalwidth=",
+      "height=",
+      "totalheight=",
+      "total=",
+      "total={${1:width},${2:height}}",
+      "textwidth=",
+      "textheight=",
+      "text=",
+      "body={${1:width},${2:height}}",
+      "lines=${1:integer}",
+      "includehead",
+      "includefoot",
+      "includeheadfoot",
+      "includemp",
+      "includeall",
+      "ignorehead",
+      "ignorefoot",
+      "ignoreheadfoot",
+      "ignoremp",
+      "ignoreall",
+      "heightrounded",
+      "hdivide={${1:left margin},${2:width},${3:right margin}}",
+      "vdivide={${1:top margin},${2:height},${3:bottom margin}}",
+      "divide={${1:left/top margin},${2:width/height},${3:right/bottom margin}}",
+      "left=",
+      "lmargin=",
+      "inner=",
+      "right=",
+      "rmargin=",
+      "outer=",
+      "top=",
+      "tmargin=",
+      "bottom=",
+      "bmargin=",
+      "hmargin=",
+      "hmargin={${1:left margin},${2:right margin}}",
+      "vmargin=",
+      "vmargin={${1:top margin},${2:bottom margin}}",
+      "margin=",
+      "margin={${1:left/top margin},${2:right/bottom margin}}",
+      "hmarginratio=${1:left}:${2:right}",
+      "vmarginratio=${1:top}:${2:bottom}",
+      "marginratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
+      "marginratio=${1:left/top}:${2:right/bottom}",
+      "ratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
+      "ratio=${1:left/top}:${2:right/bottom}",
+      "hcentering",
+      "vcentering",
+      "centering",
+      "twoside",
+      "asymmetric",
+      "bindingoffset=",
+      "headheight=",
+      "head=",
+      "headsep=",
+      "footskip=",
+      "foot=",
+      "nohead",
+      "nofoot",
+      "noheadfoot",
+      "footnotesep=",
+      "marginparwidth=",
+      "marginpar=",
+      "marginparsep=",
+      "nomarginpar",
+      "columnsep=",
+      "hoffset=",
+      "voffset=",
+      "offset=",
+      "offset={${1:hoffset},${2:voffset}}",
+      "twocolumn",
+      "onecolumn",
+      "twoside",
+      "reversemp",
+      "reversemarginpar"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/german.json b/dev/packages/german.json
new file mode 100644
index 000000000..bd04b2481
--- /dev/null
+++ b/dev/packages/german.json
@@ -0,0 +1,7 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/glossaries.json b/dev/packages/glossaries.json
new file mode 100644
index 000000000..ca0a54764
--- /dev/null
+++ b/dev/packages/glossaries.json
@@ -0,0 +1,4118 @@
+{
+  "includes": {
+    "ifthen": [],
+    "xkeyval": [],
+    "mfirstuc": [],
+    "textcase": [],
+    "xfor": [],
+    "datatool-base": [],
+    "amsgen": [],
+    "etoolbox": [],
+    "glossary-hypernav": [],
+    "glossary-list": [],
+    "glossary-long": [],
+    "glossary-super": [],
+    "glossary-tree": [],
+    "translator": [
+      "translate",
+      "translate=true"
+    ],
+    "tracklang": [
+      "translate",
+      "translate=true"
+    ],
+    "glossaries-babel": [
+      "translate=babel"
+    ]
+  },
+  "macros": {
+    "glsindexingsetting": {},
+    "GlsSetQuote{}": {
+      "snippet": "GlsSetQuote{${1:character}}"
+    },
+    "glsshowtarget{}": {
+      "snippet": "glsshowtarget{${1:target name}}"
+    },
+    "glsshowtargetinner{}": {
+      "snippet": "glsshowtargetinner{${1:target name}}"
+    },
+    "glsshowtargetfonttext{}": {
+      "snippet": "glsshowtargetfonttext{${1:text}}"
+    },
+    "glsshowtargetouter{}": {
+      "snippet": "glsshowtargetouter{${1:target name}}"
+    },
+    "glsshowtargetsymbol": {},
+    "glsshowtargetfont": {},
+    "glsshowaccsupp{}{}{}": {
+      "snippet": "glsshowaccsupp{${1:options}}{${2:tag}}{${3:replacement text}}"
+    },
+    "glslinkcheckfirsthyperhook": {},
+    "glstoctrue": {},
+    "glstocfalse": {},
+    "ifglstoc": {},
+    "setglossarysection{}": {
+      "snippet": "setglossarysection{${1:name}}"
+    },
+    "ifglsucmark": {},
+    "glsucmarkfalse": {},
+    "glsucmarktrue": {},
+    "glsautoprefix": {},
+    "glsrefentry{}": {
+      "snippet": "glsrefentry{${1:label}}"
+    },
+    "GlsEntryCounterLabelPrefix": {},
+    "glsresetentrycounter": {},
+    "glsstepentry{}": {
+      "snippet": "glsstepentry{${1:label}}"
+    },
+    "theglossaryentry": {},
+    "glsentrycounterlabel": {},
+    "ifglsentrycounter": {},
+    "glsentrycounterfalse": {},
+    "glsentrycountertrue": {},
+    "glsresetsubentrycounter": {},
+    "glsstepsubentry{}": {
+      "snippet": "glsstepsubentry{${1:label}}"
+    },
+    "theglossarysubentry": {},
+    "glssubentrycounterlabel": {},
+    "ifglssubentrycounter": {},
+    "glssubentrycounterfalse": {},
+    "glssubentrycountertrue": {},
+    "setglossarystyle{}": {
+      "snippet": "setglossarystyle{${1:style name}}"
+    },
+    "glscounter": {},
+    "glspostdescription": {},
+    "ifglsnogroupskip": {},
+    "glsnogroupskipfalse": {},
+    "glsnogroupskiptrue": {},
+    "ifglswrallowprimitivemods": {},
+    "glswrallowprimitivemodstrue": {},
+    "glswrallowprimitivemodsfalse": {},
+    "ifglsindexonlyfirst": {},
+    "glsindexonlyfirstfalse": {},
+    "glsindexonlyfirsttrue": {},
+    "glswriteentry{}{}": {
+      "snippet": "glswriteentry{${1:label}}{${2:wr-code}}"
+    },
+    "glssortnumberfmt{}": {
+      "snippet": "glssortnumberfmt{${1:number}}"
+    },
+    "glsprestandardsort{}{}{}": {
+      "snippet": "glsprestandardsort{${1:sort cs}}{${2:type}}{${3:label}}"
+    },
+    "glsdosanitizesort": {},
+    "ifglsxindy": {},
+    "glsxindyfalse": {},
+    "glsxindytrue": {},
+    "GlsDeclareNoHyperList{}": {
+      "snippet": "GlsDeclareNoHyperList{${1:list}}"
+    },
+    "printsymbols": {
+      "option": "symbols"
+    },
+    "printsymbols[]": {
+      "snippet": "printsymbols[${1:options}]",
+      "option": "symbols",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "printnumbers": {
+      "option": "numbers"
+    },
+    "printnumbers[]": {
+      "snippet": "printnumbers[${1:options}]",
+      "option": "numbers",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "newterm{}": {
+      "snippet": "newterm{${1:label}}",
+      "option": "index"
+    },
+    "newterm[]{}": {
+      "snippet": "newterm[${2:options}]{${1:label}}",
+      "option": "index",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "printindex": {
+      "option": "index"
+    },
+    "printindex[]": {
+      "snippet": "printindex[${1:options}]",
+      "option": "index",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "printacronyms": {
+      "option": "acronyms"
+    },
+    "printacronyms[]": {
+      "snippet": "printacronyms[${1:options}]",
+      "option": "acronyms",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "DeclareAcronymList{}": {
+      "snippet": "DeclareAcronymList{${1:list}}"
+    },
+    "SetAcronymLists{}": {
+      "snippet": "SetAcronymLists{${1:list}}"
+    },
+    "glsIfListOfAcronyms{}{}{}": {
+      "snippet": "glsIfListOfAcronyms{${1:glossary-label}}{${2:true}}{${3:false}}"
+    },
+    "DefineAcronymSynonyms": {},
+    "setupglossaries{}": {
+      "snippet": "setupglossaries{${1:options}}"
+    },
+    "makenoidxglossaries": {},
+    "makeglossaries": {},
+    "writeist": {},
+    "setStyleFile{}": {
+      "snippet": "setStyleFile{${1:name}}"
+    },
+    "GlsSetWriteIstHook{}": {
+      "snippet": "GlsSetWriteIstHook{${1:code}}"
+    },
+    "glswrite": {},
+    "noist": {},
+    "glsSetCompositor{}": {
+      "snippet": "glsSetCompositor{${1:symbol}}"
+    },
+    "glsSetAlphaCompositor{}": {
+      "snippet": "glsSetAlphaCompositor{${1:symbol}}"
+    },
+    "newglossaryentry{}{}": {
+      "snippet": "newglossaryentry{${1:label}}{${2:keyvals}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "longnewglossaryentry{}{}{}": {
+      "snippet": "longnewglossaryentry{${1:label}}{${2:keyvals}}{${3:description}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "provideglossaryentry{}{}": {
+      "snippet": "provideglossaryentry{${1:label}}{${2:keyvals}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "longprovideglossaryentry{}{}{}": {
+      "snippet": "longprovideglossaryentry{${1:label}}{${2:keyvals}}{${3:description}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "nopostdesc": {},
+    "glspar": {},
+    "glspluralsuffix": {},
+    "glsaddkey{}{}{}{}{}{}{}": {
+      "snippet": "glsaddkey{${1:key}}{${2:default}}{${3:nolink cs}}{${4:nolink ucfirst cs}}{${5:link cs}}{${6:link ucfirst cs}}{${7:link allcaps cs}}"
+    },
+    "glsaddkey*{}{}{}{}{}{}{}": {
+      "snippet": "glsaddkey*{${1:key}}{${2:default}}{${3:nolink cs}}{${4:nolink ucfirst cs}}{${5:link cs}}{${6:link ucfirst cs}}{${7:link allcaps cs}}"
+    },
+    "glsaddstoragekey{}{}{}": {
+      "snippet": "glsaddstoragekey{${1:key}}{${2:default}}{${3:nolink cs}}"
+    },
+    "glssetexpandfield{}": {
+      "snippet": "glssetexpandfield{${1:field}}"
+    },
+    "glssetnoexpandfield{}": {
+      "snippet": "glssetnoexpandfield{${1:field}}"
+    },
+    "glsexpandfields": {},
+    "glsnoexpandfields": {},
+    "loadglsentries{}": {
+      "snippet": "loadglsentries{${1:file}}"
+    },
+    "loadglsentries[]{}": {
+      "snippet": "loadglsentries[${2:type}]{${1:file}}"
+    },
+    "glsmoveentry{}{}": {
+      "snippet": "glsmoveentry{${1:label}}{${2:target glossary label}}"
+    },
+    "glstextformat{}": {
+      "snippet": "glstextformat{${1:text}}"
+    },
+    "glspatchtabularx": {},
+    "gls{}": {
+      "snippet": "gls{${1:label}}"
+    },
+    "gls[]{}": {
+      "snippet": "gls[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "gls{}[]": {
+      "snippet": "gls{${1:label}}[${2:insert}]"
+    },
+    "gls[]{}[]": {
+      "snippet": "gls[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Gls{}": {
+      "snippet": "Gls{${1:label}}"
+    },
+    "Gls[]{}": {
+      "snippet": "Gls[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Gls{}[]": {
+      "snippet": "Gls{${1:label}}[${2:insert}]"
+    },
+    "Gls[]{}[]": {
+      "snippet": "Gls[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLS{}": {
+      "snippet": "GLS{${1:label}}"
+    },
+    "GLS[]{}": {
+      "snippet": "GLS[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLS{}[]": {
+      "snippet": "GLS{${1:label}}[${2:insert}]"
+    },
+    "GLS[]{}[]": {
+      "snippet": "GLS[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "gls*{}": {
+      "snippet": "gls*{${1:label}}"
+    },
+    "gls*[]{}": {
+      "snippet": "gls*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "gls*{}[]": {
+      "snippet": "gls*{${1:label}}[${2:insert}]"
+    },
+    "gls*[]{}[]": {
+      "snippet": "gls*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Gls*{}": {
+      "snippet": "Gls*{${1:label}}"
+    },
+    "Gls*[]{}": {
+      "snippet": "Gls*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Gls*{}[]": {
+      "snippet": "Gls*{${1:label}}[${2:insert}]"
+    },
+    "Gls*[]{}[]": {
+      "snippet": "Gls*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLS*{}": {
+      "snippet": "GLS*{${1:label}}"
+    },
+    "GLS*[]{}": {
+      "snippet": "GLS*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLS*{}[]": {
+      "snippet": "GLS*{${1:label}}[${2:insert}]"
+    },
+    "GLS*[]{}[]": {
+      "snippet": "GLS*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glspl{}": {
+      "snippet": "glspl{${1:label}}"
+    },
+    "glspl[]{}": {
+      "snippet": "glspl[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glspl{}[]": {
+      "snippet": "glspl{${1:label}}[${2:insert}]"
+    },
+    "glspl[]{}[]": {
+      "snippet": "glspl[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glspl{}": {
+      "snippet": "Glspl{${1:label}}"
+    },
+    "Glspl[]{}": {
+      "snippet": "Glspl[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glspl{}[]": {
+      "snippet": "Glspl{${1:label}}[${2:insert}]"
+    },
+    "Glspl[]{}[]": {
+      "snippet": "Glspl[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSpl{}": {
+      "snippet": "GLSpl{${1:label}}"
+    },
+    "GLSpl[]{}": {
+      "snippet": "GLSpl[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSpl{}[]": {
+      "snippet": "GLSpl{${1:label}}[${2:insert}]"
+    },
+    "GLSpl[]{}[]": {
+      "snippet": "GLSpl[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glspl*{}": {
+      "snippet": "glspl*{${1:label}}"
+    },
+    "glspl*[]{}": {
+      "snippet": "glspl*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glspl*{}[]": {
+      "snippet": "glspl*{${1:label}}[${2:insert}]"
+    },
+    "glspl*[]{}[]": {
+      "snippet": "glspl*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glspl*{}": {
+      "snippet": "Glspl*{${1:label}}"
+    },
+    "Glspl*[]{}": {
+      "snippet": "Glspl*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glspl*{}[]": {
+      "snippet": "Glspl*{${1:label}}[${2:insert}]"
+    },
+    "Glspl*[]{}[]": {
+      "snippet": "Glspl*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSpl*{}": {
+      "snippet": "GLSpl*{${1:label}}"
+    },
+    "GLSpl*[]{}": {
+      "snippet": "GLSpl*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSpl*{}[]": {
+      "snippet": "GLSpl*{${1:label}}[${2:insert}]"
+    },
+    "GLSpl*[]{}[]": {
+      "snippet": "GLSpl*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsdisp{}{}": {
+      "snippet": "glsdisp{${1:label}}{${2:text}}"
+    },
+    "glsdisp[]{}{}": {
+      "snippet": "glsdisp[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsdisp*{}{}": {
+      "snippet": "glsdisp*{${1:label}}{${2:text}}"
+    },
+    "glsdisp*[]{}{}": {
+      "snippet": "glsdisp*[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsdisp{}{}": {
+      "snippet": "Glsdisp{${1:label}}{${2:text}}"
+    },
+    "Glsdisp[]{}{}": {
+      "snippet": "Glsdisp[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsdisp*{}{}": {
+      "snippet": "Glsdisp*{${1:label}}{${2:text}}"
+    },
+    "Glsdisp*[]{}{}": {
+      "snippet": "Glsdisp*[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glslink{}{}": {
+      "snippet": "glslink{${1:label}}{${2:text}}"
+    },
+    "glslink[]{}{}": {
+      "snippet": "glslink[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glslink*{}{}": {
+      "snippet": "glslink*{${1:label}}{${2:text}}"
+    },
+    "glslink*[]{}{}": {
+      "snippet": "glslink*[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glslink{}{}": {
+      "snippet": "Glslink{${1:label}}{${2:text}}"
+    },
+    "Glslink[]{}{}": {
+      "snippet": "Glslink[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glslink*{}{}": {
+      "snippet": "Glslink*{${1:label}}{${2:text}}"
+    },
+    "Glslink*[]{}{}": {
+      "snippet": "Glslink*[${3:options}]{${1:label}}{${2:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glstext{}": {
+      "snippet": "glstext{${1:label}}"
+    },
+    "glstext[]{}": {
+      "snippet": "glstext[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glstext{}[]": {
+      "snippet": "glstext{${1:label}}[${2:insert}]"
+    },
+    "glstext[]{}[]": {
+      "snippet": "glstext[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glstext{}": {
+      "snippet": "Glstext{${1:label}}"
+    },
+    "Glstext[]{}": {
+      "snippet": "Glstext[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glstext{}[]": {
+      "snippet": "Glstext{${1:label}}[${2:insert}]"
+    },
+    "Glstext[]{}[]": {
+      "snippet": "Glstext[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLStext{}": {
+      "snippet": "GLStext{${1:label}}"
+    },
+    "GLStext[]{}": {
+      "snippet": "GLStext[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLStext{}[]": {
+      "snippet": "GLStext{${1:label}}[${2:insert}]"
+    },
+    "GLStext[]{}[]": {
+      "snippet": "GLStext[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glstext*{}": {
+      "snippet": "glstext*{${1:label}}"
+    },
+    "glstext*[]{}": {
+      "snippet": "glstext*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glstext*{}[]": {
+      "snippet": "glstext*{${1:label}}[${2:insert}]"
+    },
+    "glstext*[]{}[]": {
+      "snippet": "glstext*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glstext*{}": {
+      "snippet": "Glstext*{${1:label}}"
+    },
+    "Glstext*[]{}": {
+      "snippet": "Glstext*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glstext*{}[]": {
+      "snippet": "Glstext*{${1:label}}[${2:insert}]"
+    },
+    "Glstext*[]{}[]": {
+      "snippet": "Glstext*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLStext*{}": {
+      "snippet": "GLStext*{${1:label}}"
+    },
+    "GLStext*[]{}": {
+      "snippet": "GLStext*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLStext*{}[]": {
+      "snippet": "GLStext*{${1:label}}[${2:insert}]"
+    },
+    "GLStext*[]{}[]": {
+      "snippet": "GLStext*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsfirst{}": {
+      "snippet": "glsfirst{${1:label}}"
+    },
+    "glsfirst[]{}": {
+      "snippet": "glsfirst[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsfirst{}[]": {
+      "snippet": "glsfirst{${1:label}}[${2:insert}]"
+    },
+    "glsfirst[]{}[]": {
+      "snippet": "glsfirst[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsfirst{}": {
+      "snippet": "Glsfirst{${1:label}}"
+    },
+    "Glsfirst[]{}": {
+      "snippet": "Glsfirst[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsfirst{}[]": {
+      "snippet": "Glsfirst{${1:label}}[${2:insert}]"
+    },
+    "Glsfirst[]{}[]": {
+      "snippet": "Glsfirst[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSfirst{}": {
+      "snippet": "GLSfirst{${1:label}}"
+    },
+    "GLSfirst[]{}": {
+      "snippet": "GLSfirst[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSfirst{}[]": {
+      "snippet": "GLSfirst{${1:label}}[${2:insert}]"
+    },
+    "GLSfirst[]{}[]": {
+      "snippet": "GLSfirst[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsfirst*{}": {
+      "snippet": "glsfirst*{${1:label}}"
+    },
+    "glsfirst*[]{}": {
+      "snippet": "glsfirst*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsfirst*{}[]": {
+      "snippet": "glsfirst*{${1:label}}[${2:insert}]"
+    },
+    "glsfirst*[]{}[]": {
+      "snippet": "glsfirst*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsfirst*{}": {
+      "snippet": "Glsfirst*{${1:label}}"
+    },
+    "Glsfirst*[]{}": {
+      "snippet": "Glsfirst*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsfirst*{}[]": {
+      "snippet": "Glsfirst*{${1:label}}[${2:insert}]"
+    },
+    "Glsfirst*[]{}[]": {
+      "snippet": "Glsfirst*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSfirst*{}": {
+      "snippet": "GLSfirst*{${1:label}}"
+    },
+    "GLSfirst*[]{}": {
+      "snippet": "GLSfirst*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSfirst*{}[]": {
+      "snippet": "GLSfirst*{${1:label}}[${2:insert}]"
+    },
+    "GLSfirst*[]{}[]": {
+      "snippet": "GLSfirst*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsplural{}": {
+      "snippet": "glsplural{${1:label}}"
+    },
+    "glsplural[]{}": {
+      "snippet": "glsplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsplural{}[]": {
+      "snippet": "glsplural{${1:label}}[${2:insert}]"
+    },
+    "glsplural[]{}[]": {
+      "snippet": "glsplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsplural{}": {
+      "snippet": "Glsplural{${1:label}}"
+    },
+    "Glsplural[]{}": {
+      "snippet": "Glsplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsplural{}[]": {
+      "snippet": "Glsplural{${1:label}}[${2:insert}]"
+    },
+    "Glsplural[]{}[]": {
+      "snippet": "Glsplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSplural{}": {
+      "snippet": "GLSplural{${1:label}}"
+    },
+    "GLSplural[]{}": {
+      "snippet": "GLSplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSplural{}[]": {
+      "snippet": "GLSplural{${1:label}}[${2:insert}]"
+    },
+    "GLSplural[]{}[]": {
+      "snippet": "GLSplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsplural*{}": {
+      "snippet": "glsplural*{${1:label}}"
+    },
+    "glsplural*[]{}": {
+      "snippet": "glsplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsplural*{}[]": {
+      "snippet": "glsplural*{${1:label}}[${2:insert}]"
+    },
+    "glsplural*[]{}[]": {
+      "snippet": "glsplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsplural*{}": {
+      "snippet": "Glsplural*{${1:label}}"
+    },
+    "Glsplural*[]{}": {
+      "snippet": "Glsplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsplural*{}[]": {
+      "snippet": "Glsplural*{${1:label}}[${2:insert}]"
+    },
+    "Glsplural*[]{}[]": {
+      "snippet": "Glsplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSplural*{}": {
+      "snippet": "GLSplural*{${1:label}}"
+    },
+    "GLSplural*[]{}": {
+      "snippet": "GLSplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSplural*{}[]": {
+      "snippet": "GLSplural*{${1:label}}[${2:insert}]"
+    },
+    "GLSplural*[]{}[]": {
+      "snippet": "GLSplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsfirstplural{}": {
+      "snippet": "glsfirstplural{${1:label}}"
+    },
+    "glsfirstplural[]{}": {
+      "snippet": "glsfirstplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsfirstplural{}[]": {
+      "snippet": "glsfirstplural{${1:label}}[${2:insert}]"
+    },
+    "glsfirstplural[]{}[]": {
+      "snippet": "glsfirstplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsfirstplural{}": {
+      "snippet": "Glsfirstplural{${1:label}}"
+    },
+    "Glsfirstplural[]{}": {
+      "snippet": "Glsfirstplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsfirstplural{}[]": {
+      "snippet": "Glsfirstplural{${1:label}}[${2:insert}]"
+    },
+    "Glsfirstplural[]{}[]": {
+      "snippet": "Glsfirstplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSfirstplural{}": {
+      "snippet": "GLSfirstplural{${1:label}}"
+    },
+    "GLSfirstplural[]{}": {
+      "snippet": "GLSfirstplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSfirstplural{}[]": {
+      "snippet": "GLSfirstplural{${1:label}}[${2:insert}]"
+    },
+    "GLSfirstplural[]{}[]": {
+      "snippet": "GLSfirstplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsfirstplural*{}": {
+      "snippet": "glsfirstplural*{${1:label}}"
+    },
+    "glsfirstplural*[]{}": {
+      "snippet": "glsfirstplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsfirstplural*{}[]": {
+      "snippet": "glsfirstplural*{${1:label}}[${2:insert}]"
+    },
+    "glsfirstplural*[]{}[]": {
+      "snippet": "glsfirstplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsfirstplural*{}": {
+      "snippet": "Glsfirstplural*{${1:label}}"
+    },
+    "Glsfirstplural*[]{}": {
+      "snippet": "Glsfirstplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsfirstplural*{}[]": {
+      "snippet": "Glsfirstplural*{${1:label}}[${2:insert}]"
+    },
+    "Glsfirstplural*[]{}[]": {
+      "snippet": "Glsfirstplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSfirstplural*{}": {
+      "snippet": "GLSfirstplural*{${1:label}}"
+    },
+    "GLSfirstplural*[]{}": {
+      "snippet": "GLSfirstplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSfirstplural*{}[]": {
+      "snippet": "GLSfirstplural*{${1:label}}[${2:insert}]"
+    },
+    "GLSfirstplural*[]{}[]": {
+      "snippet": "GLSfirstplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsname{}": {
+      "snippet": "glsname{${1:label}}"
+    },
+    "glsname[]{}": {
+      "snippet": "glsname[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsname{}[]": {
+      "snippet": "glsname{${1:label}}[${2:insert}]"
+    },
+    "glsname[]{}[]": {
+      "snippet": "glsname[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsname{}": {
+      "snippet": "Glsname{${1:label}}"
+    },
+    "Glsname[]{}": {
+      "snippet": "Glsname[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsname{}[]": {
+      "snippet": "Glsname{${1:label}}[${2:insert}]"
+    },
+    "Glsname[]{}[]": {
+      "snippet": "Glsname[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSname{}": {
+      "snippet": "GLSname{${1:label}}"
+    },
+    "GLSname[]{}": {
+      "snippet": "GLSname[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSname{}[]": {
+      "snippet": "GLSname{${1:label}}[${2:insert}]"
+    },
+    "GLSname[]{}[]": {
+      "snippet": "GLSname[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsname*{}": {
+      "snippet": "glsname*{${1:label}}"
+    },
+    "glsname*[]{}": {
+      "snippet": "glsname*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsname*{}[]": {
+      "snippet": "glsname*{${1:label}}[${2:insert}]"
+    },
+    "glsname*[]{}[]": {
+      "snippet": "glsname*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsname*{}": {
+      "snippet": "Glsname*{${1:label}}"
+    },
+    "Glsname*[]{}": {
+      "snippet": "Glsname*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsname*{}[]": {
+      "snippet": "Glsname*{${1:label}}[${2:insert}]"
+    },
+    "Glsname*[]{}[]": {
+      "snippet": "Glsname*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSname*{}": {
+      "snippet": "GLSname*{${1:label}}"
+    },
+    "GLSname*[]{}": {
+      "snippet": "GLSname*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSname*{}[]": {
+      "snippet": "GLSname*{${1:label}}[${2:insert}]"
+    },
+    "GLSname*[]{}[]": {
+      "snippet": "GLSname*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glssymbol{}": {
+      "snippet": "glssymbol{${1:label}}"
+    },
+    "glssymbol[]{}": {
+      "snippet": "glssymbol[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glssymbol{}[]": {
+      "snippet": "glssymbol{${1:label}}[${2:insert}]"
+    },
+    "glssymbol[]{}[]": {
+      "snippet": "glssymbol[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glssymbol{}": {
+      "snippet": "Glssymbol{${1:label}}"
+    },
+    "Glssymbol[]{}": {
+      "snippet": "Glssymbol[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glssymbol{}[]": {
+      "snippet": "Glssymbol{${1:label}}[${2:insert}]"
+    },
+    "Glssymbol[]{}[]": {
+      "snippet": "Glssymbol[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSsymbol{}": {
+      "snippet": "GLSsymbol{${1:label}}"
+    },
+    "GLSsymbol[]{}": {
+      "snippet": "GLSsymbol[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSsymbol{}[]": {
+      "snippet": "GLSsymbol{${1:label}}[${2:insert}]"
+    },
+    "GLSsymbol[]{}[]": {
+      "snippet": "GLSsymbol[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glssymbol*{}": {
+      "snippet": "glssymbol*{${1:label}}"
+    },
+    "glssymbol*[]{}": {
+      "snippet": "glssymbol*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glssymbol*{}[]": {
+      "snippet": "glssymbol*{${1:label}}[${2:insert}]"
+    },
+    "glssymbol*[]{}[]": {
+      "snippet": "glssymbol*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glssymbol*{}": {
+      "snippet": "Glssymbol*{${1:label}}"
+    },
+    "Glssymbol*[]{}": {
+      "snippet": "Glssymbol*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glssymbol*{}[]": {
+      "snippet": "Glssymbol*{${1:label}}[${2:insert}]"
+    },
+    "Glssymbol*[]{}[]": {
+      "snippet": "Glssymbol*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSsymbol*{}": {
+      "snippet": "GLSsymbol*{${1:label}}"
+    },
+    "GLSsymbol*[]{}": {
+      "snippet": "GLSsymbol*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSsymbol*{}[]": {
+      "snippet": "GLSsymbol*{${1:label}}[${2:insert}]"
+    },
+    "GLSsymbol*[]{}[]": {
+      "snippet": "GLSsymbol*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glssymbolplural{}": {
+      "snippet": "glssymbolplural{${1:label}}"
+    },
+    "glssymbolplural[]{}": {
+      "snippet": "glssymbolplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glssymbolplural{}[]": {
+      "snippet": "glssymbolplural{${1:label}}[${2:insert}]"
+    },
+    "glssymbolplural[]{}[]": {
+      "snippet": "glssymbolplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glssymbolplural{}": {
+      "snippet": "Glssymbolplural{${1:label}}"
+    },
+    "Glssymbolplural[]{}": {
+      "snippet": "Glssymbolplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glssymbolplural{}[]": {
+      "snippet": "Glssymbolplural{${1:label}}[${2:insert}]"
+    },
+    "Glssymbolplural[]{}[]": {
+      "snippet": "Glssymbolplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSsymbolplural{}": {
+      "snippet": "GLSsymbolplural{${1:label}}"
+    },
+    "GLSsymbolplural[]{}": {
+      "snippet": "GLSsymbolplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSsymbolplural{}[]": {
+      "snippet": "GLSsymbolplural{${1:label}}[${2:insert}]"
+    },
+    "GLSsymbolplural[]{}[]": {
+      "snippet": "GLSsymbolplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glssymbolplural*{}": {
+      "snippet": "glssymbolplural*{${1:label}}"
+    },
+    "glssymbolplural*[]{}": {
+      "snippet": "glssymbolplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glssymbolplural*{}[]": {
+      "snippet": "glssymbolplural*{${1:label}}[${2:insert}]"
+    },
+    "glssymbolplural*[]{}[]": {
+      "snippet": "glssymbolplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glssymbolplural*{}": {
+      "snippet": "Glssymbolplural*{${1:label}}"
+    },
+    "Glssymbolplural*[]{}": {
+      "snippet": "Glssymbolplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glssymbolplural*{}[]": {
+      "snippet": "Glssymbolplural*{${1:label}}[${2:insert}]"
+    },
+    "Glssymbolplural*[]{}[]": {
+      "snippet": "Glssymbolplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSsymbolplural*{}": {
+      "snippet": "GLSsymbolplural*{${1:label}}"
+    },
+    "GLSsymbolplural*[]{}": {
+      "snippet": "GLSsymbolplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSsymbolplural*{}[]": {
+      "snippet": "GLSsymbolplural*{${1:label}}[${2:insert}]"
+    },
+    "GLSsymbolplural*[]{}[]": {
+      "snippet": "GLSsymbolplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsdesc{}": {
+      "snippet": "glsdesc{${1:label}}"
+    },
+    "glsdesc[]{}": {
+      "snippet": "glsdesc[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsdesc{}[]": {
+      "snippet": "glsdesc{${1:label}}[${2:insert}]"
+    },
+    "glsdesc[]{}[]": {
+      "snippet": "glsdesc[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsdesc{}": {
+      "snippet": "Glsdesc{${1:label}}"
+    },
+    "Glsdesc[]{}": {
+      "snippet": "Glsdesc[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsdesc{}[]": {
+      "snippet": "Glsdesc{${1:label}}[${2:insert}]"
+    },
+    "Glsdesc[]{}[]": {
+      "snippet": "Glsdesc[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSdesc{}": {
+      "snippet": "GLSdesc{${1:label}}"
+    },
+    "GLSdesc[]{}": {
+      "snippet": "GLSdesc[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSdesc{}[]": {
+      "snippet": "GLSdesc{${1:label}}[${2:insert}]"
+    },
+    "GLSdesc[]{}[]": {
+      "snippet": "GLSdesc[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsdesc*{}": {
+      "snippet": "glsdesc*{${1:label}}"
+    },
+    "glsdesc*[]{}": {
+      "snippet": "glsdesc*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsdesc*{}[]": {
+      "snippet": "glsdesc*{${1:label}}[${2:insert}]"
+    },
+    "glsdesc*[]{}[]": {
+      "snippet": "glsdesc*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsdesc*{}": {
+      "snippet": "Glsdesc*{${1:label}}"
+    },
+    "Glsdesc*[]{}": {
+      "snippet": "Glsdesc*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsdesc*{}[]": {
+      "snippet": "Glsdesc*{${1:label}}[${2:insert}]"
+    },
+    "Glsdesc*[]{}[]": {
+      "snippet": "Glsdesc*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSdesc*{}": {
+      "snippet": "GLSdesc*{${1:label}}"
+    },
+    "GLSdesc*[]{}": {
+      "snippet": "GLSdesc*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSdesc*{}[]": {
+      "snippet": "GLSdesc*{${1:label}}[${2:insert}]"
+    },
+    "GLSdesc*[]{}[]": {
+      "snippet": "GLSdesc*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsdescplural{}": {
+      "snippet": "glsdescplural{${1:label}}"
+    },
+    "glsdescplural[]{}": {
+      "snippet": "glsdescplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsdescplural{}[]": {
+      "snippet": "glsdescplural{${1:label}}[${2:insert}]"
+    },
+    "glsdescplural[]{}[]": {
+      "snippet": "glsdescplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsdescplural{}": {
+      "snippet": "Glsdescplural{${1:label}}"
+    },
+    "Glsdescplural[]{}": {
+      "snippet": "Glsdescplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsdescplural{}[]": {
+      "snippet": "Glsdescplural{${1:label}}[${2:insert}]"
+    },
+    "Glsdescplural[]{}[]": {
+      "snippet": "Glsdescplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSdescplural{}": {
+      "snippet": "GLSdescplural{${1:label}}"
+    },
+    "GLSdescplural[]{}": {
+      "snippet": "GLSdescplural[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSdescplural{}[]": {
+      "snippet": "GLSdescplural{${1:label}}[${2:insert}]"
+    },
+    "GLSdescplural[]{}[]": {
+      "snippet": "GLSdescplural[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsdescplural*{}": {
+      "snippet": "glsdescplural*{${1:label}}"
+    },
+    "glsdescplural*[]{}": {
+      "snippet": "glsdescplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsdescplural*{}[]": {
+      "snippet": "glsdescplural*{${1:label}}[${2:insert}]"
+    },
+    "glsdescplural*[]{}[]": {
+      "snippet": "glsdescplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsdescplural*{}": {
+      "snippet": "Glsdescplural*{${1:label}}"
+    },
+    "Glsdescplural*[]{}": {
+      "snippet": "Glsdescplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsdescplural*{}[]": {
+      "snippet": "Glsdescplural*{${1:label}}[${2:insert}]"
+    },
+    "Glsdescplural*[]{}[]": {
+      "snippet": "Glsdescplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSdescplural*{}": {
+      "snippet": "GLSdescplural*{${1:label}}"
+    },
+    "GLSdescplural*[]{}": {
+      "snippet": "GLSdescplural*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSdescplural*{}[]": {
+      "snippet": "GLSdescplural*{${1:label}}[${2:insert}]"
+    },
+    "GLSdescplural*[]{}[]": {
+      "snippet": "GLSdescplural*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuseri{}": {
+      "snippet": "glsuseri{${1:label}}"
+    },
+    "glsuseri[]{}": {
+      "snippet": "glsuseri[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuseri{}[]": {
+      "snippet": "glsuseri{${1:label}}[${2:insert}]"
+    },
+    "glsuseri[]{}[]": {
+      "snippet": "glsuseri[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuseri{}": {
+      "snippet": "Glsuseri{${1:label}}"
+    },
+    "Glsuseri[]{}": {
+      "snippet": "Glsuseri[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuseri{}[]": {
+      "snippet": "Glsuseri{${1:label}}[${2:insert}]"
+    },
+    "Glsuseri[]{}[]": {
+      "snippet": "Glsuseri[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuseri{}": {
+      "snippet": "GLSuseri{${1:label}}"
+    },
+    "GLSuseri[]{}": {
+      "snippet": "GLSuseri[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuseri{}[]": {
+      "snippet": "GLSuseri{${1:label}}[${2:insert}]"
+    },
+    "GLSuseri[]{}[]": {
+      "snippet": "GLSuseri[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuseri*{}": {
+      "snippet": "glsuseri*{${1:label}}"
+    },
+    "glsuseri*[]{}": {
+      "snippet": "glsuseri*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuseri*{}[]": {
+      "snippet": "glsuseri*{${1:label}}[${2:insert}]"
+    },
+    "glsuseri*[]{}[]": {
+      "snippet": "glsuseri*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuseri*{}": {
+      "snippet": "Glsuseri*{${1:label}}"
+    },
+    "Glsuseri*[]{}": {
+      "snippet": "Glsuseri*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuseri*{}[]": {
+      "snippet": "Glsuseri*{${1:label}}[${2:insert}]"
+    },
+    "Glsuseri*[]{}[]": {
+      "snippet": "Glsuseri*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuseri*{}": {
+      "snippet": "GLSuseri*{${1:label}}"
+    },
+    "GLSuseri*[]{}": {
+      "snippet": "GLSuseri*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuseri*{}[]": {
+      "snippet": "GLSuseri*{${1:label}}[${2:insert}]"
+    },
+    "GLSuseri*[]{}[]": {
+      "snippet": "GLSuseri*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuserii{}": {
+      "snippet": "glsuserii{${1:label}}"
+    },
+    "glsuserii[]{}": {
+      "snippet": "glsuserii[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuserii{}[]": {
+      "snippet": "glsuserii{${1:label}}[${2:insert}]"
+    },
+    "glsuserii[]{}[]": {
+      "snippet": "glsuserii[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuserii{}": {
+      "snippet": "Glsuserii{${1:label}}"
+    },
+    "Glsuserii[]{}": {
+      "snippet": "Glsuserii[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuserii{}[]": {
+      "snippet": "Glsuserii{${1:label}}[${2:insert}]"
+    },
+    "Glsuserii[]{}[]": {
+      "snippet": "Glsuserii[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuserii{}": {
+      "snippet": "GLSuserii{${1:label}}"
+    },
+    "GLSuserii[]{}": {
+      "snippet": "GLSuserii[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuserii{}[]": {
+      "snippet": "GLSuserii{${1:label}}[${2:insert}]"
+    },
+    "GLSuserii[]{}[]": {
+      "snippet": "GLSuserii[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuserii*{}": {
+      "snippet": "glsuserii*{${1:label}}"
+    },
+    "glsuserii*[]{}": {
+      "snippet": "glsuserii*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuserii*{}[]": {
+      "snippet": "glsuserii*{${1:label}}[${2:insert}]"
+    },
+    "glsuserii*[]{}[]": {
+      "snippet": "glsuserii*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuserii*{}": {
+      "snippet": "Glsuserii*{${1:label}}"
+    },
+    "Glsuserii*[]{}": {
+      "snippet": "Glsuserii*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuserii*{}[]": {
+      "snippet": "Glsuserii*{${1:label}}[${2:insert}]"
+    },
+    "Glsuserii*[]{}[]": {
+      "snippet": "Glsuserii*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuserii*{}": {
+      "snippet": "GLSuserii*{${1:label}}"
+    },
+    "GLSuserii*[]{}": {
+      "snippet": "GLSuserii*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuserii*{}[]": {
+      "snippet": "GLSuserii*{${1:label}}[${2:insert}]"
+    },
+    "GLSuserii*[]{}[]": {
+      "snippet": "GLSuserii*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuseriii{}": {
+      "snippet": "glsuseriii{${1:label}}"
+    },
+    "glsuseriii[]{}": {
+      "snippet": "glsuseriii[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuseriii{}[]": {
+      "snippet": "glsuseriii{${1:label}}[${2:insert}]"
+    },
+    "glsuseriii[]{}[]": {
+      "snippet": "glsuseriii[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuseriii{}": {
+      "snippet": "Glsuseriii{${1:label}}"
+    },
+    "Glsuseriii[]{}": {
+      "snippet": "Glsuseriii[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuseriii{}[]": {
+      "snippet": "Glsuseriii{${1:label}}[${2:insert}]"
+    },
+    "Glsuseriii[]{}[]": {
+      "snippet": "Glsuseriii[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuseriii{}": {
+      "snippet": "GLSuseriii{${1:label}}"
+    },
+    "GLSuseriii[]{}": {
+      "snippet": "GLSuseriii[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuseriii{}[]": {
+      "snippet": "GLSuseriii{${1:label}}[${2:insert}]"
+    },
+    "GLSuseriii[]{}[]": {
+      "snippet": "GLSuseriii[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuseriii*{}": {
+      "snippet": "glsuseriii*{${1:label}}"
+    },
+    "glsuseriii*[]{}": {
+      "snippet": "glsuseriii*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuseriii*{}[]": {
+      "snippet": "glsuseriii*{${1:label}}[${2:insert}]"
+    },
+    "glsuseriii*[]{}[]": {
+      "snippet": "glsuseriii*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuseriii*{}": {
+      "snippet": "Glsuseriii*{${1:label}}"
+    },
+    "Glsuseriii*[]{}": {
+      "snippet": "Glsuseriii*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuseriii*{}[]": {
+      "snippet": "Glsuseriii*{${1:label}}[${2:insert}]"
+    },
+    "Glsuseriii*[]{}[]": {
+      "snippet": "Glsuseriii*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuseriii*{}": {
+      "snippet": "GLSuseriii*{${1:label}}"
+    },
+    "GLSuseriii*[]{}": {
+      "snippet": "GLSuseriii*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuseriii*{}[]": {
+      "snippet": "GLSuseriii*{${1:label}}[${2:insert}]"
+    },
+    "GLSuseriii*[]{}[]": {
+      "snippet": "GLSuseriii*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuseriv{}": {
+      "snippet": "glsuseriv{${1:label}}"
+    },
+    "glsuseriv[]{}": {
+      "snippet": "glsuseriv[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuseriv{}[]": {
+      "snippet": "glsuseriv{${1:label}}[${2:insert}]"
+    },
+    "glsuseriv[]{}[]": {
+      "snippet": "glsuseriv[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuseriv{}": {
+      "snippet": "Glsuseriv{${1:label}}"
+    },
+    "Glsuseriv[]{}": {
+      "snippet": "Glsuseriv[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuseriv{}[]": {
+      "snippet": "Glsuseriv{${1:label}}[${2:insert}]"
+    },
+    "Glsuseriv[]{}[]": {
+      "snippet": "Glsuseriv[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuseriv{}": {
+      "snippet": "GLSuseriv{${1:label}}"
+    },
+    "GLSuseriv[]{}": {
+      "snippet": "GLSuseriv[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuseriv{}[]": {
+      "snippet": "GLSuseriv{${1:label}}[${2:insert}]"
+    },
+    "GLSuseriv[]{}[]": {
+      "snippet": "GLSuseriv[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuseriv*{}": {
+      "snippet": "glsuseriv*{${1:label}}"
+    },
+    "glsuseriv*[]{}": {
+      "snippet": "glsuseriv*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuseriv*{}[]": {
+      "snippet": "glsuseriv*{${1:label}}[${2:insert}]"
+    },
+    "glsuseriv*[]{}[]": {
+      "snippet": "glsuseriv*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuseriv*{}": {
+      "snippet": "Glsuseriv*{${1:label}}"
+    },
+    "Glsuseriv*[]{}": {
+      "snippet": "Glsuseriv*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuseriv*{}[]": {
+      "snippet": "Glsuseriv*{${1:label}}[${2:insert}]"
+    },
+    "Glsuseriv*[]{}[]": {
+      "snippet": "Glsuseriv*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuseriv*{}": {
+      "snippet": "GLSuseriv*{${1:label}}"
+    },
+    "GLSuseriv*[]{}": {
+      "snippet": "GLSuseriv*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuseriv*{}[]": {
+      "snippet": "GLSuseriv*{${1:label}}[${2:insert}]"
+    },
+    "GLSuseriv*[]{}[]": {
+      "snippet": "GLSuseriv*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuserv{}": {
+      "snippet": "glsuserv{${1:label}}"
+    },
+    "glsuserv[]{}": {
+      "snippet": "glsuserv[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuserv{}[]": {
+      "snippet": "glsuserv{${1:label}}[${2:insert}]"
+    },
+    "glsuserv[]{}[]": {
+      "snippet": "glsuserv[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuserv{}": {
+      "snippet": "Glsuserv{${1:label}}"
+    },
+    "Glsuserv[]{}": {
+      "snippet": "Glsuserv[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuserv{}[]": {
+      "snippet": "Glsuserv{${1:label}}[${2:insert}]"
+    },
+    "Glsuserv[]{}[]": {
+      "snippet": "Glsuserv[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuserv{}": {
+      "snippet": "GLSuserv{${1:label}}"
+    },
+    "GLSuserv[]{}": {
+      "snippet": "GLSuserv[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuserv{}[]": {
+      "snippet": "GLSuserv{${1:label}}[${2:insert}]"
+    },
+    "GLSuserv[]{}[]": {
+      "snippet": "GLSuserv[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuserv*{}": {
+      "snippet": "glsuserv*{${1:label}}"
+    },
+    "glsuserv*[]{}": {
+      "snippet": "glsuserv*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuserv*{}[]": {
+      "snippet": "glsuserv*{${1:label}}[${2:insert}]"
+    },
+    "glsuserv*[]{}[]": {
+      "snippet": "glsuserv*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuserv*{}": {
+      "snippet": "Glsuserv*{${1:label}}"
+    },
+    "Glsuserv*[]{}": {
+      "snippet": "Glsuserv*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuserv*{}[]": {
+      "snippet": "Glsuserv*{${1:label}}[${2:insert}]"
+    },
+    "Glsuserv*[]{}[]": {
+      "snippet": "Glsuserv*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuserv*{}": {
+      "snippet": "GLSuserv*{${1:label}}"
+    },
+    "GLSuserv*[]{}": {
+      "snippet": "GLSuserv*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuserv*{}[]": {
+      "snippet": "GLSuserv*{${1:label}}[${2:insert}]"
+    },
+    "GLSuserv*[]{}[]": {
+      "snippet": "GLSuserv*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuservi{}": {
+      "snippet": "glsuservi{${1:label}}"
+    },
+    "glsuservi[]{}": {
+      "snippet": "glsuservi[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuservi{}[]": {
+      "snippet": "glsuservi{${1:label}}[${2:insert}]"
+    },
+    "glsuservi[]{}[]": {
+      "snippet": "glsuservi[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuservi{}": {
+      "snippet": "Glsuservi{${1:label}}"
+    },
+    "Glsuservi[]{}": {
+      "snippet": "Glsuservi[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Glsuservi{}[]": {
+      "snippet": "Glsuservi{${1:label}}[${2:insert}]"
+    },
+    "Glsuservi[]{}[]": {
+      "snippet": "Glsuservi[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuservi{}": {
+      "snippet": "GLSuservi{${1:label}}"
+    },
+    "GLSuservi[]{}": {
+      "snippet": "GLSuservi[${2:options}]{${1:label}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GLSuservi{}[]": {
+      "snippet": "GLSuservi{${1:label}}[${2:insert}]"
+    },
+    "GLSuservi[]{}[]": {
+      "snippet": "GLSuservi[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "glsuservi*{}": {
+      "snippet": "glsuservi*{${1:label}}"
+    },
+    "glsuservi*[]{}": {
+      "snippet": "glsuservi*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsuservi*{}[]": {
+      "snippet": "glsuservi*{${1:label}}[${2:insert}]"
+    },
+    "glsuservi*[]{}[]": {
+      "snippet": "glsuservi*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuservi*{}": {
+      "snippet": "Glsuservi*{${1:label}}"
+    },
+    "Glsuservi*[]{}": {
+      "snippet": "Glsuservi*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Glsuservi*{}[]": {
+      "snippet": "Glsuservi*{${1:label}}[${2:insert}]"
+    },
+    "Glsuservi*[]{}[]": {
+      "snippet": "Glsuservi*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuservi*{}": {
+      "snippet": "GLSuservi*{${1:label}}"
+    },
+    "GLSuservi*[]{}": {
+      "snippet": "GLSuservi*[${2:options}]{${1:label}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GLSuservi*{}[]": {
+      "snippet": "GLSuservi*{${1:label}}[${2:insert}]"
+    },
+    "GLSuservi*[]{}[]": {
+      "snippet": "GLSuservi*[${2:options}]{${1:label}}[${3:insert}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "glsentryfmt": {},
+    "defglsentryfmt{}": {
+      "snippet": "defglsentryfmt{${1:definition}}"
+    },
+    "defglsentryfmt[]{}": {
+      "snippet": "defglsentryfmt[${2:glossary-type}]{${1:definition}}"
+    },
+    "glslabel": {},
+    "glstype": {},
+    "glsinsert": {},
+    "glsifplural{}{}": {
+      "snippet": "glsifplural{${1:true}}{${2:false}}"
+    },
+    "glscapscase{}{}{}": {
+      "snippet": "glscapscase{${1:no case}}{${2:first uc}}{${3:all caps}}"
+    },
+    "glscustomtext": {},
+    "glsifhyperon{}{}": {
+      "snippet": "glsifhyperon{${1:true}}{${2:false}}"
+    },
+    "glslinkvar{}{}{}": {
+      "snippet": "glslinkvar{${1:unmodified}}{${2:star case}}{${3:plus case}}"
+    },
+    "glsgenentryfmt": {},
+    "glsgenacfmt": {},
+    "genacrfullformat{}{}": {
+      "snippet": "genacrfullformat{${1:label}}{${2:insert}}"
+    },
+    "genplacrfullformat{}{}": {
+      "snippet": "genplacrfullformat{${1:label}}{${2:insert}}"
+    },
+    "Genacrfullformat{}{}": {
+      "snippet": "Genacrfullformat{${1:label}}{${2:insert}}"
+    },
+    "Genplacrfullformat{}{}": {
+      "snippet": "Genplacrfullformat{${1:label}}{${2:insert}}"
+    },
+    "glslinkpostsetkeys": {},
+    "glspostlinkhook": {},
+    "glsdisablehyper": {},
+    "glsenablehyper": {},
+    "glsentrytitlecase{}{}": {
+      "snippet": "glsentrytitlecase{${1:label}}{${2:field}}"
+    },
+    "glshyperlink{}": {
+      "snippet": "glshyperlink{${1:label}}"
+    },
+    "glshyperlink[]{}": {
+      "snippet": "glshyperlink[${2:text}]{${1:label}}"
+    },
+    "glsentryname{}": {
+      "snippet": "glsentryname{${1:label}}"
+    },
+    "Glsentryname{}": {
+      "snippet": "Glsentryname{${1:label}}"
+    },
+    "glossentryname{}": {
+      "snippet": "glossentryname{${1:label}}"
+    },
+    "Glossentryname{}": {
+      "snippet": "Glossentryname{${1:label}}"
+    },
+    "glsentrytext{}": {
+      "snippet": "glsentrytext{${1:label}}"
+    },
+    "Glsentrytext{}": {
+      "snippet": "Glsentrytext{${1:label}}"
+    },
+    "glsentryplural{}": {
+      "snippet": "glsentryplural{${1:label}}"
+    },
+    "Glsentryplural{}": {
+      "snippet": "Glsentryplural{${1:label}}"
+    },
+    "glsentryfirst{}": {
+      "snippet": "glsentryfirst{${1:label}}"
+    },
+    "Glsentryfirst{}": {
+      "snippet": "Glsentryfirst{${1:label}}"
+    },
+    "glsentryfirstplural{}": {
+      "snippet": "glsentryfirstplural{${1:label}}"
+    },
+    "Glsentryfirstplural{}": {
+      "snippet": "Glsentryfirstplural{${1:label}}"
+    },
+    "glsentrydesc{}": {
+      "snippet": "glsentrydesc{${1:label}}"
+    },
+    "Glsentrydesc{}": {
+      "snippet": "Glsentrydesc{${1:label}}"
+    },
+    "glossentrydesc{}": {
+      "snippet": "glossentrydesc{${1:label}}"
+    },
+    "Glossentrydesc{}": {
+      "snippet": "Glossentrydesc{${1:label}}"
+    },
+    "glsentrydescplural{}": {
+      "snippet": "glsentrydescplural{${1:label}}"
+    },
+    "Glsentrydescplural{}": {
+      "snippet": "Glsentrydescplural{${1:label}}"
+    },
+    "glsentrysymbol{}": {
+      "snippet": "glsentrysymbol{${1:label}}"
+    },
+    "Glsentrysymbol{}": {
+      "snippet": "Glsentrysymbol{${1:label}}"
+    },
+    "glossentrysymbol{}": {
+      "snippet": "glossentrysymbol{${1:label}}"
+    },
+    "Glossentrysymbol{}": {
+      "snippet": "Glossentrysymbol{${1:label}}"
+    },
+    "glsentrysymbolplural{}": {
+      "snippet": "glsentrysymbolplural{${1:label}}"
+    },
+    "Glsentrysymbolplural{}": {
+      "snippet": "Glsentrysymbolplural{${1:label}}"
+    },
+    "glsentryuseri{}": {
+      "snippet": "glsentryuseri{${1:label}}"
+    },
+    "Glsentryuseri{}": {
+      "snippet": "Glsentryuseri{${1:label}}"
+    },
+    "glsentryuserii{}": {
+      "snippet": "glsentryuserii{${1:label}}"
+    },
+    "Glsentryuserii{}": {
+      "snippet": "Glsentryuserii{${1:label}}"
+    },
+    "glsentryuseriii{}": {
+      "snippet": "glsentryuseriii{${1:label}}"
+    },
+    "Glsentryuseriii{}": {
+      "snippet": "Glsentryuseriii{${1:label}}"
+    },
+    "glsentryuseriv{}": {
+      "snippet": "glsentryuseriv{${1:label}}"
+    },
+    "Glsentryuseriv{}": {
+      "snippet": "Glsentryuseriv{${1:label}}"
+    },
+    "glsentryuserv{}": {
+      "snippet": "glsentryuserv{${1:label}}"
+    },
+    "Glsentryuserv{}": {
+      "snippet": "Glsentryuserv{${1:label}}"
+    },
+    "glsentryuservi{}": {
+      "snippet": "glsentryuservi{${1:label}}"
+    },
+    "Glsentryuservi{}": {
+      "snippet": "Glsentryuservi{${1:label}}"
+    },
+    "glsentrynumberlist{}": {
+      "snippet": "glsentrynumberlist{${1:label}}"
+    },
+    "glsdisplaynumberlist{}": {
+      "snippet": "glsdisplaynumberlist{${1:label}}"
+    },
+    "glsnumlistsep": {},
+    "glsnumlistlastsep": {},
+    "glsnoidxdisplayloclisthandler{}": {
+      "snippet": "glsnoidxdisplayloclisthandler{${1:location}}"
+    },
+    "newacronym{}{}{}": {
+      "snippet": "newacronym{${1:label}}{${2:abbrv}}{${3:long}}"
+    },
+    "newacronym[]{}{}{}": {
+      "snippet": "newacronym[${4:options}]{${1:label}}{${2:abbrv}}{${3:long}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "glsacrpluralsuffix": {},
+    "acrshort{}": {
+      "snippet": "acrshort{${1:label}}"
+    },
+    "acrshort[]{}": {
+      "snippet": "acrshort[${2:options}]{${1:label}}"
+    },
+    "acrshort{}[]": {
+      "snippet": "acrshort{${1:label}}[${2:insert}]"
+    },
+    "acrshort[]{}[]": {
+      "snippet": "acrshort[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrshort*{}": {
+      "snippet": "acrshort*{${1:label}}"
+    },
+    "acrshort*[]{}": {
+      "snippet": "acrshort*[${2:options}]{${1:label}}"
+    },
+    "acrshort*{}[]": {
+      "snippet": "acrshort*{${1:label}}[${2:insert}]"
+    },
+    "acrshort*[]{}[]": {
+      "snippet": "acrshort*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrshort{}": {
+      "snippet": "Acrshort{${1:label}}"
+    },
+    "Acrshort[]{}": {
+      "snippet": "Acrshort[${2:options}]{${1:label}}"
+    },
+    "Acrshort{}[]": {
+      "snippet": "Acrshort{${1:label}}[${2:insert}]"
+    },
+    "Acrshort[]{}[]": {
+      "snippet": "Acrshort[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrshort*{}": {
+      "snippet": "Acrshort*{${1:label}}"
+    },
+    "Acrshort*[]{}": {
+      "snippet": "Acrshort*[${2:options}]{${1:label}}"
+    },
+    "Acrshort*{}[]": {
+      "snippet": "Acrshort*{${1:label}}[${2:insert}]"
+    },
+    "Acrshort*[]{}[]": {
+      "snippet": "Acrshort*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRshort{}": {
+      "snippet": "ACRshort{${1:label}}"
+    },
+    "ACRshort[]{}": {
+      "snippet": "ACRshort[${2:options}]{${1:label}}"
+    },
+    "ACRshort{}[]": {
+      "snippet": "ACRshort{${1:label}}[${2:insert}]"
+    },
+    "ACRshort[]{}[]": {
+      "snippet": "ACRshort[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRshort*{}": {
+      "snippet": "ACRshort*{${1:label}}"
+    },
+    "ACRshort*[]{}": {
+      "snippet": "ACRshort*[${2:options}]{${1:label}}"
+    },
+    "ACRshort*{}[]": {
+      "snippet": "ACRshort*{${1:label}}[${2:insert}]"
+    },
+    "ACRshort*[]{}[]": {
+      "snippet": "ACRshort*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrshortpl{}": {
+      "snippet": "acrshortpl{${1:label}}"
+    },
+    "acrshortpl[]{}": {
+      "snippet": "acrshortpl[${2:options}]{${1:label}}"
+    },
+    "acrshortpl{}[]": {
+      "snippet": "acrshortpl{${1:label}}[${2:insert}]"
+    },
+    "acrshortpl[]{}[]": {
+      "snippet": "acrshortpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrshortpl*{}": {
+      "snippet": "acrshortpl*{${1:label}}"
+    },
+    "acrshortpl*[]{}": {
+      "snippet": "acrshortpl*[${2:options}]{${1:label}}"
+    },
+    "acrshortpl*{}[]": {
+      "snippet": "acrshortpl*{${1:label}}[${2:insert}]"
+    },
+    "acrshortpl*[]{}[]": {
+      "snippet": "acrshortpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrshortpl{}": {
+      "snippet": "Acrshortpl{${1:label}}"
+    },
+    "Acrshortpl[]{}": {
+      "snippet": "Acrshortpl[${2:options}]{${1:label}}"
+    },
+    "Acrshortpl{}[]": {
+      "snippet": "Acrshortpl{${1:label}}[${2:insert}]"
+    },
+    "Acrshortpl[]{}[]": {
+      "snippet": "Acrshortpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrshortpl*{}": {
+      "snippet": "Acrshortpl*{${1:label}}"
+    },
+    "Acrshortpl*[]{}": {
+      "snippet": "Acrshortpl*[${2:options}]{${1:label}}"
+    },
+    "Acrshortpl*{}[]": {
+      "snippet": "Acrshortpl*{${1:label}}[${2:insert}]"
+    },
+    "Acrshortpl*[]{}[]": {
+      "snippet": "Acrshortpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRshortpl{}": {
+      "snippet": "ACRshortpl{${1:label}}"
+    },
+    "ACRshortpl[]{}": {
+      "snippet": "ACRshortpl[${2:options}]{${1:label}}"
+    },
+    "ACRshortpl{}[]": {
+      "snippet": "ACRshortpl{${1:label}}[${2:insert}]"
+    },
+    "ACRshortpl[]{}[]": {
+      "snippet": "ACRshortpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRshortpl*{}": {
+      "snippet": "ACRshortpl*{${1:label}}"
+    },
+    "ACRshortpl*[]{}": {
+      "snippet": "ACRshortpl*[${2:options}]{${1:label}}"
+    },
+    "ACRshortpl*{}[]": {
+      "snippet": "ACRshortpl*{${1:label}}[${2:insert}]"
+    },
+    "ACRshortpl*[]{}[]": {
+      "snippet": "ACRshortpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrlong{}": {
+      "snippet": "acrlong{${1:label}}"
+    },
+    "acrlong[]{}": {
+      "snippet": "acrlong[${2:options}]{${1:label}}"
+    },
+    "acrlong{}[]": {
+      "snippet": "acrlong{${1:label}}[${2:insert}]"
+    },
+    "acrlong[]{}[]": {
+      "snippet": "acrlong[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrlong*{}": {
+      "snippet": "acrlong*{${1:label}}"
+    },
+    "acrlong*[]{}": {
+      "snippet": "acrlong*[${2:options}]{${1:label}}"
+    },
+    "acrlong*{}[]": {
+      "snippet": "acrlong*{${1:label}}[${2:insert}]"
+    },
+    "acrlong*[]{}[]": {
+      "snippet": "acrlong*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrlong{}": {
+      "snippet": "Acrlong{${1:label}}"
+    },
+    "Acrlong[]{}": {
+      "snippet": "Acrlong[${2:options}]{${1:label}}"
+    },
+    "Acrlong{}[]": {
+      "snippet": "Acrlong{${1:label}}[${2:insert}]"
+    },
+    "Acrlong[]{}[]": {
+      "snippet": "Acrlong[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrlong*{}": {
+      "snippet": "Acrlong*{${1:label}}"
+    },
+    "Acrlong*[]{}": {
+      "snippet": "Acrlong*[${2:options}]{${1:label}}"
+    },
+    "Acrlong*{}[]": {
+      "snippet": "Acrlong*{${1:label}}[${2:insert}]"
+    },
+    "Acrlong*[]{}[]": {
+      "snippet": "Acrlong*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRlong{}": {
+      "snippet": "ACRlong{${1:label}}"
+    },
+    "ACRlong[]{}": {
+      "snippet": "ACRlong[${2:options}]{${1:label}}"
+    },
+    "ACRlong{}[]": {
+      "snippet": "ACRlong{${1:label}}[${2:insert}]"
+    },
+    "ACRlong[]{}[]": {
+      "snippet": "ACRlong[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRlong*{}": {
+      "snippet": "ACRlong*{${1:label}}"
+    },
+    "ACRlong*[]{}": {
+      "snippet": "ACRlong*[${2:options}]{${1:label}}"
+    },
+    "ACRlong*{}[]": {
+      "snippet": "ACRlong*{${1:label}}[${2:insert}]"
+    },
+    "ACRlong*[]{}[]": {
+      "snippet": "ACRlong*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrlongpl{}": {
+      "snippet": "acrlongpl{${1:label}}"
+    },
+    "acrlongpl[]{}": {
+      "snippet": "acrlongpl[${2:options}]{${1:label}}"
+    },
+    "acrlongpl{}[]": {
+      "snippet": "acrlongpl{${1:label}}[${2:insert}]"
+    },
+    "acrlongpl[]{}[]": {
+      "snippet": "acrlongpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrlongpl*{}": {
+      "snippet": "acrlongpl*{${1:label}}"
+    },
+    "acrlongpl*[]{}": {
+      "snippet": "acrlongpl*[${2:options}]{${1:label}}"
+    },
+    "acrlongpl*{}[]": {
+      "snippet": "acrlongpl*{${1:label}}[${2:insert}]"
+    },
+    "acrlongpl*[]{}[]": {
+      "snippet": "acrlongpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrlongpl{}": {
+      "snippet": "Acrlongpl{${1:label}}"
+    },
+    "Acrlongpl[]{}": {
+      "snippet": "Acrlongpl[${2:options}]{${1:label}}"
+    },
+    "Acrlongpl{}[]": {
+      "snippet": "Acrlongpl{${1:label}}[${2:insert}]"
+    },
+    "Acrlongpl[]{}[]": {
+      "snippet": "Acrlongpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrlongpl*{}": {
+      "snippet": "Acrlongpl*{${1:label}}"
+    },
+    "Acrlongpl*[]{}": {
+      "snippet": "Acrlongpl*[${2:options}]{${1:label}}"
+    },
+    "Acrlongpl*{}[]": {
+      "snippet": "Acrlongpl*{${1:label}}[${2:insert}]"
+    },
+    "Acrlongpl*[]{}[]": {
+      "snippet": "Acrlongpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRlongpl{}": {
+      "snippet": "ACRlongpl{${1:label}}"
+    },
+    "ACRlongpl[]{}": {
+      "snippet": "ACRlongpl[${2:options}]{${1:label}}"
+    },
+    "ACRlongpl{}[]": {
+      "snippet": "ACRlongpl{${1:label}}[${2:insert}]"
+    },
+    "ACRlongpl[]{}[]": {
+      "snippet": "ACRlongpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRlongpl*{}": {
+      "snippet": "ACRlongpl*{${1:label}}"
+    },
+    "ACRlongpl*[]{}": {
+      "snippet": "ACRlongpl*[${2:options}]{${1:label}}"
+    },
+    "ACRlongpl*{}[]": {
+      "snippet": "ACRlongpl*{${1:label}}[${2:insert}]"
+    },
+    "ACRlongpl*[]{}[]": {
+      "snippet": "ACRlongpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrfull{}": {
+      "snippet": "acrfull{${1:label}}"
+    },
+    "acrfull[]{}": {
+      "snippet": "acrfull[${2:options}]{${1:label}}"
+    },
+    "acrfull{}[]": {
+      "snippet": "acrfull{${1:label}}[${2:insert}]"
+    },
+    "acrfull[]{}[]": {
+      "snippet": "acrfull[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrfull*{}": {
+      "snippet": "acrfull*{${1:label}}"
+    },
+    "acrfull*[]{}": {
+      "snippet": "acrfull*[${2:options}]{${1:label}}"
+    },
+    "acrfull*{}[]": {
+      "snippet": "acrfull*{${1:label}}[${2:insert}]"
+    },
+    "acrfull*[]{}[]": {
+      "snippet": "acrfull*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrfull{}": {
+      "snippet": "Acrfull{${1:label}}"
+    },
+    "Acrfull[]{}": {
+      "snippet": "Acrfull[${2:options}]{${1:label}}"
+    },
+    "Acrfull{}[]": {
+      "snippet": "Acrfull{${1:label}}[${2:insert}]"
+    },
+    "Acrfull[]{}[]": {
+      "snippet": "Acrfull[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrfull*{}": {
+      "snippet": "Acrfull*{${1:label}}"
+    },
+    "Acrfull*[]{}": {
+      "snippet": "Acrfull*[${2:options}]{${1:label}}"
+    },
+    "Acrfull*{}[]": {
+      "snippet": "Acrfull*{${1:label}}[${2:insert}]"
+    },
+    "Acrfull*[]{}[]": {
+      "snippet": "Acrfull*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRfull{}": {
+      "snippet": "ACRfull{${1:label}}"
+    },
+    "ACRfull[]{}": {
+      "snippet": "ACRfull[${2:options}]{${1:label}}"
+    },
+    "ACRfull{}[]": {
+      "snippet": "ACRfull{${1:label}}[${2:insert}]"
+    },
+    "ACRfull[]{}[]": {
+      "snippet": "ACRfull[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRfull*{}": {
+      "snippet": "ACRfull*{${1:label}}"
+    },
+    "ACRfull*[]{}": {
+      "snippet": "ACRfull*[${2:options}]{${1:label}}"
+    },
+    "ACRfull*{}[]": {
+      "snippet": "ACRfull*{${1:label}}[${2:insert}]"
+    },
+    "ACRfull*[]{}[]": {
+      "snippet": "ACRfull*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrfullpl{}": {
+      "snippet": "acrfullpl{${1:label}}"
+    },
+    "acrfullpl[]{}": {
+      "snippet": "acrfullpl[${2:options}]{${1:label}}"
+    },
+    "acrfullpl{}[]": {
+      "snippet": "acrfullpl{${1:label}}[${2:insert}]"
+    },
+    "acrfullpl[]{}[]": {
+      "snippet": "acrfullpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrfullpl*{}": {
+      "snippet": "acrfullpl*{${1:label}}"
+    },
+    "acrfullpl*[]{}": {
+      "snippet": "acrfullpl*[${2:options}]{${1:label}}"
+    },
+    "acrfullpl*{}[]": {
+      "snippet": "acrfullpl*{${1:label}}[${2:insert}]"
+    },
+    "acrfullpl*[]{}[]": {
+      "snippet": "acrfullpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrfullpl{}": {
+      "snippet": "Acrfullpl{${1:label}}"
+    },
+    "Acrfullpl[]{}": {
+      "snippet": "Acrfullpl[${2:options}]{${1:label}}"
+    },
+    "Acrfullpl{}[]": {
+      "snippet": "Acrfullpl{${1:label}}[${2:insert}]"
+    },
+    "Acrfullpl[]{}[]": {
+      "snippet": "Acrfullpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "Acrfullpl*{}": {
+      "snippet": "Acrfullpl*{${1:label}}"
+    },
+    "Acrfullpl*[]{}": {
+      "snippet": "Acrfullpl*[${2:options}]{${1:label}}"
+    },
+    "Acrfullpl*{}[]": {
+      "snippet": "Acrfullpl*{${1:label}}[${2:insert}]"
+    },
+    "Acrfullpl*[]{}[]": {
+      "snippet": "Acrfullpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRfullpl{}": {
+      "snippet": "ACRfullpl{${1:label}}"
+    },
+    "ACRfullpl[]{}": {
+      "snippet": "ACRfullpl[${2:options}]{${1:label}}"
+    },
+    "ACRfullpl{}[]": {
+      "snippet": "ACRfullpl{${1:label}}[${2:insert}]"
+    },
+    "ACRfullpl[]{}[]": {
+      "snippet": "ACRfullpl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "ACRfullpl*{}": {
+      "snippet": "ACRfullpl*{${1:label}}"
+    },
+    "ACRfullpl*[]{}": {
+      "snippet": "ACRfullpl*[${2:options}]{${1:label}}"
+    },
+    "ACRfullpl*{}[]": {
+      "snippet": "ACRfullpl*{${1:label}}[${2:insert}]"
+    },
+    "ACRfullpl*[]{}[]": {
+      "snippet": "ACRfullpl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "acrfullfmt{}{}{}": {
+      "snippet": "acrfullfmt{${1:options}}{${2:label}}{${3:insert}}"
+    },
+    "ACRfullfmt{}{}{}": {
+      "snippet": "ACRfullfmt{${1:options}}{${2:label}}{${3:insert}}"
+    },
+    "Acrfullfmt{}{}{}": {
+      "snippet": "Acrfullfmt{${1:options}}{${2:label}}{${3:insert}}"
+    },
+    "ACRfullplfmt{}{}{}": {
+      "snippet": "ACRfullplfmt{${1:options}}{${2:label}}{${3:insert}}"
+    },
+    "Acrfullplfmt{}{}{}": {
+      "snippet": "Acrfullplfmt{${1:options}}{${2:label}}{${3:insert}}"
+    },
+    "acrfullplfmt{}{}{}": {
+      "snippet": "acrfullplfmt{${1:options}}{${2:label}}{${3:insert}}"
+    },
+    "acs{}": {
+      "snippet": "acs{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acs[]{}": {
+      "snippet": "acs[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acs{}[]": {
+      "snippet": "acs{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acs[]{}[]": {
+      "snippet": "acs[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acs*{}": {
+      "snippet": "acs*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acs*[]{}": {
+      "snippet": "acs*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acs*{}[]": {
+      "snippet": "acs*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acs*[]{}[]": {
+      "snippet": "acs*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acs{}": {
+      "snippet": "Acs{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acs[]{}": {
+      "snippet": "Acs[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acs{}[]": {
+      "snippet": "Acs{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acs[]{}[]": {
+      "snippet": "Acs[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acs*{}": {
+      "snippet": "Acs*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acs*[]{}": {
+      "snippet": "Acs*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acs*{}[]": {
+      "snippet": "Acs*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acs*[]{}[]": {
+      "snippet": "Acs*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acsp{}": {
+      "snippet": "acsp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acsp[]{}": {
+      "snippet": "acsp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acsp{}[]": {
+      "snippet": "acsp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acsp[]{}[]": {
+      "snippet": "acsp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acsp*{}": {
+      "snippet": "acsp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acsp*[]{}": {
+      "snippet": "acsp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acsp*{}[]": {
+      "snippet": "acsp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acsp*[]{}[]": {
+      "snippet": "acsp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acsp{}": {
+      "snippet": "Acsp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acsp[]{}": {
+      "snippet": "Acsp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acsp{}[]": {
+      "snippet": "Acsp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acsp[]{}[]": {
+      "snippet": "Acsp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acsp*{}": {
+      "snippet": "Acsp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acsp*[]{}": {
+      "snippet": "Acsp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acsp*{}[]": {
+      "snippet": "Acsp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acsp*[]{}[]": {
+      "snippet": "Acsp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acl{}": {
+      "snippet": "acl{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acl[]{}": {
+      "snippet": "acl[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acl{}[]": {
+      "snippet": "acl{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acl[]{}[]": {
+      "snippet": "acl[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acl*{}": {
+      "snippet": "acl*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acl*[]{}": {
+      "snippet": "acl*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acl*{}[]": {
+      "snippet": "acl*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acl*[]{}[]": {
+      "snippet": "acl*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acl{}": {
+      "snippet": "Acl{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acl[]{}": {
+      "snippet": "Acl[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acl{}[]": {
+      "snippet": "Acl{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acl[]{}[]": {
+      "snippet": "Acl[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acl*{}": {
+      "snippet": "Acl*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acl*[]{}": {
+      "snippet": "Acl*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acl*{}[]": {
+      "snippet": "Acl*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acl*[]{}[]": {
+      "snippet": "Acl*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "aclp{}": {
+      "snippet": "aclp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "aclp[]{}": {
+      "snippet": "aclp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "aclp{}[]": {
+      "snippet": "aclp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "aclp[]{}[]": {
+      "snippet": "aclp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "aclp*{}": {
+      "snippet": "aclp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "aclp*[]{}": {
+      "snippet": "aclp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "aclp*{}[]": {
+      "snippet": "aclp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "aclp*[]{}[]": {
+      "snippet": "aclp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Aclp{}": {
+      "snippet": "Aclp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Aclp[]{}": {
+      "snippet": "Aclp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Aclp{}[]": {
+      "snippet": "Aclp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Aclp[]{}[]": {
+      "snippet": "Aclp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Aclp*{}": {
+      "snippet": "Aclp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Aclp*[]{}": {
+      "snippet": "Aclp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Aclp*{}[]": {
+      "snippet": "Aclp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Aclp*[]{}[]": {
+      "snippet": "Aclp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acf{}": {
+      "snippet": "acf{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acf[]{}": {
+      "snippet": "acf[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acf{}[]": {
+      "snippet": "acf{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acf[]{}[]": {
+      "snippet": "acf[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acf*{}": {
+      "snippet": "acf*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acf*[]{}": {
+      "snippet": "acf*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acf*{}[]": {
+      "snippet": "acf*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acf*[]{}[]": {
+      "snippet": "acf*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acf{}": {
+      "snippet": "Acf{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acf[]{}": {
+      "snippet": "Acf[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acf{}[]": {
+      "snippet": "Acf{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acf[]{}[]": {
+      "snippet": "Acf[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acf*{}": {
+      "snippet": "Acf*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acf*[]{}": {
+      "snippet": "Acf*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acf*{}[]": {
+      "snippet": "Acf*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acf*[]{}[]": {
+      "snippet": "Acf*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acfp{}": {
+      "snippet": "acfp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acfp[]{}": {
+      "snippet": "acfp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acfp{}[]": {
+      "snippet": "acfp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acfp[]{}[]": {
+      "snippet": "acfp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acfp*{}": {
+      "snippet": "acfp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acfp*[]{}": {
+      "snippet": "acfp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acfp*{}[]": {
+      "snippet": "acfp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acfp*[]{}[]": {
+      "snippet": "acfp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acfp{}": {
+      "snippet": "Acfp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acfp[]{}": {
+      "snippet": "Acfp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acfp{}[]": {
+      "snippet": "Acfp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acfp[]{}[]": {
+      "snippet": "Acfp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acfp*{}": {
+      "snippet": "Acfp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acfp*[]{}": {
+      "snippet": "Acfp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acfp*{}[]": {
+      "snippet": "Acfp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acfp*[]{}[]": {
+      "snippet": "Acfp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "ac{}": {
+      "snippet": "ac{${1:label}}",
+      "option": "shortcuts"
+    },
+    "ac[]{}": {
+      "snippet": "ac[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "ac{}[]": {
+      "snippet": "ac{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "ac[]{}[]": {
+      "snippet": "ac[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Ac{}": {
+      "snippet": "Ac{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Ac[]{}": {
+      "snippet": "Ac[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Ac{}[]": {
+      "snippet": "Ac{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Ac[]{}[]": {
+      "snippet": "Ac[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "ac*{}": {
+      "snippet": "ac*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "ac*[]{}": {
+      "snippet": "ac*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "ac*{}[]": {
+      "snippet": "ac*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "ac*[]{}[]": {
+      "snippet": "ac*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Ac*{}": {
+      "snippet": "Ac*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Ac*[]{}": {
+      "snippet": "Ac*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Ac*{}[]": {
+      "snippet": "Ac*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Ac*[]{}[]": {
+      "snippet": "Ac*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acp{}": {
+      "snippet": "acp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acp[]{}": {
+      "snippet": "acp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acp{}[]": {
+      "snippet": "acp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acp[]{}[]": {
+      "snippet": "acp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acp{}": {
+      "snippet": "Acp{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acp[]{}": {
+      "snippet": "Acp[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acp{}[]": {
+      "snippet": "Acp{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acp[]{}[]": {
+      "snippet": "Acp[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "acp*{}": {
+      "snippet": "acp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acp*[]{}": {
+      "snippet": "acp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "acp*{}[]": {
+      "snippet": "acp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "acp*[]{}[]": {
+      "snippet": "acp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "Acp*{}": {
+      "snippet": "Acp*{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acp*[]{}": {
+      "snippet": "Acp*[${2:options}]{${1:label}}",
+      "option": "shortcuts"
+    },
+    "Acp*{}[]": {
+      "snippet": "Acp*{${1:label}}[${2:insert}]",
+      "option": "shortcuts"
+    },
+    "Acp*[]{}[]": {
+      "snippet": "Acp*[${2:options}]{${1:label}}[${3:insert}]",
+      "option": "shortcuts"
+    },
+    "glsentrylong{}": {
+      "snippet": "glsentrylong{${1:label}}"
+    },
+    "Glsentrylong{}": {
+      "snippet": "Glsentrylong{${1:label}}"
+    },
+    "glsentrylongpl{}": {
+      "snippet": "glsentrylongpl{${1:label}}"
+    },
+    "Glsentrylongpl{}": {
+      "snippet": "Glsentrylongpl{${1:label}}"
+    },
+    "glsentryshort{}": {
+      "snippet": "glsentryshort{${1:label}}"
+    },
+    "Glsentryshort{}": {
+      "snippet": "Glsentryshort{${1:label}}"
+    },
+    "glsentryshortpl{}": {
+      "snippet": "glsentryshortpl{${1:label}}"
+    },
+    "Glsentryshortpl{}": {
+      "snippet": "Glsentryshortpl{${1:label}}"
+    },
+    "glsentryfull{}": {
+      "snippet": "glsentryfull{${1:label}}"
+    },
+    "Glsentryfull{}": {
+      "snippet": "Glsentryfull{${1:label}}"
+    },
+    "glsentryfullpl{}": {
+      "snippet": "glsentryfullpl{${1:label}}"
+    },
+    "Glsentryfullpl{}": {
+      "snippet": "Glsentryfullpl{${1:label}}"
+    },
+    "setacronymstyle{}": {
+      "snippet": "setacronymstyle{${1:style-name}}"
+    },
+    "acronymentry{}": {
+      "snippet": "acronymentry{${1:label}}"
+    },
+    "acronymsort{}{}": {
+      "snippet": "acronymsort{${1:short}}{${2:long}}"
+    },
+    "firstacronymfont{}": {
+      "snippet": "firstacronymfont{${1:text}}"
+    },
+    "acronymfont{}": {
+      "snippet": "acronymfont{${1:text}}"
+    },
+    "acrpluralsuffix": {},
+    "glsupacrpluralsuffix": {},
+    "glstextup{}": {
+      "snippet": "glstextup{${1:text}}"
+    },
+    "glsacspace{}": {
+      "snippet": "glsacspace{${1:label}}"
+    },
+    "newacronymstyle{}{}{}": {
+      "snippet": "newacronymstyle{${1:name}}{${2:format def}}{${3:style defs}}"
+    },
+    "renewacronymstyle{}{}{}": {
+      "snippet": "renewacronymstyle{${1:name}}{${2:format def}}{${3:style defs}}"
+    },
+    "GenericAcronymFields": {},
+    "glskeylisttok": {},
+    "glslabeltok": {},
+    "glsshorttok": {},
+    "glslongtok": {},
+    "GlsUseAcrEntryDispStyle{}": {
+      "snippet": "GlsUseAcrEntryDispStyle{${1:style-name}}"
+    },
+    "GlsUseAcrStyleDefs{}": {
+      "snippet": "GlsUseAcrStyleDefs{${1:style-name}}"
+    },
+    "oldacronym{}{}{}": {
+      "snippet": "oldacronym{${1:short}}{${2:long}}{${3:keyvals}}"
+    },
+    "oldacronym[]{}{}{}": {
+      "snippet": "oldacronym[${4:label}]{${1:short}}{${2:long}}{${3:keyvals}}"
+    },
+    "glsreset{}": {
+      "snippet": "glsreset{${1:label}}"
+    },
+    "glslocalreset{}": {
+      "snippet": "glslocalreset{${1:label}}"
+    },
+    "glsunset{}": {
+      "snippet": "glsunset{${1:label}}"
+    },
+    "glslocalunset{}": {
+      "snippet": "glslocalunset{${1:label}}"
+    },
+    "glsresetall": {},
+    "glsresetall[]": {
+      "snippet": "glsresetall[${1:glossary list}]"
+    },
+    "glslocalresetall": {},
+    "glslocalresetall[]": {
+      "snippet": "glslocalresetall[${1:glossary list}]"
+    },
+    "glsunsetall": {},
+    "glsunsetall[]": {
+      "snippet": "glsunsetall[${1:glossary list}]"
+    },
+    "glslocalunsetall": {},
+    "glslocalunsetall[]": {
+      "snippet": "glslocalunsetall[${1:glossary list}]"
+    },
+    "glsenableentrycount": {},
+    "ifglsresetcurrcount": {},
+    "glsresetcurrcounttrue": {},
+    "glsresetcurrcountfalse": {},
+    "glsentrycurrcount{}": {
+      "snippet": "glsentrycurrcount{${1:label}}"
+    },
+    "glsentryprevcount{}": {
+      "snippet": "glsentryprevcount{${1:label}}"
+    },
+    "cgls{}": {
+      "snippet": "cgls{${1:label}}"
+    },
+    "cgls[]{}": {
+      "snippet": "cgls[${2:options}]{${1:label}}"
+    },
+    "cgls{}[]": {
+      "snippet": "cgls{${1:label}}[${2:insert}]"
+    },
+    "cgls[]{}[]": {
+      "snippet": "cgls[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cGls{}": {
+      "snippet": "cGls{${1:label}}"
+    },
+    "cGls[]{}": {
+      "snippet": "cGls[${2:options}]{${1:label}}"
+    },
+    "cGls{}[]": {
+      "snippet": "cGls{${1:label}}[${2:insert}]"
+    },
+    "cGls[]{}[]": {
+      "snippet": "cGls[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cgls*{}": {
+      "snippet": "cgls*{${1:label}}"
+    },
+    "cgls*[]{}": {
+      "snippet": "cgls*[${2:options}]{${1:label}}"
+    },
+    "cgls*{}[]": {
+      "snippet": "cgls*{${1:label}}[${2:insert}]"
+    },
+    "cgls*[]{}[]": {
+      "snippet": "cgls*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cGls*{}": {
+      "snippet": "cGls*{${1:label}}"
+    },
+    "cGls*[]{}": {
+      "snippet": "cGls*[${2:options}]{${1:label}}"
+    },
+    "cGls*{}[]": {
+      "snippet": "cGls*{${1:label}}[${2:insert}]"
+    },
+    "cGls*[]{}[]": {
+      "snippet": "cGls*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cglspl{}": {
+      "snippet": "cglspl{${1:label}}"
+    },
+    "cglspl[]{}": {
+      "snippet": "cglspl[${2:options}]{${1:label}}"
+    },
+    "cglspl{}[]": {
+      "snippet": "cglspl{${1:label}}[${2:insert}]"
+    },
+    "cglspl[]{}[]": {
+      "snippet": "cglspl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cGlspl{}": {
+      "snippet": "cGlspl{${1:label}}"
+    },
+    "cGlspl[]{}": {
+      "snippet": "cGlspl[${2:options}]{${1:label}}"
+    },
+    "cGlspl{}[]": {
+      "snippet": "cGlspl{${1:label}}[${2:insert}]"
+    },
+    "cGlspl[]{}[]": {
+      "snippet": "cGlspl[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cglspl*{}": {
+      "snippet": "cglspl*{${1:label}}"
+    },
+    "cglspl*[]{}": {
+      "snippet": "cglspl*[${2:options}]{${1:label}}"
+    },
+    "cglspl*{}[]": {
+      "snippet": "cglspl*{${1:label}}[${2:insert}]"
+    },
+    "cglspl*[]{}[]": {
+      "snippet": "cglspl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cGlspl*{}": {
+      "snippet": "cGlspl*{${1:label}}"
+    },
+    "cGlspl*[]{}": {
+      "snippet": "cGlspl*[${2:options}]{${1:label}}"
+    },
+    "cGlspl*{}[]": {
+      "snippet": "cGlspl*{${1:label}}[${2:insert}]"
+    },
+    "cGlspl*[]{}[]": {
+      "snippet": "cGlspl*[${2:options}]{${1:label}}[${3:insert}]"
+    },
+    "cglsformat{}{}": {
+      "snippet": "cglsformat{${1:label}}{${2:insert}}"
+    },
+    "cglsplformat{}{}": {
+      "snippet": "cglsplformat{${1:label}}{${2:insert}}"
+    },
+    "cGlsformat{}{}": {
+      "snippet": "cGlsformat{${1:label}}{${2:insert}}"
+    },
+    "cGlsplformat{}{}": {
+      "snippet": "cGlsplformat{${1:label}}{${2:insert}}"
+    },
+    "printnoidxglossaries": {},
+    "printglossaries": {},
+    "printnoidxglossary": {},
+    "printnoidxglossary[]": {
+      "snippet": "printnoidxglossary[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "printglossary": {},
+    "printglossary[]": {
+      "snippet": "printglossary[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "currentglossary": {},
+    "glossarysection{}": {
+      "snippet": "glossarysection{${1:title}}"
+    },
+    "glossarysection[]{}": {
+      "snippet": "glossarysection[${2:short title}]{${1:title}}"
+    },
+    "glsglossarymark{}": {
+      "snippet": "glsglossarymark{${1:title}}"
+    },
+    "glsclearpage": {},
+    "glossarytitle": {},
+    "glossarytoctitle": {},
+    "glssettoctitle{}": {
+      "snippet": "glssettoctitle{${1:glossary-type}}"
+    },
+    "glossarypreamble": {},
+    "setglossarypreamble{}": {
+      "snippet": "setglossarypreamble{${1:text}}"
+    },
+    "setglossarypreamble[]{}": {
+      "snippet": "setglossarypreamble[${2:type}]{${1:text}}"
+    },
+    "glossarypostamble": {},
+    "glossaryentrynumbers{}": {
+      "snippet": "glossaryentrynumbers{${1:locations}}"
+    },
+    "glsresetentrylist": {},
+    "glsnoidxprenumberlist{}": {
+      "snippet": "glsnoidxprenumberlist{${1:label}}"
+    },
+    "glsnonextpages": {},
+    "glsnextpages": {},
+    "newglossary{}{}{}{}": {
+      "snippet": "newglossary{${1:name}}{${2:in-ext}}{${3:out-ext}}{${4:title}}"
+    },
+    "newglossary[]{}{}{}{}": {
+      "snippet": "newglossary[${5:log-ext}]{${1:name}}{${2:in-ext}}{${3:out-ext}}{${4:title}}"
+    },
+    "newglossary[]{}{}{}{}[]": {
+      "snippet": "newglossary[${5:log-ext}]{${1:name}}{${2:in-ext}}{${3:out-ext}}{${4:title}}[${6:counter}]"
+    },
+    "newglossary*{}{}": {
+      "snippet": "newglossary*{${1:name}}{${2:title}}"
+    },
+    "newglossary*{}{}[]": {
+      "snippet": "newglossary*{${1:name}}{${2:title}}[${3:counter}]"
+    },
+    "altnewglossary{}{}{}": {
+      "snippet": "altnewglossary{${1:name}}{${2:tag}}{${3:title}}"
+    },
+    "altnewglossary{}{}{}[]": {
+      "snippet": "altnewglossary{${1:name}}{${2:tag}}{${3:title}}[${4:counter}]"
+    },
+    "newignoredglossary{}": {
+      "snippet": "newignoredglossary{${1:name}}"
+    },
+    "ifignoredglossary{}{}{}": {
+      "snippet": "ifignoredglossary{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "acronymtype": {},
+    "glsadd{}": {
+      "snippet": "glsadd{${1:label}}"
+    },
+    "glsadd[]{}": {
+      "snippet": "glsadd[${2:options}]{${1:label}}"
+    },
+    "glsaddall": {},
+    "glsaddall[]": {
+      "snippet": "glsaddall[${1:options}]",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "glsaddallunused": {},
+    "glsaddallunused[]": {
+      "snippet": "glsaddallunused[${1:glossary types}]"
+    },
+    "glssee{}{}": {
+      "snippet": "glssee{${1:label}}{${2:xr-list}}"
+    },
+    "glssee[]{}{}": {
+      "snippet": "glssee[${3:tag}]{${1:label}}{${2:xr-list}}"
+    },
+    "glsseeformat{}{}": {
+      "snippet": "glsseeformat{${1:xr-list}}{${2:location}}"
+    },
+    "glsseeformat[]{}{}": {
+      "snippet": "glsseeformat[${3:tag}]{${1:xr-list}}{${2:location}}"
+    },
+    "glsseelist{}": {
+      "snippet": "glsseelist{${1:label-list}}"
+    },
+    "glsseesep": {},
+    "glsseelastsep": {},
+    "glsseeitem{}": {
+      "snippet": "glsseeitem{${1:label}}"
+    },
+    "glsseeitemformat{}": {
+      "snippet": "glsseeitemformat{${1:label}}"
+    },
+    "delimN": {},
+    "glsignore{}": {
+      "snippet": "glsignore{${1:text}}"
+    },
+    "glsnumberformat{}": {
+      "snippet": "glsnumberformat{${1:locations}}"
+    },
+    "glshypernumber{}": {
+      "snippet": "glshypernumber{${1:locations}}"
+    },
+    "glswrglosslocationtextfmt{}": {
+      "snippet": "glswrglosslocationtextfmt{${1:location}}"
+    },
+    "setentrycounter{}": {
+      "snippet": "setentrycounter{${1:counter}}"
+    },
+    "setentrycounter[]{}": {
+      "snippet": "setentrycounter[${2:prefix}]{${1:counter}}"
+    },
+    "glsentrycounter": {},
+    "glswrglossdisableanchorcmds": {},
+    "glswrglosslocationtarget{}": {
+      "snippet": "glswrglosslocationtarget{${1:location}}"
+    },
+    "delimR": {},
+    "glsSetSuffixF{}": {
+      "snippet": "glsSetSuffixF{${1:suffix}}"
+    },
+    "glsSetSuffixFF{}": {
+      "snippet": "glsSetSuffixFF{${1:suffix}}"
+    },
+    "glswrglossdisablelocationcmds": {},
+    "glslocationcstoencap{}{}": {
+      "snippet": "glslocationcstoencap{${1:encap-csname}}{${2:location-csname}}"
+    },
+    "glsnoidxloclist{}": {
+      "snippet": "glsnoidxloclist{${1:list cs}}"
+    },
+    "glsnoidxloclisthandler{}": {
+      "snippet": "glsnoidxloclisthandler{${1:location}}"
+    },
+    "glsnumberlistloop{}{}{}": {
+      "snippet": "glsnumberlistloop{${1:label}}{${2:handler cs}}{${3:xr handler cs}}"
+    },
+    "glsnoidxdisplayloc{}{}{}{}": {
+      "snippet": "glsnoidxdisplayloc{${1:prefix}}{${2:counter}}{${3:format}}{${4:location}}"
+    },
+    "glsnoidxnumberlistloophandler{}": {
+      "snippet": "glsnoidxnumberlistloophandler{${1:location item}}"
+    },
+    "glsnamefont{}": {
+      "snippet": "glsnamefont{${1:text}}"
+    },
+    "newglossarystyle{}{}": {
+      "snippet": "newglossarystyle{${1:name}}{${2:definitions}}"
+    },
+    "renewglossarystyle{}{}": {
+      "snippet": "renewglossarystyle{${1:name}}{${2:definitions}}"
+    },
+    "glsentryitem{}": {
+      "snippet": "glsentryitem{${1:label}}"
+    },
+    "glssubentryitem{}": {
+      "snippet": "glssubentryitem{${1:label}}"
+    },
+    "glstarget{}{}": {
+      "snippet": "glstarget{${1:label}}{${2:text}}"
+    },
+    "glolinkprefix": {},
+    "glsgetgrouptitle{}": {
+      "snippet": "glsgetgrouptitle{${1:group-label}}"
+    },
+    "glossaryheader": {},
+    "glsgroupheading{}": {
+      "snippet": "glsgroupheading{${1:group-label}}"
+    },
+    "glossentry{}{}": {
+      "snippet": "glossentry{${1:label}}{${2:number-list}}"
+    },
+    "subglossentry{}{}{}": {
+      "snippet": "subglossentry{${1:level}}{${2:label}}{${3:number-list}}"
+    },
+    "glsgroupskip": {},
+    "glsopenbrace": {},
+    "glsclosebrace": {},
+    "glspercentchar": {},
+    "glstildechar": {},
+    "glsbackslash": {},
+    "glsquote{}": {
+      "snippet": "glsquote{${1:text}}"
+    },
+    "GlsAddXdyStyle{}": {
+      "snippet": "GlsAddXdyStyle{${1:style-name}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyStyles{}": {
+      "snippet": "GlsSetXdyStyles{${1:style name list}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyLanguage{}": {
+      "snippet": "GlsSetXdyLanguage{${1:language}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyLanguage[]{}": {
+      "snippet": "GlsSetXdyLanguage[${2:glossary-type}]{${1:language}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyCodePage{}": {
+      "snippet": "GlsSetXdyCodePage{${1:codepage}}",
+      "option": "xindy"
+    },
+    "GlsAddXdyCounters{}": {
+      "snippet": "GlsAddXdyCounters{${1:counter list}}",
+      "option": "xindy"
+    },
+    "GlsAddXdyAttribute{}": {
+      "snippet": "GlsAddXdyAttribute{${1:name}}",
+      "option": "xindy"
+    },
+    "GlsAddXdyLocation{}{}": {
+      "snippet": "GlsAddXdyLocation{${1:name}}{${2:definition}}",
+      "option": "xindy"
+    },
+    "GlsAddXdyLocation[]{}{}": {
+      "snippet": "GlsAddXdyLocation[${3:H-prefix}]{${1:name}}{${2:definition}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyLocationClassOrder{}": {
+      "snippet": "GlsSetXdyLocationClassOrder{${1:location names}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyMinRangeLength{}": {
+      "snippet": "GlsSetXdyMinRangeLength{${1:integer}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyFirstLetterAfterDigits{}": {
+      "snippet": "GlsSetXdyFirstLetterAfterDigits{${1:letter}}",
+      "option": "xindy"
+    },
+    "GlsSetXdyNumberGroupOrder{}": {
+      "snippet": "GlsSetXdyNumberGroupOrder{${1:relative location}}",
+      "option": "xindy"
+    },
+    "GlsAddLetterGroup{}{}": {
+      "snippet": "GlsAddLetterGroup{${1:name}}{${2:xindy code}}",
+      "option": "xindy"
+    },
+    "GlsAddSortRule{}{}": {
+      "snippet": "GlsAddSortRule{${1:arg1}}{${2:arg2}}",
+      "option": "xindy"
+    },
+    "GlsAddXdyAlphabet{}{}": {
+      "snippet": "GlsAddXdyAlphabet{${1:name}}{${2:definition}}",
+      "option": "xindy"
+    },
+    "glsdonohyperlink{}{}": {
+      "snippet": "glsdonohyperlink{${1:target}}{${2:text}}"
+    },
+    "glsdohypertarget{}{}": {
+      "snippet": "glsdohypertarget{${1:target}}{${2:text}}"
+    },
+    "glsdohyperlink{}{}": {
+      "snippet": "glsdohyperlink{${1:target}}{${2:text}}"
+    },
+    "glsdohypertargethook{}{}": {
+      "snippet": "glsdohypertargethook{${1:target}}{${2:text}}"
+    },
+    "glsdohyperlinkhook{}{}": {
+      "snippet": "glsdohyperlinkhook{${1:target}}{${2:text}}"
+    },
+    "glslabelhypertarget{}{}": {
+      "snippet": "glslabelhypertarget{${1:target}}{${2:text}}"
+    },
+    "glslabelhypertargetprefix": {},
+    "glslabelhypertargetdefs": {},
+    "glslabelhypertargetvalue": {},
+    "glstexorpdfstring{}{}": {
+      "snippet": "glstexorpdfstring{${1:TeX string}}{${2:PDF string}}"
+    },
+    "glsuppercase{}": {
+      "snippet": "glsuppercase{${1:text}}"
+    },
+    "glslowercase{}": {
+      "snippet": "glslowercase{${1:text}}"
+    },
+    "glssentencecase{}": {
+      "snippet": "glssentencecase{${1:text}}"
+    },
+    "glscapitalisewords{}": {
+      "snippet": "glscapitalisewords{${1:text}}"
+    },
+    "glsmfuexcl{}": {
+      "snippet": "glsmfuexcl{${1:cmd}}"
+    },
+    "glsmfublocker{}": {
+      "snippet": "glsmfublocker{${1:cmd}}"
+    },
+    "glsmfuaddmap{}{}": {
+      "snippet": "glsmfuaddmap{${1:cmd1}}{${2:cmd2}}"
+    },
+    "forallglossaries{}{}": {
+      "snippet": "forallglossaries{${1:cmd}}{${2:body}}"
+    },
+    "forallglossaries[]{}{}": {
+      "snippet": "forallglossaries[${3:types}]{${1:cmd}}{${2:body}}"
+    },
+    "forallacronyms{}{}": {
+      "snippet": "forallacronyms{${1:cmd}}{${2:body}}"
+    },
+    "forglsentries{}{}": {
+      "snippet": "forglsentries{${1:cmd}}{${2:body}}"
+    },
+    "forglsentries[]{}{}": {
+      "snippet": "forglsentries[${3:glossary label}]{${1:cmd}}{${2:body}}"
+    },
+    "forallglsentries{}{}": {
+      "snippet": "forallglsentries{${1:cmd}}{${2:body}}"
+    },
+    "forallglsentries[]{}{}": {
+      "snippet": "forallglsentries[${3:types}]{${1:cmd}}{${2:body}}"
+    },
+    "ifglossaryexists{}{}{}": {
+      "snippet": "ifglossaryexists{${1:glossary-type}}{${2:true}}{${3:false}}"
+    },
+    "ifglsentryexists{}{}{}": {
+      "snippet": "ifglsentryexists{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "glsdoifexists{}{}": {
+      "snippet": "glsdoifexists{${1:label}}{${2:code}}"
+    },
+    "glsdoifnoexists{}{}": {
+      "snippet": "glsdoifnoexists{${1:label}}{${2:code}}"
+    },
+    "glsdoifexistsorwarn{}{}": {
+      "snippet": "glsdoifexistsorwarn{${1:label}}{${2:code}}"
+    },
+    "glsdoifexistsordo{}{}": {
+      "snippet": "glsdoifexistsordo{${1:label}}{${2:code}}"
+    },
+    "ifglsused{}{}{}": {
+      "snippet": "ifglsused{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglshaschildren{}{}{}": {
+      "snippet": "ifglshaschildren{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglshasparent{}{}{}": {
+      "snippet": "ifglshasparent{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglshassymbol{}{}{}": {
+      "snippet": "ifglshassymbol{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglshaslong{}{}{}": {
+      "snippet": "ifglshaslong{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglshasshort{}{}{}": {
+      "snippet": "ifglshasshort{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglshasdesc{}{}{}": {
+      "snippet": "ifglshasdesc{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglsdescsuppressed{}{}{}": {
+      "snippet": "ifglsdescsuppressed{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "ifglsfieldvoid{}{}{}{}": {
+      "snippet": "ifglsfieldvoid{${1:field}}{${2:label}}{${3:true}}{${4:false}}"
+    },
+    "ifglshasfield{}{}{}{}": {
+      "snippet": "ifglshasfield{${1:field}}{${2:label}}{${3:true}}{${4:false}}"
+    },
+    "glscurrentfieldvalue": {},
+    "ifglsfieldeq{}{}{}{}{}": {
+      "snippet": "ifglsfieldeq{${1:label}}{${2:field}}{${3:string}}{${4:true}}{${5:false}}"
+    },
+    "ifglsfielddefeq{}{}{}{}{}": {
+      "snippet": "ifglsfielddefeq{${1:label}}{${2:field}}{${3:cmd}}{${4:true}}{${5:false}}"
+    },
+    "ifglsfieldcseq{}{}{}{}{}": {
+      "snippet": "ifglsfieldcseq{${1:label}}{${2:field}}{${3:csname}}{${4:true}}{${5:false}}"
+    },
+    "glsmeasureheight{}{}": {
+      "snippet": "glsmeasureheight{${1:length}}{${2:text}}"
+    },
+    "glsmeasuredepth{}{}": {
+      "snippet": "glsmeasuredepth{${1:length}}{${2:text}}"
+    },
+    "glsmeasurewidth{}{}": {
+      "snippet": "glsmeasurewidth{${1:length}}{${2:text}}"
+    },
+    "glsifmeasuring{}{}": {
+      "snippet": "glsifmeasuring{${1:true}}{${2:false}}"
+    },
+    "glsentrytype{}": {
+      "snippet": "glsentrytype{${1:label}}"
+    },
+    "glsentryparent{}": {
+      "snippet": "glsentryparent{${1:label}}"
+    },
+    "glsentrysort{}": {
+      "snippet": "glsentrysort{${1:label}}"
+    },
+    "glsfieldfetch{}{}{}": {
+      "snippet": "glsfieldfetch{${1:label}}{${2:field}}{${3:cmd}}"
+    },
+    "glsletentryfield{}{}{}": {
+      "snippet": "glsletentryfield{${1:cmd}}{${2:label}}{${3:field}}"
+    },
+    "glsunexpandedfieldvalue{}{}": {
+      "snippet": "glsunexpandedfieldvalue{${1:label}}{${2:field}}"
+    },
+    "glsfielddef{}{}{}": {
+      "snippet": "glsfielddef{${1:label}}{${2:field}}{${3:value}}"
+    },
+    "glsfieldedef{}{}{}": {
+      "snippet": "glsfieldedef{${1:label}}{${2:field}}{${3:value}}"
+    },
+    "glsfieldgdef{}{}{}": {
+      "snippet": "glsfieldgdef{${1:label}}{${2:field}}{${3:value}}"
+    },
+    "glsfieldxdef{}{}{}": {
+      "snippet": "glsfieldxdef{${1:label}}{${2:field}}{${3:value}}"
+    },
+    "acrnameformat{}{}": {
+      "snippet": "acrnameformat{${1:short text}}{${2:long text}}"
+    },
+    "acronymname": {},
+    "addglossarytocaptions{}": {
+      "snippet": "addglossarytocaptions{${1:language}}"
+    },
+    "andname": {},
+    "descriptionname": {},
+    "entryname": {},
+    "glossaryname": {},
+    "glscurrententrylabel": {},
+    "glsdefaulttype": {},
+    "glshyperfirstfalse": {},
+    "glshyperfirsttrue": {},
+    "glsifusedtranslatordict{}{}{}": {
+      "snippet": "glsifusedtranslatordict{${1:lang}}{${2:true}}{${3:false}}"
+    },
+    "glsnumbersgroupname": {},
+    "glssymbolsgroupname": {},
+    "glswritedefhook": {},
+    "hyperbf{}": {
+      "snippet": "hyperbf{${1:locations}}"
+    },
+    "hyperemph{}": {
+      "snippet": "hyperemph{${1:locations}}"
+    },
+    "hyperit{}": {
+      "snippet": "hyperit{${1:locations}}"
+    },
+    "hypermd{}": {
+      "snippet": "hypermd{${1:locations}}"
+    },
+    "hyperrm{}": {
+      "snippet": "hyperrm{${1:locations}}"
+    },
+    "hypersc{}": {
+      "snippet": "hypersc{${1:locations}}"
+    },
+    "hypersf{}": {
+      "snippet": "hypersf{${1:locations}}"
+    },
+    "hypersl{}": {
+      "snippet": "hypersl{${1:locations}}"
+    },
+    "hypertt{}": {
+      "snippet": "hypertt{${1:locations}}"
+    },
+    "hyperup{}": {
+      "snippet": "hyperup{${1:locations}}"
+    },
+    "ifglshyperfirst": {},
+    "newacronymhook": {},
+    "pagelistname": {},
+    "ProvidesGlossariesLang{}": {
+      "snippet": "ProvidesGlossariesLang{${1:language}}"
+    },
+    "RequireGlossariesLang{}": {
+      "snippet": "RequireGlossariesLang{${1:language}}"
+    },
+    "seename": {},
+    "symbolname": {},
+    "acrfootnote{}{}{}": {
+      "snippet": "acrfootnote{${1:options}}{${2:label}}{${3:link text}}"
+    },
+    "acrlinkfootnote{}{}{}": {
+      "snippet": "acrlinkfootnote{${1:options}}{${2:label}}{${3:link text}}"
+    },
+    "acrnolinkfootnote{}{}{}": {
+      "snippet": "acrnolinkfootnote{${1:options}}{${2:label}}{${3:link text}}"
+    },
+    "currentglssubentry": {},
+    "doifglossarynoexistsordo{}{}{}": {
+      "snippet": "doifglossarynoexistsordo{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "glosortentrieswarning": {},
+    "GlossariesWarning{}": {
+      "snippet": "GlossariesWarning{${1:warning}}"
+    },
+    "GlossariesWarningNoLine{}": {
+      "snippet": "GlossariesWarningNoLine{${1:warning}}"
+    },
+    "glsacronymtrue": {},
+    "glsacrshortcutsfalse": {},
+    "glsacrshortcutstrue": {},
+    "glsaddprotectedpagefmt{}": {
+      "snippet": "glsaddprotectedpagefmt{${1:internal cs name}}"
+    },
+    "glsautomakefalse": {},
+    "glsautomaketrue": {},
+    "glscompositor": {},
+    "glsdefmain": {},
+    "glsdetoklabel{}": {
+      "snippet": "glsdetoklabel{${1:arg}}"
+    },
+    "glsdoparenifnotempty{}{}": {
+      "snippet": "glsdoparenifnotempty{${1:arg}}{${2:cmd}}"
+    },
+    "glsdoshowtarget{}{}": {
+      "snippet": "glsdoshowtarget{${1:arg1}}{${2:arg2}}"
+    },
+    "glsencapwrcontent{}": {
+      "snippet": "glsencapwrcontent{${1:arg}}"
+    },
+    "glsesclocationsfalse": {},
+    "glsesclocationstrue": {},
+    "glsgetgrouplabel{}": {
+      "snippet": "glsgetgrouplabel{${1:title}}"
+    },
+    "glsifusetranslator{}{}": {
+      "snippet": "glsifusetranslator{${1:true}}{${2:false}}"
+    },
+    "glslongkey": {},
+    "glslongpluralkey": {},
+    "glsnoidxstripaccents": {},
+    "glsnomakeindexwarning{}": {
+      "snippet": "glsnomakeindexwarning{${1:cmd}}"
+    },
+    "glsnonumberlistfalse": {},
+    "glsnonumberlisttrue": {},
+    "glsnopostdotfalse": {},
+    "glsnopostdottrue": {},
+    "glsnoxindywarning{}": {
+      "snippet": "glsnoxindywarning{${1:cmd}}"
+    },
+    "glsnumlistparser": {},
+    "glsorder": {},
+    "glssanitizesortfalse": {},
+    "glssanitizesorttrue": {},
+    "glssavenumberlistfalse": {},
+    "glssavewritesfalse": {},
+    "glsshortkey": {},
+    "glsshortpluralkey": {},
+    "glsspace": {},
+    "glstranslatefalse": {},
+    "glstranslatetrue": {},
+    "GlsWarnAddProtectedPageFmt": {},
+    "glswritefiles": {},
+    "ifglsacronym": {},
+    "ifglsacrshortcuts": {},
+    "ifglsautomake": {},
+    "ifglsesclocations": {},
+    "ifglsnonumberlist": {},
+    "ifglsnopostdot": {},
+    "ifglsnopostdotfalse": {},
+    "ifglsnumberline": {},
+    "ifglssanitizesort": {},
+    "ifglssavenumberlist": {},
+    "ifglssavewrites": {},
+    "ifglstranslate": {},
+    "istfilename": {},
+    "SetDefaultAcronymDisplayStyle": {},
+    "SetGenericNewAcronym": {},
+    "showacronymlists": {},
+    "showglocounter{}": {
+      "snippet": "showglocounter{${1:label}}"
+    },
+    "showglodesc{}": {
+      "snippet": "showglodesc{${1:label}}"
+    },
+    "showglodescplural{}": {
+      "snippet": "showglodescplural{${1:label}}"
+    },
+    "showglofield{}{}": {
+      "snippet": "showglofield{${1:label}}{${2:field}}"
+    },
+    "showglofirst{}": {
+      "snippet": "showglofirst{${1:label}}"
+    },
+    "showglofirstpl{}": {
+      "snippet": "showglofirstpl{${1:label}}"
+    },
+    "showgloflag{}": {
+      "snippet": "showgloflag{${1:label}}"
+    },
+    "showgloindex{}": {
+      "snippet": "showgloindex{${1:label}}"
+    },
+    "showglolevel{}": {
+      "snippet": "showglolevel{${1:label}}"
+    },
+    "showgloloclist{}": {
+      "snippet": "showgloloclist{${1:label}}"
+    },
+    "showglolong{}": {
+      "snippet": "showglolong{${1:label}}"
+    },
+    "showgloname{}": {
+      "snippet": "showgloname{${1:label}}"
+    },
+    "showgloparent{}": {
+      "snippet": "showgloparent{${1:label}}"
+    },
+    "showgloplural{}": {
+      "snippet": "showgloplural{${1:label}}"
+    },
+    "showgloshort{}": {
+      "snippet": "showgloshort{${1:label}}"
+    },
+    "showglosort{}": {
+      "snippet": "showglosort{${1:label}}"
+    },
+    "showglossaries": {},
+    "showglossarycounter{}": {
+      "snippet": "showglossarycounter{${1:glossary label}}"
+    },
+    "showglossaryentries{}": {
+      "snippet": "showglossaryentries{${1:glossary label}}"
+    },
+    "showglossaryin{}": {
+      "snippet": "showglossaryin{${1:glossary label}}"
+    },
+    "showglossaryout{}": {
+      "snippet": "showglossaryout{${1:glossary label}}"
+    },
+    "showglossarytitle{}": {
+      "snippet": "showglossarytitle{${1:glossary label}}"
+    },
+    "showglosymbol{}": {
+      "snippet": "showglosymbol{${1:label}}"
+    },
+    "showglosymbolplural{}": {
+      "snippet": "showglosymbolplural{${1:label}}"
+    },
+    "showglotext{}": {
+      "snippet": "showglotext{${1:label}}"
+    },
+    "showglotype{}": {
+      "snippet": "showglotype{${1:label}}"
+    },
+    "showglouseri{}": {
+      "snippet": "showglouseri{${1:label}}"
+    },
+    "showglouserii{}": {
+      "snippet": "showglouserii{${1:label}}"
+    },
+    "showglouseriii{}": {
+      "snippet": "showglouseriii{${1:label}}"
+    },
+    "showglouseriv{}": {
+      "snippet": "showglouseriv{${1:label}}"
+    },
+    "showglouserv{}": {
+      "snippet": "showglouserv{${1:label}}"
+    },
+    "showglouservi{}": {
+      "snippet": "showglouservi{${1:label}}"
+    },
+    "theglsentrycounter": {},
+    "theHglossaryentry": {},
+    "theHglossarysubentry": {},
+    "theHglsentrycounter": {},
+    "acrfullformat": {},
+    "acrlinkfullformat": {},
+    "glossarymark": {}
+  },
+  "envs": {
+    "theglossary": {}
+  },
+  "options": [
+    "nowarn",
+    "nolangwarn",
+    "noredefwarn",
+    "translate=",
+    "notranslate",
+    "languages=${1:language}",
+    "nolong",
+    "nosuper",
+    "nolist",
+    "notree",
+    "nostyles",
+    "makeindex",
+    "xindy",
+    "xindy={${1:options}}",
+    "xindygloss",
+    "xindynoglsnumbers",
+    "acronym",
+    "acronyms",
+    "debug=",
+    "savewrites",
+    "hyperfirst",
+    "writeglslabels",
+    "writeglslabelnames",
+    "toc",
+    "numberline",
+    "section=${1:section unit}",
+    "ucmark",
+    "numberedsection=",
+    "savenumberlist",
+    "entrycounter",
+    "counterwithin=${1:counter}",
+    "subentrycounter",
+    "style=${1:style-name}",
+    "nonumberlist",
+    "seeautonumberlist",
+    "counter=${1:counter}",
+    "nopostdot",
+    "nogroupskip",
+    "seenoindex=",
+    "esclocations",
+    "indexonlyfirst",
+    "sanitizesort",
+    "sort=",
+    "order=",
+    "automake=",
+    "automakegloss",
+    "automakeglosslite",
+    "disablemakegloss",
+    "restoremakegloss",
+    "nohypertypes={${1:list}}",
+    "symbols",
+    "numbers",
+    "index",
+    "noglossaryindex",
+    "acronymlists={${1:label-list}}",
+    "shortcuts",
+    "mfirstuc=",
+    "kernelglossredefs="
+  ],
+  "keyvals": [
+    [
+      "type=${1:glossary-label}",
+      "title=${1:text}",
+      "toctitle=${1:text}",
+      "style=${1:style-name}",
+      "numberedsection=",
+      "nonumberlist",
+      "nogroupskip",
+      "nopostdot",
+      "entrycounter",
+      "subentrycounter",
+      "sort="
+    ],
+    [
+      "name=${1:text}",
+      "description=${1:text}",
+      "parent=${1:parent-label}",
+      "descriptionplural=${1:text}",
+      "text=${1:text}",
+      "first=${1:text}",
+      "plural=${1:text}",
+      "firstplural=${1:text}",
+      "symbol=${1:symbol}",
+      "symbolplural=${1:symbol}",
+      "sort=${1:entry-name}",
+      "type=${1:glossary-label}",
+      "user1=${1:text}",
+      "user2=${1:text}",
+      "user3=${1:text}",
+      "user4=${1:text}",
+      "user5=${1:text}",
+      "user6=${1:text}",
+      "nonumberlist",
+      "see={${1:xr-list}}",
+      "see={[${1:tag}]${2:xr-list}}"
+    ],
+    [
+      "hyper",
+      "format=${1:csname}",
+      "counter=${1:counter}",
+      "local"
+    ],
+    [
+      "format=${1:csname}",
+      "counter=${1:counter}",
+      "local"
+    ],
+    [
+      "long=${1:text}",
+      "longplural=${1:text}",
+      "short=${1:text}",
+      "shortplural=${1:text}"
+    ],
+    [
+      "types={${1:glossary-list}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/glosstex.json b/dev/packages/glosstex.json
index 9e96fc2fb..e79578345 100644
--- a/dev/packages/glosstex.json
+++ b/dev/packages/glosstex.json
@@ -7,84 +7,198 @@
     "glosstex[]{}": {
       "snippet": "glosstex[${2:pageref-mode}]{${1:label}}"
     },
+    "glosstex(){}": {
+      "snippet": "glosstex(${2:list}){${1:label}}"
+    },
+    "glosstex()[]{}": {
+      "snippet": "glosstex(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "glosstex*{}": {
       "snippet": "glosstex*{${1:label}}"
     },
     "glosstex*[]{}": {
       "snippet": "glosstex*[${2:pageref-mode}]{${1:label}}"
     },
+    "glosstex*(){}": {
+      "snippet": "glosstex*(${2:list}){${1:label}}"
+    },
+    "glosstex*()[]{}": {
+      "snippet": "glosstex*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "acronym{}": {
       "snippet": "acronym{${1:label}}"
     },
     "acronym[]{}": {
       "snippet": "acronym[${2:pageref-mode}]{${1:label}}"
     },
+    "acronym(){}": {
+      "snippet": "acronym(${2:list}){${1:label}}"
+    },
+    "acronym()[]{}": {
+      "snippet": "acronym(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "acronym*{}": {
       "snippet": "acronym*{${1:label}}"
     },
     "acronym*[]{}": {
       "snippet": "acronym*[${2:pageref-mode}]{${1:label}}"
     },
+    "acronym*(){}": {
+      "snippet": "acronym*(${2:list}){${1:label}}"
+    },
+    "acronym*()[]{}": {
+      "snippet": "acronym*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "gls{}": {
       "snippet": "gls{${1:label}}"
     },
     "gls[]{}": {
       "snippet": "gls[${2:pageref-mode}]{${1:label}}"
     },
+    "gls(){}": {
+      "snippet": "gls(${2:list}){${1:label}}"
+    },
+    "gls()[]{}": {
+      "snippet": "gls(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "gls*{}": {
       "snippet": "gls*{${1:label}}"
     },
     "gls*[]{}": {
       "snippet": "gls*[${2:pageref-mode}]{${1:label}}"
     },
+    "gls*(){}": {
+      "snippet": "gls*(${2:list}){${1:label}}"
+    },
+    "gls*()[]{}": {
+      "snippet": "gls*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
     "ac{}": {
       "snippet": "ac{${1:label}}"
     },
     "ac[]{}": {
       "snippet": "ac[${2:pageref-mode}]{${1:label}}"
     },
+    "ac()[]{}": {
+      "snippet": "ac(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac<>()[]{}": {
+      "snippet": "ac<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac[]<>()[]{}": {
+      "snippet": "ac[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "ac*{}": {
       "snippet": "ac*{${1:label}}"
     },
     "ac*[]{}": {
       "snippet": "ac*[${2:pageref-mode}]{${1:label}}"
     },
+    "ac*()[]{}": {
+      "snippet": "ac*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac*<>()[]{}": {
+      "snippet": "ac*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "ac*[]<>()[]{}": {
+      "snippet": "ac*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acs{}": {
       "snippet": "acs{${1:label}}"
     },
     "acs[]{}": {
       "snippet": "acs[${2:pageref-mode}]{${1:label}}"
     },
+    "acs()[]{}": {
+      "snippet": "acs(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs<>()[]{}": {
+      "snippet": "acs<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs[]<>()[]{}": {
+      "snippet": "acs[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acs*{}": {
       "snippet": "acs*{${1:label}}"
     },
     "acs*[]{}": {
       "snippet": "acs*[${2:pageref-mode}]{${1:label}}"
     },
+    "acs*()[]{}": {
+      "snippet": "acs*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs*<>()[]{}": {
+      "snippet": "acs*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acs*[]<>()[]{}": {
+      "snippet": "acs*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acl{}": {
       "snippet": "acl{${1:label}}"
     },
     "acl[]{}": {
       "snippet": "acl[${2:pageref-mode}]{${1:label}}"
     },
+    "acl()[]{}": {
+      "snippet": "acl(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl<>()[]{}": {
+      "snippet": "acl<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl[]<>()[]{}": {
+      "snippet": "acl[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acl*{}": {
       "snippet": "acl*{${1:label}}"
     },
     "acl*[]{}": {
       "snippet": "acl*[${2:pageref-mode}]{${1:label}}"
     },
+    "acl*()[]{}": {
+      "snippet": "acl*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl*<>()[]{}": {
+      "snippet": "acl*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acl*[]<>()[]{}": {
+      "snippet": "acl*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acf{}": {
       "snippet": "acf{${1:label}}"
     },
     "acf[]{}": {
       "snippet": "acf[${2:pageref-mode}]{${1:label}}"
     },
+    "acf()[]{}": {
+      "snippet": "acf(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf<>()[]{}": {
+      "snippet": "acf<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf[]<>()[]{}": {
+      "snippet": "acf[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
     "acf*{}": {
       "snippet": "acf*{${1:label}}"
     },
     "acf*[]{}": {
       "snippet": "acf*[${2:pageref-mode}]{${1:label}}"
     },
+    "acf*()[]{}": {
+      "snippet": "acf*(${3:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf*<>()[]{}": {
+      "snippet": "acf*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
+    },
+    "acf*[]<>()[]{}": {
+      "snippet": "acf*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
+    },
+    "printglosstex()": {
+      "snippet": "printglosstex(${1:list})"
+    },
+    "printglosstex()[]": {
+      "snippet": "printglosstex(${2:list})[${1:pageref-mode}]"
+    },
     "glxitemorderdefault{}{}": {
       "snippet": "glxitemorderdefault{${1:list}}{${2:item-order i/l/\"\"}}"
     },
diff --git a/dev/packages/gradient-text.json b/dev/packages/gradient-text.json
index af3d869db..52908089d 100644
--- a/dev/packages/gradient-text.json
+++ b/dev/packages/gradient-text.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "gradientRGB{}{}{}": {
-      "snippet": "gradientRGB{${1:text}}{${2:R1,G1,B1}}{${3:R2,G2,B2}}"
+      "snippet": "gradientRGB{${1:text}}{${2:R1,${4:G1},${5:B1}}{${3:R2},${6:G2},B2}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/grafcet.json b/dev/packages/grafcet.json
index 0deb63416..2e926e52b 100644
--- a/dev/packages/grafcet.json
+++ b/dev/packages/grafcet.json
@@ -64,7 +64,7 @@
       "snippet": "Recept{${1:Tnnn}}{${2:condition}}"
     },
     "Recepts{}": {
-      "snippet": "Recepts{${1:1/r1,2/r2,...}}"
+      "snippet": "Recepts{${1:1/r1,${2:2/r2},...}}"
     },
     "TransitionSource{}": {
       "snippet": "TransitionSource{${1:nom}}"
@@ -115,7 +115,7 @@
       "snippet": "ActionXV[${3:dist}]{${1:etape}}{${2:liste actions}}"
     },
     "Actions{}": {
-      "snippet": "Actions{${1:1/A1,2/A2,...}}"
+      "snippet": "Actions{${1:1/A1,${2:2/A2},...}}"
     },
     "ForcageX{}{}": {
       "snippet": "ForcageX{${1:Xnnn}}{${2:forçage}}"
@@ -163,22 +163,22 @@
       "snippet": "SequenceTT[${3:pos}]{${1:trans init}}{${2:liste}}"
     },
     "ActionRecept{}": {
-      "snippet": "ActionRecept{${1:1/A1/r1,2/A2/r2,...}}"
+      "snippet": "ActionRecept{${1:1/A1/r1,${2:2/A2/r2},...}}"
     },
     "Graphe{}": {
-      "snippet": "Graphe{${1:1/A1/r1,2/A2/r2,...}}"
+      "snippet": "Graphe{${1:1/A1/r1,${2:2/A2/r2},...}}"
     },
     "Graphe[]{}": {
-      "snippet": "Graphe[${2:pos}]{${1:1/A1/r1,2/A2/r2,...}}"
+      "snippet": "Graphe[${2:pos}]{${1:1/A1/r1,${3:2/A2/r2},...}}"
     },
     "GrapheBoucle{}": {
-      "snippet": "GrapheBoucle{${1:1/A1/r1,2/A2/r2,...}}"
+      "snippet": "GrapheBoucle{${1:1/A1/r1,${2:2/A2/r2},...}}"
     },
     "GrapheBoucle[]{}": {
-      "snippet": "GrapheBoucle[${2:pos}]{${1:1/A1/r1,2/A2/r2,...}}"
+      "snippet": "GrapheBoucle[${2:pos}]{${1:1/A1/r1,${3:2/A2/r2},...}}"
     },
     "DivOU{}{}": {
-      "snippet": "DivOU{${1:Xnnn}}{${2:d1/nom1,d2/nom2,...}}"
+      "snippet": "DivOU{${1:Xnnn}}{${2:d1/nom1,${3:d2/nom2},...}}"
     },
     "ConvOU{}{}{}": {
       "snippet": "ConvOU{${1:Tnnn}}{${2:liste}}{${3:nom}}"
@@ -223,7 +223,7 @@
       "snippet": "DecaleNoeudy[${3:dist}]{${1:ni}}{${2:nf}}"
     },
     "DivET{}{}": {
-      "snippet": "DivET{${1:Tnnn}}{${2:d1/br1,d2/br2,...}}"
+      "snippet": "DivET{${1:Tnnn}}{${2:d1/br1,${3:d2/br2},...}}"
     },
     "ConvET{}{}{}": {
       "snippet": "ConvET{${1:Tnnn}}{${2:liste}}{${3:nom}}"
diff --git a/dev/packages/graphics.json b/dev/packages/graphics.json
new file mode 100644
index 000000000..f5aaa60d2
--- /dev/null
+++ b/dev/packages/graphics.json
@@ -0,0 +1,84 @@
+{
+  "includes": {
+    "trig": []
+  },
+  "macros": {
+    "DeclareGraphicsExtensions{}": {
+      "snippet": "DeclareGraphicsExtensions{${1:ext-list}}"
+    },
+    "DeclareGraphicsRule{}{}{}{}": {
+      "snippet": "DeclareGraphicsRule{${1:ext}}{${2:type}}{${3:read-file}}{${4:command}}"
+    },
+    "graphicspath{}": {
+      "snippet": "graphicspath{${1:dir-list}}"
+    },
+    "includegraphics[][]{}": {
+      "snippet": "includegraphics[${2:llx,${4:lly}][${3:urx},ury}]{${1:imagefile}}"
+    },
+    "includegraphics*{}": {
+      "snippet": "includegraphics*{${1:imagefile}}"
+    },
+    "includegraphics*[]{}": {
+      "snippet": "includegraphics*[${2:llx,lly}]{${1:imagefile}}"
+    },
+    "includegraphics*[][]{}": {
+      "snippet": "includegraphics*[${2:llx,${4:lly}][${3:urx},ury}]{${1:imagefile}}"
+    },
+    "reflectbox{}": {
+      "snippet": "reflectbox{${1:text}}"
+    },
+    "resizebox{}{}{}": {
+      "snippet": "resizebox{${1:h-length}}{${2:v-length}}{${3:text}}"
+    },
+    "resizebox*{}{}{}": {
+      "snippet": "resizebox*{${1:h-length}}{${2:v-length}}{${3:text}}"
+    },
+    "rotatebox{}{}": {
+      "snippet": "rotatebox{${1:angle}}{${2:text}}"
+    },
+    "scalebox{}{}": {
+      "snippet": "scalebox{${1:h-scale}}{${2:text}}"
+    },
+    "scalebox{}[]{}": {
+      "snippet": "scalebox{${1:h-scale}}[${2:v-scale}]{${3:text}}"
+    },
+    "GDebug{}": {
+      "snippet": "GDebug{${1:text}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "draft",
+    "final",
+    "hiresbb",
+    "demo",
+    "setpagesize",
+    "nosetpagesize",
+    "dvips",
+    "xdvi",
+    "dvipdf",
+    "dvipdfm",
+    "dvipdfmx",
+    "xetex",
+    "pdftex",
+    "luatex",
+    "dvisvgm",
+    "dvipsone",
+    "dviwindo",
+    "emtex",
+    "dviwin",
+    "oztex",
+    "textures",
+    "pctexps",
+    "pctexwin",
+    "pctexhp",
+    "pctex32",
+    "truetex",
+    "tcidvi",
+    "vtex",
+    "debugshow",
+    "hiderotate",
+    "hidescale"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/graphicsonthefly.json b/dev/packages/graphicsonthefly.json
index 3a3a7c02c..58225749e 100644
--- a/dev/packages/graphicsonthefly.json
+++ b/dev/packages/graphicsonthefly.json
@@ -27,7 +27,7 @@
       "keyvalpos": 0
     },
     "usegifonthefly[]{}": {
-      "snippet": "usegifonthefly[${2:options}]{${1:fps,start,end}}",
+      "snippet": "usegifonthefly[${2:options}]{${1:fps,${3:start},end}}",
       "option": "animate",
       "keyvalindex": 0,
       "keyvalpos": 0
diff --git a/dev/packages/graphpap.json b/dev/packages/graphpap.json
index bd04b2481..3a117815a 100644
--- a/dev/packages/graphpap.json
+++ b/dev/packages/graphpap.json
@@ -1,6 +1,13 @@
 {
   "includes": {},
-  "macros": {},
+  "macros": {
+    "graphpaper()()": {
+      "snippet": "graphpaper(${1:x_init},${2:y_init})(${3:x_dimen},${4:y_dimen})"
+    },
+    "graphpaper[]()()": {
+      "snippet": "graphpaper[${1:spacing}](${2:x_init},${3:y_init})(${4:x_dimen},${5:y_dimen})"
+    }
+  },
   "envs": {},
   "options": [],
   "keyvals": []
diff --git a/dev/packages/greektonoi.json b/dev/packages/greektonoi.json
index 5b55a2eaf..4848abd32 100644
--- a/dev/packages/greektonoi.json
+++ b/dev/packages/greektonoi.json
@@ -12,6 +12,10 @@
       "detail": ">",
       "documentation": "GREATER-THAN SIGN r:"
     },
+    ")": {
+      "detail": ")",
+      "documentation": "RIGHT PARENTHESIS"
+    },
     "perispwmeni": {},
     "tildeOFF": {},
     "tildeON": {},
diff --git a/dev/packages/gregoriosyms.json b/dev/packages/gregoriosyms.json
index bab7955f5..460b33f80 100644
--- a/dev/packages/gregoriosyms.json
+++ b/dev/packages/gregoriosyms.json
@@ -112,13 +112,13 @@
       "snippet": "gredefbarredsymbol{${1:csname}}{${2:definition}}{${3:symbol}}{${4:size}}{${5:hshift}}{${6:vshift}}"
     },
     "gresimpledefbarredsymbol{}{}": {
-      "snippet": "gresimpledefbarredsymbol{${1:A, R, or V}}{${2:left shift}}"
+      "snippet": "gresimpledefbarredsymbol{${1:A,${3: R}, or V}}{${2:left shift}}"
     },
     "ABar": {},
     "VBar": {},
     "RBar": {},
     "grelatexsimpledefbarredsymbol{}{}{}{}{}": {
-      "snippet": "grelatexsimpledefbarredsymbol{${1:A, R, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
+      "snippet": "grelatexsimpledefbarredsymbol{${1:A,${6: R}, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
     },
     "gothRbar": {},
     "gothVbar": {},
diff --git a/dev/packages/gregoriotex.json b/dev/packages/gregoriotex.json
index caf33bc0a..f56334bcd 100644
--- a/dev/packages/gregoriotex.json
+++ b/dev/packages/gregoriotex.json
@@ -786,13 +786,13 @@
       "snippet": "gredefbarredsymbol{${1:csname}}{${2:definition}}{${3:symbol}}{${4:size}}{${5:hshift}}{${6:vshift}}"
     },
     "gresimpledefbarredsymbol{}{}": {
-      "snippet": "gresimpledefbarredsymbol{${1:A, R, or V}}{${2:left shift}}"
+      "snippet": "gresimpledefbarredsymbol{${1:A,${3: R}, or V}}{${2:left shift}}"
     },
     "ABar": {},
     "VBar": {},
     "RBar": {},
     "grelatexsimpledefbarredsymbol{}{}{}{}{}": {
-      "snippet": "grelatexsimpledefbarredsymbol{${1:A, R, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
+      "snippet": "grelatexsimpledefbarredsymbol{${1:A,${6: R}, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
     },
     "gothRbar": {},
     "gothVbar": {},
diff --git a/dev/packages/grid.json b/dev/packages/grid.json
new file mode 100644
index 000000000..d9a0f3da0
--- /dev/null
+++ b/dev/packages/grid.json
@@ -0,0 +1,30 @@
+{
+  "includes": {
+    "keyval": []
+  },
+  "macros": {
+    "fight": {},
+    "roundoff": {},
+    "floatunit": {},
+    "allfloats": {},
+    "halfbaselineskip": {},
+    "figboxht": {},
+    "mylines": {},
+    "oldendfigure": {},
+    "oldendtable": {},
+    "oldfigure": {},
+    "oldtable": {},
+    "xbaselineskip": {},
+    "ProcessOptionsKV": {}
+  },
+  "envs": {
+    "gridenv": {},
+    "gridfltenv": {}
+  },
+  "options": [
+    "fontsize=",
+    "baseline=",
+    "lines=${1:number}"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/gridslides.json b/dev/packages/gridslides.json
new file mode 100644
index 000000000..6ac14c43e
--- /dev/null
+++ b/dev/packages/gridslides.json
@@ -0,0 +1,84 @@
+{
+  "includes": {
+    "inputenc": [],
+    "amsmath": [],
+    "amsthm": [],
+    "amssymb": [],
+    "mathtools": [],
+    "babel": [],
+    "braket": [],
+    "siunitx": [],
+    "xspace": [],
+    "dsfont": [],
+    "microtype": [],
+    "ragged2e": [],
+    "tikz": [],
+    "geometry": [],
+    "xstring": [],
+    "enumerate": [],
+    "environ": [],
+    "hyperref": [],
+    "tikzlibrarycalc": []
+  },
+  "macros": {
+    "bg{}": {
+      "snippet": "bg{${1:imagefile}}"
+    },
+    "txt(){}": {
+      "snippet": "txt(${2:x},${3:y}){${1:text}}"
+    },
+    "block(){}": {
+      "snippet": "block(${2:x},${3:y},${4:w}){${1:content}}"
+    },
+    "block<>(){}": {
+      "snippet": "block<${2:}>(${3:x},${4:y},${5:w}){${1:content}}"
+    },
+    "fig(){}": {
+      "snippet": "fig(${2:x},${3:y},${4:w}){${1:imagefile}}"
+    },
+    "eq(){}": {
+      "snippet": "eq(${2:x},${3:y}){${1:formula}}"
+    },
+    "institute{}": {
+      "snippet": "institute{${1:institute}}"
+    },
+    "theheadline": {},
+    "theslide": {},
+    "theauthor": {},
+    "thetitle": {},
+    "thedate": {},
+    "theinstitute": {},
+    "rgb{}": {
+      "snippet": "rgb{${1:rgb}}"
+    },
+    "captionsngerman": {},
+    "datengerman": {},
+    "extrasngerman": {},
+    "noextrasngerman": {},
+    "dq": {},
+    "ntosstrue": {},
+    "ntossfalse": {},
+    "prefacename": {},
+    "bibname": {},
+    "chaptername": {},
+    "enclname": {},
+    "ccname": {},
+    "headtoname": {},
+    "seename": {},
+    "alsoname": {},
+    "proofname": {},
+    "glossaryname": {},
+    "mdqon": {},
+    "mdqoff": {}
+  },
+  "envs": {
+    "slide{}": {
+      "name": "slide",
+      "snippet": "{${1:title}}"
+    },
+    "style": {},
+    "rawslide": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/grmath.json b/dev/packages/grmath.json
new file mode 100644
index 000000000..cf15cdddf
--- /dev/null
+++ b/dev/packages/grmath.json
@@ -0,0 +1,16 @@
+{
+  "includes": {},
+  "macros": {
+    "lcm": {},
+    "arccot": {},
+    "arcsec": {},
+    "arccsc": {},
+    "symgroperators": {}
+  },
+  "envs": {},
+  "options": [
+    "grlog",
+    "enlog"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/guit.json b/dev/packages/guit.json
new file mode 100644
index 000000000..c0dfc5f37
--- /dev/null
+++ b/dev/packages/guit.json
@@ -0,0 +1,197 @@
+{
+  "includes": {
+    "graphics": [],
+    "url": [],
+    "xcolor": [],
+    "xkeyval": []
+  },
+  "macros": {
+    "GuIT": {},
+    "GuIT[]": {
+      "snippet": "GuIT[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "guit": {},
+    "guit[]": {
+      "snippet": "guit[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "GuIT*": {},
+    "GuIT*[]": {
+      "snippet": "GuIT*[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "guit*": {},
+    "guit*[]": {
+      "snippet": "guit*[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Ars": {},
+    "Arsob": {},
+    "ars": {},
+    "tecnica": {},
+    "arsta": {},
+    "arstb": {},
+    "arstv": {},
+    "arsto": {},
+    "Arsto": {},
+    "GuITcolor{}": {
+      "snippet": "GuITcolor{${1:c,${2:m},${3:y},k}}"
+    },
+    "GuITcolor[]{}": {
+      "snippet": "GuITcolor[${2:model}]{${1:color spec}}"
+    },
+    "guitcolor{}": {
+      "snippet": "guitcolor{${1:c,${2:m},${3:y},k}}"
+    },
+    "guitcolor[]{}": {
+      "snippet": "guitcolor[${2:model}]{${1:color spec}}"
+    },
+    "GuITcolor*{}": {
+      "snippet": "GuITcolor*{${1:c,${2:m},${3:y},k}}"
+    },
+    "GuITcolor*[]{}": {
+      "snippet": "GuITcolor*[${2:model}]{${1:color spec}}"
+    },
+    "guitcolor*{}": {
+      "snippet": "guitcolor*{${1:c,${2:m},${3:y},k}}"
+    },
+    "guitcolor*[]{}": {
+      "snippet": "guitcolor*[${2:model}]{${1:color spec}}"
+    },
+    "GuITtext": {},
+    "GuITtext[]": {
+      "snippet": "GuITtext[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "guittext": {},
+    "guittext[]": {
+      "snippet": "guittext[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "GuITtextEn": {},
+    "GuITtextEn[]": {
+      "snippet": "GuITtextEn[${1:options}]"
+    },
+    "guittexten": {},
+    "guittexten[]": {
+      "snippet": "guittexten[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "GuITurl": {},
+    "GuITurl[]": {
+      "snippet": "GuITurl[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "guiturl": {},
+    "guiturl[]": {
+      "snippet": "guiturl[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "GuITforum": {},
+    "GuITforum[]": {
+      "snippet": "GuITforum[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "guitforum": {},
+    "guitforum[]": {
+      "snippet": "guitforum[${1:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "GuITmeeting": {},
+    "GuITmeeting[]": {
+      "snippet": "GuITmeeting[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "guitmeeting": {},
+    "guitmeeting[]": {
+      "snippet": "guitmeeting[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "GuITmeeting*": {},
+    "GuITmeeting*[]": {
+      "snippet": "GuITmeeting*[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "guitmeeting*": {},
+    "guitmeeting*[]": {
+      "snippet": "guitmeeting*[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "setupGuIT[]": {
+      "snippet": "setupGuIT[${1:options}]",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "setupguit[]": {
+      "snippet": "setupguit[${1:options}]",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "DeclareGuITLogoCommand{}{}{}{}{}": {
+      "snippet": "DeclareGuITLogoCommand{${1:family}}{${2:u-hor}}{${3:u-vert}}{${4:i-hor}}{${5:t-hor}}"
+    },
+    "DeclareGuITLogoCommand{}[]{}{}{}{}": {
+      "snippet": "DeclareGuITLogoCommand{${1:family}}[${2:series}]{${3:u-hor}}{${4:u-vert}}{${5:i-hor}}{${6:t-hor}}"
+    },
+    "AliasGuITLogoCommand{}{}{}{}": {
+      "snippet": "AliasGuITLogoCommand{${1:family1}}{${2:series1}}{${3:family2}}{${4:series2}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "color",
+    "nocolor",
+    "link"
+  ],
+  "keyvals": [
+    [
+      "color=",
+      "link=",
+      "family=${1:family}",
+      "series=${1:series}",
+      "url=${1:URL}"
+    ],
+    [
+      "link=",
+      "url=${1:URL}"
+    ],
+    [
+      "link=",
+      "url=${1:URL}",
+      "document=${1:path}"
+    ],
+    [
+      "color=",
+      "link=",
+      "url=${1:URL}",
+      "year=${1:year}",
+      "style="
+    ],
+    [
+      "color=",
+      "link=",
+      "family=${1:family}",
+      "series=${1:series}",
+      "url=${1:URL}",
+      "document=${1:path}",
+      "year=${1:year}",
+      "style="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/hamnosys.json b/dev/packages/hamnosys.json
index 64d933a6d..643b18fd6 100644
--- a/dev/packages/hamnosys.json
+++ b/dev/packages/hamnosys.json
@@ -11,7 +11,7 @@
     },
     "hamnosysfont": {},
     "hamnosys{}": {
-      "snippet": "hamnosys{${1:sym1,sym2,...}}"
+      "snippet": "hamnosys{${1:sym1,${2:sym2},...}}"
     },
     "hamfist": {},
     "hamflathand": {},
diff --git a/dev/packages/handout.json b/dev/packages/handout.json
new file mode 100644
index 000000000..92a6a3ae3
--- /dev/null
+++ b/dev/packages/handout.json
@@ -0,0 +1,42 @@
+{
+  "includes": {
+    "kvoptions": [],
+    "etoolbox": [],
+    "suffix": []
+  },
+  "macros": {
+    "handout{}": {
+      "snippet": "handout{${1:file path}}"
+    },
+    "thehandoutnumber": {},
+    "handoutnumber{}": {
+      "snippet": "handoutnumber{${1:arg}}"
+    },
+    "handoutnumberintxt{}": {
+      "snippet": "handoutnumberintxt{${1:arg}}"
+    },
+    "disablehandout": {},
+    "enablehandout": {},
+    "onlyhandout{}": {
+      "snippet": "onlyhandout{${1:contents}}"
+    },
+    "nothandout{}": {
+      "snippet": "nothandout{${1:contents}}"
+    },
+    "forhandout{}": {
+      "snippet": "forhandout{${1:contents}}"
+    },
+    "forhandout*{}": {
+      "snippet": "forhandout*{${1:contents}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "dir=${1:file path}",
+    "sectioning",
+    "disabled",
+    "printing",
+    "numbering"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/hcycle.json b/dev/packages/hcycle.json
index 7382d88b0..a83bc703a 100644
--- a/dev/packages/hcycle.json
+++ b/dev/packages/hcycle.json
@@ -15,6 +15,18 @@
     "FiveSugarh[]{}{}[]": {
       "snippet": "FiveSugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "FiveSugarh(){}{}": {
+      "snippet": "FiveSugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "FiveSugarh(){}{}[]": {
+      "snippet": "FiveSugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "FiveSugarh()[]{}{}": {
+      "snippet": "FiveSugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "FiveSugarh()[]{}{}[]": {
+      "snippet": "FiveSugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "Furanose{}": {
       "snippet": "Furanose{${1:subslist}}"
     },
@@ -51,6 +63,18 @@
     "SixSugarh[]{}{}[]": {
       "snippet": "SixSugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "SixSugarh(){}{}": {
+      "snippet": "SixSugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "SixSugarh(){}{}[]": {
+      "snippet": "SixSugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "SixSugarh()[]{}{}": {
+      "snippet": "SixSugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "SixSugarh()[]{}{}[]": {
+      "snippet": "SixSugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "fivesugarh{}{}": {
       "snippet": "fivesugarh{${1:atomlist}}{${2:subslist}}"
     },
@@ -63,6 +87,18 @@
     "fivesugarh[]{}{}[]": {
       "snippet": "fivesugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "fivesugarh(){}{}": {
+      "snippet": "fivesugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "fivesugarh(){}{}[]": {
+      "snippet": "fivesugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "fivesugarh()[]{}{}": {
+      "snippet": "fivesugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "fivesugarh()[]{}{}[]": {
+      "snippet": "fivesugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "fivesugarhw{}{}": {
       "snippet": "fivesugarhw{${1:atomlist}}{${2:subslist}}"
     },
@@ -75,6 +111,18 @@
     "fivesugarhw[]{}{}[]": {
       "snippet": "fivesugarhw[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "fivesugarhw(){}{}": {
+      "snippet": "fivesugarhw(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "fivesugarhw(){}{}[]": {
+      "snippet": "fivesugarhw(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "fivesugarhw()[]{}{}": {
+      "snippet": "fivesugarhw(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "fivesugarhw()[]{}{}[]": {
+      "snippet": "fivesugarhw(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "furanose{}": {
       "snippet": "furanose{${1:subslist}}"
     },
@@ -111,6 +159,18 @@
     "sixsugarh[]{}{}[]": {
       "snippet": "sixsugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "sixsugarh(){}{}": {
+      "snippet": "sixsugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "sixsugarh(){}{}[]": {
+      "snippet": "sixsugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "sixsugarh()[]{}{}": {
+      "snippet": "sixsugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "sixsugarh()[]{}{}[]": {
+      "snippet": "sixsugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "sixsugarhw{}{}": {
       "snippet": "sixsugarhw{${1:atomlist}}{${2:subslist}}"
     },
@@ -123,6 +183,18 @@
     "sixsugarhw[]{}{}[]": {
       "snippet": "sixsugarhw[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "sixsugarhw(){}{}": {
+      "snippet": "sixsugarhw(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "sixsugarhw(){}{}[]": {
+      "snippet": "sixsugarhw(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "sixsugarhw()[]{}{}": {
+      "snippet": "sixsugarhw(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "sixsugarhw()[]{}{}[]": {
+      "snippet": "sixsugarhw(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "Cyclitol": {},
     "cyclitol": {},
     "fSugarhbondd": {},
diff --git a/dev/packages/hep-math.json b/dev/packages/hep-math.json
index d597e9062..ee0680c97 100644
--- a/dev/packages/hep-math.json
+++ b/dev/packages/hep-math.json
@@ -202,10 +202,10 @@
     },
     "rowseperator": {},
     "row{}": {
-      "snippet": "row{${1:x1,x2,...}}"
+      "snippet": "row{${1:x1,${2:x2},...}}"
     },
     "column{}": {
-      "snippet": "column{${1:x1,x2,...}}"
+      "snippet": "column{${1:x1,${2:x2},...}}"
     },
     "midbar": {},
     "midbar[]": {
diff --git a/dev/packages/hetarom.json b/dev/packages/hetarom.json
index f4598c961..a03b07cc9 100644
--- a/dev/packages/hetarom.json
+++ b/dev/packages/hetarom.json
@@ -81,6 +81,18 @@
     "decaheterov[]{}{}[]": {
       "snippet": "decaheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "decaheterov(){}{}": {
+      "snippet": "decaheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterov(){}{}[]": {
+      "snippet": "decaheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "decaheterov()[]{}{}": {
+      "snippet": "decaheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterov()[]{}{}[]": {
+      "snippet": "decaheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "decaheterovi{}{}": {
       "snippet": "decaheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -93,6 +105,18 @@
     "decaheterovi[]{}{}[]": {
       "snippet": "decaheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "decaheterovi(){}{}": {
+      "snippet": "decaheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterovi(){}{}[]": {
+      "snippet": "decaheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "decaheterovi()[]{}{}": {
+      "snippet": "decaheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterovi()[]{}{}[]": {
+      "snippet": "decaheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "decaheterovb{}{}": {
       "snippet": "decaheterovb{${1:atomlist}}{${2:subslist}}"
     },
@@ -105,6 +129,18 @@
     "decaheterovb[]{}{}[]": {
       "snippet": "decaheterovb[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "decaheterovb(){}{}": {
+      "snippet": "decaheterovb(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterovb(){}{}[]": {
+      "snippet": "decaheterovb(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "decaheterovb()[]{}{}": {
+      "snippet": "decaheterovb(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterovb()[]{}{}[]": {
+      "snippet": "decaheterovb(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "decaheterovt{}{}": {
       "snippet": "decaheterovt{${1:atomlist}}{${2:subslist}}"
     },
@@ -117,6 +153,18 @@
     "decaheterovt[]{}{}[]": {
       "snippet": "decaheterovt[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "decaheterovt(){}{}": {
+      "snippet": "decaheterovt(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterovt(){}{}[]": {
+      "snippet": "decaheterovt(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "decaheterovt()[]{}{}": {
+      "snippet": "decaheterovt(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterovt()[]{}{}[]": {
+      "snippet": "decaheterovt(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "fiveheterov{}{}": {
       "snippet": "fiveheterov{${1:atomlist}}{${2:subslist}}"
     },
@@ -129,6 +177,18 @@
     "fiveheterov[]{}{}[]": {
       "snippet": "fiveheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "fiveheterov(){}{}": {
+      "snippet": "fiveheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheterov(){}{}[]": {
+      "snippet": "fiveheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "fiveheterov()[]{}{}": {
+      "snippet": "fiveheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheterov()[]{}{}[]": {
+      "snippet": "fiveheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "fiveheterovi{}{}": {
       "snippet": "fiveheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -141,6 +201,18 @@
     "fiveheterovi[]{}{}[]": {
       "snippet": "fiveheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "fiveheterovi(){}{}": {
+      "snippet": "fiveheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheterovi(){}{}[]": {
+      "snippet": "fiveheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "fiveheterovi()[]{}{}": {
+      "snippet": "fiveheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheterovi()[]{}{}[]": {
+      "snippet": "fiveheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "fourhetero{}{}": {
       "snippet": "fourhetero{${1:atomlist}}{${2:subslist}}"
     },
@@ -153,6 +225,18 @@
     "fourhetero[]{}{}[]": {
       "snippet": "fourhetero[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "fourhetero(){}{}": {
+      "snippet": "fourhetero(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "fourhetero(){}{}[]": {
+      "snippet": "fourhetero(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "fourhetero()[]{}{}": {
+      "snippet": "fourhetero(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "fourhetero()[]{}{}[]": {
+      "snippet": "fourhetero(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "furanv{}": {
       "snippet": "furanv{${1:subslist}}"
     },
@@ -273,6 +357,18 @@
     "nonaheterov[]{}{}[]": {
       "snippet": "nonaheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "nonaheterov(){}{}": {
+      "snippet": "nonaheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheterov(){}{}[]": {
+      "snippet": "nonaheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "nonaheterov()[]{}{}": {
+      "snippet": "nonaheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheterov()[]{}{}[]": {
+      "snippet": "nonaheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "nonaheterovi{}{}": {
       "snippet": "nonaheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -285,6 +381,18 @@
     "nonaheterovi[]{}{}[]": {
       "snippet": "nonaheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "nonaheterovi(){}{}": {
+      "snippet": "nonaheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheterovi(){}{}[]": {
+      "snippet": "nonaheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "nonaheterovi()[]{}{}": {
+      "snippet": "nonaheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheterovi()[]{}{}[]": {
+      "snippet": "nonaheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "oxazolev{}": {
       "snippet": "oxazolev{${1:subslist}}"
     },
@@ -507,6 +615,18 @@
     "sixheterov[]{}{}[]": {
       "snippet": "sixheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "sixheterov(){}{}": {
+      "snippet": "sixheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheterov(){}{}[]": {
+      "snippet": "sixheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "sixheterov()[]{}{}": {
+      "snippet": "sixheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheterov()[]{}{}[]": {
+      "snippet": "sixheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "sixheterovi{}{}": {
       "snippet": "sixheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -519,6 +639,18 @@
     "sixheterovi[]{}{}[]": {
       "snippet": "sixheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "sixheterovi(){}{}": {
+      "snippet": "sixheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheterovi(){}{}[]": {
+      "snippet": "sixheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "sixheterovi()[]{}{}": {
+      "snippet": "sixheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheterovi()[]{}{}[]": {
+      "snippet": "sixheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "thietane{}": {
       "snippet": "thietane{${1:subslist}}"
     },
@@ -564,6 +696,18 @@
     "threeheteroi[]{}{}[]": {
       "snippet": "threeheteroi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "threeheteroi(){}{}": {
+      "snippet": "threeheteroi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheteroi(){}{}[]": {
+      "snippet": "threeheteroi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "threeheteroi()[]{}{}": {
+      "snippet": "threeheteroi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheteroi()[]{}{}[]": {
+      "snippet": "threeheteroi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "threeheterov{}{}": {
       "snippet": "threeheterov{${1:atomlist}}{${2:subslist}}"
     },
@@ -576,6 +720,18 @@
     "threeheterov[]{}{}[]": {
       "snippet": "threeheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "threeheterov(){}{}": {
+      "snippet": "threeheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheterov(){}{}[]": {
+      "snippet": "threeheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "threeheterov()[]{}{}": {
+      "snippet": "threeheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheterov()[]{}{}[]": {
+      "snippet": "threeheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "threeheterovi{}{}": {
       "snippet": "threeheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -588,6 +744,18 @@
     "threeheterovi[]{}{}[]": {
       "snippet": "threeheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "threeheterovi(){}{}": {
+      "snippet": "threeheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheterovi(){}{}[]": {
+      "snippet": "threeheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "threeheterovi()[]{}{}": {
+      "snippet": "threeheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheterovi()[]{}{}[]": {
+      "snippet": "threeheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "triazinev{}": {
       "snippet": "triazinev{${1:subslist}}"
     },
diff --git a/dev/packages/hetaromh.json b/dev/packages/hetaromh.json
index 7a9097094..abc71cd9c 100644
--- a/dev/packages/hetaromh.json
+++ b/dev/packages/hetaromh.json
@@ -61,6 +61,18 @@
     "decaheteroh[]{}{}[]": {
       "snippet": "decaheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "decaheteroh(){}{}": {
+      "snippet": "decaheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheteroh(){}{}[]": {
+      "snippet": "decaheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "decaheteroh()[]{}{}": {
+      "snippet": "decaheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheteroh()[]{}{}[]": {
+      "snippet": "decaheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "decaheterohi{}{}": {
       "snippet": "decaheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -73,6 +85,18 @@
     "decaheterohi[]{}{}[]": {
       "snippet": "decaheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "decaheterohi(){}{}": {
+      "snippet": "decaheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterohi(){}{}[]": {
+      "snippet": "decaheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "decaheterohi()[]{}{}": {
+      "snippet": "decaheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "decaheterohi()[]{}{}[]": {
+      "snippet": "decaheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "fiveheteroh{}{}": {
       "snippet": "fiveheteroh{${1:atomlist}}{${2:subslist}}"
     },
@@ -85,6 +109,18 @@
     "fiveheteroh[]{}{}[]": {
       "snippet": "fiveheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "fiveheteroh(){}{}": {
+      "snippet": "fiveheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheteroh(){}{}[]": {
+      "snippet": "fiveheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "fiveheteroh()[]{}{}": {
+      "snippet": "fiveheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheteroh()[]{}{}[]": {
+      "snippet": "fiveheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "fiveheterohi{}{}": {
       "snippet": "fiveheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -97,6 +133,18 @@
     "fiveheterohi[]{}{}[]": {
       "snippet": "fiveheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "fiveheterohi(){}{}": {
+      "snippet": "fiveheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheterohi(){}{}[]": {
+      "snippet": "fiveheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "fiveheterohi()[]{}{}": {
+      "snippet": "fiveheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "fiveheterohi()[]{}{}[]": {
+      "snippet": "fiveheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "furanh{}": {
       "snippet": "furanh{${1:subslist}}"
     },
@@ -205,6 +253,18 @@
     "nonaheteroh[]{}{}[]": {
       "snippet": "nonaheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "nonaheteroh(){}{}": {
+      "snippet": "nonaheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheteroh(){}{}[]": {
+      "snippet": "nonaheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "nonaheteroh()[]{}{}": {
+      "snippet": "nonaheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheteroh()[]{}{}[]": {
+      "snippet": "nonaheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "nonaheterohi{}{}": {
       "snippet": "nonaheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -217,6 +277,18 @@
     "nonaheterohi[]{}{}[]": {
       "snippet": "nonaheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "nonaheterohi(){}{}": {
+      "snippet": "nonaheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheterohi(){}{}[]": {
+      "snippet": "nonaheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "nonaheterohi()[]{}{}": {
+      "snippet": "nonaheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "nonaheterohi()[]{}{}[]": {
+      "snippet": "nonaheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "oxazoleh{}": {
       "snippet": "oxazoleh{${1:subslist}}"
     },
@@ -385,6 +457,18 @@
     "sixheteroh[]{}{}[]": {
       "snippet": "sixheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "sixheteroh(){}{}": {
+      "snippet": "sixheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheteroh(){}{}[]": {
+      "snippet": "sixheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "sixheteroh()[]{}{}": {
+      "snippet": "sixheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheteroh()[]{}{}[]": {
+      "snippet": "sixheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "sixheterohi{}{}": {
       "snippet": "sixheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -397,6 +481,18 @@
     "sixheterohi[]{}{}[]": {
       "snippet": "sixheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "sixheterohi(){}{}": {
+      "snippet": "sixheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheterohi(){}{}[]": {
+      "snippet": "sixheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "sixheterohi()[]{}{}": {
+      "snippet": "sixheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "sixheterohi()[]{}{}[]": {
+      "snippet": "sixheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "thiiraneh{}": {
       "snippet": "thiiraneh{${1:subslist}}"
     },
@@ -433,6 +529,18 @@
     "threeheteroh[]{}{}[]": {
       "snippet": "threeheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "threeheteroh(){}{}": {
+      "snippet": "threeheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheteroh(){}{}[]": {
+      "snippet": "threeheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "threeheteroh()[]{}{}": {
+      "snippet": "threeheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheteroh()[]{}{}[]": {
+      "snippet": "threeheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "threeheterohi{}{}": {
       "snippet": "threeheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -445,6 +553,18 @@
     "threeheterohi[]{}{}[]": {
       "snippet": "threeheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
+    "threeheterohi(){}{}": {
+      "snippet": "threeheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheterohi(){}{}[]": {
+      "snippet": "threeheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
+    },
+    "threeheterohi()[]{}{}": {
+      "snippet": "threeheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
+    },
+    "threeheterohi()[]{}{}[]": {
+      "snippet": "threeheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
+    },
     "triazineh{}": {
       "snippet": "triazineh{${1:subslist}}"
     },
diff --git a/dev/packages/hf-tikz.json b/dev/packages/hf-tikz.json
index f4f54993d..b87973d20 100644
--- a/dev/packages/hf-tikz.json
+++ b/dev/packages/hf-tikz.json
@@ -8,6 +8,9 @@
     "tikzmarkin{}": {
       "snippet": "tikzmarkin{${1:marker-id}}"
     },
+    "tikzmarkin{}()()": {
+      "snippet": "tikzmarkin{${1:marker-id}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
     "tikzmarkin[]{}": {
       "snippet": "tikzmarkin[${2:options}]{${1:marker-id}}",
       "keyvalindex": 0,
diff --git a/dev/packages/hgbbib.json b/dev/packages/hgbbib.json
index f91cec7cf..be7e4255d 100644
--- a/dev/packages/hgbbib.json
+++ b/dev/packages/hgbbib.json
@@ -77,6 +77,18 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
+    "nptextcites(){}{}": {
+      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()(){}{}": {
+      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "apa"
+    },
+    "nptextcites()()[]{}[]{}": {
+      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "apa"
+    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -85,6 +97,10 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
     },
+    "nptextcites()()[][]{}[][]{}": {
+      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "apa"
+    },
     "AddBibFile{}": {
       "snippet": "AddBibFile{${1:bib file}}"
     },
@@ -92,12 +108,24 @@
     "mcite{}{}": {
       "snippet": "mcite{${1:bibid}}{${2:bibid}}"
     },
+    "mcite(){}{}": {
+      "snippet": "mcite(${3:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "mcite()(){}{}": {
+      "snippet": "mcite(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
+    },
+    "mcite()()[]{}[]{}": {
+      "snippet": "mcite(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
+    },
     "mcite[]{}[]{}": {
       "snippet": "mcite[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "mcite[][]{}[][]{}": {
       "snippet": "mcite[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
+    "mcite()()[][]{}[][]{}": {
+      "snippet": "mcite(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
+    },
     "citenobr{}": {
       "snippet": "citenobr{${1:bibid}}"
     },
diff --git a/dev/packages/hlist.json b/dev/packages/hlist.json
index a5b59bcf7..8100ae303 100644
--- a/dev/packages/hlist.json
+++ b/dev/packages/hlist.json
@@ -7,6 +7,9 @@
     "hitem>": {},
     "hitem*": {},
     "hitem*>": {},
+    "hitem()": {
+      "snippet": "hitem(${1:num})"
+    },
     "sethlist{}": {
       "snippet": "sethlist{${1:keyvals}}",
       "keyvalindex": 0,
diff --git a/dev/packages/hsetup.json b/dev/packages/hsetup.json
new file mode 100644
index 000000000..79719b60c
--- /dev/null
+++ b/dev/packages/hsetup.json
@@ -0,0 +1,367 @@
+{
+  "includes": {
+    "ifthen": [],
+    "graphicx": [],
+    "class-letter": [],
+    "babel": []
+  },
+  "macros": {
+    "addressA{}": {
+      "snippet": "addressA{${1:text}}"
+    },
+    "addressB{}": {
+      "snippet": "addressB{${1:text}}"
+    },
+    "addressC{}": {
+      "snippet": "addressC{${1:text}}"
+    },
+    "border[]{}{}": {
+      "snippet": "border[${3:voffset}]{${1:height}}{${2:imagefile}}"
+    },
+    "border{}{}": {
+      "snippet": "border{${1:height}}{${2:imagefile}}"
+    },
+    "bottomC{}": {
+      "snippet": "bottomC{${1:text}}"
+    },
+    "bottomL{}": {
+      "snippet": "bottomL{${1:text}}"
+    },
+    "bottomR{}": {
+      "snippet": "bottomR{${1:text}}"
+    },
+    "centreA{}": {
+      "snippet": "centreA{${1:text}}"
+    },
+    "centreB{}": {
+      "snippet": "centreB{${1:text}}"
+    },
+    "centreC{}": {
+      "snippet": "centreC{${1:text}}"
+    },
+    "centreD{}": {
+      "snippet": "centreD{${1:text}}"
+    },
+    "centreE{}": {
+      "snippet": "centreE{${1:text}}"
+    },
+    "centreF{}": {
+      "snippet": "centreF{${1:text}}"
+    },
+    "centrepos{}": {
+      "snippet": "centrepos{${1:offset}}"
+    },
+    "extraA{}": {
+      "snippet": "extraA{${1:text}}"
+    },
+    "extraB{}": {
+      "snippet": "extraB{${1:text}}"
+    },
+    "extraC{}": {
+      "snippet": "extraC{${1:text}}"
+    },
+    "logo[]{}": {
+      "snippet": "logo[${2:height}]{${1:imagefile}}"
+    },
+    "logo{}": {
+      "snippet": "logo{${1:imagefile}}"
+    },
+    "newfa": {},
+    "newfb": {},
+    "newfc": {},
+    "newoption{}{}": {
+      "snippet": "newoption{${1:name}}{${2:number}}"
+    },
+    "addrbox": {},
+    "centreoffset": {},
+    "cmda{}": {
+      "snippet": "cmda{${1:arg}}"
+    },
+    "cmdb{}": {
+      "snippet": "cmdb{${1:arg}}"
+    },
+    "dohead{}{}{}{}": {
+      "snippet": "dohead{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "dotoadd{}": {
+      "snippet": "dotoadd{${1:arg}}"
+    },
+    "draftfalse": {},
+    "drafttrue": {},
+    "hlangcnt": {},
+    "hltype": {},
+    "ifdraft": {},
+    "logoheight": {},
+    "logoname": {},
+    "myc": {},
+    "oldbls": {},
+    "pindt": {},
+    "sealbx": {},
+    "settoadd{}": {
+      "snippet": "settoadd{${1:arg}}"
+    },
+    "tmpdima": {},
+    "tmpdimb": {},
+    "frenchsetup{}": {
+      "snippet": "frenchsetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "frenchbsetup{}": {
+      "snippet": "frenchbsetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "AddThinSpaceBeforeFootnotes": {},
+    "alsoname": {},
+    "at": {},
+    "bibname": {},
+    "AutoSpaceBeforeFDP": {},
+    "boi": {},
+    "bname{}": {
+      "snippet": "bname{${1:text}}"
+    },
+    "bsc{}": {
+      "snippet": "bsc{${1:text}}"
+    },
+    "CaptionSeparator": {},
+    "captionsfrench": {},
+    "ccname": {},
+    "chaptername": {},
+    "circonflexe": {},
+    "dateacadian": {},
+    "datefrench": {},
+    "DecimalMathComma": {},
+    "degre": {},
+    "degres": {},
+    "descindentFB": {},
+    "dotFFN": {},
+    "enclname": {},
+    "extrasfrench": {},
+    "FBcolonspace": {},
+    "FBdatebox": {},
+    "FBdatespace": {},
+    "FBeverylineguill": {},
+    "FBfigtabshape": {},
+    "FBfnindent": {},
+    "FBFrenchFootnotesfalse": {},
+    "FBFrenchFootnotestrue": {},
+    "FBFrenchSuperscriptstrue": {},
+    "FBGlobalLayoutFrenchtrue": {},
+    "FBgspchar": {},
+    "FBguillopen": {},
+    "FBguillspace": {},
+    "FBInnerGuillSinglefalse": {},
+    "FBInnerGuillSingletrue": {},
+    "FBListItemsAsParfalse": {},
+    "FBListItemsAsPartrue": {},
+    "FBLowercaseSuperscriptstrue": {},
+    "FBmedkern": {},
+    "FBPartNameFulltrue": {},
+    "FBsetspaces[]{}{}{}{}": {
+      "snippet": "FBsetspaces[${5:language}]{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}"
+    },
+    "FBsetspaces{}{}{}{}": {
+      "snippet": "FBsetspaces{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}"
+    },
+    "FBSmallCapsFigTabCaptionstrue": {},
+    "FBStandardEnumerateEnvtrue": {},
+    "FBStandardItemizeEnvtrue": {},
+    "FBStandardItemLabelstrue": {},
+    "FBStandardLayouttrue": {},
+    "FBStandardListSpacingtrue": {},
+    "FBStandardListstrue": {},
+    "FBsupR": {},
+    "FBsupS": {},
+    "FBtextellipsis": {},
+    "FBthickkern": {},
+    "FBthinspace": {},
+    "FBthousandsep": {},
+    "FBWarning{}": {
+      "snippet": "FBWarning{${1:message}}"
+    },
+    "fg": {},
+    "fgi": {},
+    "fgii": {},
+    "fprimo)": {},
+    "frenchdate{}{}{}": {
+      "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
+    },
+    "FrenchEnumerate{}": {
+      "snippet": "FrenchEnumerate{${1:arg}}"
+    },
+    "FrenchFootnotes": {},
+    "FrenchLabelItem": {},
+    "frenchpartfirst": {},
+    "frenchpartsecond": {},
+    "FrenchPopularEnumerate{}": {
+      "snippet": "FrenchPopularEnumerate{${1:arg}}"
+    },
+    "frenchtoday": {},
+    "Frlabelitemi": {},
+    "Frlabelitemii": {},
+    "Frlabelitemiii": {},
+    "Frlabelitemiv": {},
+    "frquote{}": {
+      "snippet": "frquote{${1:text}}"
+    },
+    "fup{}": {
+      "snippet": "fup{${1:text}}"
+    },
+    "glossaryname": {},
+    "headtoname": {},
+    "ieme": {},
+    "iemes": {},
+    "ier": {},
+    "iere": {},
+    "ieres": {},
+    "iers": {},
+    "ifFBAutoSpaceFootnotes": {},
+    "ifFBCompactItemize": {},
+    "ifFBCustomiseFigTabCaptions": {},
+    "ifFBfrench": {},
+    "ifFBFrenchFootnotes": {},
+    "ifFBFrenchSuperscripts": {},
+    "ifFBGlobalLayoutFrench": {},
+    "ifFBIndentFirst": {},
+    "ifFBINGuillSpace": {},
+    "ifFBListItemsAsPar": {},
+    "ifFBListOldLayout": {},
+    "ifFBLowercaseSuperscripts": {},
+    "ifFBLuaTeX": {},
+    "ifFBOldFigTabCaptions": {},
+    "ifFBOriginalTypewriter": {},
+    "ifFBPartNameFull": {},
+    "ifFBReduceListSpacing": {},
+    "ifFBShowOptions": {},
+    "ifFBSmallCapsFigTabCaptions": {},
+    "ifFBStandardEnumerateEnv": {},
+    "ifFBStandardItemizeEnv": {},
+    "ifFBStandardItemLabels": {},
+    "ifFBStandardLayout": {},
+    "ifFBStandardLists": {},
+    "ifFBStandardListSpacing": {},
+    "ifFBSuppressWarning": {},
+    "ifFBThinColonSpace": {},
+    "ifFBThinSpaceInFrenchNumbers": {},
+    "ifFBunicode": {},
+    "ifFBXeTeX": {},
+    "ifLaTeXe": {},
+    "kernFFN": {},
+    "labelindentFB": {},
+    "labelwidthFB": {},
+    "leftmarginFB": {},
+    "listfigurename": {},
+    "listindentFB": {},
+    "No": {},
+    "no": {},
+    "NoAutoSpaceBeforeFDP": {},
+    "NoAutoSpacing": {},
+    "NoEveryParQuote": {},
+    "noextrasfrench": {},
+    "nombre{}": {
+      "snippet": "nombre{${1:arg}}"
+    },
+    "nos": {},
+    "Nos": {},
+    "og": {},
+    "ogi": {},
+    "ogii": {},
+    "parindentFFN": {},
+    "partfirst": {},
+    "partnameord": {},
+    "partsecond": {},
+    "prefacename": {},
+    "primo": {},
+    "proofname": {},
+    "quarto": {},
+    "rmfamilyFB": {},
+    "secundo": {},
+    "seename": {},
+    "sffamilyFB": {},
+    "StandardFootnotes": {},
+    "StandardMathComma": {},
+    "tertio": {},
+    "tild": {},
+    "ttfamilyFB": {},
+    "up{}": {
+      "snippet": "up{${1:text}}"
+    },
+    "xspace": {},
+    "captionsgerman": {},
+    "dategerman": {},
+    "extrasgerman": {},
+    "noextrasgerman": {},
+    "dq": {},
+    "tosstrue": {},
+    "tossfalse": {},
+    "mdqon": {},
+    "mdqoff": {},
+    "ck": {},
+    "captionsbritish": {},
+    "datebritish": {},
+    "extrasbritish": {},
+    "noextrasbritish": {},
+    "captionsenglish": {},
+    "dateenglish": {},
+    "extrasenglish": {},
+    "noextrasenglish": {},
+    "englishhyphenmins": {},
+    "britishhyphenmins": {},
+    "americanhyphenmins": {}
+  },
+  "envs": {
+    "descriptionFB": {},
+    "enumerateFB": {},
+    "itemizeFB": {},
+    "listFB{}": {
+      "name": "listFB",
+      "snippet": "{${1:symbol}}"
+    },
+    "listORI{}": {
+      "name": "listORI",
+      "snippet": "{${1:symbol}}"
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "ShowOptions",
+      "StandardLayout",
+      "GlobalLayoutFrench",
+      "IndentFirst",
+      "PartNameFull",
+      "ListItemsAsPar",
+      "StandardListSpacing",
+      "StandardItemizeEnv",
+      "StandardEnumerateEnv",
+      "StandardItemLabels",
+      "ItemLabels=",
+      "ItemLabeli=",
+      "ItemLabelii=",
+      "ItemLabeliii=",
+      "ItemLabeliv=",
+      "StandardLists",
+      "ListOldLayout",
+      "FrenchFootnotes",
+      "AutoSpaceFootnotes",
+      "AutoSpacePunctuation",
+      "ThinColonSpace",
+      "OriginalTypewriter",
+      "UnicodeNoBreakSpaces",
+      "og=",
+      "fg=",
+      "INGuillSpace",
+      "EveryParGuill=",
+      "EveryLineGuill=",
+      "InnerGuillSingle",
+      "ThinSpaceInFrenchNumbers",
+      "SmallCapsFigTabCaptions",
+      "CustomiseFigTabCaptions",
+      "OldFigTabCaptions",
+      "FrenchSuperscripts",
+      "LowercaseSuperscripts",
+      "SuppressWarning"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/hvlogos.json b/dev/packages/hvlogos.json
index 6bf875464..9f17d2208 100644
--- a/dev/packages/hvlogos.json
+++ b/dev/packages/hvlogos.json
@@ -117,10 +117,10 @@
       "snippet": "hvLaTeXTeX[${1:(-La kern}][${2:L-a kern}]"
     },
     "hvLaTeXTeX[][][]": {
-      "snippet": "hvLaTeXTeX[${1:(-La kern}][${2:L-a kern}][${3:a-) kern}]"
+      "snippet": "hvLaTeXTeX[${1:(${4:-La kern}][${2:L-a kern}][${3:a-}) kern}]"
     },
     "hvLaTeXTeX[][][][]": {
-      "snippet": "hvLaTeXTeX[${1:(-La kern}][${2:L-a kern}][${3:a-) kern}][${4:)-TeX kern}]"
+      "snippet": "hvLaTeXTeX[${1:(${5:-La kern}][${2:L-a kern}][${3:a-}) kern}][${4:)-TeX kern}]"
     }
   },
   "envs": {},
diff --git a/dev/packages/hvpygmentex.json b/dev/packages/hvpygmentex.json
index 0666a8c69..4551f308c 100644
--- a/dev/packages/hvpygmentex.json
+++ b/dev/packages/hvpygmentex.json
@@ -37,6 +37,9 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
+    "widest(){}{}": {
+      "snippet": "widest(${3:string list}){${1:code}}{${2:cmd}}"
+    },
     "VerbatimOutAppend": {},
     "remainingglobaloptions": {},
     "remaininguseroptions": {},
diff --git a/dev/packages/hvqrurl.json b/dev/packages/hvqrurl.json
index 9e3b3d052..a617f843a 100644
--- a/dev/packages/hvqrurl.json
+++ b/dev/packages/hvqrurl.json
@@ -30,7 +30,8 @@
   },
   "envs": {},
   "options": [
-    "nohyperref"
+    "nohyperref",
+    "forget"
   ],
   "keyvals": [
     [
diff --git a/dev/packages/hypbmsec.json b/dev/packages/hypbmsec.json
index 060f8b76a..923cc31f8 100644
--- a/dev/packages/hypbmsec.json
+++ b/dev/packages/hypbmsec.json
@@ -4,23 +4,65 @@
     "part[][]{}": {
       "snippet": "part[${2:short title}][${3:outline entry}]{${1:title}}"
     },
+    "part[](){}": {
+      "snippet": "part[${2:short title}](${3:pdf outline entry}){${1:title}}"
+    },
+    "part(){}": {
+      "snippet": "part(${2:pdf outline entry}){${1:title}}"
+    },
     "section[][]{}": {
       "snippet": "section[${2:short title}][${3:outline entry}]{${1:title}}"
     },
+    "section[](){}": {
+      "snippet": "section[${2:short title}](${3:pdf outline entry}){${1:title}}"
+    },
+    "section(){}": {
+      "snippet": "section(${2:pdf outline entry}){${1:title}}"
+    },
     "subsection[][]{}": {
       "snippet": "subsection[${2:short title}][${3:outline entry}]{${1:title}}"
     },
+    "subsection[](){}": {
+      "snippet": "subsection[${2:short title}](${3:pdf outline entry}){${1:title}}"
+    },
+    "subsection(){}": {
+      "snippet": "subsection(${2:pdf outline entry}){${1:title}}"
+    },
     "subsubsection[][]{}": {
       "snippet": "subsubsection[${2:short title}][${3:outline entry}]{${1:title}}"
     },
+    "subsubsection[](){}": {
+      "snippet": "subsubsection[${2:short title}](${3:pdf outline entry}){${1:title}}"
+    },
+    "subsubsection(){}": {
+      "snippet": "subsubsection(${2:pdf outline entry}){${1:title}}"
+    },
     "paragraph[][]{}": {
       "snippet": "paragraph[${2:short title}][${3:outline entry}]{${1:title}}"
     },
+    "paragraph[](){}": {
+      "snippet": "paragraph[${2:short title}](${3:pdf outline entry}){${1:title}}"
+    },
+    "paragraph(){}": {
+      "snippet": "paragraph(${2:pdf outline entry}){${1:title}}"
+    },
     "subparagraph[][]{}": {
       "snippet": "subparagraph[${2:short title}][${3:outline entry}]{${1:title}}"
     },
+    "subparagraph[](){}": {
+      "snippet": "subparagraph[${2:short title}](${3:pdf outline entry}){${1:title}}"
+    },
+    "subparagraph(){}": {
+      "snippet": "subparagraph(${2:pdf outline entry}){${1:title}}"
+    },
     "chapter[][]{}": {
       "snippet": "chapter[${2:short title}][${3:outline entry}]{${1:title}}"
+    },
+    "chapter[](){}": {
+      "snippet": "chapter[${2:short title}](${3:pdf outline entry}){${1:title}}"
+    },
+    "chapter(){}": {
+      "snippet": "chapter(${2:pdf outline entry}){${1:title}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/hyperref.json b/dev/packages/hyperref.json
new file mode 100644
index 000000000..fe966b0a7
--- /dev/null
+++ b/dev/packages/hyperref.json
@@ -0,0 +1,479 @@
+{
+  "includes": {
+    "iftex": [],
+    "keyval": [],
+    "kvsetkeys": [],
+    "kvdefinekeys": [],
+    "pdfescape": [],
+    "hycolor": [],
+    "kvoptions": [],
+    "intcalc": [],
+    "url": [],
+    "bitset": [],
+    "bigintcalc": [],
+    "atbegshi": [],
+    "atveryend": [],
+    "rerunfilecheck": [],
+    "nameref": [],
+    "etoolbox": [],
+    "stringenc": [],
+    "backref": [
+      "backref",
+      "backref=section",
+      "backref=slide",
+      "backref=page",
+      "pagebackref",
+      "pagebackref=true"
+    ],
+    "color": [
+      "colorlinks",
+      "colorlinks=true"
+    ]
+  },
+  "macros": {
+    "HyperDestRename{}{}": {
+      "snippet": "HyperDestRename{${1:destination}}{${2:newname}}",
+      "option": "destlabel=true"
+    },
+    "hyperindexformat{}{}": {
+      "snippet": "hyperindexformat{${1:arg1}}{${2:arg2}}",
+      "option": "hyperindex=true"
+    },
+    "hypersetup{}": {
+      "snippet": "hypersetup{${1:keyvals}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "href[]{}{}": {
+      "snippet": "href[${3:options}]{${1:URL}}{${2:text}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "href{}{}": {
+      "snippet": "href{${1:URL}}{${2:text}}"
+    },
+    "AddToDocumentProperties{}{}": {
+      "snippet": "AddToDocumentProperties{${1:property}}{${2:value}}"
+    },
+    "AddToDocumentProperties[]{}{}": {
+      "snippet": "AddToDocumentProperties[${3:category}]{${1:property}}{${2:value}}"
+    },
+    "GetDocumentProperties{}": {
+      "snippet": "GetDocumentProperties{${1:property}}"
+    },
+    "SetLinkTargetFilter{}": {
+      "snippet": "SetLinkTargetFilter{${1:filter code}}"
+    },
+    "url{}": {
+      "snippet": "url{${1:URL}}"
+    },
+    "nolinkurl{}": {
+      "snippet": "nolinkurl{${1:URL}}"
+    },
+    "hyperbaseurl{}": {
+      "snippet": "hyperbaseurl{${1:URL}}"
+    },
+    "hyperimage{}{}": {
+      "snippet": "hyperimage{${1:imageURL}}{${2:text}}"
+    },
+    "hyperdef{}{}{}": {
+      "snippet": "hyperdef{${1:category}}{${2:name}}{${3:text}}"
+    },
+    "hyperref{}{}{}{}": {
+      "snippet": "hyperref{${1:URL}}{${2:category}}{${3:name}}{${4:text}}"
+    },
+    "hyperref[]{}{}{}{}": {
+      "snippet": "hyperref[${5:label}]{${1:URL}}{${2:category}}{${3:name}}{${4:text}}"
+    },
+    "hyperref[]{}": {
+      "snippet": "hyperref[${2:label}]{${1:text}}"
+    },
+    "hyperref{}": {
+      "snippet": "hyperref{${1:text}}"
+    },
+    "hyperlink{}{}": {
+      "snippet": "hyperlink{${1:target name}}{${2:link text}}"
+    },
+    "hypertarget{}{}": {
+      "snippet": "hypertarget{${1:target name}}{${2:anchor text}}"
+    },
+    "phantomsection": {},
+    "hyperget{}{}": {
+      "snippet": "hyperget{${1:anchor}}{${2:label}}"
+    },
+    "autopageref{}": {
+      "snippet": "autopageref{${1:label}}"
+    },
+    "autopageref*{}": {
+      "snippet": "autopageref*{${1:label}}"
+    },
+    "autoref{}": {
+      "snippet": "autoref{${1:label}}"
+    },
+    "autoref*{}": {
+      "snippet": "autoref*{${1:label}}"
+    },
+    "thispdfpagelabel": {},
+    "pdfstringdef{}{}": {
+      "snippet": "pdfstringdef{${1:macroname}}{${2:TeXstring}}"
+    },
+    "pdfbookmark{}{}": {
+      "snippet": "pdfbookmark{${1:text}}{${2:name}}"
+    },
+    "pdfbookmark[]{}{}": {
+      "snippet": "pdfbookmark[${3:level}]{${1:text}}{${2:name}}"
+    },
+    "currentpdfbookmark{}{}": {
+      "snippet": "currentpdfbookmark{${1:text}}{${2:name}}"
+    },
+    "subpdfbookmark{}{}": {
+      "snippet": "subpdfbookmark{${1:text}}{${2:name}}"
+    },
+    "belowpdfbookmark{}{}": {
+      "snippet": "belowpdfbookmark{${1:text}}{${2:name}}"
+    },
+    "texorpdfstring{}{}": {
+      "snippet": "texorpdfstring{${1:TEXstring}}{${2:PDFstring}}"
+    },
+    "pdfstringdefDisableCommands{}": {
+      "snippet": "pdfstringdefDisableCommands{${1:hooks}}"
+    },
+    "hypercalcbp{}": {
+      "snippet": "hypercalcbp{${1:dimen specification}}"
+    },
+    "Acrobatmenu{}{}": {
+      "snippet": "Acrobatmenu{${1:menuoption}}{${2:text}}"
+    },
+    "TextField{}": {
+      "snippet": "TextField{${1:label}}"
+    },
+    "TextField[]{}": {
+      "snippet": "TextField[${2:parameters}]{${1:label}}"
+    },
+    "CheckBox{}": {
+      "snippet": "CheckBox{${1:label}}"
+    },
+    "CheckBox[]{}": {
+      "snippet": "CheckBox[${2:parameters}]{${1:label}}"
+    },
+    "ChoiceMenu{}{}": {
+      "snippet": "ChoiceMenu{${1:label}}{${2:choices}}"
+    },
+    "ChoiceMenu[]{}{}": {
+      "snippet": "ChoiceMenu[${3:parameters}]{${1:label}}{${2:choices}}"
+    },
+    "PushButton{}": {
+      "snippet": "PushButton{${1:label}}"
+    },
+    "PushButton[]{}": {
+      "snippet": "PushButton[${2:parameters}]{${1:label}}"
+    },
+    "Submit{}": {
+      "snippet": "Submit{${1:label}}"
+    },
+    "Submit[]{}": {
+      "snippet": "Submit[${2:parameters}]{${1:label}}"
+    },
+    "Reset{}": {
+      "snippet": "Reset{${1:label}}"
+    },
+    "Reset[]{}": {
+      "snippet": "Reset[${2:parameters}]{${1:label}}"
+    },
+    "LayoutTextField{}{}": {
+      "snippet": "LayoutTextField{${1:label}}{${2:field}}"
+    },
+    "LayoutChoiceField{}{}": {
+      "snippet": "LayoutChoiceField{${1:label}}{${2:field}}"
+    },
+    "LayoutCheckField{}{}": {
+      "snippet": "LayoutCheckField{${1:label}}{${2:field}}"
+    },
+    "MakeRadioField{}{}": {
+      "snippet": "MakeRadioField{${1:width}}{${2:height}}"
+    },
+    "MakeCheckField{}{}": {
+      "snippet": "MakeCheckField{${1:width}}{${2:height}}"
+    },
+    "MakeTextField{}{}": {
+      "snippet": "MakeTextField{${1:width}}{${2:height}}"
+    },
+    "MakeChoiceField{}{}": {
+      "snippet": "MakeChoiceField{${1:width}}{${2:height}}"
+    },
+    "MakeButtonField{}": {
+      "snippet": "MakeButtonField{${1:text}}"
+    },
+    "DefaultHeightofSubmit": {},
+    "DefaultWidthofSubmit": {},
+    "DefaultHeightofReset": {},
+    "DefaultWidthofReset": {},
+    "DefaultHeightofCheckBox": {},
+    "DefaultWidthofCheckBox": {},
+    "DefaultHeightofChoiceMenu": {},
+    "DefaultWidthofChoiceMenu": {},
+    "DefaultHeightofText": {},
+    "DefaultHeightofTextMultiline": {},
+    "DefaultWidthofText": {},
+    "DefaultOptionsofSubmit": {},
+    "DefaultOptionsofReset": {},
+    "DefaultOptionsofPushButton": {},
+    "DefaultOptionsofCheckBox": {},
+    "DefaultOptionsofText": {},
+    "DefaultOptionsofListBox": {},
+    "DefaultOptionsofComboBox": {},
+    "DefaultOptionsofPopdownBox": {},
+    "DefaultOptionsofRadio": {},
+    "AfterBeginDocument{}": {
+      "snippet": "AfterBeginDocument{${1:code}}"
+    },
+    "AMSautorefname": {},
+    "appendixautorefname": {},
+    "chapterautorefname": {},
+    "equationautorefname": {},
+    "FancyVerbLineautorefname": {},
+    "figureautorefname": {},
+    "footnoteautorefname": {},
+    "Hfootnoteautorefname": {},
+    "Hurl{}": {
+      "snippet": "Hurl{${1:URL}}"
+    },
+    "HyperDestLabelReplace{}": {
+      "snippet": "HyperDestLabelReplace{${1:dest}}"
+    },
+    "HyperDestNameFilter{}": {
+      "snippet": "HyperDestNameFilter{${1:arg}}"
+    },
+    "hypergetpageref{}": {
+      "snippet": "hypergetpageref{${1:label}}"
+    },
+    "hypergetref{}": {
+      "snippet": "hypergetref{${1:label}}"
+    },
+    "hyperlinkfileprefix{}": {
+      "snippet": "hyperlinkfileprefix{${1:prefix}}"
+    },
+    "hyperpage{}": {
+      "snippet": "hyperpage{${1:arg}}"
+    },
+    "HyperRaiseLinkDefault": {},
+    "HyperRaiseLinkHook": {},
+    "IfHyperBoolean{}{}{}": {
+      "snippet": "IfHyperBoolean{${1:options}}{${2:true}}{${3:false}}"
+    },
+    "IfHyperBooleanExists{}{}{}": {
+      "snippet": "IfHyperBooleanExists{${1:option}}{${2:true}}{${3:false}}"
+    },
+    "ifpdfstringunicode{}{}": {
+      "snippet": "ifpdfstringunicode{${1:unicode chars}}{${2:chars}}"
+    },
+    "Itemautorefname": {},
+    "itemautorefname": {},
+    "MakeLowercaseUnsupportedInPdfStrings{}": {
+      "snippet": "MakeLowercaseUnsupportedInPdfStrings{${1:text}}"
+    },
+    "MakeUppercaseUnsupportedInPdfStrings{}": {
+      "snippet": "MakeUppercaseUnsupportedInPdfStrings{${1:text}}"
+    },
+    "MaybeStopEarly": {},
+    "MaybeStopNow": {},
+    "nohyperpage{}": {
+      "snippet": "nohyperpage{${1:arg}}"
+    },
+    "pageautorefname": {},
+    "paragraphautorefname": {},
+    "partautorefname": {},
+    "pdfstringdefPostHook": {},
+    "pdfstringdefPreHook": {},
+    "pdfstringdefWarn{}": {
+      "snippet": "pdfstringdefWarn{${1:arg}}"
+    },
+    "sectionautorefname": {},
+    "setpdflinkmargin{}": {
+      "snippet": "setpdflinkmargin{${1:length}}"
+    },
+    "subparagraphautorefname": {},
+    "subsectionautorefname": {},
+    "subsubsectionautorefname": {},
+    "tableautorefname": {},
+    "theHchapter": {},
+    "theHenumi": {},
+    "theHenumii": {},
+    "theHenumiii": {},
+    "theHenumiv": {},
+    "theHequation": {},
+    "theHfigure": {},
+    "theHHfootnote": {},
+    "theHHmpfootnote": {},
+    "theHItem": {},
+    "theHmpfootnote": {},
+    "theHparagraph": {},
+    "theHpart": {},
+    "theHsection": {},
+    "theHsubparagraph": {},
+    "theHsubsection": {},
+    "theHsubsubsection": {},
+    "theHtable": {},
+    "theHtheorem": {},
+    "theHthm": {},
+    "theoremautorefname": {},
+    "unichar{}": {
+      "snippet": "unichar{${1:char num}}"
+    },
+    "XeTeXLinkBox{}": {
+      "snippet": "XeTeXLinkBox{${1:contents}}"
+    },
+    "XeTeXLinkMargin": {}
+  },
+  "envs": {
+    "NoHyper": {},
+    "Form": {},
+    "Form[]": {
+      "name": "Form",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "addtopdfcreator=${1:text}",
+      "allbordercolors=",
+      "allcolors=",
+      "anchorcolor=",
+      "backref=",
+      "baseurl=${1:URL}",
+      "bookmarks",
+      "bookmarksdepth",
+      "bookmarksdepth=${1:number}",
+      "bookmarksnumbered",
+      "bookmarksopen",
+      "bookmarksopenlevel=${1:level}",
+      "bookmarkstype=",
+      "breaklinks",
+      "citebordercolor=",
+      "citecolor=",
+      "CJKbookmarks",
+      "colorlinks",
+      "customdriver=${1:file}",
+      "debug",
+      "destlabel",
+      "draft",
+      "driverfallback=${1:driver}",
+      "dvipdfm",
+      "dvipdfmx",
+      "dvipdfmx-outline-open",
+      "dvips",
+      "dvipsone",
+      "dviwindo",
+      "encap=${1:character}",
+      "extension=${1:file ext}",
+      "filebordercolor=",
+      "filecolor=",
+      "final",
+      "frenchlinks",
+      "hidelinks",
+      "hitex",
+      "hyperfigures",
+      "hyperfootnotes",
+      "hyperindex",
+      "hypertex",
+      "hypertexnames",
+      "implicit",
+      "linkbordercolor=",
+      "linkcolor=",
+      "linkfileprefix=${1:prefix}",
+      "linktoc=",
+      "linktocpage",
+      "luatex",
+      "menubordercolor=",
+      "menucolor=",
+      "nativepdf",
+      "naturalnames",
+      "nesting",
+      "next-anchor=${1:anchor name}",
+      "ocgcolorlinks",
+      "pageanchor",
+      "pagebackref",
+      "pdfa",
+      "pdfauthor=${1:author}",
+      "pdfborder=",
+      "pdfborderstyle=",
+      "pdfcenterwindow",
+      "pdfcreationdate=${1:date}",
+      "pdfcreator=${1:creator}",
+      "pdfdirection=",
+      "pdfdisplaydoctitle",
+      "pdfduplex=",
+      "pdfencoding=",
+      "pdfescapeform",
+      "pdffitwindow",
+      "pdfhighlight=",
+      "pdfinfo={${1:info keys}}",
+      "pdfkeywords={${1:keyword list}}",
+      "pdflang=${1:lang id}",
+      "pdflinkmargin=",
+      "pdfmark",
+      "pdfmenubar",
+      "pdfmoddate=${1:date}",
+      "pdfnewwindow",
+      "pdfnonfullscreenpagemode",
+      "pdfnumcopies=${1:integer}",
+      "pdfpageduration=",
+      "pdfpagelabels",
+      "pdfpagelayout=",
+      "pdfpagemode=",
+      "pdfpagescrop=${1:n1 n2 n3 n4}",
+      "pdfpagetransition=",
+      "pdfpicktraybypdfsize",
+      "pdfprintarea=",
+      "pdfprintclip=",
+      "pdfprintpagerange=${1:n1 n2}",
+      "pdfprintscaling=",
+      "pdfproducer=${1:producer}",
+      "pdfremotestartview=",
+      "pdfstartpage=${1:page number}",
+      "pdfstartview=",
+      "pdfsubject=${1:subject}",
+      "pdftex",
+      "pdftitle=${1:title}",
+      "pdftoolbar",
+      "pdftrapped=",
+      "pdfusetitle",
+      "pdfversion=${1:version}",
+      "pdfview=",
+      "pdfviewarea=",
+      "pdfviewclip=",
+      "pdfwindowui",
+      "plainpages",
+      "ps2pdf",
+      "psdextra",
+      "raiselinks",
+      "runbordercolor=",
+      "runcolor=",
+      "setpagesize",
+      "tex4ht",
+      "textures",
+      "unicode",
+      "urlbordercolor=",
+      "urlcolor=",
+      "verbose",
+      "vtex",
+      "vtexpdfmark",
+      "xetex"
+    ],
+    [
+      "pdfremotestartview=",
+      "pdfnewwindow",
+      "page=${1:number}",
+      "ismap",
+      "nextactionraw={${1:PDF code}}"
+    ],
+    [
+      "action=${1:URL}",
+      "encoding=${1:encoding}",
+      "method="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/icite.json b/dev/packages/icite.json
new file mode 100644
index 000000000..d8fb95785
--- /dev/null
+++ b/dev/packages/icite.json
@@ -0,0 +1,36 @@
+{
+  "includes": {
+    "xkeyval": [],
+    "datatool": [],
+    "usebib": []
+  },
+  "macros": {
+    "SetTitleStyle{}": {
+      "snippet": "SetTitleStyle{${1:style code}}"
+    },
+    "AuthorTitleDelim{}": {
+      "snippet": "AuthorTitleDelim{${1:delim}}"
+    },
+    "TitlePageDelim{}": {
+      "snippet": "TitlePageDelim{${1:delim}}"
+    },
+    "icite{}": {
+      "snippet": "icite{${1:bibid}}"
+    },
+    "icite[]{}": {
+      "snippet": "icite[${2:pre}]{${1:bibid}}"
+    },
+    "icite[][]{}": {
+      "snippet": "icite[${2:pre}][${3:post}]{${1:bibid}}"
+    },
+    "icite[][]{}[]": {
+      "snippet": "icite[${2:pre}][${3:post}]{${1:bibid}}[${4:csname}]"
+    },
+    "IndexSubtypeAs{}{}": {
+      "snippet": "IndexSubtypeAs{${1:subtype}}{${2:index name}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/iffont.json b/dev/packages/iffont.json
index d29ab74ba..7663051e7 100644
--- a/dev/packages/iffont.json
+++ b/dev/packages/iffont.json
@@ -5,7 +5,7 @@
   },
   "macros": {
     "settofirstfound{}{}": {
-      "snippet": "settofirstfound{${1:font cmd}}{${2:font1,font2,...}}"
+      "snippet": "settofirstfound{${1:font cmd}}{${2:font1,${3:font2},...}}"
     },
     "iffontsexist{}{}{}": {
       "snippet": "iffontsexist{${1:font list}}{${2:true}}{${3:false}}"
diff --git a/dev/packages/ifoption.json b/dev/packages/ifoption.json
index 4be75557c..96745e200 100644
--- a/dev/packages/ifoption.json
+++ b/dev/packages/ifoption.json
@@ -13,7 +13,7 @@
       "snippet": "IfClassOption{${1:class}}{${2:option}}{${3:true}}{${4:false}}"
     },
     "DeclareExclusiveOptions{}": {
-      "snippet": "DeclareExclusiveOptions{${1:name1,name2,...}}"
+      "snippet": "DeclareExclusiveOptions{${1:name1,${2:name2},...}}"
     },
     "ProcessExclusiveOptions": {},
     "DeclareBooleanOption{}": {
diff --git a/dev/packages/ifthen.json b/dev/packages/ifthen.json
new file mode 100644
index 000000000..16e2a06fc
--- /dev/null
+++ b/dev/packages/ifthen.json
@@ -0,0 +1,41 @@
+{
+  "includes": {},
+  "macros": {
+    "ifthenelse{}{}{}": {
+      "snippet": "ifthenelse{${1:test}}{${2:then clause}}{${3:else clause}}"
+    },
+    "isodd{}": {
+      "snippet": "isodd{${1:number}}"
+    },
+    "isundefined{}": {
+      "snippet": "isundefined{${1:command}}"
+    },
+    "equal{}{}": {
+      "snippet": "equal{${1:string}}{${2:string}}"
+    },
+    "AND": {},
+    "OR": {},
+    "NOT": {},
+    "lengthtest{}": {
+      "snippet": "lengthtest{${1:dimen operator dimen}}"
+    },
+    "boolean{}": {
+      "snippet": "boolean{${1:name}}"
+    },
+    "newboolean{}": {
+      "snippet": "newboolean{${1:name}}"
+    },
+    "provideboolean{}": {
+      "snippet": "provideboolean{${1:name}}"
+    },
+    "setboolean{}{}": {
+      "snippet": "setboolean{${1:name}}{${2:truth value}}"
+    },
+    "whiledo{}{}": {
+      "snippet": "whiledo{${1:test}}{${2:while clause}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/igo.json b/dev/packages/igo.json
new file mode 100644
index 000000000..5357da2b0
--- /dev/null
+++ b/dev/packages/igo.json
@@ -0,0 +1,125 @@
+{
+  "includes": {},
+  "macros": {
+    "black[]{}": {
+      "snippet": "black[${2:glyph}]{${1:intersection-list}}"
+    },
+    "black{}": {
+      "snippet": "black{${1:intersection-list}}"
+    },
+    "blackstone": {},
+    "blackstone[]": {
+      "snippet": "blackstone[${1:glyph}]"
+    },
+    "clear{}": {
+      "snippet": "clear{${1:intersection-list}}"
+    },
+    "cleargoban": {},
+    "cleargoban[]": {
+      "snippet": "cleargoban[${1:intersection-pair}]"
+    },
+    "cleargobansymbols": {},
+    "copyfromgoban{}": {
+      "snippet": "copyfromgoban{${1:n}}"
+    },
+    "copygoban{}": {
+      "snippet": "copygoban{${1:n}}"
+    },
+    "copytogoban{}": {
+      "snippet": "copytogoban{${1:n}}"
+    },
+    "gobansize{}": {
+      "snippet": "gobansize{${1:n}}"
+    },
+    "gobansymbol{}{}": {
+      "snippet": "gobansymbol{${1:intersection-list}}{${2:symbol}}"
+    },
+    "gobansymbols{}{}": {
+      "snippet": "gobansymbols{${1:intersection-list}}{${2:symbol}}"
+    },
+    "hflipgoban": {},
+    "igobreakafterdiagram": {},
+    "igocircle": {},
+    "igocross": {},
+    "igofontsize{}": {
+      "snippet": "igofontsize{${1:n}}"
+    },
+    "igonone": {},
+    "igosquare": {},
+    "igotriangle": {},
+    "largegoban": {},
+    "mirrorgoban": {},
+    "normalgoban": {},
+    "rotategoban": {},
+    "rotategobanleft": {},
+    "rotategobanright": {},
+    "showfullgoban": {},
+    "showgoban": {},
+    "showgoban[]": {
+      "snippet": "showgoban[${1:intersection-pair}]"
+    },
+    "smallgoban": {},
+    "stonesize": {},
+    "usegoban{}": {
+      "snippet": "usegoban{${1:n}}"
+    },
+    "vflipgoban": {},
+    "white[]{}": {
+      "snippet": "white[${2:glyph}]{${1:intersection-list}}"
+    },
+    "white{}": {
+      "snippet": "white{${1:intersection-list}}"
+    },
+    "whitestone": {},
+    "whitestone[]": {
+      "snippet": "whitestone[${1:glyph}]"
+    },
+    "breakrepeat": {},
+    "by{}": {
+      "snippet": "by{${1:step}}"
+    },
+    "csprotect": {},
+    "downto{}": {
+      "snippet": "downto{${1:end}}"
+    },
+    "endrepeat": {},
+    "for{}": {
+      "snippet": "for{${1:var}}"
+    },
+    "from{}": {
+      "snippet": "from{${1:start}}"
+    },
+    "REPcomp": {},
+    "REPcsarg{}{}": {
+      "snippet": "REPcsarg{${1:arg1}}{${2:arg2}}"
+    },
+    "REPcsargrom{}{}": {
+      "snippet": "REPcsargrom{${1:arg1}}{${2:arg2}}"
+    },
+    "REPcsrom{}": {
+      "snippet": "REPcsrom{${1:arg}}"
+    },
+    "REPdepth": {},
+    "REPdxbody": {},
+    "REPsetup{}": {
+      "snippet": "REPsetup{${1:arg}}"
+    },
+    "REPsign": {},
+    "REPtmp": {},
+    "REPtraceexit": {},
+    "REPtraceinit": {},
+    "REPzero": {},
+    "to{}": {
+      "snippet": "to{${1:end}}"
+    },
+    "until{}": {
+      "snippet": "until{${1:cond}}"
+    },
+    "while{}": {
+      "snippet": "while{${1:cond}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/imsart.json b/dev/packages/imsart.json
new file mode 100644
index 000000000..94728afec
--- /dev/null
+++ b/dev/packages/imsart.json
@@ -0,0 +1,576 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "keyval": [],
+    "ifpdf": [],
+    "fontenc": [],
+    "amsmath": [
+      "amsmath",
+      "bj"
+    ],
+    "amsthm": [
+      "amsthm",
+      "bj"
+    ],
+    "natbib": [
+      "natbib",
+      "bj"
+    ],
+    "rotating": [
+      "rotating"
+    ],
+    "lmodern": [
+      "ba",
+      "ps",
+      "ss",
+      "ejs"
+    ],
+    "times": [
+      "aap",
+      "aop",
+      "aos",
+      "aoas",
+      "aihp",
+      "bjps"
+    ],
+    "helvet": [
+      "aap",
+      "aop",
+      "aos",
+      "aoas",
+      "bj",
+      "aihp",
+      "bjps"
+    ],
+    "textcase": [
+      "aap",
+      "aop",
+      "aos",
+      "aoas"
+    ],
+    "newtxmath": [
+      "bj"
+    ],
+    "graphicx": [
+      "bj"
+    ],
+    "letterspace": [
+      "bj"
+    ],
+    "enumitem": [
+      "bj"
+    ],
+    "hyperref": [
+      "bj"
+    ],
+    "amssymb": [
+      "bj"
+    ],
+    "mathrsfs": [
+      "bj"
+    ],
+    "bm": [
+      "bj"
+    ],
+    "color": [
+      "bj",
+      "showframe"
+    ]
+  },
+  "macros": {
+    "DH": {},
+    "dh": {},
+    "dj": {},
+    "DJ": {},
+    "guillemetleft": {},
+    "guillemetright": {},
+    "guillemotleft": {},
+    "guillemotright": {},
+    "guilsinglleft": {},
+    "guilsinglright": {},
+    "Hwithstroke": {},
+    "hwithstroke": {},
+    "k{}": {
+      "snippet": "k{${1:arg}}"
+    },
+    "NG": {},
+    "ng": {},
+    "quotedblbase": {},
+    "quotesinglbase": {},
+    "textogonekcentered{}": {
+      "snippet": "textogonekcentered{${1:arg}}"
+    },
+    "textquotedbl": {},
+    "th": {},
+    "TH": {},
+    "savehline": {
+      "option": "bjps"
+    },
+    "thline": {
+      "option": "bjps"
+    },
+    "setlstracking{}": {
+      "snippet": "setlstracking{${1:value}}",
+      "option": "bj"
+    },
+    "texttracking{}{}": {
+      "snippet": "texttracking{${1:value}}{${2:text}}",
+      "option": "bj"
+    },
+    "accepted{}": {
+      "snippet": "accepted{${1:date}}"
+    },
+    "acknowledgementsname": {},
+    "address[]{}": {
+      "snippet": "address[${2:id}]{${1:address}}"
+    },
+    "address{}": {
+      "snippet": "address{${1:address}}"
+    },
+    "AND": {},
+    "articletitle": {},
+    "arxiv{}": {
+      "snippet": "arxiv{${1:arxiv}}"
+    },
+    "atltitle{}": {
+      "snippet": "atltitle{${1:text}}"
+    },
+    "author[]{}": {
+      "snippet": "author[${2:id}]{${1:name}}"
+    },
+    "baddress": {},
+    "banumber": {},
+    "barticle": {},
+    "bauthor": {},
+    "bbook": {},
+    "bbooklet": {},
+    "bchapter": {},
+    "bdoi{}": {
+      "snippet": "bdoi{${1:DOI}}"
+    },
+    "bedition": {},
+    "beditor": {},
+    "betal": {},
+    "bfnm": {},
+    "bhowpublished": {},
+    "bid{}": {
+      "snippet": "bid{${1:keyvals}}"
+    },
+    "binbook": {},
+    "bincollection": {},
+    "binits": {},
+    "binproceedings": {},
+    "binstitution": {},
+    "bisbn": {},
+    "blocation": {},
+    "bmanual": {},
+    "bmastersthesis": {},
+    "bmisc": {},
+    "bmrnumber": {},
+    "bnote": {},
+    "bnumber": {},
+    "borganization": {},
+    "bpages": {},
+    "bparticle": {},
+    "bphdthesis": {},
+    "bproceedings": {},
+    "bptok{}": {
+      "snippet": "bptok{${1:arg}}"
+    },
+    "bpublisher": {},
+    "bschool": {},
+    "bsnm": {},
+    "bsuffix": {},
+    "btechreport": {},
+    "btype": {},
+    "bunpublished": {},
+    "byear": {},
+    "citefix": {},
+    "contributor{}{}": {
+      "snippet": "contributor{${1:name}}{${2:university}}"
+    },
+    "copyrightowner{}": {
+      "snippet": "copyrightowner{${1:text}}"
+    },
+    "correctionnote{}": {
+      "snippet": "correctionnote{${1:text}}"
+    },
+    "corref{}": {
+      "snippet": "corref{${1:id}}"
+    },
+    "dedicated{}": {
+      "snippet": "dedicated{${1:text}}"
+    },
+    "degs{}": {
+      "snippet": "degs{${1:text}}"
+    },
+    "dochead{}": {
+      "snippet": "dochead{${1:arg}}"
+    },
+    "doi{}": {
+      "snippet": "doi{${1:DOI}}"
+    },
+    "doublespacing": {},
+    "ead[]{}": {
+      "snippet": "ead[${2:options}]{${1:email}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ead{}": {
+      "snippet": "ead{${1:email}}"
+    },
+    "endlocaldefs": {},
+    "firstpage{}": {
+      "snippet": "firstpage{${1:number}}"
+    },
+    "fnms{}": {
+      "snippet": "fnms{${1:first name}}"
+    },
+    "fundingname": {},
+    "getitemvalue{}{}": {
+      "snippet": "getitemvalue{${1:list name}}{${2:index}}"
+    },
+    "getpkgattr{}{}": {
+      "snippet": "getpkgattr{${1:type}}{${2:name}}"
+    },
+    "inits{}": {
+      "snippet": "inits{${1:initials}}"
+    },
+    "issue{}": {
+      "snippet": "issue{${1:number}}"
+    },
+    "journalurl{}": {
+      "snippet": "journalurl{${1:URL}}"
+    },
+    "kwd[]{}": {
+      "snippet": "kwd[${2:pre text}]{${1:keyword}}"
+    },
+    "kwd{}": {
+      "snippet": "kwd{${1:keyword}}"
+    },
+    "labellonglist": {},
+    "lastpage{}": {
+      "snippet": "lastpage{${1:number}}"
+    },
+    "legend{}": {
+      "snippet": "legend{${1:text}}"
+    },
+    "loadhyperrefoptions": {},
+    "MR{}": {
+      "snippet": "MR{${1:number}}"
+    },
+    "MRfixed{}": {
+      "snippet": "MRfixed{${1:arg}}"
+    },
+    "newpseudoenvironment{}{}{}": {
+      "snippet": "newpseudoenvironment{${1:name}}{${2:begdef}}{${3:enddef}}"
+    },
+    "nocontentsline": {},
+    "nohyphen": {},
+    "normaltext": {},
+    "orcid{}": {
+      "snippet": "orcid{${1:ORCID}}"
+    },
+    "paperno{}": {
+      "snippet": "paperno{${1:number}}"
+    },
+    "paperurl{}": {
+      "snippet": "paperurl{${1:URL}}"
+    },
+    "pdfauthor{}": {
+      "snippet": "pdfauthor{${1:name}}"
+    },
+    "pdfkeywords{}": {
+      "snippet": "pdfkeywords{${1:text}}"
+    },
+    "pdfsubject{}": {
+      "snippet": "pdfsubject{${1:text}}"
+    },
+    "pdftitle{}": {
+      "snippet": "pdftitle{${1:text}}"
+    },
+    "printaddresses": {},
+    "printaddressnum{}": {
+      "snippet": "printaddressnum{${1:arg}}"
+    },
+    "printead[]{}": {
+      "snippet": "printead[${2:options}]{${1:label1,${3:label2},...}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "printead{}": {
+      "snippet": "printead{${1:label1,${2:label2},...}}"
+    },
+    "printorcid": {},
+    "pubonline{}": {
+      "snippet": "pubonline{${1:date}}"
+    },
+    "pubyear{}": {
+      "snippet": "pubyear{${1:year}}"
+    },
+    "qq{}": {
+      "snippet": "qq{${1:text}}"
+    },
+    "received{}": {
+      "snippet": "received{${1:date}}"
+    },
+    "relateddoi[]{}{}": {
+      "snippet": "relateddoi[${3:opt}]{${1:arg}}{${2:DOI}}"
+    },
+    "relateddoi{}{}": {
+      "snippet": "relateddoi{${1:arg}}{${2:DOI}}"
+    },
+    "relateddois[]{}{}": {
+      "snippet": "relateddois[${3:mark}]{${1:id}}{${2:DOI}}"
+    },
+    "relateddois{}{}": {
+      "snippet": "relateddois{${1:id}}{${2:DOI}}"
+    },
+    "restorethankscounter": {},
+    "revised{}": {
+      "snippet": "revised{${1:date}}"
+    },
+    "roles{}": {
+      "snippet": "roles{${1:text}}"
+    },
+    "runauthor{}": {
+      "snippet": "runauthor{${1:names}}"
+    },
+    "runtitle{}": {
+      "snippet": "runtitle{${1:text}}"
+    },
+    "safelabel{}": {
+      "snippet": "safelabel{${1:label}}"
+    },
+    "saferef{}": {
+      "snippet": "saferef{${1:label}}"
+    },
+    "sdatatype{}": {
+      "snippet": "sdatatype{${1:.ext}}"
+    },
+    "sday{}": {
+      "snippet": "sday{${1:day}}"
+    },
+    "sdescription{}": {
+      "snippet": "sdescription{${1:text}}"
+    },
+    "sep": {},
+    "setpkgattr{}{}{}": {
+      "snippet": "setpkgattr{${1:type}}{${2:name}}{${3:code}}"
+    },
+    "setvaluelist{}{}": {
+      "snippet": "setvaluelist{${1:name}}{${2:item1,${3:item2},...}}"
+    },
+    "sfilename{}": {
+      "snippet": "sfilename{${1:file}}"
+    },
+    "singlespacing": {},
+    "slink[]{}": {
+      "snippet": "slink[${2:options}]{${1:URL}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "slink{}": {
+      "snippet": "slink{${1:URL}}"
+    },
+    "smonth{}": {
+      "snippet": "smonth{${1:month}}"
+    },
+    "sname{}": {
+      "snippet": "sname{${1:text}}"
+    },
+    "snm{}": {
+      "snippet": "snm{${1:surname}}"
+    },
+    "specialsection*{}": {
+      "snippet": "specialsection*{${1:title}}"
+    },
+    "specialsection[]{}": {
+      "snippet": "specialsection[${2:short title}]{${1:title}}"
+    },
+    "specialsection{}": {
+      "snippet": "specialsection{${1:title}}"
+    },
+    "startlocaldefs": {},
+    "stitle{}": {
+      "snippet": "stitle{${1:text}}"
+    },
+    "stitlepost{}": {
+      "snippet": "stitlepost{${1:text}}"
+    },
+    "support{}": {
+      "snippet": "support{${1:text}}"
+    },
+    "syear{}": {
+      "snippet": "syear{${1:year}}"
+    },
+    "tablewidth": {},
+    "tabnoteref{}": {
+      "snippet": "tabnoteref{${1:id}}"
+    },
+    "tabnotestoks": {},
+    "tabnotetext[]{}": {
+      "snippet": "tabnotetext[${2:options}]{${1:text}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "tabnotetext{}": {
+      "snippet": "tabnotetext{${1:text}}"
+    },
+    "thankslabel[]{}": {
+      "snippet": "thankslabel[${2:mark}]{${1:id}}"
+    },
+    "thankslabel{}": {
+      "snippet": "thankslabel{${1:id}}"
+    },
+    "thanksmark[]{}": {
+      "snippet": "thanksmark[${2:mark}]{${1:id}}"
+    },
+    "thanksmark{}": {
+      "snippet": "thanksmark{${1:id}}"
+    },
+    "thanksnewlabel": {},
+    "thanksref[]{}": {
+      "snippet": "thanksref[${2:mark}]{${1:id}}"
+    },
+    "thanksref{}": {
+      "snippet": "thanksref{${1:id}}"
+    },
+    "thankstext[]{}{}": {
+      "snippet": "thankstext[${3:mark}]{${1:id}}{${2:text}}"
+    },
+    "thankstext{}{}": {
+      "snippet": "thankstext{${1:id}}{${2:text}}"
+    },
+    "theaddress": {},
+    "theaddressref": {},
+    "theauthor": {},
+    "theemailref": {},
+    "thefirstpage": {},
+    "thelastpage": {},
+    "thelonglist": {},
+    "thesuppdoi{}": {
+      "snippet": "thesuppdoi{${1:id}}"
+    },
+    "thetabnote": {},
+    "thethanks": {},
+    "usethankscounter{}": {
+      "snippet": "usethankscounter{${1:counter}}"
+    },
+    "volume{}": {
+      "snippet": "volume{${1:number}}"
+    },
+    "volumetitle{}": {
+      "snippet": "volumetitle{${1:text}}"
+    },
+    "woMR{}": {
+      "snippet": "woMR{${1:arg}}"
+    }
+  },
+  "envs": {
+    "proof[]": {
+      "name": "proof",
+      "snippet": "[${1:heading}]",
+      "option": "amsthm"
+    },
+    "abstract[]": {
+      "name": "abstract",
+      "snippet": "[${1:language=language}]"
+    },
+    "acks": {},
+    "acks[]": {
+      "name": "acks",
+      "snippet": "[${1:title}]"
+    },
+    "appendix": {},
+    "aug": {},
+    "em": {},
+    "frontmatter": {},
+    "funding": {},
+    "funding[]": {
+      "name": "funding",
+      "snippet": "[${1:title}]"
+    },
+    "keyword": {},
+    "keyword[]": {
+      "name": "keyword",
+      "snippet": "[${1:class=class}]"
+    },
+    "longlist": {},
+    "longlist[]": {
+      "name": "longlist",
+      "snippet": "[${1:widest label}]"
+    },
+    "supplement": {},
+    "supplement[]": {
+      "name": "supplement",
+      "snippet": "[${1:id=id}]"
+    },
+    "tabnotes": {}
+  },
+  "options": [
+    "printbiddoi",
+    "keywordsasfootnote",
+    "historyasfootnote",
+    "addressasfootnote",
+    "addressatend",
+    "autosecdot",
+    "noautosecdot",
+    "noundefthanksref",
+    "frontback",
+    "amsmath",
+    "amsthm",
+    "seceqn",
+    "natbib",
+    "linksfromyear",
+    "numbers",
+    "nameyear",
+    "authoryear",
+    "rotating",
+    "ba",
+    "ps",
+    "ss",
+    "ejs",
+    "aap",
+    "aop",
+    "aos",
+    "aoas",
+    "sts",
+    "bj",
+    "aihp",
+    "bjps",
+    "doublespacing",
+    "singlespacing",
+    "noinfoline",
+    "infoline",
+    "linenumbers",
+    "nolinenumbers",
+    "showframe",
+    "noshowframe",
+    "submission",
+    "preedit",
+    "preprint"
+  ],
+  "keyvals": [
+    [
+      "email",
+      "url",
+      "label=${1:label}",
+      "text=${1:text}",
+      "nopdflink"
+    ],
+    [
+      "text=${1:text}",
+      "presep=${1:separator}"
+    ],
+    [
+      "text=${1:text}",
+      "doi",
+      "url"
+    ],
+    [
+      "id=${1:id}",
+      "mark=${1:mark}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/index.json b/dev/packages/index.json
new file mode 100644
index 000000000..1e7619fdb
--- /dev/null
+++ b/dev/packages/index.json
@@ -0,0 +1,44 @@
+{
+  "includes": {},
+  "macros": {
+    "newindex{}{}{}{}": {
+      "snippet": "newindex{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
+    },
+    "newindex[]{}{}{}{}": {
+      "snippet": "newindex[${5:number cmd}]{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
+    },
+    "renewindex{}{}{}{}": {
+      "snippet": "renewindex{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
+    },
+    "renewindex[]{}{}{}{}": {
+      "snippet": "renewindex[${5:number cmd}]{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
+    },
+    "printindex": {},
+    "printindex[]": {
+      "snippet": "printindex[${1:tag}]"
+    },
+    "index*{}": {
+      "snippet": "index*{${1:entry}}"
+    },
+    "index[]{}": {
+      "snippet": "index[${2:tag}]{${1:entry}}"
+    },
+    "shortindexingon": {},
+    "shortindexingoff": {},
+    "proofmodetrue": {},
+    "proofmodefalse": {},
+    "indexproofstyle{}": {
+      "snippet": "indexproofstyle{${1:code}}"
+    },
+    "disableindex": {},
+    "seename": {},
+    "see{}{}": {
+      "snippet": "see{${1:text}}{${2:page number}}"
+    }
+  },
+  "envs": {
+    "shortindexingon": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/inputenc.json b/dev/packages/inputenc.json
new file mode 100644
index 000000000..30db4361f
--- /dev/null
+++ b/dev/packages/inputenc.json
@@ -0,0 +1,58 @@
+{
+  "includes": {
+    "ucs": [
+      "utf8x"
+    ]
+  },
+  "macros": {
+    "DeclareInputMath{}{}": {
+      "snippet": "DeclareInputMath{${1:slot}}{${2:text}}"
+    },
+    "DeclareInputText{}{}": {
+      "snippet": "DeclareInputText{${1:slot}}{${2:math}}"
+    },
+    "DeclareUnicodeCharacter{}{}": {
+      "snippet": "DeclareUnicodeCharacter{${1:slot}}{${2:text}}"
+    },
+    "inputencodingname": {},
+    "inputencoding{}": {
+      "snippet": "inputencoding{${1:encoding name}}"
+    },
+    "IeC{}": {
+      "snippet": "IeC{${1:arg}}"
+    },
+    "definearmew{}": {
+      "snippet": "definearmew{${1:character}}",
+      "option": "armscii8"
+    }
+  },
+  "envs": {},
+  "options": [
+    "ascii",
+    "latin1",
+    "latin2",
+    "latin3",
+    "latin4",
+    "latin5",
+    "latin9",
+    "latin10",
+    "decmulti",
+    "cp850",
+    "cp852",
+    "cp858",
+    "cp437",
+    "cp437de",
+    "cp865",
+    "applemac",
+    "macce",
+    "next",
+    "cp1250",
+    "cp1252",
+    "cp1257",
+    "ansinew",
+    "utf8",
+    "utf8x",
+    "armscii8"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/intcalc.json b/dev/packages/intcalc.json
new file mode 100644
index 000000000..5597e6c9c
--- /dev/null
+++ b/dev/packages/intcalc.json
@@ -0,0 +1,65 @@
+{
+  "includes": {},
+  "macros": {
+    "intcalcNum{}": {
+      "snippet": "intcalcNum{${1:number}}"
+    },
+    "intcalcInv{}": {
+      "snippet": "intcalcInv{${1:number}}"
+    },
+    "intcalcAbs{}": {
+      "snippet": "intcalcAbs{${1:number}}"
+    },
+    "intcalcSgn{}": {
+      "snippet": "intcalcSgn{${1:number}}"
+    },
+    "intcalcMin{}{}": {
+      "snippet": "intcalcMin{${1:num1}}{${2:num2}}"
+    },
+    "intcalcMax{}{}": {
+      "snippet": "intcalcMax{${1:num1}}{${2:num2}}"
+    },
+    "intcalcCmp{}{}": {
+      "snippet": "intcalcCmp{${1:num1}}{${2:num2}}"
+    },
+    "intcalcInc{}": {
+      "snippet": "intcalcInc{${1:number}}"
+    },
+    "intcalcDec{}": {
+      "snippet": "intcalcDec{${1:number}}"
+    },
+    "intcalcAdd{}{}": {
+      "snippet": "intcalcAdd{${1:num1}}{${2:num2}}"
+    },
+    "intcalcSub{}{}": {
+      "snippet": "intcalcSub{${1:num1}}{${2:num2}}"
+    },
+    "intcalcShl{}": {
+      "snippet": "intcalcShl{${1:number}}"
+    },
+    "intcalcShr{}": {
+      "snippet": "intcalcShr{${1:number}}"
+    },
+    "intcalcMul{}{}": {
+      "snippet": "intcalcMul{${1:num1}}{${2:num2}}"
+    },
+    "intcalcSqr{}": {
+      "snippet": "intcalcSqr{${1:number}}"
+    },
+    "intcalcFac{}": {
+      "snippet": "intcalcFac{${1:number}}"
+    },
+    "intcalcPow{}{}": {
+      "snippet": "intcalcPow{${1:num1}}{${2:num2}}"
+    },
+    "intcalcDiv{}{}": {
+      "snippet": "intcalcDiv{${1:num1}}{${2:num2}}"
+    },
+    "intcalcMod{}{}": {
+      "snippet": "intcalcMod{${1:num1}}{${2:num2}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/interactiveanimation.json b/dev/packages/interactiveanimation.json
index 21ee829f9..3e0645d3e 100644
--- a/dev/packages/interactiveanimation.json
+++ b/dev/packages/interactiveanimation.json
@@ -10,9 +10,9 @@
       "keyvalpos": 2
     },
     "controlbutton[]{}{}{}": {
-      "snippet": "controlbutton[${4:sequence file,start page,end page}]{${1:caption}}{${2:target frame}}{${3:options}}",
+      "snippet": "controlbutton[${4:sequence file,${5:start page},end page}]{${1:caption}}{${2:target frame}}{${3:options}}",
       "keyvalindex": 0,
-      "keyvalpos": 3
+      "keyvalpos": 2
     }
   },
   "envs": {
diff --git a/dev/packages/interval.json b/dev/packages/interval.json
new file mode 100644
index 000000000..1577cb684
--- /dev/null
+++ b/dev/packages/interval.json
@@ -0,0 +1,60 @@
+{
+  "includes": {
+    "pgfkeys": []
+  },
+  "macros": {
+    "interval{}{}": {
+      "snippet": "interval{${1:start}}{${2:end}}"
+    },
+    "interval[]{}{}": {
+      "snippet": "interval[${3:options}]{${1:start}}{${2:end}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ointerval[]{}{}": {
+      "snippet": "ointerval[${3:options}]{${1:start}}{${2:end}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "linterval[]{}{}": {
+      "snippet": "linterval[${3:options}]{${1:start}}{${2:end}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "rinterval[]{}{}": {
+      "snippet": "rinterval[${3:options}]{${1:start}}{${2:end}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "intervalconfig{}": {
+      "snippet": "intervalconfig{${1:options}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "INTVversion": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "open",
+      "open left",
+      "open right",
+      "scaled",
+      "scaled=${1:scale command}"
+    ],
+    [
+      "scaled",
+      "scaled=${1:scale command}"
+    ],
+    [
+      "separator symbol=${1:symbol}",
+      "left open fence=${1:symbol}",
+      "left closed fence=${1:symbol}",
+      "right open fence=${1:symbol}",
+      "right closed fence=${1:symbol}",
+      "soft open fences",
+      "colorize=${1:color commands}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/invoice.json b/dev/packages/invoice.json
new file mode 100644
index 000000000..debbf2f35
--- /dev/null
+++ b/dev/packages/invoice.json
@@ -0,0 +1,116 @@
+{
+  "includes": {
+    "ifthen": [],
+    "longtable": [],
+    "calc": [],
+    "siunitx": [],
+    "fp": []
+  },
+  "macros": {
+    "ProjectTitle{}": {
+      "snippet": "ProjectTitle{${1:text}}"
+    },
+    "Fee{}{}{}": {
+      "snippet": "Fee{${1:contents}}{${2:rate/unit}}{${3:count}}"
+    },
+    "STFee": {},
+    "EBC{}{}": {
+      "snippet": "EBC{${1:contents}}{${2:amount}}"
+    },
+    "EFC{}{}{}{}{}": {
+      "snippet": "EFC{${1:contents}}{${2:foreign currency}}{${3:amount}}{${4:conversion rate}}{${5:base currency result}}"
+    },
+    "EBCi{}{}": {
+      "snippet": "EBCi{${1:contents}}{${2:amount}}"
+    },
+    "EFCi{}{}{}{}{}": {
+      "snippet": "EFCi{${1:contents}}{${2:foreign currency}}{${3:amount}}{${4:conversion rate}}{${5:base currency result}}"
+    },
+    "STExpenses": {},
+    "Discount{}{}": {
+      "snippet": "Discount{${1:contents}}{${2:amount}}"
+    },
+    "STProject": {},
+    "BC": {},
+    "commafalse": {},
+    "commatrue": {},
+    "Flag": {},
+    "ifcomma": {},
+    "ifVATnonzero": {},
+    "invoiceno{}": {
+      "snippet": "invoiceno{${1:arg}}"
+    },
+    "InvoiceVersion": {},
+    "Null": {},
+    "Project": {},
+    "theDiscount": {},
+    "theExpenses": {},
+    "theFee": {},
+    "theProject": {},
+    "theTotal": {},
+    "theVAT": {},
+    "VATnonzerofalse": {},
+    "VATnonzerotrue": {},
+    "Activity": {},
+    "Amount": {},
+    "Count": {},
+    "Currency": {},
+    "Error": {},
+    "Expense": {},
+    "Expenses": {},
+    "Factor": {},
+    "FeeBeforeExpense": {},
+    "FeeSTExists": {},
+    "Fees": {},
+    "InternalError": {},
+    "InvoiceCompleted": {},
+    "InvoiceCompletedNoExpense": {},
+    "InvoiceCompletedNoFee": {},
+    "InvoiceCompletedNoFeeST": {},
+    "InvoiceCompletedNoProject": {},
+    "InvoiceCompletedNoProjectST": {},
+    "KOMA": {},
+    "MissingFee": {},
+    "MissingInputData": {},
+    "MissingOpening": {},
+    "MissingProject": {},
+    "NoInvoiceNesting": {},
+    "NoProjectNesting": {},
+    "ProjectCompletedNoExpense": {},
+    "ProjectCompletedNoFee": {},
+    "ProjectEmpty": {},
+    "ProjectSTExists": {},
+    "SubtotalExpenses": {},
+    "SubtotalFee": {},
+    "SubtotalProject": {},
+    "SumExpenses": {},
+    "SumFees": {},
+    "SumVAT": {},
+    "Total": {},
+    "UnitRate": {},
+    "VAT": {},
+    "Warning": {}
+  },
+  "envs": {
+    "invoice{}{}": {
+      "name": "invoice",
+      "snippet": "{${1:base currency}}{${2:VAT}}"
+    }
+  },
+  "options": [
+    "afrikaans",
+    "dutch",
+    "english",
+    "estonian",
+    "finnish",
+    "french",
+    "german",
+    "italian",
+    "spanish",
+    "spanishe",
+    "spanishv",
+    "swedish",
+    "comma"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ipa.json b/dev/packages/ipa.json
new file mode 100644
index 000000000..347e78ea6
--- /dev/null
+++ b/dev/packages/ipa.json
@@ -0,0 +1,153 @@
+{
+  "includes": {},
+  "macros": {
+    "ain": {},
+    "babygamma": {},
+    "barb": {},
+    "bard": {},
+    "bari": {},
+    "barl": {},
+    "baro": {},
+    "barp": {},
+    "barsci": {},
+    "barscu": {},
+    "baru": {},
+    "clickb": {},
+    "clickc": {},
+    "clickt": {},
+    "closedniomega": {},
+    "closedrevepsilon": {},
+    "corner": {},
+    "crossb": {},
+    "crossd": {},
+    "crossh": {},
+    "crossnilambda": {},
+    "curlyc": {},
+    "curlyesh": {},
+    "curlyyogh": {},
+    "curlyz": {},
+    "dlbari": {},
+    "downp": {},
+    "downt": {},
+    "dz": {},
+    "ejective": {},
+    "eng": {},
+    "er": {},
+    "esh": {},
+    "eth": {
+      "detail": "ð",
+      "documentation": "eth"
+    },
+    "flapr": {},
+    "glotstop": {},
+    "halflength": {},
+    "hookb": {},
+    "hookd": {},
+    "hookg": {},
+    "hookh": {},
+    "hookheng": {},
+    "hookrevepsilon": {},
+    "hv": {},
+    "inva": {},
+    "invf": {},
+    "invglotstop": {},
+    "invh": {},
+    "invlegr": {},
+    "invm": {},
+    "invr": {},
+    "invscr": {},
+    "invscripta": {},
+    "invv": {},
+    "invw": {},
+    "invy": {},
+    "ipagamma": {},
+    "labdentalnas": {},
+    "latfric": {},
+    "leftp": {},
+    "leftt": {},
+    "legm": {},
+    "legr": {},
+    "length": {},
+    "lz": {},
+    "midtilde": {},
+    "nialpha": {},
+    "nibeta": {},
+    "nichi": {},
+    "niepsilon": {},
+    "nigamma": {},
+    "niiota": {},
+    "nilambda": {},
+    "niomega": {},
+    "niphi": {},
+    "nisigma": {},
+    "nitheta": {},
+    "niupsilon": {},
+    "nj": {},
+    "oo": {},
+    "open": {},
+    "openo": {},
+    "overring": {},
+    "polishhook": {},
+    "reve": {},
+    "reveject": {},
+    "revepsilon": {},
+    "revglotstop": {},
+    "rightp": {},
+    "rightt": {},
+    "scd": {},
+    "scg": {},
+    "schwa": {},
+    "sci": {},
+    "scn": {},
+    "scr": {},
+    "scripta": {},
+    "scriptg": {},
+    "scriptv": {},
+    "scu": {},
+    "scy": {},
+    "secstress": {},
+    "slashb": {},
+    "slashc": {},
+    "slashd": {},
+    "slashu": {},
+    "stress": {},
+    "syllabic": {},
+    "taild": {},
+    "tailinvr": {},
+    "taill": {},
+    "tailn": {},
+    "tailr": {},
+    "tails": {},
+    "tailt": {},
+    "tailz": {},
+    "tesh": {},
+    "thorn": {},
+    "tildel": {},
+    "underdots": {},
+    "underring": {},
+    "undertilde": {},
+    "underwedge": {},
+    "upp": {},
+    "upt": {},
+    "yogh": {},
+    "dental{}": {
+      "snippet": "dental{${1:character}}"
+    },
+    "underarch{}": {
+      "snippet": "underarch{${1:character}}"
+    },
+    "diatop[]": {
+      "snippet": "diatop[${1:diacritics|character}]"
+    },
+    "diaunder[]": {
+      "snippet": "diaunder[${1:diacritics|character}]"
+    },
+    "ipa": {},
+    "fileversion": {},
+    "filedate": {},
+    "docdate": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ipsum.json b/dev/packages/ipsum.json
new file mode 100644
index 000000000..da0c3a4f8
--- /dev/null
+++ b/dev/packages/ipsum.json
@@ -0,0 +1,31 @@
+{
+  "includes": {
+    "xstring": [],
+    "xintexpr": [],
+    "simplekv": []
+  },
+  "macros": {
+    "ipsum": {},
+    "ipsum[]": {
+      "snippet": "ipsum[${1:range}]"
+    },
+    "ipsum<>": {
+      "snippet": "ipsum<${1:keyvals}>",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ipsum<>[]": {
+      "snippet": "ipsum<${2:keyvals}>[${1:range}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "Lang=",
+      "Type="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/isomath.json b/dev/packages/isomath.json
new file mode 100644
index 000000000..32b28a61c
--- /dev/null
+++ b/dev/packages/isomath.json
@@ -0,0 +1,51 @@
+{
+  "includes": {
+    "fixmath": [],
+    "kvoptions": []
+  },
+  "macros": {
+    "mathbfit{}": {
+      "snippet": "mathbfit{${1:text}}"
+    },
+    "mathsfbfit{}": {
+      "snippet": "mathsfbfit{${1:text}}"
+    },
+    "mathbold{}": {
+      "snippet": "mathbold{${1:text}}"
+    },
+    "mathboldsans{}": {
+      "snippet": "mathboldsans{${1:text}}"
+    },
+    "mathsfit{}": {
+      "snippet": "mathsfit{${1:text}}",
+      "option": "OMLmathsfit=true"
+    },
+    "mathsans{}": {
+      "snippet": "mathsans{${1:text}}",
+      "option": "OMLmathsfit=true"
+    },
+    "vectorsym{}": {
+      "snippet": "vectorsym{${1:symbol}}"
+    },
+    "matrixsym{}": {
+      "snippet": "matrixsym{${1:symbol}}"
+    },
+    "tensorsym{}": {
+      "snippet": "tensorsym{${1:symbol}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "rmdefault=${1:font family}",
+    "sfdefault=",
+    "scaled=${1:factor}",
+    "reuseMathAlphabets",
+    "OMLmathrm",
+    "OMLmathbf",
+    "OMLmathsf",
+    "OMLmathsfit",
+    "OMLmathtt",
+    "OMLmathsans"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/joinbox.json b/dev/packages/joinbox.json
index 99f1bc907..83d6efa3e 100644
--- a/dev/packages/joinbox.json
+++ b/dev/packages/joinbox.json
@@ -20,34 +20,34 @@
       "keyvalpos": 0
     },
     "joinboxes{}": {
-      "snippet": "joinboxes{${1:content1,content2,...}}"
+      "snippet": "joinboxes{${1:content1,${2:content2},...}}"
     },
     "joinboxes[]{}": {
-      "snippet": "joinboxes[${2:options}]{${1:content1,content2,...}}",
+      "snippet": "joinboxes[${2:options}]{${1:content1,${3:content2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "joinboxes*{}": {
-      "snippet": "joinboxes*{${1:content1,content2,...}}"
+      "snippet": "joinboxes*{${1:content1,${2:content2},...}}"
     },
     "joinboxes*[]{}": {
-      "snippet": "joinboxes*[${2:options}]{${1:content1,content2,...}}",
+      "snippet": "joinboxes*[${2:options}]{${1:content1,${3:content2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "joinfigs{}": {
-      "snippet": "joinfigs{${1:imagefile1,imagefile2,...}}"
+      "snippet": "joinfigs{${1:imagefile1,${2:imagefile2},...}}"
     },
     "joinfigs[]{}": {
-      "snippet": "joinfigs[${2:options}]{${1:imagefile1,imagefile2,...}}",
+      "snippet": "joinfigs[${2:options}]{${1:imagefile1,${3:imagefile2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "joinfigs*{}": {
-      "snippet": "joinfigs*{${1:imagefile1,imagefile2,...}}"
+      "snippet": "joinfigs*{${1:imagefile1,${2:imagefile2},...}}"
     },
     "joinfigs*[]{}": {
-      "snippet": "joinfigs*[${2:options}]{${1:imagefile1,imagefile2,...}}",
+      "snippet": "joinfigs*[${2:options}]{${1:imagefile1,${3:imagefile2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/junicode.json b/dev/packages/junicode.json
index 479d312b0..441861133 100644
--- a/dev/packages/junicode.json
+++ b/dev/packages/junicode.json
@@ -271,7 +271,6 @@
   },
   "envs": {},
   "options": [
-    "fonttype=",
     "light",
     "medium",
     "semibold",
diff --git a/dev/packages/jurabib.json b/dev/packages/jurabib.json
index 2ac6aeb22..f844586c0 100644
--- a/dev/packages/jurabib.json
+++ b/dev/packages/jurabib.json
@@ -25,7 +25,7 @@
       "snippet": "citefield[${3:page-range}]{${1:field}}{${2:bibid}}"
     },
     "citenotitlefortype{}": {
-      "snippet": "citenotitlefortype{${1:article,book,…}}"
+      "snippet": "citenotitlefortype{${1:article,${2:book},…}}"
     },
     "citeswithoutentry{}": {
       "snippet": "citeswithoutentry{${1:keylist}}"
@@ -37,7 +37,7 @@
       "snippet": "citetitle[${2:Annotator/See}][${3:page-range}]{${1:bibid}}"
     },
     "citetitlefortype{}": {
-      "snippet": "citetitlefortype{${1:article,book,…}}"
+      "snippet": "citetitlefortype{${1:article,${2:book},…}}"
     },
     "footcite[]{}": {
       "snippet": "footcite[${2:page-range}]{${1:bibid}}"
@@ -99,13 +99,13 @@
       "snippet": "pageadd{${1:text}}"
     },
     "formatpages{}{}{}": {
-      "snippet": "formatpages{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages{${1:article,${4:book},…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}]{${1:article,${5:book},…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[][]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,${6:book},…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "citealp[]{}": {
       "snippet": "citealp[${2:postfix}]{${1:keylist}}"
diff --git a/dev/packages/kanbun.json b/dev/packages/kanbun.json
new file mode 100644
index 000000000..df4db0a8f
--- /dev/null
+++ b/dev/packages/kanbun.json
@@ -0,0 +1,54 @@
+{
+  "includes": {
+    "l3keys2e": [],
+    "ifluatex": []
+  },
+  "macros": {
+    "setkanbun{}": {
+      "snippet": "setkanbun{${1:options}}"
+    },
+    "kanjiunit{}{}{}{}{}{}": {
+      "snippet": "kanjiunit{${1:}}{${2:left punct}}{${3:kanji}}{${4:other punct}}{${5:kaeriten}}{${6:}}"
+    },
+    "furiokuri{}{}": {
+      "snippet": "furiokuri{${1:furigana}}{${2:okurigana}}"
+    },
+    "kanbunfont": {},
+    "multifuriokuri{}{}": {
+      "snippet": "multifuriokuri{${1:furigana}}{${2:okurigana}}"
+    },
+    "multifuriokuri[]{}{}": {
+      "snippet": "multifuriokuri[${3:raise}]{${1:furigana}}{${2:okurigana}}"
+    },
+    "Kanbun": {},
+    "EndKanbun": {},
+    "printkanbun": {},
+    "printkanbuncode": {},
+    "printkanbunnopar": {},
+    "printkanbunnoparcode": {},
+    "createcatcodes": {},
+    "kaeriten{}": {
+      "snippet": "kaeriten{${1:arg}}"
+    },
+    "matchkana{}": {
+      "snippet": "matchkana{${1:arg}}"
+    },
+    "Space": {}
+  },
+  "envs": {
+    "kanjipar": {}
+  },
+  "options": [
+    "scale=${1:ratio}",
+    "fontcmd=${1:font command}",
+    "rubyfontcmd=${1:font command}",
+    "unit=",
+    "yokoaki=${1:ratio}",
+    "tateaki=${1:ratio}",
+    "okuriintrusion=${1:ratio}",
+    "kumi=",
+    "aki",
+    "beta"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/keyval.json b/dev/packages/keyval.json
new file mode 100644
index 000000000..5a2bff750
--- /dev/null
+++ b/dev/packages/keyval.json
@@ -0,0 +1,14 @@
+{
+  "includes": {},
+  "macros": {
+    "setkeys{}{}": {
+      "snippet": "setkeys{${1:family}}{${2:keyvals}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "unknownkeysallowed",
+    "unknownkeyserror"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/keyvaltable.json b/dev/packages/keyvaltable.json
index 371e80ac9..982840756 100644
--- a/dev/packages/keyvaltable.json
+++ b/dev/packages/keyvaltable.json
@@ -150,6 +150,12 @@
     "kvtRuleCMid{}{}{}": {
       "snippet": "kvtRuleCMid{${1:a-b}}{${2:color}}{${3:color}}"
     },
+    "kvtRuleCMid(){}{}{}": {
+      "snippet": "kvtRuleCMid(${4:trim}){${1:a-b}}{${2:color}}{${3:color}}"
+    },
+    "kvtRuleCMid[](){}{}{}": {
+      "snippet": "kvtRuleCMid[${4:width}](${5:trim}){${1:a-b}}{${2:color}}{${3:color}}"
+    },
     "kvtRulesCMid{}{}{}": {
       "snippet": "kvtRulesCMid{${1:rlist}}{${2:color}}{${3:color}}"
     },
diff --git a/dev/packages/knowledge.json b/dev/packages/knowledge.json
index 5493d6ce3..db9d49d45 100644
--- a/dev/packages/knowledge.json
+++ b/dev/packages/knowledge.json
@@ -63,9 +63,15 @@
     "kl{}": {
       "snippet": "kl{${1:text}}"
     },
+    "kl(){}": {
+      "snippet": "kl(${2:scope}){${1:text}}"
+    },
     "kl[]{}": {
       "snippet": "kl[${2:knowledge name}]{${1:text}}"
     },
+    "kl()[]{}": {
+      "snippet": "kl(${3:scope})[${2:knowledge name}]{${1:text}}"
+    },
     "knowledgenewvariant{}{}": {
       "snippet": "knowledgenewvariant{${1:command}}{${2:directives}}"
     },
@@ -79,12 +85,12 @@
       "snippet": "knowledgescope{${1:scope name}}"
     },
     "knowledgeimport{}": {
-      "snippet": "knowledgeimport{${1:scope1,scope2,...}}"
+      "snippet": "knowledgeimport{${1:scope1,${2:scope2},...}}"
     },
     "knowledgeconfigureenvironment{}{}": {
-      "snippet": "knowledgeconfigureenvironment{${1:env1,env2,...}}{${2:keyvals}}",
+      "snippet": "knowledgeconfigureenvironment{${1:env1,${3:env2},...}}{${2:keyvals}}",
       "keyvalindex": 1,
-      "keyvalpos": 1
+      "keyvalpos": 0
     },
     "intro{}": {
       "snippet": "intro{${1:knowledge}}"
@@ -101,6 +107,9 @@
     "phantomintro{}": {
       "snippet": "phantomintro{${1:knowledge}}"
     },
+    "phantomintro(){}": {
+      "snippet": "phantomintro(${2:label}){${1:knowledge}}"
+    },
     "nointro{}": {
       "snippet": "nointro{${1:knowledge}}"
     },
@@ -119,9 +128,15 @@
     "rekl{}": {
       "snippet": "rekl{${1:text}}"
     },
+    "rekl(){}": {
+      "snippet": "rekl(${2:scope}){${1:text}}"
+    },
     "rekl[]{}": {
       "snippet": "rekl[${2:knowledge name}]{${1:text}}"
     },
+    "rekl()[]{}": {
+      "snippet": "rekl(${3:scope})[${2:knowledge name}]{${1:text}}"
+    },
     "AP": {},
     "itemAP": {},
     "knowledgeIntroIndexStyle": {
@@ -439,7 +454,7 @@
       "snippet": "KAuxScopeTag{${1:arg1}}{${2:arg2}}"
     },
     "KnowledgeConfigureEnvironment{}{}": {
-      "snippet": "KnowledgeConfigureEnvironment{${1:env1,env2,...}}{${2:keyvals}}"
+      "snippet": "KnowledgeConfigureEnvironment{${1:env1,${3:env2},...}}{${2:keyvals}}"
     },
     "ScopeHackEnvironments": {},
     "ScopeActivate": {},
diff --git a/dev/packages/knufakelogo.json b/dev/packages/knufakelogo.json
index 1c1ddd4c1..b37df425b 100644
--- a/dev/packages/knufakelogo.json
+++ b/dev/packages/knufakelogo.json
@@ -14,6 +14,9 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "KNUfakelogo*[]{}()()": {
+      "snippet": "KNUfakelogo*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
+    },
     "KNUfakelogoBlue{}": {
       "snippet": "KNUfakelogoBlue{${1:scale}}"
     },
@@ -22,6 +25,9 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "KNUfakelogoBlue*[]{}()()": {
+      "snippet": "KNUfakelogoBlue*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
+    },
     "KNUfakelogoGreen{}": {
       "snippet": "KNUfakelogoGreen{${1:scale}}"
     },
@@ -30,6 +36,9 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "KNUfakelogoGreen*[]{}()()": {
+      "snippet": "KNUfakelogoGreen*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
+    },
     "KNUfakelogoBlack{}": {
       "snippet": "KNUfakelogoBlack{${1:scale}}"
     },
@@ -38,6 +47,9 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "KNUfakelogoBlack*[]{}()()": {
+      "snippet": "KNUfakelogoBlack*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
+    },
     "KNUfakelogoColor{}{}{}": {
       "snippet": "KNUfakelogoColor{${1:scale}}{${2:inner circ colour}}{${3:outer ring colour}}"
     },
@@ -46,6 +58,9 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "KNUfakelogoColor*[]{}{}[][]()()": {
+      "snippet": "KNUfakelogoColor*[${3:options}]{${1:scale}}{${2:bg and inner colour}}[${4:inner text  colour}][${5:outer text/ring colour}](${6:SW coordinate})(${7:NE coordinate})"
+    },
     "KBOX": {},
     "KCIRCLE": {},
     "KFILL": {},
diff --git a/dev/packages/l3sys-query.json b/dev/packages/l3sys-query.json
new file mode 100644
index 000000000..533777667
--- /dev/null
+++ b/dev/packages/l3sys-query.json
@@ -0,0 +1,37 @@
+{
+  "includes": {},
+  "macros": {
+    "QueryWorkingDirectory{}": {
+      "snippet": "QueryWorkingDirectory{${1:result cmd}}"
+    },
+    "QueryFiles{}{}": {
+      "snippet": "QueryFiles{${1:spec}}{${2:function}}"
+    },
+    "QueryFiles[]{}{}": {
+      "snippet": "QueryFiles[${3:options}]{${1:spec}}{${2:function}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "QueryFilesTF{}{}{}{}": {
+      "snippet": "QueryFilesTF{${1:spec}}{${2:function}}{${3:pre code}}{${4:empty list code}}"
+    },
+    "QueryFilesTF[]{}{}{}{}": {
+      "snippet": "QueryFilesTF[${5:options}]{${1:spec}}{${2:function}}{${3:pre code}}{${4:empty list code}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "recursive",
+      "ignore-case",
+      "reverse",
+      "pattern",
+      "sort=",
+      "type=",
+      "exclude=${1:Lua pattern}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/la.json b/dev/packages/la.json
new file mode 100644
index 000000000..17075c490
--- /dev/null
+++ b/dev/packages/la.json
@@ -0,0 +1,27 @@
+{
+  "includes": {},
+  "macros": {
+    "la": {},
+    "textla{}": {
+      "snippet": "textla{${1:text}}"
+    },
+    "lla": {},
+    "textlla{}": {
+      "snippet": "textlla{${1:text}}"
+    },
+    "llafill": {},
+    "llaline{}": {
+      "snippet": "llaline{${1:text}}"
+    },
+    "filename": {},
+    "fileversion": {},
+    "filedate": {},
+    "docversion": {},
+    "docdate": {}
+  },
+  "envs": {
+    "llapar": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/labels.json b/dev/packages/labels.json
new file mode 100644
index 000000000..1d9bcdc7c
--- /dev/null
+++ b/dev/packages/labels.json
@@ -0,0 +1,90 @@
+{
+  "includes": {},
+  "macros": {
+    "BottomLabelBorder": {
+      "option": "newdimens"
+    },
+    "BottomPageMargin": {
+      "option": "newdimens"
+    },
+    "InterLabelColumn": {
+      "option": "newdimens"
+    },
+    "InterLabelRow": {
+      "option": "newdimens"
+    },
+    "LeftLabelBorder": {
+      "option": "newdimens"
+    },
+    "LeftPageMargin": {
+      "option": "newdimens"
+    },
+    "RightLabelBorder": {
+      "option": "newdimens"
+    },
+    "RightPageMargin": {
+      "option": "newdimens"
+    },
+    "TopLabelBorder": {
+      "option": "newdimens"
+    },
+    "TopPageMargin": {
+      "option": "newdimens"
+    },
+    "addresslabel[]{}": {
+      "snippet": "addresslabel[${2:font commands}]{${1:text}}"
+    },
+    "addresslabel{}": {
+      "snippet": "addresslabel{${1:text}}"
+    },
+    "BottomBorder": {},
+    "boxedaddresslabel[]{}": {
+      "snippet": "boxedaddresslabel[${2:font commands}]{${1:text}}"
+    },
+    "boxedaddresslabel{}": {
+      "snippet": "boxedaddresslabel{${1:text}}"
+    },
+    "genericlabel{}": {
+      "snippet": "genericlabel{${1:text}}"
+    },
+    "ifLabelGrid": {},
+    "ifLabelInfo": {},
+    "LabelCols": {},
+    "labelfile{}": {
+      "snippet": "labelfile{${1:file}}"
+    },
+    "LabelGridfalse": {},
+    "LabelGridtrue": {},
+    "LabelInfofalse": {},
+    "LabelInfotrue": {},
+    "LabelRows": {},
+    "LabelSetup": {},
+    "LeftBorder": {},
+    "numberoflabels": {},
+    "promptlabels": {},
+    "RightBorder": {},
+    "skiplabels{}": {
+      "snippet": "skiplabels{${1:integer}}"
+    },
+    "TopBorder": {},
+    "isitapar": {},
+    "LabelTotal": {},
+    "LabTmp": {},
+    "PkgBlurb{}{}": {
+      "snippet": "PkgBlurb{${1:arg1}}{${2:arg2}}"
+    },
+    "ToMilli{}": {
+      "snippet": "ToMilli{${1:arg}}"
+    },
+    "TypeoutBlurb{}{}": {
+      "snippet": "TypeoutBlurb{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {
+    "labels": {}
+  },
+  "options": [
+    "newdimens"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/labyrinth.json b/dev/packages/labyrinth.json
index 9d4a32c8d..20f706cbe 100644
--- a/dev/packages/labyrinth.json
+++ b/dev/packages/labyrinth.json
@@ -14,6 +14,9 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "putsymbol(){}": {
+      "snippet": "putsymbol(${2:x},${3:y}){${1:symbol}}"
+    },
     "plus": {
       "detail": "+",
       "documentation": "PLUS SIGN"
@@ -26,11 +29,27 @@
       "detail": "∗",
       "documentation": "ASTERISK OPERATOR (Hodge star operator)"
     },
+    "labyrinthsolution(){}": {
+      "snippet": "labyrinthsolution(${2:x},${3:y}){${1:solution code}}"
+    },
+    "labyrinthsolution[](){}": {
+      "snippet": "labyrinthsolution[${2:options}](${3:x},${4:y}){${1:solution code}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "solutionset{}": {
       "snippet": "solutionset{${1:options}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
+    "autosolution()(){}": {
+      "snippet": "autosolution(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:first direction}}"
+    },
+    "autosolution[]()(){}": {
+      "snippet": "autosolution[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:first direction}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "solutionpath": {},
     "truncdiv{}{}": {
       "snippet": "truncdiv{${1:num1}}{${2:num2}}"
diff --git a/dev/packages/ladder.json b/dev/packages/ladder.json
new file mode 100644
index 000000000..a8d7fcfe3
--- /dev/null
+++ b/dev/packages/ladder.json
@@ -0,0 +1,50 @@
+{
+  "includes": {
+    "calc": [],
+    "ifthen": [],
+    "tikz": []
+  },
+  "macros": {
+    "ladderLine": {},
+    "startParallel": {},
+    "setParallel": {},
+    "unsetParallel": {},
+    "ladderNO{}{}": {
+      "snippet": "ladderNO{${1:name}}{${2:mnemonic}}"
+    },
+    "ladderNO[]{}{}": {
+      "snippet": "ladderNO[${3:type}]{${1:name}}{${2:mnemonic}}"
+    },
+    "ladderNC{}{}": {
+      "snippet": "ladderNC{${1:name}}{${2:mnemonic}}"
+    },
+    "ladderNC[]{}{}": {
+      "snippet": "ladderNC[${3:type}]{${1:name}}{${2:mnemonic}}"
+    },
+    "ladderC{}{}": {
+      "snippet": "ladderC{${1:name}}{${2:mnemonic}}"
+    },
+    "ladderC[]{}{}": {
+      "snippet": "ladderC[${3:type}]{${1:name}}{${2:mnemonic}}"
+    },
+    "ladderText{}{}": {
+      "snippet": "ladderText{${1:name}}{${2:mnemonic}}"
+    },
+    "ladderText[]{}{}": {
+      "snippet": "ladderText[${3:type}]{${1:name}}{${2:mnemonic}}"
+    },
+    "thecurrentX": {},
+    "thecurrentY": {},
+    "thememCurrentX": {},
+    "thememCurrentY": {},
+    "thenextX": {},
+    "thenextY": {},
+    "thenextYPar": {},
+    "thestartPar": {},
+    "thestopPar": {},
+    "thetempCurrentY": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lapdf.json b/dev/packages/lapdf.json
index 80fcd351b..bf4931ad5 100644
--- a/dev/packages/lapdf.json
+++ b/dev/packages/lapdf.json
@@ -3,39 +3,348 @@
     "calc": []
   },
   "macros": {
+    "Abs()": {
+      "snippet": "Abs(${1:num})"
+    },
+    "Acos()": {
+      "snippet": "Acos(${1:num},${2:cmd})"
+    },
+    "Acosh()": {
+      "snippet": "Acosh(${1:num},${2:cmd})"
+    },
+    "Add()": {
+      "snippet": "Add(${1:num1},${2:num2})"
+    },
     "Affine": {},
+    "Arc()()()()": {
+      "snippet": "Arc(${1:n})(${2:x},${3:y})(${4:direction},${5:angle})(${6:radius})"
+    },
+    "Arcto()()()()": {
+      "snippet": "Arcto(${1:n})(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:radius})"
+    },
+    "Asin()": {
+      "snippet": "Asin(${1:num},${2:cmd})"
+    },
+    "Asinh()": {
+      "snippet": "Asinh(${1:num},${2:cmd})"
+    },
+    "Atan()": {
+      "snippet": "Atan(${1:num},${2:cmd})"
+    },
+    "Atanh()": {
+      "snippet": "Atanh(${1:num},${2:cmd})"
+    },
+    "Bezier()": {
+      "snippet": "Bezier(${1:val1},${2:val2},${3:val3},${4:val4},${5:val5},${6:val6})"
+    },
     "Black": {},
     "Blue": {},
+    "Circle()()": {
+      "snippet": "Circle(${1:n})(${2:x},${3:y},${4:radius})"
+    },
     "Closepath": {},
     "Colval": {},
+    "Concat()": {
+      "snippet": "Concat(${1:val1},${2:val2},${3:val3},${4:val4},${5:val5},${6:val6})"
+    },
+    "Cos()": {
+      "snippet": "Cos(${1:angle},${2:cmd})"
+    },
+    "Cosh()": {
+      "snippet": "Cosh(${1:angle},${2:cmd})"
+    },
+    "Crnd()": {
+      "snippet": "Crnd(${1:num})"
+    },
     "Cyan": {},
+    "Dabs()": {
+      "snippet": "Dabs(${1:dimen})"
+    },
+    "Dadd()": {
+      "snippet": "Dadd(${1:dimen1},${2:dimen2})"
+    },
+    "Dash()": {
+      "snippet": "Dash(${1:n})"
+    },
     "Dblue": {},
     "Dcyan": {},
+    "Ddiv()": {
+      "snippet": "Ddiv(${1:dimen1},${2:dimen2})"
+    },
+    "Defdim()": {
+      "snippet": "Defdim(${1:cmd},${2:val})"
+    },
+    "Defnum()": {
+      "snippet": "Defnum(${1:cmd},${2:val})"
+    },
+    "Deg()": {
+      "snippet": "Deg(${1:num},${2:cmd})"
+    },
+    "Df()": {
+      "snippet": "Df(${1:x},${2:cmd})"
+    },
     "Dgray": {},
     "Dgreen": {},
+    "Dint()": {
+      "snippet": "Dint(${1:dimen})"
+    },
+    "Direc()()()": {
+      "snippet": "Direc(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:cmd})"
+    },
+    "Div()": {
+      "snippet": "Div(${1:num1},${2:num2})"
+    },
     "Dmagenta": {},
+    "Dmod()": {
+      "snippet": "Dmod(${1:dimen1},${2:dimen2})"
+    },
+    "Dmul()": {
+      "snippet": "Dmul(${1:dimen1},${2:dimen2})"
+    },
+    "Dpoly()": {
+      "snippet": "Dpoly(${1:x},${2:cmd})"
+    },
+    "Dpx()": {
+      "snippet": "Dpx(${1:angle},${2:cmd})"
+    },
+    "Dpy()": {
+      "snippet": "Dpy(${1:angle},${2:cmd})"
+    },
     "Dred": {},
+    "Dset()": {
+      "snippet": "Dset(${1:num},${2:cmd})"
+    },
+    "Dsig()": {
+      "snippet": "Dsig(${1:dimen1},${2:dimen2})"
+    },
+    "Dsub()": {
+      "snippet": "Dsub(${1:dimen1},${2:dimen2})"
+    },
+    "Dtp()": {
+      "snippet": "Dtp(${1:angle},${2:cmd})"
+    },
+    "Dtt()": {
+      "snippet": "Dtt(${1:t},${2:cmd})"
+    },
+    "Dtx()": {
+      "snippet": "Dtx(${1:t},${2:cmd})"
+    },
+    "Dty()": {
+      "snippet": "Dty(${1:t},${2:cmd})"
+    },
     "Dyellow": {},
+    "Ellipse()()()": {
+      "snippet": "Ellipse(${1:n})(${2:x},${3:y})(${4:a},${5:b},${6:angle})"
+    },
+    "Epolygon()()()": {
+      "snippet": "Epolygon(${1:n})(${2:x},${3:y})(${4:radius},${5:angle})"
+    },
+    "Euclid()": {
+      "snippet": "Euclid(${1:x},${2:y})"
+    },
+    "Exp()": {
+      "snippet": "Exp(${1:num},${2:cmd})"
+    },
+    "Fill()": {
+      "snippet": "Fill(${1:r},${2:g},${3:b})"
+    },
+    "Fplot()()": {
+      "snippet": "Fplot(${1:n})(${2:x},${3:y})"
+    },
+    "Fpoly()": {
+      "snippet": "Fpoly(${1:x},${2:cmd})"
+    },
+    "Gfill()": {
+      "snippet": "Gfill(${1:gray val})"
+    },
     "Gray": {},
     "Green": {},
     "Grestore": {},
     "Gsave": {},
+    "Homogen()": {
+      "snippet": "Homogen(${1:px},${2:py},${3:w})"
+    },
+    "Hypot()": {
+      "snippet": "Hypot(${1:leg1},${2:leg2},${3:cmd})"
+    },
     "Lapdf": {},
+    "Len()()()": {
+      "snippet": "Len(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:cmd})"
+    },
+    "Line()()": {
+      "snippet": "Line(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "Lineto()": {
+      "snippet": "Lineto(${1:x},${2:y})"
+    },
+    "Lingrid()()()()": {
+      "snippet": "Lingrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
+    },
+    "Ln()": {
+      "snippet": "Ln(${1:num},${2:cmd})"
+    },
+    "Log()": {
+      "snippet": "Log(${1:base},${2:num},${3:cmd})"
+    },
+    "Logxgrid()()()()": {
+      "snippet": "Logxgrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
+    },
+    "Logxygrid()()()()": {
+      "snippet": "Logxygrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
+    },
+    "Logygrid()()()()": {
+      "snippet": "Logygrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
+    },
     "Magenta": {},
+    "Mod()": {
+      "snippet": "Mod(${1:num1},${2:num2})"
+    },
+    "Moveto()": {
+      "snippet": "Moveto(${1:x},${2:y})"
+    },
+    "Mul()": {
+      "snippet": "Mul(${1:num1},${2:num2})"
+    },
+    "Nextcol()": {
+      "snippet": "Nextcol(${1:num1},${2:num2})"
+    },
     "Np{}": {
       "snippet": "Np{${1:length}}"
     },
     "PDF{}": {
       "snippet": "PDF{${1:pdf special}}"
     },
+    "Point()()": {
+      "snippet": "Point(${1:gray val})(${2:x},${3:y})"
+    },
+    "Polgrid()()": {
+      "snippet": "Polgrid(${1:g},${2:a})(${3:radius})"
+    },
+    "Polynom()()": {
+      "snippet": "Polynom(${1:x},${2:y})(${3:a},${4:b},${5:c},${6:d})"
+    },
+    "Pot()": {
+      "snippet": "Pot(${1:base},${2:power},${3:cmd})"
+    },
+    "Pow()": {
+      "snippet": "Pow(${1:base},${2:power},${3:cmd})"
+    },
+    "Pplot()()": {
+      "snippet": "Pplot(${1:n})(${2:angle1},${3:angle2})"
+    },
+    "Pxy()": {
+      "snippet": "Pxy(${1:angle},${2:x},${3:y})"
+    },
+    "Rad()": {
+      "snippet": "Rad(${1:num},${2:cmd})"
+    },
+    "Rect()": {
+      "snippet": "Rect(${1:val1},${2:val2},${3:val3},${4:val4})"
+    },
+    "Rectangle()()()": {
+      "snippet": "Rectangle(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:angle})"
+    },
     "Red": {},
     "Resetcol": {},
+    "Rmoveto()": {
+      "snippet": "Rmoveto(${1:x},${2:y},${3:z})"
+    },
+    "Root()": {
+      "snippet": "Root(${1:num},${2:root},${3:cmd})"
+    },
+    "Rotate()": {
+      "snippet": "Rotate(${1:angle})"
+    },
+    "Rotpoint()()()": {
+      "snippet": "Rotpoint(${1:angle})(${2:xy},${3:y1})(${4:x2},${5:y2})"
+    },
+    "Scale()": {
+      "snippet": "Scale(${1:val1},${2:val2})"
+    },
+    "Sector()()()()": {
+      "snippet": "Sector(${1:n})(${2:x},${3:y})(${4:direction},${5:angle})(${6:radius})"
+    },
+    "Set()": {
+      "snippet": "Set(${1:dimen},${2:val})"
+    },
+    "Setcap()": {
+      "snippet": "Setcap(${1:value})"
+    },
     "Setclip": {},
+    "Setcol()": {
+      "snippet": "Setcol(${1:r},${2:g},${3:b})"
+    },
+    "Setdash()": {
+      "snippet": "Setdash(${1:value})"
+    },
+    "Setflat()": {
+      "snippet": "Setflat(${1:value})"
+    },
+    "Setgray()": {
+      "snippet": "Setgray(${1:gray val})"
+    },
+    "Setjoin()": {
+      "snippet": "Setjoin(${1:value})"
+    },
+    "Setmiter()": {
+      "snippet": "Setmiter(${1:value})"
+    },
+    "Setwidth()": {
+      "snippet": "Setwidth(${1:value})"
+    },
     "Sfill": {},
+    "Sig()": {
+      "snippet": "Sig(${1:num1},${2:num2})"
+    },
+    "Sin()": {
+      "snippet": "Sin(${1:angle},${2:cmd})"
+    },
+    "Sinh()": {
+      "snippet": "Sinh(${1:angle},${2:cmd})"
+    },
+    "Sqrt()": {
+      "snippet": "Sqrt(${1:num},${2:cmd})"
+    },
+    "Stepcol()": {
+      "snippet": "Stepcol(${1:num1},${2:num2},${3:cmd})"
+    },
     "Stroke": {},
+    "Sub()": {
+      "snippet": "Sub(${1:num1},${2:num2})"
+    },
+    "Tan()": {
+      "snippet": "Tan(${1:angle},${2:cmd})"
+    },
+    "Tangent()()()": {
+      "snippet": "Tangent(${1:x})(${2:x1},${3:x2})(${4:a},${5:b},${6:c},${7:d})"
+    },
+    "Tanh()": {
+      "snippet": "Tanh(${1:angle},${2:cmd})"
+    },
+    "Text(){}": {
+      "snippet": "Text(${2:x},${3:y},${4:pos}){${1:text}}"
+    },
     "Thick": {},
     "Thin": {},
+    "Tplot()()": {
+      "snippet": "Tplot(${1:n})(${2:t1},${3:t2})"
+    },
+    "Translate()": {
+      "snippet": "Translate(${1:val1},${2:val2})"
+    },
+    "Triangle()()()()": {
+      "snippet": "Triangle(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})(${7:angle})"
+    },
     "Ul": {},
+    "Varc()()()()": {
+      "snippet": "Varc(${1:n})(${2:x},${3:y})(${4:direction},${5:angle})(${6:radius})"
+    },
+    "Vect()()": {
+      "snippet": "Vect(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "Vecto()": {
+      "snippet": "Vecto(${1:x},${2:y})"
+    },
     "Whiledim{}{}": {
       "snippet": "Whiledim{${1:dimen condition}}{${2:commands}}"
     },
@@ -49,11 +358,18 @@
       "snippet": "nP{${1:length}}"
     },
     "pdfTeX": {},
+    "lapdf()()": {
+      "snippet": "lapdf(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
     "endlapdf": {},
     "pdf": {},
     "endpdf": {}
   },
   "envs": {
+    "lapdf(x1,y1)(x2,y2)": {
+      "name": "lapdf",
+      "snippet": "(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
     "pdf": {}
   },
   "options": [
diff --git a/dev/packages/latex-dev.json b/dev/packages/latex-dev.json
index fd323f985..915177450 100644
--- a/dev/packages/latex-dev.json
+++ b/dev/packages/latex-dev.json
@@ -34,6 +34,7 @@
     "AssignSocketPlug{}{}": {
       "snippet": "AssignSocketPlug{${1:socket}}{${2:socket plug}}"
     },
+    "AssignTemplateKeys": {},
     "AtBeginDocument[]{}": {
       "snippet": "AtBeginDocument[${2:label}]{${1:code}}"
     },
@@ -142,6 +143,8 @@
     "DebugShipoutsOn": {},
     "DebugSocketsOff": {},
     "DebugSocketsOn": {},
+    "DebugTablesOff": {},
+    "DebugTablesOn": {},
     "DeclareCaseChangeEquivalent{}{}": {
       "snippet": "DeclareCaseChangeEquivalent{${1:cmd}}{${2:replacement text}}"
     },
@@ -211,6 +214,12 @@
     "DeclareHookRule{}{}{}{}": {
       "snippet": "DeclareHookRule{${1:hook}}{${2:label1}}{${3:relation}}{${4:label2}}"
     },
+    "DeclareInstance{}{}{}{}": {
+      "snippet": "DeclareInstance{${1:type}}{${2:instance}}{${3:template}}{${4:parameters}}"
+    },
+    "DeclareInstanceCopy{}{}{}": {
+      "snippet": "DeclareInstanceCopy{${1:type}}{${2:instance2}}{${3:instance1}}"
+    },
     "DeclareKeys[]{}": {
       "snippet": "DeclareKeys[${2:family}]{${1:declarations}}"
     },
@@ -289,6 +298,15 @@
     "DeclareSymbolFontAlphabet{}{}": {
       "snippet": "DeclareSymbolFontAlphabet{${1:math-alph}}{${2:sym-font}}"
     },
+    "DeclareTemplateCode{}{}{}{}{}": {
+      "snippet": "DeclareTemplateCode{${1:type}}{${2:template}}{${3:no. of args}}{${4:key bindings}}{${5:code}}"
+    },
+    "DeclareTemplateCopy{}{}{}": {
+      "snippet": "DeclareTemplateCopy{${1:type}}{${2:template2}}{${3:template1}}"
+    },
+    "DeclareTemplateInterface{}{}{}{}": {
+      "snippet": "DeclareTemplateInterface{${1:type}}{${2:template}}{${3:no. of args}}{${4:key list}}"
+    },
     "DeclareTextAccent{}{}{}": {
       "snippet": "DeclareTextAccent{${1:cmd}}{${2:encoding}}{${3:slot}}"
     },
@@ -350,6 +368,12 @@
       "snippet": "DisableHook{${1:hook}}"
     },
     "DiscardShipoutBox": {},
+    "EditInstance{}{}{}": {
+      "snippet": "EditInstance{${1:type}}{${2:instance}}{${3:new values}}"
+    },
+    "EditTemplateDefaults{}{}{}": {
+      "snippet": "EditTemplateDefaults{${1:type}}{${2:template}}{${3:new defaults}}"
+    },
     "EndIncludeInRelease": {},
     "EndModuleRelease": {},
     "ExecuteOptions{}": {
@@ -393,35 +417,89 @@
     "IfBooleanTF{}{}{}": {
       "snippet": "IfBooleanTF{${1:arg}}{${2:true code}}{${3:false code}}"
     },
+    "IfClassAtLeastF{}{}{}": {
+      "snippet": "IfClassAtLeastF{${1:class}}{${2:date}}{${3:false code}}"
+    },
+    "IfClassAtLeastT{}{}{}": {
+      "snippet": "IfClassAtLeastT{${1:class}}{${2:date}}{${3:true code}}"
+    },
     "IfClassAtLeastTF{}{}{}{}": {
       "snippet": "IfClassAtLeastTF{${1:class}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
+    "IfClassLoadedF{}{}": {
+      "snippet": "IfClassLoadedF{${1:class}}{${2:false code}}"
+    },
+    "IfClassLoadedT{}{}": {
+      "snippet": "IfClassLoadedT{${1:class}}{${2:true code}}"
+    },
     "IfClassLoadedTF{}{}{}": {
       "snippet": "IfClassLoadedTF{${1:class}}{${2:true code}}{${3:false code}}"
     },
+    "IfClassLoadedWithOptionsF{}{}{}": {
+      "snippet": "IfClassLoadedWithOptionsF{${1:class}}{${2:options}}{${3:false code}}"
+    },
+    "IfClassLoadedWithOptionsT{}{}{}": {
+      "snippet": "IfClassLoadedWithOptionsT{${1:class}}{${2:options}}{${3:true code}}"
+    },
     "IfClassLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfClassLoadedWithOptionsTF{${1:class}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfExplAtLeastTF{}{}{}": {
       "snippet": "IfExplAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
+    "IfFileAtLeastF{}{}{}": {
+      "snippet": "IfFileAtLeastF{${1:file}}{${2:date}}{${3:false code}}"
+    },
+    "IfFileAtLeastT{}{}{}": {
+      "snippet": "IfFileAtLeastT{${1:file}}{${2:date}}{${3:true code}}"
+    },
     "IfFileAtLeastTF{}{}{}{}": {
       "snippet": "IfFileAtLeastTF{${1:file}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
     "IfFileExists{}{}{}": {
       "snippet": "IfFileExists{${1:file}}{${2:true code}}{${3:false code}}"
     },
+    "IfFileLoadedF{}{}": {
+      "snippet": "IfFileLoadedF{${1:file}}{${2:false code}}"
+    },
+    "IfFileLoadedT{}{}": {
+      "snippet": "IfFileLoadedT{${1:file}}{${2:true code}}"
+    },
+    "IfFileLoadedTF{}{}{}": {
+      "snippet": "IfFileLoadedTF{${1:file}}{${2:true code}}{${3:false code}}"
+    },
     "IfFontSeriesContextTF{}{}{}": {
       "snippet": "IfFontSeriesContextTF{${1:face}}{${2:true code}}{${3:false code}}"
     },
+    "IfFormatAtLeastF{}{}": {
+      "snippet": "IfFormatAtLeastF{${1:date}}{${2:false code}}"
+    },
+    "IfFormatAtLeastT{}{}": {
+      "snippet": "IfFormatAtLeastT{${1:date}}{${2:true code}}"
+    },
     "IfFormatAtLeastTF{}{}{}": {
       "snippet": "IfFormatAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
     "IfHookEmptyTF{}{}{}": {
       "snippet": "IfHookEmptyTF{${1:hook}}{${2:true code}}{${3:false code}}"
     },
-    "IfLabelExistTF{}{}{}": {
-      "snippet": "IfLabelExistTF{${1:label}}{${2:true code}}{${3:false code}}"
+    "IfInstanceExistsF{}{}{}{}": {
+      "snippet": "IfInstanceExistsF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
+    },
+    "IfInstanceExistsT{}{}{}{}": {
+      "snippet": "IfInstanceExistsT{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
+    },
+    "IfInstanceExistsTF{}{}{}{}": {
+      "snippet": "IfInstanceExistsTF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
+    },
+    "IfLabelExistsF{}{}": {
+      "snippet": "IfLabelExistsF{${1:label}}{${2:false code}}"
+    },
+    "IfLabelExistsT{}{}": {
+      "snippet": "IfLabelExistsT{${1:label}}{${2:true code}}"
+    },
+    "IfLabelExistsTF{}{}{}": {
+      "snippet": "IfLabelExistsTF{${1:label}}{${2:true code}}{${3:false code}}"
     },
     "IfMarksEqualTF[]{}{}{}{}{}": {
       "snippet": "IfMarksEqualTF[${6:region}]{${1:class}}{${2:pos1}}{${3:pos2}}{${4:true code}}{${5:false code}}"
@@ -438,20 +516,44 @@
     "IfNoValueTF{}{}{}": {
       "snippet": "IfNoValueTF{${1:arg}}{${2:-NoValue-Code}}{${3:ValueCode}}"
     },
+    "IfPackageAtLeastF{}{}{}": {
+      "snippet": "IfPackageAtLeastF{${1:package}}{${2:date}}{${3:false code}}"
+    },
+    "IfPackageAtLeastT{}{}{}": {
+      "snippet": "IfPackageAtLeastT{${1:package}}{${2:date}}{${3:true code}}"
+    },
     "IfPackageAtLeastTF{}{}{}{}": {
       "snippet": "IfPackageAtLeastTF{${1:package}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
+    "IfPackageLoadedF{}{}": {
+      "snippet": "IfPackageLoadedF{${1:package}}{${2:false code}}"
+    },
+    "IfPackageLoadedT{}{}": {
+      "snippet": "IfPackageLoadedT{${1:package}}{${2:true code}}"
+    },
     "IfPackageLoadedTF{}{}{}": {
       "snippet": "IfPackageLoadedTF{${1:package}}{${2:true code}}{${3:false code}}"
     },
+    "IfPackageLoadedWithOptionsF{}{}{}": {
+      "snippet": "IfPackageLoadedWithOptionsF{${1:package}}{${2:options}}{${3:false code}}"
+    },
+    "IfPackageLoadedWithOptionsT{}{}{}": {
+      "snippet": "IfPackageLoadedWithOptionsT{${1:package}}{${2:options}}{${3:true code}}"
+    },
     "IfPackageLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfPackageLoadedWithOptionsTF{${1:package}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfPDFManagementActiveTF{}{}": {
       "snippet": "IfPDFManagementActiveTF{${1:true code}}{${2:false code}}"
     },
-    "IfPropertyExistTF{}{}{}": {
-      "snippet": "IfPropertyExistTF{${1:property}}{${2:true code}}{${3:false code}}"
+    "IfPropertyExistsF{}{}": {
+      "snippet": "IfPropertyExistsF{${1:property}}{${2:false code}}"
+    },
+    "IfPropertyExistsT{}{}": {
+      "snippet": "IfPropertyExistsT{${1:property}}{${2:true code}}"
+    },
+    "IfPropertyExistsTF{}{}{}": {
+      "snippet": "IfPropertyExistsTF{${1:property}}{${2:true code}}{${3:false code}}"
     },
     "IfPropertyRecordedTF{}{}{}{}": {
       "snippet": "IfPropertyRecordedTF{${1:label}}{${2:property}}{${3:true code}}{${4:false code}}"
@@ -478,6 +580,9 @@
     "InsertMark{}{}": {
       "snippet": "InsertMark{${1:class}}{${2:text}}"
     },
+    "KeyValue{}": {
+      "snippet": "KeyValue{${1:key name}}"
+    },
     "LastDeclaredEncoding": {},
     "LastMark[]{}": {
       "snippet": "LastMark[${2:region}]{${1:class}}"
@@ -582,13 +687,14 @@
     "NewSocketPlug{}{}{}": {
       "snippet": "NewSocketPlug{${1:socket}}{${2:socket plug}}{${3:code}}"
     },
+    "NewTemplateType{}{}": {
+      "snippet": "NewTemplateType{${1:template type}}{${2:no. of args}}"
+    },
     "NextLinkTarget{}": {
       "snippet": "NextLinkTarget{${1:target name}}"
     },
     "OmitIndent": {},
     "OptionNotUsed": {},
-    "obeyedline": {},
-    "obeyedspace": {},
     "PackageError{}{}{}": {
       "snippet": "PackageError{${1:package name}}{${2:error text}}{${3:help text}}"
     },
@@ -732,6 +838,9 @@
     "RequirePackageWithOptions{}[]": {
       "snippet": "RequirePackageWithOptions{${1:package}}[${2:release}]"
     },
+    "ResumeTagging{}": {
+      "snippet": "ResumeTagging{${1:string}}"
+    },
     "ReverseBoolean": {},
     "SetDefaultHookLabel{}": {
       "snippet": "SetDefaultHookLabel{${1:default label}}"
@@ -751,6 +860,9 @@
     "SetSymbolFont{}{}{}{}{}{}": {
       "snippet": "SetSymbolFont{${1:sym-font}}{${2:version}}{${3:encoding}}{${4:family}}{${5:series}}{${6:shape}}"
     },
+    "SetTemplateKeys{}{}{}": {
+      "snippet": "SetTemplateKeys{${1:type}}{${2:template}}{${3:keyvals}}"
+    },
     "ShipoutBox": {},
     "ShipoutBoxDepth": {},
     "ShipoutBoxHeight": {},
@@ -767,15 +879,36 @@
     "ShowHook{}": {
       "snippet": "ShowHook{${1:hook}}"
     },
+    "ShowInstanceValues{}{}": {
+      "snippet": "ShowInstanceValues{${1:type}}{${2:instance}}"
+    },
+    "ShowMarksAt{}": {
+      "snippet": "ShowMarksAt{${1:text}}"
+    },
     "ShowSocket{}": {
       "snippet": "ShowSocket{${1:socket}}"
     },
+    "ShowTemplateCode{}{}": {
+      "snippet": "ShowTemplateCode{${1:type}}{${2:template}}"
+    },
+    "ShowTemplateDefaults{}{}": {
+      "snippet": "ShowTemplateDefaults{${1:type}}{${2:template}}"
+    },
+    "ShowTemplateInterface{}{}": {
+      "snippet": "ShowTemplateInterface{${1:type}}{${2:template}}"
+    },
+    "ShowTemplateVariables{}{}": {
+      "snippet": "ShowTemplateVariables{${1:type}}{${2:template}}"
+    },
     "SplitArgument{}{}": {
       "snippet": "SplitArgument{${1:number}}{${2:tokens}}"
     },
     "SplitList{}": {
       "snippet": "SplitList{${1:tokens}}"
     },
+    "SuspendTagging{}": {
+      "snippet": "SuspendTagging{${1:string}}"
+    },
     "TextSymbolUnavailable{}": {
       "snippet": "TextSymbolUnavailable{${1:arg}}"
     },
@@ -792,6 +925,9 @@
     "UseHook{}": {
       "snippet": "UseHook{${1:hook}}"
     },
+    "UseInstance{}{}": {
+      "snippet": "UseInstance{${1:type}}{${2:instance}}"
+    },
     "UseLegacyTextSymbols": {},
     "UseName{}": {
       "snippet": "UseName{${1:csname}}"
@@ -801,7 +937,13 @@
     },
     "UseRawInputEncoding": {},
     "UseSocket{}": {
-      "snippet": "UseSocket{${1:socket}}"
+      "snippet": "UseSocket{${1:socket name}}"
+    },
+    "UseTaggingSocket{}": {
+      "snippet": "UseTaggingSocket{${1:socket}}"
+    },
+    "UseTemplate{}{}{}": {
+      "snippet": "UseTemplate{${1:type}}{${2:template}}{${3:settings}}"
     },
     "UseTextAccent{}{}{}": {
       "snippet": "UseTextAccent{${1:encoding}}{${2:cmd}}{${3:text}}"
@@ -1245,26 +1387,6 @@
     "itdefault": {},
     "loggingall": {},
     "loggingoutput": {},
-    "ltcmddate": {},
-    "ltcmdhooksdate": {},
-    "ltcmdhooksversion": {},
-    "ltcmdversion": {},
-    "ltfilehookdate": {},
-    "ltfilehookversion": {},
-    "lthooksdate": {},
-    "lthooksversion": {},
-    "ltmarksdate": {},
-    "ltmarksversion": {},
-    "ltmetadate": {},
-    "ltmetaversion": {},
-    "ltparadate": {},
-    "ltparaversion": {},
-    "ltpropertiesdate": {},
-    "ltpropertiesversion": {},
-    "ltshipoutdate": {},
-    "ltshipoutversion": {},
-    "ltsocketsdate": {},
-    "ltsocketsversion": {},
     "mathalpha": {},
     "mathgroup": {},
     "mathhexbox": {},
@@ -1275,6 +1397,8 @@
     "numberline{}": {
       "snippet": "numberline{${1:number}}"
     },
+    "obeyedline": {},
+    "obeyedspace": {},
     "poptabs": {},
     "pushtabs": {},
     "requestedLaTeXdate": {},
diff --git a/dev/packages/latex-document.json b/dev/packages/latex-document.json
index be4a24017..696a6c964 100644
--- a/dev/packages/latex-document.json
+++ b/dev/packages/latex-document.json
@@ -13,13 +13,22 @@
     },
     "and": {},
     "asciispace": {},
+    "bezier{}()()()": {
+      "snippet": "bezier{${1:n}}(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
+    },
     "bfseries": {},
     "bibindent": {},
     "Bigg": {},
+    "Bigg(": {
+      "snippet": "Bigg(${2:${1}\\Bigg})"
+    },
     "Bigg[": {
       "snippet": "Bigg[${1}\\Bigg]"
     },
     "bigg": {},
+    "bigg(": {
+      "snippet": "bigg(${2:${1}\\bigg})"
+    },
     "bigg[": {
       "snippet": "bigg[${1}\\bigg]"
     },
@@ -40,6 +49,12 @@
       "snippet": "contentsline{${1:type}}{${2:text}}{${3:page}}{${4:Href}}"
     },
     "contentsname": {},
+    "dashbox{}()[]{}": {
+      "snippet": "dashbox{${1:dashlength}}(${4:width},${5:height})[${2:position}]{${3:text}}"
+    },
+    "dashbox{}(){}": {
+      "snippet": "dashbox{${1:dashlength}}(${3:width},${4:height}){${2:text}}"
+    },
     "date{}": {
       "snippet": "date{${1:text}}"
     },
@@ -91,6 +106,12 @@
     "fpeval{}": {
       "snippet": "fpeval{${1:fp expression}}"
     },
+    "framebox()[]{}": {
+      "snippet": "framebox(${3:xdimen},${4:ydimen})[${2:position}]{${1:text}}"
+    },
+    "framebox(){}": {
+      "snippet": "framebox(${2:xdimen},${3:ydimen}){${1:text}}"
+    },
     "frame{}": {
       "snippet": "frame{${1:text}}"
     },
@@ -136,21 +157,35 @@
       "snippet": "legacyoldstylenums{${1:text}}"
     },
     "lhook": {},
+    "line(){}": {
+      "snippet": "line(${2:xslope},${3:yslope}){${1:length}}"
+    },
     "linethickness{}": {
       "snippet": "linethickness{${1:dimension}}"
     },
     "linewidth": {},
     "listfigurename": {},
     "listfiles": {},
+    "listfiles[]": {
+      "snippet": "listfiles[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "listparindent": {},
     "listtablename": {},
+    "makebox()[]{}": {
+      "snippet": "makebox(${3:width},${4:height})[${2:position}]{${1:text}}"
+    },
+    "makebox(){}": {
+      "snippet": "makebox(${2:width},${3:height}){${1:text}}"
+    },
     "makelabel": {},
     "MakeLowercase{}": {
       "snippet": "MakeLowercase{${1:text}}"
     },
     "MakeLowercase[]{}": {
       "snippet": "MakeLowercase[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "MakeTitlecase{}": {
@@ -158,7 +193,7 @@
     },
     "MakeTitlecase[]{}": {
       "snippet": "MakeTitlecase[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "MakeUppercase{}": {
@@ -166,7 +201,7 @@
     },
     "MakeUppercase[]{}": {
       "snippet": "MakeUppercase[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "mapstochar": {},
@@ -195,6 +230,9 @@
       "documentation": "MEDIUM MATHEMATICAL SPACE, four-eighteenths of an em"
     },
     "mdseries": {},
+    "multiput()(){}{}": {
+      "snippet": "multiput(${3:xcoord},${4:ycoord})(${5:xdelta},${6:ydelta}){${1:copies}}{${2:object}}"
+    },
     "negmedspace": {},
     "negthickspace": {},
     "newblock": {},
@@ -226,6 +264,12 @@
       "snippet": "oldstylenums{${1:text}}"
     },
     "onecolumn": {},
+    "oval()": {
+      "snippet": "oval(${1:width},${2:height})"
+    },
+    "oval()[]": {
+      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
+    },
     "pageref*{}": {
       "snippet": "pageref*{${1:label}}"
     },
@@ -246,6 +290,15 @@
     },
     "protect": {},
     "pushtabs": {},
+    "put(){}": {
+      "snippet": "put(${2:xcoord},${3:ycoord}){${1:text}}"
+    },
+    "qbezier()()()": {
+      "snippet": "qbezier(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
+    "qbezier[]()()()": {
+      "snippet": "qbezier[${1:n}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
+    },
     "qbeziermax": {},
     "r{}": {
       "snippet": "r{${1:letter}}"
@@ -422,6 +475,9 @@
       "detail": "⋮",
       "documentation": "VERTICAL ELLIPSIS"
     },
+    "vector(){}": {
+      "snippet": "vector(${2:xslope},${3:yslope}){${1:length}}"
+    },
     "verb": {
       "snippet": "verb|${1:text}|"
     },
@@ -517,7 +573,7 @@
     "filecontents[]{}": {
       "name": "filecontents",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "filecontents*{}": {
@@ -527,7 +583,7 @@
     "filecontents*[]{}": {
       "name": "filecontents*",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "flushleft": {},
@@ -566,6 +622,14 @@
       "snippet": "{${1:width}}"
     },
     "normalsize": {},
+    "picture(width,height)": {
+      "name": "picture",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "picture(width,height)(xoffset,yoffset)": {
+      "name": "picture",
+      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
+    },
     "pmatrix": {},
     "quotation": {},
     "quote": {},
@@ -635,6 +699,10 @@
     "openbib"
   ],
   "keyvals": [
+    [
+      "hashes",
+      "sizes"
+    ],
     [
       "locale=${1:BCP-47 tag}",
       "lang=${1:BCP-47 tag}"
diff --git a/dev/packages/latex2pydata.json b/dev/packages/latex2pydata.json
index 2fe4728c6..6d02196b0 100644
--- a/dev/packages/latex2pydata.json
+++ b/dev/packages/latex2pydata.json
@@ -36,6 +36,9 @@
     "pydatawritevalue{}": {
       "snippet": "pydatawritevalue{${1:value}}"
     },
+    "pydatawritekeyedefvalue{}{}": {
+      "snippet": "pydatawritekeyedefvalue{${1:key}}{${2:value}}"
+    },
     "pydatawritekeyvalue{}{}": {
       "snippet": "pydatawritekeyvalue{${1:key}}{${2:value}}"
     },
@@ -53,6 +56,9 @@
     "pydatabuffervalue{}": {
       "snippet": "pydatabuffervalue{${1:value}}"
     },
+    "pydatabufferkeyedefvalue{}{}": {
+      "snippet": "pydatabufferkeyedefvalue{${1:key}}{${2:value}}"
+    },
     "pydatabufferkeyvalue{}{}": {
       "snippet": "pydatabufferkeyvalue{${1:key}}{${2:value}}"
     },
diff --git a/dev/packages/latexscreenshooter.json b/dev/packages/latexscreenshooter.json
new file mode 100644
index 000000000..ccd16cc66
--- /dev/null
+++ b/dev/packages/latexscreenshooter.json
@@ -0,0 +1,14 @@
+{
+  "includes": {
+    "graphicx": [],
+    "catchfile": []
+  },
+  "macros": {
+    "screenshooter{}{}{}{}{}": {
+      "snippet": "screenshooter{${1:URL}}{${2:width}}{${3:height}}{${4:file name}}{${5:path}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/layout.json b/dev/packages/layout.json
new file mode 100644
index 000000000..7c12a6335
--- /dev/null
+++ b/dev/packages/layout.json
@@ -0,0 +1,74 @@
+{
+  "includes": {},
+  "macros": {
+    "layout": {},
+    "layout*": {},
+    "Headertext": {},
+    "Bodytext": {},
+    "Footertext": {},
+    "MarginNotestext": {},
+    "oneinchtext": {},
+    "notshown": {},
+    "LayOuttype{}": {
+      "snippet": "LayOuttype{${1:arg}}"
+    },
+    "LayOutbs": {},
+    "ConvertToCount{}{}": {
+      "snippet": "ConvertToCount{${1:arg1}}{${2:arg2}}"
+    },
+    "SetToHalf{}{}": {
+      "snippet": "SetToHalf{${1:arg1}}{${2:arg2}}"
+    },
+    "SetToQuart{}{}": {
+      "snippet": "SetToQuart{${1:arg1}}{${2:arg2}}"
+    },
+    "Identify{}": {
+      "snippet": "Identify{${1:arg}}"
+    },
+    "InsideHArrow{}": {
+      "snippet": "InsideHArrow{${1:width}}"
+    },
+    "InsideVArrow{}": {
+      "snippet": "InsideVArrow{${1:height}}"
+    },
+    "OutsideHArrow{}{}{}": {
+      "snippet": "OutsideHArrow{${1:right arrow pos}}{${2:length}}{${3:arrow length}}"
+    },
+    "OutsideVArrow{}{}{}": {
+      "snippet": "OutsideVArrow{${1:lower arrow pos}}{${2:length}}{${3:arrow length}}"
+    },
+    "Show{}{}": {
+      "snippet": "Show{${1:arg1}}{${2:arg2}}"
+    },
+    "Type{}{}": {
+      "snippet": "Type{${1:arg1}}{${2:arg2}}"
+    },
+    "oneinch": {},
+    "fheight": {},
+    "Interval": {},
+    "ExtraYPos": {},
+    "PositionX": {},
+    "PositionY": {},
+    "ArrowLength": {}
+  },
+  "envs": {},
+  "options": [
+    "dutch",
+    "german",
+    "ngerman",
+    "english",
+    "french",
+    "francais",
+    "spanish",
+    "portuguese",
+    "brazilian",
+    "italian",
+    "romanian",
+    "japanese",
+    "verbose",
+    "silent",
+    "integers",
+    "reals"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lazylist.json b/dev/packages/lazylist.json
index 203d580d5..6fb0aa5f7 100644
--- a/dev/packages/lazylist.json
+++ b/dev/packages/lazylist.json
@@ -99,7 +99,7 @@
       "snippet": "Commaize{${1:arg1}}{${2:arg2}}"
     },
     "Listize[]": {
-      "snippet": "Listize[${1:a,b,c,...}]"
+      "snippet": "Listize[${1:a,${2:b},${3:c},...}]"
     },
     "Show": {}
   },
diff --git a/dev/packages/lcd.json b/dev/packages/lcd.json
new file mode 100644
index 000000000..94d3da136
--- /dev/null
+++ b/dev/packages/lcd.json
@@ -0,0 +1,29 @@
+{
+  "includes": {},
+  "macros": {
+    "DefineLCDchar{}{}": {
+      "snippet": "DefineLCDchar{${1:name}}{${2:binary code}}"
+    },
+    "LCDcolors{}{}": {
+      "snippet": "LCDcolors{${1:textcolor}}{${2:bgcolor}}"
+    },
+    "LCDcolors[]{}{}": {
+      "snippet": "LCDcolors[${3:color}]{${1:color}}{${2:color}}"
+    },
+    "LCDframe": {},
+    "LCDnoframe": {},
+    "textLCD{}": {
+      "snippet": "textLCD{${1:num of chars}}|${2:text}|"
+    },
+    "textLCD[]{}": {
+      "snippet": "textLCD[${2:shift}]{${1:num of chars}}|${3:text}|"
+    },
+    "textLCDcorr": {},
+    "LCDunitlength": {},
+    "filedate": {},
+    "fileversion": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/leading.json b/dev/packages/leading.json
new file mode 100644
index 000000000..52549b763
--- /dev/null
+++ b/dev/packages/leading.json
@@ -0,0 +1,13 @@
+{
+  "includes": {
+    "calc": []
+  },
+  "macros": {
+    "leading{}": {
+      "snippet": "leading{${1:length}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lhelp.json b/dev/packages/lhelp.json
index 72b8c546d..c56a40d8d 100644
--- a/dev/packages/lhelp.json
+++ b/dev/packages/lhelp.json
@@ -238,9 +238,27 @@
     "fparbox{}": {
       "snippet": "fparbox{${1:text}}"
     },
+    "fparbox([]){}": {
+      "snippet": "fparbox(${3:[${2:pos}]}){${1:text}}"
+    },
+    "fparbox([][]){}": {
+      "snippet": "fparbox(${4:[${2:pos}][${3:height}]}){${1:text}}"
+    },
+    "fparbox([][][]){}": {
+      "snippet": "fparbox(${5:[${2:pos}][${3:height}][${4:inner-pos}]}){${1:text}}"
+    },
     "fparbox[]{}": {
       "snippet": "fparbox[${2:width}]{${1:text}}"
     },
+    "fparbox[]([]){}": {
+      "snippet": "fparbox[${2:width}](${4:[${3:pos}]}){${1:text}}"
+    },
+    "fparbox[]([][]){}": {
+      "snippet": "fparbox[${2:width}](${5:[${3:pos}][${4:height}]}){${1:text}}"
+    },
+    "fparbox[]([][][]){}": {
+      "snippet": "fparbox[${2:width}](${6:[${3:pos}][${4:height}][${5:inner-pos}]}){${1:text}}"
+    },
     "xyfparbox{}{}{}": {
       "snippet": "xyfparbox{${1:width}}{${2:height}}{${3:text}}"
     },
diff --git a/dev/packages/lie-hasse.json b/dev/packages/lie-hasse.json
index a2d39e748..8d2949a75 100644
--- a/dev/packages/lie-hasse.json
+++ b/dev/packages/lie-hasse.json
@@ -2,6 +2,7 @@
   "includes": {
     "xcolor": [],
     "dynkin-diagrams": [],
+    "contour": [],
     "tikzlibrarypositioning": [],
     "tikzlibraryfadings": [],
     "tikzlibraryquotes": []
@@ -45,8 +46,11 @@
     "drawRootAsDynkinSum{}{}": {
       "snippet": "drawRootAsDynkinSum{${1:arg1}}{${2:arg2}}"
     },
-    "forAllPositiveRootsInHasseDiagram{}": {
-      "snippet": "forAllPositiveRootsInHasseDiagram{${1:command}}"
+    "edgeQuote{}": {
+      "snippet": "edgeQuote{${1:arg}}"
+    },
+    "forAllPositiveRoots{}": {
+      "snippet": "forAllPositiveRoots{${1:command}}"
     },
     "studyHasseDiagramOfRootSystem{}{}": {
       "snippet": "studyHasseDiagramOfRootSystem{${1:letter}}{${2:rank}}"
@@ -60,21 +64,12 @@
     "drawRootDecomp{}{}": {
       "snippet": "drawRootDecomp{${1:first-pos}}{${2:second-pos}}"
     },
-    "backwardsGtwo": {},
+    "hasseAttachGtwo": {},
     "attachDynkin": {},
     "doHasseDiagram{}": {
       "snippet": "doHasseDiagram{${1:arg}}"
     },
-    "forscsvlist": {},
-    "drpo": {},
-    "drmo": {},
-    "tdrpt": {},
-    "maxy": {},
-    "lbl": {},
-    "drmt": {},
-    "iD": {},
-    "xxD": {},
-    "maxxD": {}
+    "forscsvlist": {}
   },
   "envs": {},
   "options": [],
@@ -82,6 +77,7 @@
     [
       "edge length=",
       "edge/.style={${1:TikZ options}}",
+      "edge length=",
       "edge quotes/.style={${1:TikZ options}}",
       "compact edge/.style={${1:TikZ options}}",
       "noncompact edge/.style={${1:TikZ options}}",
@@ -94,7 +90,9 @@
       "show ordering",
       "show name",
       "show widths",
-      "show height"
+      "show height",
+      "show Levi",
+      "show unipotent radical"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/liftarm.json b/dev/packages/liftarm.json
index 19b7dec0a..324948a9b 100644
--- a/dev/packages/liftarm.json
+++ b/dev/packages/liftarm.json
@@ -1,6 +1,5 @@
 {
   "includes": {
-    "etoolbox": [],
     "xcolor": [],
     "tikz": [],
     "tikzlibrarycalc": []
@@ -14,34 +13,26 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "liftarmconnect{}{}{}{}": {
-      "snippet": "liftarmconnect{${1:point1}}{${2:length1}}{${3:point2}}{${4:length2}}"
-    },
-    "liftarmconnect[]{}{}{}{}": {
-      "snippet": "liftarmconnect[${5:options}]{${1:point1}}{${2:length1}}{${3:point2}}{${4:length2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "liftarmconstruct{}{}": {
-      "snippet": "liftarmconstruct{${1:text}}{${2:commands}}"
-    },
-    "liftarmconstruct[]{}{}": {
-      "snippet": "liftarmconstruct[${3:TikZ options}]{${1:text}}{${2:commands}}"
+    "liftarmconstruct{}": {
+      "snippet": "liftarmconstruct{${1:commands}}"
     },
+    "liftarmconstructclear": {},
     "liftarmanimate{}{}{}": {
       "snippet": "liftarmanimate{${1:frame rate}}{${2:list}}{${3:commands}}"
     },
     "liftarmanimate[]{}{}{}": {
       "snippet": "liftarmanimate[${4:options}]{${1:frame rate}}{${2:list}}{${3:commands}}",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     }
   },
   "envs": {
-    "liftarmconstruction": {},
-    "liftarmconstruction[]": {
-      "name": "liftarmconstruction",
-      "snippet": "[${1:TikZ options}]"
+    "liftarmconnect": {},
+    "liftarmconnect[]": {
+      "name": "liftarmconnect",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
     }
   },
   "options": [],
@@ -49,58 +40,25 @@
     [
       "axle holes={${1:values}}",
       "brick",
-      "color=",
-      "${1:color}",
-      "color 0=",
-      "color 1=",
-      "color 2=",
-      "color 3=",
-      "color 4=",
-      "color 5=",
-      "color 6=",
-      "color 7=",
-      "color modulo=${1:integer}",
+      "color={${1:number}}{${2:color}}",
+      "color modulo=${1:number}",
       "contour",
+      "contour style={${1:options}}",
       "coordinate={${1:num1/name1,num2/name2/...}}",
       "hole radius=${1:number}",
+      "liftarm style={${1:options}}",
       "liftarm thickness=${1:number}",
-      "mark color=",
       "mark holes={${1:values}}",
+      "mark radius=${1:factor}",
+      "mark style={${1:options}}",
       "origin=${1:number}",
       "scalefactor=${1:factor}",
-      "screw color=",
+      "screw angle=${1:degrees}",
       "screw holes={${1:values}}",
-      "screw holes angle=${1:degrees}"
-    ],
-    [
-      "axle holes={${1:values}}",
-      "brick",
-      "color=",
-      "${1:color}",
-      "color 0=",
-      "color 1=",
-      "color 2=",
-      "color 3=",
-      "color 4=",
-      "color 5=",
-      "color 6=",
-      "color 7=",
-      "color modulo=${1:integer}",
-      "contour",
-      "coordinate={${1:num1/name1,num2/name2/...}}",
-      "hole radius=${1:number}",
-      "liftarm thickness=${1:number}",
-      "mark color=",
-      "mark holes={${1:values}}",
-      "origin=${1:number}",
-      "scalefactor=${1:factor}",
-      "screw color=",
-      "screw holes={${1:values}}",
-      "screw holes angle=${1:degrees}",
-      "connect coordinate=${1:name}",
-      "connect reverse",
-      "liftarm 1={${1:options}}",
-      "liftarm 2={${1:options}}"
+      "screw radius=${1:factor}",
+      "screw style={${1:options}}",
+      "trace={${1:num1/numframes1/code1,...}}",
+      "type="
     ],
     [
       "label=${1:label}",
@@ -141,6 +99,30 @@
       "begin={${1:begin code}}",
       "end={${1:end code}}",
       "timeline=${1:file}"
+    ],
+    [
+      "axle holes={${1:values}}",
+      "brick",
+      "color={${1:number}}{${2:color}}",
+      "color modulo=${1:number}",
+      "contour",
+      "contour style={${1:options}}",
+      "coordinate={${1:num1/name1,num2/name2/...}}",
+      "hole radius=${1:number}",
+      "liftarm style={${1:options}}",
+      "liftarm thickness=${1:number}",
+      "mark holes={${1:values}}",
+      "mark radius=${1:factor}",
+      "mark style={${1:options}}",
+      "origin=${1:number}",
+      "scalefactor=${1:factor}",
+      "screw angle=${1:degrees}",
+      "screw holes={${1:values}}",
+      "screw radius=${1:factor}",
+      "screw style={${1:options}}",
+      "trace={${1:num1/numframes1/code1,...}}",
+      "type=",
+      "connect stop="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/limap.json b/dev/packages/limap.json
new file mode 100644
index 000000000..ab67f3ae7
--- /dev/null
+++ b/dev/packages/limap.json
@@ -0,0 +1,78 @@
+{
+  "includes": {
+    "longtable": [],
+    "etoolbox": [],
+    "booktabs": []
+  },
+  "macros": {
+    "Block{}": {
+      "snippet": "Block{${1:title}}"
+    },
+    "MapBlockLabelFont": {},
+    "MapParskip": {},
+    "MapTitleFraction": {},
+    "MapTextFraction": {},
+    "MapRuleWidth": {},
+    "MapRuleStart": {},
+    "WideBlock{}": {
+      "snippet": "WideBlock{${1:content}}"
+    },
+    "MapFont": {},
+    "MapTitleFont": {},
+    "MapContinued": {},
+    "MapContinuing": {},
+    "MapTitleContinuedFont": {},
+    "MapNewpage": {},
+    "MapTOC{}": {
+      "snippet": "MapTOC{${1:text}}"
+    },
+    "MapTableOfContents": {},
+    "MapTableOfContentsStyle": {},
+    "MapBlockStartHook{}": {
+      "snippet": "MapBlockStartHook{${1:code}}"
+    },
+    "MapBlockTOC{}": {
+      "snippet": "MapBlockTOC{${1:text}}"
+    },
+    "MapTabularFraction": {},
+    "MapTOCname": {},
+    "MapTOCpage": {},
+    "filename": {},
+    "fileversion": {},
+    "filedate": {},
+    "docversion": {},
+    "docdate": {},
+    "defineLimapLanguage{}{}{}{}{}": {
+      "snippet": "defineLimapLanguage{${1:name}}{${2:continued}}{${3:continuing}}{${4:TOCname}}{${5:TOCpage}}"
+    },
+    "MapContinuingFormat{}": {
+      "snippet": "MapContinuingFormat{${1:text}}"
+    },
+    "MapContinuedFormat{}": {
+      "snippet": "MapContinuedFormat{${1:text}}"
+    },
+    "MapTOCheadfont": {},
+    "MakeTitle": {}
+  },
+  "envs": {
+    "Map{}": {
+      "name": "Map",
+      "snippet": "{${1:title}}"
+    },
+    "MapTabular{}": {
+      "name": "MapTabular",
+      "snippet": "{${1:preamble}}"
+    },
+    "Abstract": {}
+  },
+  "options": [
+    "austrian",
+    "german",
+    "french",
+    "english",
+    "USenglish",
+    "nonstrict",
+    "nolines"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/linearregression.json b/dev/packages/linearregression.json
new file mode 100644
index 000000000..174263bcc
--- /dev/null
+++ b/dev/packages/linearregression.json
@@ -0,0 +1,19 @@
+{
+  "includes": {
+    "pict2e": []
+  },
+  "macros": {
+    "lrfilename{}": {
+      "snippet": "lrfilename{${1:file}}"
+    },
+    "lraskfilename": {},
+    "lrcomputation": {},
+    "lrprint": {},
+    "lrplot{}{}{}{}{}": {
+      "snippet": "lrplot{${1:width}}{${2:key1}}{${3:key2}}{${4:key3}}{${5:key4}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lineno.json b/dev/packages/lineno.json
new file mode 100644
index 000000000..ca1ab3d15
--- /dev/null
+++ b/dev/packages/lineno.json
@@ -0,0 +1,212 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "kvoptions": [],
+    "vplref": [
+      "addpageno"
+    ],
+    "ednmath0": [
+      "mathrefs"
+    ],
+    "edtable": [
+      "edtable",
+      "longtable",
+      "nolongtablepatch"
+    ],
+    "longtable": [
+      "longtable",
+      "nolongtablepatch"
+    ],
+    "ltabptch": [
+      "longtable"
+    ]
+  },
+  "macros": {
+    "linenumbers": {},
+    "linenumbers*": {},
+    "linenumbers[]": {
+      "snippet": "linenumbers[${1:number}]"
+    },
+    "nolinenumbers": {},
+    "resetlinenumber": {},
+    "resetlinenumber[]": {
+      "snippet": "resetlinenumber[${1:number}]"
+    },
+    "setrunninglinenumbers": {},
+    "runninglinenumbers": {},
+    "runninglinenumbers*": {},
+    "runninglinenumbers[]": {
+      "snippet": "runninglinenumbers[${1:number}]"
+    },
+    "setpagewiselinenumbers": {},
+    "pagewiselinenumbers": {},
+    "switchlinenumbers": {},
+    "switchlinenumbers*": {},
+    "runningpagewiselinenumbers": {},
+    "realpagewiselinenumbers": {},
+    "leftlinenumbers": {},
+    "rightlinenumbers": {},
+    "leftlinenumbers*": {},
+    "rightlinenumbers*": {},
+    "modulolinenumbers": {},
+    "modulolinenumbers*": {},
+    "modulolinenumbers[]": {
+      "snippet": "modulolinenumbers[${1:n}]"
+    },
+    "linenumberfont": {},
+    "linenumbersep": {},
+    "linenumberwidth": {},
+    "thelinenumber": {},
+    "makeLineNumber": {},
+    "LineNumber": {},
+    "makeLineNumberRunning": {},
+    "makeLineNumberOdd": {},
+    "makeLineNumberEven": {},
+    "makeLineNumberLeft": {},
+    "makeLineNumberRight": {},
+    "linelabel{}": {
+      "snippet": "linelabel{${1:label}}"
+    },
+    "lineref{}": {
+      "snippet": "lineref{${1:label}}"
+    },
+    "lineref[]{}": {
+      "snippet": "lineref[${2:offset}]{${1:label}}"
+    },
+    "linerefr{}": {
+      "snippet": "linerefr{${1:label}}"
+    },
+    "linerefr[]{}": {
+      "snippet": "linerefr[${2:offset}]{${1:label}}"
+    },
+    "linerefp{}": {
+      "snippet": "linerefp{${1:label}}"
+    },
+    "linerefp[]{}": {
+      "snippet": "linerefp[${2:offset}]{${1:label}}"
+    },
+    "quotelinenumbers": {},
+    "quotelinenumbersep": {},
+    "quotelinenumberfont": {},
+    "numquotelist": {},
+    "internallinenumbers": {},
+    "bframesep": {},
+    "bframerule": {},
+    "bframebox": {},
+    "stepLineNumber": {},
+    "linenopenalty": {},
+    "linenopenaltypar": {},
+    "LineNoTest": {},
+    "LineNoLaTeXOutput": {},
+    "MakeLineNo": {},
+    "WriteLineNo": {},
+    "PassVadjustList": {},
+    "linenoprevgraf": {},
+    "linenumberpar": {},
+    "ifLineNumbers": {},
+    "LineNumbersfalse": {},
+    "LineNumberstrue": {},
+    "endrunninglinenumbers": {},
+    "endpagewiselinenumbers": {},
+    "endnolinenumbers": {},
+    "linenomath": {},
+    "linenomathNonumbers": {},
+    "linenomathWithnumbers": {},
+    "linenumberdisplaymath": {},
+    "nolinenumberdisplaymath": {},
+    "endlinenomath": {},
+    "theLineNumber": {},
+    "setmakelinenumbers{}": {
+      "snippet": "setmakelinenumbers{${1:arg}}"
+    },
+    "logtheLineNumber": {},
+    "LastNumberedPage": {},
+    "lastLN": {},
+    "firstLN": {},
+    "pageLN": {},
+    "nextLN": {},
+    "NumberedPageCache": {},
+    "testLastNumberedPage{}": {
+      "snippet": "testLastNumberedPage{${1:arg}}"
+    },
+    "testFirstNumberedPage{}": {
+      "snippet": "testFirstNumberedPage{${1:arg}}"
+    },
+    "testNumberedPage": {},
+    "testNextNumberedPage{}": {
+      "snippet": "testNextNumberedPage{${1:arg}}"
+    },
+    "getLineNumber": {},
+    "ifoddNumberedPage": {},
+    "oddNumberedPagetrue": {},
+    "oddNumberedPagefalse": {},
+    "ifcolumnwiselinenumbers": {},
+    "columnwiselinenumberstrue": {},
+    "columnwiselinenumbersfalse": {},
+    "gotNumberedPage{}{}{}{}": {
+      "snippet": "gotNumberedPage{${1:first line in col}}{${2:page num}}{${3:col num}}{${4:first line in page}}"
+    },
+    "subtractlinenumberoffset{}": {
+      "snippet": "subtractlinenumberoffset{${1:arg}}"
+    },
+    "thePagewiseLineNumber": {},
+    "makePagewiseLineNumber": {},
+    "getpagewiselinenumber{}": {
+      "snippet": "getpagewiselinenumber{${1:arg}}"
+    },
+    "themodulolinenumber": {},
+    "firstlinenumber{}": {
+      "snippet": "firstlinenumber{${1:number}}"
+    },
+    "endinternallinenumbers": {},
+    "internallinenumberpar": {},
+    "makeinternalLinenumbers": {},
+    "PostponeVadjust{}": {
+      "snippet": "PostponeVadjust{${1:arg}}"
+    }
+  },
+  "envs": {
+    "linenumbers": {},
+    "linenumbers[]": {
+      "name": "linenumbers",
+      "snippet": "[${1:number}]"
+    },
+    "linenumbers*": {},
+    "runninglinenumbers": {},
+    "runninglinenumbers[]": {
+      "name": "runninglinenumbers",
+      "snippet": "[${1:number}]"
+    },
+    "runninglinenumbers*": {},
+    "pagewiselinenumbers": {},
+    "linenomath": {},
+    "linenomath*": {},
+    "numquote": {},
+    "numquote*": {},
+    "numquotation": {},
+    "numquotation*": {},
+    "bframe": {},
+    "internallinenumbers": {},
+    "internallinenumbers*": {}
+  },
+  "options": [
+    "addpageno",
+    "mathrefs",
+    "edtable",
+    "longtable",
+    "nolongtablepatch",
+    "left",
+    "right",
+    "switch",
+    "switch*",
+    "columnwise",
+    "pagewise",
+    "running",
+    "modulo",
+    "modulo*",
+    "mathlines",
+    "sep=",
+    "width="
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lipsum.json b/dev/packages/lipsum.json
new file mode 100644
index 000000000..b2b362285
--- /dev/null
+++ b/dev/packages/lipsum.json
@@ -0,0 +1,171 @@
+{
+  "includes": {
+    "l3keys2e": []
+  },
+  "macros": {
+    "lipsum": {},
+    "lipsum[]": {
+      "snippet": "lipsum[${1:num-num}]"
+    },
+    "lipsum[][]": {
+      "snippet": "lipsum[${1:num-num}][${2:num-num}]"
+    },
+    "lipsum*": {},
+    "lipsum*[]": {
+      "snippet": "lipsum*[${1:num-num}]"
+    },
+    "lipsum*[][]": {
+      "snippet": "lipsum*[${1:num-num}][${2:num-num}]"
+    },
+    "unpacklipsum": {},
+    "unpacklipsum[]": {
+      "snippet": "unpacklipsum[${1:num}]"
+    },
+    "unpacklipsum*": {},
+    "unpacklipsum*[]": {
+      "snippet": "unpacklipsum*[${1:num}]"
+    },
+    "lipsumexp": {},
+    "setlipsum{}": {
+      "snippet": "setlipsum{${1:keyvals}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "SetLipsumText{}": {
+      "snippet": "SetLipsumText{${1:lipsum text definition filename}}"
+    },
+    "SetLipsumDefault{}": {
+      "snippet": "SetLipsumDefault{${1:num-num}}"
+    },
+    "LipsumPar{}": {
+      "snippet": "LipsumPar{${1:num}}"
+    },
+    "SetLipsumParListStart{}": {
+      "snippet": "SetLipsumParListStart{${1:tokens}}"
+    },
+    "SetLipsumParListStart*{}": {
+      "snippet": "SetLipsumParListStart*{${1:tokens}}"
+    },
+    "SetLipsumParListEnd{}": {
+      "snippet": "SetLipsumParListEnd{${1:tokens}}"
+    },
+    "SetLipsumParListEnd*{}": {
+      "snippet": "SetLipsumParListEnd*{${1:tokens}}"
+    },
+    "SetLipsumSentenceListStart{}": {
+      "snippet": "SetLipsumSentenceListStart{${1:tokens}}"
+    },
+    "SetLipsumSentenceListStart*{}": {
+      "snippet": "SetLipsumSentenceListStart*{${1:tokens}}"
+    },
+    "SetLipsumSentenceListEnd{}": {
+      "snippet": "SetLipsumSentenceListEnd{${1:tokens}}"
+    },
+    "SetLipsumSentenceListEnd*{}": {
+      "snippet": "SetLipsumSentenceListEnd*{${1:tokens}}"
+    },
+    "SetLipsumParListSurrounders{}{}": {
+      "snippet": "SetLipsumParListSurrounders{${1:start}}{${2:end}}"
+    },
+    "SetLipsumParListSurrounders*{}{}": {
+      "snippet": "SetLipsumParListSurrounders*{${1:start}}{${2:end}}"
+    },
+    "SetLipsumSentenceListSurrounders{}{}": {
+      "snippet": "SetLipsumSentenceListSurrounders{${1:start}}{${2:end}}"
+    },
+    "SetLipsumSentenceListSurrounders*{}{}": {
+      "snippet": "SetLipsumSentenceListSurrounders*{${1:start}}{${2:end}}"
+    },
+    "SetLipsumParListItemStart{}": {
+      "snippet": "SetLipsumParListItemStart{${1:tokens}}"
+    },
+    "SetLipsumParListItemStart*{}": {
+      "snippet": "SetLipsumParListItemStart*{${1:tokens}}"
+    },
+    "SetLipsumParListItemEnd{}": {
+      "snippet": "SetLipsumParListItemEnd{${1:tokens}}"
+    },
+    "SetLipsumParListItemEnd*{}": {
+      "snippet": "SetLipsumParListItemEnd*{${1:tokens}}"
+    },
+    "SetLipsumSentenceListItemStart{}": {
+      "snippet": "SetLipsumSentenceListItemStart{${1:tokens}}"
+    },
+    "SetLipsumSentenceListItemStart*{}": {
+      "snippet": "SetLipsumSentenceListItemStart*{${1:tokens}}"
+    },
+    "SetLipsumSentenceListItemEnd{}": {
+      "snippet": "SetLipsumSentenceListItemEnd{${1:tokens}}"
+    },
+    "SetLipsumSentenceListItemEnd*{}": {
+      "snippet": "SetLipsumSentenceListItemEnd*{${1:tokens}}"
+    },
+    "SetLipsumParListItemSurrounders{}{}": {
+      "snippet": "SetLipsumParListItemSurrounders{${1:start}}{${2:end}}"
+    },
+    "SetLipsumParListItemSurrounders*{}{}": {
+      "snippet": "SetLipsumParListItemSurrounders*{${1:start}}{${2:end}}"
+    },
+    "SetLipsumSentenceListItemSurrounders{}{}": {
+      "snippet": "SetLipsumSentenceListItemSurrounders{${1:start}}{${2:end}}"
+    },
+    "SetLipsumSentenceListItemSurrounders*{}{}": {
+      "snippet": "SetLipsumSentenceListItemSurrounders*{${1:start}}{${2:end}}"
+    },
+    "SetLipsumParListItemSeparator{}": {
+      "snippet": "SetLipsumParListItemSeparator{${1:tokens}}"
+    },
+    "SetLipsumParListItemSeparator*{}": {
+      "snippet": "SetLipsumParListItemSeparator*{${1:tokens}}"
+    },
+    "SetLipsumSentenceListItemSeparator{}": {
+      "snippet": "SetLipsumSentenceListItemSeparator{${1:tokens}}"
+    },
+    "SetLipsumSentenceListItemSeparator*{}": {
+      "snippet": "SetLipsumSentenceListItemSeparator*{${1:tokens}}"
+    },
+    "LipsumProtect{}": {
+      "snippet": "LipsumProtect{${1:tokens}}"
+    },
+    "LipsumRestoreParList": {},
+    "LipsumRestoreSentenceList": {},
+    "LipsumRestoreAll": {},
+    "NewLipsumPar{}": {
+      "snippet": "NewLipsumPar{${1:paragrph}}"
+    },
+    "SetLipsumLanguage{}": {
+      "snippet": "SetLipsumLanguage{${1:language}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "nopar",
+      "text=",
+      "language=${1:language}",
+      "auto-lang",
+      "default-range=${1:i-j}",
+      "par-before=${1:tokens}",
+      "par-begin=${1:tokens}",
+      "par-sep=${1:tokens}",
+      "par-end=${1:tokens}",
+      "par-after=${1:tokens}",
+      "sentence-before=${1:tokens}",
+      "sentence-begin=${1:tokens}",
+      "sentence-sep=${1:tokens}",
+      "sentence-end=${1:tokens}",
+      "sentence-after=${1:tokens}",
+      "par-before*=${1:tokens}",
+      "par-begin*=${1:tokens}",
+      "par-sep*=${1:tokens}",
+      "par-end*=${1:tokens}",
+      "par-after*=${1:tokens}",
+      "sentence-before*=${1:tokens}",
+      "sentence-begin*=${1:tokens}",
+      "sentence-sep*=${1:tokens}",
+      "sentence-end*=${1:tokens}",
+      "sentence-after*=${1:tokens}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/listing.json b/dev/packages/listing.json
new file mode 100644
index 000000000..4b07bc579
--- /dev/null
+++ b/dev/packages/listing.json
@@ -0,0 +1,19 @@
+{
+  "includes": {},
+  "macros": {
+    "listoflistings": {},
+    "listingname": {},
+    "listlistingname": {},
+    "thelisting": {},
+    "filename": {},
+    "fileversion": {},
+    "filedate": {}
+  },
+  "envs": {
+    "listing": {}
+  },
+  "options": [
+    "bigcaptions"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/listings.json b/dev/packages/listings.json
new file mode 100644
index 000000000..a41539139
--- /dev/null
+++ b/dev/packages/listings.json
@@ -0,0 +1,344 @@
+{
+  "includes": {
+    "keyval": []
+  },
+  "macros": {
+    "lstloadlanguages{}": {
+      "snippet": "lstloadlanguages{${1:lang1,${2:lang2},...}}"
+    },
+    "lstset{}": {
+      "snippet": "lstset{${1:keyvals}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "lstinline": {
+      "snippet": "lstinline|${1:code}|"
+    },
+    "lstinline[]": {
+      "snippet": "lstinline[${1:options}]|${2:code}|",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "lstinline[]{}": {
+      "snippet": "lstinline[${2:options}]{${1:verbatimSymbol}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "lstinputlisting{}": {
+      "snippet": "lstinputlisting{${1:file}}"
+    },
+    "lstinputlisting[]{}": {
+      "snippet": "lstinputlisting[${2:options}]{${1:file}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "lstdefinestyle{}{}": {
+      "snippet": "lstdefinestyle{${1:style name}}{${2:keyvals}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "thelstnumber": {},
+    "theHlstnumber": {},
+    "thelstlabel": {},
+    "lstlistoflistings": {},
+    "lstlistlistingname": {},
+    "lstlistingname": {},
+    "lstlistingnamestyle": {},
+    "thelstlisting": {},
+    "lstname": {},
+    "lstindexmacro{}": {
+      "snippet": "lstindexmacro{${1:arg}}"
+    },
+    "lstnewenvironment{}[][]{}{}": {
+      "snippet": "lstnewenvironment{${1:envname}}[${2:args}][${3:default}]{${4:begdef}}{${5:enddef}}"
+    },
+    "lstnewenvironment{}[]{}{}": {
+      "snippet": "lstnewenvironment{${1:envname}}[${2:args}]{${3:begdef}}{${4:enddef}}"
+    },
+    "lstnewenvironment{}{}{}": {
+      "snippet": "lstnewenvironment{${1:envname}}{${2:begdef}}{${3:enddef}}"
+    },
+    "lstdefinelanguage{}{}": {
+      "snippet": "lstdefinelanguage{${1:language name}}{${2:keyvals}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "lstdefinelanguage{}{}[]": {
+      "snippet": "lstdefinelanguage{${1:language name}}{${2:keyvals}}[${3:required aspects}]",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "lstdefinelanguage[]{}{}": {
+      "snippet": "lstdefinelanguage[${3:dialect}]{${1:language name}}{${2:keyvals}}",
+      "keyvalindex": 1,
+      "keyvalpos": 2
+    },
+    "lstdefinelanguage[]{}{}[]": {
+      "snippet": "lstdefinelanguage[${3:dialect}]{${1:language name}}{${2:keyvals}}[${4:required aspects}]",
+      "keyvalindex": 1,
+      "keyvalpos": 2
+    },
+    "lstdefinelanguage[]{}[]{}{}[]": {
+      "snippet": "lstdefinelanguage[${4:dialect}]{${1:language name}}[${5:base dialect}]{${2:base language}}{${3:keyvals}}[${6:required aspects}]",
+      "keyvalindex": 1,
+      "keyvalpos": 4
+    },
+    "lstalias{}{}": {
+      "snippet": "lstalias{${1:alias}}{${2:language}}"
+    },
+    "lstaspectfiles": {},
+    "lstlanguagefiles": {},
+    "lstloadaspects{}": {
+      "snippet": "lstloadaspects{${1:aspects}}"
+    },
+    "lststylefiles": {},
+    "theHlstlisting": {},
+    "lstlgrindeffile": {
+      "option": "lgrind"
+    },
+    "lstdefineformat{}{}": {
+      "snippet": "lstdefineformat{${1:name}}{${2:format}}",
+      "option": "formats"
+    },
+    "lstformatfiles": {
+      "option": "formats"
+    }
+  },
+  "envs": {
+    "lstlisting": {},
+    "lstlisting[]": {
+      "name": "lstlisting",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [
+    "draft",
+    "final",
+    "savemem",
+    "noaspects",
+    "lgrind",
+    "procnames",
+    "hyper",
+    "formats",
+    "0.21"
+  ],
+  "keyvals": [
+    [
+      "inputpath=${1:path}",
+      "aboveskip=",
+      "belowskip=",
+      "lineskip=",
+      "boxpos=",
+      "print",
+      "showlines",
+      "emptylines=${1:number}",
+      "emptylines=*${1:number}",
+      "gobble=${1:number}",
+      "style=${1:style name}",
+      "language=${1:language}",
+      "language=[${1:dialect}]${2:language}",
+      "alsolanguage=${1:language}",
+      "alsolanguage=[${1:dialect}]${2:language}",
+      "defaultdialect=[${1:dialect}]${2:language}",
+      "printpod",
+      "usekeywordsintag",
+      "tagstyle=${1:style}",
+      "markfirstintag=${1:style}",
+      "makemacrouse",
+      "basicstyle=${1:style}",
+      "identifierstyle=${1:style}",
+      "commentstyle=${1:style}",
+      "stringstyle=${1:style}",
+      "keywordstyle=${1:style}",
+      "keywordstyle=*${1:style}",
+      "keywordstyle=[${1:number}]${2:style}",
+      "keywordstyle=[${1:number}]*${2:style}",
+      "ndkeywordstyle=${1:style}",
+      "classoffset=${1:number}",
+      "texcsstyle=${1:style}",
+      "texcsstyle=*${1:style}",
+      "texcsstyle=[${1:class number}]${2:style}",
+      "texcsstyle=*[${1:class number}]${2:style}",
+      "directivestyle=${1:style}",
+      "emph={${1:identifier list}}",
+      "emph=[${1:number}]{${2:identifier list}}",
+      "moreemph={${1:identifier list}}",
+      "moreemph=[${1:number}]{${2:identifier list}}",
+      "deleteemph={${1:identifier list}}",
+      "deleteemph=[${1:number}]{${2:identifier list}}",
+      "emphstyle={${1:style}}",
+      "emphstyle=[${1:number}]{${2:style}}",
+      "delim=[${1:type}][${2:style}]${3:delimiters}",
+      "delim=*[${1:type}][${2:style}]${3:delimiters}",
+      "delim=**[${1:type}][${2:style}]${3:delimiters}",
+      "moredelim=[${1:type}][${2:style}]${3:delimiters}",
+      "moredelim=*[${1:type}][${2:style}]${3:delimiters}",
+      "moredelim=**[${1:type}][${2:style}]${3:delimiters}",
+      "deletedelim=[${1:type}][${2:style}]${3:delimiters}",
+      "deletedelim=*[${1:type}][${2:style}]${3:delimiters}",
+      "deletedelim=**[${1:type}][${2:style}]${3:delimiters}",
+      "extendedchars",
+      "inputencoding=${1:encoding}",
+      "upquote",
+      "tabsize=${1:number}",
+      "showtabs",
+      "tab=${1:tokens}",
+      "showspaces",
+      "showstringspaces",
+      "formfeed=${1:tokens}",
+      "numbers=",
+      "stepnumber=${1:number}",
+      "numberfirstline",
+      "numberstyle=${1:style}",
+      "numbersep=",
+      "numberblanklines",
+      "firstnumber=${1:auto|last|<number>}",
+      "name=${1:name}",
+      "title=${1:title text}",
+      "caption={${1:caption text}}",
+      "caption={[${1:short}]${2:caption text}}",
+      "label=",
+      "nolol",
+      "numberbychapter",
+      "captionpos=${1:subset of tb}",
+      "abovecaptionskip=",
+      "belowcaptionskip=",
+      "linewidth=",
+      "xleftmargin=",
+      "xrightmargin=",
+      "resetmargins",
+      "breaklines",
+      "breakatwhitespace",
+      "prebreak=${1:tokens}",
+      "postbreak=${1:tokens}",
+      "breakindent=",
+      "breakautoindent",
+      "frame=${1:type}",
+      "frameround=",
+      "framesep=",
+      "rulesep=",
+      "framerule=",
+      "framexleftmargin=",
+      "framexrightmargin=",
+      "framextopmargin=",
+      "framexbottommargin=",
+      "backgroundcolor=",
+      "rulecolor=",
+      "fillcolor=",
+      "rulesepcolor=",
+      "frameshape={${1:top shape}}{${2:left shape}}{${3:right shape}}{${4:bottom shape}}",
+      "index={${1:identifiers}}",
+      "index=[${1:number}]{${2:identifiers}}",
+      "index=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
+      "moreindex={${1:identifiers}}",
+      "moreindex=[${1:number}]{${2:identifiers}}",
+      "moreindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
+      "deleteindex={${1:identifiers}}",
+      "deleteindex=[${1:number}]{${2:identifiers}}",
+      "deleteindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
+      "indexstyle=${1:one-parameter macro}",
+      "indexstyle=[${1:number}]${2:one-parameter macro}",
+      "columns=${1:alignment}",
+      "columns=[${1:c|l|r}]${2:alignment}",
+      "flexiblecolumns",
+      "keepspaces",
+      "basewidth=",
+      "fontadjust",
+      "texcl",
+      "mathescape",
+      "escapechar=${1:character}",
+      "escapeinside=${1:<char1><char2>}",
+      "escapebegin=${1:tokens}",
+      "escapeend=${1:tokens}",
+      "fancyvrb",
+      "fvcmdparams=${1:<cmd1> <num1> ...}",
+      "morefvcmdparams=${1:<cmd1> <num1> ...}",
+      "literate={${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
+      "literate=*{${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
+      "rangebeginprefix=${1:prefix}",
+      "rangebeginsuffix=${1:suffix}",
+      "rangeendprefix=${1:prefix}",
+      "rangeendsuffix=${1:suffix}",
+      "rangeprefix=${1:prefix}",
+      "rangesuffix=${1:suffix}",
+      "includerangemarker",
+      "multicols=${1:number}",
+      "float",
+      "float=${1:subset of tbph}",
+      "float=*${1:subset of tbph}",
+      "floatplacement=${1:place specifiers}",
+      "firstline=${1:number}",
+      "lastline=${1:number}",
+      "linerange={${1:first1-last1,first2-last2,...}}",
+      "consecutivenumbers",
+      "keywordsprefix=${1:prefix}",
+      "keywords={${1:list of keywords}}",
+      "keywords=[${1:number}]{${2:list of keywords}}",
+      "morekeywords={${1:list of keywords}}",
+      "morekeywords=[${1:number}]{${2:list of keywords}}",
+      "deletekeywords={${1:list of keywords}}",
+      "deletekeywords=[${1:number}]{${2:list of keywords}}",
+      "ndkeywords={${1:list of keywords}}",
+      "moreendkeywords={${1:list of keywords}}",
+      "deleteendkeywords={${1:list of keywords}}",
+      "texcs={${1:list of csnames}}",
+      "texcs=[${1:class number}]{${2:list of csnames}}",
+      "moretexcs={${1:list of csnames}}",
+      "moretexcs=[${1:class number}]{${2:list of csnames}}",
+      "deletetexcs={${1:list of csnames}}",
+      "deletetexcs=[${1:class number}]{${2:list of csnames}}",
+      "directives={${1:list of compiler directives}}",
+      "moredirectives={${1:list of compiler directives}}",
+      "deletedirectives={${1:list of compiler directives}}",
+      "sensitive",
+      "alsoletter={${1:character sequence}}",
+      "alsodigit={${1:character sequence}}",
+      "alsoother={${1:character sequence}}",
+      "otherkeywords={${1:keywords}}",
+      "tag=${1:<char1><char2>}",
+      "string=${1:delimiter}",
+      "string=[${1:b|d|m|bd|s}]${2:delimiter}",
+      "morestring=${1:delimiter}",
+      "morestring=[${1:b|d|m|bd|s}]${2:delimiter}",
+      "deletestring=${1:delimiter}",
+      "deletestring=[${1:b|d|m|bd|s}]${2:delimiter}",
+      "comment=${1:delimiter(s)}",
+      "comment=[${1:type}]${2:delimiter(s)}",
+      "morecomment=${1:delimiter(s)}",
+      "morecomment=[${1:type}]${2:delimiter(s)}",
+      "deletecomment=${1:delimiter(s)}",
+      "deletecomment=[${1:type}]${2:delimiter(s)}",
+      "keywordcomment={${1:keywords}}",
+      "morekeywordcomment={${1:keywords}}",
+      "deletekeywordcomment={${1:keywords}}",
+      "keywordcommentsemicolon={${1:keywords}}{${2:keywords}}{${3:keywords}}",
+      "podcomment",
+      "procnamekeys={${1:keywords}}",
+      "moreprocnamekeys={${1:keywords}}",
+      "deleteprocnamekeys={${1:keywords}}",
+      "procnamestyle=${1:style}",
+      "indexprocnames",
+      "hyperref={${1:identifiers}}",
+      "morehyperref={${1:identifiers}}",
+      "deletehyperref={${1:identifiers}}",
+      "hyperanchor=${1:two-parameter macro}",
+      "hyperlink=${1:two-parameter macro}",
+      "lgrindef=${1:language}"
+    ],
+    [
+      "procnamekeys={${1:keywords}}",
+      "moreprocnamekeys={${1:keywords}}",
+      "deleteprocnamekeys={${1:keywords}}",
+      "procnamestyle=${1:style}",
+      "indexprocnames",
+      "hyperref={${1:identifiers}}",
+      "morehyperref={${1:identifiers}}",
+      "deletehyperref={${1:identifiers}}",
+      "hyperanchor=${1:two-parameter macro}",
+      "hyperlink=${1:two-parameter macro}",
+      "lgrindef=${1:language}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/listingsutf8.json b/dev/packages/listingsutf8.json
new file mode 100644
index 000000000..2b4d4ce94
--- /dev/null
+++ b/dev/packages/listingsutf8.json
@@ -0,0 +1,30 @@
+{
+  "includes": {
+    "listings": [],
+    "inputenc": [],
+    "pdftexcmds": [],
+    "stringenc": []
+  },
+  "macros": {
+    "lstlgrindeffile": {
+      "option": "lgrind"
+    },
+    "lstdefineformat{}{}": {
+      "snippet": "lstdefineformat{${1:name}}{${2:format}}",
+      "option": "formats"
+    }
+  },
+  "envs": {},
+  "options": [
+    "draft",
+    "final",
+    "savemem",
+    "noaspects",
+    "lgrind",
+    "procnames",
+    "hyper",
+    "formats",
+    "0.21"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lltjext.json b/dev/packages/lltjext.json
index 92c203673..9df86a778 100644
--- a/dev/packages/lltjext.json
+++ b/dev/packages/lltjext.json
@@ -46,6 +46,15 @@
     "layoutfloat[]{}": {
       "snippet": "layoutfloat[${2:pos}]{${1:content}}"
     },
+    "layoutfloat(){}": {
+      "snippet": "layoutfloat(${2:x},${3:y}){${1:content}}"
+    },
+    "layoutfloat()[]{}": {
+      "snippet": "layoutfloat(${3:x},${4:y})[${2:pos}]{${1:content}}"
+    },
+    "DeclareLayoutCaption{}<>()[]": {
+      "snippet": "DeclareLayoutCaption{${1:floatname}}<${3:dir}>(${4:width})[${2:pos1pos2}]"
+    },
     "layoutcaption": {},
     "pcaption{}": {
       "snippet": "pcaption{${1:caption}}"
@@ -121,6 +130,14 @@
     "minipage<>[][][]{}": {
       "name": "minipage",
       "snippet": "<${5:dir}>[${2:position}][${3:height}][${4:inner pos}]{${1:width}}"
+    },
+    "picture<>(width,height)": {
+      "name": "picture",
+      "snippet": "<${1:dir}>(${2:width},${3:height})"
+    },
+    "picture<>(width,height)(xoffset,yoffset)": {
+      "name": "picture",
+      "snippet": "<${1:dir}>(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
     }
   },
   "options": [],
diff --git a/dev/packages/lmodern.json b/dev/packages/lmodern.json
new file mode 100644
index 000000000..0dcc79111
--- /dev/null
+++ b/dev/packages/lmodern.json
@@ -0,0 +1,11 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {},
+  "options": [
+    "nomath",
+    "variablett",
+    "lighttt"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/logicpuzzle.json b/dev/packages/logicpuzzle.json
index 0b295ad85..1f2cfdeec 100644
--- a/dev/packages/logicpuzzle.json
+++ b/dev/packages/logicpuzzle.json
@@ -20,7 +20,7 @@
       "snippet": "setcell{${1:column}}{${2:row}}{${3:element}}"
     },
     "setcells{}{}": {
-      "snippet": "setcells{${1:col1/row1,col2/row2,...}}{${2:element}}"
+      "snippet": "setcells{${1:col1/row1,${3:col2/row2},...}}{${2:element}}"
     },
     "setbigcell{}{}{}": {
       "snippet": "setbigcell{${1:column}}{${2:row}}{${3:element}}"
@@ -73,7 +73,7 @@
       "snippet": "tikzpath{${1:column}}{${2:row}}{${3:direction list}}"
     },
     "xtikzpath{}{}{}": {
-      "snippet": "xtikzpath{${1:column}}{${2:row}}{${3:dir1/len1,dir2/len2,...}}"
+      "snippet": "xtikzpath{${1:column}}{${2:row}}{${3:dir1/len1,${4:dir2/len2},...}}"
     },
     "titleformat{}": {
       "snippet": "titleformat{${1:format}}"
@@ -298,16 +298,16 @@
       "snippet": "magnetsV{${1:number list}}"
     },
     "PMH{}": {
-      "snippet": "PMH{${1:col1/row1,col2/row2,...}}"
+      "snippet": "PMH{${1:col1/row1,${2:col2/row2},...}}"
     },
     "MPH{}": {
-      "snippet": "MPH{${1:col1/row1,col2/row2,...}}"
+      "snippet": "MPH{${1:col1/row1,${2:col2/row2},...}}"
     },
     "PMV{}": {
-      "snippet": "PMV{${1:col1/row1,col2/row2,...}}"
+      "snippet": "PMV{${1:col1/row1,${2:col2/row2},...}}"
     },
     "MPV{}": {
-      "snippet": "MPV{${1:col1/row1,col2/row2,...}}"
+      "snippet": "MPV{${1:col1/row1,${2:col2/row2},...}}"
     },
     "magnetssetup{}": {
       "snippet": "magnetssetup{${1:options}}",
@@ -334,10 +334,10 @@
       "keyvalpos": 0
     },
     "nonogramrow{}{}": {
-      "snippet": "nonogramrow{${1:row}}{${2:col1/len1,col2/len2,...}}"
+      "snippet": "nonogramrow{${1:row}}{${2:col1/len1,${3:col2/len2},...}}"
     },
     "nonogramcolumn{}{}": {
-      "snippet": "nonogramcolumn{${1:column}}{${2:row1/len1,row2/len2,...}}"
+      "snippet": "nonogramcolumn{${1:column}}{${2:row1/len1,${3:row2/len2},...}}"
     },
     "nonogramV{}": {
       "snippet": "nonogramV{${1:csv list}}"
diff --git a/dev/packages/logpap.json b/dev/packages/logpap.json
index 18441b4c4..9d97971f1 100644
--- a/dev/packages/logpap.json
+++ b/dev/packages/logpap.json
@@ -9,6 +9,42 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "loglinpap()(){}{}": {
+      "snippet": "loglinpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
+    },
+    "loglinpap()(){}{}[]": {
+      "snippet": "loglinpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
+    },
+    "loglinpap()(){}{}[][]": {
+      "snippet": "loglinpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
+    },
+    "linlogpap()(){}{}": {
+      "snippet": "linlogpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
+    },
+    "linlogpap()(){}{}[]": {
+      "snippet": "linlogpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
+    },
+    "linlogpap()(){}{}[][]": {
+      "snippet": "linlogpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
+    },
+    "loglogpap()(){}{}": {
+      "snippet": "loglogpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
+    },
+    "loglogpap()(){}{}[]": {
+      "snippet": "loglogpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
+    },
+    "loglogpap()(){}{}[][]": {
+      "snippet": "loglogpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
+    },
+    "linlinpap()(){}{}": {
+      "snippet": "linlinpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
+    },
+    "linlinpap()(){}{}[]": {
+      "snippet": "linlinpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
+    },
+    "linlinpap()(){}{}[][]": {
+      "snippet": "linlinpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
+    },
     "DefineLPLabelColor{}": {
       "snippet": "DefineLPLabelColor{${1:color command}}"
     },
diff --git a/dev/packages/logsys.json b/dev/packages/logsys.json
index e109b42f8..c82c7867b 100644
--- a/dev/packages/logsys.json
+++ b/dev/packages/logsys.json
@@ -27,6 +27,114 @@
     "vlogline*[]{}{}": {
       "snippet": "vlogline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
+    "logsys()()": {
+      "snippet": "logsys(${1:lower-left})(${2:upper-right})"
+    },
+    "logsys[]()()": {
+      "snippet": "logsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logsys[][]()()": {
+      "snippet": "logsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "logsys*()()": {
+      "snippet": "logsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "logsys*[]()()": {
+      "snippet": "logsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logsys*[][]()()": {
+      "snippet": "logsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semilogsys()()": {
+      "snippet": "semilogsys(${1:lower-left})(${2:upper-right})"
+    },
+    "semilogsys[]()()": {
+      "snippet": "semilogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semilogsys[][]()()": {
+      "snippet": "semilogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semilogsys*()()": {
+      "snippet": "semilogsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "semilogsys*[]()()": {
+      "snippet": "semilogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semilogsys*[][]()()": {
+      "snippet": "semilogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loglogsys()()": {
+      "snippet": "loglogsys(${1:lower-left})(${2:upper-right})"
+    },
+    "loglogsys[]()()": {
+      "snippet": "loglogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loglogsys[][]()()": {
+      "snippet": "loglogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loglogsys*()()": {
+      "snippet": "loglogsys*(${1:lower-left})(${2:upper-right})"
+    },
+    "loglogsys*[]()()": {
+      "snippet": "loglogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loglogsys*[][]()()": {
+      "snippet": "loglogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loggrid()()": {
+      "snippet": "loggrid(${1:lower-left})(${2:upper-right})"
+    },
+    "loggrid[]()()": {
+      "snippet": "loggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loggrid[][]()()": {
+      "snippet": "loggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "loggrid*()()": {
+      "snippet": "loggrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "loggrid*[]()()": {
+      "snippet": "loggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "loggrid*[][]()()": {
+      "snippet": "loggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semiloggrid()()": {
+      "snippet": "semiloggrid(${1:lower-left})(${2:upper-right})"
+    },
+    "semiloggrid[]()()": {
+      "snippet": "semiloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semiloggrid[][]()()": {
+      "snippet": "semiloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "semiloggrid*()()": {
+      "snippet": "semiloggrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "semiloggrid*[]()()": {
+      "snippet": "semiloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "semiloggrid*[][]()()": {
+      "snippet": "semiloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "logloggrid()()": {
+      "snippet": "logloggrid(${1:lower-left})(${2:upper-right})"
+    },
+    "logloggrid[]()()": {
+      "snippet": "logloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logloggrid[][]()()": {
+      "snippet": "logloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
+    "logloggrid*()()": {
+      "snippet": "logloggrid*(${1:lower-left})(${2:upper-right})"
+    },
+    "logloggrid*[]()()": {
+      "snippet": "logloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
+    },
+    "logloggrid*[][]()()": {
+      "snippet": "logloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
+    },
     "interval": {},
     "intervalthickness{}": {
       "snippet": "intervalthickness{${1:width}}"
diff --git a/dev/packages/longtable.json b/dev/packages/longtable.json
new file mode 100644
index 000000000..8a7b4f73b
--- /dev/null
+++ b/dev/packages/longtable.json
@@ -0,0 +1,38 @@
+{
+  "includes": {},
+  "macros": {
+    "caption*{}": {
+      "snippet": "caption*{${1:text}}"
+    },
+    "endfirstfoot": {},
+    "endlastfoot": {},
+    "endfirsthead": {},
+    "endfoot": {},
+    "endhead": {},
+    "LTchunksize": {},
+    "LTcapwidth": {},
+    "LTleft": {},
+    "LTpost": {},
+    "LTpre": {},
+    "LTright": {},
+    "setlongtables": {},
+    "tabularnewline": {}
+  },
+  "envs": {
+    "longtable[]{}": {
+      "name": "longtable",
+      "snippet": "[${2:alignment}]{${1:preamble}}"
+    },
+    "longtable{}": {
+      "name": "longtable",
+      "snippet": "{${1:preamble}}"
+    }
+  },
+  "options": [
+    "errorshow",
+    "pausing",
+    "set",
+    "final"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lpic.json b/dev/packages/lpic.json
index 26e782f9a..02429d811 100644
--- a/dev/packages/lpic.json
+++ b/dev/packages/lpic.json
@@ -29,11 +29,11 @@
   "envs": {
     "lpic{}": {
       "name": "lpic",
-      "snippet": "{${1:filename(${2:x,y})}}"
+      "snippet": "{${1:filename(${2:x},${3:y})}}"
     },
     "lpic[]{}": {
       "name": "lpic",
-      "snippet": "[${2:options}]{${1:filename(${3:x,y})}}",
+      "snippet": "[${2:options}]{${1:filename(${3:x},${4:y})}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     }
diff --git a/dev/packages/lscape.json b/dev/packages/lscape.json
new file mode 100644
index 000000000..a9ac7f6b3
--- /dev/null
+++ b/dev/packages/lscape.json
@@ -0,0 +1,13 @@
+{
+  "includes": {
+    "graphics": []
+  },
+  "macros": {},
+  "envs": {
+    "landscape": {}
+  },
+  "options": [
+    "pdftex"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lstdoc.json b/dev/packages/lstdoc.json
index c08bcb48d..295d6f393 100644
--- a/dev/packages/lstdoc.json
+++ b/dev/packages/lstdoc.json
@@ -34,7 +34,7 @@
     "syntaxbreak": {},
     "syntaxfill": {},
     "alternative{}": {
-      "snippet": "alternative{${1:item1,item2,...}}"
+      "snippet": "alternative{${1:item1,${2:item2},...}}"
     },
     "newdocenvironment{}{}{}{}": {
       "snippet": "newdocenvironment{${1:envname}}{${2:typename}}{${3:begdef}}{${4:enddef}}"
diff --git a/dev/packages/ltugcomn.json b/dev/packages/ltugcomn.json
index 9e0ee4c13..9320b5728 100644
--- a/dev/packages/ltugcomn.json
+++ b/dev/packages/ltugcomn.json
@@ -349,6 +349,9 @@
     "tubhideheight{}": {
       "snippet": "tubhideheight{${1:height}}"
     },
+    "tubissue{}()": {
+      "snippet": "tubissue{${1:volume}}(${2:issue})"
+    },
     "tubjustifiedpar": {},
     "tubline{}": {
       "snippet": "tubline{${1:text}}"
diff --git a/dev/packages/ltxdockit.json b/dev/packages/ltxdockit.json
new file mode 100644
index 000000000..214b97068
--- /dev/null
+++ b/dev/packages/ltxdockit.json
@@ -0,0 +1,348 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "listings": [],
+    "color": [],
+    "xspace": [],
+    "ifpdf": [],
+    "hyperref": []
+  },
+  "macros": {
+    "marglistwidth": {},
+    "marglistsep": {},
+    "marglistfont": {},
+    "margnotefont": {},
+    "optionlistfont": {},
+    "ltxsyntaxfont": {},
+    "ltxsyntaxlabelfont": {},
+    "changelogfont": {},
+    "changeloglabelfont": {},
+    "verbatimfont": {},
+    "displayverbfont": {},
+    "defaultcolor": {},
+    "spotcolor": {},
+    "cs{}": {
+      "snippet": "cs{${1:csname}}"
+    },
+    "cmd{}": {
+      "snippet": "cmd{${1:csname}}"
+    },
+    "env{}": {
+      "snippet": "env{${1:envname}}"
+    },
+    "len{}": {
+      "snippet": "len{${1:length}}"
+    },
+    "cnt{}": {
+      "snippet": "cnt{${1:counter}}"
+    },
+    "prm{}": {
+      "snippet": "prm{${1:arg}}"
+    },
+    "mprm{}": {
+      "snippet": "mprm{${1:arg}}"
+    },
+    "oprm{}": {
+      "snippet": "oprm{${1:arg}}"
+    },
+    "opt{}": {
+      "snippet": "opt{${1:arg}}"
+    },
+    "kvopt{}{}": {
+      "snippet": "kvopt{${1:key}}{${2:value}}"
+    },
+    "file{}": {
+      "snippet": "file{${1:filename}}"
+    },
+    "sty{}": {
+      "snippet": "sty{${1:arg}}"
+    },
+    "bin{}": {
+      "snippet": "bin{${1:arg}}"
+    },
+    "acr{}": {
+      "snippet": "acr{${1:arg}}"
+    },
+    "keyval": {},
+    "refs{}{}{}": {
+      "snippet": "refs{${1:sing name}}{${2:plural name}}{${3:label}}"
+    },
+    "secref{}": {
+      "snippet": "secref{${1:label}}"
+    },
+    "Secref{}": {
+      "snippet": "Secref{${1:label}}"
+    },
+    "apxref{}": {
+      "snippet": "apxref{${1:label}}"
+    },
+    "Apxref{}": {
+      "snippet": "Apxref{${1:label}}"
+    },
+    "tabref{}": {
+      "snippet": "tabref{${1:label}}"
+    },
+    "Tabref{}": {
+      "snippet": "Tabref{${1:label}}"
+    },
+    "csitem{}": {
+      "snippet": "csitem{${1:csname}}"
+    },
+    "cmditem{}": {
+      "snippet": "cmditem{${1:csname}}"
+    },
+    "cmditem{}[]": {
+      "snippet": "cmditem{${1:csname}}[${2:options}]"
+    },
+    "cmditem{}[]{}": {
+      "snippet": "cmditem{${1:csname}}[${2:options}]{${3:arg}}"
+    },
+    "envitem{}": {
+      "snippet": "envitem{${1:envname}}"
+    },
+    "lenitem{}": {
+      "snippet": "lenitem{${1:length}}"
+    },
+    "boolitem{}": {
+      "snippet": "boolitem{${1:key}}"
+    },
+    "boolitem[]{}": {
+      "snippet": "boolitem[${2:true or false}]{${1:key}}"
+    },
+    "cntitem{}": {
+      "snippet": "cntitem{${1:counter}}"
+    },
+    "optitem{}": {
+      "snippet": "optitem{${1:option}}"
+    },
+    "varitem{}": {
+      "snippet": "varitem{${1:variable}}"
+    },
+    "valitem{}": {
+      "snippet": "valitem{${1:value}}"
+    },
+    "choitem{}{}": {
+      "snippet": "choitem{${1:key}}{${2:values}}"
+    },
+    "choitem[]{}{}": {
+      "snippet": "choitem[${3:opt}]{${1:key}}{${2:values}}"
+    },
+    "intitem{}": {
+      "snippet": "intitem{${1:key}}"
+    },
+    "intitem[]{}": {
+      "snippet": "intitem[${2:integer}]{${1:key}}"
+    },
+    "legitem{}": {
+      "snippet": "legitem{${1:arg}}"
+    },
+    "see{}": {
+      "snippet": "see{${1:label}}"
+    },
+    "lstenvsep": {}
+  },
+  "envs": {
+    "marglist": {},
+    "keymarglist": {},
+    "ltxsyntax": {},
+    "optionlist": {},
+    "optionlist*": {},
+    "valuelist": {},
+    "valuelist[]": {
+      "name": "valuelist",
+      "snippet": "[${1:opt}]"
+    },
+    "valuelist*": {},
+    "argumentlist{}": {
+      "name": "argumentlist",
+      "snippet": "{${1:arg}}"
+    },
+    "changelog": {},
+    "release{}{}": {
+      "name": "release",
+      "snippet": "{${1:version}}{${2:date}}"
+    },
+    "ltxcode": {},
+    "ltxcode[]": {
+      "name": "ltxcode",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ltxexample": {},
+    "ltxexample[]": {
+      "name": "ltxexample",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "inputpath=${1:path}",
+      "aboveskip=",
+      "belowskip=",
+      "lineskip=",
+      "boxpos=",
+      "print",
+      "showlines",
+      "emptylines=${1:number}",
+      "emptylines=*${1:number}",
+      "gobble=${1:number}",
+      "style=${1:style name}",
+      "language=${1:language}",
+      "language=[${1:dialect}]${2:language}",
+      "alsolanguage=${1:language}",
+      "alsolanguage=[${1:dialect}]${2:language}",
+      "defaultdialect=[${1:dialect}]${2:language}",
+      "printpod",
+      "usekeywordsintag",
+      "tagstyle=${1:style}",
+      "markfirstintag=${1:style}",
+      "makemacrouse",
+      "basicstyle=${1:style}",
+      "identifierstyle=${1:style}",
+      "commentstyle=${1:style}",
+      "stringstyle=${1:style}",
+      "keywordstyle=${1:style}",
+      "keywordstyle=[${1:number}]${2:style}",
+      "keywordstyle=[${1:number}]*${2:style}",
+      "ndkeywordstyle=${1:style}",
+      "classoffset=${1:number}",
+      "texcsstyle=${1:style}",
+      "texcsstyle=[${1:class number}]${2:style}",
+      "texcsstyle=*[${1:class number}]${2:style}",
+      "directivestyle=${1:style}",
+      "emph={${1:identifier list}}",
+      "emph=[${1:number}]{${2:identifier list}}",
+      "moreemph={${1:identifier list}}",
+      "moreemph=[${1:number}]{${2:identifier list}}",
+      "deleteemph={${1:identifier list}}",
+      "deleteemph=[${1:number}]{${2:identifier list}}",
+      "emphstyle={${1:style}}",
+      "emphstyle=[${1:number}]{${2:style}}",
+      "delim=",
+      "moredelim=",
+      "deletedelim=",
+      "extendedchars",
+      "inputencoding=${1:encoding}",
+      "upquote",
+      "tabsize=${1:number}",
+      "showtabs",
+      "tab=${1:tokens}",
+      "showspaces",
+      "showstringspaces",
+      "formfeed=${1:tokens}",
+      "numbers=",
+      "stepnumber=${1:number}",
+      "numberfirstline",
+      "numberstyle=${1:style}",
+      "numbersep=",
+      "numberblanklines",
+      "firstnumber=",
+      "name=${1:name}",
+      "title=${1:title text}",
+      "caption={${1:caption text}}",
+      "caption={[${1:short}]${2:caption text}}",
+      "label=",
+      "nolol",
+      "numberbychapter",
+      "captionpos=${1:subset of tb}",
+      "abovecaptionskip=",
+      "belowcaptionskip=",
+      "linewidth=",
+      "xleftmargin=",
+      "xrightmargin=",
+      "resetmargins",
+      "breaklines",
+      "breakatwhitespace",
+      "prebreak=${1:tokens}",
+      "postbreak=${1:tokens}",
+      "breakindent=",
+      "breakautoindent",
+      "frame=",
+      "frameround=",
+      "framesep=",
+      "rulesep=",
+      "framerule=",
+      "framexleftmargin=",
+      "framexrightmargin=",
+      "framextopmargin=",
+      "framexbottommargin=",
+      "backgroundcolor=",
+      "rulecolor=",
+      "fillcolor=",
+      "rulesepcolor=",
+      "frameshape={${1:top shape}}{${2:left shape}}{${3:right shape}}{${4:bottom shape}}",
+      "index=",
+      "moreindex=",
+      "deleteindex=",
+      "indexstyle=",
+      "columns=",
+      "flexiblecolumns",
+      "keepspaces",
+      "basewidth=",
+      "fontadjust",
+      "texcl",
+      "mathescape",
+      "escapechar=${1:character}",
+      "escapeinside=",
+      "escapebegin=${1:tokens}",
+      "escapeend=${1:tokens}",
+      "fancyvrb",
+      "fvcmdparams=",
+      "morefvcmdparams=",
+      "literate=",
+      "rangebeginprefix=",
+      "rangebeginsuffix=",
+      "rangeendprefix=",
+      "rangeendsuffix=",
+      "rangeprefix=",
+      "rangesuffix=",
+      "includerangemarker",
+      "multicols=${1:number}",
+      "float",
+      "float=${1:subset of tbph}",
+      "float=*${1:subset of tbph}",
+      "floatplacement=",
+      "firstline=${1:number}",
+      "lastline=${1:number}",
+      "linerange={${1:first1-last1,first2-last2,...}}",
+      "consecutivenumbers",
+      "keywordsprefix=${1:prefix}",
+      "keywords={${1:list of keywords}}",
+      "keywords=[${1:number}]{${2:list of keywords}}",
+      "morekeywords={${1:list of keywords}}",
+      "morekeywords=[${1:number}]{${2:list of keywords}}",
+      "deletekeywords={${1:list of keywords}}",
+      "deletekeywords=[${1:number}]{${2:list of keywords}}",
+      "ndkeywords={${1:list of keywords}}",
+      "moreendkeywords={${1:list of keywords}}",
+      "deleteendkeywords={${1:list of keywords}}",
+      "texcs=",
+      "moretexcs=",
+      "deletetxcs=",
+      "directives=",
+      "moredirectives=",
+      "deletedirectives=",
+      "sensitive",
+      "alsoletter={${1:character sequence}}",
+      "alsodigit={${1:character sequence}}",
+      "alsoother={${1:character sequence}}",
+      "otherkeywords={${1:keywords}}",
+      "tag=",
+      "string=",
+      "morestring=",
+      "deletestring=",
+      "comment=",
+      "morecomment=",
+      "deletecomment=",
+      "keywordcomment={${1:keywords}}",
+      "morekeywordcomment={${1:keywords}}",
+      "deletekeywordcomment={${1:keywords}}",
+      "keywordcommentsemicolon={${1:keywords}}{${2:keywords}}{${3:keywords}}",
+      "podcomment"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/luagcd.json b/dev/packages/luagcd.json
index 9dce667cc..efe7a1a63 100644
--- a/dev/packages/luagcd.json
+++ b/dev/packages/luagcd.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "luagcd{}": {
-      "snippet": "luagcd{${1:int1,int2,...}}"
+      "snippet": "luagcd{${1:int1,${2:int2},...}}"
     },
     "luagcdwithsteps{}{}": {
       "snippet": "luagcdwithsteps{${1:int1}}{${2:int2}}"
diff --git a/dev/packages/luahttp.json b/dev/packages/luahttp.json
index cf5ea736b..79ecafed8 100644
--- a/dev/packages/luahttp.json
+++ b/dev/packages/luahttp.json
@@ -9,16 +9,16 @@
       "snippet": "fetchJson{${1:URL}}"
     },
     "fetchJson{}[]": {
-      "snippet": "fetchJson{${1:URL}}[${2:key1,key2,...}]"
+      "snippet": "fetchJson{${1:URL}}[${2:key1,${3:key2},...}]"
     },
     "fetchJsonUsingFile{}": {
       "snippet": "fetchJsonUsingFile{${1:JSON file}}"
     },
     "fetchJsonUsingFile{}[]": {
-      "snippet": "fetchJsonUsingFile{${1:JSON file}}[${2:key1,key2,...}]"
+      "snippet": "fetchJsonUsingFile{${1:JSON file}}[${2:key1,${3:key2},...}]"
     },
     "fetchJsonUsingQuery{}{}": {
-      "snippet": "fetchJsonUsingQuery{${1:URL}}{${2:key1,key2,...}}"
+      "snippet": "fetchJsonUsingQuery{${1:URL}}{${2:key1,${3:key2},...}}"
     },
     "fetchRss{}{}": {
       "snippet": "fetchRss{${1:URL}}{${2:limit}}"
@@ -27,7 +27,7 @@
       "snippet": "fetchRss{${1:URL}}{${2:limit}}[${3:feedinfokey1,...}]"
     },
     "fetchRss{}{}[][]": {
-      "snippet": "fetchRss{${1:URL}}{${2:limit}}[${3:feedinfokey1,...}][${4:entrykey1,...}]"
+      "snippet": "fetchRss{${1:URL}}{${2:limit}}[${3:feedinfokey1,${5:...}][${4:entrykey1},...}]"
     },
     "fetchImage{}": {
       "snippet": "fetchImage{${1:URL}}"
diff --git a/dev/packages/luamaths.json b/dev/packages/luamaths.json
index 58756ec10..4807d9e6a 100644
--- a/dev/packages/luamaths.json
+++ b/dev/packages/luamaths.json
@@ -37,10 +37,10 @@
       "snippet": "mathLog{${1:number}}"
     },
     "mathMax{}": {
-      "snippet": "mathMax{${1:num1,num2,...}}"
+      "snippet": "mathMax{${1:num1,${2:num2},...}}"
     },
     "mathMin{}": {
-      "snippet": "mathMin{${1:num1,num2,...}}"
+      "snippet": "mathMin{${1:num1,${2:num2},...}}"
     },
     "mathPi": {},
     "mathRandom{}": {
diff --git a/dev/packages/luamplib.json b/dev/packages/luamplib.json
index 5ce61e177..a9dab8dfb 100644
--- a/dev/packages/luamplib.json
+++ b/dev/packages/luamplib.json
@@ -45,10 +45,10 @@
       "snippet": "mplibnumbersystem{${1:type}}"
     },
     "mplibmakenocache{}": {
-      "snippet": "mplibmakenocache{${1:file1,file2,...}}"
+      "snippet": "mplibmakenocache{${1:file1,${2:file2},...}}"
     },
     "mplibcancelnocache{}": {
-      "snippet": "mplibcancelnocache{${1:file1,file2,...}}"
+      "snippet": "mplibcancelnocache{${1:file1,${2:file2},...}}"
     },
     "mplibcachedir{}": {
       "snippet": "mplibcachedir{${1:directory path}}"
@@ -69,6 +69,13 @@
     "mplibshowlog{}": {
       "snippet": "mplibshowlog{${1:choice}}"
     },
+    "mppattern{}": {
+      "snippet": "mppattern{${1:name}}"
+    },
+    "mppattern{}[]": {
+      "snippet": "mppattern{${1:name}}[${2:options}]"
+    },
+    "endmppattern": {},
     "mplibsetformat{}": {
       "snippet": "mplibsetformat{${1:format name}}"
     },
@@ -103,6 +110,12 @@
     "mplibdoprempfig": {},
     "mplibmainmpfig": {},
     "mplibmpfigbranch": {},
+    "mplibpatternbranch": {},
+    "mplibpatterngetnexttok": {},
+    "mplibpatternmain": {},
+    "mplibpatternname": {},
+    "mplibpatternopts": {},
+    "mplibpatternskipspace": {},
     "mplibprempfig{}": {
       "snippet": "mplibprempfig{${1:arg}}"
     },
@@ -130,8 +143,29 @@
     "mplibcode[]": {
       "name": "mplibcode",
       "snippet": "[${1:instance name}]"
+    },
+    "mppattern{}": {
+      "name": "mppattern",
+      "snippet": "{${1:name}}"
+    },
+    "mppattern{}[]": {
+      "name": "mppattern",
+      "snippet": "{${1:name}}[${2:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 1
     }
   },
   "options": [],
-  "keyvals": []
+  "keyvals": [
+    [
+      "xstep=${1:number}",
+      "ystep=${1:number}",
+      "xshift=${1:number}",
+      "yshift=${1:number}",
+      "bbox=\"${1:llx lly urx ury}\"",
+      "matrix=\"${1:xx xy yx yy}\"",
+      "resources=${1:PDF resources}",
+      "colored"
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/luatex.json b/dev/packages/luatex.json
new file mode 100644
index 000000000..956d90c3f
--- /dev/null
+++ b/dev/packages/luatex.json
@@ -0,0 +1,314 @@
+{
+  "includes": {},
+  "macros": {
+    "luatexbanner": {},
+    "luatexversion": {},
+    "luatexrevision": {},
+    "formatname": {},
+    "attributedef{}": {
+      "snippet": "attributedef{${1:cmd}}"
+    },
+    "directlua{}": {
+      "snippet": "directlua{${1:lua code}}"
+    },
+    "latelua{}": {
+      "snippet": "latelua{${1:lua code}}"
+    },
+    "luaescapestring{}": {
+      "snippet": "luaescapestring{${1:TeX code}}"
+    },
+    "luadef{}": {
+      "snippet": "luadef{${1:cmd}}"
+    },
+    "fontid": {},
+    "setfontid": {},
+    "nospaces": {},
+    "scantextokens": {},
+    "csstring": {},
+    "begincsname": {},
+    "lastnamedcs": {},
+    "alignmark": {},
+    "aligntab": {},
+    "glet{}": {
+      "snippet": "glet{${1:cmd}}"
+    },
+    "immediateassignment": {},
+    "immediateassigned": {},
+    "ifcondition": {},
+    "vpack": {},
+    "hpack": {},
+    "tpack": {},
+    "saveboxresource": {},
+    "saveimageresource": {},
+    "useboxresource": {},
+    "useimageresource": {},
+    "lastsavedboxresourceindex": {},
+    "lastsavedimageresourceindex": {},
+    "lastsavedimageresourcepages": {},
+    "nohrule": {},
+    "novrule": {},
+    "gleaders": {},
+    "boundary": {},
+    "noboundary": {},
+    "protrusionboundary": {},
+    "wordboundary": {},
+    "pagebottomoffset": {},
+    "pagetopoffset": {},
+    "pagerightoffset": {},
+    "pageleftoffset": {},
+    "partokencontext": {},
+    "partokenname": {},
+    "showstream": {},
+    "eTeXgluestretchorder": {},
+    "eTeXglueshrinkorder": {},
+    "deferred": {},
+    "pagewidth": {},
+    "pageheight": {},
+    "adjustspacing": {},
+    "protrudechars": {},
+    "ignoreligaturesinfont": {},
+    "expandglyphsinfont": {},
+    "copyfont": {},
+    "savepos": {},
+    "lastxpos": {},
+    "lastypos": {},
+    "pxdimen": {},
+    "insertht": {},
+    "normaldeviate": {},
+    "uniformdeviate": {},
+    "setrandomseed": {},
+    "randomseed": {},
+    "primitive": {},
+    "ifprimitive": {},
+    "ifabsnum": {},
+    "ifabsdim": {},
+    "textdir": {},
+    "linedir": {},
+    "pardir": {},
+    "pagedir": {},
+    "bodydir": {},
+    "mathdir": {},
+    "boxdir": {},
+    "hjcode": {},
+    "hyphenationbounds": {},
+    "explicitdiscretionary": {},
+    "automaticdiscretionary": {},
+    "leftghost": {},
+    "rightghost": {},
+    "hyphenpenaltymode": {},
+    "automatichyphenpenalty": {},
+    "explicithyphenpenalty": {},
+    "exceptionpenalty": {},
+    "Umathchardef": {},
+    "Umathchardef{}": {
+      "snippet": "Umathchardef{${1:cmd}}"
+    },
+    "Umathcharnumdef": {},
+    "Umathcharnumdef{}": {
+      "snippet": "Umathcharnumdef{${1:cmd}}"
+    },
+    "Umathcode": {},
+    "Udelcode": {},
+    "Umathchar": {},
+    "Umathaccent": {},
+    "Udelimiter": {},
+    "Uradical": {},
+    "Umathcharnum": {},
+    "Umathcodenum": {},
+    "Udelcodenum": {},
+    "Uroot": {},
+    "Uoverdelimiter": {},
+    "Uunderdelimiter": {},
+    "Udelimiterover": {},
+    "Udelimiterunder": {},
+    "variablefam": {},
+    "mathstyle": {},
+    "Ustack": {},
+    "crampeddisplaystyle": {},
+    "crampedtextstyle": {},
+    "crampedscriptstyle": {},
+    "crampedscriptscriptstyle": {},
+    "Umathquad": {},
+    "Umathaxis": {},
+    "Umathoperatorsize": {},
+    "Umathoverbarkern": {},
+    "Umathoverbarrule": {},
+    "Umathoverbarvgap": {},
+    "Umathunderbarkern": {},
+    "Umathunderbarrule": {},
+    "Umathunderbarvgap": {},
+    "Umathradicalkern": {},
+    "Umathradicalrule": {},
+    "Umathradicalvgap": {},
+    "Umathradicaldegreebefore": {},
+    "Umathradicaldegreeafter": {},
+    "Umathradicaldegreeraise": {},
+    "Umathstackvgap": {},
+    "Umathstacknumup": {},
+    "Umathstackdenomdown": {},
+    "Umathfractionrule": {},
+    "Umathfractionnumvgap": {},
+    "Umathfractionnumup": {},
+    "Umathfractiondenomvgap": {},
+    "Umathfractiondenomdown": {},
+    "Umathfractiondelsize": {},
+    "Umathlimitabovevgap": {},
+    "Umathlimitabovebgap": {},
+    "Umathlimitabovekern": {},
+    "Umathlimitbelowvgap": {},
+    "Umathlimitbelowbgap": {},
+    "Umathlimitbelowkern": {},
+    "Umathoverdelimitervgap": {},
+    "Umathoverdelimiterbgap": {},
+    "Umathunderdelimitervgap": {},
+    "Umathunderdelimiterbgap": {},
+    "Umathsubshiftdrop": {},
+    "Umathsubshiftdown": {},
+    "Umathsupshiftdrop": {},
+    "Umathsupshiftup": {},
+    "Umathsubsupshiftdown": {},
+    "Umathsubtopmax": {},
+    "Umathsupbottommin": {},
+    "Umathsupsubbottommax": {},
+    "Umathsubsupvgap": {},
+    "Umathspaceafterscript": {},
+    "Umathconnectoroverlapmin": {},
+    "Umathskewedfractionhgap": {},
+    "Umathskewedfractionvgap": {},
+    "Umathordordspacing": {},
+    "Umathordopspacing": {},
+    "Umathordbinspacing": {},
+    "Umathordrelspacing": {},
+    "Umathordopenspacing": {},
+    "Umathordclosespacing": {},
+    "Umathordpunctspacing": {},
+    "Umathordinnerspacing": {},
+    "Umathopordspacing": {},
+    "Umathopopspacing": {},
+    "Umathopbinspacing": {},
+    "Umathoprelspacing": {},
+    "Umathopopenspacing": {},
+    "Umathopclosespacing": {},
+    "Umathoppunctspacing": {},
+    "Umathopinnerspacing": {},
+    "Umathbinordspacing": {},
+    "Umathbinopspacing": {},
+    "Umathbinbinspacing": {},
+    "Umathbinrelspacing": {},
+    "Umathbinopenspacing": {},
+    "Umathbinclosespacing": {},
+    "Umathbinpunctspacing": {},
+    "Umathbininnerspacing": {},
+    "Umathrelordspacing": {},
+    "Umathrelopspacing": {},
+    "Umathrelbinspacing": {},
+    "Umathrelrelspacing": {},
+    "Umathrelopenspacing": {},
+    "Umathrelclosespacing": {},
+    "Umathrelpunctspacing": {},
+    "Umathrelinnerspacing": {},
+    "Umathopenordspacing": {},
+    "Umathopenopspacing": {},
+    "Umathopenbinspacing": {},
+    "Umathopenrelspacing": {},
+    "Umathopenopenspacing": {},
+    "Umathopenclosespacing": {},
+    "Umathopenpunctspacing": {},
+    "Umathopeninnerspacing": {},
+    "Umathcloseordspacing": {},
+    "Umathcloseopspacing": {},
+    "Umathclosebinspacing": {},
+    "Umathcloserelspacing": {},
+    "Umathcloseopenspacing": {},
+    "Umathcloseclosespacing": {},
+    "Umathclosepunctspacing": {},
+    "Umathcloseinnerspacing": {},
+    "Umathpunctordspacing": {},
+    "Umathpunctopspacing": {},
+    "Umathpunctbinspacing": {},
+    "Umathpunctrelspacing": {},
+    "Umathpunctopenspacing": {},
+    "Umathpunctclosespacing": {},
+    "Umathpunctpunctspacing": {},
+    "Umathpunctinnerspacing": {},
+    "Umathinnerordspacing": {},
+    "Umathinneropspacing": {},
+    "Umathinnerbinspacing": {},
+    "Umathinnerrelspacing": {},
+    "Umathinneropenspacing": {},
+    "Umathinnerclosespacing": {},
+    "Umathinnerpunctspacing": {},
+    "Umathinnerinnerspacing": {},
+    "Umathnolimitsupfactor": {},
+    "Umathnolimitsubfactor": {},
+    "Uhextensible": {},
+    "Uvextensible": {},
+    "Uskewed": {},
+    "Uskewedwithdelims": {},
+    "Uleft": {},
+    "Umiddle": {},
+    "Uright": {},
+    "Usuperscript": {},
+    "Usubscript": {},
+    "Ustartmath": {},
+    "Ustopmath": {},
+    "Ustartdisplaymath": {},
+    "Ustopdisplaymath": {},
+    "Unosuperscript{}": {
+      "snippet": "Unosuperscript{${1:text}}"
+    },
+    "Unosubscript{}": {
+      "snippet": "Unosubscript{${1:text}}"
+    },
+    "mathoption": {},
+    "localinterlinepenalty": {},
+    "localbrokenpenalty": {},
+    "localleftbox": {},
+    "localrightbox": {},
+    "compoundhyphenmode": {},
+    "dviextension": {},
+    "dvifeedback": {},
+    "dvivariable": {},
+    "endlocalcontrol": {},
+    "eTeXminorversion": {},
+    "eTeXVersion": {},
+    "fixupboxesmode": {},
+    "luacopyinputnodes": {},
+    "mathrulesfam": {},
+    "mathrulesmode": {},
+    "mathrulethicknessmode": {},
+    "newattribute{}": {
+      "snippet": "newattribute{${1:attribute}}"
+    },
+    "newcatcodetable{}": {
+      "snippet": "newcatcodetable{${1:catcodetable}}"
+    },
+    "newluafunction{}": {
+      "snippet": "newluafunction{${1:function}}"
+    },
+    "newluacmd{}": {
+      "snippet": "newluacmd{${1:cmd}}"
+    },
+    "newprotectedluacmd{}": {
+      "snippet": "newprotectedluacmd{${1:cmd}}"
+    },
+    "newwhatsit{}": {
+      "snippet": "newwhatsit{${1:whatsit}}"
+    },
+    "newluabytecode{}": {
+      "snippet": "newluabytecode{${1:bytecode}}"
+    },
+    "newluachunkname{}": {
+      "snippet": "newluachunkname{${1:chunkname}}"
+    },
+    "setattribute{}{}": {
+      "snippet": "setattribute{${1:attribute}}{${2:value}}"
+    },
+    "unsetattribute{}": {
+      "snippet": "unsetattribute{${1:attribute}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/luatexja-fontspec.json b/dev/packages/luatexja-fontspec.json
index 62d131a11..f5cbae931 100644
--- a/dev/packages/luatexja-fontspec.json
+++ b/dev/packages/luatexja-fontspec.json
@@ -48,12 +48,36 @@
     "setjfontfamily{}[]{}": {
       "snippet": "setjfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
     },
+    "providejfontfamily{}{}": {
+      "snippet": "providejfontfamily{${1:cmd}}{${2:font}}"
+    },
+    "providejfontfamily{}[]{}": {
+      "snippet": "providejfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
     "newjfontface{}{}": {
       "snippet": "newjfontface{${1:cmd}}{${2:font}}"
     },
     "newjfontface{}[]{}": {
       "snippet": "newjfontface{${1:cmd}}[${2:font features}]{${3:font}}"
     },
+    "renewjfontface{}{}": {
+      "snippet": "renewjfontface{${1:cmd}}{${2:font}}"
+    },
+    "renewjfontface{}[]{}": {
+      "snippet": "renewjfontface{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "setjfontface{}{}": {
+      "snippet": "setjfontface{${1:cmd}}{${2:font}}"
+    },
+    "setjfontface{}[]{}": {
+      "snippet": "setjfontface{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
+    "providejfontface{}{}": {
+      "snippet": "providejfontface{${1:cmd}}{${2:font}}"
+    },
+    "providejfontface{}[]{}": {
+      "snippet": "providejfontface{${1:cmd}}[${2:font features}]{${3:font}}"
+    },
     "defaultjfontfeatures{}": {
       "snippet": "defaultjfontfeatures{${1:font features}}"
     },
diff --git a/dev/packages/luatexko.json b/dev/packages/luatexko.json
index abb826952..9f52bb457 100644
--- a/dev/packages/luatexko.json
+++ b/dev/packages/luatexko.json
@@ -153,22 +153,22 @@
       "snippet": "adhocfallbackfont[${2:font features}]{${1:font name}}"
     },
     "registerpunctuations{}": {
-      "snippet": "registerpunctuations{${1:code1,code2,...}}"
+      "snippet": "registerpunctuations{${1:code1,${2:code2},...}}"
     },
     "registerhangulpunctuations{}": {
-      "snippet": "registerhangulpunctuations{${1:code1,code2,...}}"
+      "snippet": "registerhangulpunctuations{${1:code1,${2:code2},...}}"
     },
     "unregisterpunctuations{}": {
-      "snippet": "unregisterpunctuations{${1:code1,code2,...}}"
+      "snippet": "unregisterpunctuations{${1:code1,${2:code2},...}}"
     },
     "unregisterhangulpunctuations{}": {
-      "snippet": "unregisterhangulpunctuations{${1:code1,code2,...}}"
+      "snippet": "unregisterhangulpunctuations{${1:code1,${2:code2},...}}"
     },
     "registerbreakableafter{}": {
-      "snippet": "registerbreakableafter{${1:code1,code2,...}}"
+      "snippet": "registerbreakableafter{${1:code1,${2:code2},...}}"
     },
     "registerbreakablebefore{}": {
-      "snippet": "registerbreakablebefore{${1:code1,code2,...}}"
+      "snippet": "registerbreakablebefore{${1:code1,${2:code2},...}}"
     },
     "typesetclassic": {},
     "typesetmodern": {},
diff --git a/dev/packages/luatruthtable.json b/dev/packages/luatruthtable.json
index 6eaccdfad..5271703bc 100644
--- a/dev/packages/luatruthtable.json
+++ b/dev/packages/luatruthtable.json
@@ -6,10 +6,10 @@
   },
   "macros": {
     "luaTruthTable{}{}": {
-      "snippet": "luaTruthTable{${1:var1,var2,...}}{${2:expr1,expr2,...}}"
+      "snippet": "luaTruthTable{${1:var1,${3:var2},${4:...}}{${2:expr1},${5:expr2},...}}"
     },
     "luaTruthTable[]{}{}": {
-      "snippet": "luaTruthTable[${3:options}]{${1:var1,var2,...}}{${2:expr1,expr2,...}}",
+      "snippet": "luaTruthTable[${3:options}]{${1:var1,${4:var2},${5:...}}{${2:expr1},${6:expr2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     }
diff --git a/dev/packages/lutabulartools.json b/dev/packages/lutabulartools.json
index d9f11f973..08ea4bba9 100644
--- a/dev/packages/lutabulartools.json
+++ b/dev/packages/lutabulartools.json
@@ -50,20 +50,32 @@
       "snippet": "addMCsicol{${1:column}}"
     },
     "midrulesat{}": {
-      "snippet": "midrulesat{${1:row1,row2,...}}"
+      "snippet": "midrulesat{${1:row1,${2:row2},...}}"
     },
     "gmidrule{}": {
       "snippet": "gmidrule{${1:colspecs}}"
     },
+    "gmidrule(){}": {
+      "snippet": "gmidrule(${2:trim}){${1:colspecs}}"
+    },
     "gcmidrule{}": {
       "snippet": "gcmidrule{${1:colspecs}}"
     },
+    "gcmidrule(){}": {
+      "snippet": "gcmidrule(${2:trim}){${1:colspecs}}"
+    },
     "gcmidrules{}": {
       "snippet": "gcmidrules{${1:colspecs}}"
     },
+    "gcmidrules(){}": {
+      "snippet": "gcmidrules(${2:trim}){${1:colspecs}}"
+    },
     "cmidrules{}": {
       "snippet": "cmidrules{${1:colspecs}}"
     },
+    "cmidrules(){}": {
+      "snippet": "cmidrules(${2:trim}){${1:colspecs}}"
+    },
     "midruleX{}": {
       "snippet": "midruleX{${1:keyvals}}",
       "keyvalindex": 1,
diff --git a/dev/packages/luwiantype.json b/dev/packages/luwiantype.json
new file mode 100644
index 000000000..6c41b356f
--- /dev/null
+++ b/dev/packages/luwiantype.json
@@ -0,0 +1,780 @@
+{
+  "includes": {
+    "fontspec": [],
+    "graphicx": [],
+    "stackengine": [],
+    "moresize": []
+  },
+  "macros": {
+    "A": {
+      "detail": "𝐴",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
+    },
+    "A[]": {
+      "snippet": "A[${1:number}]"
+    },
+    "ADORARE": {},
+    "AEDIFICARE": {},
+    "AEDIFICIUM": {},
+    "AEDIFICIUMMINUS": {},
+    "AEDIFICIUMPONERE": {},
+    "ALA": {},
+    "AMPLECTI": {},
+    "ANIMAL": {},
+    "ANNUS": {},
+    "ANNUSANNUS": {},
+    "APER": {},
+    "AQUILA": {},
+    "ARAI": {},
+    "ARGENTUM": {},
+    "ARHA": {},
+    "ASCIA": {},
+    "ASINUS": {},
+    "ASINUS[]": {
+      "snippet": "ASINUS[${1:number}]"
+    },
+    "ASINUSIIA": {},
+    "ATAII": {},
+    "AUDIRE": {},
+    "AURIGA": {},
+    "AURIGA[]": {
+      "snippet": "AURIGA[${1:number}]"
+    },
+    "AVIS": {},
+    "AVIS[]": {
+      "snippet": "AVIS[${1:number}]"
+    },
+    "AVISX": {},
+    "AVUS": {},
+    "AX": {},
+    "badeq": {},
+    "BESTIA": {},
+    "BIBERE": {},
+    "BONUS": {},
+    "BONUS[]": {
+      "snippet": "BONUS[${1:number}]"
+    },
+    "BOS": {},
+    "BOS[]": {
+      "snippet": "BOS[${1:number}]"
+    },
+    "BOSIIMI": {},
+    "BOSMI": {},
+    "boust{}": {
+      "snippet": "boust{${1:text}}"
+    },
+    "BRACCHIUM": {},
+    "CAELUM": {},
+    "CANIS": {},
+    "CANIS[]": {
+      "snippet": "CANIS[${1:number}]"
+    },
+    "CAPERE": {},
+    "CAPERE[]": {
+      "snippet": "CAPERE[${1:number}]"
+    },
+    "CAPEREIICAPEREII": {},
+    "CAPERESCALPRUM": {},
+    "CAPRA": {},
+    "CAPRA[]": {
+      "snippet": "CAPRA[${1:number}]"
+    },
+    "CAPRAIIA": {},
+    "CAPUT": {},
+    "CAPUTSCALPRUM": {},
+    "CASTRUM": {},
+    "CENTUM": {},
+    "CERVUS": {},
+    "CERVUS[]": {
+      "snippet": "CERVUS[${1:number}]"
+    },
+    "CONTRACTUS": {},
+    "CORNU": {},
+    "CORNUCAPUT": {},
+    "CRUS": {},
+    "CRUS[]": {
+      "snippet": "CRUS[${1:number}]"
+    },
+    "CRUSCRUS": {},
+    "CRUSFLUMEN": {},
+    "CRUX": {},
+    "CRUX[]": {
+      "snippet": "CRUX[${1:number}]"
+    },
+    "CUBITUM": {},
+    "CULTER": {},
+    "CUM": {},
+    "CURRERE": {},
+    "CURRUS": {},
+    "DARE": {},
+    "DAREDARE": {},
+    "DECEM": {},
+    "DELERE": {},
+    "DEUS": {},
+    "DEUSDOMUS": {},
+    "DEUSMONSMENSA": {},
+    "DEUSMONSSARPA": {},
+    "DEUSVIATERRA": {},
+    "DIES": {},
+    "DOMINA": {},
+    "DOMINUS": {},
+    "DOMUS": {},
+    "DOMUSMINUS": {},
+    "DOMUSSCALA": {},
+    "DOMUSX": {},
+    "EDERE": {},
+    "EGO": {},
+    "EGO[]": {
+      "snippet": "EGO[${1:number}]"
+    },
+    "EIGHT": {},
+    "ENSIS": {},
+    "EQUUS": {},
+    "EUNUCHUS": {},
+    "EUNUCHUS[]": {
+      "snippet": "EUNUCHUS[${1:number}]"
+    },
+    "EXERCITUS": {},
+    "FALX": {},
+    "FEMINA": {},
+    "FILIA": {},
+    "FILIUS": {},
+    "FINES": {},
+    "FINESHA": {},
+    "FIVE": {},
+    "FLAMMAE": {},
+    "FLUMEN": {},
+    "FONS": {},
+    "FORTIS": {},
+    "FOUR": {},
+    "FRATER": {},
+    "FRATER[]": {
+      "snippet": "FRATER[${1:number}]"
+    },
+    "FRONS": {},
+    "FULGUR": {},
+    "FUSUS": {},
+    "GCXCV": {},
+    "GENUFLECTERE": {},
+    "GRYLLUS": {},
+    "HA": {},
+    "HA[]": {
+      "snippet": "HA[${1:number}]"
+    },
+    "HAIILI": {},
+    "HALAI": {},
+    "HANA": {},
+    "HARAI": {},
+    "HASTARIUS": {},
+    "HATTI": {},
+    "HATTILI": {},
+    "HATTUSILI": {},
+    "HAX": {},
+    "HEROS": {},
+    "HI": {},
+    "HI[]": {
+      "snippet": "HI[${1:number}]"
+    },
+    "hl": {},
+    "HORDEUM": {},
+    "HORREUM": {},
+    "hr": {},
+    "HU": {},
+    "HU[]": {
+      "snippet": "HU[${1:number}]"
+    },
+    "HUNDRED": {},
+    "HURU": {},
+    "HWIA": {},
+    "HWIX": {},
+    "I": {
+      "detail": "𝐼",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL I"
+    },
+    "I[]": {
+      "snippet": "I[${1:number}]"
+    },
+    "IA": {},
+    "IA[]": {
+      "snippet": "IA[${1:number}]"
+    },
+    "IACULUM": {},
+    "INFANS": {},
+    "INFRA": {},
+    "IRAI": {},
+    "ISHUWA": {},
+    "IUDEX": {},
+    "IUDEXLA": {},
+    "IUDEXRAI": {},
+    "IUSTITIA": {},
+    "JANUS": {},
+    "KA": {},
+    "KA[]": {
+      "snippet": "KA[${1:number}]"
+    },
+    "KAR": {},
+    "KI": {},
+    "KIX": {},
+    "KU": {},
+    "KWIA": {},
+    "LA": {},
+    "LAI": {},
+    "LAI[]": {
+      "snippet": "LAI[${1:number}]"
+    },
+    "LAIU": {},
+    "LALA": {},
+    "LAPIS": {},
+    "LAPISSCALPRUM": {},
+    "LARAA": {},
+    "Lat": {},
+    "LAX": {},
+    "LCCCII": {},
+    "LCCCL": {},
+    "LCCCLI": {},
+    "LCCCLII": {},
+    "LCCCLIII": {},
+    "LCCCLIV": {},
+    "LCCCLIX": {},
+    "LCCCLIXA": {},
+    "LCCCLVI": {},
+    "LCCCLVII": {},
+    "LCCCLXI": {},
+    "LCCCLXV": {},
+    "LCCCLXXIII": {},
+    "LCCCLXXIV": {},
+    "LCCCLXXV": {},
+    "LCCCVIII": {},
+    "LCCCX": {},
+    "LCCCXCIV": {},
+    "LCCCXCVI": {},
+    "LCCCXCVIII": {},
+    "LCCCXI": {},
+    "LCCCXII": {},
+    "LCCCXLII": {},
+    "LCCCXLIX": {},
+    "LCCCXLVIII": {},
+    "LCCCXVII": {},
+    "LCCCXX": {},
+    "LCCCXXI": {},
+    "LCCCXXIII": {},
+    "LCCCXXIV": {},
+    "LCCCXXIXA": {},
+    "LCCCXXXIII": {},
+    "LCCCXXXIX": {},
+    "LCCIII": {},
+    "LCCLII": {},
+    "LCCLIX": {},
+    "LCCLVI": {},
+    "LCCLVIII": {},
+    "LCCLX": {},
+    "LCCLXI": {},
+    "LCCLXII": {},
+    "LCCLXIII": {},
+    "LCCLXV": {},
+    "LCCLXX": {},
+    "LCCLXXI": {},
+    "LCCLXXIII": {},
+    "LCCLXXIV": {},
+    "LCCLXXIX": {},
+    "LCCLXXXII": {},
+    "LCCLXXXIV": {},
+    "LCCLXXXVII": {},
+    "LCCV": {},
+    "LCCVI": {},
+    "LCCVIII": {},
+    "LCCXCIII": {},
+    "LCCXCVII": {},
+    "LCCXI": {},
+    "LCCXIII": {},
+    "LCCXIX": {},
+    "LCCXL": {},
+    "LCCXLII": {},
+    "LCCXVII": {},
+    "LCCXVIII": {},
+    "LCCXX": {},
+    "LCCXXII": {},
+    "LCCXXIV": {},
+    "LCCXXX": {},
+    "LCCXXXII": {},
+    "LCCXXXIII": {},
+    "LCCXXXIV": {},
+    "LCCXXXV": {},
+    "LCCXXXVI": {},
+    "LCCXXXVIII": {},
+    "LCDI": {},
+    "LCDIII": {},
+    "LCDIX": {},
+    "LCDLII": {},
+    "LCDLIII": {},
+    "LCDLIV": {},
+    "LCDLIX": {},
+    "LCDLVII": {},
+    "LCDLVIIA": {},
+    "LCDLVIII": {},
+    "LCDLX": {},
+    "LCDLXI": {},
+    "LCDLXIII": {},
+    "LCDLXIV": {},
+    "LCDLXIX": {},
+    "LCDLXV": {},
+    "LCDLXVI": {},
+    "LCDLXVII": {},
+    "LCDLXVIII": {},
+    "LCDLXXI": {},
+    "LCDLXXII": {},
+    "LCDLXXIII": {},
+    "LCDLXXIX": {},
+    "LCDLXXV": {},
+    "LCDLXXVI": {},
+    "LCDLXXVIII": {},
+    "LCDLXXX": {},
+    "LCDLXXXI": {},
+    "LCDLXXXII": {},
+    "LCDLXXXIV": {},
+    "LCDLXXXIX": {},
+    "LCDLXXXV": {},
+    "LCDLXXXVII": {},
+    "LCDV": {},
+    "LCDVI": {},
+    "LCDVII": {},
+    "LCDVIII": {},
+    "LCDX": {},
+    "LCDXA": {},
+    "LCDXC": {},
+    "LCDXCI": {},
+    "LCDXCII": {},
+    "LCDXCIII": {},
+    "LCDXCIV": {},
+    "LCDXCV": {},
+    "LCDXCVI": {},
+    "LCDXCVII": {},
+    "LCDXIV": {},
+    "LCDXL": {},
+    "LCDXLI": {},
+    "LCDXLII": {},
+    "LCDXLIII": {},
+    "LCDXLIV": {},
+    "LCDXLIX": {},
+    "LCDXVI": {},
+    "LCDXVIII": {},
+    "LCDXX": {},
+    "LCDXXIV": {},
+    "LCDXXV": {},
+    "LCDXXVI": {},
+    "LCDXXVII": {},
+    "LCDXXVIII": {},
+    "LCDXXXI": {},
+    "LCDXXXII": {},
+    "LCDXXXIII": {},
+    "LCDXXXVI": {},
+    "LCDXXXVII": {},
+    "LCL": {},
+    "LCLII": {},
+    "LCLIV": {},
+    "LCLIX": {},
+    "LCLV": {},
+    "LCLVI": {},
+    "LCLVII": {},
+    "LCLVIII": {},
+    "LCLXI": {},
+    "LCLXII": {},
+    "LCLXIII": {},
+    "LCLXIV": {},
+    "LCLXIX": {},
+    "LCLXVII": {},
+    "LCLXVIII": {},
+    "LCLXX": {},
+    "LCLXXI": {},
+    "LCLXXX": {},
+    "LCLXXXIII": {},
+    "LCLXXXIV": {},
+    "LCLXXXIX": {},
+    "LCLXXXV": {},
+    "LCLXXXVI": {},
+    "LCLXXXVII": {},
+    "LCLXXXVIII": {},
+    "LCVI": {},
+    "LCXCIV": {},
+    "LCXCV": {},
+    "LCXCVIII": {},
+    "LCXIII": {},
+    "LCXIX": {},
+    "LCXL": {},
+    "LCXLI": {},
+    "LCXLIII": {},
+    "LCXLIV": {},
+    "LCXLIX": {},
+    "LCXLV": {},
+    "LCXLVI": {},
+    "LCXLVII": {},
+    "LCXVI": {},
+    "LCXVII": {},
+    "LCXVIII": {},
+    "LCXXII": {},
+    "LCXXIII": {},
+    "LCXXIV": {},
+    "LCXXIX": {},
+    "LCXXVI": {},
+    "LCXXVII": {},
+    "LCXXXIX": {},
+    "LCXXXVA": {},
+    "LCXXXVI": {},
+    "LDI": {},
+    "LDII": {},
+    "LDIII": {},
+    "LDIV": {},
+    "LDIX": {},
+    "LDV": {},
+    "LDVII": {},
+    "LDXI": {},
+    "LDXII": {},
+    "LDXIII": {},
+    "LDXIV": {},
+    "LDXIX": {},
+    "LDXV": {},
+    "LDXVI": {},
+    "LDXVII": {},
+    "LDXVIII": {},
+    "LDXX": {},
+    "LDXXI": {},
+    "LDXXII": {},
+    "LDXXIII": {},
+    "LDXXX": {},
+    "LECTUS": {},
+    "LEO": {},
+    "LEO[]": {
+      "snippet": "LEO[${1:number}]"
+    },
+    "LEOMONSTULEO": {},
+    "LEPUS": {},
+    "LEPUS[]": {
+      "snippet": "LEPUS[${1:number}]"
+    },
+    "LI": {},
+    "LI[]": {
+      "snippet": "LI[${1:number}]"
+    },
+    "LIBARE": {},
+    "LIBATIO": {},
+    "LIGARE": {},
+    "LIGNUM": {},
+    "LIII": {},
+    "LINGERE": {},
+    "LINGUA": {},
+    "LINGUACLAVUS": {},
+    "LINGUAX": {},
+    "LIS": {},
+    "LITUUS": {},
+    "LITUUSNA": {},
+    "LITUUSU": {},
+    "LL": {},
+    "LLI": {},
+    "LLIV": {},
+    "LLX": {},
+    "LLXI": {},
+    "LLXIII": {},
+    "LLXIV": {},
+    "LLXIX": {},
+    "LLXVII": {},
+    "LLXVIII": {},
+    "LLXXI": {},
+    "LLXXII": {},
+    "LLXXIV": {},
+    "LLXXV": {},
+    "LLXXVI": {},
+    "LLXXVII": {},
+    "LLXXXVII": {},
+    "LLXXXVIII": {},
+    "LOCUS": {},
+    "LOGE": {},
+    "LOGS": {},
+    "LONGUS": {},
+    "LOQUI": {},
+    "LUNA": {},
+    "Luwian": {},
+    "LV": {},
+    "LXCII": {},
+    "LXCIV": {},
+    "LXCLII": {},
+    "LXI": {},
+    "LXIII": {},
+    "LXL": {},
+    "LXLIV": {},
+    "LXLVII": {},
+    "LXLVIII": {},
+    "LXX": {},
+    "LXXIII": {},
+    "LXXX": {},
+    "LXXXIII": {},
+    "LXXXVII": {},
+    "LXXXVIII": {},
+    "MA": {},
+    "MA[]": {
+      "snippet": "MA[${1:number}]"
+    },
+    "MAGNUS": {},
+    "MAGNUSDOMINA": {},
+    "MAGNUSDOMUS": {},
+    "MAGNUSFILIA": {},
+    "MAGNUSREX": {},
+    "MALLEUS": {},
+    "MALUS": {},
+    "MALUS[]": {
+      "snippet": "MALUS[${1:number}]"
+    },
+    "MANDARE": {},
+    "MANDARE[]": {
+      "snippet": "MANDARE[${1:number}]"
+    },
+    "MANUS": {},
+    "MANUSCULTER": {},
+    "MATER": {},
+    "MAX": {},
+    "MENSA": {},
+    "MENSA[]": {
+      "snippet": "MENSA[${1:number}]"
+    },
+    "MI": {},
+    "MI[]": {
+      "snippet": "MI[${1:number}]"
+    },
+    "MIIIREGIO": {},
+    "MILLE": {},
+    "MINUS": {},
+    "MONS": {},
+    "MONS[]": {
+      "snippet": "MONS[${1:number}]"
+    },
+    "MORI": {},
+    "MU": {},
+    "MUA": {},
+    "MURSILI": {},
+    "MURUS": {},
+    "MUWA": {},
+    "NA": {},
+    "NA[]": {
+      "snippet": "NA[${1:number}]"
+    },
+    "NEG": {},
+    "NEG[]": {
+      "snippet": "NEG[${1:number}]"
+    },
+    "NEPOS": {},
+    "NI": {},
+    "NI[]": {
+      "snippet": "NI[${1:number}]"
+    },
+    "NINE": {},
+    "NIX": {},
+    "NU": {},
+    "NU[]": {
+      "snippet": "NU[${1:number}]"
+    },
+    "OCCIDENS": {},
+    "OCULUS": {},
+    "OMNIS": {},
+    "OMNIS[]": {
+      "snippet": "OMNIS[${1:number}]"
+    },
+    "OMNISMI": {},
+    "ONE": {},
+    "ORIENS": {},
+    "OVIS": {},
+    "OVIS[]": {
+      "snippet": "OVIS[${1:number}]"
+    },
+    "PA": {},
+    "PANIS": {},
+    "PANISSCUTELLA": {},
+    "PARI": {},
+    "PASTOR": {},
+    "PAX": {},
+    "PERS": {},
+    "PES": {},
+    "PES[]": {
+      "snippet": "PES[${1:number}]"
+    },
+    "PESIIPES": {},
+    "PESIIPESII": {},
+    "PESREGIO": {},
+    "PESSCALAROTAE": {},
+    "PI": {},
+    "PI[]": {
+      "snippet": "PI[${1:number}]"
+    },
+    "PISCIS": {},
+    "PITHOS": {},
+    "PITHOSA": {},
+    "PITHOSSCUTELLA": {},
+    "POCULUM": {},
+    "PODIUM": {},
+    "PONERE": {},
+    "PORTA": {},
+    "PORTA[]": {
+      "snippet": "PORTA[${1:number}]"
+    },
+    "POST": {},
+    "PRAE": {},
+    "PRINCEPS": {},
+    "PROPHETA": {},
+    "PU": {},
+    "PU[]": {
+      "snippet": "PU[${1:number}]"
+    },
+    "PUGNUS": {},
+    "PUGNUSPUGNUS": {},
+    "PUGNUSX": {},
+    "PURUS": {},
+    "RAA": {},
+    "RAI": {},
+    "REGIO": {},
+    "REL": {},
+    "REX": {},
+    "REXFILIA": {},
+    "REXFILIUS": {},
+    "REXINFANS": {},
+    "RII": {},
+    "ROTA": {},
+    "RU": {},
+    "RU[]": {
+      "snippet": "RU[${1:number}]"
+    },
+    "SA": {},
+    "SA[]": {
+      "snippet": "SA[${1:number}]"
+    },
+    "SACERDOS": {},
+    "SACERDOS[]": {
+      "snippet": "SACERDOS[${1:number}]"
+    },
+    "SARAI": {},
+    "SARMA": {},
+    "SARMA[]": {
+      "snippet": "SARMA[${1:number}]"
+    },
+    "SARPA": {},
+    "SAX": {},
+    "SCALPRUM": {},
+    "SCRIBA": {},
+    "SCUTELLA": {},
+    "SCUTUM": {},
+    "SERVUS": {},
+    "SI": {},
+    "SI[]": {
+      "snippet": "SI[${1:number}]"
+    },
+    "SIGILLUM": {},
+    "SOL": {},
+    "SOL[]": {
+      "snippet": "SOL[${1:number}]"
+    },
+    "SOLIIMENSA": {},
+    "SOLIITHRONUS": {},
+    "SOLIUM": {},
+    "SPHINX": {},
+    "STATUA": {},
+    "STELE": {},
+    "SU": {},
+    "SU[]": {
+      "snippet": "SU[${1:number}]"
+    },
+    "SUB": {},
+    "SUPER": {},
+    "TA": {},
+    "TA[]": {
+      "snippet": "TA[${1:number}]"
+    },
+    "TAI": {},
+    "TAI[]": {
+      "snippet": "TAI[${1:number}]"
+    },
+    "TALA": {},
+    "TANA": {},
+    "TAPA": {},
+    "TARAI": {},
+    "TARAIX": {},
+    "TELIPINU": {},
+    "TEN": {},
+    "TERRA": {},
+    "TESHUB": {},
+    "THOUSAND": {},
+    "THREE": {},
+    "THRONUS": {},
+    "THRONUS[]": {
+      "snippet": "THRONUS[${1:number}]"
+    },
+    "TI": {},
+    "TI[]": {
+      "snippet": "TI[${1:number}]"
+    },
+    "TONITRUS": {},
+    "tsub{}": {
+      "snippet": "tsub{${1:text}}"
+    },
+    "tsup{}": {
+      "snippet": "tsup{${1:text}}"
+    },
+    "TU": {},
+    "TU[]": {
+      "snippet": "TU[${1:number}]"
+    },
+    "TURRIS": {},
+    "TUZZI": {},
+    "TWELVE": {},
+    "TWO": {},
+    "U": {
+      "detail": "𝑈",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL U"
+    },
+    "UA": {},
+    "UNGULA": {},
+    "UNUS": {},
+    "UR": {},
+    "URBS": {},
+    "URBSLI": {},
+    "URBSRAILI": {},
+    "URCEUS": {},
+    "URHI": {},
+    "US": {},
+    "VACUUS": {},
+    "VAS": {},
+    "VERSUS": {},
+    "VIA": {},
+    "VIATERRAPLUSSCALPRUM": {},
+    "VIATERRASCALPRUM": {},
+    "VIR": {},
+    "VIR[]": {
+      "snippet": "VIR[${1:number}]"
+    },
+    "VIRIIA": {},
+    "VIRIIMINUS": {},
+    "VITA": {},
+    "VITELLUS": {},
+    "VITIS": {},
+    "WAI": {},
+    "WAI[]": {
+      "snippet": "WAI[${1:number}]"
+    },
+    "WIYA": {},
+    "WORD": {},
+    "ZA": {},
+    "ZA[]": {
+      "snippet": "ZA[${1:number}]"
+    },
+    "ZAX": {},
+    "ZI": {},
+    "ZI[]": {
+      "snippet": "ZI[${1:number}]"
+    },
+    "ZIA": {},
+    "ZU": {},
+    "ZU[]": {
+      "snippet": "ZU[${1:number}]"
+    },
+    "ZUWA": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/lwarp.json b/dev/packages/lwarp.json
index 75a62130a..3980ff7be 100644
--- a/dev/packages/lwarp.json
+++ b/dev/packages/lwarp.json
@@ -116,6 +116,12 @@
     "InlineClass[]{}{}": {
       "snippet": "InlineClass[${3:web css style}]{${1:css class}}{${2:text}}"
     },
+    "InlineClass(){}{}": {
+      "snippet": "InlineClass(${3:wp css style}){${1:css class}}{${2:text}}"
+    },
+    "InlineClass()[]{}{}": {
+      "snippet": "InlineClass(${4:wp css style})[${3:web css style}]{${1:css class}}{${2:text}}"
+    },
     "marginparBlock{}": {
       "snippet": "marginparBlock{${1:right}}"
     },
diff --git a/dev/packages/mafr.json b/dev/packages/mafr.json
index c3a1b3b88..d7f5bd7e1 100644
--- a/dev/packages/mafr.json
+++ b/dev/packages/mafr.json
@@ -184,6 +184,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/mailmerge.json b/dev/packages/mailmerge.json
index ab0045fbe..8f6d677ba 100644
--- a/dev/packages/mailmerge.json
+++ b/dev/packages/mailmerge.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "mailfields{}": {
-      "snippet": "mailfields{${1:name1,name2,...}}"
+      "snippet": "mailfields{${1:name1,${2:name2},...}}"
     },
     "mailrepeat{}": {
       "snippet": "mailrepeat{${1:text}}"
@@ -16,7 +16,7 @@
     "numberofentries": {},
     "entrynumber": {},
     "mailentry{}": {
-      "snippet": "mailentry{${1:value1,value2,...}}"
+      "snippet": "mailentry{${1:value1,${2:value2},...}}"
     },
     "mailnewdata": {},
     "MAILMcurrtag": {},
diff --git a/dev/packages/makecell.json b/dev/packages/makecell.json
index 5202a9ac8..cbaa9d8b7 100644
--- a/dev/packages/makecell.json
+++ b/dev/packages/makecell.json
@@ -10,6 +10,9 @@
     "cellgape": {},
     "cellrotangle": {},
     "cellset": {},
+    "diaghead(){}{}{}": {
+      "snippet": "diaghead(${4:Hratio},${5:Vratio}){${1:text for width}}{${2:head1}}{${3:head2}}"
+    },
     "diaghead{}{}{}": {
       "snippet": "diaghead{${1:text for width}}{${2:head1}}{${3:head2}}"
     },
diff --git a/dev/packages/makeidx.json b/dev/packages/makeidx.json
new file mode 100644
index 000000000..80a76bc71
--- /dev/null
+++ b/dev/packages/makeidx.json
@@ -0,0 +1,17 @@
+{
+  "includes": {},
+  "macros": {
+    "see{}{}": {
+      "snippet": "see{${1:text}}{${2:page number}}"
+    },
+    "seealso{}{}": {
+      "snippet": "seealso{${1:text}}{${2:page number}}"
+    },
+    "seename": {},
+    "alsoname": {},
+    "printindex": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/makeplot.json b/dev/packages/makeplot.json
index f21637258..60a82a3e9 100644
--- a/dev/packages/makeplot.json
+++ b/dev/packages/makeplot.json
@@ -33,6 +33,12 @@
     "plotFile[]{}": {
       "snippet": "plotFile[${2:options}]{${1:file}}"
     },
+    "legendXY(){}{}": {
+      "snippet": "legendXY(${3:x},${4:y}){${1:number of lines}}{${2:width in mm}}"
+    },
+    "legendXY[](){}{}": {
+      "snippet": "legendXY[${3:options}](${4:x},${5:y}){${1:number of lines}}{${2:width in mm}}"
+    },
     "legendDL{}{}": {
       "snippet": "legendDL{${1:number of lines}}{${2:width in mm}}"
     },
diff --git a/dev/packages/mandi.json b/dev/packages/mandi.json
index 4584f3b9d..45db20311 100644
--- a/dev/packages/mandi.json
+++ b/dev/packages/mandi.json
@@ -15,10 +15,10 @@
       "snippet": "momentum{${1:magnitude}}"
     },
     "momentumvector{}": {
-      "snippet": "momentumvector{${1:c1,c2,...}}"
+      "snippet": "momentumvector{${1:c1,${2:c2},...}}"
     },
     "vectormomentum{}": {
-      "snippet": "vectormomentum{${1:c1,c2,...}}"
+      "snippet": "vectormomentum{${1:c1,${2:c2},...}}"
     },
     "momentumvalue{}": {
       "snippet": "momentumvalue{${1:magnitude}}"
@@ -36,28 +36,28 @@
     "momentumonlyderivedunits": {},
     "momentumonlyalternateunits": {},
     "momentumvectorvalue{}": {
-      "snippet": "momentumvectorvalue{${1:c1,c2,...}}"
+      "snippet": "momentumvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectormomentumvalue{}": {
-      "snippet": "vectormomentumvalue{${1:c1,c2,...}}"
+      "snippet": "vectormomentumvalue{${1:c1,${2:c2},...}}"
     },
     "momentumvectorbaseunits{}": {
-      "snippet": "momentumvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "momentumvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectormomentumbaseunits{}": {
-      "snippet": "vectormomentumbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectormomentumbaseunits{${1:c1,${2:c2},...}}"
     },
     "momentumvectorderivedunits{}": {
-      "snippet": "momentumvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "momentumvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectormomentumderivedunits{}": {
-      "snippet": "vectormomentumderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectormomentumderivedunits{${1:c1,${2:c2},...}}"
     },
     "momentumvectoralternateunits{}": {
-      "snippet": "momentumvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "momentumvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectormomentumalternateunits{}": {
-      "snippet": "vectormomentumalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectormomentumalternateunits{${1:c1,${2:c2},...}}"
     },
     "momentumvectoronlybaseunits": {},
     "vectormomentumonlybaseunits": {},
@@ -72,10 +72,10 @@
       "snippet": "acceleration{${1:magnitude}}"
     },
     "accelerationvector{}": {
-      "snippet": "accelerationvector{${1:c1,c2,...}}"
+      "snippet": "accelerationvector{${1:c1,${2:c2},...}}"
     },
     "vectoracceleration{}": {
-      "snippet": "vectoracceleration{${1:c1,c2,...}}"
+      "snippet": "vectoracceleration{${1:c1,${2:c2},...}}"
     },
     "accelerationvalue{}": {
       "snippet": "accelerationvalue{${1:magnitude}}"
@@ -93,28 +93,28 @@
     "accelerationonlyderivedunits": {},
     "accelerationonlyalternateunits": {},
     "accelerationvectorvalue{}": {
-      "snippet": "accelerationvectorvalue{${1:c1,c2,...}}"
+      "snippet": "accelerationvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectoraccelerationvalue{}": {
-      "snippet": "vectoraccelerationvalue{${1:c1,c2,...}}"
+      "snippet": "vectoraccelerationvalue{${1:c1,${2:c2},...}}"
     },
     "accelerationvectorbaseunits{}": {
-      "snippet": "accelerationvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "accelerationvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectoraccelerationbaseunits{}": {
-      "snippet": "vectoraccelerationbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectoraccelerationbaseunits{${1:c1,${2:c2},...}}"
     },
     "accelerationvectorderivedunits{}": {
-      "snippet": "accelerationvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "accelerationvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectoraccelerationderivedunits{}": {
-      "snippet": "vectoraccelerationderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectoraccelerationderivedunits{${1:c1,${2:c2},...}}"
     },
     "accelerationvectoralternateunits{}": {
-      "snippet": "accelerationvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "accelerationvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectoraccelerationalternateunits{}": {
-      "snippet": "vectoraccelerationalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectoraccelerationalternateunits{${1:c1,${2:c2},...}}"
     },
     "accelerationvectoronlybaseunits": {},
     "vectoraccelerationonlybaseunits": {},
@@ -144,10 +144,10 @@
       "snippet": "angularacceleration{${1:magnitude}}"
     },
     "angularaccelerationvector{}": {
-      "snippet": "angularaccelerationvector{${1:c1,c2,...}}"
+      "snippet": "angularaccelerationvector{${1:c1,${2:c2},...}}"
     },
     "vectorangularacceleration{}": {
-      "snippet": "vectorangularacceleration{${1:c1,c2,...}}"
+      "snippet": "vectorangularacceleration{${1:c1,${2:c2},...}}"
     },
     "angularaccelerationvalue{}": {
       "snippet": "angularaccelerationvalue{${1:magnitude}}"
@@ -165,28 +165,28 @@
     "angularaccelerationonlyderivedunits": {},
     "angularaccelerationonlyalternateunits": {},
     "angularaccelerationvectorvalue{}": {
-      "snippet": "angularaccelerationvectorvalue{${1:c1,c2,...}}"
+      "snippet": "angularaccelerationvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorangularaccelerationvalue{}": {
-      "snippet": "vectorangularaccelerationvalue{${1:c1,c2,...}}"
+      "snippet": "vectorangularaccelerationvalue{${1:c1,${2:c2},...}}"
     },
     "angularaccelerationvectorbaseunits{}": {
-      "snippet": "angularaccelerationvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "angularaccelerationvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularaccelerationbaseunits{}": {
-      "snippet": "vectorangularaccelerationbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularaccelerationbaseunits{${1:c1,${2:c2},...}}"
     },
     "angularaccelerationvectorderivedunits{}": {
-      "snippet": "angularaccelerationvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "angularaccelerationvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularaccelerationderivedunits{}": {
-      "snippet": "vectorangularaccelerationderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularaccelerationderivedunits{${1:c1,${2:c2},...}}"
     },
     "angularaccelerationvectoralternateunits{}": {
-      "snippet": "angularaccelerationvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "angularaccelerationvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularaccelerationalternateunits{}": {
-      "snippet": "vectorangularaccelerationalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularaccelerationalternateunits{${1:c1,${2:c2},...}}"
     },
     "angularaccelerationvectoronlybaseunits": {},
     "vectorangularaccelerationonlybaseunits": {},
@@ -216,10 +216,10 @@
       "snippet": "angularimpulse{${1:magnitude}}"
     },
     "angularimpulsevector{}": {
-      "snippet": "angularimpulsevector{${1:c1,c2,...}}"
+      "snippet": "angularimpulsevector{${1:c1,${2:c2},...}}"
     },
     "vectorangularimpulse{}": {
-      "snippet": "vectorangularimpulse{${1:c1,c2,...}}"
+      "snippet": "vectorangularimpulse{${1:c1,${2:c2},...}}"
     },
     "angularimpulsevalue{}": {
       "snippet": "angularimpulsevalue{${1:magnitude}}"
@@ -237,28 +237,28 @@
     "angularimpulseonlyderivedunits": {},
     "angularimpulseonlyalternateunits": {},
     "angularimpulsevectorvalue{}": {
-      "snippet": "angularimpulsevectorvalue{${1:c1,c2,...}}"
+      "snippet": "angularimpulsevectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorangularimpulsevalue{}": {
-      "snippet": "vectorangularimpulsevalue{${1:c1,c2,...}}"
+      "snippet": "vectorangularimpulsevalue{${1:c1,${2:c2},...}}"
     },
     "angularimpulsevectorbaseunits{}": {
-      "snippet": "angularimpulsevectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "angularimpulsevectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularimpulsebaseunits{}": {
-      "snippet": "vectorangularimpulsebaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularimpulsebaseunits{${1:c1,${2:c2},...}}"
     },
     "angularimpulsevectorderivedunits{}": {
-      "snippet": "angularimpulsevectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "angularimpulsevectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularimpulsederivedunits{}": {
-      "snippet": "vectorangularimpulsederivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularimpulsederivedunits{${1:c1,${2:c2},...}}"
     },
     "angularimpulsevectoralternateunits{}": {
-      "snippet": "angularimpulsevectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "angularimpulsevectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularimpulsealternateunits{}": {
-      "snippet": "vectorangularimpulsealternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularimpulsealternateunits{${1:c1,${2:c2},...}}"
     },
     "angularimpulsevectoronlybaseunits": {},
     "vectorangularimpulseonlybaseunits": {},
@@ -270,10 +270,10 @@
       "snippet": "angularmomentum{${1:magnitude}}"
     },
     "angularmomentumvector{}": {
-      "snippet": "angularmomentumvector{${1:c1,c2,...}}"
+      "snippet": "angularmomentumvector{${1:c1,${2:c2},...}}"
     },
     "vectorangularmomentum{}": {
-      "snippet": "vectorangularmomentum{${1:c1,c2,...}}"
+      "snippet": "vectorangularmomentum{${1:c1,${2:c2},...}}"
     },
     "angularmomentumvalue{}": {
       "snippet": "angularmomentumvalue{${1:magnitude}}"
@@ -291,28 +291,28 @@
     "angularmomentumonlyderivedunits": {},
     "angularmomentumonlyalternateunits": {},
     "angularmomentumvectorvalue{}": {
-      "snippet": "angularmomentumvectorvalue{${1:c1,c2,...}}"
+      "snippet": "angularmomentumvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorangularmomentumvalue{}": {
-      "snippet": "vectorangularmomentumvalue{${1:c1,c2,...}}"
+      "snippet": "vectorangularmomentumvalue{${1:c1,${2:c2},...}}"
     },
     "angularmomentumvectorbaseunits{}": {
-      "snippet": "angularmomentumvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "angularmomentumvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularmomentumbaseunits{}": {
-      "snippet": "vectorangularmomentumbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularmomentumbaseunits{${1:c1,${2:c2},...}}"
     },
     "angularmomentumvectorderivedunits{}": {
-      "snippet": "angularmomentumvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "angularmomentumvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularmomentumderivedunits{}": {
-      "snippet": "vectorangularmomentumderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularmomentumderivedunits{${1:c1,${2:c2},...}}"
     },
     "angularmomentumvectoralternateunits{}": {
-      "snippet": "angularmomentumvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "angularmomentumvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularmomentumalternateunits{}": {
-      "snippet": "vectorangularmomentumalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularmomentumalternateunits{${1:c1,${2:c2},...}}"
     },
     "angularmomentumvectoronlybaseunits": {},
     "vectorangularmomentumonlybaseunits": {},
@@ -324,10 +324,10 @@
       "snippet": "angularvelocity{${1:magnitude}}"
     },
     "angularvelocityvector{}": {
-      "snippet": "angularvelocityvector{${1:c1,c2,...}}"
+      "snippet": "angularvelocityvector{${1:c1,${2:c2},...}}"
     },
     "vectorangularvelocity{}": {
-      "snippet": "vectorangularvelocity{${1:c1,c2,...}}"
+      "snippet": "vectorangularvelocity{${1:c1,${2:c2},...}}"
     },
     "angularvelocityvalue{}": {
       "snippet": "angularvelocityvalue{${1:magnitude}}"
@@ -345,28 +345,28 @@
     "angularvelocityonlyderivedunits": {},
     "angularvelocityonlyalternateunits": {},
     "angularvelocityvectorvalue{}": {
-      "snippet": "angularvelocityvectorvalue{${1:c1,c2,...}}"
+      "snippet": "angularvelocityvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorangularvelocityvalue{}": {
-      "snippet": "vectorangularvelocityvalue{${1:c1,c2,...}}"
+      "snippet": "vectorangularvelocityvalue{${1:c1,${2:c2},...}}"
     },
     "angularvelocityvectorbaseunits{}": {
-      "snippet": "angularvelocityvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "angularvelocityvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularvelocitybaseunits{}": {
-      "snippet": "vectorangularvelocitybaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularvelocitybaseunits{${1:c1,${2:c2},...}}"
     },
     "angularvelocityvectorderivedunits{}": {
-      "snippet": "angularvelocityvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "angularvelocityvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularvelocityderivedunits{}": {
-      "snippet": "vectorangularvelocityderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularvelocityderivedunits{${1:c1,${2:c2},...}}"
     },
     "angularvelocityvectoralternateunits{}": {
-      "snippet": "angularvelocityvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "angularvelocityvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorangularvelocityalternateunits{}": {
-      "snippet": "vectorangularvelocityalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorangularvelocityalternateunits{${1:c1,${2:c2},...}}"
     },
     "angularvelocityvectoronlybaseunits": {},
     "vectorangularvelocityonlybaseunits": {},
@@ -378,10 +378,10 @@
       "snippet": "cmagneticfield{${1:magnitude}}"
     },
     "cmagneticfieldvector{}": {
-      "snippet": "cmagneticfieldvector{${1:c1,c2,...}}"
+      "snippet": "cmagneticfieldvector{${1:c1,${2:c2},...}}"
     },
     "vectorcmagneticfield{}": {
-      "snippet": "vectorcmagneticfield{${1:c1,c2,...}}"
+      "snippet": "vectorcmagneticfield{${1:c1,${2:c2},...}}"
     },
     "cmagneticfieldvalue{}": {
       "snippet": "cmagneticfieldvalue{${1:magnitude}}"
@@ -399,28 +399,28 @@
     "cmagneticfieldonlyderivedunits": {},
     "cmagneticfieldonlyalternateunits": {},
     "cmagneticfieldvectorvalue{}": {
-      "snippet": "cmagneticfieldvectorvalue{${1:c1,c2,...}}"
+      "snippet": "cmagneticfieldvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorcmagneticfieldvalue{}": {
-      "snippet": "vectorcmagneticfieldvalue{${1:c1,c2,...}}"
+      "snippet": "vectorcmagneticfieldvalue{${1:c1,${2:c2},...}}"
     },
     "cmagneticfieldvectorbaseunits{}": {
-      "snippet": "cmagneticfieldvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "cmagneticfieldvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorcmagneticfieldbaseunits{}": {
-      "snippet": "vectorcmagneticfieldbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorcmagneticfieldbaseunits{${1:c1,${2:c2},...}}"
     },
     "cmagneticfieldvectorderivedunits{}": {
-      "snippet": "cmagneticfieldvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "cmagneticfieldvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorcmagneticfieldderivedunits{}": {
-      "snippet": "vectorcmagneticfieldderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorcmagneticfieldderivedunits{${1:c1,${2:c2},...}}"
     },
     "cmagneticfieldvectoralternateunits{}": {
-      "snippet": "cmagneticfieldvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "cmagneticfieldvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorcmagneticfieldalternateunits{}": {
-      "snippet": "vectorcmagneticfieldalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorcmagneticfieldalternateunits{${1:c1,${2:c2},...}}"
     },
     "cmagneticfieldvectoronlybaseunits": {},
     "vectorcmagneticfieldonlybaseunits": {},
@@ -432,10 +432,10 @@
       "snippet": "currentdensity{${1:magnitude}}"
     },
     "currentdensityvector{}": {
-      "snippet": "currentdensityvector{${1:c1,c2,...}}"
+      "snippet": "currentdensityvector{${1:c1,${2:c2},...}}"
     },
     "vectorcurrentdensity{}": {
-      "snippet": "vectorcurrentdensity{${1:c1,c2,...}}"
+      "snippet": "vectorcurrentdensity{${1:c1,${2:c2},...}}"
     },
     "currentdensityvalue{}": {
       "snippet": "currentdensityvalue{${1:magnitude}}"
@@ -453,28 +453,28 @@
     "currentdensityonlyderivedunits": {},
     "currentdensityonlyalternateunits": {},
     "currentdensityvectorvalue{}": {
-      "snippet": "currentdensityvectorvalue{${1:c1,c2,...}}"
+      "snippet": "currentdensityvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorcurrentdensityvalue{}": {
-      "snippet": "vectorcurrentdensityvalue{${1:c1,c2,...}}"
+      "snippet": "vectorcurrentdensityvalue{${1:c1,${2:c2},...}}"
     },
     "currentdensityvectorbaseunits{}": {
-      "snippet": "currentdensityvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "currentdensityvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorcurrentdensitybaseunits{}": {
-      "snippet": "vectorcurrentdensitybaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorcurrentdensitybaseunits{${1:c1,${2:c2},...}}"
     },
     "currentdensityvectorderivedunits{}": {
-      "snippet": "currentdensityvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "currentdensityvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorcurrentdensityderivedunits{}": {
-      "snippet": "vectorcurrentdensityderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorcurrentdensityderivedunits{${1:c1,${2:c2},...}}"
     },
     "currentdensityvectoralternateunits{}": {
-      "snippet": "currentdensityvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "currentdensityvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorcurrentdensityalternateunits{}": {
-      "snippet": "vectorcurrentdensityalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorcurrentdensityalternateunits{${1:c1,${2:c2},...}}"
     },
     "currentdensityvectoronlybaseunits": {},
     "vectorcurrentdensityonlybaseunits": {},
@@ -486,10 +486,10 @@
       "snippet": "direction{${1:magnitude}}"
     },
     "directionvector{}": {
-      "snippet": "directionvector{${1:c1,c2,...}}"
+      "snippet": "directionvector{${1:c1,${2:c2},...}}"
     },
     "vectordirection{}": {
-      "snippet": "vectordirection{${1:c1,c2,...}}"
+      "snippet": "vectordirection{${1:c1,${2:c2},...}}"
     },
     "directionvalue{}": {
       "snippet": "directionvalue{${1:magnitude}}"
@@ -507,28 +507,28 @@
     "directiononlyderivedunits": {},
     "directiononlyalternateunits": {},
     "directionvectorvalue{}": {
-      "snippet": "directionvectorvalue{${1:c1,c2,...}}"
+      "snippet": "directionvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectordirectionvalue{}": {
-      "snippet": "vectordirectionvalue{${1:c1,c2,...}}"
+      "snippet": "vectordirectionvalue{${1:c1,${2:c2},...}}"
     },
     "directionvectorbaseunits{}": {
-      "snippet": "directionvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "directionvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectordirectionbaseunits{}": {
-      "snippet": "vectordirectionbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectordirectionbaseunits{${1:c1,${2:c2},...}}"
     },
     "directionvectorderivedunits{}": {
-      "snippet": "directionvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "directionvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectordirectionderivedunits{}": {
-      "snippet": "vectordirectionderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectordirectionderivedunits{${1:c1,${2:c2},...}}"
     },
     "directionvectoralternateunits{}": {
-      "snippet": "directionvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "directionvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectordirectionalternateunits{}": {
-      "snippet": "vectordirectionalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectordirectionalternateunits{${1:c1,${2:c2},...}}"
     },
     "directionvectoronlybaseunits": {},
     "vectordirectiononlybaseunits": {},
@@ -540,10 +540,10 @@
       "snippet": "displacement{${1:magnitude}}"
     },
     "displacementvector{}": {
-      "snippet": "displacementvector{${1:c1,c2,...}}"
+      "snippet": "displacementvector{${1:c1,${2:c2},...}}"
     },
     "vectordisplacement{}": {
-      "snippet": "vectordisplacement{${1:c1,c2,...}}"
+      "snippet": "vectordisplacement{${1:c1,${2:c2},...}}"
     },
     "displacementvalue{}": {
       "snippet": "displacementvalue{${1:magnitude}}"
@@ -561,28 +561,28 @@
     "displacementonlyderivedunits": {},
     "displacementonlyalternateunits": {},
     "displacementvectorvalue{}": {
-      "snippet": "displacementvectorvalue{${1:c1,c2,...}}"
+      "snippet": "displacementvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectordisplacementvalue{}": {
-      "snippet": "vectordisplacementvalue{${1:c1,c2,...}}"
+      "snippet": "vectordisplacementvalue{${1:c1,${2:c2},...}}"
     },
     "displacementvectorbaseunits{}": {
-      "snippet": "displacementvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "displacementvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectordisplacementbaseunits{}": {
-      "snippet": "vectordisplacementbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectordisplacementbaseunits{${1:c1,${2:c2},...}}"
     },
     "displacementvectorderivedunits{}": {
-      "snippet": "displacementvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "displacementvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectordisplacementderivedunits{}": {
-      "snippet": "vectordisplacementderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectordisplacementderivedunits{${1:c1,${2:c2},...}}"
     },
     "displacementvectoralternateunits{}": {
-      "snippet": "displacementvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "displacementvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectordisplacementalternateunits{}": {
-      "snippet": "vectordisplacementalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectordisplacementalternateunits{${1:c1,${2:c2},...}}"
     },
     "displacementvectoronlybaseunits": {},
     "vectordisplacementonlybaseunits": {},
@@ -594,10 +594,10 @@
       "snippet": "electricdipolemoment{${1:magnitude}}"
     },
     "electricdipolemomentvector{}": {
-      "snippet": "electricdipolemomentvector{${1:c1,c2,...}}"
+      "snippet": "electricdipolemomentvector{${1:c1,${2:c2},...}}"
     },
     "vectorelectricdipolemoment{}": {
-      "snippet": "vectorelectricdipolemoment{${1:c1,c2,...}}"
+      "snippet": "vectorelectricdipolemoment{${1:c1,${2:c2},...}}"
     },
     "electricdipolemomentvalue{}": {
       "snippet": "electricdipolemomentvalue{${1:magnitude}}"
@@ -615,28 +615,28 @@
     "electricdipolemomentonlyderivedunits": {},
     "electricdipolemomentonlyalternateunits": {},
     "electricdipolemomentvectorvalue{}": {
-      "snippet": "electricdipolemomentvectorvalue{${1:c1,c2,...}}"
+      "snippet": "electricdipolemomentvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorelectricdipolemomentvalue{}": {
-      "snippet": "vectorelectricdipolemomentvalue{${1:c1,c2,...}}"
+      "snippet": "vectorelectricdipolemomentvalue{${1:c1,${2:c2},...}}"
     },
     "electricdipolemomentvectorbaseunits{}": {
-      "snippet": "electricdipolemomentvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "electricdipolemomentvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorelectricdipolemomentbaseunits{}": {
-      "snippet": "vectorelectricdipolemomentbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorelectricdipolemomentbaseunits{${1:c1,${2:c2},...}}"
     },
     "electricdipolemomentvectorderivedunits{}": {
-      "snippet": "electricdipolemomentvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "electricdipolemomentvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorelectricdipolemomentderivedunits{}": {
-      "snippet": "vectorelectricdipolemomentderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorelectricdipolemomentderivedunits{${1:c1,${2:c2},...}}"
     },
     "electricdipolemomentvectoralternateunits{}": {
-      "snippet": "electricdipolemomentvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "electricdipolemomentvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorelectricdipolemomentalternateunits{}": {
-      "snippet": "vectorelectricdipolemomentalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorelectricdipolemomentalternateunits{${1:c1,${2:c2},...}}"
     },
     "electricdipolemomentvectoronlybaseunits": {},
     "vectorelectricdipolemomentonlybaseunits": {},
@@ -648,10 +648,10 @@
       "snippet": "electricfield{${1:magnitude}}"
     },
     "electricfieldvector{}": {
-      "snippet": "electricfieldvector{${1:c1,c2,...}}"
+      "snippet": "electricfieldvector{${1:c1,${2:c2},...}}"
     },
     "vectorelectricfield{}": {
-      "snippet": "vectorelectricfield{${1:c1,c2,...}}"
+      "snippet": "vectorelectricfield{${1:c1,${2:c2},...}}"
     },
     "electricfieldvalue{}": {
       "snippet": "electricfieldvalue{${1:magnitude}}"
@@ -669,28 +669,28 @@
     "electricfieldonlyderivedunits": {},
     "electricfieldonlyalternateunits": {},
     "electricfieldvectorvalue{}": {
-      "snippet": "electricfieldvectorvalue{${1:c1,c2,...}}"
+      "snippet": "electricfieldvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorelectricfieldvalue{}": {
-      "snippet": "vectorelectricfieldvalue{${1:c1,c2,...}}"
+      "snippet": "vectorelectricfieldvalue{${1:c1,${2:c2},...}}"
     },
     "electricfieldvectorbaseunits{}": {
-      "snippet": "electricfieldvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "electricfieldvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorelectricfieldbaseunits{}": {
-      "snippet": "vectorelectricfieldbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorelectricfieldbaseunits{${1:c1,${2:c2},...}}"
     },
     "electricfieldvectorderivedunits{}": {
-      "snippet": "electricfieldvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "electricfieldvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorelectricfieldderivedunits{}": {
-      "snippet": "vectorelectricfieldderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorelectricfieldderivedunits{${1:c1,${2:c2},...}}"
     },
     "electricfieldvectoralternateunits{}": {
-      "snippet": "electricfieldvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "electricfieldvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorelectricfieldalternateunits{}": {
-      "snippet": "vectorelectricfieldalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorelectricfieldalternateunits{${1:c1,${2:c2},...}}"
     },
     "electricfieldvectoronlybaseunits": {},
     "vectorelectricfieldonlybaseunits": {},
@@ -702,10 +702,10 @@
       "snippet": "energyflux{${1:magnitude}}"
     },
     "energyfluxvector{}": {
-      "snippet": "energyfluxvector{${1:c1,c2,...}}"
+      "snippet": "energyfluxvector{${1:c1,${2:c2},...}}"
     },
     "vectorenergyflux{}": {
-      "snippet": "vectorenergyflux{${1:c1,c2,...}}"
+      "snippet": "vectorenergyflux{${1:c1,${2:c2},...}}"
     },
     "energyfluxvalue{}": {
       "snippet": "energyfluxvalue{${1:magnitude}}"
@@ -723,28 +723,28 @@
     "energyfluxonlyderivedunits": {},
     "energyfluxonlyalternateunits": {},
     "energyfluxvectorvalue{}": {
-      "snippet": "energyfluxvectorvalue{${1:c1,c2,...}}"
+      "snippet": "energyfluxvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorenergyfluxvalue{}": {
-      "snippet": "vectorenergyfluxvalue{${1:c1,c2,...}}"
+      "snippet": "vectorenergyfluxvalue{${1:c1,${2:c2},...}}"
     },
     "energyfluxvectorbaseunits{}": {
-      "snippet": "energyfluxvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "energyfluxvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorenergyfluxbaseunits{}": {
-      "snippet": "vectorenergyfluxbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorenergyfluxbaseunits{${1:c1,${2:c2},...}}"
     },
     "energyfluxvectorderivedunits{}": {
-      "snippet": "energyfluxvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "energyfluxvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorenergyfluxderivedunits{}": {
-      "snippet": "vectorenergyfluxderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorenergyfluxderivedunits{${1:c1,${2:c2},...}}"
     },
     "energyfluxvectoralternateunits{}": {
-      "snippet": "energyfluxvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "energyfluxvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorenergyfluxalternateunits{}": {
-      "snippet": "vectorenergyfluxalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorenergyfluxalternateunits{${1:c1,${2:c2},...}}"
     },
     "energyfluxvectoronlybaseunits": {},
     "vectorenergyfluxonlybaseunits": {},
@@ -756,10 +756,10 @@
       "snippet": "force{${1:magnitude}}"
     },
     "forcevector{}": {
-      "snippet": "forcevector{${1:c1,c2,...}}"
+      "snippet": "forcevector{${1:c1,${2:c2},...}}"
     },
     "vectorforce{}": {
-      "snippet": "vectorforce{${1:c1,c2,...}}"
+      "snippet": "vectorforce{${1:c1,${2:c2},...}}"
     },
     "forcevalue{}": {
       "snippet": "forcevalue{${1:magnitude}}"
@@ -777,28 +777,28 @@
     "forceonlyderivedunits": {},
     "forceonlyalternateunits": {},
     "forcevectorvalue{}": {
-      "snippet": "forcevectorvalue{${1:c1,c2,...}}"
+      "snippet": "forcevectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorforcevalue{}": {
-      "snippet": "vectorforcevalue{${1:c1,c2,...}}"
+      "snippet": "vectorforcevalue{${1:c1,${2:c2},...}}"
     },
     "forcevectorbaseunits{}": {
-      "snippet": "forcevectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "forcevectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorforcebaseunits{}": {
-      "snippet": "vectorforcebaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorforcebaseunits{${1:c1,${2:c2},...}}"
     },
     "forcevectorderivedunits{}": {
-      "snippet": "forcevectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "forcevectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorforcederivedunits{}": {
-      "snippet": "vectorforcederivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorforcederivedunits{${1:c1,${2:c2},...}}"
     },
     "forcevectoralternateunits{}": {
-      "snippet": "forcevectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "forcevectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorforcealternateunits{}": {
-      "snippet": "vectorforcealternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorforcealternateunits{${1:c1,${2:c2},...}}"
     },
     "forcevectoronlybaseunits": {},
     "vectorforceonlybaseunits": {},
@@ -810,10 +810,10 @@
       "snippet": "gravitationalfield{${1:magnitude}}"
     },
     "gravitationalfieldvector{}": {
-      "snippet": "gravitationalfieldvector{${1:c1,c2,...}}"
+      "snippet": "gravitationalfieldvector{${1:c1,${2:c2},...}}"
     },
     "vectorgravitationalfield{}": {
-      "snippet": "vectorgravitationalfield{${1:c1,c2,...}}"
+      "snippet": "vectorgravitationalfield{${1:c1,${2:c2},...}}"
     },
     "gravitationalfieldvalue{}": {
       "snippet": "gravitationalfieldvalue{${1:magnitude}}"
@@ -831,28 +831,28 @@
     "gravitationalfieldonlyderivedunits": {},
     "gravitationalfieldonlyalternateunits": {},
     "gravitationalfieldvectorvalue{}": {
-      "snippet": "gravitationalfieldvectorvalue{${1:c1,c2,...}}"
+      "snippet": "gravitationalfieldvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorgravitationalfieldvalue{}": {
-      "snippet": "vectorgravitationalfieldvalue{${1:c1,c2,...}}"
+      "snippet": "vectorgravitationalfieldvalue{${1:c1,${2:c2},...}}"
     },
     "gravitationalfieldvectorbaseunits{}": {
-      "snippet": "gravitationalfieldvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "gravitationalfieldvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorgravitationalfieldbaseunits{}": {
-      "snippet": "vectorgravitationalfieldbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorgravitationalfieldbaseunits{${1:c1,${2:c2},...}}"
     },
     "gravitationalfieldvectorderivedunits{}": {
-      "snippet": "gravitationalfieldvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "gravitationalfieldvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorgravitationalfieldderivedunits{}": {
-      "snippet": "vectorgravitationalfieldderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorgravitationalfieldderivedunits{${1:c1,${2:c2},...}}"
     },
     "gravitationalfieldvectoralternateunits{}": {
-      "snippet": "gravitationalfieldvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "gravitationalfieldvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorgravitationalfieldalternateunits{}": {
-      "snippet": "vectorgravitationalfieldalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorgravitationalfieldalternateunits{${1:c1,${2:c2},...}}"
     },
     "gravitationalfieldvectoronlybaseunits": {},
     "vectorgravitationalfieldonlybaseunits": {},
@@ -864,10 +864,10 @@
       "snippet": "impulse{${1:magnitude}}"
     },
     "impulsevector{}": {
-      "snippet": "impulsevector{${1:c1,c2,...}}"
+      "snippet": "impulsevector{${1:c1,${2:c2},...}}"
     },
     "vectorimpulse{}": {
-      "snippet": "vectorimpulse{${1:c1,c2,...}}"
+      "snippet": "vectorimpulse{${1:c1,${2:c2},...}}"
     },
     "impulsevalue{}": {
       "snippet": "impulsevalue{${1:magnitude}}"
@@ -885,28 +885,28 @@
     "impulseonlyderivedunits": {},
     "impulseonlyalternateunits": {},
     "impulsevectorvalue{}": {
-      "snippet": "impulsevectorvalue{${1:c1,c2,...}}"
+      "snippet": "impulsevectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorimpulsevalue{}": {
-      "snippet": "vectorimpulsevalue{${1:c1,c2,...}}"
+      "snippet": "vectorimpulsevalue{${1:c1,${2:c2},...}}"
     },
     "impulsevectorbaseunits{}": {
-      "snippet": "impulsevectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "impulsevectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorimpulsebaseunits{}": {
-      "snippet": "vectorimpulsebaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorimpulsebaseunits{${1:c1,${2:c2},...}}"
     },
     "impulsevectorderivedunits{}": {
-      "snippet": "impulsevectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "impulsevectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorimpulsederivedunits{}": {
-      "snippet": "vectorimpulsederivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorimpulsederivedunits{${1:c1,${2:c2},...}}"
     },
     "impulsevectoralternateunits{}": {
-      "snippet": "impulsevectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "impulsevectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorimpulsealternateunits{}": {
-      "snippet": "vectorimpulsealternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorimpulsealternateunits{${1:c1,${2:c2},...}}"
     },
     "impulsevectoronlybaseunits": {},
     "vectorimpulseonlybaseunits": {},
@@ -918,10 +918,10 @@
       "snippet": "magneticdipolemoment{${1:magnitude}}"
     },
     "magneticdipolemomentvector{}": {
-      "snippet": "magneticdipolemomentvector{${1:c1,c2,...}}"
+      "snippet": "magneticdipolemomentvector{${1:c1,${2:c2},...}}"
     },
     "vectormagneticdipolemoment{}": {
-      "snippet": "vectormagneticdipolemoment{${1:c1,c2,...}}"
+      "snippet": "vectormagneticdipolemoment{${1:c1,${2:c2},...}}"
     },
     "magneticdipolemomentvalue{}": {
       "snippet": "magneticdipolemomentvalue{${1:magnitude}}"
@@ -939,28 +939,28 @@
     "magneticdipolemomentonlyderivedunits": {},
     "magneticdipolemomentonlyalternateunits": {},
     "magneticdipolemomentvectorvalue{}": {
-      "snippet": "magneticdipolemomentvectorvalue{${1:c1,c2,...}}"
+      "snippet": "magneticdipolemomentvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectormagneticdipolemomentvalue{}": {
-      "snippet": "vectormagneticdipolemomentvalue{${1:c1,c2,...}}"
+      "snippet": "vectormagneticdipolemomentvalue{${1:c1,${2:c2},...}}"
     },
     "magneticdipolemomentvectorbaseunits{}": {
-      "snippet": "magneticdipolemomentvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "magneticdipolemomentvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectormagneticdipolemomentbaseunits{}": {
-      "snippet": "vectormagneticdipolemomentbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectormagneticdipolemomentbaseunits{${1:c1,${2:c2},...}}"
     },
     "magneticdipolemomentvectorderivedunits{}": {
-      "snippet": "magneticdipolemomentvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "magneticdipolemomentvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectormagneticdipolemomentderivedunits{}": {
-      "snippet": "vectormagneticdipolemomentderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectormagneticdipolemomentderivedunits{${1:c1,${2:c2},...}}"
     },
     "magneticdipolemomentvectoralternateunits{}": {
-      "snippet": "magneticdipolemomentvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "magneticdipolemomentvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectormagneticdipolemomentalternateunits{}": {
-      "snippet": "vectormagneticdipolemomentalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectormagneticdipolemomentalternateunits{${1:c1,${2:c2},...}}"
     },
     "magneticdipolemomentvectoronlybaseunits": {},
     "vectormagneticdipolemomentonlybaseunits": {},
@@ -972,10 +972,10 @@
       "snippet": "magneticfield{${1:magnitude}}"
     },
     "magneticfieldvector{}": {
-      "snippet": "magneticfieldvector{${1:c1,c2,...}}"
+      "snippet": "magneticfieldvector{${1:c1,${2:c2},...}}"
     },
     "vectormagneticfield{}": {
-      "snippet": "vectormagneticfield{${1:c1,c2,...}}"
+      "snippet": "vectormagneticfield{${1:c1,${2:c2},...}}"
     },
     "magneticfieldvalue{}": {
       "snippet": "magneticfieldvalue{${1:magnitude}}"
@@ -993,28 +993,28 @@
     "magneticfieldonlyderivedunits": {},
     "magneticfieldonlyalternateunits": {},
     "magneticfieldvectorvalue{}": {
-      "snippet": "magneticfieldvectorvalue{${1:c1,c2,...}}"
+      "snippet": "magneticfieldvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectormagneticfieldvalue{}": {
-      "snippet": "vectormagneticfieldvalue{${1:c1,c2,...}}"
+      "snippet": "vectormagneticfieldvalue{${1:c1,${2:c2},...}}"
     },
     "magneticfieldvectorbaseunits{}": {
-      "snippet": "magneticfieldvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "magneticfieldvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectormagneticfieldbaseunits{}": {
-      "snippet": "vectormagneticfieldbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectormagneticfieldbaseunits{${1:c1,${2:c2},...}}"
     },
     "magneticfieldvectorderivedunits{}": {
-      "snippet": "magneticfieldvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "magneticfieldvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectormagneticfieldderivedunits{}": {
-      "snippet": "vectormagneticfieldderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectormagneticfieldderivedunits{${1:c1,${2:c2},...}}"
     },
     "magneticfieldvectoralternateunits{}": {
-      "snippet": "magneticfieldvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "magneticfieldvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectormagneticfieldalternateunits{}": {
-      "snippet": "vectormagneticfieldalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectormagneticfieldalternateunits{${1:c1,${2:c2},...}}"
     },
     "magneticfieldvectoronlybaseunits": {},
     "vectormagneticfieldonlybaseunits": {},
@@ -1026,10 +1026,10 @@
       "snippet": "momentumflux{${1:magnitude}}"
     },
     "momentumfluxvector{}": {
-      "snippet": "momentumfluxvector{${1:c1,c2,...}}"
+      "snippet": "momentumfluxvector{${1:c1,${2:c2},...}}"
     },
     "vectormomentumflux{}": {
-      "snippet": "vectormomentumflux{${1:c1,c2,...}}"
+      "snippet": "vectormomentumflux{${1:c1,${2:c2},...}}"
     },
     "momentumfluxvalue{}": {
       "snippet": "momentumfluxvalue{${1:magnitude}}"
@@ -1047,28 +1047,28 @@
     "momentumfluxonlyderivedunits": {},
     "momentumfluxonlyalternateunits": {},
     "momentumfluxvectorvalue{}": {
-      "snippet": "momentumfluxvectorvalue{${1:c1,c2,...}}"
+      "snippet": "momentumfluxvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectormomentumfluxvalue{}": {
-      "snippet": "vectormomentumfluxvalue{${1:c1,c2,...}}"
+      "snippet": "vectormomentumfluxvalue{${1:c1,${2:c2},...}}"
     },
     "momentumfluxvectorbaseunits{}": {
-      "snippet": "momentumfluxvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "momentumfluxvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectormomentumfluxbaseunits{}": {
-      "snippet": "vectormomentumfluxbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectormomentumfluxbaseunits{${1:c1,${2:c2},...}}"
     },
     "momentumfluxvectorderivedunits{}": {
-      "snippet": "momentumfluxvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "momentumfluxvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectormomentumfluxderivedunits{}": {
-      "snippet": "vectormomentumfluxderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectormomentumfluxderivedunits{${1:c1,${2:c2},...}}"
     },
     "momentumfluxvectoralternateunits{}": {
-      "snippet": "momentumfluxvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "momentumfluxvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectormomentumfluxalternateunits{}": {
-      "snippet": "vectormomentumfluxalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectormomentumfluxalternateunits{${1:c1,${2:c2},...}}"
     },
     "momentumfluxvectoronlybaseunits": {},
     "vectormomentumfluxonlybaseunits": {},
@@ -1080,10 +1080,10 @@
       "snippet": "poynting{${1:magnitude}}"
     },
     "poyntingvector{}": {
-      "snippet": "poyntingvector{${1:c1,c2,...}}"
+      "snippet": "poyntingvector{${1:c1,${2:c2},...}}"
     },
     "vectorpoynting{}": {
-      "snippet": "vectorpoynting{${1:c1,c2,...}}"
+      "snippet": "vectorpoynting{${1:c1,${2:c2},...}}"
     },
     "poyntingvalue{}": {
       "snippet": "poyntingvalue{${1:magnitude}}"
@@ -1101,28 +1101,28 @@
     "poyntingonlyderivedunits": {},
     "poyntingonlyalternateunits": {},
     "poyntingvectorvalue{}": {
-      "snippet": "poyntingvectorvalue{${1:c1,c2,...}}"
+      "snippet": "poyntingvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorpoyntingvalue{}": {
-      "snippet": "vectorpoyntingvalue{${1:c1,c2,...}}"
+      "snippet": "vectorpoyntingvalue{${1:c1,${2:c2},...}}"
     },
     "poyntingvectorbaseunits{}": {
-      "snippet": "poyntingvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "poyntingvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorpoyntingbaseunits{}": {
-      "snippet": "vectorpoyntingbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorpoyntingbaseunits{${1:c1,${2:c2},...}}"
     },
     "poyntingvectorderivedunits{}": {
-      "snippet": "poyntingvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "poyntingvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorpoyntingderivedunits{}": {
-      "snippet": "vectorpoyntingderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorpoyntingderivedunits{${1:c1,${2:c2},...}}"
     },
     "poyntingvectoralternateunits{}": {
-      "snippet": "poyntingvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "poyntingvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorpoyntingalternateunits{}": {
-      "snippet": "vectorpoyntingalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorpoyntingalternateunits{${1:c1,${2:c2},...}}"
     },
     "poyntingvectoronlybaseunits": {},
     "vectorpoyntingonlybaseunits": {},
@@ -1134,10 +1134,10 @@
       "snippet": "torque{${1:magnitude}}"
     },
     "torquevector{}": {
-      "snippet": "torquevector{${1:c1,c2,...}}"
+      "snippet": "torquevector{${1:c1,${2:c2},...}}"
     },
     "vectortorque{}": {
-      "snippet": "vectortorque{${1:c1,c2,...}}"
+      "snippet": "vectortorque{${1:c1,${2:c2},...}}"
     },
     "torquevalue{}": {
       "snippet": "torquevalue{${1:magnitude}}"
@@ -1155,28 +1155,28 @@
     "torqueonlyderivedunits": {},
     "torqueonlyalternateunits": {},
     "torquevectorvalue{}": {
-      "snippet": "torquevectorvalue{${1:c1,c2,...}}"
+      "snippet": "torquevectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectortorquevalue{}": {
-      "snippet": "vectortorquevalue{${1:c1,c2,...}}"
+      "snippet": "vectortorquevalue{${1:c1,${2:c2},...}}"
     },
     "torquevectorbaseunits{}": {
-      "snippet": "torquevectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "torquevectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectortorquebaseunits{}": {
-      "snippet": "vectortorquebaseunits{${1:c1,c2,...}}"
+      "snippet": "vectortorquebaseunits{${1:c1,${2:c2},...}}"
     },
     "torquevectorderivedunits{}": {
-      "snippet": "torquevectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "torquevectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectortorquederivedunits{}": {
-      "snippet": "vectortorquederivedunits{${1:c1,c2,...}}"
+      "snippet": "vectortorquederivedunits{${1:c1,${2:c2},...}}"
     },
     "torquevectoralternateunits{}": {
-      "snippet": "torquevectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "torquevectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectortorquealternateunits{}": {
-      "snippet": "vectortorquealternateunits{${1:c1,c2,...}}"
+      "snippet": "vectortorquealternateunits{${1:c1,${2:c2},...}}"
     },
     "torquevectoronlybaseunits": {},
     "vectortorqueonlybaseunits": {},
@@ -1188,10 +1188,10 @@
       "snippet": "velocity{${1:magnitude}}"
     },
     "velocityvector{}": {
-      "snippet": "velocityvector{${1:c1,c2,...}}"
+      "snippet": "velocityvector{${1:c1,${2:c2},...}}"
     },
     "vectorvelocity{}": {
-      "snippet": "vectorvelocity{${1:c1,c2,...}}"
+      "snippet": "vectorvelocity{${1:c1,${2:c2},...}}"
     },
     "velocityvalue{}": {
       "snippet": "velocityvalue{${1:magnitude}}"
@@ -1209,28 +1209,28 @@
     "velocityonlyderivedunits": {},
     "velocityonlyalternateunits": {},
     "velocityvectorvalue{}": {
-      "snippet": "velocityvectorvalue{${1:c1,c2,...}}"
+      "snippet": "velocityvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorvelocityvalue{}": {
-      "snippet": "vectorvelocityvalue{${1:c1,c2,...}}"
+      "snippet": "vectorvelocityvalue{${1:c1,${2:c2},...}}"
     },
     "velocityvectorbaseunits{}": {
-      "snippet": "velocityvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "velocityvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorvelocitybaseunits{}": {
-      "snippet": "vectorvelocitybaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorvelocitybaseunits{${1:c1,${2:c2},...}}"
     },
     "velocityvectorderivedunits{}": {
-      "snippet": "velocityvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "velocityvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorvelocityderivedunits{}": {
-      "snippet": "vectorvelocityderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorvelocityderivedunits{${1:c1,${2:c2},...}}"
     },
     "velocityvectoralternateunits{}": {
-      "snippet": "velocityvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "velocityvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorvelocityalternateunits{}": {
-      "snippet": "vectorvelocityalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorvelocityalternateunits{${1:c1,${2:c2},...}}"
     },
     "velocityvectoronlybaseunits": {},
     "vectorvelocityonlybaseunits": {},
@@ -1242,10 +1242,10 @@
       "snippet": "velocityc{${1:magnitude}}"
     },
     "velocitycvector{}": {
-      "snippet": "velocitycvector{${1:c1,c2,...}}"
+      "snippet": "velocitycvector{${1:c1,${2:c2},...}}"
     },
     "vectorvelocityc{}": {
-      "snippet": "vectorvelocityc{${1:c1,c2,...}}"
+      "snippet": "vectorvelocityc{${1:c1,${2:c2},...}}"
     },
     "velocitycvalue{}": {
       "snippet": "velocitycvalue{${1:magnitude}}"
@@ -1263,28 +1263,28 @@
     "velocityconlyderivedunits": {},
     "velocityconlyalternateunits": {},
     "velocitycvectorvalue{}": {
-      "snippet": "velocitycvectorvalue{${1:c1,c2,...}}"
+      "snippet": "velocitycvectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorvelocitycvalue{}": {
-      "snippet": "vectorvelocitycvalue{${1:c1,c2,...}}"
+      "snippet": "vectorvelocitycvalue{${1:c1,${2:c2},...}}"
     },
     "velocitycvectorbaseunits{}": {
-      "snippet": "velocitycvectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "velocitycvectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorvelocitycbaseunits{}": {
-      "snippet": "vectorvelocitycbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorvelocitycbaseunits{${1:c1,${2:c2},...}}"
     },
     "velocitycvectorderivedunits{}": {
-      "snippet": "velocitycvectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "velocitycvectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorvelocitycderivedunits{}": {
-      "snippet": "vectorvelocitycderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorvelocitycderivedunits{${1:c1,${2:c2},...}}"
     },
     "velocitycvectoralternateunits{}": {
-      "snippet": "velocitycvectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "velocitycvectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorvelocitycalternateunits{}": {
-      "snippet": "vectorvelocitycalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorvelocitycalternateunits{${1:c1,${2:c2},...}}"
     },
     "velocitycvectoronlybaseunits": {},
     "vectorvelocityconlybaseunits": {},
@@ -1296,10 +1296,10 @@
       "snippet": "wavenumber{${1:magnitude}}"
     },
     "wavenumbervector{}": {
-      "snippet": "wavenumbervector{${1:c1,c2,...}}"
+      "snippet": "wavenumbervector{${1:c1,${2:c2},...}}"
     },
     "vectorwavenumber{}": {
-      "snippet": "vectorwavenumber{${1:c1,c2,...}}"
+      "snippet": "vectorwavenumber{${1:c1,${2:c2},...}}"
     },
     "wavenumbervalue{}": {
       "snippet": "wavenumbervalue{${1:magnitude}}"
@@ -1317,28 +1317,28 @@
     "wavenumberonlyderivedunits": {},
     "wavenumberonlyalternateunits": {},
     "wavenumbervectorvalue{}": {
-      "snippet": "wavenumbervectorvalue{${1:c1,c2,...}}"
+      "snippet": "wavenumbervectorvalue{${1:c1,${2:c2},...}}"
     },
     "vectorwavenumbervalue{}": {
-      "snippet": "vectorwavenumbervalue{${1:c1,c2,...}}"
+      "snippet": "vectorwavenumbervalue{${1:c1,${2:c2},...}}"
     },
     "wavenumbervectorbaseunits{}": {
-      "snippet": "wavenumbervectorbaseunits{${1:c1,c2,...}}"
+      "snippet": "wavenumbervectorbaseunits{${1:c1,${2:c2},...}}"
     },
     "vectorwavenumberbaseunits{}": {
-      "snippet": "vectorwavenumberbaseunits{${1:c1,c2,...}}"
+      "snippet": "vectorwavenumberbaseunits{${1:c1,${2:c2},...}}"
     },
     "wavenumbervectorderivedunits{}": {
-      "snippet": "wavenumbervectorderivedunits{${1:c1,c2,...}}"
+      "snippet": "wavenumbervectorderivedunits{${1:c1,${2:c2},...}}"
     },
     "vectorwavenumberderivedunits{}": {
-      "snippet": "vectorwavenumberderivedunits{${1:c1,c2,...}}"
+      "snippet": "vectorwavenumberderivedunits{${1:c1,${2:c2},...}}"
     },
     "wavenumbervectoralternateunits{}": {
-      "snippet": "wavenumbervectoralternateunits{${1:c1,c2,...}}"
+      "snippet": "wavenumbervectoralternateunits{${1:c1,${2:c2},...}}"
     },
     "vectorwavenumberalternateunits{}": {
-      "snippet": "vectorwavenumberalternateunits{${1:c1,c2,...}}"
+      "snippet": "vectorwavenumberalternateunits{${1:c1,${2:c2},...}}"
     },
     "wavenumbervectoronlybaseunits": {},
     "vectorwavenumberonlybaseunits": {},
@@ -2933,16 +2933,16 @@
       "snippet": "xtento{${1:number}}"
     },
     "mivector{}": {
-      "snippet": "mivector{${1:c1,c2,...}}"
+      "snippet": "mivector{${1:c1,${2:c2},...}}"
     },
     "mivector[]{}": {
-      "snippet": "mivector[${2:delimiter}]{${1:c1,c2,...}}"
+      "snippet": "mivector[${2:delimiter}]{${1:c1,${3:c2},...}}"
     },
     "mivector{}[]": {
-      "snippet": "mivector{${1:c1,c2,...}}[${2:units}]"
+      "snippet": "mivector{${1:c1,${3:c2},...}}[${2:units}]"
     },
     "mivector[]{}[]": {
-      "snippet": "mivector[${2:delimiter}]{${1:c1,c2,...}}[${3:units}]"
+      "snippet": "mivector[${2:delimiter}]{${1:c1,${4:c2},...}}[${3:units}]"
     }
   },
   "envs": {
diff --git a/dev/packages/mandistudent.json b/dev/packages/mandistudent.json
index f31d8e604..3b24464be 100644
--- a/dev/packages/mandistudent.json
+++ b/dev/packages/mandistudent.json
@@ -169,16 +169,16 @@
       "keyvalpos": 0
     },
     "colvec{}": {
-      "snippet": "colvec{${1:c1,c2,...}}"
+      "snippet": "colvec{${1:c1,${2:c2},...}}"
     },
     "colvec[]{}": {
-      "snippet": "colvec[${2:delimiter}]{${1:c1,c2,...}}"
+      "snippet": "colvec[${2:delimiter}]{${1:c1,${3:c2},...}}"
     },
     "rowvec{}": {
-      "snippet": "rowvec{${1:c1,c2,...}}"
+      "snippet": "rowvec{${1:c1,${2:c2},...}}"
     },
     "rowvec[]{}": {
-      "snippet": "rowvec[${2:delimiter}]{${1:c1,c2,...}}"
+      "snippet": "rowvec[${2:delimiter}]{${1:c1,${3:c2},...}}"
     },
     "veccomp{}": {
       "snippet": "veccomp{${1:symbol}}"
@@ -217,9 +217,15 @@
     "vpythonfile{}{}": {
       "snippet": "vpythonfile{${1:file}}{${2:caption}}"
     },
+    "vpythonfile(){}{}": {
+      "snippet": "vpythonfile(${3:link}){${1:file}}{${2:caption}}"
+    },
     "vpythonfile[]{}{}": {
       "snippet": "vpythonfile[${3:options}]{${1:file}}{${2:caption}}"
     },
+    "vpythonfile[](){}{}": {
+      "snippet": "vpythonfile[${3:options}](${4:link}){${1:file}}{${2:caption}}"
+    },
     "webvpythoninline{}": {
       "snippet": "webvpythoninline{${1:Web VPython code}}"
     },
@@ -329,6 +335,22 @@
     "parts": {},
     "physicssolution": {},
     "physicssolution*": {},
+    "webvpythonblock(link){}": {
+      "name": "webvpythonblock",
+      "snippet": "(${2:link}){${1:caption}}"
+    },
+    "webvpythonblock[](link){}": {
+      "name": "webvpythonblock",
+      "snippet": "[${2:options}](${3:link}){${1:caption}}"
+    },
+    "webvpythonblock*(link){}": {
+      "name": "webvpythonblock*",
+      "snippet": "(${2:link}){${1:caption}}"
+    },
+    "webvpythonblock*[](link){}": {
+      "name": "webvpythonblock*",
+      "snippet": "[${2:options}](${3:link}){${1:caption}}"
+    },
     "enumerate*": {},
     "enumerate*[]": {
       "name": "enumerate*",
diff --git a/dev/packages/mathsemantics-manifolds.json b/dev/packages/mathsemantics-manifolds.json
index 9b96167c0..a4f1d3d1a 100644
--- a/dev/packages/mathsemantics-manifolds.json
+++ b/dev/packages/mathsemantics-manifolds.json
@@ -45,37 +45,73 @@
     "exponential{}": {
       "snippet": "exponential{${1:base}}"
     },
+    "exponential{}()": {
+      "snippet": "exponential{${1:base}}(${2:arg})"
+    },
     "exponential[]{}": {
       "snippet": "exponential[${2:scale}]{${1:base}}"
     },
+    "exponential[]{}()": {
+      "snippet": "exponential[${2:scale}]{${1:base}}(${3:arg})"
+    },
+    "geodesic<>()": {
+      "snippet": "geodesic<${1:s}>(${2:eval point})"
+    },
     "geodesic<>[]": {
       "snippet": "geodesic<${2:s}>[${1:scale}]"
     },
+    "geodesic<>[]()": {
+      "snippet": "geodesic<${2:s}>[${1:scale}](${3:eval point})"
+    },
     "geodesic<>{}{}": {
       "snippet": "geodesic<${3:style}>{${1:t0}}{${2:t1}}"
     },
+    "geodesic<>{}{}()": {
+      "snippet": "geodesic<${3:style}>{${1:t0}}{${2:t1}}(${4:eval point})"
+    },
     "geodesic<>[]{}{}": {
       "snippet": "geodesic<${4:style}>[${3:scale}]{${1:t0}}{${2:t1}}"
     },
+    "geodesic<>[]{}{}()": {
+      "snippet": "geodesic<${4:style}>[${3:scale}]{${1:t0}}{${2:t1}}(${5:eval point})"
+    },
     "geodesic{}{}": {
       "snippet": "geodesic|${3:symbol}|{${1:t0}}{${2:t1}}"
     },
+    "geodesic{}{}()": {
+      "snippet": "geodesic|${4:symbol}|{${1:t0}}{${2:t1}}(${3:eval point})"
+    },
     "geodesic[]{}{}": {
       "snippet": "geodesic|${4:symbol}|[${3:scale}]{${1:t0}}{${2:t1}}"
     },
+    "geodesic[]{}{}()": {
+      "snippet": "geodesic|${5:symbol}|[${3:scale}]{${1:t0}}{${2:t1}}(${4:eval point})"
+    },
     "logOp": {},
     "logarithm{}": {
       "snippet": "logarithm{${1:base}}"
     },
+    "logarithm{}()": {
+      "snippet": "logarithm{${1:base}}(${2:arg})"
+    },
     "logarithm[]{}": {
       "snippet": "logarithm[${2:scale}]{${1:base}}"
     },
+    "logarithm[]{}()": {
+      "snippet": "logarithm[${2:scale}]{${1:base}}(${3:arg})"
+    },
     "inverseRetract{}": {
       "snippet": "inverseRetract{${1:base}}"
     },
+    "inverseRetract{}()": {
+      "snippet": "inverseRetract{${1:base}}(${2:arg})"
+    },
     "inverseRetract[]{}": {
       "snippet": "inverseRetract[${2:scale}]{${1:base}}"
     },
+    "inverseRetract[]{}()": {
+      "snippet": "inverseRetract[${2:scale}]{${1:base}}(${3:arg})"
+    },
     "lie{}{}": {
       "snippet": "lie{${1:arg1}}{${2:arg2}}"
     },
@@ -85,33 +121,63 @@
     "parallelTransport{}{}": {
       "snippet": "parallelTransport{${1:start}}{${2:end}}"
     },
+    "parallelTransport{}{}()": {
+      "snippet": "parallelTransport{${1:start}}{${2:end}}(${3:arg})"
+    },
     "parallelTransport{}{}[]": {
       "snippet": "parallelTransport{${1:start}}{${2:end}}[${3:sup}]"
     },
+    "parallelTransport{}{}()[]": {
+      "snippet": "parallelTransport{${1:start}}{${2:end}}(${4:arg})[${3:sup}]"
+    },
     "parallelTransport[]{}{}": {
       "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}"
     },
+    "parallelTransport[]{}{}()": {
+      "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}(${4:arg})"
+    },
     "parallelTransport[]{}{}[]": {
       "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}[${4:sup}]"
     },
+    "parallelTransport[]{}{}()[]": {
+      "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}(${5:arg})[${4:sup}]"
+    },
     "parallelTransportDir{}{}": {
       "snippet": "parallelTransportDir{${1:start}}{${2:dir}}"
     },
+    "parallelTransportDir{}{}()": {
+      "snippet": "parallelTransportDir{${1:start}}{${2:dir}}(${3:arg})"
+    },
     "parallelTransportDir{}{}[]": {
       "snippet": "parallelTransportDir{${1:start}}{${2:dir}}[${3:sup}]"
     },
+    "parallelTransportDir{}{}()[]": {
+      "snippet": "parallelTransportDir{${1:start}}{${2:dir}}(${4:arg})[${3:sup}]"
+    },
     "parallelTransportDir[]{}{}": {
       "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}"
     },
+    "parallelTransportDir[]{}{}()": {
+      "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${4:arg})"
+    },
     "parallelTransportDir[]{}{}[]": {
       "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}[${4:sup}]"
     },
+    "parallelTransportDir[]{}{}()[]": {
+      "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${5:arg})[${4:sup}]"
+    },
     "retract{}": {
       "snippet": "retract{${1:base}}"
     },
+    "retract{}()": {
+      "snippet": "retract{${1:base}}(${2:arg})"
+    },
     "retract[]{}": {
       "snippet": "retract[${2:scale}]{${1:base}}"
     },
+    "retract[]{}()": {
+      "snippet": "retract[${2:scale}]{${1:base}}(${3:arg})"
+    },
     "riemannian{}{}": {
       "snippet": "riemannian{${1:arg1}}{${2:arg2}}"
     },
@@ -167,26 +233,50 @@
     "vectorTransport{}{}": {
       "snippet": "vectorTransport{${1:start}}{${2:end}}"
     },
+    "vectorTransport{}{}()": {
+      "snippet": "vectorTransport{${1:start}}{${2:end}}(${3:arg})"
+    },
     "vectorTransport{}{}[]": {
       "snippet": "vectorTransport{${1:start}}{${2:end}}[${3:sup}]"
     },
+    "vectorTransport{}{}()[]": {
+      "snippet": "vectorTransport{${1:start}}{${2:end}}(${4:arg})[${3:sup}]"
+    },
     "vectorTransport[]{}{}": {
       "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}"
     },
+    "vectorTransport[]{}{}()": {
+      "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}(${4:arg})"
+    },
     "vectorTransport[]{}{}[]": {
       "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}[${4:sup}]"
     },
+    "vectorTransport[]{}{}()[]": {
+      "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}(${5:arg})[${4:sup}]"
+    },
     "vectorTransportDir{}{}": {
       "snippet": "vectorTransportDir{${1:start}}{${2:dir}}"
     },
+    "vectorTransportDir{}{}()": {
+      "snippet": "vectorTransportDir{${1:start}}{${2:dir}}(${3:arg})"
+    },
     "vectorTransportDir{}{}[]": {
       "snippet": "vectorTransportDir{${1:start}}{${2:dir}}[${3:sup}]"
     },
+    "vectorTransportDir{}{}()[]": {
+      "snippet": "vectorTransportDir{${1:start}}{${2:dir}}(${4:arg})[${3:sup}]"
+    },
     "vectorTransportDir[]{}{}": {
       "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}"
     },
+    "vectorTransportDir[]{}{}()": {
+      "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${4:arg})"
+    },
     "vectorTransportDir[]{}{}[]": {
       "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}[${4:sup}]"
+    },
+    "vectorTransportDir[]{}{}()[]": {
+      "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${5:arg})[${4:sup}]"
     }
   },
   "envs": {},
diff --git a/dev/packages/mathsemantics-semantic.json b/dev/packages/mathsemantics-semantic.json
index 777018ed2..1ad04c289 100644
--- a/dev/packages/mathsemantics-semantic.json
+++ b/dev/packages/mathsemantics-semantic.json
@@ -87,23 +87,35 @@
     "proj{}": {
       "snippet": "proj{${1:sub}}"
     },
+    "proj{}()": {
+      "snippet": "proj{${1:sub}}(${2:arg})"
+    },
     "proj[]": {
       "snippet": "proj[${1:scale}]"
     },
     "proj[]{}": {
       "snippet": "proj[${2:scale}]{${1:sub}}"
     },
+    "proj[]{}()": {
+      "snippet": "proj[${2:scale}]{${1:sub}}(${3:arg})"
+    },
     "proxOp": {},
     "prox": {},
     "prox{}": {
       "snippet": "prox{${1:sub}}"
     },
+    "prox{}()": {
+      "snippet": "prox{${1:sub}}(${2:arg})"
+    },
     "prox[]": {
       "snippet": "prox[${1:scale}]"
     },
     "prox[]{}": {
       "snippet": "prox[${2:scale}]{${1:sub}}"
     },
+    "prox[]{}()": {
+      "snippet": "prox[${2:scale}]{${1:sub}}(${3:arg})"
+    },
     "aff": {},
     "arcosh": {},
     "arcoth": {},
diff --git a/dev/packages/mathspec.json b/dev/packages/mathspec.json
index 630eca74d..53cf5a422 100644
--- a/dev/packages/mathspec.json
+++ b/dev/packages/mathspec.json
@@ -11,6 +11,18 @@
     ]
   },
   "macros": {
+    "setmathsfont(){}": {
+      "snippet": "setmathsfont(${2:sets}){${1:font name}}"
+    },
+    "setmathsfont()[]{}": {
+      "snippet": "setmathsfont(${3:sets})[${2:font features}]{${1:font name}}"
+    },
+    "setmathfont(){}": {
+      "snippet": "setmathfont(${2:sets}){${1:font name}}"
+    },
+    "setmathfont()[]{}": {
+      "snippet": "setmathfont(${3:sets})[${2:font features}]{${1:font name}}"
+    },
     "setmathrm{}": {
       "snippet": "setmathrm{${1:font name}}"
     },
@@ -47,6 +59,12 @@
     "setmathfrak[]{}": {
       "snippet": "setmathfrak[${2:font features}]{${1:font name}}"
     },
+    "setallmainfonts(){}": {
+      "snippet": "setallmainfonts(${2:sets}){${1:font name}}"
+    },
+    "setallmainfonts()[]{}": {
+      "snippet": "setallmainfonts(${3:sets})[${2:font features}]{${1:font name}}"
+    },
     "setprimaryfont{}": {
       "snippet": "setprimaryfont{${1:font name}}"
     },
diff --git a/dev/packages/mathtools.json b/dev/packages/mathtools.json
new file mode 100644
index 000000000..2b225ffbc
--- /dev/null
+++ b/dev/packages/mathtools.json
@@ -0,0 +1,521 @@
+{
+  "includes": {
+    "keyval": [],
+    "calc": [],
+    "mhsetup": [],
+    "amsmath": [],
+    "graphicx": []
+  },
+  "macros": {
+    "mathtoolsset{}": {
+      "snippet": "mathtoolsset{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mathllap[]{}": {
+      "snippet": "mathllap[${2:mathstyle}]{${1:math}}"
+    },
+    "mathllap{}": {
+      "snippet": "mathllap{${1:math}}"
+    },
+    "mathrlap[]{}": {
+      "snippet": "mathrlap[${2:mathstyle}]{${1:math}}"
+    },
+    "mathrlap{}": {
+      "snippet": "mathrlap{${1:math}}"
+    },
+    "mathmbox{}": {
+      "snippet": "mathmbox{${1:math}}"
+    },
+    "mathclap[]{}": {
+      "snippet": "mathclap[${2:mathstyle}]{${1:math}}"
+    },
+    "mathclap{}": {
+      "snippet": "mathclap{${1:math}}"
+    },
+    "clap{}": {
+      "snippet": "clap{${1:text}}"
+    },
+    "mathmakebox[][]{}": {
+      "snippet": "mathmakebox[${2:width}][${3:pos}]{${1:math}}"
+    },
+    "mathmakebox[]{}": {
+      "snippet": "mathmakebox[${2:width}]{${1:math}}"
+    },
+    "mathmakebox{}": {
+      "snippet": "mathmakebox{${1:math}}"
+    },
+    "cramped[]{}": {
+      "snippet": "cramped[${2:mathstyle}]{${1:math}}"
+    },
+    "cramped{}": {
+      "snippet": "cramped{${1:math}}"
+    },
+    "crampedllap[]{}": {
+      "snippet": "crampedllap[${2:mathstyle}]{${1:math}}"
+    },
+    "crampedllap{}": {
+      "snippet": "crampedllap{${1:math}}"
+    },
+    "crampedrlap[]{}": {
+      "snippet": "crampedrlap[${2:mathstyle}]{${1:math}}"
+    },
+    "crampedrlap{}": {
+      "snippet": "crampedrlap{${1:math}}"
+    },
+    "crampedclap[]{}": {
+      "snippet": "crampedclap[${2:mathstyle}]{${1:math}}"
+    },
+    "crampedclap{}": {
+      "snippet": "crampedclap{${1:math}}"
+    },
+    "crampedsubstack{}": {
+      "snippet": "crampedsubstack{${1:arg}}"
+    },
+    "smashoperator[]{}": {
+      "snippet": "smashoperator[${2:pos}]{${1:operator with limits}}"
+    },
+    "smashoperator{}": {
+      "snippet": "smashoperator{${1:operator with limits}}"
+    },
+    "adjustlimits{}_{}{}_{}": {
+      "snippet": "adjustlimits{${1:operator1}}_{${2:limit1}}{${3:operator2}}_{${4:limit2}}"
+    },
+    "SwapAboveDisplaySkip": {},
+    "newtagform{}[]{}{}": {
+      "snippet": "newtagform{${1:name}}[${2:inner format}]{${3:left}}{${4:right}}"
+    },
+    "newtagform{}{}{}": {
+      "snippet": "newtagform{${1:name}}{${2:left}}{${3:right}}"
+    },
+    "renewtagform{}[]{}{}": {
+      "snippet": "renewtagform{${1:name}}[${2:inner format}]{${3:left}}{${4:right}}"
+    },
+    "renewtagform{}{}{}": {
+      "snippet": "renewtagform{${1:name}}{${2:left}}{${3:right}}"
+    },
+    "usetagform{}": {
+      "snippet": "usetagform{${1:name}}"
+    },
+    "refeq{}": {
+      "snippet": "refeq{${1:label}}"
+    },
+    "noeqref{}": {
+      "snippet": "noeqref{${1:labellist}}"
+    },
+    "xleftrightarrow{}": {
+      "snippet": "xleftrightarrow{${1:sup}}"
+    },
+    "xleftrightarrow[]{}": {
+      "snippet": "xleftrightarrow[${2:sub}]{${1:sup}}"
+    },
+    "xLeftarrow{}": {
+      "snippet": "xLeftarrow{${1:sup}}"
+    },
+    "xLeftarrow[]{}": {
+      "snippet": "xLeftarrow[${2:sub}]{${1:sup}}"
+    },
+    "xhookleftarrow{}": {
+      "snippet": "xhookleftarrow{${1:sup}}"
+    },
+    "xhookleftarrow[]{}": {
+      "snippet": "xhookleftarrow[${2:sub}]{${1:sup}}"
+    },
+    "xmapsto{}": {
+      "snippet": "xmapsto{${1:sup}}"
+    },
+    "xmapsto[]{}": {
+      "snippet": "xmapsto[${2:sub}]{${1:sup}}"
+    },
+    "xRightarrow{}": {
+      "snippet": "xRightarrow{${1:sup}}"
+    },
+    "xRightarrow[]{}": {
+      "snippet": "xRightarrow[${2:sub}]{${1:sup}}"
+    },
+    "xLeftrightarrow{}": {
+      "snippet": "xLeftrightarrow{${1:sup}}"
+    },
+    "xLeftrightarrow[]{}": {
+      "snippet": "xLeftrightarrow[${2:sub}]{${1:sup}}"
+    },
+    "xhookrightarrow{}": {
+      "snippet": "xhookrightarrow{${1:sup}}"
+    },
+    "xhookrightarrow[]{}": {
+      "snippet": "xhookrightarrow[${2:sub}]{${1:sup}}"
+    },
+    "xrightharpoondown{}": {
+      "snippet": "xrightharpoondown{${1:sup}}"
+    },
+    "xrightharpoondown[]{}": {
+      "snippet": "xrightharpoondown[${2:sub}]{${1:sup}}"
+    },
+    "xleftharpoondown{}": {
+      "snippet": "xleftharpoondown{${1:sup}}"
+    },
+    "xleftharpoondown[]{}": {
+      "snippet": "xleftharpoondown[${2:sub}]{${1:sup}}"
+    },
+    "xrightleftharpoons{}": {
+      "snippet": "xrightleftharpoons{${1:sup}}"
+    },
+    "xrightleftharpoons[]{}": {
+      "snippet": "xrightleftharpoons[${2:sub}]{${1:sup}}"
+    },
+    "xrightharpoonup{}": {
+      "snippet": "xrightharpoonup{${1:sup}}"
+    },
+    "xrightharpoonup[]{}": {
+      "snippet": "xrightharpoonup[${2:sub}]{${1:sup}}"
+    },
+    "xleftharpoonup{}": {
+      "snippet": "xleftharpoonup{${1:sup}}"
+    },
+    "xleftharpoonup[]{}": {
+      "snippet": "xleftharpoonup[${2:sub}]{${1:sup}}"
+    },
+    "xleftrightharpoons{}": {
+      "snippet": "xleftrightharpoons{${1:sup}}"
+    },
+    "xleftrightharpoons[]{}": {
+      "snippet": "xleftrightharpoons[${2:sub}]{${1:sup}}"
+    },
+    "xlongrightarrow{}": {
+      "snippet": "xlongrightarrow{${1:sup}}"
+    },
+    "xlongrightarrow[]{}": {
+      "snippet": "xlongrightarrow[${2:sub}]{${1:sup}}"
+    },
+    "xLongrightarrow{}": {
+      "snippet": "xLongrightarrow{${1:sup}}"
+    },
+    "xLongrightarrow[]{}": {
+      "snippet": "xLongrightarrow[${2:sub}]{${1:sup}}"
+    },
+    "xlongleftarrow{}": {
+      "snippet": "xlongleftarrow{${1:sup}}"
+    },
+    "xlongleftarrow[]{}": {
+      "snippet": "xlongleftarrow[${2:sub}]{${1:sup}}"
+    },
+    "xLongleftarrow{}": {
+      "snippet": "xLongleftarrow{${1:sup}}"
+    },
+    "xLongleftarrow[]{}": {
+      "snippet": "xLongleftarrow[${2:sub}]{${1:sup}}"
+    },
+    "underbracket[][]{}": {
+      "snippet": "underbracket[${2:rule thickness}][${3:bracket height}]{${1:arg}}"
+    },
+    "underbracket[]{}": {
+      "snippet": "underbracket[${2:rule thickness}]{${1:arg}}"
+    },
+    "underbracket{}": {
+      "snippet": "underbracket{${1:arg}}"
+    },
+    "overbracket[][]{}": {
+      "snippet": "overbracket[${2:rule thickness}][${3:bracket height}]{${1:arg}}"
+    },
+    "overbracket[]{}": {
+      "snippet": "overbracket[${2:rule thickness}]{${1:arg}}"
+    },
+    "overbracket{}": {
+      "snippet": "overbracket{${1:arg}}"
+    },
+    "LaTeXunderbrace{}": {
+      "snippet": "LaTeXunderbrace{${1:arg}}"
+    },
+    "LaTeXoverbrace{}": {
+      "snippet": "LaTeXoverbrace{${1:arg}}"
+    },
+    "newgathered{}{}{}{}": {
+      "snippet": "newgathered{${1:envname}}{${2:pre line}}{${3:post line}}{${4:after}}"
+    },
+    "renewgathered{}{}{}{}": {
+      "snippet": "renewgathered{${1:envname}}{${2:pre line}}{${3:post line}}{${4:after}}"
+    },
+    "MultlinedHook": {},
+    "shoveleft{}": {
+      "snippet": "shoveleft{${1:arg}}"
+    },
+    "shoveleft[]{}": {
+      "snippet": "shoveleft[${2:dimen}]{${1:arg}}"
+    },
+    "shoveright{}": {
+      "snippet": "shoveright{${1:arg}}"
+    },
+    "shoveright[]{}": {
+      "snippet": "shoveright[${2:dimen}]{${1:arg}}"
+    },
+    "MoveEqLeft": {},
+    "MoveEqLeft[]": {
+      "snippet": "MoveEqLeft[${1:number}]"
+    },
+    "Aboxed{}": {
+      "snippet": "Aboxed{${1:left hand side & right hand side}}"
+    },
+    "MakeAboxedCommand{}": {
+      "snippet": "MakeAboxedCommand{${1:cmd}}"
+    },
+    "ArrowBetweenLines": {},
+    "ArrowBetweenLines[]": {
+      "snippet": "ArrowBetweenLines[${1:symbol}]"
+    },
+    "ArrowBetweenLines*": {},
+    "ArrowBetweenLines*[]": {
+      "snippet": "ArrowBetweenLines*[${1:symbol}]"
+    },
+    "vdotswithin{}": {
+      "snippet": "vdotswithin{${1:symbol}}"
+    },
+    "shortvdotswithin{}": {
+      "snippet": "shortvdotswithin{${1:symbol}}"
+    },
+    "shortvdotswithin*{}": {
+      "snippet": "shortvdotswithin*{${1:symbol}}"
+    },
+    "MTFlushSpaceAbove": {},
+    "MTFlushSpaceBelow": {},
+    "origjot": {},
+    "shortintertext{}": {
+      "snippet": "shortintertext{${1:text}}"
+    },
+    "intertext{}": {
+      "snippet": "intertext{${1:text}}"
+    },
+    "DeclarePairedDelimiter{}{}{}": {
+      "snippet": "DeclarePairedDelimiter{${1:cmd}}{${2:left delim}}{${3:right delim}}"
+    },
+    "DeclarePairedDelimiterX{}[]{}{}{}": {
+      "snippet": "DeclarePairedDelimiterX{${1:cmd}}[${2:args}]{${3:left delim}}{${4:right delim}}{${5:body}}"
+    },
+    "DeclarePairedDelimiterXPP{}[]{}{}{}{}{}": {
+      "snippet": "DeclarePairedDelimiterXPP{${1:cmd}}[${2:args}]{${3:pre code}}{${4:left delim}}{${5:right delim}}{${6:post code}}{${7:body}}"
+    },
+    "reDeclarePairedDelimiterInnerWrapper{}{}{}": {
+      "snippet": "reDeclarePairedDelimiterInnerWrapper{${1:cmd}}{${2:star option}}{${3:code}}"
+    },
+    "lparen": {
+      "detail": "(",
+      "documentation": "LEFT PARENTHESIS"
+    },
+    "rparen": {
+      "detail": ")",
+      "documentation": "RIGHT PARENTHESIS"
+    },
+    "vcentcolon": {},
+    "ordinarycolon": {},
+    "coloneqq": {
+      "detail": "≔",
+      "documentation": "# : equals"
+    },
+    "eqqcolon": {
+      "detail": "≕",
+      "documentation": "equals, colon"
+    },
+    "colonapprox": {},
+    "dblcolon": {},
+    "Coloneqq": {
+      "detail": "⩴",
+      "documentation": "DOUBLE COLON EQUAL"
+    },
+    "Eqqcolon": {},
+    "Colonapprox": {},
+    "coloneq": {
+      "detail": "≔",
+      "documentation": "# : equals"
+    },
+    "eqcolon": {
+      "detail": "≕",
+      "documentation": "equals, colon"
+    },
+    "colonsim": {},
+    "Coloneq": {
+      "detail": "⩴",
+      "documentation": "DOUBLE COLON EQUAL"
+    },
+    "Eqcolon": {},
+    "Colonsim": {},
+    "approxcolon": {},
+    "Approxcolon": {},
+    "simcolon": {},
+    "Simcolon": {},
+    "colondash": {},
+    "Colondash": {},
+    "dashcolon": {
+      "detail": "∹",
+      "documentation": "EXCESS"
+    },
+    "Dashcolon": {},
+    "nuparrow": {},
+    "ndownarrow": {},
+    "bigtimes": {
+      "detail": "⨉",
+      "documentation": "N-ARY TIMES OPERATOR"
+    },
+    "prescript{}{}{}": {
+      "snippet": "prescript{${1:sup}}{${2:sub}}{${3:arg}}"
+    },
+    "splitfrac{}{}": {
+      "snippet": "splitfrac{${1:numer}}{${2:denom}}"
+    },
+    "splitdfrac{}{}": {
+      "snippet": "splitdfrac{${1:numer}}{${2:denom}}"
+    },
+    "xmathstrut{}": {
+      "snippet": "xmathstrut{${1:increase}}"
+    },
+    "xmathstrut[]{}": {
+      "snippet": "xmathstrut[${2:depth increase}]{${1:increase}}"
+    },
+    "newcases{}{}{}{}{}": {
+      "snippet": "newcases{${1:envname}}{${2:sep}}{${3:preamble}}{${4:left}}{${5:right}}"
+    },
+    "renewcases{}{}{}{}{}": {
+      "snippet": "renewcases{${1:envname}}{${2:sep}}{${3:preamble}}{${4:left}}{${5:right}}"
+    },
+    "upbracketfill{}{}": {
+      "snippet": "upbracketfill{${1:arg1}}{${2:arg2}}"
+    },
+    "upbracketend{}{}": {
+      "snippet": "upbracketend{${1:arg1}}{${2:arg2}}"
+    },
+    "downbracketfill{}{}": {
+      "snippet": "downbracketfill{${1:arg1}}{${2:arg2}}"
+    },
+    "downbracketend{}{}": {
+      "snippet": "downbracketend{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {
+    "crampedsubarray{}": {
+      "name": "crampedsubarray",
+      "snippet": "{${1:col}}"
+    },
+    "dcases": {},
+    "dcases*": {},
+    "rcases": {},
+    "rcases*": {},
+    "drcases": {},
+    "drcases*": {},
+    "cases*": {},
+    "matrix*[]": {
+      "name": "matrix*",
+      "snippet": "[${1:col}]"
+    },
+    "pmatrix*[]": {
+      "name": "pmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "bmatrix*[]": {
+      "name": "bmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "Bmatrix*[]": {
+      "name": "Bmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "vmatrix*[]": {
+      "name": "vmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "Vmatrix*[]": {
+      "name": "Vmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "smallmatrix*[]": {
+      "name": "smallmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "psmallmatrix": {},
+    "psmallmatrix*[]": {
+      "name": "psmallmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "bsmallmatrix": {},
+    "bsmallmatrix*[]": {
+      "name": "bsmallmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "Bsmallmatrix": {},
+    "Bsmallmatrix*[]": {
+      "name": "Bsmallmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "vsmallmatrix": {},
+    "vsmallmatrix*[]": {
+      "name": "vsmallmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "Vsmallmatrix": {},
+    "Vsmallmatrix*[]": {
+      "name": "Vsmallmatrix*",
+      "snippet": "[${1:col}]"
+    },
+    "spreadlines{}": {
+      "name": "spreadlines",
+      "snippet": "{${1:dimen}}"
+    },
+    "lgathered[]": {
+      "name": "lgathered",
+      "snippet": "[${1:pos}]"
+    },
+    "rgathered[]": {
+      "name": "rgathered",
+      "snippet": "[${1:pos}]"
+    },
+    "multlined": {},
+    "multlined[][]": {
+      "name": "multlined",
+      "snippet": "[${1:pos}][${2:width}]"
+    }
+  },
+  "options": [
+    "fixamsmath",
+    "donotfixamsmathbugs",
+    "allowspaces",
+    "disallowspaces",
+    "legacycolonsymbols",
+    "intlimits",
+    "nointlimits",
+    "sumlimits",
+    "nosumlimits",
+    "namelimits",
+    "nonamelimits",
+    "leqno",
+    "reqno",
+    "centertags",
+    "tbtags",
+    "cmex10",
+    "fleqn",
+    "alignedleftspaceyes",
+    "alignedleftspaceno",
+    "alignedleftspaceyesifneg"
+  ],
+  "keyvals": [
+    [
+      "showonlyrefs",
+      "showmanualtags",
+      "original-intertext",
+      "original-shortintertext",
+      "mathic",
+      "above-intertext-sep=",
+      "below-intertext-sep=",
+      "above-shortintertext-sep=",
+      "below-shortintertext-sep=",
+      "smallmatrix-align=",
+      "smallmatrix-inner-space=",
+      "firstline-afterskip=",
+      "lastline-preskip=",
+      "multlined-width=",
+      "multlined-pos=",
+      "centercolon",
+      "prescript-sup-format=${1:cmd}",
+      "prescript-sub-format=${1:cmd}",
+      "prescript-arg-format=${1:cmd}",
+      "shortvdotsadjustabove=",
+      "shortvdotsadjustbelow="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/memhangul-common.json b/dev/packages/memhangul-common.json
index f4f94fdf3..3ccab7642 100644
--- a/dev/packages/memhangul-common.json
+++ b/dev/packages/memhangul-common.json
@@ -28,7 +28,7 @@
     "oblivoirlist": {},
     "oblivoirlists": {},
     "ReleaseMacros{}": {
-      "snippet": "ReleaseMacros{${1:macro1,macro2,...}}"
+      "snippet": "ReleaseMacros{${1:macro1,${2:macro2},...}}"
     },
     "snm{}": {
       "snippet": "snm{${1:text}}"
diff --git a/dev/packages/memoize.json b/dev/packages/memoize.json
new file mode 100644
index 000000000..e016bf412
--- /dev/null
+++ b/dev/packages/memoize.json
@@ -0,0 +1,242 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "pdftexcmds": [],
+    "advice": []
+  },
+  "macros": {
+    "mmzset{}": {
+      "snippet": "mmzset{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mmznext{}": {
+      "snippet": "mmznext{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "nommzkeys{}": {
+      "snippet": "nommzkeys{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mmz{}": {
+      "snippet": "mmz{${1:code}}"
+    },
+    "mmz[]{}": {
+      "snippet": "mmz[${2:options}]{${1:code}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "nommz{}": {
+      "snippet": "nommz{${1:code}}"
+    },
+    "nommz[]{}": {
+      "snippet": "nommz[${2:options}]{${1:code}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mmzContext": {},
+    "mmzContextExtra": {},
+    "mmzNoRef{}": {
+      "snippet": "mmzNoRef{${1:label}}"
+    },
+    "mmzForceNoRef{}": {
+      "snippet": "mmzForceNoRef{${1:label}}"
+    },
+    "mmzAbort": {},
+    "mmzUnmemoizable": {},
+    "ifmmzUnmemoizable": {},
+    "Memoize{}{}": {
+      "snippet": "Memoize{${1:key}}{${2:code}}"
+    },
+    "mmzAtBeginMemoization": {},
+    "mmzAtEndMemoization": {},
+    "mmzAtEndMemoizationExtra": {},
+    "mmzAfterMemoization": {},
+    "mmzAfterMemoizationExtra": {},
+    "mmzCMemo": {},
+    "mmzCCMemo": {},
+    "ifmemoize": {},
+    "memoizetrue": {},
+    "memoizefalse": {},
+    "ifmemoizing": {},
+    "ifinmemoize": {},
+    "mmzSingleExternDriver{}": {
+      "snippet": "mmzSingleExternDriver{${1:code}}"
+    },
+    "mmzExternalizeBox{}{}": {
+      "snippet": "mmzExternalizeBox{${1:box}}{${2:token register}}"
+    },
+    "ifmmzkeepexterns": {},
+    "mmzkeepexternstrue": {},
+    "mmzkeepexternsfalse": {},
+    "IfMemoizing{}{}{}": {
+      "snippet": "IfMemoizing{${1:name}}{${2:true code}}{${3:false code}}"
+    },
+    "IfMemoizing[]{}{}{}": {
+      "snippet": "IfMemoizing[${4:offset}]{${1:name}}{${2:true code}}{${3:false code}}"
+    },
+    "memoizinggrouplevel": {},
+    "mmzRegularPages": {},
+    "mmzExternPages": {},
+    "mmzExtraPages": {},
+    "mmzTracingOn": {},
+    "mmzTracingOff": {},
+    "mmzThisContext": {},
+    "mmzMemo": {},
+    "mmzSource": {},
+    "mmzResource{}": {
+      "snippet": "mmzResource{${1:file}}"
+    },
+    "mmzIncludeExtern{}{}{}{}{}{}{}{}{}": {
+      "snippet": "mmzIncludeExtern{${1:seq}}{${2:\\hbox|\\vbox}}{${3:width}}{${4:height}}{${5:depth}}{${6:left}}{${7:bot}}{${8:right}}{${9:top}}"
+    },
+    "mmzLabel{}{}": {
+      "snippet": "mmzLabel{${1:key}}{${2:value}}"
+    },
+    "mmzEndMemo": {},
+    "mmzOutputDirectory": {},
+    "warningtext": {},
+    "externbasepath": {},
+    "pagenumber": {},
+    "expectedwidth": {},
+    "expectedheight": {},
+    "fromdocument": {},
+    "logfile": {},
+    "warningtemplate": {},
+    "force": {},
+    "mmzpdfmajorversion": {},
+    "mmzpdfminorversion": {},
+    "mmzUsedCMemo{}": {
+      "snippet": "mmzUsedCMemo{${1:filename}}"
+    },
+    "mmzUsedCCMemo{}": {
+      "snippet": "mmzUsedCCMemo{${1:filename}}"
+    },
+    "mmzUsedExtern{}": {
+      "snippet": "mmzUsedExtern{${1:filename}}"
+    },
+    "mmzNewCMemo{}": {
+      "snippet": "mmzNewCMemo{${1:filename}}"
+    },
+    "mmzNewCCMemo{}": {
+      "snippet": "mmzNewCCMemo{${1:filename}}"
+    },
+    "mmzNewExtern{}{}{}{}": {
+      "snippet": "mmzNewExtern{${1:filename}}{${2:page num}}{${3:width}}{${4:height}}"
+    },
+    "mmzPrefix{}": {
+      "snippet": "mmzPrefix{${1:path prefix}}"
+    },
+    "mmzAutoInit": {},
+    "mmzPgfAtBeginMemoization": {},
+    "mmzPgfAtEndMemoization": {},
+    "filetotoks{}{}": {
+      "snippet": "filetotoks{${1:arg1}}{${2:arg2}}"
+    },
+    "mmzRawCollectorOptions": {},
+    "mmzDriver": {},
+    "mmzvalueof{}": {
+      "snippet": "mmzvalueof{${1:arg}}"
+    },
+    "mmzBeamerPauses": {},
+    "mmzSetBeamerOverlays{}{}": {
+      "snippet": "mmzSetBeamerOverlays{${1:arg1}}{${2:arg2}}"
+    },
+    "mmzBeamerOverlays": {}
+  },
+  "envs": {
+    "memoize": {},
+    "memoize[]": {
+      "name": "memoize",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "nomemoize": {},
+    "nomemoize[]": {
+      "name": "nomemoize",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [
+    "options={${1:options}}",
+    "enable",
+    "disable",
+    "normal",
+    "readonly",
+    "recompile"
+  ],
+  "keyvals": [
+    [
+      "verbatim",
+      "verb",
+      "no verbatim",
+      "padding left=",
+      "padding right=",
+      "padding top=",
+      "padding bottom=",
+      "padding=",
+      "context=${1:tokens}",
+      "clear context",
+      "meaning to context={${1:command/env list}}",
+      "csname meaning to context=${1:csname}",
+      "key meaning to context=${1:key path}",
+      "key value to context=${1:key path}",
+      "padding to context",
+      "per overlay",
+      "capture=",
+      "driver=${1:code}",
+      "at begin memoization=${1:code}",
+      "at end memoization=${1:code}",
+      "after memoization=${1:code}",
+      "integrated driver=${1:name}",
+      "trace",
+      "include source in cmemo",
+      "include context in ccmemo",
+      "direct ccmemo input",
+      "memo dir=${1:directory}",
+      "no memo dir",
+      "prefix=${1:prefix}",
+      "mkdir",
+      "mkdir command=${1:system command}",
+      "output-directory=${1:directory}",
+      "extract={${1:extraction method}}",
+      "perl extraction command=${1:system command}",
+      "perl extraction options=${1:options}",
+      "python extraction command=${1:system command}",
+      "python extraction options=${1:options}",
+      "tex extraction command=${1:system command}",
+      "tex extraction options=${1:options}",
+      "tex extraction script=${1:TeX code}",
+      "record=${1:record type}",
+      "no record",
+      "makefile=${1:filename}",
+      "sh=${1:filename}",
+      "bat=${1:filename}",
+      "activation=",
+      "activate deferred",
+      "activate={${1:command/env list}}",
+      "deactivate={${1:command/env list}}",
+      "activate csname=${1:csname}",
+      "deactivate csname=${1:csname}",
+      "activate key={${1:list of key names}}",
+      "deactivate key={${1:list of key names}}",
+      "try activate",
+      "force activate",
+      "auto={${1:command or env}}{${2:keylist}}",
+      "auto csname={${1:csname}}{${2:keylist}}",
+      "auto key={${1:key}}{${2:keylist}}",
+      "auto'={${1:command or env}}{${2:keylist}}",
+      "auto csname'={${1:csname}}{${2:keylist}}",
+      "auto key'={${1:key}}{${2:keylist}}",
+      "manual",
+      "ignore spaces",
+      "biblatex={${1:additional configuration}}",
+      "biblatex ccmemo cite="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/memory.json b/dev/packages/memory.json
new file mode 100644
index 000000000..d58b0beda
--- /dev/null
+++ b/dev/packages/memory.json
@@ -0,0 +1,14 @@
+{
+  "includes": {},
+  "macros": {
+    "newdata{}": {
+      "snippet": "newdata{${1:variable}}"
+    },
+    "newdata*{}": {
+      "snippet": "newdata*{${1:variable}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/menu.json b/dev/packages/menu.json
new file mode 100644
index 000000000..73f27245a
--- /dev/null
+++ b/dev/packages/menu.json
@@ -0,0 +1,94 @@
+{
+  "includes": {
+    "xspace": [],
+    "bbding": [
+      "hand"
+    ],
+    "fancybox": [
+      "framed",
+      "grey"
+    ],
+    "color": [
+      "grey"
+    ]
+  },
+  "macros": {
+    "menu{}": {
+      "snippet": "menu{${1:entry1!entry2!!...}}"
+    },
+    "menuitem{}": {
+      "snippet": "menuitem{${1:item}}"
+    },
+    "menuitem[]{}": {
+      "snippet": "menuitem[${2:length}]{${1:item}}"
+    },
+    "menuitemactive{}": {
+      "snippet": "menuitemactive{${1:item}}"
+    },
+    "menuitemactive[]{}": {
+      "snippet": "menuitemactive[${2:length}]{${1:item}}"
+    },
+    "menuseparator": {},
+    "menuseparator[]": {
+      "snippet": "menuseparator[${1:length}]"
+    },
+    "menutext{}": {
+      "snippet": "menutext{${1:text}}"
+    },
+    "menumathsymbols{}{}": {
+      "snippet": "menumathsymbols{${1:symbol1}}{${2:symbol2}}"
+    },
+    "menumathsymbols[]{}{}": {
+      "snippet": "menumathsymbols[${3:start}]{${1:symbol1}}{${2:symbol2}}"
+    },
+    "menusymbols{}{}": {
+      "snippet": "menusymbols{${1:symbol1}}{${2:symbol2}}"
+    },
+    "menusymbols[]{}{}": {
+      "snippet": "menusymbols[${3:start}]{${1:symbol1}}{${2:symbol2}}"
+    },
+    "menusymbols{}{}[]": {
+      "snippet": "menusymbols{${1:symbol1}}{${2:symbol2}}[${3:end}]"
+    },
+    "menusymbols[]{}{}[]": {
+      "snippet": "menusymbols[${3:start}]{${1:symbol1}}{${2:symbol2}}[${4:end}]"
+    },
+    "menufolderentry{}": {
+      "snippet": "menufolderentry{${1:title}}"
+    },
+    "menufolderentry[]{}": {
+      "snippet": "menufolderentry[${2:length}]{${1:title}}"
+    },
+    "menuitemactivesymbol": {},
+    "menuitemlength": {},
+    "menusep": {},
+    "ifmenuoptionhand": {},
+    "menuoptionhandtrue": {},
+    "menuoptionhandfalse": {},
+    "ifmenuoptionframed": {},
+    "menuoptionframedtrue": {},
+    "menuoptionframedfalse": {},
+    "ifmenuoptiongrey": {},
+    "menuoptiongreytrue": {},
+    "menuoptiongreyfalse": {},
+    "gt": {},
+    "filedate": {},
+    "fileversion": {}
+  },
+  "envs": {
+    "menufolder{}": {
+      "name": "menufolder",
+      "snippet": "{${1:title}}"
+    },
+    "menufolder[]{}": {
+      "name": "menufolder",
+      "snippet": "[${2:length}]{${1:title}}"
+    }
+  },
+  "options": [
+    "hand",
+    "framed",
+    "grey"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/merge.json b/dev/packages/merge.json
new file mode 100644
index 000000000..998c6f97b
--- /dev/null
+++ b/dev/packages/merge.json
@@ -0,0 +1,12 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {
+    "merge{}": {
+      "name": "merge",
+      "snippet": "{${1:file}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/mfpic.json b/dev/packages/mfpic.json
index 2986f5961..72d7cdda4 100644
--- a/dev/packages/mfpic.json
+++ b/dev/packages/mfpic.json
@@ -19,11 +19,11 @@
       "snippet": "applyT{${1:transformer}}"
     },
     "arc[]{}": {
-      "snippet": "arc[${2:t}]{${1:p0,p1,p2}}"
+      "snippet": "arc[${2:t}]{${1:p0,${3:p1},p2}}"
     },
     "arccomplement": {},
     "areagradient{}": {
-      "snippet": "areagradient{${1:function,hdim,vdim}}"
+      "snippet": "areagradient{${1:function,${2:hdim},vdim}}"
     },
     "arrow": {},
     "arrow*": {},
@@ -87,13 +87,13 @@
       "snippet": "backgroundcolor{${1:color spec}}"
     },
     "barchart[]{}{}": {
-      "snippet": "barchart[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "barchart[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "barchart{}{}": {
       "snippet": "barchart{${1:h or v}}{${2:list}}"
     },
     "bargraph[]{}{}": {
-      "snippet": "bargraph[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "bargraph[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "bargraph{}{}": {
       "snippet": "bargraph{${1:h or v}}{${2:list}}"
@@ -103,10 +103,10 @@
       "snippet": "bclosed[${1:tension}]"
     },
     "belowfcn[]{}{}": {
-      "snippet": "belowfcn[${3:spec}]{${1:xmin,xmax,∆x}}{${2:f(${4:x})}}"
+      "snippet": "belowfcn[${3:spec}]{${1:xmin,${4:xmax},∆x}}{${2:f(${5:x})}}"
     },
     "belowfcn{}{}": {
-      "snippet": "belowfcn{${1:xmin,xmax,∆x}}{${2:f(${3:x})}}"
+      "snippet": "belowfcn{${1:xmin,${3:xmax},∆x}}{${2:f(${4:x})}}"
     },
     "bmarks[]{}": {
       "snippet": "bmarks[${2:length}]{${1:number list}}"
@@ -122,19 +122,19 @@
       "snippet": "browniangraph{${1:num,scale}}"
     },
     "brownianmotion{}": {
-      "snippet": "brownianmotion{${1:start,num,scale}}"
+      "snippet": "brownianmotion{${1:start,${2:num},scale}}"
     },
     "btwnfcn[]{}{}{}": {
-      "snippet": "btwnfcn[${4:spec}]{${1:xmin,xmax,∆x}}{${2:f(${5:x})}}{${3:g(${6:x})}}"
+      "snippet": "btwnfcn[${4:spec}]{${1:xmin,${5:xmax},∆x}}{${2:f(${6:x})}}{${3:g(${7:x})}}"
     },
     "btwnfcn{}{}{}": {
-      "snippet": "btwnfcn{${1:xmin,xmax,∆x}}{${2:f(${4:x})}}{${3:g(${5:x})}}"
+      "snippet": "btwnfcn{${1:xmin,${4:xmax},∆x}}{${2:f(${5:x})}}{${3:g(${6:x})}}"
     },
     "btwnplrfcn[]{}{}{}": {
-      "snippet": "btwnplrfcn[${4:spec}]{${1:θmin,θmax,∆θ}}{${2:f(${5:θ})}}{${3:g(${6:θ})}}"
+      "snippet": "btwnplrfcn[${4:spec}]{${1:θmin,${5:θmax},∆θ}}{${2:f(${6:θ})}}{${3:g(${7:θ})}}"
     },
     "btwnplrfcn{}{}{}": {
-      "snippet": "btwnplrfcn{${1:θmin,θmax,∆θ}}{${2:f(${4:θ})}}{${3:g(${5:θ})}}"
+      "snippet": "btwnplrfcn{${1:θmin,${4:θmax},∆θ}}{${2:f(${5:θ})}}{${3:g(${6:θ})}}"
     },
     "cbclosed": {},
     "cbeziers{}": {
@@ -144,7 +144,7 @@
       "snippet": "chartbar{${1:number}}"
     },
     "circle[]{}": {
-      "snippet": "circle[${2:t}]{${1:p1,p2,p3}}"
+      "snippet": "circle[${2:t}]{${1:p1,${3:p2},p3}}"
     },
     "clearsymbols": {},
     "clipmfpic": {},
@@ -155,19 +155,19 @@
       "snippet": "closedcomputedspline{${1:list}}"
     },
     "closedconvexcurve[]{}": {
-      "snippet": "closedconvexcurve[${2:tension}]{${1:p0,p1,...}}"
+      "snippet": "closedconvexcurve[${2:tension}]{${1:p0,${3:p1},...}}"
     },
     "closedconvexcurve{}": {
-      "snippet": "closedconvexcurve{${1:p0,p1,...}}"
+      "snippet": "closedconvexcurve{${1:p0,${2:p1},...}}"
     },
     "closedcspline{}": {
       "snippet": "closedcspline{${1:list}}"
     },
     "closedcurve[]{}": {
-      "snippet": "closedcurve[${2:tension}]{${1:p0,p1,...}}"
+      "snippet": "closedcurve[${2:tension}]{${1:p0,${3:p1},...}}"
     },
     "closedcurve{}": {
-      "snippet": "closedcurve{${1:p0,p1,...}}"
+      "snippet": "closedcurve{${1:p0,${2:p1},...}}"
     },
     "closedmfbezier[]{}": {
       "snippet": "closedmfbezier[${2:tension}]{${1:list}}"
@@ -176,7 +176,7 @@
       "snippet": "closedmfbezier{${1:list}}"
     },
     "closedpolyline{}": {
-      "snippet": "closedpolyline{${1:p0,p1,...}}"
+      "snippet": "closedpolyline{${1:p0,${2:p1},...}}"
     },
     "closedqbeziers{}": {
       "snippet": "closedqbeziers{${1:list}}"
@@ -189,10 +189,10 @@
       "snippet": "cmykcolorarray{${1:var}}{${2:list of cmykcolors}}"
     },
     "coil[]{}": {
-      "snippet": "coil[${2:tension}]{${1:start,end,wl,amp}}"
+      "snippet": "coil[${2:tension}]{${1:start,${3:end},${4:wl},amp}}"
     },
     "coil{}": {
-      "snippet": "coil{${1:start,end,wl,amp}}"
+      "snippet": "coil{${1:start,${2:end},${3:wl},amp}}"
     },
     "colorarray{}{}": {
       "snippet": "colorarray{${1:var}}{${2:list of colors}}"
@@ -203,32 +203,32 @@
     },
     "connect": {},
     "convexcurve[]{}": {
-      "snippet": "convexcurve[${2:tension}]{${1:p0,p1,...}}"
+      "snippet": "convexcurve[${2:tension}]{${1:p0,${3:p1},...}}"
     },
     "convexcurve{}": {
-      "snippet": "convexcurve{${1:p0,p1,...}}"
+      "snippet": "convexcurve{${1:p0,${2:p1},...}}"
     },
     "convexcyclic[]{}": {
-      "snippet": "convexcyclic[${2:tension}]{${1:p0,p1,...}}"
+      "snippet": "convexcyclic[${2:tension}]{${1:p0,${3:p1},...}}"
     },
     "convexcyclic{}": {
-      "snippet": "convexcyclic{${1:p0,p1,...}}"
+      "snippet": "convexcyclic{${1:p0,${2:p1},...}}"
     },
     "coords": {},
     "corkscrew[]{}": {
-      "snippet": "corkscrew[${2:tension}]{${1:start,end,wl,amp}}"
+      "snippet": "corkscrew[${2:tension}]{${1:start,${3:end},${4:wl},amp}}"
     },
     "corkscrew{}": {
-      "snippet": "corkscrew{${1:start,end,wl,amp}}"
+      "snippet": "corkscrew{${1:start,${2:end},${3:wl},amp}}"
     },
     "cspline{}": {
       "snippet": "cspline{${1:list}}"
     },
     "curve[]{}": {
-      "snippet": "curve[${2:tension}]{${1:p0,p1,...}}"
+      "snippet": "curve[${2:tension}]{${1:p0,${3:p1},...}}"
     },
     "curve{}": {
-      "snippet": "curve{${1:p0,p1,...}}"
+      "snippet": "curve{${1:p0,${2:p1},...}}"
     },
     "cutoffafter{}": {
       "snippet": "cutoffafter{${1:object}}"
@@ -237,10 +237,10 @@
       "snippet": "cutoffbefore{${1:object}}"
     },
     "cyclic[]{}": {
-      "snippet": "cyclic[${2:tension}]{${1:p0,p1,...}}"
+      "snippet": "cyclic[${2:tension}]{${1:p0,${3:p1},...}}"
     },
     "cyclic{}": {
-      "snippet": "cyclic{${1:p0,p1,...}}"
+      "snippet": "cyclic{${1:p0,${2:p1},...}}"
     },
     "darkershade": {},
     "dashed[]": {
@@ -250,7 +250,7 @@
     "dashlen": {},
     "dashlineset": {},
     "dashpattern{}{}": {
-      "snippet": "dashpattern{${1:name}}{${2:len1,...,len2k}}"
+      "snippet": "dashpattern{${1:name}}{${2:len1,${3:...},len2k}}"
     },
     "dashspace": {},
     "datafile[]{}": {
@@ -264,13 +264,13 @@
       "snippet": "defaultplot{${1:method}}"
     },
     "DEgraph[]{}{}": {
-      "snippet": "DEgraph[${3:spec}]{${1:x0,y0,∆s,N}}{${2:f(${4:x,y})}}"
+      "snippet": "DEgraph[${3:spec}]{${1:x0,${4:y0},${5:∆s},N}}{${2:f(${6:x},${7:y})}}"
     },
     "DEgraph{}{}": {
-      "snippet": "DEgraph{${1:x0,y0,∆s,N}}{${2:f(${3:x,y})}}"
+      "snippet": "DEgraph{${1:x0,${3:y0},${4:∆s},N}}{${2:f(${5:x},${6:y})}}"
     },
     "DEtrajectory{}{}": {
-      "snippet": "DEtrajectory{${1:p0,∆s,N}}{${2:F(${3:x,y,t})}}"
+      "snippet": "DEtrajectory{${1:p0,${3:∆s},N}}{${2:F(${4:x},${5:y},${6:t})}}"
     },
     "doaxes[]{}": {
       "snippet": "doaxes[${2:length}]{${1:axis list}}"
@@ -306,10 +306,10 @@
       "snippet": "drawpen{${1:size}}"
     },
     "ellipse[]{}": {
-      "snippet": "ellipse[${2:θ}]{${1:c,rx,ry}}"
+      "snippet": "ellipse[${2:θ}]{${1:c,${3:rx},ry}}"
     },
     "ellipse{}": {
-      "snippet": "ellipse{${1:c,rx,ry}}"
+      "snippet": "ellipse{${1:c,${2:rx},ry}}"
     },
     "endconnect": {},
     "endcoords": {},
@@ -331,16 +331,16 @@
       "snippet": "everytlabel{${1:TeX code}}"
     },
     "fcncurve[]{}": {
-      "snippet": "fcncurve[${2:tension}]{${1:(${3:x0,y0}),(${4:x1,y1}),...}}"
+      "snippet": "fcncurve[${2:tension}]{${1:(${3:x0},${4:y0}),(${5:x1},${6:y1}),...}}"
     },
     "fcncurve{}": {
-      "snippet": "fcncurve{${1:(${2:x0,y0}),(${3:x1,y1}),...}}"
+      "snippet": "fcncurve{${1:(${2:x0},${3:y0}),(${4:x1},${5:y1}),...}}"
     },
     "fcnspline{}": {
       "snippet": "fcnspline{${1:list}}"
     },
     "fdef{}{}{}": {
-      "snippet": "fdef{${1:function}}{${2:param1,param2,...}}{${3:MF expr}}"
+      "snippet": "fdef{${1:function}}{${2:param1,${4:param2},...}}{${3:MF expr}}"
     },
     "fillcolor[]{}": {
       "snippet": "fillcolor[${2:model}]{${1:color spec}}"
@@ -349,16 +349,16 @@
       "snippet": "fillcolor{${1:color spec}}"
     },
     "fullellipse{}": {
-      "snippet": "fullellipse{${1:C,M1,M2}}"
+      "snippet": "fullellipse{${1:C,${2:M1},M2}}"
     },
     "function[]{}{}": {
-      "snippet": "function[${3:spec}]{${1:xmin,xmax,∆x}}{${2:f(${4:x})}}"
+      "snippet": "function[${3:spec}]{${1:xmin,${4:xmax},∆x}}{${2:f(${5:x})}}"
     },
     "function{}{}": {
-      "snippet": "function{${1:xmin,xmax,∆x}}{${2:f(${3:x})}}"
+      "snippet": "function{${1:xmin,${3:xmax},∆x}}{${2:f(${4:x})}}"
     },
     "gantt[]{}{}": {
-      "snippet": "gantt[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "gantt[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "gantt{}{}": {
       "snippet": "gantt{${1:h or v}}{${2:list}}"
@@ -367,7 +367,7 @@
       "snippet": "ganttbar{${1:number}}"
     },
     "gbrace{}": {
-      "snippet": "gbrace{${1:z1,C,z2}}"
+      "snippet": "gbrace{${1:z1,${2:C},z2}}"
     },
     "gclear": {},
     "gclip": {},
@@ -394,7 +394,7 @@
       "snippet": "globalsetmpvariable{${1:type}}{${2:name}}{${3:value}}"
     },
     "gradient{}": {
-      "snippet": "gradient{${1:function,width,angle}}"
+      "snippet": "gradient{${1:function,${2:width},angle}}"
     },
     "graphbar{}": {
       "snippet": "graphbar{${1:number}}"
@@ -422,7 +422,7 @@
       "snippet": "gridrays{${1:anglesep}}"
     },
     "halfellipse{}": {
-      "snippet": "halfellipse{${1:M1,M2,M3}}"
+      "snippet": "halfellipse{${1:M1,${2:M2},M3}}"
     },
     "hashlen": {},
     "hatch": {},
@@ -459,7 +459,7 @@
       "snippet": "histobar{${1:number}}"
     },
     "histogram[]{}{}": {
-      "snippet": "histogram[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "histogram[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "histogram{}{}": {
       "snippet": "histogram{${1:h or v}}{${2:list}}"
@@ -497,7 +497,7 @@
     },
     "lightershade": {},
     "lines{}": {
-      "snippet": "lines{${1:p0,p1,...}}"
+      "snippet": "lines{${1:p0,${2:p1},...}}"
     },
     "lmarks[]{}": {
       "snippet": "lmarks[${2:length}]{${1:number list}}"
@@ -527,13 +527,13 @@
       "snippet": "mfobj{${1:path expr}}"
     },
     "mfpbarchart[]{}{}": {
-      "snippet": "mfpbarchart[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfpbarchart[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "mfpbarchart{}{}": {
       "snippet": "mfpbarchart{${1:h or v}}{${2:list}}"
     },
     "mfpbargraph[]{}{}": {
-      "snippet": "mfpbargraph[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfpbargraph[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "mfpbargraph{}{}": {
       "snippet": "mfpbargraph{${1:h or v}}{${2:list}}"
@@ -559,13 +559,13 @@
       "snippet": "mfpframed{${1:content}}"
     },
     "mfpgantt[]{}{}": {
-      "snippet": "mfpgantt[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfpgantt[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "mfpgantt{}{}": {
       "snippet": "mfpgantt{${1:h or v}}{${2:list}}"
     },
     "mfphistogram[]{}{}": {
-      "snippet": "mfphistogram[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfphistogram[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
     },
     "mfphistogram{}{}": {
       "snippet": "mfphistogram{${1:h or v}}{${2:list}}"
@@ -671,10 +671,10 @@
       "snippet": "pairarray{${1:var}}{${2:list of points}}"
     },
     "parafcn[]{}{}": {
-      "snippet": "parafcn[${3:spec}]{${1:tmin,tmax,∆t}}{${2:(x(${4:t}),y(${5:t}))}}"
+      "snippet": "parafcn[${3:spec}]{${1:tmin,${4:tmax},∆t}}{${2:(x(${5:t}),y(${6:t}))}}"
     },
     "parafcn{}{}": {
-      "snippet": "parafcn{${1:tmin,tmax,∆t}}{${2:(x(${3:t}),y(${4:t}))}}"
+      "snippet": "parafcn{${1:tmin,${3:tmax},∆t}}{${2:(x(${4:t}),y(${5:t}))}}"
     },
     "parallelpath{}": {
       "snippet": "parallelpath{${1:distance}}"
@@ -725,22 +725,22 @@
       "snippet": "plotnodes{${1:symbol}}"
     },
     "plotsymbol[]{}{}": {
-      "snippet": "plotsymbol[${3:size}]{${1:symbol}}{${2:p0,p1,...}}"
+      "snippet": "plotsymbol[${3:size}]{${1:symbol}}{${2:p0,${4:p1},...}}"
     },
     "plotsymbol{}{}": {
-      "snippet": "plotsymbol{${1:symbol}}{${2:p0,p1,...}}"
+      "snippet": "plotsymbol{${1:symbol}}{${2:p0,${3:p1},...}}"
     },
     "plottext{}{}": {
-      "snippet": "plottext{${1:text}}{${2:(${3:x0,y0}),(${4:x1,y1}),...}}"
+      "snippet": "plottext{${1:text}}{${2:(${3:x0},${4:y0}),(${5:x1},${6:y1}),...}}"
     },
     "plr{}": {
-      "snippet": "plr{${1:(${2:r0,θ0}),(${3:r1,θ1}),...}}"
+      "snippet": "plr{${1:(${2:r0},${3:θ0}),(${4:r1},${5:θ1}),...}}"
     },
     "plrfcn[]{}{}": {
-      "snippet": "plrfcn[${3:spec}]{${1:θmin,θmax,∆θ}}{${2:f(${4:θ})}}"
+      "snippet": "plrfcn[${3:spec}]{${1:θmin,${4:θmax},∆θ}}{${2:f(${5:θ})}}"
     },
     "plrfcn{}{}": {
-      "snippet": "plrfcn{${1:θmin,θmax,∆θ}}{${2:f(${3:θ})}}"
+      "snippet": "plrfcn{${1:θmin,${3:θmax},∆θ}}{${2:f(${4:θ})}}"
     },
     "plrgrid{}": {
       "snippet": "plrgrid{${1:rsep,anglesep}}"
@@ -752,13 +752,13 @@
       "snippet": "plrgridpoints{${1:rsep,anglesep}}"
     },
     "plrpatch{}": {
-      "snippet": "plrpatch{${1:rmin,rmax,rsep,tmin,tmax,tsep}}"
+      "snippet": "plrpatch{${1:rmin,${2:rmax},${3:rsep},${4:tmin},${5:tmax},tsep}}"
     },
     "plrregion[]{}{}": {
-      "snippet": "plrregion[${3:spec}]{${1:θmin,θmax,∆θ}}{${2:f(${4:θ})}}"
+      "snippet": "plrregion[${3:spec}]{${1:θmin,${4:θmax},∆θ}}{${2:f(${5:θ})}}"
     },
     "plrregion{}{}": {
-      "snippet": "plrregion{${1:θmin,θmax,∆θ}}{${2:f(${3:θ})}}"
+      "snippet": "plrregion{${1:θmin,${3:θmax},∆θ}}{${2:f(${4:θ})}}"
     },
     "plrvectorfield[]{}{}{}": {
       "snippet": "plrvectorfield[${4:length}]{${1:rsep,tsep}}{${2:formula}}{${3:restriction}}"
@@ -767,10 +767,10 @@
       "snippet": "plrvectorfield{${1:rsep,tsep}}{${2:formula}}{${3:restriction}}"
     },
     "point[]{}": {
-      "snippet": "point[${2:size}]{${1:p0,p1,...}}"
+      "snippet": "point[${2:size}]{${1:p0,${3:p1},...}}"
     },
     "point{}": {
-      "snippet": "point{${1:p0,p1,...}}"
+      "snippet": "point{${1:p0,${2:p1},...}}"
     },
     "pointcolor[]{}": {
       "snippet": "pointcolor[${2:model}]{${1:color spec}}"
@@ -778,6 +778,9 @@
     "pointcolor{}": {
       "snippet": "pointcolor{${1:color spec}}"
     },
+    "pointdef{}()": {
+      "snippet": "pointdef{${1:name}}(${2:x},${3:y})"
+    },
     "pointedlines": {},
     "pointfillfalse": {},
     "pointfilltrue": {},
@@ -791,10 +794,10 @@
       "snippet": "polkadotwd{${1:diameter}}"
     },
     "polygon{}": {
-      "snippet": "polygon{${1:p0,p1,...}}"
+      "snippet": "polygon{${1:p0,${2:p1},...}}"
     },
     "polyline{}": {
-      "snippet": "polyline{${1:p0,p1,...}}"
+      "snippet": "polyline{${1:p0,${2:p1},...}}"
     },
     "pshcircle*{}": {
       "snippet": "pshcircle*{${1:center,radius}}"
@@ -813,10 +816,10 @@
       "snippet": "qspline{${1:list}}"
     },
     "quarterellipse{}": {
-      "snippet": "quarterellipse{${1:M1,A,M2}}"
+      "snippet": "quarterellipse{${1:M1,${2:A},M2}}"
     },
     "radialgradient{}": {
-      "snippet": "radialgradient{${1:clr function,width,center}}"
+      "snippet": "radialgradient{${1:clr function,${2:width},center}}"
     },
     "randomizepath{}": {
       "snippet": "randomizepath{${1:maxshift,weirdness}}"
@@ -825,7 +828,7 @@
       "snippet": "randomlines{${1:maxshift}}"
     },
     "randomwalk{}": {
-      "snippet": "randomwalk{${1:start,num,scale}}"
+      "snippet": "randomwalk{${1:start,${2:num},scale}}"
     },
     "reconfigureplot{}{}": {
       "snippet": "reconfigureplot{${1:method}}{${2:list}}"
@@ -884,7 +887,7 @@
       "snippet": "sclosed[${1:tension}]"
     },
     "sector{}": {
-      "snippet": "sector{${1:c,r,θ1,θ2}}"
+      "snippet": "sector{${1:c,${2:r},${3:θ1},θ2}}"
     },
     "sequence": {},
     "setallaxismargins{}": {
@@ -957,10 +960,10 @@
     },
     "sideheadlen": {},
     "sinewave[]{}": {
-      "snippet": "sinewave[${2:tension}]{${1:start,end,wl,amp}}"
+      "snippet": "sinewave[${2:tension}]{${1:start,${3:end},${4:wl},amp}}"
     },
     "sinewave{}": {
-      "snippet": "sinewave{${1:start,end,wl,amp}}"
+      "snippet": "sinewave{${1:start,${2:end},${3:wl},amp}}"
     },
     "slantpath{}": {
       "snippet": "slantpath{${1:y,factor}}"
@@ -996,7 +999,13 @@
       "snippet": "thatch[${1:space,angle}][${2:color}]"
     },
     "tile{}": {
-      "snippet": "tile{${1:tilename,unit,width,height,clip}}"
+      "snippet": "tile{${1:tilename,${2:unit},${3:width},${4:height},clip}}"
+    },
+    "tlabel(){}": {
+      "snippet": "tlabel(${2:x},${3:y}){${1:label text}}"
+    },
+    "tlabel[](){}": {
+      "snippet": "tlabel[${2:just}](${3:x},${4:y}){${1:label text}}"
     },
     "tlabel[]{}{}": {
       "snippet": "tlabel[${3:just}]{${1:pair list}}{${2:label text}}"
@@ -1004,18 +1013,84 @@
     "tlabel{}{}": {
       "snippet": "tlabel{${1:pair list}}{${2:label text}}"
     },
+    "tlabelcircle(){}": {
+      "snippet": "tlabelcircle(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabelcircle*(){}": {
+      "snippet": "tlabelcircle*(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabelcircle*[](){}": {
+      "snippet": "tlabelcircle*[${2:just}](${3:x},${4:y}){${1:text}}"
+    },
+    "tlabelcircle[](){}": {
+      "snippet": "tlabelcircle[${2:just}](${3:x},${4:y}){${1:text}}"
+    },
     "tlabelcolor[]{}": {
       "snippet": "tlabelcolor[${2:model}]{${1:color spec}}"
     },
     "tlabelcolor{}": {
       "snippet": "tlabelcolor{${1:color spec}}"
     },
+    "tlabelellipse(){}": {
+      "snippet": "tlabelellipse(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabelellipse*(){}": {
+      "snippet": "tlabelellipse*(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabelellipse*[](){}": {
+      "snippet": "tlabelellipse*[${2:ratio}](${3:x},${4:y}){${1:text}}"
+    },
+    "tlabelellipse*[][](){}": {
+      "snippet": "tlabelellipse*[${2:ratio}][${3:just}](${4:x},${5:y}){${1:text}}"
+    },
+    "tlabelellipse[](){}": {
+      "snippet": "tlabelellipse[${2:ratio}](${3:x},${4:y}){${1:text}}"
+    },
+    "tlabelellipse[][](){}": {
+      "snippet": "tlabelellipse[${2:ratio}][${3:just}](${4:x},${5:y}){${1:text}}"
+    },
     "tlabeljustify{}": {
       "snippet": "tlabeljustify{${1:just}}"
     },
     "tlabeloffset{}{}": {
       "snippet": "tlabeloffset{${1:hlength}}{${2:vlength}}"
     },
+    "tlabeloval(){}": {
+      "snippet": "tlabeloval(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabeloval*(){}": {
+      "snippet": "tlabeloval*(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabeloval*[](){}": {
+      "snippet": "tlabeloval*[${2:mult}](${3:x},${4:y}){${1:text}}"
+    },
+    "tlabeloval*[][](){}": {
+      "snippet": "tlabeloval*[${2:mult}][${3:just}](${4:x},${5:y}){${1:text}}"
+    },
+    "tlabeloval[](){}": {
+      "snippet": "tlabeloval[${2:mult}](${3:x},${4:y}){${1:text}}"
+    },
+    "tlabeloval[][](){}": {
+      "snippet": "tlabeloval[${2:mult}][${3:just}](${4:x},${5:y}){${1:text}}"
+    },
+    "tlabelrect(){}": {
+      "snippet": "tlabelrect(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabelrect*(){}": {
+      "snippet": "tlabelrect*(${2:x},${3:y}){${1:text}}"
+    },
+    "tlabelrect*[](){}": {
+      "snippet": "tlabelrect*[${2:radius}](${3:x},${4:y}){${1:text}}"
+    },
+    "tlabelrect*[][](){}": {
+      "snippet": "tlabelrect*[${2:radius}][${3:just}](${4:x},${5:y}){${1:text}}"
+    },
+    "tlabelrect[](){}": {
+      "snippet": "tlabelrect[${2:radius}](${3:x},${4:y}){${1:text}}"
+    },
+    "tlabelrect[][](){}": {
+      "snippet": "tlabelrect[${2:radius}][${3:just}](${4:x},${5:y}){${1:text}}"
+    },
     "tlabels{}": {
       "snippet": "tlabels{${1:params1 params2 ...}}"
     },
@@ -1053,7 +1128,7 @@
       "snippet": "turn{${1:degrees}}"
     },
     "turtle{}": {
-      "snippet": "turtle{${1:p0,v1,v2,...}}"
+      "snippet": "turtle{${1:p0,${2:v1},${3:v2},...}}"
     },
     "unsmoothdata": {},
     "usecenteredcaptions": {},
@@ -1139,7 +1214,7 @@
       "snippet": "yslantpath{${1:x,factor}}"
     },
     "zigzag{}": {
-      "snippet": "zigzag{${1:start,end,wl,amp}}"
+      "snippet": "zigzag{${1:start,${2:end},${3:wl},amp}}"
     },
     "zscale{}": {
       "snippet": "zscale{${1:v}}"
@@ -1199,7 +1274,7 @@
     },
     "tile{}": {
       "name": "tile",
-      "snippet": "{${1:tilename,unit,width,height,clip}}"
+      "snippet": "{${1:tilename,${2:unit},${3:width},${4:height},clip}}"
     }
   },
   "options": [
diff --git a/dev/packages/mfpic4ode.json b/dev/packages/mfpic4ode.json
index 536a7ec2a..a666e5fda 100644
--- a/dev/packages/mfpic4ode.json
+++ b/dev/packages/mfpic4ode.json
@@ -5,7 +5,7 @@
     "colorODEarrowtrue": {},
     "colorODEarrowfalse": {},
     "ODEdefineequation{}": {
-      "snippet": "ODEdefineequation{${1:f(${2:x,y})}}"
+      "snippet": "ODEdefineequation{${1:f(${2:x},${3:y})}}"
     },
     "trajectory{}{}": {
       "snippet": "trajectory{${1:x0}}{${2:y0}}"
@@ -17,7 +17,7 @@
       "snippet": "trajectoryRKF{${1:x0}}{${2:y0}}"
     },
     "trajectories{}": {
-      "snippet": "trajectories{${1:x1,y1;x2,y2;...}}"
+      "snippet": "trajectories{${1:x1,${2:y1;x2},y2;...}}"
     },
     "ODEarrow{}{}": {
       "snippet": "ODEarrow{${1:x}}{${2:y}}"
@@ -29,10 +29,10 @@
       "snippet": "ODEvarrow{${1:x}}"
     },
     "ODEarrows{}": {
-      "snippet": "ODEarrows{${1:x1,y1;x2,y2;...}}"
+      "snippet": "ODEarrows{${1:x1,${2:y1;x2},y2;...}}"
     },
     "ASdefineequations{}{}": {
-      "snippet": "ASdefineequations{${1:f(${3:x,y})}}{${2:g(${4:x,y})}}"
+      "snippet": "ASdefineequations{${1:f(${3:x},${4:y})}}{${2:g(${5:x},${6:y})}}"
     },
     "AStrajectory{}{}": {
       "snippet": "AStrajectory{${1:x0}}{${2:y0}}"
@@ -41,13 +41,13 @@
       "snippet": "AStrajectoryRKF{${1:x0}}{${2:y0}}"
     },
     "AStrajectories{}": {
-      "snippet": "AStrajectories{${1:x1,y1;x2,y2;...}}"
+      "snippet": "AStrajectories{${1:x1,${2:y1;x2},y2;...}}"
     },
     "ASarrow{}{}": {
       "snippet": "ASarrow{${1:x}}{${2:y}}"
     },
     "ASarrows{}": {
-      "snippet": "ASarrows{${1:x1,y1;x2,y2;...}}"
+      "snippet": "ASarrows{${1:x1,${2:y1;x2},y2;...}}"
     },
     "ODEline{}{}": {
       "snippet": "ODEline{${1:p0}}{${2:p1}}"
diff --git a/dev/packages/miller.json b/dev/packages/miller.json
index 33434dcfd..84ef9e47d 100644
--- a/dev/packages/miller.json
+++ b/dev/packages/miller.json
@@ -7,6 +7,9 @@
     "hkl<>": {
       "snippet": "hkl<${1:indices}>"
     },
+    "hkl()": {
+      "snippet": "hkl(${1:indices})"
+    },
     "hkl{}": {
       "snippet": "hkl{${1:indices}}"
     },
diff --git a/dev/packages/milsymb.json b/dev/packages/milsymb.json
index 1c85421bd..90e82211a 100644
--- a/dev/packages/milsymb.json
+++ b/dev/packages/milsymb.json
@@ -17,39 +17,111 @@
     "MilAir[]": {
       "snippet": "MilAir[${1:options}]"
     },
+    "MilAir[]()": {
+      "snippet": "MilAir[${1:options}](${2:location})"
+    },
+    "MilAir[]()(){}": {
+      "snippet": "MilAir[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilMissile[]": {
       "snippet": "MilMissile[${1:options}]"
     },
+    "MilMissile[]()": {
+      "snippet": "MilMissile[${1:options}](${2:location})"
+    },
+    "MilMissile[]()(){}": {
+      "snippet": "MilMissile[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilLand[]": {
       "snippet": "MilLand[${1:options}]"
     },
+    "MilLand[]()": {
+      "snippet": "MilLand[${1:options}](${2:location})"
+    },
+    "MilLand[]()(){}": {
+      "snippet": "MilLand[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilEquipment[]": {
       "snippet": "MilEquipment[${1:options}]"
     },
+    "MilEquipment[]()": {
+      "snippet": "MilEquipment[${1:options}](${2:location})"
+    },
+    "MilEquipment[]()(){}": {
+      "snippet": "MilEquipment[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilInstallation[]": {
       "snippet": "MilInstallation[${1:options}]"
     },
+    "MilInstallation[]()": {
+      "snippet": "MilInstallation[${1:options}](${2:location})"
+    },
+    "MilInstallation[]()(){}": {
+      "snippet": "MilInstallation[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilSeaSurface[]": {
       "snippet": "MilSeaSurface[${1:options}]"
     },
+    "MilSeaSurface[]()": {
+      "snippet": "MilSeaSurface[${1:options}](${2:location})"
+    },
+    "MilSeaSurface[]()(){}": {
+      "snippet": "MilSeaSurface[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilSeaSubsurface[]": {
       "snippet": "MilSeaSubsurface[${1:options}]"
     },
+    "MilSeaSubsurface[]()": {
+      "snippet": "MilSeaSubsurface[${1:options}](${2:location})"
+    },
+    "MilSeaSubsurface[]()(){}": {
+      "snippet": "MilSeaSubsurface[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilMine[]": {
       "snippet": "MilMine[${1:options}]"
     },
+    "MilMine[]()": {
+      "snippet": "MilMine[${1:options}](${2:location})"
+    },
+    "MilMine[]()(){}": {
+      "snippet": "MilMine[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilSpace[]": {
       "snippet": "MilSpace[${1:options}]"
     },
+    "MilSpace[]()": {
+      "snippet": "MilSpace[${1:options}](${2:location})"
+    },
+    "MilSpace[]()(){}": {
+      "snippet": "MilSpace[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilActivity[]": {
       "snippet": "MilActivity[${1:options}]"
     },
+    "MilActivity[]()": {
+      "snippet": "MilActivity[${1:options}](${2:location})"
+    },
+    "MilActivity[]()(){}": {
+      "snippet": "MilActivity[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "MilDebris[]": {
       "snippet": "MilDebris[${1:options}]"
     },
+    "MilDebris[]()": {
+      "snippet": "MilDebris[${1:options}](${2:location})"
+    },
+    "MilDebris[]()(){}": {
+      "snippet": "MilDebris[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "OwnShip[]": {
       "snippet": "OwnShip[${1:options}]"
     },
+    "OwnShip[]()": {
+      "snippet": "OwnShip[${1:options}](${2:location})"
+    },
+    "OwnShip[]()(){}": {
+      "snippet": "OwnShip[${2:options}](${3:location})(${4:name}){${1:label}}"
+    },
     "clipfriendly": {},
     "cliphostile": {},
     "clipneutral": {},
diff --git a/dev/packages/minted.json b/dev/packages/minted.json
new file mode 100644
index 000000000..131d4eed6
--- /dev/null
+++ b/dev/packages/minted.json
@@ -0,0 +1,297 @@
+{
+  "includes": {
+    "keyval": [],
+    "kvoptions": [],
+    "fvextra": [],
+    "ifthen": [],
+    "shellesc": [],
+    "ifplatform": [],
+    "pdftexcmds": [],
+    "etoolbox": [],
+    "xstring": [],
+    "lineno": [],
+    "framed": [],
+    "catchfile": [],
+    "xcolor": [],
+    "float": [],
+    "newfloat": [
+      "newfloat",
+      "newfloat=true"
+    ]
+  },
+  "macros": {
+    "mint[]{}{}": {
+      "snippet": "mint[${3:keys}]{${1:language}}{${2:verbatimSymbol}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mint{}": {
+      "snippet": "mint{${1:language}}|${2:code}|"
+    },
+    "mint[]{}": {
+      "snippet": "mint[${2:options}]{${1:language}}|${3:code}|",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mintinline[]{}{}": {
+      "snippet": "mintinline[${3:keys}]{${1:language}}{${2:verbatimSymbol}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mintinline{}": {
+      "snippet": "mintinline{${1:language}}|${2:code}|"
+    },
+    "mintinline[]{}": {
+      "snippet": "mintinline[${2:options}]{${1:language}}|${3:code}|",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "inputminted{}{}": {
+      "snippet": "inputminted{${1:language}}{${2:file}}"
+    },
+    "inputminted[]{}{}": {
+      "snippet": "inputminted[${3:options}]{${1:language}}{${2:file}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "usemintedstyle{}": {
+      "snippet": "usemintedstyle{${1:pygments style}}"
+    },
+    "usemintedstyle[]{}": {
+      "snippet": "usemintedstyle[${2:language}]{${1:pygments style}}"
+    },
+    "setminted{}": {
+      "snippet": "setminted{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "setminted[]{}": {
+      "snippet": "setminted[${2:language}]{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "setmintedinline{}": {
+      "snippet": "setmintedinline{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "setmintedinline[]{}": {
+      "snippet": "setmintedinline[${2:language}]{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "listoflistings": {},
+    "listingscaption": {},
+    "listoflistingscaption": {},
+    "newminted{}{}": {
+      "snippet": "newminted{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "newminted[]{}{}": {
+      "snippet": "newminted[${3:envname}]{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "newmint{}{}": {
+      "snippet": "newmint{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "newmint[]{}{}": {
+      "snippet": "newmint[${3:macro name}]{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "newmintinline{}{}": {
+      "snippet": "newmintinline{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "newmintinline[]{}{}": {
+      "snippet": "newmintinline[${3:macro name}]{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "newmintedfile{}{}": {
+      "snippet": "newmintedfile{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "newmintedfile[]{}{}": {
+      "snippet": "newmintedfile[${3:macro name}]{${1:language}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "DeleteFile{}": {
+      "snippet": "DeleteFile{${1:file}}"
+    },
+    "DeleteFile[]{}": {
+      "snippet": "DeleteFile[${2:directory}]{${1:file}}"
+    },
+    "ProvideDirectory{}": {
+      "snippet": "ProvideDirectory{${1:directory}}"
+    },
+    "ifAppExists": {},
+    "TestAppExists{}": {
+      "snippet": "TestAppExists{${1:application}}"
+    },
+    "MintedPygmentize": {},
+    "MintedPython": {},
+    "PYG": {},
+    "PYGZsq": {},
+    "PYGZhy": {},
+    "RobustMintInline{}": {
+      "snippet": "RobustMintInline{${1:arg}}"
+    },
+    "RobustMintInline[]{}": {
+      "snippet": "RobustMintInline[${2:opt}]{${1:arg}}"
+    },
+    "RobustMintInlineProcess{}{}{}": {
+      "snippet": "RobustMintInlineProcess{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "RobustMint{}": {
+      "snippet": "RobustMint{${1:arg}}"
+    },
+    "RobustMint[]{}": {
+      "snippet": "RobustMint[${2:opt}]{${1:arg}}"
+    },
+    "RobustMintProcess{}{}{}": {
+      "snippet": "RobustMintProcess{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "RobustNewMint": {},
+    "RobustNewMintInline": {}
+  },
+  "envs": {
+    "minted[]": {
+      "name": "minted",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "minted{}": {
+      "name": "minted",
+      "snippet": "{${1:language}}"
+    },
+    "minted[]{}": {
+      "name": "minted",
+      "snippet": "[${2:options}]{${1:language}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "listing": {},
+    "listing[]": {
+      "name": "listing",
+      "snippet": "[${1:placement}]"
+    }
+  },
+  "options": [
+    "chapter",
+    "section",
+    "cache",
+    "cachedir=${1:directory}",
+    "finalizecache",
+    "fontencoding=${1:encoding}",
+    "frozencache",
+    "draft",
+    "final",
+    "inputlanglinenos",
+    "kpsewhich",
+    "langlinenos",
+    "newfloat",
+    "outputdir=${1:directory}"
+  ],
+  "keyvals": [
+    [
+      "autogobble",
+      "baselinestretch=",
+      "beameroverlays",
+      "breakbytoken",
+      "breakbytokenanywhere",
+      "breaklines",
+      "bgcolor=",
+      "codetagify=${1:string list}",
+      "curlyquotes",
+      "encoding=${1:encoding}",
+      "escapeinside=${1:two chars}",
+      "firstline=${1:int}",
+      "firstnumber=",
+      "fontfamily=${1:family name}",
+      "fontseries=${1:series name}",
+      "fontsize=${1:size command}",
+      "fontshape=${1:shape name}",
+      "formatcom=${1:command}",
+      "frame=",
+      "framerule=",
+      "framesep=",
+      "funcnamehighlighting",
+      "gobble=${1:int}",
+      "highlightcolor=",
+      "highlightlines=${1:list of lineno ranges}",
+      "ignorelexererrors",
+      "keywordcase=",
+      "label=${1:string}",
+      "labelposition=",
+      "lastline=${1:int}",
+      "linenos",
+      "numberfirstline",
+      "numbers=",
+      "mathescape",
+      "numberblanklines",
+      "numbersep=",
+      "obeytabs",
+      "outencoding=${1:encoding}",
+      "python3",
+      "resetmargins",
+      "rulecolor=",
+      "samepage",
+      "showspaces",
+      "showtabs",
+      "space=${1:command}",
+      "spacecolor=",
+      "startinline",
+      "style=${1:pytments style}",
+      "stepnumber=${1:int}",
+      "stepnumberfromfirst",
+      "stepnumberoffsetvalues",
+      "stripall",
+      "stripnl",
+      "tab=${1:commnd}",
+      "tabcolor=",
+      "tabsize=${1:int}",
+      "texcl",
+      "texcomments",
+      "xleftmargin=",
+      "xrightmargin=",
+      "breakafter=${1:string}",
+      "breakafterinrun",
+      "breakaftersymbolpre=${1:string}",
+      "breakaftersymbolpost=${1:string}",
+      "breakanywhere",
+      "breakanywheresymbolpre=${1:string}",
+      "breakanywheresymbolpost=${1:string}",
+      "breakautoindent",
+      "breakbefore=${1:string}",
+      "breakbeforeinrun",
+      "breakbeforesymbolpre=${1:string}",
+      "breakbeforesymbolpost=${1:string}",
+      "breakindent=",
+      "breakindentnchars=${1:int}",
+      "breaksymbol=${1:string}",
+      "breaksymbolleft=${1:string}",
+      "breaksymbolright=${1:string}",
+      "breaksymbolindent=",
+      "breaksymbolindentnchars=${1:int}",
+      "breaksymbolindentleft=",
+      "breaksymbolindentleftnchars=${1:int}",
+      "breaksymbolindentritht=",
+      "breaksymbolindentrightnchars=${1:int}",
+      "breaksymbolsep=",
+      "breaksymbolsepnchars=${1:int}",
+      "breaksymbolsepleft=",
+      "breaksymbolsepleftnchars=${1:int}",
+      "breaksymbolsepright=",
+      "breaksymbolseprightnchars=${1:int}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/minutes.json b/dev/packages/minutes.json
index b2ff604a6..7671a1540 100644
--- a/dev/packages/minutes.json
+++ b/dev/packages/minutes.json
@@ -28,10 +28,10 @@
       "snippet": "minutetaker{${1:name}}"
     },
     "participant{}": {
-      "snippet": "participant{${1:name1,name2,...}}"
+      "snippet": "participant{${1:name1,${2:name2},...}}"
     },
     "guest{}": {
-      "snippet": "guest{${1:name1,name2,...}}"
+      "snippet": "guest{${1:name1,${2:name2},...}}"
     },
     "minutesdate{}": {
       "snippet": "minutesdate{${1:date}}"
@@ -46,16 +46,16 @@
       "snippet": "location{${1:location}}"
     },
     "cc{}": {
-      "snippet": "cc{${1:name1,name2,...}}"
+      "snippet": "cc{${1:name1,${2:name2},...}}"
     },
     "missing[]{}": {
-      "snippet": "missing[${2:no excuse name}]{${1:excused name1,excused name2,...}}"
+      "snippet": "missing[${2:no excuse name}]{${1:excused name1,${3:excused name2},...}}"
     },
     "missingExcused{}": {
-      "snippet": "missingExcused{${1:name1,name2,...}}"
+      "snippet": "missingExcused{${1:name1,${2:name2},...}}"
     },
     "missingNoExcuse{}": {
-      "snippet": "missingNoExcuse{${1:name1,name2,...}}"
+      "snippet": "missingNoExcuse{${1:name1,${2:name2},...}}"
     },
     "topic{}": {
       "snippet": "topic{${1:title}}"
@@ -191,10 +191,10 @@
       "snippet": "protokollant{${1:name}}"
     },
     "teilnehmer{}": {
-      "snippet": "teilnehmer{${1:name1,name2,...}}"
+      "snippet": "teilnehmer{${1:name1,${2:name2},...}}"
     },
     "gaeste{}": {
-      "snippet": "gaeste{${1:name1,name2,...}}"
+      "snippet": "gaeste{${1:name1,${2:name2},...}}"
     },
     "sitzungsdatum{}": {
       "snippet": "sitzungsdatum{${1:date}}"
@@ -209,16 +209,16 @@
       "snippet": "sitzungsort{${1:location}}"
     },
     "verteiler{}": {
-      "snippet": "verteiler{${1:name1,name2,...}}"
+      "snippet": "verteiler{${1:name1,${2:name2},...}}"
     },
     "fehlend[]{}": {
-      "snippet": "fehlend[${2:no excuse name}]{${1:excused name1,excused name2,...}}"
+      "snippet": "fehlend[${2:no excuse name}]{${1:excused name1,${3:excused name2},...}}"
     },
     "fehlendEntschuldigt{}": {
-      "snippet": "fehlendEntschuldigt{${1:name1,name2,...}}"
+      "snippet": "fehlendEntschuldigt{${1:name1,${2:name2},...}}"
     },
     "fehlendUnentschuldigt{}": {
-      "snippet": "fehlendUnentschuldigt{${1:name1,name2,...}}"
+      "snippet": "fehlendUnentschuldigt{${1:name1,${2:name2},...}}"
     },
     "zusatztopic{}": {
       "snippet": "zusatztopic{${1:title}}"
@@ -329,10 +329,10 @@
       "snippet": "notulist{${1:name}}"
     },
     "deelnemer{}": {
-      "snippet": "deelnemer{${1:name1,name2,...}}"
+      "snippet": "deelnemer{${1:name1,${2:name2},...}}"
     },
     "gast{}": {
-      "snippet": "gast{${1:name1,name2,...}}"
+      "snippet": "gast{${1:name1,${2:name2},...}}"
     },
     "bijeenkomstdatum{}": {
       "snippet": "bijeenkomstdatum{${1:date}}"
@@ -347,13 +347,13 @@
       "snippet": "locatie{${1:location}}"
     },
     "afwezig[]{}": {
-      "snippet": "afwezig[${2:no excuse name}]{${1:excused name1,excused name2,...}}"
+      "snippet": "afwezig[${2:no excuse name}]{${1:excused name1,${3:excused name2},...}}"
     },
     "afwezigBericht{}": {
-      "snippet": "afwezigBericht{${1:name1,name2,...}}"
+      "snippet": "afwezigBericht{${1:name1,${2:name2},...}}"
     },
     "afwezigZonderBericht{}": {
-      "snippet": "afwezigZonderBericht{${1:name1,name2,...}}"
+      "snippet": "afwezigZonderBericht{${1:name1,${2:name2},...}}"
     },
     "extrapunt{}": {
       "snippet": "extrapunt{${1:title}}"
diff --git a/dev/packages/mismath.json b/dev/packages/mismath.json
index d19f31f57..ac5603fdd 100644
--- a/dev/packages/mismath.json
+++ b/dev/packages/mismath.json
@@ -3,6 +3,7 @@
     "amsmath": [],
     "mathtools": [],
     "esvect": [],
+    "mleftright": [],
     "ifthen": [],
     "xspace": [],
     "iftex": [],
@@ -209,6 +210,12 @@
     "systemstretch": {},
     "changecol": {},
     "bslash": {},
+    "upDelta": {
+      "detail": "Δ",
+      "documentation": "capital del greek"
+    },
+    "opDelta": {},
+    "opdelta": {},
     "enumber": {},
     "inumber": {},
     "jnumber": {},
diff --git a/dev/packages/mkstmp_pro.json b/dev/packages/mkstmp_pro.json
index 94c2ab647..90a28da67 100644
--- a/dev/packages/mkstmp_pro.json
+++ b/dev/packages/mkstmp_pro.json
@@ -8,7 +8,7 @@
       "snippet": "setStampPath{${1:path}}"
     },
     "makeStamps{{}{}": {
-      "snippet": "makeStamps{{${1:name=name1,page=page1}}{${2:name=name2,page=page2}...}}"
+      "snippet": "makeStamps{{${1:name=name1,${3:page=page1}}{${2:name=name2},page=page2}...}}"
     },
     "definePath{}{}": {
       "snippet": "definePath{${1:cmd}}{${2:path}}"
diff --git a/dev/packages/mlist.json b/dev/packages/mlist.json
new file mode 100644
index 000000000..5933d3db1
--- /dev/null
+++ b/dev/packages/mlist.json
@@ -0,0 +1,151 @@
+{
+  "includes": {
+    "ifmtarg": [],
+    "xkeyval": []
+  },
+  "macros": {
+    "newvect{}{}": {
+      "snippet": "newvect{${1:macro}}{${2:text}}"
+    },
+    "newvect{}{}[]": {
+      "snippet": "newvect{${1:macro}}{${2:text}}[${3:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "newmatr{}{}": {
+      "snippet": "newmatr{${1:macro}}{${2:text}}"
+    },
+    "newmatr{}{}[]": {
+      "snippet": "newmatr{${1:macro}}{${2:text}}[${3:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "newfunc{}{}": {
+      "snippet": "newfunc{${1:macro}}{${2:text}}"
+    },
+    "newfunc{}{}[]": {
+      "snippet": "newfunc{${1:macro}}{${2:text}}[${3:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "newmset{}{}": {
+      "snippet": "newmset{${1:macro}}{${2:text}}"
+    },
+    "newmset{}{}[]": {
+      "snippet": "newmset{${1:macro}}{${2:text}}[${3:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 2
+    },
+    "setR": {},
+    "setC": {},
+    "setN": {},
+    "setZ": {},
+    "vect{}": {
+      "snippet": "vect{${1:text}}"
+    },
+    "vect{}{}": {
+      "snippet": "vect{${1:text}}{${2:indices}}"
+    },
+    "matr{}": {
+      "snippet": "matr{${1:text}}"
+    },
+    "matr{}{}": {
+      "snippet": "matr{${1:text}}{${2:entries}}"
+    },
+    "func{}": {
+      "snippet": "func{${1:text}}"
+    },
+    "func{}{}": {
+      "snippet": "func{${1:text}}{${2:arg}}"
+    },
+    "mset{}": {
+      "snippet": "mset{${1:text}}"
+    },
+    "mset{}{}": {
+      "snippet": "mset{${1:text}}{${2:dims}}"
+    },
+    "MID": {},
+    "LAST": {},
+    "newmlist{}": {
+      "snippet": "newmlist{${1:macro}}"
+    },
+    "newmlist{}[]": {
+      "snippet": "newmlist{${1:macro}}[${2:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "renewmlist{}": {
+      "snippet": "renewmlist{${1:macro}}"
+    },
+    "renewmlist{}[]": {
+      "snippet": "renewmlist{${1:macro}}[${2:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "mlistsetup{}": {
+      "snippet": "mlistsetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mlistsub{}{}": {
+      "snippet": "mlistsub{${1:arg}}{${2:sub}}"
+    },
+    "mlistsup{}{}": {
+      "snippet": "mlistsup{${1:arg}}{${2:sup}}"
+    },
+    "mlistelem{}{}": {
+      "snippet": "mlistelem{${1:arg1}}{${2:arg2}}"
+    },
+    "mlisthead{}": {
+      "snippet": "mlisthead{${1:arg}}"
+    },
+    "mlistnowrap{}{}": {
+      "snippet": "mlistnowrap{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistparen{}{}": {
+      "snippet": "mlistparen{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistbrack{}{}": {
+      "snippet": "mlistbrack{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistbrace{}{}": {
+      "snippet": "mlistbrace{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistangle{}{}": {
+      "snippet": "mlistangle{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistheadparen{}{}": {
+      "snippet": "mlistheadparen{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistheadbrack{}{}": {
+      "snippet": "mlistheadbrack{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistheadbrace{}{}": {
+      "snippet": "mlistheadbrace{${1:arg1}}{${2:arg2}}"
+    },
+    "mlistheadangle{}{}": {
+      "snippet": "mlistheadangle{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "headcmd=${1:macro}",
+      "elemcmd=${1:macro}",
+      "headhook=${1:code}",
+      "wrap={${1:open}}{${2:close}}",
+      "wrapone",
+      "wrapone={${1:open}}{${2:close}}",
+      "wrapcmd=${1:macro}",
+      "wraponecmd=${1:macro}",
+      "sep=${1:code}",
+      "sepsep=${1:code}",
+      "symbol=${1:symbol}",
+      "index={${1:indeices}}",
+      "elem={${1:args}}",
+      "dot=${1:code}",
+      "dots=${1:code}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/modiagram.json b/dev/packages/modiagram.json
index 841efa414..bc00c55e0 100644
--- a/dev/packages/modiagram.json
+++ b/dev/packages/modiagram.json
@@ -22,13 +22,29 @@
     "molecule[]{}": {
       "snippet": "molecule[${2:name}]{${1:MO-spec}}"
     },
+    "AO(){}{}": {
+      "snippet": "AO(${3:xshift}){${1:type}}{${2:energy; el-spec}}"
+    },
+    "AO(){}[]{}": {
+      "snippet": "AO(${4:xshift}){${1:type}}[${2:options}]{${3:energy; el-spec}}",
+      "keyvalindex": 1,
+      "keyvalpos": 2
+    },
+    "AO[](){}{}": {
+      "snippet": "AO[${3:name}](${4:xshift}){${1:type}}{${2:energy; el-spec}}"
+    },
+    "AO[](){}[]{}": {
+      "snippet": "AO[${3:name}](${5:xshift}){${1:type}}[${4:options}]{${2:energy; el-spec}}",
+      "keyvalindex": 1,
+      "keyvalpos": 3
+    },
     "connect{}": {
       "snippet": "connect{${1:AO-connect}}"
     },
     "EnergyAxis": {},
     "EnergyAxis[]": {
       "snippet": "EnergyAxis[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
       "keyvalpos": 0
     }
   },
@@ -58,6 +74,24 @@
       "labels-fs=${1:cmd}",
       "labels-style={${1:TikZ}}"
     ],
+    [
+      "label=",
+      "label[x]=",
+      "label[y]=",
+      "label[z]=",
+      "color=",
+      "color[x]=",
+      "color[y]=",
+      "color[z]=",
+      "up-el-pos=${1:number}",
+      "up-el-pos[x]=${1:number}",
+      "up-el-pos[y]=${1:number}",
+      "up-el-pos[z]=${1:number}",
+      "down-el-pos=${1:number}",
+      "down-el-pos[x]=${1:number}",
+      "down-el-pos[y]=${1:number}",
+      "down-el-pos[z]=${1:number}"
+    ],
     [
       "title=",
       "head=${1:TikZ arrow head}"
diff --git a/dev/packages/msc.json b/dev/packages/msc.json
index 036643b91..c184b6d92 100644
--- a/dev/packages/msc.json
+++ b/dev/packages/msc.json
@@ -399,43 +399,86 @@
     "hmscstartsymbol{}": {
       "snippet": "hmscstartsymbol{${1:nickname}}"
     },
+    "hmscstartsymbol{}()": {
+      "snippet": "hmscstartsymbol{${1:nickname}}(${2:x},${3:y})"
+    },
     "hmscstartsymbol[]{}": {
       "snippet": "hmscstartsymbol[${2:options}]{${1:nickname}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "hmscstartsymbol[]{}()": {
+      "snippet": "hmscstartsymbol[${2:options}]{${1:nickname}}(${3:x},${4:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "hmscendsymbol{}": {
       "snippet": "hmscendsymbol{${1:nickname}}"
     },
+    "hmscendsymbol{}()": {
+      "snippet": "hmscendsymbol{${1:nickname}}(${2:x},${3:y})"
+    },
     "hmscendsymbol[]{}": {
       "snippet": "hmscendsymbol[${2:options}]{${1:nickname}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "hmscendsymbol[]{}()": {
+      "snippet": "hmscendsymbol[${2:options}]{${1:nickname}}(${3:x},${4:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "hmscreference{}{}": {
       "snippet": "hmscreference{${1:nickname}}{${2:text}}"
     },
+    "hmscreference{}{}()": {
+      "snippet": "hmscreference{${1:nickname}}{${2:text}}(${3:x},${4:y})"
+    },
     "hmscreference[]{}{}": {
       "snippet": "hmscreference[${3:options}]{${1:nickname}}{${2:text}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "hmscreference[]{}{}()": {
+      "snippet": "hmscreference[${3:options}]{${1:nickname}}{${2:text}}(${4:x},${5:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "hmsccondition{}{}": {
       "snippet": "hmsccondition{${1:nickname}}{${2:text}}"
     },
+    "hmsccondition{}{}()": {
+      "snippet": "hmsccondition{${1:nickname}}{${2:text}}(${3:x},${4:y})"
+    },
     "hmsccondition[]{}{}": {
       "snippet": "hmsccondition[${3:options}]{${1:nickname}}{${2:text}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "hmsccondition[]{}{}()": {
+      "snippet": "hmsccondition[${3:options}]{${1:nickname}}{${2:text}}(${4:x},${5:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "hmscconnection{}": {
       "snippet": "hmscconnection{${1:nickname}}"
     },
+    "hmscconnection{}()": {
+      "snippet": "hmscconnection{${1:nickname}}(${2:x},${3:y})"
+    },
     "hmscconnection[]{}": {
       "snippet": "hmscconnection[${2:options}]{${1:nickname}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "hmscconnection[]{}()": {
+      "snippet": "hmscconnection[${2:options}]{${1:nickname}}(${3:x},${4:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "reference{}()": {
+      "snippet": "reference{${1:text}}(${2:x},${3:y})"
+    },
     "separator{}": {
       "snippet": "separator{${1:y}}"
     },
@@ -563,11 +606,29 @@
       "name": "hmsc",
       "snippet": "{${1:name}}"
     },
+    "hmsc{}(llx,lly)(urx,ury)": {
+      "name": "hmsc",
+      "snippet": "{${1:name}}(${2:llx},${3:lly})(${4:urx},${5:ury})"
+    },
     "hmsc[]{}": {
       "name": "hmsc",
       "snippet": "[${2:options}]{${1:name}}",
       "keyvalindex": 0,
       "keyvalpos": 0
+    },
+    "hmsc[]{}(llx,lly)(urx,ury)": {
+      "name": "hmsc",
+      "snippet": "[${2:options}]{${1:name}}(${3:llx},${4:lly})(${5:urx},${6:ury})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "mscdoc{}(llx,lly)(urx,ury)": {
+      "name": "mscdoc",
+      "snippet": "{${1:name}}(${2:llx},${3:lly})(${4:urx},${5:ury})"
+    },
+    "mscdoc[]{}(llx,lly)(urx,ury)": {
+      "name": "mscdoc",
+      "snippet": "[${2:headerpos}]{${1:name}}(${3:llx},${4:lly})(${5:urx},${6:ury})"
     }
   },
   "options": [],
diff --git a/dev/packages/multibib.json b/dev/packages/multibib.json
index e8b7f52a3..921355399 100644
--- a/dev/packages/multibib.json
+++ b/dev/packages/multibib.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "newcites{}{}": {
-      "snippet": "newcites{${1:suffix1,suffix2,...}}{${2:title1,title2,...}}"
+      "snippet": "newcites{${1:suffix1,${3:suffix2},${4:...}}{${2:title1},${5:title2},...}}"
     },
     "setbiblabelwidth{}": {
       "snippet": "setbiblabelwidth{${1:number}}"
diff --git a/dev/packages/multicol.json b/dev/packages/multicol.json
new file mode 100644
index 000000000..54f0faa8e
--- /dev/null
+++ b/dev/packages/multicol.json
@@ -0,0 +1,63 @@
+{
+  "includes": {},
+  "macros": {
+    "columnbreak": {},
+    "columnseprulecolor": {},
+    "docolaction{}{}{}": {
+      "snippet": "docolaction{${1:first}}{${2:middle}}{${3:last}}"
+    },
+    "flushcolumns": {},
+    "LRmulticolcolumns": {},
+    "maxbalancingoverflow": {},
+    "multicolbaselineskip": {},
+    "multicolmindepthstring": {},
+    "multicolpretolerance": {},
+    "multicolsep": {},
+    "multicoltolerance": {},
+    "newcolumn": {},
+    "postmulticols": {},
+    "premulticols": {},
+    "raggedcolumns": {},
+    "RLmulticolcolumns": {},
+    "setemergencystretch{}{}": {
+      "snippet": "setemergencystretch{${1:num of cols}}{${2:hsize}}"
+    },
+    "vfilmaxdepth": {}
+  },
+  "envs": {
+    "multicols*{}": {
+      "name": "multicols*",
+      "snippet": "{${1:n}}"
+    },
+    "multicols*{}[]": {
+      "name": "multicols*",
+      "snippet": "{${1:n}}[${2:preface}]"
+    },
+    "multicols*{}[][]": {
+      "name": "multicols*",
+      "snippet": "{${1:n}}[${2:preface}][${3:skip}]"
+    },
+    "multicols{}": {
+      "name": "multicols",
+      "snippet": "{${1:n}}"
+    },
+    "multicols{}[]": {
+      "name": "multicols",
+      "snippet": "{${1:n}}[${2:preface}]"
+    },
+    "multicols{}[][]": {
+      "name": "multicols",
+      "snippet": "{${1:n}}[${2:preface}][${3:skip}]"
+    }
+  },
+  "options": [
+    "errorshow",
+    "infoshow",
+    "balancingshow",
+    "markshow",
+    "debugshow",
+    "grid",
+    "colaction"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/multienv.json b/dev/packages/multienv.json
index 5231e4098..b9e839ee3 100644
--- a/dev/packages/multienv.json
+++ b/dev/packages/multienv.json
@@ -2,41 +2,41 @@
   "includes": {},
   "macros": {
     "newmultienvironment{}{}": {
-      "snippet": "newmultienvironment{${1:envname}}{${2:env,env=arg,...}}"
+      "snippet": "newmultienvironment{${1:envname}}{${2:env,${3:env=arg},...}}"
     },
     "newmultienvironment{}[]{}": {
-      "snippet": "newmultienvironment{${1:envname}}[${2:args}]{${3:env,env=arg,...}}"
+      "snippet": "newmultienvironment{${1:envname}}[${2:args}]{${3:env,${4:env=arg},...}}"
     },
     "newmultienvironment{}[][]{}": {
-      "snippet": "newmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,env=arg,...}}"
+      "snippet": "newmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,${5:env=arg},...}}"
     },
     "renewmultienvironment{}{}": {
-      "snippet": "renewmultienvironment{${1:envname}}{${2:env,env=arg,...}}"
+      "snippet": "renewmultienvironment{${1:envname}}{${2:env,${3:env=arg},...}}"
     },
     "renewmultienvironment{}[]{}": {
-      "snippet": "renewmultienvironment{${1:envname}}[${2:args}]{${3:env,env=arg,...}}"
+      "snippet": "renewmultienvironment{${1:envname}}[${2:args}]{${3:env,${4:env=arg},...}}"
     },
     "renewmultienvironment{}[][]{}": {
-      "snippet": "renewmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,env=arg,...}}"
+      "snippet": "renewmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,${5:env=arg},...}}"
     },
     "providemultienvironment{}{}": {
-      "snippet": "providemultienvironment{${1:envname}}{${2:env,env=arg,...}}"
+      "snippet": "providemultienvironment{${1:envname}}{${2:env,${3:env=arg},...}}"
     },
     "providemultienvironment{}[]{}": {
-      "snippet": "providemultienvironment{${1:envname}}[${2:args}]{${3:env,env=arg,...}}"
+      "snippet": "providemultienvironment{${1:envname}}[${2:args}]{${3:env,${4:env=arg},...}}"
     },
     "providemultienvironment{}[][]{}": {
-      "snippet": "providemultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,env=arg,...}}"
+      "snippet": "providemultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,${5:env=arg},...}}"
     }
   },
   "envs": {
     "multienv{}": {
       "name": "multienv",
-      "snippet": "{${1:env,env=arg,key=value,...}}"
+      "snippet": "{${1:env,${2:env=arg},${3:key=value},...}}"
     },
     "multienv*{}": {
       "name": "multienv*",
-      "snippet": "{${1:env,env=arg,key=value,...}}"
+      "snippet": "{${1:env,${2:env=arg},${3:key=value},...}}"
     }
   },
   "options": [],
diff --git a/dev/packages/multilang.json b/dev/packages/multilang.json
new file mode 100644
index 000000000..797bab554
--- /dev/null
+++ b/dev/packages/multilang.json
@@ -0,0 +1,49 @@
+{
+  "includes": {
+    "environ": [],
+    "etoolbox": [],
+    "pgfkeys": [],
+    "pgfopts": []
+  },
+  "macros": {
+    "NewMultilangCmd{}{}": {
+      "snippet": "NewMultilangCmd{${1:command}}{${2:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "NewMultilangEnv{}{}": {
+      "snippet": "NewMultilangEnv{${1:envname}}{${2:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "NewMultilangType{}{}": {
+      "snippet": "NewMultilangType{${1:type name}}{${2:format}}"
+    },
+    "NewMultilangType[]{}{}": {
+      "snippet": "NewMultilangType[${3:arg count}]{${1:type name}}{${2:format}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "languages={${1:lang1,lang2,...}}"
+  ],
+  "keyvals": [
+    [
+      "command=${1:command}",
+      "margs={${1:arg1,arg2,...}}",
+      "oargs={${1:arg1,arg2,...}}",
+      "starred",
+      "disablable",
+      "defaults={${1:arg1=val1,arg2=val2,...}}",
+      "alias/${1:name}={${2:arg1,arg2,...}}"
+    ],
+    [
+      "environment=${1:environment}",
+      "margs={${1:arg1,arg2,...}}",
+      "oargs={${1:arg1,arg2,...}}",
+      "disablable",
+      "defaults={${1:arg1=val1,arg2=val2,...}}",
+      "alias/${1:name}={${2:arg1,arg2,...}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/na-position.json b/dev/packages/na-position.json
index 6907d51d5..6cd82bda0 100644
--- a/dev/packages/na-position.json
+++ b/dev/packages/na-position.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "tkzTabPos{}": {
-      "snippet": "tkzTabPos{${1:symbol1/expr1,symbol2/expr2,...}}"
+      "snippet": "tkzTabPos{${1:symbol1/expr1,${2:symbol2/expr2},...}}"
     },
     "tkzTabPos[]{}": {
-      "snippet": "tkzTabPos[${2:options}]{${1:symbol1/expr1,symbol2/expr2,...}}",
+      "snippet": "tkzTabPos[${2:options}]{${1:symbol1/expr1,${3:symbol2/expr2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/nameauth.json b/dev/packages/nameauth.json
index 457a57861..0c4f9f6d7 100644
--- a/dev/packages/nameauth.json
+++ b/dev/packages/nameauth.json
@@ -21,7 +21,7 @@
       "snippet": "AKA*[${3:forename}]{${1:surname}}{${2:xref surname}}"
     },
     "AKA*{}{}": {
-      "snippet": "AKA*{${1:surname,affix}}{${2:xref surname,affix}}"
+      "snippet": "AKA*{${1:surname,${3:affix}}{${2:xref surname},affix}}"
     },
     "AKA[]{}[]{}": {
       "snippet": "AKA[${3:forename}]{${1:surname}}[${4:xref forename}]{${2:xref surname}}"
@@ -33,7 +33,7 @@
       "snippet": "AKA[${3:forename}]{${1:surname}}{${2:xref surname}}"
     },
     "AKA{}{}": {
-      "snippet": "AKA{${1:surname,affix}}{${2:xref surname,affix}}"
+      "snippet": "AKA{${1:surname,${3:affix}}{${2:xref surname},affix}}"
     },
     "AllCapsActive": {},
     "AllCapsInactive": {},
@@ -213,7 +213,7 @@
       "snippet": "PName*[${3:forename}]{${1:surname}}{${2:xref surname}}"
     },
     "PName*{}{}": {
-      "snippet": "PName*{${1:surname,affix}}{${2:xref surname,affix}}"
+      "snippet": "PName*{${1:surname,${3:affix}}{${2:xref surname},affix}}"
     },
     "PName[]{}[]{}": {
       "snippet": "PName[${3:forename}]{${1:surname}}[${4:xref forename}]{${2:xref surname}}"
diff --git a/dev/packages/nameref.json b/dev/packages/nameref.json
new file mode 100644
index 000000000..4a98e54c9
--- /dev/null
+++ b/dev/packages/nameref.json
@@ -0,0 +1,26 @@
+{
+  "includes": {
+    "refcount": [],
+    "gettitlestring": []
+  },
+  "macros": {
+    "nameref{}": {
+      "snippet": "nameref{${1:label}}"
+    },
+    "nameref*{}": {
+      "snippet": "nameref*{${1:label}}"
+    },
+    "Nameref{}": {
+      "snippet": "Nameref{${1:label}}"
+    },
+    "Sectionformat{}{}": {
+      "snippet": "Sectionformat{${1:arg1}}{${2:arg2}}"
+    },
+    "vnameref{}": {
+      "snippet": "vnameref{${1:label}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/nccfloats.json b/dev/packages/nccfloats.json
index e3d1c6f83..827d58c18 100644
--- a/dev/packages/nccfloats.json
+++ b/dev/packages/nccfloats.json
@@ -40,24 +40,48 @@
     "sidefig[]{}{}": {
       "snippet": "sidefig[${3:pos}]{${1:figure}}{${2:text}}"
     },
+    "sidefig()(){}{}": {
+      "snippet": "sidefig(${3:figwidth})(${4:textwidth}){${1:figure}}{${2:text}}"
+    },
+    "sidefig[]()(){}{}": {
+      "snippet": "sidefig[${3:pos}](${4:figwidth})(${5:textwidth}){${1:figure}}{${2:text}}"
+    },
     "sidefig*{}{}": {
       "snippet": "sidefig*{${1:figure}}{${2:text}}"
     },
     "sidefig*[]{}{}": {
       "snippet": "sidefig*[${3:pos}]{${1:figure}}{${2:text}}"
     },
+    "sidefig*()(){}{}": {
+      "snippet": "sidefig*(${3:figwidth})(${4:textwidth}){${1:figure}}{${2:text}}"
+    },
+    "sidefig*[]()(){}{}": {
+      "snippet": "sidefig*[${3:pos}](${4:figwidth})(${5:textwidth}){${1:figure}}{${2:text}}"
+    },
     "sidetabl{}{}": {
       "snippet": "sidetabl{${1:table}}{${2:text}}"
     },
     "sidetabl[]{}{}": {
       "snippet": "sidetabl[${3:pos}]{${1:table}}{${2:text}}"
     },
+    "sidetabl()(){}{}": {
+      "snippet": "sidetabl(${3:tablewidth})(${4:textwidth}){${1:table}}{${2:text}}"
+    },
+    "sidetabl[]()(){}{}": {
+      "snippet": "sidetabl[${3:pos}](${4:tablewidth})(${5:textwidth}){${1:table}}{${2:text}}"
+    },
     "sidetabl*{}{}": {
       "snippet": "sidetabl*{${1:table}}{${2:text}}"
     },
     "sidetabl*[]{}{}": {
       "snippet": "sidetabl*[${3:pos}]{${1:table}}{${2:text}}"
     },
+    "sidetabl*()(){}{}": {
+      "snippet": "sidetabl*(${3:tablewidth})(${4:textwidth}){${1:table}}{${2:text}}"
+    },
+    "sidetabl*[]()(){}{}": {
+      "snippet": "sidetabl*[${3:pos}](${4:tablewidth})(${5:textwidth}){${1:table}}{${2:text}}"
+    },
     "ifleftsidefloat{}{": {
       "snippet": "ifleftsidefloat{${1:left clause}}{${2:right clause}}"
     },
@@ -67,48 +91,96 @@
     "fig[]{}": {
       "snippet": "fig[${2:placement}]{${1:body}}"
     },
+    "fig(){}": {
+      "snippet": "fig(${2:width}){${1:body}}"
+    },
+    "fig[](){}": {
+      "snippet": "fig[${2:placement}](${3:width}){${1:body}}"
+    },
     "fig*{}": {
       "snippet": "fig*{${1:body}}"
     },
     "fig*[]{}": {
       "snippet": "fig*[${2:placement}]{${1:body}}"
     },
+    "fig*(){}": {
+      "snippet": "fig*(${2:width}){${1:body}}"
+    },
+    "fig*[](){}": {
+      "snippet": "fig*[${2:placement}](${3:width}){${1:body}}"
+    },
     "tabl{}": {
       "snippet": "tabl{${1:body}}"
     },
     "tabl[]{}": {
       "snippet": "tabl[${2:placement}]{${1:body}}"
     },
+    "tabl(){}": {
+      "snippet": "tabl(${2:width}){${1:body}}"
+    },
+    "tabl[](){}": {
+      "snippet": "tabl[${2:placement}](${3:width}){${1:body}}"
+    },
     "tabl*{}": {
       "snippet": "tabl*{${1:body}}"
     },
     "tabl*[]{}": {
       "snippet": "tabl*[${2:placement}]{${1:body}}"
     },
+    "tabl*(){}": {
+      "snippet": "tabl*(${2:width}){${1:body}}"
+    },
+    "tabl*[](){}": {
+      "snippet": "tabl*[${2:placement}](${3:width}){${1:body}}"
+    },
     "figs{}{}": {
       "snippet": "figs{${1:body1}}{${2:body2}}"
     },
     "figs[]{}{}": {
       "snippet": "figs[${3:placement}]{${1:body1}}{${2:body2}}"
     },
+    "figs()(){}{}": {
+      "snippet": "figs(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
+    },
+    "figs[]()(){}{}": {
+      "snippet": "figs[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
+    },
     "figs*{}{}": {
       "snippet": "figs*{${1:body1}}{${2:body2}}"
     },
     "figs*[]{}{}": {
       "snippet": "figs*[${3:placement}]{${1:body1}}{${2:body2}}"
     },
+    "figs*()(){}{}": {
+      "snippet": "figs*(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
+    },
+    "figs*[]()(){}{}": {
+      "snippet": "figs*[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
+    },
     "tabls{}{}": {
       "snippet": "tabls{${1:body1}}{${2:body2}}"
     },
     "tabls[]{}{}": {
       "snippet": "tabls[${3:placement}]{${1:body1}}{${2:body2}}"
     },
+    "tabls()(){}{}": {
+      "snippet": "tabls(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
+    },
+    "tabls[]()(){}{}": {
+      "snippet": "tabls[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
+    },
     "tabls*{}{}": {
       "snippet": "tabls*{${1:body1}}{${2:body2}}"
     },
     "tabls*[]{}{}": {
       "snippet": "tabls*[${3:placement}]{${1:body1}}{${2:body2}}"
     },
+    "tabls*()(){}{}": {
+      "snippet": "tabls*(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
+    },
+    "tabls*[]()(){}{}": {
+      "snippet": "tabls*[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
+    },
     "newminifloat{}{}{}{}": {
       "snippet": "newminifloat{${1:gen}}{${2:type}}{${3:placement}}{${4:pos}}"
     }
diff --git a/dev/packages/nccpic.json b/dev/packages/nccpic.json
index 5de2df9fe..aeba6a877 100644
--- a/dev/packages/nccpic.json
+++ b/dev/packages/nccpic.json
@@ -8,7 +8,19 @@
       "snippet": "ipic{${1:imagefile}}"
     },
     "draftgraphics": {},
-    "finalgraphics": {}
+    "finalgraphics": {},
+    "putimage(){}": {
+      "snippet": "putimage(${2:x},${3:y}){${1:imagefile}}"
+    },
+    "putimage()[]{}": {
+      "snippet": "putimage(${3:x},${4:y})[${2:width,height}]{${1:imagefile}}"
+    },
+    "putimage()(){}": {
+      "snippet": "putimage(${2:x},${3:y})(${4:xshift},${5:yshift}){${1:imagefile}}"
+    },
+    "putimage()[](){}": {
+      "snippet": "putimage(${3:x},${4:y})[${2:width,height}](${5:xshift},${6:yshift}){${1:imagefile}}"
+    }
   },
   "envs": {},
   "options": [
diff --git a/dev/packages/newtx.json b/dev/packages/newtx.json
index fdd1166a0..9c142fa17 100644
--- a/dev/packages/newtx.json
+++ b/dev/packages/newtx.json
@@ -285,6 +285,7 @@
     "baskervaldx",
     "heuristica",
     "erewhon",
+    "gelasio",
     "xcharter",
     "stix2",
     "nc",
diff --git a/dev/packages/newtxmath.json b/dev/packages/newtxmath.json
index 539e081aa..50a6643fa 100644
--- a/dev/packages/newtxmath.json
+++ b/dev/packages/newtxmath.json
@@ -2204,6 +2204,7 @@
     "utopia",
     "heuristica",
     "erewhon",
+    "gelasio",
     "xcharter",
     "cmintegrals",
     "cmbraces",
diff --git a/dev/packages/nextpage.json b/dev/packages/nextpage.json
new file mode 100644
index 000000000..970f5aeb8
--- /dev/null
+++ b/dev/packages/nextpage.json
@@ -0,0 +1,24 @@
+{
+  "includes": {},
+  "macros": {
+    "cleartoevenpage": {},
+    "cleartoevenpage[]": {
+      "snippet": "cleartoevenpage[${1:code}]"
+    },
+    "movetoevenpage": {},
+    "movetoevenpage[]": {
+      "snippet": "movetoevenpage[${1:code}]"
+    },
+    "cleartooddpage": {},
+    "cleartooddpage[]": {
+      "snippet": "cleartooddpage[${1:code}]"
+    },
+    "movetooddpage": {},
+    "movetooddpage[]": {
+      "snippet": "movetooddpage[${1:code}]"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/nicematrix.json b/dev/packages/nicematrix.json
index b9ff0e345..773728533 100644
--- a/dev/packages/nicematrix.json
+++ b/dev/packages/nicematrix.json
@@ -56,10 +56,10 @@
     },
     "Body": {},
     "cellcolor{}{}": {
-      "snippet": "cellcolor{${1:color}}{${2:i-j,k-l,...}}"
+      "snippet": "cellcolor{${1:color}}{${2:i-j,${3:k-l},...}}"
     },
     "cellcolor[]{}{}": {
-      "snippet": "cellcolor[${3:color_model}]{${1:color}}{${2:i-j,k-l,...}}"
+      "snippet": "cellcolor[${3:color_model}]{${1:color}}{${2:i-j,${4:k-l},...}}"
     },
     "rectanglecolor{}{}{}": {
       "snippet": "rectanglecolor{${1:color}}{${2:i-j}}{${3:k-l}}"
@@ -80,16 +80,16 @@
       "snippet": "chessboardcolors[${3:color_model}]{${1:color1}}{${2:color2}}"
     },
     "rowcolor{}{}": {
-      "snippet": "rowcolor{${1:color}}{${2:i,j-k,l-,...}}"
+      "snippet": "rowcolor{${1:color}}{${2:i,${3:j-k},${4:l-},...}}"
     },
     "rowcolor[]{}{}": {
-      "snippet": "rowcolor[${3:color_model}]{${1:color}}{${2:i,j-k,l-,...}}"
+      "snippet": "rowcolor[${3:color_model}]{${1:color}}{${2:i,${4:j-k},${5:l-},...}}"
     },
     "columncolor{}{}": {
-      "snippet": "columncolor{${1:color}}{${2:i,j-k,l-,...}}"
+      "snippet": "columncolor{${1:color}}{${2:i,${3:j-k},${4:l-},...}}"
     },
     "columncolor[]{}{}": {
-      "snippet": "columncolor[${3:color_model}]{${1:color}}{${2:i,j-k,l-,...}}"
+      "snippet": "columncolor[${3:color_model}]{${1:color}}{${2:i,${4:j-k},${5:l-},...}}"
     },
     "rowcolors{}{}{}": {
       "snippet": "rowcolors{${1:row}}{${2:color1}}{${3:color2}}"
@@ -100,10 +100,10 @@
       "keyvalpos": 4
     },
     "rowlistcolors{}{}": {
-      "snippet": "rowlistcolors{${1:row}}{${2:color1,color2,...}}"
+      "snippet": "rowlistcolors{${1:row}}{${2:color1,${3:color2},...}}"
     },
     "rowlistcolors[]{}{}": {
-      "snippet": "rowlistcolors[${3:color model}]{${1:row}}{${2:color1,color2,...}}"
+      "snippet": "rowlistcolors[${3:color model}]{${1:row}}{${2:color1,${4:color2},...}}"
     },
     "RowStyle{}": {
       "snippet": "RowStyle{${1:code}}"
@@ -537,6 +537,8 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
+      "ampersand-in-blocks",
+      "&-in-blocks",
       "width=",
       "notes={${1:specs}}",
       "notes/style=",
@@ -586,6 +588,8 @@
       "borders={${1:borders options}}",
       "hvlines",
       "v-center",
+      "p",
+      "j",
       "m",
       "t",
       "b",
@@ -809,6 +813,8 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
+      "ampersand-in-blocks",
+      "&-in-blocks",
       "width=",
       "caption=${1:text}",
       "short-caption=${1:text}",
@@ -893,6 +899,8 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
+      "ampersand-in-blocks",
+      "&-in-blocks",
       "caption=${1:text}",
       "short-caption=${1:text}",
       "label=",
@@ -976,6 +984,8 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
+      "ampersand-in-blocks",
+      "&-in-blocks",
       "delimiters/color=",
       "sub-matrix/left-xshift=",
       "sub-matrix/right-xshift=",
@@ -1056,6 +1066,8 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
+      "ampersand-in-blocks",
+      "&-in-blocks",
       "l",
       "c",
       "r",
diff --git a/dev/packages/nlctuserguide.json b/dev/packages/nlctuserguide.json
index 5503e45ae..a128264d6 100644
--- a/dev/packages/nlctuserguide.json
+++ b/dev/packages/nlctuserguide.json
@@ -796,7 +796,7 @@
       "snippet": "margm{${1:arg}}"
     },
     "menu{}": {
-      "snippet": "menu{${1:item1,item2,...}}"
+      "snippet": "menu{${1:item1,${2:item2},...}}"
     },
     "meta{}": {
       "snippet": "meta{${1:arg}}"
diff --git a/dev/packages/nth.json b/dev/packages/nth.json
new file mode 100644
index 000000000..bf316db75
--- /dev/null
+++ b/dev/packages/nth.json
@@ -0,0 +1,27 @@
+{
+  "includes": {},
+  "macros": {
+    "nth{}": {
+      "snippet": "nth{${1:number}}"
+    },
+    "ordinal{}": {
+      "snippet": "ordinal{${1:counter}}"
+    },
+    "nthM{}": {
+      "snippet": "nthM{${1:arg}}"
+    },
+    "nthSuff{}{}{}": {
+      "snippet": "nthSuff{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "nthscript{}": {
+      "snippet": "nthscript{${1:arg}}"
+    },
+    "nthtest": {}
+  },
+  "envs": {},
+  "options": [
+    "super",
+    "negative"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ntheorem.json b/dev/packages/ntheorem.json
index 7bc618b2e..fbc785bc5 100644
--- a/dev/packages/ntheorem.json
+++ b/dev/packages/ntheorem.json
@@ -145,7 +145,7 @@
     "theoreminframepostskipamount": {},
     "theoremrightindent": {},
     "listtheorems{}": {
-      "snippet": "listtheorems{${1:thmset1,thmset2,...}}"
+      "snippet": "listtheorems{${1:thmset1,${2:thmset2},...}}"
     },
     "theoremlisttype{}": {
       "snippet": "theoremlisttype{${1:type}}"
diff --git a/dev/packages/numerica.json b/dev/packages/numerica.json
index 5a6010ee5..a11bf1f66 100644
--- a/dev/packages/numerica.json
+++ b/dev/packages/numerica.json
@@ -224,28 +224,28 @@
       "snippet": "nmcMacros*[${2:settings}]{${1:command list}}[${3:vv-list}]"
     },
     "constants{}": {
-      "snippet": "constants{${1:name1=val1,name2=val2,...}}"
+      "snippet": "constants{${1:name1=val1,${2:name2=val2},...}}"
     },
     "constants[]{}": {
-      "snippet": "constants[${2:settings}]{${1:name1=val1,name2=val2,...}}"
+      "snippet": "constants[${2:settings}]{${1:name1=val1,${3:name2=val2},...}}"
     },
     "constants{}[]": {
-      "snippet": "constants{${1:name1=val1,name2=val2,...}}[${2:vv-list}]"
+      "snippet": "constants{${1:name1=val1,${3:name2=val2},...}}[${2:vv-list}]"
     },
     "constants[]{}[]": {
-      "snippet": "constants[${2:settings}]{${1:name1=val1,name2=val2,...}}[${3:vv-list}]"
+      "snippet": "constants[${2:settings}]{${1:name1=val1,${4:name2=val2},...}}[${3:vv-list}]"
     },
     "nmcConstants{}": {
-      "snippet": "nmcConstants{${1:name1=val1,name2=val2,...}}"
+      "snippet": "nmcConstants{${1:name1=val1,${2:name2=val2},...}}"
     },
     "nmcConstants[]{}": {
-      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,name2=val2,...}}"
+      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,${3:name2=val2},...}}"
     },
     "nmcConstants{}[]": {
-      "snippet": "nmcConstants{${1:name1=val1,name2=val2,...}}[${2:vv-list}]"
+      "snippet": "nmcConstants{${1:name1=val1,${3:name2=val2},...}}[${2:vv-list}]"
     },
     "nmcConstants[]{}[]": {
-      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,name2=val2,...}}[${3:vv-list}]"
+      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,${4:name2=val2},...}}[${3:vv-list}]"
     },
     "reuse{}": {
       "snippet": "reuse{${1:csname}}"
diff --git a/dev/packages/numprint.json b/dev/packages/numprint.json
new file mode 100644
index 000000000..cbf5971e2
--- /dev/null
+++ b/dev/packages/numprint.json
@@ -0,0 +1,149 @@
+{
+  "includes": {
+    "array": []
+  },
+  "macros": {
+    "numprint{}": {
+      "snippet": "numprint{${1:number}}"
+    },
+    "numprint[]{}": {
+      "snippet": "numprint[${2:unit}]{${1:number}}"
+    },
+    "np{}": {
+      "snippet": "np{${1:number}}",
+      "option": "np"
+    },
+    "np[]{}": {
+      "snippet": "np[${2:unit}]{${1:number}}",
+      "option": "np"
+    },
+    "cntprint{}": {
+      "snippet": "cntprint{${1:counter}}"
+    },
+    "cntprint[]{}": {
+      "snippet": "cntprint[${2:unit}]{${1:counter}}"
+    },
+    "lenprint{}": {
+      "snippet": "lenprint{${1:length}}"
+    },
+    "lenprint[]{}": {
+      "snippet": "lenprint[${2:unit}]{${1:length}}"
+    },
+    "npfourdigitsep": {},
+    "npfourdigitnosep": {},
+    "npaddmissingzero": {},
+    "npnoaddmissingzero": {},
+    "npaddplus": {},
+    "npnoaddplus": {},
+    "npaddplusexponent": {},
+    "npnoaddplusexponent": {},
+    "nprounddigits{}": {
+      "snippet": "nprounddigits{${1:digits}}"
+    },
+    "nproundexpdigits{}": {
+      "snippet": "nproundexpdigits{${1:digits}}"
+    },
+    "npnoround": {},
+    "npnoroundexp": {},
+    "nplpadding{}": {
+      "snippet": "nplpadding{${1:digits}}"
+    },
+    "nplpadding[]{}": {
+      "snippet": "nplpadding[${2:character}]{${1:digits}}"
+    },
+    "npnolpadding": {},
+    "npreplacenull{}": {
+      "snippet": "npreplacenull{${1:replacement}}"
+    },
+    "npprintnull": {},
+    "npunitcommand{}": {
+      "snippet": "npunitcommand{${1:arg}}"
+    },
+    "npdefunit{}{}{}": {
+      "snippet": "npdefunit{${1:unitname}}{${2:unit}}{${3:scale}}"
+    },
+    "selectlanguage{}": {
+      "snippet": "selectlanguage{${1:language}}"
+    },
+    "npmakebox{}": {
+      "snippet": "npmakebox{${1:text}}"
+    },
+    "npmakebox[][]{}": {
+      "snippet": "npmakebox[${2:dummy text}][${3:justification}]{${1:text}}"
+    },
+    "npboldmath": {
+      "option": "boldmath"
+    },
+    "npafternum{}": {
+      "snippet": "npafternum{${1:arg}}"
+    },
+    "npunit{}": {
+      "snippet": "npunit{${1:unit}}"
+    },
+    "npdigits{}{}": {
+      "snippet": "npdigits{${1:before}}{${2:after}}"
+    },
+    "npexponentdigits{}": {
+      "snippet": "npexponentdigits{${1:before}}"
+    },
+    "npexponentdigits[]{}": {
+      "snippet": "npexponentdigits[${2:after}]{${1:before}}"
+    },
+    "npnodigits": {},
+    "npnoexponentdigits": {},
+    "npthousandsep{}": {
+      "snippet": "npthousandsep{${1:separator}}"
+    },
+    "npthousandthpartsep{}": {
+      "snippet": "npthousandthpartsep{${1:separator}}"
+    },
+    "npdecimalsign{}": {
+      "snippet": "npdecimalsign{${1:sign}}"
+    },
+    "npproductsign{}": {
+      "snippet": "npproductsign{${1:sign}}"
+    },
+    "npunitseparator{}": {
+      "snippet": "npunitseparator{${1:separator}}"
+    },
+    "npdegreeseparator{}": {
+      "snippet": "npdegreeseparator{${1:separator}}"
+    },
+    "npcelsiusseparator{}": {
+      "snippet": "npcelsiusseparator{${1:separator}}"
+    },
+    "nppercentseparator{}": {
+      "snippet": "nppercentseparator{${1:separator}}"
+    },
+    "npstyledefault": {},
+    "npstyleenglish": {},
+    "npstylegerman": {},
+    "npstylefrench": {},
+    "npstyleportuguese": {},
+    "npstyledutch": {},
+    "npaddtolanguage{}{}": {
+      "snippet": "npaddtolanguage{${1:lang1}}{${2:lang2}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "nosepfour",
+    "sepfour",
+    "noaddmissingzero",
+    "addmissingzero",
+    "noaddplus",
+    "addplus",
+    "noaddplusexponent",
+    "addplusexponent",
+    "noautolanguage",
+    "autolanguage",
+    "np",
+    "oldcolumntypes",
+    "newcolumntypes",
+    "boldmath",
+    "warning",
+    "error",
+    "debug"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ocgx.json b/dev/packages/ocgx.json
new file mode 100644
index 000000000..3f569e4e0
--- /dev/null
+++ b/dev/packages/ocgx.json
@@ -0,0 +1,23 @@
+{
+  "includes": {
+    "ocg-p": []
+  },
+  "macros": {
+    "switchocg{}{}": {
+      "snippet": "switchocg{${1:ocg1 ocg2 ...}}{${2:display}}"
+    },
+    "showocg{}{}": {
+      "snippet": "showocg{${1:ocg1 ocg2 ...}}{${2:display}}"
+    },
+    "hideocg{}{}": {
+      "snippet": "hideocg{${1:ocg1 ocg2 ...}}{${2:display}}"
+    },
+    "actionsocg{}{}{}{}": {
+      "snippet": "actionsocg{${1:switchocg1 ...}}{${2:showocg1 ...}}{${3:hideocg1 ...}}{${4:display}}"
+    },
+    "ocgxversion": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ocgx2.json b/dev/packages/ocgx2.json
index ad306a7b3..3ca694638 100644
--- a/dev/packages/ocgx2.json
+++ b/dev/packages/ocgx2.json
@@ -12,73 +12,73 @@
   },
   "macros": {
     "AllOn{}": {
-      "snippet": "AllOn{${1:ocg1,ocg2,...}}"
+      "snippet": "AllOn{${1:ocg1,${2:ocg2},...}}"
     },
     "AnyOn{}": {
-      "snippet": "AnyOn{${1:ocg1,ocg2,...}}"
+      "snippet": "AnyOn{${1:ocg1,${2:ocg2},...}}"
     },
     "AnyOff{}": {
-      "snippet": "AnyOff{${1:ocg1,ocg2,...}}"
+      "snippet": "AnyOff{${1:ocg1,${2:ocg2},...}}"
     },
     "AllOff{}": {
-      "snippet": "AllOff{${1:ocg1,ocg2,...}}"
+      "snippet": "AllOff{${1:ocg1,${2:ocg2},...}}"
     },
     "Not{}": {
       "snippet": "Not{${1:item}}"
     },
     "And{}": {
-      "snippet": "And{${1:item1,item2,...}}"
+      "snippet": "And{${1:item1,${2:item2},...}}"
     },
     "Or{}": {
-      "snippet": "Or{${1:item1,item2,...}}"
+      "snippet": "Or{${1:item1,${2:item2},...}}"
     },
     "switchocg{}{}": {
-      "snippet": "switchocg{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "switchocg{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
     },
     "switchocg[]{}{}": {
-      "snippet": "switchocg[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "switchocg[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
     },
     "switchocg*{}{}": {
-      "snippet": "switchocg*{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "switchocg*{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
     },
     "switchocg*[]{}{}": {
-      "snippet": "switchocg*[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "switchocg*[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
     },
     "showocg{}{}": {
-      "snippet": "showocg{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "showocg{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
     },
     "showocg[]{}{}": {
-      "snippet": "showocg[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "showocg[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
     },
     "showocg*{}{}": {
-      "snippet": "showocg*{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "showocg*{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
     },
     "showocg*[]{}{}": {
-      "snippet": "showocg*[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "showocg*[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
     },
     "hideocg{}{}": {
-      "snippet": "hideocg{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "hideocg{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
     },
     "hideocg[]{}{}": {
-      "snippet": "hideocg[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "hideocg[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
     },
     "hideocg*{}{}": {
-      "snippet": "hideocg*{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "hideocg*{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
     },
     "hideocg*[]{}{}": {
-      "snippet": "hideocg*[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
+      "snippet": "hideocg*[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
     },
     "actionsocg{}{}{}{}": {
-      "snippet": "actionsocg{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
+      "snippet": "actionsocg{${1:switchocg1,${5:...}}{${2:showocg1},${6:...}}{${3:hideocg1},...}}{${4:link text}}"
     },
     "actionsocg[]{}{}{}{}": {
-      "snippet": "actionsocg[${5:trigger}]{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
+      "snippet": "actionsocg[${5:trigger}]{${1:switchocg1,${6:...}}{${2:showocg1},${7:...}}{${3:hideocg1},...}}{${4:link text}}"
     },
     "actionsocg*{}{}{}{}": {
-      "snippet": "actionsocg*{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
+      "snippet": "actionsocg*{${1:switchocg1,${5:...}}{${2:showocg1},${6:...}}{${3:hideocg1},...}}{${4:link text}}"
     },
     "actionsocg*[]{}{}{}{}": {
-      "snippet": "actionsocg*[${5:trigger}]{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
+      "snippet": "actionsocg*[${5:trigger}]{${1:switchocg1,${6:...}}{${2:showocg1},${7:...}}{${3:hideocg1},...}}{${4:link text}}"
     },
     "ocglinkprotect{}": {
       "snippet": "ocglinkprotect{${1:text}}"
diff --git a/dev/packages/onedown.json b/dev/packages/onedown.json
index 58b81b80e..66de718a5 100644
--- a/dev/packages/onedown.json
+++ b/dev/packages/onedown.json
@@ -143,18 +143,42 @@
     "showNS[]": {
       "snippet": "showNS[${1:pos}]"
     },
+    "showNS()": {
+      "snippet": "showNS(${1:N/S})"
+    },
+    "showNS[]()": {
+      "snippet": "showNS[${1:pos}](${2:N/S})"
+    },
     "showNS*": {},
     "showNS*[]": {
       "snippet": "showNS*[${1:pos}]"
     },
+    "showNS*()": {
+      "snippet": "showNS*(${1:N/S})"
+    },
+    "showNS*[]()": {
+      "snippet": "showNS*[${1:pos}](${2:N/S})"
+    },
     "showEW": {},
     "showEW[]": {
       "snippet": "showEW[${1:pos}]"
     },
+    "showEW()": {
+      "snippet": "showEW(${1:E/W})"
+    },
+    "showEW[]()": {
+      "snippet": "showEW[${1:pos}](${2:E/W})"
+    },
     "showEW*": {},
     "showEW*[]": {
       "snippet": "showEW*[${1:pos}]"
     },
+    "showEW*()": {
+      "snippet": "showEW*(${1:E/W})"
+    },
+    "showEW*[]()": {
+      "snippet": "showEW*[${1:pos}](${2:E/W})"
+    },
     "showNE": {},
     "showNE[]": {
       "snippet": "showNE[${1:pos}]"
diff --git a/dev/packages/optex.json b/dev/packages/optex.json
index fb998b937..71f394fd3 100644
--- a/dev/packages/optex.json
+++ b/dev/packages/optex.json
@@ -844,13 +844,20 @@
     "scriptspaces{}{}{}{}": {
       "snippet": "scriptspaces{${1:s-rel}}{${2:s-bin}}{${3:ss-rel}}{${4:ss-bin}}"
     },
+    "interval": {},
+    "rmsbsp": {},
     "bfserif": {},
+    "flexipa": {},
+    "partialsymbolvars": {},
+    "mrmpartial": {},
     "rmchars{}": {
       "snippet": "rmchars{${1:list}}"
     },
     "vargreek{}": {
       "snippet": "vargreek{${1:list}}"
     },
+    "enablefic": {},
+    "finalitalcorr": {},
     "textvariables": {},
     "textdigits": {},
     "textmoremath": {},
@@ -10933,13 +10940,17 @@
   "keyvals": [
     [
       "dots",
+      "interval",
       "vert",
+      "rmsbsp",
       "bfserif",
-      "rmchar={${1:list}}",
+      "flexipa",
+      "rmchars={${1:list}}",
       "vargreek={${1:list}}",
       "text={${1:list}}",
       "mstyle=${1:style}",
-      "bstyle=${1:style}"
+      "bstyle=${1:style}",
+      "enablefic"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/optional.json b/dev/packages/optional.json
new file mode 100644
index 000000000..b5097bc94
--- /dev/null
+++ b/dev/packages/optional.json
@@ -0,0 +1,16 @@
+{
+  "includes": {},
+  "macros": {
+    "opt{}{}": {
+      "snippet": "opt{${1:option}}{${2:content}}"
+    },
+    "optv{}{}": {
+      "snippet": "optv{${1:option}}{${2:content}}"
+    },
+    "AskOption": {},
+    "UseOption": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/options.json b/dev/packages/options.json
new file mode 100644
index 000000000..5899588ff
--- /dev/null
+++ b/dev/packages/options.json
@@ -0,0 +1,157 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "xcolor": []
+  },
+  "macros": {
+    "options{}": {
+      "snippet": "options{${1:options}}"
+    },
+    "optionsalso{}": {
+      "snippet": "optionsalso{${1:options}}"
+    },
+    "optionswithremaining{}": {
+      "snippet": "optionswithremaining{${1:options}}"
+    },
+    "option{}": {
+      "snippet": "option{${1:option}}"
+    },
+    "letoption{}{}": {
+      "snippet": "letoption{${1:option}}{${2:macro}}"
+    },
+    "edefoption{}{}": {
+      "snippet": "edefoption{${1:option}}{${2:macro}}"
+    },
+    "ifoptiondefined{}{}{}": {
+      "snippet": "ifoptiondefined{${1:option}}{${2:true}}{${3:false}}"
+    },
+    "ifoptionvoid{}{}{}": {
+      "snippet": "ifoptionvoid{${1:option}}{${2:true}}{${3:false}}"
+    },
+    "ifoptionblank{}{}{}": {
+      "snippet": "ifoptionblank{${1:option}}{${2:true}}{${3:false}}"
+    },
+    "ifoptionequal{}{}{}{}": {
+      "snippet": "ifoptionequal{${1:option}}{${2:value}}{${3:true}}{${4:false}}"
+    },
+    "ifoptionanyof{}{}{}{}": {
+      "snippet": "ifoptionanyof{${1:option}}{${2:list}}{${3:true}}{${4:false}}"
+    },
+    "ifoptiontype{}{}{}{}": {
+      "snippet": "ifoptiontype{${1:option}}{${2:type}}{${3:true}}{${4:false}}"
+    },
+    "ifoptionnil{}{}{}": {
+      "snippet": "ifoptionnil{${1:list option}}{${2:true}}{${3:false}}"
+    },
+    "ifoptioniscode{}{}{}": {
+      "snippet": "ifoptioniscode{${1:option}}{${2:true}}{${3:false}}"
+    },
+    "optionlistdo{}{}": {
+      "snippet": "optionlistdo{${1:list option}}{${2:action}}"
+    },
+    "letoptionlist{}{}": {
+      "snippet": "letoptionlist{${1:list option}}{${2:macro}}"
+    },
+    "ifoptioncontains{}{}{}": {
+      "snippet": "ifoptioncontains{${1:list option}}{${2:true}}{${3:false}}"
+    },
+    "optionshow{}": {
+      "snippet": "optionshow{${1:option}}"
+    },
+    "optionshowall": {},
+    "optionshowall[]": {
+      "snippet": "optionshowall[${1:bool}]"
+    },
+    "optionshowpath{}": {
+      "snippet": "optionshowpath{${1:option}}"
+    },
+    "optionerror{}{}": {
+      "snippet": "optionerror{${1:option}}{${2:message}}"
+    },
+    "optionwarning{}{}": {
+      "snippet": "optionwarning{${1:option}}{${2:message}}"
+    },
+    "letoptiontype{}{}": {
+      "snippet": "letoptiontype{${1:option}}{${2:type}}"
+    },
+    "optionname{}": {
+      "snippet": "optionname{${1:option}}"
+    },
+    "optionprependcode{}{}": {
+      "snippet": "optionprependcode{${1:option}}{${2:code}}"
+    },
+    "optionnewcode{}{}": {
+      "snippet": "optionnewcode{${1:option}}{${2:code}}"
+    },
+    "optionnewcode*{}{}": {
+      "snippet": "optionnewcode*{${1:option}}{${2:code}}"
+    },
+    "optionnewhandler{}{}": {
+      "snippet": "optionnewhandler{${1:option}}{${2:code}}"
+    },
+    "optionnewhandler*{}{}": {
+      "snippet": "optionnewhandler*{${1:option}}{${2:code}}"
+    },
+    "optionvalue": {},
+    "optionnovalue": {},
+    "eifblank{}{}{}": {
+      "snippet": "eifblank{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "eifstrequal{}{}{}": {
+      "snippet": "eifstrequal{${1:string}}{${2:true}}{${3:false}}"
+    },
+    "expandnextcmds{}{}": {
+      "snippet": "expandnextcmds{${1:arg1}}{${2:arg2}}"
+    },
+    "expandnextsingle{}{}": {
+      "snippet": "expandnextsingle{${1:arg1}}{${2:arg2}}"
+    },
+    "expandnext{}{}": {
+      "snippet": "expandnext{${1:arg1}}{${2:arg2}}"
+    },
+    "ifoptioncmd{}{}{}": {
+      "snippet": "ifoptioncmd{${1:option}}{${2:true}}{${3:false}}"
+    },
+    "ifoptioncolortransparent{}{}{}": {
+      "snippet": "ifoptioncolortransparent{${1:color}}{${2:true}}{${3:false}}"
+    },
+    "ifoptionisabsolute{}{}{}": {
+      "snippet": "ifoptionisabsolute{${1:option}}{${2:true}}{${3:false}}"
+    },
+    "letoptionchoices{}{}": {
+      "snippet": "letoptionchoices{${1:option}}{${2:macro}}"
+    },
+    "ontoggle{}{}": {
+      "snippet": "ontoggle{${1:toggle name}}{${2:true}}"
+    },
+    "optioncolorbox{}{}": {
+      "snippet": "optioncolorbox{${1:color}}{${2:code}}"
+    },
+    "optioncolor{}": {
+      "snippet": "optioncolor{${1:color}}"
+    },
+    "optionlist{}": {
+      "snippet": "optionlist{${1:list option}}"
+    },
+    "optionparamcount{}": {
+      "snippet": "optionparamcount{${1:option}}"
+    },
+    "optionshowtype{}": {
+      "snippet": "optionshowtype{${1:option}}"
+    },
+    "optiontextcolor{}{}": {
+      "snippet": "optiontextcolor{${1:color}}{${2:code}}"
+    },
+    "optiontypeout{}": {
+      "snippet": "optiontypeout{${1:option}}"
+    },
+    "optionunit{}": {
+      "snippet": "optionunit{${1:option}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "debug"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/orcidlink.json b/dev/packages/orcidlink.json
index 6f77420b9..15be019fc 100644
--- a/dev/packages/orcidlink.json
+++ b/dev/packages/orcidlink.json
@@ -7,6 +7,19 @@
   "macros": {
     "orcidlink{}": {
       "snippet": "orcidlink{${1:orcid}}"
+    },
+    "orcidlogo": {},
+    "orcidlinkf{}": {
+      "snippet": "orcidlinkf{${1:orcid}}"
+    },
+    "orcidlinkc{}": {
+      "snippet": "orcidlinkc{${1:orcid}}"
+    },
+    "orcidlinki{}{}": {
+      "snippet": "orcidlinki{${1:name}}{${2:orcid}}"
+    },
+    "orcidlinkX{}{}{}": {
+      "snippet": "orcidlinkX{${1:before}}{${2:orcid}}{${3:after}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/otf.json b/dev/packages/otf.json
new file mode 100644
index 000000000..f431272f9
--- /dev/null
+++ b/dev/packages/otf.json
@@ -0,0 +1,142 @@
+{
+  "includes": {
+    "platex": [],
+    "keyval": [],
+    "ajmacros": [],
+    "mlutf": [
+      "multi"
+    ],
+    "mlcid": [
+      "multi"
+    ],
+    "uplatex": [
+      "uplatex"
+    ]
+  },
+  "macros": {
+    "rubydefault": {
+      "option": "expert"
+    },
+    "rubyfamily": {
+      "option": "expert"
+    },
+    "rubykatuji": {
+      "option": "expert"
+    },
+    "mgdefault": {
+      "option": "deluxe"
+    },
+    "propdefault": {
+      "option": "deluxe"
+    },
+    "ebdefault": {
+      "option": "deluxe"
+    },
+    "ltdefault": {
+      "option": "deluxe"
+    },
+    "mathmg{}": {
+      "snippet": "mathmg{${1:text}}",
+      "option": "deluxe"
+    },
+    "mgfamily": {
+      "option": "deluxe"
+    },
+    "textmg{}": {
+      "snippet": "textmg{${1:text}}",
+      "option": "deluxe"
+    },
+    "propshape": {
+      "option": "deluxe"
+    },
+    "ebseries": {
+      "option": "deluxe"
+    },
+    "ltseries": {
+      "option": "deluxe"
+    },
+    "UTF{}": {
+      "snippet": "UTF{${1:hex number}}"
+    },
+    "CID{}": {
+      "snippet": "CID{${1:number}}"
+    },
+    "ajKunoji": {},
+    "ajKunojiwithBou": {},
+    "ajDKunoji": {},
+    "ajDKunojiwithBou": {},
+    "ajNinoji": {},
+    "ajvarNinoji": {},
+    "ajYusuriten": {},
+    "ajMasu": {},
+    "ajYori": {},
+    "ajKoto": {},
+    "ajUta": {},
+    "ajCommandKey": {},
+    "ajReturnKey": {},
+    "ajCheckmark": {},
+    "ajVisibleSpace": {},
+    "ajSenteMark": {},
+    "ajGoteMark": {},
+    "ajClub": {},
+    "ajHeart": {},
+    "ajSpade": {},
+    "ajDiamond": {},
+    "ajvarClub": {},
+    "ajvarHeart": {},
+    "ajvarSpade": {},
+    "ajvarDiamond": {},
+    "ajPhone": {},
+    "ajPostal": {},
+    "ajvarPostal": {},
+    "ajSun": {},
+    "ajCloud": {},
+    "ajUmbrella": {},
+    "ajSnowman": {},
+    "ajJIS": {},
+    "ajJAS": {},
+    "ajBall": {},
+    "ajHotSpring": {},
+    "ajWhiteSesame": {},
+    "ajBlackSesame": {},
+    "ajWhiteFlorette": {},
+    "ajBlackFlorette": {},
+    "ajRightBArrow": {},
+    "ajLeftBArrow": {},
+    "ajUpBArrow": {},
+    "ajDownBArrow": {},
+    "ajRightHand": {},
+    "ajLeftHand": {},
+    "ajUpHand": {},
+    "ajDownHand": {},
+    "ajRightScissors": {},
+    "ajLeftScissors": {},
+    "ajUpScissors": {},
+    "ajDownScissors": {},
+    "ajRightWArrow": {},
+    "ajLeftWArrow": {},
+    "ajUpWArrow": {},
+    "ajDownWArrow": {},
+    "ajRightDownArrow": {},
+    "ajLeftDownArrow": {},
+    "ajLeftUpArrow": {},
+    "ajRightUpArrow": {}
+  },
+  "envs": {},
+  "options": [
+    "nomacros",
+    "noreplace",
+    "noruby",
+    "bold",
+    "expert",
+    "deluxe",
+    "multi",
+    "burasage",
+    "platex",
+    "uplatex",
+    "autodetect",
+    "jis2004",
+    "scale=${1:factor}"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/overarrows.json b/dev/packages/overarrows.json
index 3243e77bd..aace0e5bf 100644
--- a/dev/packages/overarrows.json
+++ b/dev/packages/overarrows.json
@@ -10,6 +10,9 @@
     "tikz": [
       "tikz"
     ],
+    "pstricks-add": [
+      "pstricks"
+    ],
     "pict2e": [
       "pstarrows"
     ]
@@ -256,56 +259,56 @@
       "option": "allcommands"
     },
     "NewOverArrowCommand{}{}": {
-      "snippet": "NewOverArrowCommand{${1:name}}{${2:keyvals}}",
+      "snippet": "NewOverArrowCommand{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "NewOverArrowCommand[]{}{}": {
-      "snippet": "NewOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
+      "snippet": "NewOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "RenewOverArrowCommand{}{}": {
-      "snippet": "RenewOverArrowCommand{${1:name}}{${2:keyvals}}",
+      "snippet": "RenewOverArrowCommand{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "RenewOverArrowCommand[]{}{}": {
-      "snippet": "RenewOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
+      "snippet": "RenewOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "ProvideOverArrowCommand{}{}": {
-      "snippet": "ProvideOverArrowCommand{${1:name}}{${2:keyvals}}",
+      "snippet": "ProvideOverArrowCommand{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "ProvideOverArrowCommand[]{}{}": {
-      "snippet": "ProvideOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
+      "snippet": "ProvideOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "DeclareOverArrowCommand{}{}": {
-      "snippet": "DeclareOverArrowCommand{${1:name}}{${2:keyvals}}",
+      "snippet": "DeclareOverArrowCommand{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "DeclareOverArrowCommand[]{}{}": {
-      "snippet": "DeclareOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
+      "snippet": "DeclareOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "TestOverArrow{}": {
-      "snippet": "TestOverArrow{${1:name}}"
+      "snippet": "TestOverArrow{${1:arrow command}}"
     },
     "TestOverArrow[]{}": {
-      "snippet": "TestOverArrow[${2:pattern}]{${1:name}}"
+      "snippet": "TestOverArrow[${2:pattern}]{${1:arrow command}}"
     },
     "TestOverArrow*{}": {
-      "snippet": "TestOverArrow*{${1:name}}"
+      "snippet": "TestOverArrow*{${1:arrow command}}"
     },
     "TestOverArrow*[]{}": {
-      "snippet": "TestOverArrow*[${2:pattern}]{${1:name}}"
+      "snippet": "TestOverArrow*[${2:pattern}]{${1:arrow command}}"
     },
     "xjoinrel": {},
     "xjoinrel[]": {
@@ -357,6 +360,7 @@
     "esvecth",
     "old-arrows",
     "tikz",
+    "pstricks",
     "pstarrows",
     "subscripts",
     "subother",
@@ -420,6 +424,9 @@
       "line thickness=",
       "thinner",
       "tikz command={${1:TikZ command}}",
+      "pstricks command={${1:pstricks command}}",
+      "arrow={${1:arrow}}",
+      "psset={${1:pstricks options}}",
       "picture command={${1:picture command}}",
       "geometry={${1:picture geometry spec}}",
       "stack macro={${1:stack definition}}",
diff --git a/dev/packages/pagegrid.json b/dev/packages/pagegrid.json
new file mode 100644
index 000000000..c2151f306
--- /dev/null
+++ b/dev/packages/pagegrid.json
@@ -0,0 +1,47 @@
+{
+  "includes": {
+    "tikz": [],
+    "atbegshi": [],
+    "kvoptions": []
+  },
+  "macros": {
+    "pagegridsetup{}": {
+      "snippet": "pagegridsetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "pagegridShipoutDoubleBegin": {},
+    "pagegridShipoutDoubleEnd": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "enable",
+      "disable",
+      "left-top",
+      "lt",
+      "top-left",
+      "tl",
+      "tr",
+      "top-right",
+      "rt",
+      "right-top",
+      "left-bottom",
+      "lb",
+      "bottom-left",
+      "bl",
+      "br",
+      "bottom-right",
+      "rb",
+      "right-bottom",
+      "step=",
+      "firstcolor=",
+      "secondcolor=",
+      "arrows",
+      "arrowlength=",
+      "double=",
+      "foreground"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/paracol.json b/dev/packages/paracol.json
index 85b063636..0ded80be5 100644
--- a/dev/packages/paracol.json
+++ b/dev/packages/paracol.json
@@ -19,16 +19,16 @@
       "snippet": "ensurevspace{${1:length}}"
     },
     "columnratio{}": {
-      "snippet": "columnratio{${1:ratio 0,...,ratio k}}"
+      "snippet": "columnratio{${1:ratio 0,${2:...},ratio k}}"
     },
     "columnratio{}[]": {
-      "snippet": "columnratio{${1:ratio 0,...,ratio k}}[${2:ratio' 0,...,ratio' k}]"
+      "snippet": "columnratio{${1:ratio 0,${3:...},${4:ratio k}}[${2:ratio' 0},${5:...},ratio' k}]"
     },
     "setcolumnwidth{}": {
-      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}"
+      "snippet": "setcolumnwidth{${1:gap 0,${2:...},gap k}}"
     },
     "setcolumnwidth{}[]": {
-      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}[${2:gap' 0,...,gap' k}]"
+      "snippet": "setcolumnwidth{${1:gap 0,${3:...},${4:gap k}}[${2:gap' 0},${5:...},gap' k}]"
     },
     "twosided": {},
     "twosided[]": {
diff --git a/dev/packages/parallel.json b/dev/packages/parallel.json
new file mode 100644
index 000000000..2df4e79fb
--- /dev/null
+++ b/dev/packages/parallel.json
@@ -0,0 +1,76 @@
+{
+  "includes": {},
+  "macros": {
+    "ParallelLText{}": {
+      "snippet": "ParallelLText{${1:text}}"
+    },
+    "ParallelRText{}": {
+      "snippet": "ParallelRText{${1:text}}"
+    },
+    "ParallelPar": {},
+    "ParallelLWidth": {},
+    "ParallelRWidth": {},
+    "ParallelTextWidth": {},
+    "ParallelLeftMargin": {},
+    "ParallelUserMidSkip": {},
+    "ParallelMainMidSkip": {},
+    "ParallelLBox": {},
+    "ParallelRBox": {},
+    "ParallelBoxVar": {},
+    "ParallelLTok": {},
+    "ParallelRTok": {},
+    "ParallelBoolVar": {},
+    "ParallelBoolMid": {},
+    "ParallelWhichBox": {},
+    "ParallelMainMode": {},
+    "ParallelFNMode": {},
+    "ParallelLFNCounter": {},
+    "ParallelRFNCounter": {},
+    "ParallelMaxFN": {},
+    "ParallelFNNumMode": {},
+    "ParallelMessage{}": {
+      "snippet": "ParallelMessage{${1:text}}"
+    },
+    "ParallelLFootnote{}": {
+      "snippet": "ParallelLFootnote{${1:text}}"
+    },
+    "ParallelRFootnote{}": {
+      "snippet": "ParallelRFootnote{${1:text}}"
+    },
+    "ParallelShowFNList": {},
+    "ParallelParOnePage": {},
+    "ParallelParTwoPages": {},
+    "ParallelAfterText": {},
+    "ParallelCheckOpenBrace": {},
+    "ParallelAtEnd": {},
+    "ParallelDot": {}
+  },
+  "envs": {
+    "Parallel{}{}": {
+      "name": "Parallel",
+      "snippet": "{${1:left-width}}{${2:right-width}}"
+    },
+    "Parallel[]{}{}": {
+      "name": "Parallel",
+      "snippet": "[${3:options}]{${1:left-width}}{${2:right-width}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ParallelFNEnviron": {}
+  },
+  "options": [
+    "Verbose",
+    "OldStyleNums",
+    "RaiseNums",
+    "ItalicNums",
+    "RomanNums",
+    "SeparatedFootnotes"
+  ],
+  "keyvals": [
+    [
+      "c",
+      "v",
+      "p"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/parcolumns.json b/dev/packages/parcolumns.json
new file mode 100644
index 000000000..82dffd14f
--- /dev/null
+++ b/dev/packages/parcolumns.json
@@ -0,0 +1,37 @@
+{
+  "includes": {
+    "processkv": []
+  },
+  "macros": {
+    "colchunk{}": {
+      "snippet": "colchunk{${1:chunk}}"
+    },
+    "colchunk[]{}": {
+      "snippet": "colchunk[${2:column}]{${1:chunk}}"
+    },
+    "colplacechunks": {}
+  },
+  "envs": {
+    "parcolumns{}": {
+      "name": "parcolumns",
+      "snippet": "{${1:number of cols}}"
+    },
+    "parcolumns[]{}": {
+      "name": "parcolumns",
+      "snippet": "[${2:options}]{${1:number of cols}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "colwidths={${1:col=width,...}}",
+      "distance=",
+      "rulebetween",
+      "nofirstindent",
+      "sloppy",
+      "sloppyspaces"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/parskip.json b/dev/packages/parskip.json
new file mode 100644
index 000000000..72b05d245
--- /dev/null
+++ b/dev/packages/parskip.json
@@ -0,0 +1,16 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {},
+  "options": [
+    "skip",
+    "skip=",
+    "tocskip",
+    "tocskip=",
+    "indent",
+    "indent=",
+    "parfill",
+    "parfill="
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/pas-crosswords.json b/dev/packages/pas-crosswords.json
index 672ae9284..f0267a9a9 100644
--- a/dev/packages/pas-crosswords.json
+++ b/dev/packages/pas-crosswords.json
@@ -11,7 +11,7 @@
       "snippet": "blackcase{${1:x}}{${2:y}}"
     },
     "blackcases{}": {
-      "snippet": "blackcases{${1:x1/y1,x2/y2,...}}"
+      "snippet": "blackcases{${1:x1/y1,${2:x2/y2},...}}"
     },
     "word{}{}{}": {
       "snippet": "word{${1:x}}{${2:y}}{${3:MOT}}"
@@ -22,15 +22,15 @@
       "keyvalpos": 0
     },
     "words{}": {
-      "snippet": "words{${1:x1/y1/MOT1,x2/y2.MOT2,...}}"
+      "snippet": "words{${1:x1/y1/MOT1,${2:x2/y2.MOT2},...}}"
     },
     "words[]{}": {
-      "snippet": "words[${2:options}]{${1:x1/y1/MOT1,x2/y2.MOT2,...}}",
+      "snippet": "words[${2:options}]{${1:x1/y1/MOT1,${3:x2/y2.MOT2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "gridcross{}": {
-      "snippet": "gridcross{${1:MOT1*MOT2,MOT3*MOT4,...}}"
+      "snippet": "gridcross{${1:MOT1*MOT2,${2:MOT3*MOT4},...}}"
     },
     "printDef{}{}": {
       "snippet": "printDef{${1:h|v}}{${2:la définition}}"
diff --git a/dev/packages/pas-tableur.json b/dev/packages/pas-tableur.json
index 1fda59b43..ce24dd7e2 100644
--- a/dev/packages/pas-tableur.json
+++ b/dev/packages/pas-tableur.json
@@ -13,10 +13,10 @@
       "snippet": "tableur[${2:nombre de lignes}]{${1:colonnes}}"
     },
     "tableur*{}": {
-      "snippet": "tableur*{${1:col1/dim1,col2/dim2,...}}"
+      "snippet": "tableur*{${1:col1/dim1,${2:col2/dim2},...}}"
     },
     "tableur*[]{}": {
-      "snippet": "tableur*[${2:nombre de lignes}]{${1:col1/dim1,col2/dim2,...}}"
+      "snippet": "tableur*[${2:nombre de lignes}]{${1:col1/dim1,${3:col2/dim2},...}}"
     },
     "tabcolwidth{}": {
       "snippet": "tabcolwidth{${1:width}}"
diff --git a/dev/packages/passopt.json b/dev/packages/passopt.json
new file mode 100644
index 000000000..241eef8fc
--- /dev/null
+++ b/dev/packages/passopt.json
@@ -0,0 +1,26 @@
+{
+  "includes": {},
+  "macros": {
+    "SetOptionsToPackage{}{}": {
+      "snippet": "SetOptionsToPackage{${1:options list}}{${2:package}}"
+    },
+    "SetOptionsToPackage*{}{}": {
+      "snippet": "SetOptionsToPackage*{${1:options list}}{${2:package}}"
+    },
+    "SetOptionsToClass{}{}": {
+      "snippet": "SetOptionsToClass{${1:options list}}{${2:class}}"
+    },
+    "SetOptionsToClass*{}{}": {
+      "snippet": "SetOptionsToClass*{${1:options list}}{${2:class}}"
+    },
+    "ClearPackageOptions{}": {
+      "snippet": "ClearPackageOptions{${1:package}}"
+    },
+    "ClearClassOptions{}": {
+      "snippet": "ClearClassOptions{${1:class}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/path.json b/dev/packages/path.json
new file mode 100644
index 000000000..3c40f49d8
--- /dev/null
+++ b/dev/packages/path.json
@@ -0,0 +1,18 @@
+{
+  "includes": {},
+  "macros": {
+    "path": {
+      "snippet": "path|${1:text}|"
+    },
+    "path{}": {
+      "snippet": "path{${1:verbatimSymbol}}"
+    },
+    "pathafterhook": {},
+    "ifspecialpathdelimiters": {},
+    "specialpathdelimiterstrue": {},
+    "specialpathdelimitersfalse": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/pbox.json b/dev/packages/pbox.json
new file mode 100644
index 000000000..6ba163253
--- /dev/null
+++ b/dev/packages/pbox.json
@@ -0,0 +1,31 @@
+{
+  "includes": {
+    "calc": []
+  },
+  "macros": {
+    "pbox{}{}": {
+      "snippet": "pbox{${1:width}}{${2:contents}}"
+    },
+    "pbox[]{}{}": {
+      "snippet": "pbox[${3:position}]{${1:width}}{${2:contents}}"
+    },
+    "pbox[][]{}{}": {
+      "snippet": "pbox[${3:position}][${4:height}]{${1:width}}{${2:contents}}"
+    },
+    "pbox[][][]{}{}": {
+      "snippet": "pbox[${3:position}][${4:height}][${5:inner-pos}]{${1:width}}{${2:contents}}"
+    },
+    "settominwidth{}{}": {
+      "snippet": "settominwidth{${1:cmd}}{${2:text}}"
+    },
+    "settominwidth[]{}{}": {
+      "snippet": "settominwidth[${3:max-width}]{${1:cmd}}{${2:text}}"
+    },
+    "widthofpbox{}": {
+      "snippet": "widthofpbox{${1:text}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/pdfx.json b/dev/packages/pdfx.json
index e90f4a8e8..acf979c17 100644
--- a/dev/packages/pdfx.json
+++ b/dev/packages/pdfx.json
@@ -376,6 +376,7 @@
     "pdf15",
     "pdf16",
     "pdf17",
+    "pdf20",
     "nocharset",
     "usecharset",
     "latxmp",
diff --git a/dev/packages/perpage.json b/dev/packages/perpage.json
new file mode 100644
index 000000000..af38c8797
--- /dev/null
+++ b/dev/packages/perpage.json
@@ -0,0 +1,28 @@
+{
+  "includes": {},
+  "macros": {
+    "MakePerPage{}": {
+      "snippet": "MakePerPage{${1:counter}}"
+    },
+    "MakePerPage[]{}": {
+      "snippet": "MakePerPage[${2:value}]{${1:counter}}"
+    },
+    "theperpage": {},
+    "theabspage": {},
+    "MakeSorted{}": {
+      "snippet": "MakeSorted{${1:counter}}"
+    },
+    "MakeSortedPerPage{}": {
+      "snippet": "MakeSortedPerPage{${1:counter}}"
+    },
+    "MakeSortedPerPage[]{}": {
+      "snippet": "MakeSortedPerPage[${2:value}]{${1:counter}}"
+    },
+    "AddAbsoluteCounter{}": {
+      "snippet": "AddAbsoluteCounter{${1:name}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/pgf-PeriodicTable.json b/dev/packages/pgf-PeriodicTable.json
index 10744554c..3101035c1 100644
--- a/dev/packages/pgf-PeriodicTable.json
+++ b/dev/packages/pgf-PeriodicTable.json
@@ -44,7 +44,13 @@
       "keyvalpos": 0
     },
     "pgfPTresetstyle": {},
+    "pgfPTbuildcell()[]": {
+      "snippet": "pgfPTbuildcell(${2:rows},${3:columns})[${1:entries}]"
+    },
     "pgfPTresetcell": {},
+    "pgfPTbuildcellstyle{}()[]": {
+      "snippet": "pgfPTbuildcellstyle{${1:name}}(${3:rows},${4:columns})[${2:entries}]"
+    },
     "pgfPTpreviewcell": {},
     "pgfPTpreviewcell[]": {
       "snippet": "pgfPTpreviewcell[${1:scale}]"
@@ -56,10 +62,10 @@
       "snippet": "pgfPTpreviewcellstyle[${2:scale}]{${1:name}}"
     },
     "pgfPTnewColorScheme{}{}": {
-      "snippet": "pgfPTnewColorScheme{${1:name}}{${2:r1/g1/b1,r2/g2/b2,...}}"
+      "snippet": "pgfPTnewColorScheme{${1:name}}{${2:r1/g1/b1,${3:r2/g2/b2},...}}"
     },
     "pgfPTnewColorScheme[]{}{}": {
-      "snippet": "pgfPTnewColorScheme[${3:r/g/b}]{${1:name}}{${2:r1/g1/b1,r2/g2/b2,...}}"
+      "snippet": "pgfPTnewColorScheme[${3:r/g/b}]{${1:name}}{${2:r1/g1/b1,${4:r2/g2/b2},...}}"
     },
     "pgfPTnewZlist{}{}": {
       "snippet": "pgfPTnewZlist{${1:name}}{${2:list}}"
@@ -90,10 +96,10 @@
       "keyvalpos": 2
     },
     "pgfPTCScombine{}": {
-      "snippet": "pgfPTCScombine{${1:colorscheme1,colorscheme2,new colorscheme name}}"
+      "snippet": "pgfPTCScombine{${1:colorscheme1,${2:colorscheme2},new colorscheme name}}"
     },
     "pgfPTCScombine[]{}": {
-      "snippet": "pgfPTCScombine[${2:proportion,mode}]{${1:colorscheme1,colorscheme2,new colorscheme name}}"
+      "snippet": "pgfPTCScombine[${2:proportion,${3:mode}]{${1:colorscheme1},${4:colorscheme2},new colorscheme name}}"
     },
     "pgfPTCSwrite{}": {
       "snippet": "pgfPTCSwrite{${1:list of colorschemes}}"
@@ -218,6 +224,7 @@
     "pgfPTglobalfont": {},
     "pgfPTgrlabelsfalse": {},
     "pgfPTgrlabelstrue": {},
+    "pgfPTgrnum": {},
     "pgfPTiblockcolor": {},
     "pgfPTiblockfontcolor": {},
     "pgfPTiblocklinewidth": {},
@@ -341,7 +348,10 @@
     "pgfPTZspace": {},
     "pgfZuseboxwidthfalse": {},
     "pgfZuseboxwidthtrue": {},
-    "thetinysize": {}
+    "thetinysize": {},
+    "ifpgfPTORoman": {},
+    "pgfPTORomantrue": {},
+    "pgfPTORomanfalse": {}
   },
   "envs": {},
   "options": [
@@ -410,8 +420,10 @@
       "legend={${1:keyvals}}",
       "show period numbers",
       "show group numbers",
+      "group numbers=",
       "period label color=",
       "group label color=",
+      "Roman label color=",
       "label font=${1:font commands}",
       "per={${1:keyvals}}",
       "gr={${1:keyvals}}",
@@ -508,6 +520,7 @@
       "Ar label=",
       "Ar precision=${1:integer}",
       "Ar={${1:keyvals}}",
+      "O Roman",
       "d color=",
       "d font=${1:font commands}",
       "d unit=",
diff --git a/dev/packages/pgf-pie.json b/dev/packages/pgf-pie.json
index fc1042cba..c404ff99a 100644
--- a/dev/packages/pgf-pie.json
+++ b/dev/packages/pgf-pie.json
@@ -5,10 +5,10 @@
   },
   "macros": {
     "pie{}": {
-      "snippet": "pie{${1:num1/text1,num2/text2,...}}"
+      "snippet": "pie{${1:num1/text1,${2:num2/text2},...}}"
     },
     "pie[]{}": {
-      "snippet": "pie[${2:options}]{${1:num1/text1,num2/text2,...}}",
+      "snippet": "pie[${2:options}]{${1:num1/text1,${3:num2/text2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     }
diff --git a/dev/packages/pgf-spectra.json b/dev/packages/pgf-spectra.json
index 2a912e97a..a804b18e3 100644
--- a/dev/packages/pgf-spectra.json
+++ b/dev/packages/pgf-spectra.json
@@ -18,6 +18,12 @@
       "keyvalpos": 0
     },
     "pgfspectraStyleReset": {},
+    "pgfspectrashade(){}": {
+      "snippet": "pgfspectrashade(${2:start},${3:end}){${1:name}}"
+    },
+    "pgfspectrashade[](){}": {
+      "snippet": "pgfspectrashade[${2:h|v}](${3:start},${4:end}){${1:name}}"
+    },
     "usepgfspectralibrary{}": {
       "snippet": "usepgfspectralibrary{${1:libraries}}"
     },
@@ -75,6 +81,16 @@
     "pgfspectrarainbow{}": {
       "snippet": "pgfspectrarainbow{${1:radius}}"
     },
+    "pgfspectrarainbow(){}": {
+      "snippet": "pgfspectrarainbow(${2:options}){${1:radius}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "pgfspectrarainbow[](){}": {
+      "snippet": "pgfspectrarainbow[${2:TikZ options}](${3:options}){${1:radius}}",
+      "keyvalindex": 4,
+      "keyvalpos": 1
+    },
     "wldez": {},
     "wlquatromil": {}
   },
@@ -150,6 +166,13 @@
       "shade opacity=${1:factor}",
       "shade opacity color=",
       "logarithmic"
+    ],
+    [
+      "rainbow start=${1:fraction}",
+      "rainbow knock out=${1:value}",
+      "rainbow fade=${1:fading}",
+      "rainbow transparency=${1:factor}",
+      "rainbow background="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pgfcore.json b/dev/packages/pgfcore.json
index 602c3d2be..8634f1142 100644
--- a/dev/packages/pgfcore.json
+++ b/dev/packages/pgfcore.json
@@ -2157,6 +2157,9 @@
     "pgfooclass{}{}": {
       "snippet": "pgfooclass{${1:class}}{${2:body}}"
     },
+    "pgfooclass(){}{}": {
+      "snippet": "pgfooclass(${3:list of superclasses}){${1:class}}{${2:body}}"
+    },
     "attribute": {},
     "method": {},
     "pgfoovalueof{}": {
diff --git a/dev/packages/pgfmanual.json b/dev/packages/pgfmanual.json
index bea89f0f7..6197544c1 100644
--- a/dev/packages/pgfmanual.json
+++ b/dev/packages/pgfmanual.json
@@ -148,7 +148,7 @@
     "firstchoicetrue": {},
     "firstchoicefalse": {},
     "mchoice{}": {
-      "snippet": "mchoice{${1:choice1,choice2,...}}"
+      "snippet": "mchoice{${1:choice1,${2:choice2},...}}"
     },
     "insertpathifneeded{}{}": {
       "snippet": "insertpathifneeded{${1:path/key}}{${2:default path}}"
@@ -181,6 +181,12 @@
     "indexkey{}": {
       "snippet": "indexkey{${1:/path/key}}"
     },
+    "extractpredefinedmethod{}()": {
+      "snippet": "extractpredefinedmethod{${1:arg1}}(${2:arg2})"
+    },
+    "extractmethod{}()": {
+      "snippet": "extractmethod{${1:arg1}}(${2:arg2})"
+    },
     "extractattribute{}": {
       "snippet": "extractattribute{${1:arg}}"
     },
@@ -232,6 +238,9 @@
     "itemcalendaroption{}": {
       "snippet": "itemcalendaroption{${1:option}}"
     },
+    "extractclass{}()": {
+      "snippet": "extractclass{${1:arg1}}(${2:arg2})"
+    },
     "noindexing": {},
     "processaction{}": {
       "snippet": "processaction{${1:arg}}"
@@ -372,15 +381,15 @@
     "parameterdescription": {},
     "commandlist{}": {
       "name": "commandlist",
-      "snippet": "{${1:cmd1,cmd2,...}}"
+      "snippet": "{${1:cmd1,${2:cmd2},...}}"
     },
     "internallist{}": {
       "name": "internallist",
-      "snippet": "{${1:cmd1,cmd2,...}}"
+      "snippet": "{${1:cmd1,${2:cmd2},...}}"
     },
     "internallist[]{}": {
       "name": "internallist",
-      "snippet": "[${2:type}]{${1:cmd1,cmd2,...}}"
+      "snippet": "[${2:type}]{${1:cmd1,${3:cmd2},...}}"
     },
     "environment{{}": {
       "name": "environment",
@@ -436,11 +445,11 @@
     },
     "keylist{}": {
       "name": "keylist",
-      "snippet": "{${1:path1/key1=value1,path2/key2=value2,...}}"
+      "snippet": "{${1:path1/key1=value1,${2:path2/key2=value2},...}}"
     },
     "keylist[]{}": {
       "name": "keylist",
-      "snippet": "[${2:default path}]{${1:path1/key1=value1,path2/key2=value2,...}}"
+      "snippet": "[${2:default path}]{${1:path1/key1=value1,${3:path2/key2=value2},...}}"
     },
     "predefinedmethod{}": {
       "name": "predefinedmethod",
diff --git a/dev/packages/pgfmath.json b/dev/packages/pgfmath.json
new file mode 100644
index 000000000..8a436a8cb
--- /dev/null
+++ b/dev/packages/pgfmath.json
@@ -0,0 +1,491 @@
+{
+  "includes": {
+    "pgfrcs": [],
+    "pgfkeys": []
+  },
+  "macros": {
+    "pgfmathloaded": {},
+    "pgfmathsetlength{}{}": {
+      "snippet": "pgfmathsetlength{${1:length register}}{${2:math expression}}"
+    },
+    "pgfmathaddtolength{}{}": {
+      "snippet": "pgfmathaddtolength{${1:length register}}{${2:math expression}}"
+    },
+    "pgfmathsetcount{}{}": {
+      "snippet": "pgfmathsetcount{${1:count register}}{${2:math expression}}"
+    },
+    "pgfmathaddtocount{}{}": {
+      "snippet": "pgfmathaddtocount{${1:count register}}{${2:math expression}}"
+    },
+    "pgfmathsetcounter{}{}": {
+      "snippet": "pgfmathsetcounter{${1:counter}}{${2:math expression}}"
+    },
+    "pgfmathaddtocounter{}{}": {
+      "snippet": "pgfmathaddtocounter{${1:counter}}{${2:math expression}}"
+    },
+    "pgfmathsetmacro{}{}": {
+      "snippet": "pgfmathsetmacro{${1:cmd}}{${2:math expression}}"
+    },
+    "pgfmathsetlengthmacro{}{}": {
+      "snippet": "pgfmathsetlengthmacro{${1:cmd}}{${2:math expression}}"
+    },
+    "pgfmathtruncatemacro{}{}": {
+      "snippet": "pgfmathtruncatemacro{${1:cmd}}{${2:math expression}}"
+    },
+    "pgfmathnewcounter{}": {
+      "snippet": "pgfmathnewcounter{${1:counter}}"
+    },
+    "pgfmathmakecounterglobal{}": {
+      "snippet": "pgfmathmakecounterglobal{${1:counter}}"
+    },
+    "pgfmathanglebetweenpoints{}{}": {
+      "snippet": "pgfmathanglebetweenpoints{${1:point 1}}{${2:point 2}}"
+    },
+    "pgfmathanglebetweenlines{}{}{}{}": {
+      "snippet": "pgfmathanglebetweenlines{${1:line 1 start}}{${2:line 1 end}}{${3:line 2 start}}{${4:line 2 end}}"
+    },
+    "pgfmathrotatepointaround{}{}{}": {
+      "snippet": "pgfmathrotatepointaround{${1:point}}{${2:rotate center}}{${3:degree}}"
+    },
+    "pgfmathreflectpointalongaxis{}{}{}": {
+      "snippet": "pgfmathreflectpointalongaxis{${1:point}}{${2:point on axis}}{${3:axis angle}}"
+    },
+    "pgfmathpointintersectionoflineandarc{}{}{}{}{}{}": {
+      "snippet": "pgfmathpointintersectionoflineandarc{${1:point 1}}{${2:point 2}}{${3:arc center}}{${4:start angle}}{${5:end angle}}{${6:radii}}"
+    },
+    "pgfmathangleonellipse{}{}": {
+      "snippet": "pgfmathangleonellipse{${1:point on ellipse}}{${2:radii}}"
+    },
+    "pgfmathincluded": {},
+    "ifpgfmathcontinueloop": {},
+    "pgfmathcontinuelooptrue": {},
+    "pgfmathcontinueloopfalse": {},
+    "repeatpgfmathloop": {},
+    "pgfmathbreakloop": {},
+    "pgfmathreturn": {},
+    "pgfmathcounter": {},
+    "ifpgfmathfloat": {},
+    "pgfmathfloattrue": {},
+    "pgfmathfloatfalse": {},
+    "ifpgfmathunitsdeclared": {},
+    "pgfmathunitsdeclaredtrue": {},
+    "pgfmathunitsdeclaredfalse": {},
+    "ifpgfmathmathunitsdeclared": {},
+    "pgfmathmathunitsdeclaredtrue": {},
+    "pgfmathmathunitsdeclaredfalse": {},
+    "ifpgfmathignoreunitscale": {},
+    "pgfmathignoreunitscaletrue": {},
+    "pgfmathignoreunitscalefalse": {},
+    "pgfmathprint{}": {
+      "snippet": "pgfmathprint{${1:real number}}"
+    },
+    "pgfmathparse{}": {
+      "snippet": "pgfmathparse{${1:math expression}}"
+    },
+    "pgfmathqparse{}": {
+      "snippet": "pgfmathqparse{${1:math expression}}"
+    },
+    "pgfmathpostparse": {},
+    "pgfmathscaleresult": {},
+    "pgfmathsetresultunitscale{}": {
+      "snippet": "pgfmathsetresultunitscale{${1:scale value}}"
+    },
+    "pgfmathresultunitscale": {},
+    "pgfmathifexpression{}{}{}": {
+      "snippet": "pgfmathifexpression{${1:math expression}}{${2:true}}{${3:false}}"
+    },
+    "pgfmathdeclareoperator{}{}{}{}{}": {
+      "snippet": "pgfmathdeclareoperator{${1:op}}{${2:op name}}{${3:arity}}{${4:type}}{${5:precedence}}"
+    },
+    "pgfmathdeclarefunction{}{}{}": {
+      "snippet": "pgfmathdeclarefunction{${1:name}}{${2:num of args}}{${3:code}}"
+    },
+    "pgfmathdeclarefunction*{}{}{}": {
+      "snippet": "pgfmathdeclarefunction*{${1:name}}{${2:num of args}}{${3:code}}"
+    },
+    "pgfmathredeclarefunction{}{}": {
+      "snippet": "pgfmathredeclarefunction{${1:name}}{${2:code}}"
+    },
+    "pgfmathnotifynewdeclarefunction{}{}{}": {
+      "snippet": "pgfmathnotifynewdeclarefunction{${1:name}}{${2:num of args}}{${3:code}}"
+    },
+    "pgfmathdeclarepseudoconstant{}{}": {
+      "snippet": "pgfmathdeclarepseudoconstant{${1:name}}{${2:code}}"
+    },
+    "pgfmathredeclarepseudoconstant{}{}": {
+      "snippet": "pgfmathredeclarepseudoconstant{${1:name}}{${2:code}}"
+    },
+    "pgfmathadd{}{}": {
+      "snippet": "pgfmathadd{${1:x}}{${2:y}}"
+    },
+    "pgfmathsubtract{}{}": {
+      "snippet": "pgfmathsubtract{${1:x}}{${2:y}}"
+    },
+    "pgfmathneg{}": {
+      "snippet": "pgfmathneg{${1:x}}"
+    },
+    "pgfmathmultiply{}{}": {
+      "snippet": "pgfmathmultiply{${1:x}}{${2:y}}"
+    },
+    "pgfmathdivide{}{}": {
+      "snippet": "pgfmathdivide{${1:x}}{${2:y}}"
+    },
+    "pgfmathreciprocal{}": {
+      "snippet": "pgfmathreciprocal{${1:x}}"
+    },
+    "pgfmathdiv{}": {
+      "snippet": "pgfmathdiv{${1:x}}"
+    },
+    "pgfmathmod{}{}": {
+      "snippet": "pgfmathmod{${1:x}}{${2:y}}"
+    },
+    "pgfmathMod{}{}": {
+      "snippet": "pgfmathMod{${1:x}}{${2:y}}"
+    },
+    "pgfmathabs{}": {
+      "snippet": "pgfmathabs{${1:x}}"
+    },
+    "pgfmathsign{}": {
+      "snippet": "pgfmathsign{${1:x}}"
+    },
+    "pgfmathe": {},
+    "pgfmathln{}": {
+      "snippet": "pgfmathln{${1:x}}"
+    },
+    "pgfmathlogten{}": {
+      "snippet": "pgfmathlogten{${1:x}}"
+    },
+    "pgfmathlogtwo{}": {
+      "snippet": "pgfmathlogtwo{${1:x}}"
+    },
+    "pgfmathexp{}": {
+      "snippet": "pgfmathexp{${1:x}}"
+    },
+    "pgfmathsqrt{}": {
+      "snippet": "pgfmathsqrt{${1:x}}"
+    },
+    "pgfmathpow{}{}": {
+      "snippet": "pgfmathpow{${1:x}}{${2:power}}"
+    },
+    "pgfmathfactorial{}": {
+      "snippet": "pgfmathfactorial{${1:x}}"
+    },
+    "pgfmathpi": {},
+    "pgfmathiftrigonometricusesdeg{}{}": {
+      "snippet": "pgfmathiftrigonometricusesdeg{${1:true}}{${2:false}}"
+    },
+    "pgfmathradians{}": {
+      "snippet": "pgfmathradians{${1:x in radians}} "
+    },
+    "pgfmathdeg{}": {
+      "snippet": "pgfmathdeg{${1:x in radians}}"
+    },
+    "pgfmathrad{}": {
+      "snippet": "pgfmathrad{${1:x in degrees}}"
+    },
+    "pgfmathsin{}": {
+      "snippet": "pgfmathsin{${1:x in degrees}}"
+    },
+    "pgfmathcos{}": {
+      "snippet": "pgfmathcos{${1:x in degrees}}"
+    },
+    "pgfmathsincos{}": {
+      "snippet": "pgfmathsincos{${1:num in degress}}"
+    },
+    "pgfmathtan{}": {
+      "snippet": "pgfmathtan{${1:x in degrees}}"
+    },
+    "pgfmathcosec{}": {
+      "snippet": "pgfmathcosec{${1:x in degrees}}"
+    },
+    "pgfmathsec{}": {
+      "snippet": "pgfmathsec{${1:x in degrees}}"
+    },
+    "pgfmathcot{}": {
+      "snippet": "pgfmathcot{${1:x in degrees}}"
+    },
+    "pgfmathasin{}": {
+      "snippet": "pgfmathasin{${1:x in degrees}}"
+    },
+    "pgfmathacos{}": {
+      "snippet": "pgfmathacos{${1:x in degrees}}"
+    },
+    "pgfmathatan{}": {
+      "snippet": "pgfmathatan{${1:x in degrees}}"
+    },
+    "pgfmathatantwo{}{}": {
+      "snippet": "pgfmathatantwo{${1:y in degrees}}{${2:x in degrees}}"
+    },
+    "pgfmathsetseed{}": {
+      "snippet": "pgfmathsetseed{${1:integer}}"
+    },
+    "pgfmathgeneratepseudorandomnumber": {},
+    "pgfmathrnd": {},
+    "pgfmathrand": {},
+    "pgfmathrandominteger{}{}{}": {
+      "snippet": "pgfmathrandominteger{${1:cmd}}{${2:min}}{${3:max}}"
+    },
+    "pgfmathdeclarerandomlist{}{}": {
+      "snippet": "pgfmathdeclarerandomlist{${1:list name}}{${2:list of items}}"
+    },
+    "pgfmathrandomitem{}{}": {
+      "snippet": "pgfmathrandomitem{${1:cmd}}{${2:list name}}"
+    },
+    "pgfmathgreater{}{}": {
+      "snippet": "pgfmathgreater{${1:x}}{${2:y}}"
+    },
+    "pgfmathgreaterthan{}{}": {
+      "snippet": "pgfmathgreaterthan{${1:x}}{${2:y}}"
+    },
+    "pgfmathless{}{}": {
+      "snippet": "pgfmathless{${1:x}}{${2:y}}"
+    },
+    "pgfmathlessthan{}{}": {
+      "snippet": "pgfmathlessthan{${1:x}}{${2:y}}"
+    },
+    "pgfmathequal{}{}": {
+      "snippet": "pgfmathequal{${1:x}}{${2:y}}"
+    },
+    "pgfmathequalto{}{}": {
+      "snippet": "pgfmathequalto{${1:x}}{${2:y}}"
+    },
+    "ifpgfmathcomparison": {},
+    "pgfmathcomparisontrue": {},
+    "pgfmathcomparisonfalse": {},
+    "pgfmathapproxequalto{}{}": {
+      "snippet": "pgfmathapproxequalto{${1:x}}{${2:y}}"
+    },
+    "pgfmathifthenelse{}{}{}": {
+      "snippet": "pgfmathifthenelse{${1:x}}{${2:true}}{${3:false}}"
+    },
+    "pgfmathnotequal{}{}": {
+      "snippet": "pgfmathnotequal{${1:x}}{${2:y}}"
+    },
+    "pgfmathnotless{}{}": {
+      "snippet": "pgfmathnotless{${1:x}}{${2:y}}"
+    },
+    "pgfmathnotgreater{}{}": {
+      "snippet": "pgfmathnotgreater{${1:x}}{${2:y}}"
+    },
+    "pgfmathand{}{}": {
+      "snippet": "pgfmathand{${1:x}}{${2:y}}"
+    },
+    "pgfmathor{}{}": {
+      "snippet": "pgfmathor{${1:x}}{${2:y}}"
+    },
+    "pgfmathnot{}": {
+      "snippet": "pgfmathnot{${1:x}}"
+    },
+    "pgfmathtrue": {},
+    "pgfmathfalse": {},
+    "pgfmathbin{}": {
+      "snippet": "pgfmathbin{${1:x in base 10}}"
+    },
+    "pgfmathhex{}": {
+      "snippet": "pgfmathhex{${1:x in base 10}}"
+    },
+    "pgfmathHex{}": {
+      "snippet": "pgfmathHex{${1:x in base 10}}"
+    },
+    "pgfmathoct{}": {
+      "snippet": "pgfmathoct{${1:x in base 10}}"
+    },
+    "pgfmathbasetodec{}{}{}": {
+      "snippet": "pgfmathbasetodec{${1:cmd}}{${2:number}}{${3:base}}"
+    },
+    "pgfmathdectobase{}{}{}": {
+      "snippet": "pgfmathdectobase{${1:cmd}}{${2:number}}{${3:base}}"
+    },
+    "pgfmathdectoBase{}{}{}": {
+      "snippet": "pgfmathdectoBase{${1:cmd}}{${2:number}}{${3:base}}"
+    },
+    "pgfmathbasetobase{}{}{}{}": {
+      "snippet": "pgfmathbasetobase{${1:cmd}}{${2:number}}{${3:base1}}{${4:base2}}"
+    },
+    "pgfmathbasetoBase{}{}{}{}": {
+      "snippet": "pgfmathbasetoBase{${1:cmd}}{${2:number}}{${3:base1}}{${4:base2}}"
+    },
+    "pgfmathsetbasenumberlength{}": {
+      "snippet": "pgfmathsetbasenumberlength{${1:integer}}"
+    },
+    "pgfmathtodigitlist{}{}": {
+      "snippet": "pgfmathtodigitlist{${1:cmd}}{${2:number}}"
+    },
+    "pgfmathround{}": {
+      "snippet": "pgfmathround{${1:x}}"
+    },
+    "pgfmathfloor{}": {
+      "snippet": "pgfmathfloor{${1:x}}"
+    },
+    "pgfmathceil{}": {
+      "snippet": "pgfmathceil{${1:x}}"
+    },
+    "pgfmathint{}": {
+      "snippet": "pgfmathint{${1:x}}"
+    },
+    "pgfmathfrac{}": {
+      "snippet": "pgfmathfrac{${1:x}}"
+    },
+    "pgfmathreal{}": {
+      "snippet": "pgfmathreal{${1:x}}"
+    },
+    "pgfmathveclen{}{}": {
+      "snippet": "pgfmathveclen{${1:x coordinate}}{${2:y coordinate}}"
+    },
+    "pgfmathcosh{}": {
+      "snippet": "pgfmathcosh{${1:x in degree}}"
+    },
+    "pgfmathsinh{}": {
+      "snippet": "pgfmathsinh{${1:x in degree}}"
+    },
+    "pgfmathtanh{}": {
+      "snippet": "pgfmathtanh{${1:x in degree}}"
+    },
+    "pgfmathscientific{}{}": {
+      "snippet": "pgfmathscientific{${1:mantissa}}{${2:exponent}}"
+    },
+    "pgfmathwidth{}": {
+      "snippet": "pgfmathwidth{${1:\"text\"}}"
+    },
+    "pgfmathheight{}": {
+      "snippet": "pgfmathheight{${1:\"text\"}}"
+    },
+    "pgfmathdepth{}": {
+      "snippet": "pgfmathdepth{${1:\"text\"}}"
+    },
+    "pgfmatharray{}{}": {
+      "snippet": "pgfmatharray{${1:array}}{${2:index}}"
+    },
+    "pgfmathdim{}": {
+      "snippet": "pgfmathdim{${1:array}}"
+    },
+    "pgfmathmax{}{}": {
+      "snippet": "pgfmathmax{${1:num list}}{${2:num list}}"
+    },
+    "pgfmathmin{}{}": {
+      "snippet": "pgfmathmin{${1:num list}}{${2:num list}}"
+    },
+    "pgfmathscalar{}": {
+      "snippet": "pgfmathscalar{${1:value}}"
+    },
+    "pgfmathgcd{}{}": {
+      "snippet": "pgfmathgcd{${1:x}}{${2:y}}"
+    },
+    "pgfmathisprime{}": {
+      "snippet": "pgfmathisprime{${1:x}}"
+    },
+    "pgfmathisodd{}": {
+      "snippet": "pgfmathisodd{${1:x}}"
+    },
+    "pgfmathiseven{}": {
+      "snippet": "pgfmathiseven{${1:x}}"
+    },
+    "ifpgfmathfloatcomparison": {},
+    "pgfmathfloatcomparisontrue": {},
+    "pgfmathfloatcomparisonfalse": {},
+    "ifpgfmathfloatroundhasperiod": {},
+    "pgfmathfloatroundhasperiodtrue": {},
+    "pgfmathfloatroundhasperiodfalse": {},
+    "ifpgfmathprintnumberskipzeroperiod": {},
+    "pgfmathprintnumberskipzeroperiodtrue": {},
+    "pgfmathprintnumberskipzeroperiodfalse": {},
+    "ifpgfmathfloatroundmayneedrenormalize": {},
+    "pgfmathfloatroundmayneedrenormalizetrue": {},
+    "pgfmathfloatroundmayneedrenormalizefalse": {},
+    "pgfmathfloatparsenumber{}": {
+      "snippet": "pgfmathfloatparsenumber{${1:number}}"
+    },
+    "pgfmathfloatqparsenumber{}": {
+      "snippet": "pgfmathfloatqparsenumber{${1:number}}"
+    },
+    "pgfmathfloattomacro{}{}{}{}": {
+      "snippet": "pgfmathfloattomacro{${1:number}}{${2:flags macro}}{${3:mantissa macro}}{${4:exponent macro}}"
+    },
+    "pgfmathfloattoregisters{}{}{}{}": {
+      "snippet": "pgfmathfloattoregisters{${1:number}}{${2:flags count}}{${3:mantissa dimen}}{${4:exponent count}}"
+    },
+    "pgfmathfloattoregisterstok{}{}{}{}": {
+      "snippet": "pgfmathfloattoregisterstok{${1:number}}{${2:flags count}}{${3:mantissa toks}}{${4:exponent count}}"
+    },
+    "pgfmathfloatgetflags{}{}": {
+      "snippet": "pgfmathfloatgetflags{${1:number}}{${2:flags count}}"
+    },
+    "pgfmathfloatgetflagstomacro{}{}": {
+      "snippet": "pgfmathfloatgetflagstomacro{${1:number}}{${2:flags macro}}"
+    },
+    "pgfmathfloatgetmantissa{}{}": {
+      "snippet": "pgfmathfloatgetmantissa{${1:number}}{${2:mantissa dimen}}"
+    },
+    "pgfmathfloatgetmantisse{}{}": {
+      "snippet": "pgfmathfloatgetmantisse{${1:number}}{${2:mantissa dimen}}"
+    },
+    "pgfmathfloatgetmantissatok{}{}": {
+      "snippet": "pgfmathfloatgetmantissatok{${1:number}}{${2:mantissa toks}}"
+    },
+    "pgfmathfloatgetmantissetok{}{}": {
+      "snippet": "pgfmathfloatgetmantissetok{${1:number}}{${2:mantissa toks}}"
+    },
+    "pgfmathfloatgetexponent{}{}": {
+      "snippet": "pgfmathfloatgetexponent{${1:number}}{${2:exponent count}}"
+    },
+    "pgfmathfloatcreate{}{}{}": {
+      "snippet": "pgfmathfloatcreate{${1:flags}}{${2:mantissa}}{${3:exponent}}"
+    },
+    "pgfmathfloattofixed{}": {
+      "snippet": "pgfmathfloattofixed{${1:float}}"
+    },
+    "pgfmathfloattoint{}": {
+      "snippet": "pgfmathfloattoint{${1:float}}"
+    },
+    "pgfmathfloattosci{}": {
+      "snippet": "pgfmathfloattosci{${1:float}}"
+    },
+    "pgfmathfloatvalueof{}": {
+      "snippet": "pgfmathfloatvalueof{${1:float}}"
+    },
+    "pgfmathroundto{}": {
+      "snippet": "pgfmathroundto{${1:fixed point number}}"
+    },
+    "pgfmathroundtozerofill{}": {
+      "snippet": "pgfmathroundtozerofill{${1:fixed point number}}"
+    },
+    "pgfmathfloatround{}": {
+      "snippet": "pgfmathfloatround{${1:float}}"
+    },
+    "pgfmathfloatroundzerofill{}": {
+      "snippet": "pgfmathfloatroundzerofill{${1:float}}"
+    },
+    "pgfmathfloatrounddisplaystyle{}{}{}": {
+      "snippet": "pgfmathfloatrounddisplaystyle{${1:flags}}{${2:mantissa}}{${3:exponent}}"
+    },
+    "pgfmathfloatgetfrac{}": {
+      "snippet": "pgfmathfloatgetfrac{${1:number}}"
+    },
+    "pgfmathgreatestcommondivisor{}{}": {
+      "snippet": "pgfmathgreatestcommondivisor{${1:int 1}}{${2:int 2}}"
+    },
+    "pgfmathifisint{}{}{}": {
+      "snippet": "pgfmathifisint{${1:number constant}}{${2:true}}{${3:false}}"
+    },
+    "pgfmathprintnumber{}": {
+      "snippet": "pgfmathprintnumber{${1:number}}"
+    },
+    "pgfmathprintnumberto{}{}": {
+      "snippet": "pgfmathprintnumberto{${1:number}}{${2:cmd}}"
+    },
+    "ifpgfmathfloatparsenumberpendingperiod": {},
+    "pgfmathfloatparsenumberpendingperiodtrue": {},
+    "pgfmathfloatparsenumberpendingperiodfalse": {},
+    "pgfretval": {},
+    "pgfmathresult": {},
+    "pgfmathresulty": {},
+    "pgfmathresultx": {},
+    "pgfmathresultdenom": {},
+    "pgfmathresultfractional": {},
+    "pgfmathresultnumerator": {},
+    "pgfmathresultX": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/pgfplots.json b/dev/packages/pgfplots.json
index d4093d1a3..e27c2719b 100644
--- a/dev/packages/pgfplots.json
+++ b/dev/packages/pgfplots.json
@@ -365,46 +365,46 @@
       "snippet": "pgfplotsutilsortfour{${1:macro1}}{${2:macro2}}{${3:macro3}}{${4:macro4}}"
     },
     "pgfplotsmathvectortostring{}{}": {
-      "snippet": "pgfplotsmathvectortostring{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectortostring{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorfromstring{}{}": {
-      "snippet": "pgfplotsmathvectorfromstring{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorfromstring{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorsubtract{}{}{}": {
-      "snippet": "pgfplotsmathvectorsubtract{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorsubtract{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectoradd{}{}{}": {
-      "snippet": "pgfplotsmathvectoradd{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectoradd{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorcompwise{}{}{}{}": {
-      "snippet": "pgfplotsmathvectorcompwise{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:operation}}{${4:arg}}"
+      "snippet": "pgfplotsmathvectorcompwise{${1:x1,${5:y1},${6:z1}}{${2:x2},${7:y2},z2}}{${3:operation}}{${4:arg}}"
     },
     "pgfplotsmathvectorsum{}{}": {
-      "snippet": "pgfplotsmathvectorsum{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorsum{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscalarproduct{}{}{}": {
-      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectortocomponents{}{}{}": {
-      "snippet": "pgfplotsmathvectortocomponents{${1:x,y,z}}{${2:string}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectortocomponents{${1:x,${4:y},z}}{${2:string}}{${3:arg}}"
     },
     "pgfplotsmathvectorcrossprod{}{}{}": {
-      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorscaleindividually{}{}{}": {
-      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
     },
     "pgfplotspointfromcsvvector{}{}": {
-      "snippet": "pgfplotspointfromcsvvector{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotspointfromcsvvector{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorlength{}{}": {
-      "snippet": "pgfplotsmathvectorlength{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorlength{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscale{}{}{}": {
-      "snippet": "pgfplotsmathvectorscale{${1:x,y,z}}{${2:scale}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscale{${1:x,${4:y},z}}{${2:scale}}{${3:arg}}"
     },
     "pgfplotsmathvectordatascaletrafoinverse{}{}": {
-      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,y,z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,${3:y},z}}{${2:arg}}"
     },
     "pgfplotsDQ": {},
     "pgfplotsVERTBAR": {},
@@ -980,6 +980,9 @@
     "rangea": {},
     "rangeb": {},
     "factor": {},
+    "simplecoordinate()": {
+      "snippet": "simplecoordinate(${1:x},${2:y},${3:z})"
+    },
     "curelem": {},
     "pgfplotssetaxesfromazel{}{}{}": {
       "snippet": "pgfplotssetaxesfromazel{${1:azimuth}}{${2:elevation}}{${3:macro}}"
@@ -1190,7 +1193,7 @@
     },
     "pgfplotsaxisvisphasepreparedatapoint": {},
     "pgfplotsaxisvisphasetransformcoordinateentry{}{}": {
-      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x, y, or z}}{${2:input}}"
+      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x,${3: y}, or z}}{${2:input}}"
     },
     "pgfplotstransformplotattime{}": {
       "snippet": "pgfplotstransformplotattime{${1:fraction}}"
@@ -1206,13 +1209,16 @@
       "snippet": "pgfplotspointplotattime{${1:fraction}}"
     },
     "pgfplotsplothandlergraphics": {},
+    "pgfplotsplothandlergraphicspointmappoint()()": {
+      "snippet": "pgfplotsplothandlergraphicspointmappoint(${1:x},${2:y},${3:z})(${4:a},${5:b})"
+    },
     "pgfplotsplothandlergraphicspointmapcomputerequiredview": {},
     "pgfplotsE": {},
     "pgfplotsmathfloatviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathfloatviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
     },
     "pgfplotsmathvectorviewdepth{}": {
-      "snippet": "pgfplotsmathvectorviewdepth{${1:x,y,z}}"
+      "snippet": "pgfplotsmathvectorviewdepth{${1:x,${2:y},z}}"
     },
     "pgfplotsmathviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
@@ -1227,22 +1233,22 @@
     "tick": {},
     "nexttick": {},
     "pgfplotsvalueoflargesttickdimen{}": {
-      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x, y, or z}}"
+      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x,${2: y}, or z}}"
     },
     "pgfplotsqpointoutsideofticklabelaxis{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxisrel{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxistransformed{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsticklabelaxisspec{}": {
-      "snippet": "pgfplotsticklabelaxisspec{${1:x, y, or z}}"
+      "snippet": "pgfplotsticklabelaxisspec{${1:x,${2: y}, or z}}"
     },
     "pgfplotspointouternormalvectorofticklabelaxis{}": {
-      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x, y, or z}}"
+      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x,${2: y}, or z}}"
     },
     "Hmacro": {},
     "Hmacrobaseten": {},
diff --git a/dev/packages/phfparen.json b/dev/packages/phfparen.json
index 187151d2a..60deaf235 100644
--- a/dev/packages/phfparen.json
+++ b/dev/packages/phfparen.json
@@ -7,6 +7,12 @@
     "xstring": []
   },
   "macros": {
+    "paren()": {
+      "snippet": "paren(${1:expression in parenthesis})"
+    },
+    "paren*()": {
+      "snippet": "paren*(${1:expression in parenthesis})"
+    },
     "paren[]": {
       "snippet": "paren[${1:expression in brackets}]"
     },
diff --git a/dev/packages/phfqit.json b/dev/packages/phfqit.json
index 40c1931c4..0d76918e1 100644
--- a/dev/packages/phfqit.json
+++ b/dev/packages/phfqit.json
@@ -43,6 +43,27 @@
     "CNOT": {},
     "NOT": {},
     "NOOP": {},
+    "uu()": {
+      "snippet": "uu(${1:arg})"
+    },
+    "UU()": {
+      "snippet": "UU(${1:arg})"
+    },
+    "su()": {
+      "snippet": "su(${1:arg})"
+    },
+    "SU()": {
+      "snippet": "SU(${1:arg})"
+    },
+    "so()": {
+      "snippet": "so(${1:arg})"
+    },
+    "SO()": {
+      "snippet": "SO(${1:arg})"
+    },
+    "SN()": {
+      "snippet": "SN(${1:arg})"
+    },
     "ket{}": {
       "snippet": "ket{${1:arg}}"
     },
@@ -230,6 +251,15 @@
     "Hbase{}{}[][]{}[]": {
       "snippet": "Hbase{${1:Hsym}}{${2:subscript}}[${3:state}][${4:epsilon}]{${5:target sys}}[${6:cond sys}]"
     },
+    "Hfn()": {
+      "snippet": "Hfn(${1:arg})"
+    },
+    "Hfunc()": {
+      "snippet": "Hfunc(${1:arg})"
+    },
+    "Hfnbase{}{}{}()": {
+      "snippet": "Hfnbase{${1:Hsym}}{${2:sub}}{${3:sup}}(${4:arg})"
+    },
     "DD{}{}": {
       "snippet": "DD{${1:state}}{${2:relative-to state}}"
     },
diff --git a/dev/packages/physics.json b/dev/packages/physics.json
index 6dfcaa9e3..bb72bca82 100644
--- a/dev/packages/physics.json
+++ b/dev/packages/physics.json
@@ -15,6 +15,9 @@
     "Pmqty{}": {
       "snippet": "Pmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
+    "Pr()": {
+      "snippet": "Pr(${1:expression})"
+    },
     "Probability": {},
     "Res[]": {
       "snippet": "Res[${1:expression}]"
@@ -43,30 +46,102 @@
     "acommutator{}{}": {
       "snippet": "acommutator{${1:expression1}}{${2:expression2}}"
     },
+    "acos()": {
+      "snippet": "acos(${1:expression})"
+    },
+    "acos[]()": {
+      "snippet": "acos[${1:power}](${2:expression})"
+    },
     "acosecant": {},
     "acosine": {},
+    "acot()": {
+      "snippet": "acot(${1:expression})"
+    },
+    "acot[]()": {
+      "snippet": "acot[${1:power}](${2:expression})"
+    },
     "acotangent": {},
+    "acsc()": {
+      "snippet": "acsc(${1:expression})"
+    },
+    "acsc[]()": {
+      "snippet": "acsc[${1:power}](${2:expression})"
+    },
     "admat{}": {
-      "snippet": "admat{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "admat{${1:matrix element 1,${2:matrix element 2},...}}"
     },
     "anticommutator{}{}": {
       "snippet": "anticommutator{${1:expression1}}{${2:expression2}}"
     },
     "antidiagonalmatrix{}": {
-      "snippet": "antidiagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "antidiagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
+    },
+    "arccos()": {
+      "snippet": "arccos(${1:expression})"
+    },
+    "arccos[]()": {
+      "snippet": "arccos[${1:power}](${2:expression})"
     },
     "arccosecant": {},
     "arccosine": {},
+    "arccot()": {
+      "snippet": "arccot(${1:expression})"
+    },
+    "arccot[]()": {
+      "snippet": "arccot[${1:power}](${2:expression})"
+    },
     "arccotangent": {},
+    "arccsc()": {
+      "snippet": "arccsc(${1:expression})"
+    },
+    "arccsc[]()": {
+      "snippet": "arccsc[${1:power}](${2:expression})"
+    },
+    "arcsec()": {
+      "snippet": "arcsec(${1:expression})"
+    },
+    "arcsec[]()": {
+      "snippet": "arcsec[${1:power}](${2:expression})"
+    },
     "arcsecant": {},
+    "arcsin()": {
+      "snippet": "arcsin(${1:expression})"
+    },
+    "arcsin[]()": {
+      "snippet": "arcsin[${1:power}](${2:expression})"
+    },
     "arcsine": {},
+    "arctan()": {
+      "snippet": "arctan(${1:expression})"
+    },
+    "arctan[]()": {
+      "snippet": "arctan[${1:power}](${2:expression})"
+    },
     "arctangent": {},
     "argclose": {},
     "argclose*": {},
     "argopen": {},
     "argopen*": {},
+    "asec()": {
+      "snippet": "asec(${1:expression})"
+    },
+    "asec[]()": {
+      "snippet": "asec[${1:power}](${2:expression})"
+    },
     "asecant": {},
+    "asin()": {
+      "snippet": "asin(${1:expression})"
+    },
+    "asin[]()": {
+      "snippet": "asin[${1:power}](${2:expression})"
+    },
     "asine": {},
+    "atan()": {
+      "snippet": "atan(${1:expression})"
+    },
+    "atan[]()": {
+      "snippet": "atan[${1:power}](${2:expression})"
+    },
     "atangent": {},
     "bmqty{}": {
       "snippet": "bmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
@@ -102,13 +177,55 @@
     "commutator{}{}": {
       "snippet": "commutator{${1:expression1}}{${2:expression2}}"
     },
+    "cos()": {
+      "snippet": "cos(${1:expression})"
+    },
+    "cos[]()": {
+      "snippet": "cos[${1:power}](${2:expression})"
+    },
     "cosecant": {},
+    "cosh()": {
+      "snippet": "cosh(${1:expression})"
+    },
+    "cosh[]()": {
+      "snippet": "cosh[${1:power}](${2:expression})"
+    },
     "cosine": {},
+    "cot()": {
+      "snippet": "cot(${1:expression})"
+    },
+    "cot[]()": {
+      "snippet": "cot[${1:power}](${2:expression})"
+    },
     "cotangent": {},
+    "coth()": {
+      "snippet": "coth(${1:expression})"
+    },
+    "coth[]()": {
+      "snippet": "coth[${1:power}](${2:expression})"
+    },
     "cp": {},
     "cross": {},
     "crossproduct": {},
+    "csc()": {
+      "snippet": "csc(${1:expression})"
+    },
+    "csc[]()": {
+      "snippet": "csc[${1:power}](${2:expression})"
+    },
+    "csch()": {
+      "snippet": "csch(${1:expression})"
+    },
+    "csch[]()": {
+      "snippet": "csch[${1:power}](${2:expression})"
+    },
     "curl": {},
+    "curl()": {
+      "snippet": "curl(${1:expression})"
+    },
+    "curl*()": {
+      "snippet": "curl*(${1:expression})"
+    },
     "curl*[]": {
       "snippet": "curl*[${1:expression}]"
     },
@@ -122,6 +239,9 @@
       "detail": "ⅆ",
       "documentation": "DOUBLE-STRUCK ITALIC SMALL D"
     },
+    "dd()": {
+      "snippet": "dd(${1:expression})"
+    },
     "dd[]{}": {
       "snippet": "dd[${2:power}]{${1:expression}}"
     },
@@ -131,11 +251,20 @@
     "derivative{}{}": {
       "snippet": "derivative{${1:function}}{${2:expression}}"
     },
+    "det()": {
+      "snippet": "det(${1:expression})"
+    },
     "determinant": {},
     "diagonalmatrix{}": {
-      "snippet": "diagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "diagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
     },
     "differential": {},
+    "div()": {
+      "snippet": "div(${1:expression})"
+    },
+    "div*()": {
+      "snippet": "div*(${1:expression})"
+    },
     "div*[]": {
       "snippet": "div*[${1:expression}]"
     },
@@ -151,7 +280,7 @@
     },
     "divisionsymbol": {},
     "dmat{}": {
-      "snippet": "dmat{${1:matrix element 1,matrix element 2,...}}"
+      "snippet": "dmat{${1:matrix element 1,${2:matrix element 2},...}}"
     },
     "dotproduct": {},
     "dv*{}{}": {
@@ -163,6 +292,9 @@
     "dv{}": {
       "snippet": "dv{${1:expression}}"
     },
+    "dv{}()": {
+      "snippet": "dv{${1:expression1}}(${2:expression2})"
+    },
     "dv{}{}": {
       "snippet": "dv{${1:function}}{${2:expression}}"
     },
@@ -175,6 +307,9 @@
     "dyad{}{}": {
       "snippet": "dyad{${1:expression1}}{${2:expression2}}"
     },
+    "erf()": {
+      "snippet": "erf(${1:expression})"
+    },
     "ev**{}{}": {
       "snippet": "ev**{${1:expression1}}{${2:expression2}}"
     },
@@ -196,6 +331,9 @@
     "evaluated{}_{}^{}": {
       "snippet": "evaluated{${1:expression}}_{${2:limit1}}^{${3:limit2}}"
     },
+    "exp()": {
+      "snippet": "exp(${1:expression})"
+    },
     "expectationvalue{}{}": {
       "snippet": "expectationvalue{${1:expression1}}{${2:expression2}}"
     },
@@ -221,13 +359,25 @@
     "fdv{}": {
       "snippet": "fdv{${1:expression}}"
     },
+    "fdv{}()": {
+      "snippet": "fdv{${1:expression}}(${2:function})"
+    },
     "fdv{}{}": {
       "snippet": "fdv{${1:function}}{${2:expression}}"
     },
+    "flatfrac{}()": {
+      "snippet": "flatfrac{${1:expression1}}(${2:expression2})"
+    },
     "functionalderivative{}{}": {
       "snippet": "functionalderivative{${1:function}}{${2:expression}}"
     },
     "grad": {},
+    "grad()": {
+      "snippet": "grad(${1:expression})"
+    },
+    "grad*()": {
+      "snippet": "grad*(${1:expression})"
+    },
     "grad*[]": {
       "snippet": "grad*[${1:expression}]"
     },
@@ -277,6 +427,12 @@
       "snippet": "ketbra{${1:expression1}}{${2:expression2}}"
     },
     "laplacian": {},
+    "laplacian()": {
+      "snippet": "laplacian(${1:expression})"
+    },
+    "laplacian*()": {
+      "snippet": "laplacian*(${1:expression})"
+    },
     "laplacian*[]": {
       "snippet": "laplacian*[${1:expression}]"
     },
@@ -286,6 +442,12 @@
     "laplacian{}": {
       "snippet": "laplacian{${1:expression}}"
     },
+    "ln()": {
+      "snippet": "ln(${1:expression})"
+    },
+    "log()": {
+      "snippet": "log(${1:expression})"
+    },
     "logarithm": {},
     "lparen": {
       "detail": "(",
@@ -306,6 +468,9 @@
     "matrixelement{}{}{}": {
       "snippet": "matrixelement{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
+    "matrixquantity()": {
+      "snippet": "matrixquantity(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
+    },
     "matrixquantity{}": {
       "snippet": "matrixquantity{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -322,6 +487,12 @@
     "mel{}{}{}": {
       "snippet": "mel{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
+    "mqty()": {
+      "snippet": "mqty(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
+    },
+    "mqty*()": {
+      "snippet": "mqty*(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
+    },
     "mqty[]": {
       "snippet": "mqty[${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}]"
     },
@@ -344,6 +515,9 @@
     "op{}{}": {
       "snippet": "op{${1:expression1}}{${2:expression2}}"
     },
+    "opbraces{}()": {
+      "snippet": "opbraces{${1:operator}}(${2:expression})"
+    },
     "order*{}": {
       "snippet": "order*{${1:expression}}"
     },
@@ -460,6 +634,9 @@
     "qsince*": {},
     "qthen": {},
     "qthen*": {},
+    "qty()": {
+      "snippet": "qty(${1:expression})"
+    },
     "qty[]": {
       "snippet": "qty[${1:expression}]"
     },
@@ -484,8 +661,32 @@
     "sbmqty{}": {
       "snippet": "sbmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
+    "sec()": {
+      "snippet": "sec(${1:expression})"
+    },
+    "sec[]()": {
+      "snippet": "sec[${1:power}](${2:expression})"
+    },
     "secant": {},
+    "sech()": {
+      "snippet": "sech(${1:expression})"
+    },
+    "sech[]()": {
+      "snippet": "sech[${1:power}](${2:expression})"
+    },
+    "sin()": {
+      "snippet": "sin(${1:expression})"
+    },
+    "sin[]()": {
+      "snippet": "sin[${1:power}](${2:expression})"
+    },
     "sine": {},
+    "sinh()": {
+      "snippet": "sinh(${1:expression})"
+    },
+    "sinh[]()": {
+      "snippet": "sinh[${1:power}](${2:expression})"
+    },
     "smallmatrixdeterminant{}": {
       "snippet": "smallmatrixdeterminant{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -495,6 +696,12 @@
     "smdet{}": {
       "snippet": "smdet{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element}}"
     },
+    "smqty({})": {
+      "snippet": "smqty(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
+    },
+    "smqty*({})": {
+      "snippet": "smqty*(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
+    },
     "smqty[{]": {
       "snippet": "smqty[{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}]"
     },
@@ -513,9 +720,27 @@
     "svmqty{}": {
       "snippet": "svmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
+    "tan()": {
+      "snippet": "tan(${1:expression})"
+    },
+    "tan[]()": {
+      "snippet": "tan[${1:power}](${2:expression})"
+    },
     "tangent": {},
+    "tanh()": {
+      "snippet": "tanh(${1:expression})"
+    },
+    "tanh[]()": {
+      "snippet": "tanh[${1:power}](${2:expression})"
+    },
     "tr": {},
+    "tr()": {
+      "snippet": "tr(${1:expression})"
+    },
     "trace": {},
+    "trigbraces{}()": {
+      "snippet": "trigbraces{${1:operator}}(${2:expression})"
+    },
     "trigopt": {},
     "va*{}": {
       "snippet": "va*{${1:expression}}"
@@ -523,6 +748,9 @@
     "va{}": {
       "snippet": "va{${1:expression}}"
     },
+    "var()": {
+      "snippet": "var(${1:expression})"
+    },
     "var{}": {
       "snippet": "var{${1:expression}}"
     },
diff --git a/dev/packages/physics2.json b/dev/packages/physics2.json
index 36533ab9b..05a055b1a 100644
--- a/dev/packages/physics2.json
+++ b/dev/packages/physics2.json
@@ -73,40 +73,40 @@
       "snippet": "ketbra*|subformula1>${1:optional}<subformula2|"
     },
     "diagmat{}": {
-      "snippet": "diagmat{${1:entry1,entry2,...}}"
+      "snippet": "diagmat{${1:entry1,${2:entry2},...}}"
     },
     "diagmat[]{}": {
-      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "pdiagmat{}": {
-      "snippet": "pdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "pdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "pdiagmat[]{}": {
-      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "bdiagmat{}": {
-      "snippet": "bdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "bdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "bdiagmat[]{}": {
-      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "Bdiagmat{}": {
-      "snippet": "Bdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "Bdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "Bdiagmat[]{}": {
-      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "vdiagmat{}": {
-      "snippet": "vdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "vdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "vdiagmat[]{}": {
-      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "Vdiagmat{}": {
-      "snippet": "Vdiagmat{${1:entry1,entry2,...}}"
+      "snippet": "Vdiagmat{${1:entry1,${2:entry2},...}}"
     },
     "Vdiagmat[]{}": {
-      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
+      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
     },
     "doublecross": {},
     "doubledot": {},
diff --git a/dev/packages/piano.json b/dev/packages/piano.json
new file mode 100644
index 000000000..b2c263a3f
--- /dev/null
+++ b/dev/packages/piano.json
@@ -0,0 +1,11 @@
+{
+  "includes": {
+    "color": [],
+    "ifthen": [],
+    "xargs": []
+  },
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/picinpar.json b/dev/packages/picinpar.json
index f42f4d5f6..adbb82be6 100644
--- a/dev/packages/picinpar.json
+++ b/dev/packages/picinpar.json
@@ -67,17 +67,17 @@
     "window": {},
     "window[]": {
       "name": "window",
-      "snippet": "[${1:lines,pos,graphics,caption}]"
+      "snippet": "[${1:lines,${2:pos},${3:graphics},caption}]"
     },
     "figwindow": {},
     "figwindow[]": {
       "name": "figwindow",
-      "snippet": "[${1:lines,pos,graphics,caption}]"
+      "snippet": "[${1:lines,${2:pos},${3:graphics},caption}]"
     },
     "tabwindow": {},
     "tabwindow[]": {
       "name": "tabwindow",
-      "snippet": "[${1:lines,pos,graphics,caption}]"
+      "snippet": "[${1:lines,${2:pos},${3:graphics},caption}]"
     }
   },
   "options": [],
diff --git a/dev/packages/picins.json b/dev/packages/picins.json
index 3ad7ec299..f8993ae72 100644
--- a/dev/packages/picins.json
+++ b/dev/packages/picins.json
@@ -4,9 +4,45 @@
     "parpic{}": {
       "snippet": "parpic{${1:graphics}}"
     },
+    "parpic(){}": {
+      "snippet": "parpic(${2:width},${3:height}){${1:graphics}}"
+    },
+    "parpic()[]{}": {
+      "snippet": "parpic(${3:width},${4:height})[${2:opts}]{${1:graphics}}"
+    },
+    "parpic()[][]{}": {
+      "snippet": "parpic(${4:width},${5:height})[${2:opts}][${3:pos}]{${1:graphics}}"
+    },
+    "parpic()(){}": {
+      "snippet": "parpic(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics}}"
+    },
+    "parpic()()[]{}": {
+      "snippet": "parpic(${3:width},${4:height})(${5:xoffset},${6:yoffset})[${2:opts}]{${1:graphics}}"
+    },
+    "parpic()()[][]{}": {
+      "snippet": "parpic(${4:width},${5:height})(${6:xoffset},${7:yoffset})[${2:opts}][${3:pos}]{${1:graphics}}"
+    },
     "hpic{}": {
       "snippet": "hpic{${1:graphics}}"
     },
+    "hpic(){}": {
+      "snippet": "hpic(${2:width},${3:height}){${1:graphics}}"
+    },
+    "hpic()[]{}": {
+      "snippet": "hpic(${3:width},${4:height})[${2:opts}]{${1:graphics}}"
+    },
+    "hpic()[][]{}": {
+      "snippet": "hpic(${4:width},${5:height})[${2:opts}][${3:pos}]{${1:graphics}}"
+    },
+    "hpic()(){}": {
+      "snippet": "hpic(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics}}"
+    },
+    "hpic()()[]{}": {
+      "snippet": "hpic(${3:width},${4:height})(${5:xoffset},${6:yoffset})[${2:opts}]{${1:graphics}}"
+    },
+    "hpic()()[][]{}": {
+      "snippet": "hpic(${4:width},${5:height})(${6:xoffset},${7:yoffset})[${2:opts}][${3:pos}]{${1:graphics}}"
+    },
     "picskip{}": {
       "snippet": "picskip{${1:n}}"
     },
@@ -49,7 +85,22 @@
     "ihpic": {},
     "iihpic": {},
     "iiihpic": {},
-    "ivhpic": {}
+    "ivhpic": {},
+    "Rahmen(){}": {
+      "snippet": "Rahmen(${2:x},${3:y}){${1:arg}}"
+    },
+    "Schatten(){}": {
+      "snippet": "Schatten(${2:x},${3:y}){${1:arg}}"
+    },
+    "Oval(){}": {
+      "snippet": "Oval(${2:x},${3:y}){${1:arg}}"
+    },
+    "Strich(){}": {
+      "snippet": "Strich(${2:x},${3:y}){${1:arg}}"
+    },
+    "Kasten(){}": {
+      "snippet": "Kasten(${2:x},${3:y}){${1:arg}}"
+    }
   },
   "envs": {
     "frameenv": {},
diff --git a/dev/packages/pict2e.json b/dev/packages/pict2e.json
new file mode 100644
index 000000000..6565b4e55
--- /dev/null
+++ b/dev/packages/pict2e.json
@@ -0,0 +1,119 @@
+{
+  "includes": {
+    "trig": []
+  },
+  "macros": {
+    "line(){}": {
+      "snippet": "line(${2:x},${3:y}){${1:length}}"
+    },
+    "vector(){}": {
+      "snippet": "vector(${2:x},${3:y}){${1:length}}"
+    },
+    "circle{}": {
+      "snippet": "circle{${1:diameter}}"
+    },
+    "circle*{}": {
+      "snippet": "circle*{${1:diameter}}"
+    },
+    "oval()": {
+      "snippet": "oval(${1:x},${2:y})"
+    },
+    "oval[]()": {
+      "snippet": "oval[${1:radius}](${2:x},${3:y})"
+    },
+    "oval()[]": {
+      "snippet": "oval(${2:x},${3:y})[${1:pos}]"
+    },
+    "oval[]()[]": {
+      "snippet": "oval[${1:radius}](${3:x},${4:y})[${2:pos}]"
+    },
+    "maxovalrad": {},
+    "bezier{}()()()": {
+      "snippet": "bezier{${1:n}}(${2:ax},${3:ay})(${4:bx},${5:by})(${6:cx},${7:cy})"
+    },
+    "qbezier()()()": {
+      "snippet": "qbezier(${1:ax},${2:ay})(${3:bx},${4:by})(${5:cx},${6:cy})"
+    },
+    "qbezier[]()()()": {
+      "snippet": "qbezier[${1:n}](${2:ax},${3:ay})(${4:bx},${5:by})(${6:cx},${7:cy})"
+    },
+    "cbezier()()()()": {
+      "snippet": "cbezier(${1:ax},${2:ay})(${3:bx},${4:by})(${5:cx},${6:cy})(${7:dx},${8:dy})"
+    },
+    "cbezier[]()()()()": {
+      "snippet": "cbezier[${1:n}](${2:ax},${3:ay})(${4:bx},${5:by})(${6:cx},${7:cy})(${8:dx},${9:dy})"
+    },
+    "qbeziermax": {},
+    "arc{}": {
+      "snippet": "arc{${1:radius}}"
+    },
+    "arc[]{}": {
+      "snippet": "arc[${2:angle1,angle2}]{${1:radius}}"
+    },
+    "arc*{}": {
+      "snippet": "arc*{${1:radius}}"
+    },
+    "arc*[]{}": {
+      "snippet": "arc*[${2:angle1,angle2}]{${1:radius}}"
+    },
+    "Line()()": {
+      "snippet": "Line(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "Vector()()": {
+      "snippet": "Vector(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "moveto()": {
+      "snippet": "moveto(${1:x},${2:y})"
+    },
+    "lineto()": {
+      "snippet": "lineto(${1:x},${2:y})"
+    },
+    "curveto()()()": {
+      "snippet": "curveto(${1:x2},${2:y2})(${3:x3},${4:y3})(${5:x4},${6:y4})"
+    },
+    "circlearc{}{}{}{}{}": {
+      "snippet": "circlearc{${1:x}}{${2:y}}{${3:radius}}{${4:angle1}}{${5:angle2}}"
+    },
+    "circlearc[]{}{}{}{}{}": {
+      "snippet": "circlearc[${6:n}]{${1:x}}{${2:y}}{${3:radius}}{${4:angle1}}{${5:angle2}}"
+    },
+    "closepath": {},
+    "strokepath": {},
+    "fillpath": {},
+    "buttcap": {},
+    "roundcap": {},
+    "squarecap": {},
+    "miterjoin": {},
+    "roundjoin": {},
+    "beveljoin": {},
+    "thicklines": {},
+    "thinlines": {},
+    "ltxarrows": {},
+    "pstarrows": {},
+    "OriginalPictureCmds": {}
+  },
+  "envs": {},
+  "options": [
+    "dvips",
+    "xdvi",
+    "dvipdf",
+    "dvipdfm",
+    "dvipdfmx",
+    "pdftex",
+    "luatex",
+    "xetex",
+    "dvipsone",
+    "dviwindo",
+    "oztex",
+    "textures",
+    "pctexps",
+    "pctex32",
+    "vtex",
+    "original",
+    "ltxarrows",
+    "pstarrows",
+    "debug",
+    "hide"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/picture.json b/dev/packages/picture.json
new file mode 100644
index 000000000..9b3eb1204
--- /dev/null
+++ b/dev/packages/picture.json
@@ -0,0 +1,15 @@
+{
+  "includes": {
+    "calc": [
+      "calc"
+    ]
+  },
+  "macros": {},
+  "envs": {},
+  "options": [
+    "plain",
+    "etex",
+    "calc"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/pinoutikz.json b/dev/packages/pinoutikz.json
index b08166d9d..df2bead75 100644
--- a/dev/packages/pinoutikz.json
+++ b/dev/packages/pinoutikz.json
@@ -15,12 +15,39 @@
     "tikzlibraryshapes.geometric": []
   },
   "macros": {
+    "PDIP(){}": {
+      "snippet": "PDIP(${2:pincount}){${1:pinarray}}"
+    },
+    "pctPDIP(){}": {
+      "snippet": "pctPDIP(${2:pincount}){${1:pinarray}}"
+    },
+    "TQFP(){}": {
+      "snippet": "TQFP(${2:pincount}){${1:pinarray}}"
+    },
+    "pctTQFP(){}": {
+      "snippet": "pctTQFP(${2:pincount}){${1:pinarray}}"
+    },
+    "PLCC(){}": {
+      "snippet": "PLCC(${2:pincount}){${1:pinarray}}"
+    },
+    "pctPLCC(){}": {
+      "snippet": "pctPLCC(${2:pincount}){${1:pinarray}}"
+    },
     "pinoutikzname": {},
     "pinoutikzversion": {},
     "pinoutikzdate": {},
     "FormatPinLabel{}": {
       "snippet": "FormatPinLabel{${1:arg}}"
     },
+    "CASE(){}": {
+      "snippet": "CASE(${2:arg1}){${1:arg2}}"
+    },
+    "PIN[](){}{}": {
+      "snippet": "PIN[${3:arg1}](${4:arg2}){${1:arg3}}{${2:arg4}}"
+    },
+    "GENFOUREDGE(){}{}{}": {
+      "snippet": "GENFOUREDGE(${4:arg1}){${1:arg2}}{${2:arg3}}{${3:arg4}}"
+    },
     "pardefault": {},
     "neverindent": {},
     "autoindent": {}
diff --git a/dev/packages/pinyin.json b/dev/packages/pinyin.json
new file mode 100644
index 000000000..9501ad08d
--- /dev/null
+++ b/dev/packages/pinyin.json
@@ -0,0 +1,892 @@
+{
+  "includes": {},
+  "macros": {
+    "PYactivate": {},
+    "PYdeactivate": {},
+    "a": {
+      "detail": "𝑎",
+      "documentation": "MATHEMATICAL ITALIC SMALL A"
+    },
+    "A": {
+      "detail": "𝐴",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
+    },
+    "ai": {},
+    "Ai": {},
+    "an": {},
+    "An": {},
+    "ang": {},
+    "Ang": {},
+    "ao": {},
+    "Ao": {},
+    "ba": {},
+    "Ba": {},
+    "bai": {},
+    "Bai": {},
+    "ban": {},
+    "Ban": {},
+    "bang": {},
+    "Bang": {},
+    "bao": {},
+    "Bao": {},
+    "bei": {},
+    "Bei": {},
+    "ben": {},
+    "Ben": {},
+    "beng": {},
+    "Beng": {},
+    "bi": {},
+    "Bi": {},
+    "bian": {},
+    "Bian": {},
+    "biao": {},
+    "Biao": {},
+    "bie": {},
+    "Bie": {},
+    "bin": {},
+    "Bin": {},
+    "bing": {},
+    "Bing": {},
+    "bo": {},
+    "Bo": {},
+    "bu": {},
+    "Bu": {},
+    "ca": {},
+    "Ca": {},
+    "cai": {},
+    "Cai": {},
+    "can": {},
+    "Can": {},
+    "cang": {},
+    "Cang": {},
+    "cao": {},
+    "Cao": {},
+    "ce": {},
+    "Ce": {},
+    "cen": {},
+    "Cen": {},
+    "ceng": {},
+    "Ceng": {},
+    "cha": {},
+    "Cha": {},
+    "chai": {},
+    "Chai": {},
+    "chan": {},
+    "Chan": {},
+    "chang": {},
+    "Chang": {},
+    "chao": {},
+    "Chao": {},
+    "che": {},
+    "Che": {},
+    "chen": {},
+    "Chen": {},
+    "cheng": {},
+    "Cheng": {},
+    "Chi": {},
+    "chong": {},
+    "Chong": {},
+    "chou": {},
+    "Chou": {},
+    "chu": {},
+    "Chu": {},
+    "chua": {},
+    "chuai": {},
+    "Chuai": {},
+    "chuan": {},
+    "Chuan": {},
+    "chuang": {},
+    "Chuang": {},
+    "chui": {},
+    "Chui": {},
+    "chun": {},
+    "Chun": {},
+    "chuo": {},
+    "Chuo": {},
+    "ci": {},
+    "Ci": {},
+    "cong": {
+      "detail": "≅",
+      "documentation": "congruent with"
+    },
+    "Cong": {},
+    "cou": {},
+    "Cou": {},
+    "cu": {},
+    "Cu": {},
+    "cuan": {},
+    "Cuan": {},
+    "cui": {},
+    "Cui": {},
+    "cun": {},
+    "Cun": {},
+    "cuo": {},
+    "Cuo": {},
+    "da": {},
+    "Da": {},
+    "dai": {},
+    "Dai": {},
+    "dan": {},
+    "Dan": {},
+    "dang": {},
+    "Dang": {},
+    "dao": {},
+    "Dao": {},
+    "de": {},
+    "De": {},
+    "dei": {},
+    "Dei": {},
+    "den": {},
+    "deng": {},
+    "Deng": {},
+    "di": {},
+    "Di": {},
+    "dian": {},
+    "Dian": {},
+    "diao": {},
+    "Diao": {},
+    "die": {},
+    "Die": {},
+    "ding": {},
+    "Ding": {},
+    "diu": {},
+    "Diu": {},
+    "dong": {},
+    "Dong": {},
+    "dou": {},
+    "Dou": {},
+    "du": {},
+    "Du": {},
+    "duan": {},
+    "Duan": {},
+    "dui": {},
+    "Dui": {},
+    "dun": {},
+    "Dun": {},
+    "duo": {},
+    "Duo": {},
+    "e": {
+      "detail": "𝑒",
+      "documentation": "MATHEMATICAL ITALIC SMALL E"
+    },
+    "E": {
+      "detail": "𝐸",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL E"
+    },
+    "ei": {},
+    "Ei": {},
+    "en": {},
+    "En": {},
+    "eng": {},
+    "Eng": {},
+    "er": {},
+    "Er": {},
+    "fa": {},
+    "Fa": {},
+    "fan": {},
+    "Fan": {},
+    "fang": {},
+    "Fang": {},
+    "fei": {},
+    "Fei": {},
+    "fen": {},
+    "Fen": {},
+    "feng": {},
+    "Feng": {},
+    "fiao": {},
+    "Fiao": {},
+    "fo": {},
+    "Fo": {},
+    "fou": {},
+    "Fou": {},
+    "fu": {},
+    "Fu": {},
+    "ga": {},
+    "Ga": {},
+    "gai": {},
+    "Gai": {},
+    "gan": {},
+    "Gan": {},
+    "gang": {},
+    "Gang": {},
+    "gao": {},
+    "Gao": {},
+    "ge": {
+      "detail": "≥",
+      "documentation": "r: greater-than-or-equal"
+    },
+    "Ge": {},
+    "gei": {},
+    "Gei": {},
+    "gen": {},
+    "Gen": {},
+    "geng": {},
+    "Geng": {},
+    "gong": {},
+    "Gong": {},
+    "gou": {},
+    "Gou": {},
+    "gu": {},
+    "Gu": {},
+    "gua": {},
+    "Gua": {},
+    "guai": {},
+    "Guai": {},
+    "guan": {},
+    "Guan": {},
+    "guang": {},
+    "Guang": {},
+    "gui": {},
+    "Gui": {},
+    "gun": {},
+    "Gun": {},
+    "guo": {},
+    "Guo": {},
+    "ha": {},
+    "Ha": {},
+    "hai": {},
+    "Hai": {},
+    "han": {},
+    "Han": {},
+    "hang": {},
+    "Hang": {},
+    "hao": {},
+    "Hao": {},
+    "he": {},
+    "He": {},
+    "hei": {},
+    "Hei": {},
+    "hen": {},
+    "Hen": {},
+    "heng": {},
+    "Heng": {},
+    "hong": {},
+    "Hong": {},
+    "hou": {},
+    "Hou": {},
+    "hu": {},
+    "Hu": {},
+    "hua": {},
+    "Hua": {},
+    "huai": {},
+    "Huai": {},
+    "huan": {},
+    "Huan": {},
+    "huang": {},
+    "Huang": {},
+    "hui": {},
+    "Hui": {},
+    "hun": {},
+    "Hun": {},
+    "huo": {},
+    "Huo": {},
+    "ji": {},
+    "Ji": {},
+    "jia": {},
+    "Jia": {},
+    "jian": {},
+    "Jian": {},
+    "jiang": {},
+    "Jiang": {},
+    "jiao": {},
+    "Jiao": {},
+    "jie": {},
+    "Jie": {},
+    "jin": {},
+    "Jin": {},
+    "jing": {},
+    "Jing": {},
+    "jiong": {},
+    "Jiong": {},
+    "jiu": {},
+    "Jiu": {},
+    "ju": {},
+    "Ju": {},
+    "juan": {},
+    "Juan": {},
+    "jue": {},
+    "Jue": {},
+    "jun": {},
+    "Jun": {},
+    "ka": {},
+    "Ka": {},
+    "kai": {},
+    "Kai": {},
+    "kan": {},
+    "Kan": {},
+    "kang": {},
+    "Kang": {},
+    "kao": {},
+    "Kao": {},
+    "ke": {},
+    "Ke": {},
+    "kei": {},
+    "Kei": {},
+    "ken": {},
+    "Ken": {},
+    "keng": {},
+    "Keng": {},
+    "kong": {},
+    "Kong": {},
+    "kou": {},
+    "Kou": {},
+    "ku": {},
+    "Ku": {},
+    "kua": {},
+    "Kua": {},
+    "kuai": {},
+    "Kuai": {},
+    "kuan": {},
+    "Kuan": {},
+    "kuang": {},
+    "Kuang": {},
+    "kui": {},
+    "Kui": {},
+    "kun": {},
+    "Kun": {},
+    "kuo": {},
+    "Kuo": {},
+    "la": {},
+    "La": {},
+    "lai": {},
+    "Lai": {},
+    "lan": {},
+    "Lan": {},
+    "lang": {
+      "detail": "⟪",
+      "documentation": "MATHEMATICAL LEFT DOUBLE ANGLE BRACKET, z notation left chevron bracket"
+    },
+    "Lang": {},
+    "lao": {},
+    "Lao": {},
+    "le": {
+      "detail": "≤",
+      "documentation": "r: less-than-or-equal"
+    },
+    "Le": {},
+    "lei": {},
+    "Lei": {},
+    "leng": {},
+    "Leng": {},
+    "li": {},
+    "Li": {},
+    "lia": {},
+    "Lia": {},
+    "lian": {},
+    "Lian": {},
+    "liang": {},
+    "Liang": {},
+    "liao": {},
+    "Liao": {},
+    "lie": {},
+    "Lie": {},
+    "lin": {},
+    "Lin": {},
+    "ling": {},
+    "Ling": {},
+    "liu": {},
+    "Liu": {},
+    "Long": {},
+    "LONG": {},
+    "lou": {},
+    "Lou": {},
+    "lu": {},
+    "Lu": {},
+    "luan": {},
+    "Luan": {},
+    "lun": {},
+    "Lun": {},
+    "luo": {},
+    "Luo": {},
+    "lv": {},
+    "Lv": {},
+    "lve": {},
+    "Lve": {},
+    "ma": {},
+    "Ma": {},
+    "mai": {},
+    "Mai": {},
+    "man": {},
+    "Man": {},
+    "mang": {},
+    "Mang": {},
+    "mao": {},
+    "Mao": {},
+    "me": {},
+    "mei": {},
+    "Mei": {},
+    "men": {},
+    "Men": {},
+    "meng": {},
+    "Meng": {},
+    "mi": {},
+    "Mi": {},
+    "mian": {},
+    "Mian": {},
+    "miao": {},
+    "Miao": {},
+    "mie": {},
+    "Mie": {},
+    "min": {},
+    "Min": {},
+    "ming": {},
+    "Ming": {},
+    "miu": {},
+    "Miu": {},
+    "mo": {},
+    "Mo": {},
+    "mou": {},
+    "Mou": {},
+    "Mu": {},
+    "na": {},
+    "Na": {},
+    "nai": {},
+    "Nai": {},
+    "nan": {},
+    "Nan": {},
+    "nang": {},
+    "Nang": {},
+    "nao": {},
+    "Nao": {},
+    "ne": {
+      "detail": "≠",
+      "documentation": "r: not equal"
+    },
+    "Ne": {},
+    "nei": {},
+    "Nei": {},
+    "nen": {},
+    "Nen": {},
+    "neng": {},
+    "Neng": {},
+    "ni": {
+      "detail": "∋",
+      "documentation": "con variant"
+    },
+    "Ni": {},
+    "nian": {},
+    "Nian": {},
+    "niang": {},
+    "Niang": {},
+    "niao": {},
+    "Niao": {},
+    "nie": {},
+    "Nie": {},
+    "nin": {
+      "detail": "∉",
+      "documentation": "negated set membership"
+    },
+    "Nin": {},
+    "ning": {},
+    "Ning": {},
+    "niu": {},
+    "Niu": {},
+    "nong": {},
+    "Nong": {},
+    "nou": {},
+    "Nou": {},
+    "Nu": {},
+    "nuan": {},
+    "Nuan": {},
+    "nuo": {},
+    "Nuo": {},
+    "nv": {},
+    "Nv": {},
+    "nve": {},
+    "Nve": {},
+    "o": {
+      "detail": "𝑜",
+      "documentation": "MATHEMATICAL ITALIC SMALL O"
+    },
+    "O": {
+      "detail": "𝑂",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL O"
+    },
+    "ou": {},
+    "Ou": {},
+    "pa": {},
+    "Pa": {},
+    "pai": {},
+    "Pai": {},
+    "pan": {},
+    "Pan": {},
+    "pang": {},
+    "Pang": {},
+    "pao": {},
+    "Pao": {},
+    "pei": {},
+    "Pei": {},
+    "pen": {},
+    "Pen": {},
+    "peng": {},
+    "Peng": {},
+    "pian": {},
+    "Pian": {},
+    "piao": {},
+    "Piao": {},
+    "pie": {},
+    "Pie": {},
+    "pin": {},
+    "Pin": {},
+    "ping": {},
+    "Ping": {},
+    "po": {},
+    "Po": {},
+    "pou": {},
+    "Pou": {},
+    "pu": {},
+    "Pu": {},
+    "qi": {},
+    "Qi": {},
+    "qia": {},
+    "Qia": {},
+    "qian": {},
+    "Qian": {},
+    "qiang": {},
+    "Qiang": {},
+    "qiao": {},
+    "Qiao": {},
+    "qie": {},
+    "Qie": {},
+    "qin": {},
+    "Qin": {},
+    "qing": {},
+    "Qing": {},
+    "qiong": {},
+    "Qiong": {},
+    "qiu": {},
+    "Qiu": {},
+    "qu": {},
+    "Qu": {},
+    "quan": {},
+    "Quan": {},
+    "que": {},
+    "Que": {},
+    "qun": {},
+    "Qun": {},
+    "ran": {},
+    "Ran": {},
+    "rang": {
+      "detail": "⟫",
+      "documentation": "MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET, z notation right chevron bracket"
+    },
+    "Rang": {},
+    "rao": {},
+    "Rao": {},
+    "Re": {
+      "detail": "ℜ",
+      "documentation": "real part"
+    },
+    "re": {},
+    "ren": {},
+    "Ren": {},
+    "reng": {},
+    "Reng": {},
+    "ri": {},
+    "Ri": {},
+    "rong": {},
+    "Rong": {},
+    "rou": {},
+    "Rou": {},
+    "ru": {},
+    "Ru": {},
+    "rua": {},
+    "ruan": {},
+    "Ruan": {},
+    "rui": {},
+    "Rui": {},
+    "run": {},
+    "Run": {},
+    "ruo": {},
+    "Ruo": {},
+    "sa": {},
+    "Sa": {},
+    "sai": {},
+    "Sai": {},
+    "san": {},
+    "San": {},
+    "sang": {},
+    "Sang": {},
+    "sao": {},
+    "Sao": {},
+    "se": {},
+    "Se": {},
+    "sen": {},
+    "Sen": {},
+    "seng": {},
+    "Seng": {},
+    "sha": {},
+    "Sha": {},
+    "shai": {},
+    "Shai": {},
+    "shan": {},
+    "Shan": {},
+    "shang": {},
+    "Shang": {},
+    "shao": {},
+    "Shao": {},
+    "she": {},
+    "She": {},
+    "shei": {},
+    "Shei": {},
+    "shen": {},
+    "Shen": {},
+    "sheng": {},
+    "Sheng": {},
+    "shi": {},
+    "Shi": {},
+    "shou": {},
+    "Shou": {},
+    "shu": {},
+    "Shu": {},
+    "shua": {},
+    "Shua": {},
+    "shuai": {},
+    "Shuai": {},
+    "shuan": {},
+    "Shuan": {},
+    "shuang": {},
+    "Shuang": {},
+    "shui": {},
+    "Shui": {},
+    "shun": {},
+    "Shun": {},
+    "shuo": {},
+    "Shuo": {},
+    "si": {},
+    "Si": {},
+    "song": {},
+    "Song": {},
+    "sou": {},
+    "Sou": {},
+    "su": {},
+    "Su": {},
+    "suan": {},
+    "Suan": {},
+    "sui": {},
+    "Sui": {},
+    "sun": {
+      "detail": "☼",
+      "documentation": "WHITE SUN WITH RAYS"
+    },
+    "Sun": {
+      "detail": "☉",
+      "documentation": "SUN"
+    },
+    "suo": {},
+    "Suo": {},
+    "ta": {},
+    "Ta": {},
+    "tai": {},
+    "Tai": {},
+    "tan": {},
+    "Tan": {},
+    "tang": {},
+    "Tang": {},
+    "tao": {},
+    "Tao": {},
+    "te": {},
+    "Te": {},
+    "tei": {},
+    "Tei": {},
+    "teng": {},
+    "Teng": {},
+    "ti": {},
+    "Ti": {},
+    "tian": {},
+    "Tian": {},
+    "tiao": {},
+    "Tiao": {},
+    "tie": {},
+    "Tie": {},
+    "ting": {},
+    "Ting": {},
+    "tong": {},
+    "Tong": {},
+    "tou": {},
+    "Tou": {},
+    "tu": {},
+    "Tu": {},
+    "tuan": {},
+    "Tuan": {},
+    "tui": {},
+    "Tui": {},
+    "tun": {},
+    "Tun": {},
+    "tuo": {},
+    "Tuo": {},
+    "wa": {},
+    "Wa": {},
+    "wai": {},
+    "Wai": {},
+    "wan": {},
+    "Wan": {},
+    "wang": {},
+    "Wang": {},
+    "wei": {},
+    "Wei": {},
+    "wen": {},
+    "Wen": {},
+    "weng": {},
+    "Weng": {},
+    "wo": {},
+    "Wo": {},
+    "wu": {},
+    "Wu": {},
+    "xia": {},
+    "Xia": {},
+    "xian": {},
+    "Xian": {},
+    "xiang": {},
+    "Xiang": {},
+    "xiao": {},
+    "Xiao": {},
+    "xie": {},
+    "Xie": {},
+    "xin": {},
+    "Xin": {},
+    "xing": {},
+    "Xing": {},
+    "xiong": {},
+    "Xiong": {},
+    "xiu": {},
+    "Xiu": {},
+    "xu": {},
+    "Xu": {},
+    "xuan": {},
+    "Xuan": {},
+    "xue": {},
+    "Xue": {},
+    "xun": {},
+    "Xun": {},
+    "ya": {},
+    "Ya": {},
+    "yan": {},
+    "Yan": {},
+    "yang": {},
+    "Yang": {},
+    "yao": {},
+    "Yao": {},
+    "ye": {},
+    "Ye": {},
+    "yi": {},
+    "Yi": {},
+    "yin": {},
+    "Yin": {},
+    "ying": {},
+    "Ying": {},
+    "yo": {},
+    "Yo": {},
+    "yong": {},
+    "Yong": {},
+    "you": {},
+    "You": {},
+    "yu": {},
+    "Yu": {},
+    "yuan": {},
+    "Yuan": {},
+    "yue": {},
+    "Yue": {},
+    "yun": {},
+    "Yun": {},
+    "za": {},
+    "Za": {},
+    "zai": {},
+    "Zai": {},
+    "zan": {},
+    "Zan": {},
+    "zang": {},
+    "Zang": {},
+    "zao": {},
+    "Zao": {},
+    "ze": {},
+    "Ze": {},
+    "zei": {},
+    "Zei": {},
+    "zen": {},
+    "Zen": {},
+    "zeng": {},
+    "Zeng": {},
+    "zha": {},
+    "Zha": {},
+    "zhai": {},
+    "Zhai": {},
+    "zhan": {},
+    "Zhan": {},
+    "zhang": {},
+    "Zhang": {},
+    "zhao": {},
+    "Zhao": {},
+    "zhe": {},
+    "Zhe": {},
+    "zhei": {},
+    "Zhei": {},
+    "zhen": {},
+    "Zhen": {},
+    "zheng": {},
+    "Zheng": {},
+    "zhi": {},
+    "Zhi": {},
+    "zhong": {},
+    "Zhong": {},
+    "zhou": {},
+    "Zhou": {},
+    "zhu": {},
+    "Zhu": {},
+    "zhua": {},
+    "Zhua": {},
+    "zhuai": {},
+    "Zhuai": {},
+    "zhuan": {},
+    "Zhuan": {},
+    "zhuang": {},
+    "Zhuang": {},
+    "zhui": {},
+    "Zhui": {},
+    "zhun": {},
+    "Zhun": {},
+    "zhuo": {},
+    "Zhuo": {},
+    "zi": {},
+    "Zi": {},
+    "zong": {},
+    "Zong": {},
+    "zou": {},
+    "Zou": {},
+    "zu": {},
+    "Zu": {},
+    "zuan": {},
+    "Zuan": {},
+    "zui": {},
+    "Zui": {},
+    "zun": {},
+    "Zun": {},
+    "zuo": {},
+    "Zuo": {},
+    "PYa": {},
+    "PYchi": {},
+    "PYcong": {},
+    "PYding": {},
+    "PYge": {},
+    "PYhang": {},
+    "PYle": {},
+    "PYmin": {},
+    "PYmu": {},
+    "PYne": {},
+    "PYni": {},
+    "PYnu": {},
+    "PYo": {},
+    "PYO": {},
+    "PYpi": {},
+    "PYPi": {},
+    "PYRe": {},
+    "PYtan": {},
+    "PYxi": {},
+    "PYXi": {}
+  },
+  "envs": {},
+  "options": [
+    "useCMmacron"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/piton.json b/dev/packages/piton.json
index 153159e69..11d340b57 100644
--- a/dev/packages/piton.json
+++ b/dev/packages/piton.json
@@ -112,10 +112,10 @@
       "keyvalpos": 1
     },
     "SetPitonIdentifier{}{}": {
-      "snippet": "SetPitonIdentifier{${1:id1,id2,...}}{${2:code}}"
+      "snippet": "SetPitonIdentifier{${1:id1,${3:id2},...}}{${2:code}}"
     },
     "SetPitonIdentifier[]{}{}": {
-      "snippet": "SetPitonIdentifier[${3:language}]{${1:id1,id2,...}}{${2:code}}"
+      "snippet": "SetPitonIdentifier[${3:language}]{${1:id1,${4:id2},...}}{${2:code}}"
     },
     "PitonFileVersion": {},
     "PitonFileDate": {}
@@ -253,7 +253,8 @@
       "moredirectives={${1:list of compiler directives}}",
       "tag=${1:<char1><char2>}",
       "alsodigit={${1:character sequence}}",
-      "alsoletter={${1:character sequence}}"
+      "alsoletter={${1:character sequence}}",
+      "alsoother={${1:character sequence}}"
     ],
     [
       "line-numbers/start",
diff --git a/dev/packages/placeat.json b/dev/packages/placeat.json
index 15ea35e81..c7b88e724 100644
--- a/dev/packages/placeat.json
+++ b/dev/packages/placeat.json
@@ -5,6 +5,18 @@
     "atbegshi": []
   },
   "macros": {
+    "placeat(){}": {
+      "snippet": "placeat(${2:x},${3:y}){${1:content}}"
+    },
+    "placeat(){}[]": {
+      "snippet": "placeat(${3:x},${4:y}){${1:content}}[${2:name}]"
+    },
+    "placeat()[]{}": {
+      "snippet": "placeat(${3:x},${4:y})[${2:content-left}]{${1:content}}"
+    },
+    "placeat()[]{}[]": {
+      "snippet": "placeat(${4:x},${5:y})[${2:content-left}]{${1:content}}[${3:name}]"
+    },
     "placeat{}{}{}": {
       "snippet": "placeat{${1:x}}{${2:y}}{${3:content}}"
     },
@@ -17,6 +29,12 @@
     "placeat{}{}[]{}[]": {
       "snippet": "placeat{${1:x}}{${2:y}}[${3:content-left}]{${4:content}}[${5:name}]"
     },
+    "placerelto[](){}": {
+      "snippet": "placerelto[${2:name}](${3:x},${4:y}){${1:content}}"
+    },
+    "placerelto[](){}[]": {
+      "snippet": "placerelto[${2:name}](${4:x},${5:y}){${1:content}}[${3:name}]"
+    },
     "placerelto[]{}{}{}": {
       "snippet": "placerelto[${4:name}]{${1:x}}{${2:y}}{${3:content}}"
     },
@@ -34,6 +52,60 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "placelineat()()": {
+      "snippet": "placelineat(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "placelineat[]()()": {
+      "snippet": "placelineat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "placearrowat()()": {
+      "snippet": "placearrowat(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "placearrowat[]()()": {
+      "snippet": "placearrowat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "placecircleat(){}": {
+      "snippet": "placecircleat(${2:x},${3:y}){${1:r}}"
+    },
+    "placecircleat[](){}": {
+      "snippet": "placecircleat[${2:color}](${3:x},${4:y}){${1:r}}"
+    },
+    "placefilledcircleat(){}": {
+      "snippet": "placefilledcircleat(${2:x},${3:y}){${1:r}}"
+    },
+    "placefilledcircleat[](){}": {
+      "snippet": "placefilledcircleat[${2:color}](${3:x},${4:y}){${1:r}}"
+    },
+    "placesquareat(){}": {
+      "snippet": "placesquareat(${2:x},${3:y}){${1:r}}"
+    },
+    "placesquareat[](){}": {
+      "snippet": "placesquareat[${2:color}](${3:x},${4:y}){${1:r}}"
+    },
+    "placerectangleat()()": {
+      "snippet": "placerectangleat(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "placerectangleat[]()()": {
+      "snippet": "placerectangleat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "placefilledrectangleat()()": {
+      "snippet": "placefilledrectangleat(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "placefilledrectangleat[]()()": {
+      "snippet": "placefilledrectangleat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "placecurveat()()()()": {
+      "snippet": "placecurveat(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})(${7:x4},${8:y4})"
+    },
+    "placecurveat[]()()()()": {
+      "snippet": "placecurveat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4})"
+    },
+    "placeroundedat()()": {
+      "snippet": "placeroundedat(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "placeroundedat[]()()": {
+      "snippet": "placeroundedat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
     "placeatthreenumbers{}{}{}": {
       "snippet": "placeatthreenumbers{${1:arg1}}{${2:arg2}}{${3:arg3}}"
     },
diff --git a/dev/packages/plaintex.json b/dev/packages/plaintex.json
index 75c6d62ae..7d24d9387 100644
--- a/dev/packages/plaintex.json
+++ b/dev/packages/plaintex.json
@@ -1298,24 +1298,45 @@
       "detail": ">",
       "documentation": "GREATER-THAN SIGN r:"
     },
+    "big(": {
+      "snippet": "big(${2:${1}\\big})"
+    },
     "big[": {
       "snippet": "big[${1}\\big]"
     },
+    "Big(": {
+      "snippet": "Big(${2:${1}\\Big})"
+    },
     "Big[": {
       "snippet": "Big[${1}\\Big]"
     },
+    "bigl(": {
+      "snippet": "bigl(${2:${1}\\bigr})"
+    },
     "bigl[": {
       "snippet": "bigl[${1}\\bigr]"
     },
+    "Bigl(": {
+      "snippet": "Bigl(${2:${1}\\Bigr})"
+    },
     "Bigl[": {
       "snippet": "Bigl[${1}\\Bigr]"
     },
+    "biggl(": {
+      "snippet": "biggl(${2:${1}\\biggr})"
+    },
     "biggl[": {
       "snippet": "biggl[${1}\\biggr]"
     },
+    "Biggl(": {
+      "snippet": "Biggl(${2:${1}\\Biggr})"
+    },
     "Biggl[": {
       "snippet": "Biggl[${1}\\Biggr]"
     },
+    "left(": {
+      "snippet": "left(${2:${1}\\right})"
+    },
     "left[": {
       "snippet": "left[${1}\\right]"
     },
diff --git a/dev/packages/platex.json b/dev/packages/platex.json
new file mode 100644
index 000000000..308c72609
--- /dev/null
+++ b/dev/packages/platex.json
@@ -0,0 +1,150 @@
+{
+  "includes": {
+    "ptex": [],
+    "latex-document": [],
+    "latex-dev": []
+  },
+  "macros": {
+    "pfmtname": {},
+    "pfmtversion": {},
+    "plIncludeInRelease{}{}{}": {
+      "snippet": "plIncludeInRelease{${1:date}}{${2:command}}{${3:description}}"
+    },
+    "plEndIncludeInRelease": {},
+    "Cht": {},
+    "cht": {},
+    "Cdp": {},
+    "cdp": {},
+    "Cwd": {},
+    "cwd": {},
+    "Cvs": {},
+    "cvs": {},
+    "Chs": {},
+    "chs": {},
+    "cHT": {},
+    "afont": {},
+    "tstrutbox": {},
+    "zstrutbox": {},
+    "ystrutbox": {},
+    "tstrut": {},
+    "zstrut": {},
+    "ystrut": {},
+    "DeclareYokoKanjiEncoding{}{}{}": {
+      "snippet": "DeclareYokoKanjiEncoding{${1:encoding}}{${2:text-settings}}{${3:math-settings}}"
+    },
+    "DeclareTateKanjiEncoding{}{}{}": {
+      "snippet": "DeclareTateKanjiEncoding{${1:encoding}}{${2:text-settings}}{${3:math-settings}}"
+    },
+    "DeclareKanjiEncodingDefaults{}{}": {
+      "snippet": "DeclareKanjiEncodingDefaults{${1:text-settings}}{${2:math-settings}}"
+    },
+    "KanjiEncodingPair{}{}": {
+      "snippet": "KanjiEncodingPair{${1:encoding1}}{${2:encoding2}}"
+    },
+    "DeclareKanjiFamily{}{}{}": {
+      "snippet": "DeclareKanjiFamily{${1:encoding}}{${2:family}}{${3:loading-settings}}"
+    },
+    "DeclareKanjiSubstitution{}{}{}{}": {
+      "snippet": "DeclareKanjiSubstitution{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
+    },
+    "DeclareErrorKanjiFont{}{}{}{}{}": {
+      "snippet": "DeclareErrorKanjiFont{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}{${5:size}}"
+    },
+    "reDeclareMathAlphabet{}{}{}": {
+      "snippet": "reDeclareMathAlphabet{${1:math-alph}}{${2:latin-math-alph}}{${3:japanese-math-alph}}"
+    },
+    "DeclareRelationFont{}{}{}{}{}{}{}{}": {
+      "snippet": "DeclareRelationFont{${1:enc1}}{${2:fam1}}{${3:series1}}{${4:shape1}}{${5:enc2}}{${6:fam2}}{${7:series2}}{${8:shape2}}"
+    },
+    "SetRelationFont{}{}{}{}{}{}{}{}": {
+      "snippet": "SetRelationFont{${1:enc1}}{${2:fam1}}{${3:series1}}{${4:shape1}}{${5:enc2}}{${6:fam2}}{${7:series2}}{${8:shape2}}"
+    },
+    "userelfont": {},
+    "adjustbaseline": {},
+    "romanencoding{}": {
+      "snippet": "romanencoding{${1:encoding}}"
+    },
+    "kanjiencoding{}": {
+      "snippet": "kanjiencoding{${1:encoding}}"
+    },
+    "romanfamily{}": {
+      "snippet": "romanfamily{${1:family}}"
+    },
+    "kanjifamily{}": {
+      "snippet": "kanjifamily{${1:family}}"
+    },
+    "romanseries{}": {
+      "snippet": "romanseries{${1:series}}"
+    },
+    "kanjiseries{}": {
+      "snippet": "kanjiseries{${1:series}}"
+    },
+    "romanseriesforce{}": {
+      "snippet": "romanseriesforce{${1:series}}"
+    },
+    "kanjiseriesforce{}": {
+      "snippet": "kanjiseriesforce{${1:series}}"
+    },
+    "romanshape{}": {
+      "snippet": "romanshape{${1:shape}}"
+    },
+    "kanjishape{}": {
+      "snippet": "kanjishape{${1:shape}}"
+    },
+    "romanshapeforce{}": {
+      "snippet": "romanshapeforce{${1:shape}}"
+    },
+    "kanjishapeforce{}": {
+      "snippet": "kanjishapeforce{${1:shape}}"
+    },
+    "usekanji{}{}{}{}": {
+      "snippet": "usekanji{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
+    },
+    "useroman{}{}{}{}": {
+      "snippet": "useroman{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
+    },
+    "kanjiseriesdefault": {},
+    "mcfamily": {},
+    "gtfamily": {},
+    "mathmc{}": {
+      "snippet": "mathmc{${1:text}}"
+    },
+    "mathgt{}": {
+      "snippet": "mathgt{${1:text}}"
+    },
+    "textmc{}": {
+      "snippet": "textmc{${1:text}}"
+    },
+    "textgt{}": {
+      "snippet": "textgt{${1:text}}"
+    },
+    "fixcompositeaccent": {},
+    "nofixcompositeaccent": {},
+    "<": {
+      "detail": "<",
+      "documentation": "LESS-THAN SIGN r:"
+    },
+    "removejfmglue": {},
+    "iftombow": {},
+    "tombowfalse": {},
+    "tombowtrue": {},
+    "iftombowdate": {},
+    "tombowdatetrue": {},
+    "tombowdatefalse": {},
+    "maketombowbox": {},
+    "printglossary": {},
+    "hour": {},
+    "minute": {},
+    "DeclareKanjiEncoding{}{}{}": {
+      "snippet": "DeclareKanjiEncoding{${1:encoding}}{${2:text-settings}}{${3:math-settings}}"
+    },
+    "mcdefault": {},
+    "gtdefault": {},
+    "kanjiencodingdefault": {},
+    "kanjifamilydefault": {},
+    "kanjishapedefault": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/plext.json b/dev/packages/plext.json
index bd354ec98..d87a04550 100644
--- a/dev/packages/plext.json
+++ b/dev/packages/plext.json
@@ -16,6 +16,18 @@
     "layoutfloat[]{}": {
       "snippet": "layoutfloat[${2:pos}]{${1:content}}"
     },
+    "layoutfloat(){}": {
+      "snippet": "layoutfloat(${2:width},${3:height}){${1:content}}"
+    },
+    "layoutfloat()[]{}": {
+      "snippet": "layoutfloat(${3:width},${4:height})[${2:pos}]{${1:content}}"
+    },
+    "DeclareLayoutCaption{}<>()[]": {
+      "snippet": "DeclareLayoutCaption{${1:type}}<${3:dir}>(${4:width})[${2:⟨pos1⟩⟨pos2⟩}]"
+    },
+    "layoutcaption<>()[]": {
+      "snippet": "layoutcaption<${2:dir}>(${3:width})[${1:pos}]"
+    },
     "pcaption{}": {
       "snippet": "pcaption{${1:text}}"
     },
diff --git a/dev/packages/pm-isomath.json b/dev/packages/pm-isomath.json
index 87683ebff..bde543e16 100644
--- a/dev/packages/pm-isomath.json
+++ b/dev/packages/pm-isomath.json
@@ -15,6 +15,9 @@
     "MathLatin{}{}[]": {
       "snippet": "MathLatin{${1:letter}}{${2:family}}[${3:series}]"
     },
+    "MathLatin{}{}[]()": {
+      "snippet": "MathLatin{${1:letter}}{${2:family}}[${3:series}](${4:shape})"
+    },
     "MathGreek{}": {
       "snippet": "MathGreek{${1:letter}}"
     },
@@ -24,158 +27,275 @@
     "MathGreek{}{}[]": {
       "snippet": "MathGreek{${1:letter}}{${2:family}}[${3:series}]"
     },
+    "MathGreek{}{}[]()": {
+      "snippet": "MathGreek{${1:letter}}{${2:family}}[${3:series}](${4:shape})"
+    },
     "ISOalpha": {},
     "ISOalpha{}": {
       "snippet": "ISOalpha{${1:family}}"
     },
+    "ISOalpha{}[]()": {
+      "snippet": "ISOalpha{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISObeta": {},
     "ISObeta{}": {
       "snippet": "ISObeta{${1:family}}"
     },
+    "ISObeta{}[]()": {
+      "snippet": "ISObeta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOgamma": {},
     "ISOgamma{}": {
       "snippet": "ISOgamma{${1:family}}"
     },
+    "ISOgamma{}[]()": {
+      "snippet": "ISOgamma{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOdelta": {},
     "ISOdelta{}": {
       "snippet": "ISOdelta{${1:family}}"
     },
+    "ISOdelta{}[]()": {
+      "snippet": "ISOdelta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOepsilon": {},
     "ISOepsilon{}": {
       "snippet": "ISOepsilon{${1:family}}"
     },
+    "ISOepsilon{}[]()": {
+      "snippet": "ISOepsilon{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOzeta": {},
     "ISOzeta{}": {
       "snippet": "ISOzeta{${1:family}}"
     },
+    "ISOzeta{}[]()": {
+      "snippet": "ISOzeta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOeta": {},
     "ISOeta{}": {
       "snippet": "ISOeta{${1:family}}"
     },
+    "ISOeta{}[]()": {
+      "snippet": "ISOeta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOtheta": {},
     "ISOtheta{}": {
       "snippet": "ISOtheta{${1:family}}"
     },
+    "ISOtheta{}[]()": {
+      "snippet": "ISOtheta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOiota": {},
     "ISOiota{}": {
       "snippet": "ISOiota{${1:family}}"
     },
+    "ISOiota{}[]()": {
+      "snippet": "ISOiota{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOkappa": {},
     "ISOkappa{}": {
       "snippet": "ISOkappa{${1:family}}"
     },
+    "ISOkappa{}[]()": {
+      "snippet": "ISOkappa{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOlambda": {},
     "ISOlambda{}": {
       "snippet": "ISOlambda{${1:family}}"
     },
+    "ISOlambda{}[]()": {
+      "snippet": "ISOlambda{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOmu": {},
     "ISOmu{}": {
       "snippet": "ISOmu{${1:family}}"
     },
+    "ISOmu{}[]()": {
+      "snippet": "ISOmu{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOnu": {},
     "ISOnu{}": {
       "snippet": "ISOnu{${1:family}}"
     },
+    "ISOnu{}[]()": {
+      "snippet": "ISOnu{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOxi": {},
     "ISOxi{}": {
       "snippet": "ISOxi{${1:family}}"
     },
+    "ISOxi{}[]()": {
+      "snippet": "ISOxi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOomicron": {},
     "ISOomicron{}": {
       "snippet": "ISOomicron{${1:family}}"
     },
+    "ISOomicron{}[]()": {
+      "snippet": "ISOomicron{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOpi": {},
     "ISOpi{}": {
       "snippet": "ISOpi{${1:family}}"
     },
+    "ISOpi{}[]()": {
+      "snippet": "ISOpi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOrho": {},
     "ISOrho{}": {
       "snippet": "ISOrho{${1:family}}"
     },
+    "ISOrho{}[]()": {
+      "snippet": "ISOrho{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOsigma": {},
     "ISOsigma{}": {
       "snippet": "ISOsigma{${1:family}}"
     },
+    "ISOsigma{}[]()": {
+      "snippet": "ISOsigma{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOtau": {},
     "ISOtau{}": {
       "snippet": "ISOtau{${1:family}}"
     },
+    "ISOtau{}[]()": {
+      "snippet": "ISOtau{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOupsilon": {},
     "ISOupsilon{}": {
       "snippet": "ISOupsilon{${1:family}}"
     },
+    "ISOupsilon{}[]()": {
+      "snippet": "ISOupsilon{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOphi": {},
     "ISOphi{}": {
       "snippet": "ISOphi{${1:family}}"
     },
+    "ISOphi{}[]()": {
+      "snippet": "ISOphi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOchi": {},
     "ISOchi{}": {
       "snippet": "ISOchi{${1:family}}"
     },
+    "ISOchi{}[]()": {
+      "snippet": "ISOchi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOpsi": {},
     "ISOpsi{}": {
       "snippet": "ISOpsi{${1:family}}"
     },
+    "ISOpsi{}[]()": {
+      "snippet": "ISOpsi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOomega": {},
     "ISOomega{}": {
       "snippet": "ISOomega{${1:family}}"
     },
+    "ISOomega{}[]()": {
+      "snippet": "ISOomega{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOGamma": {},
     "ISOGamma{}": {
       "snippet": "ISOGamma{${1:family}}"
     },
+    "ISOGamma{}[]()": {
+      "snippet": "ISOGamma{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISODelta": {},
     "ISODelta{}": {
       "snippet": "ISODelta{${1:family}}"
     },
+    "ISODelta{}[]()": {
+      "snippet": "ISODelta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOEta": {},
     "ISOEta{}": {
       "snippet": "ISOEta{${1:family}}"
     },
+    "ISOEta{}[]()": {
+      "snippet": "ISOEta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOTheta": {},
     "ISOTheta{}": {
       "snippet": "ISOTheta{${1:family}}"
     },
+    "ISOTheta{}[]()": {
+      "snippet": "ISOTheta{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOLambda": {},
     "ISOLambda{}": {
       "snippet": "ISOLambda{${1:family}}"
     },
+    "ISOLambda{}[]()": {
+      "snippet": "ISOLambda{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOXi": {},
     "ISOXi{}": {
       "snippet": "ISOXi{${1:family}}"
     },
+    "ISOXi{}[]()": {
+      "snippet": "ISOXi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOPi": {},
     "ISOPi{}": {
       "snippet": "ISOPi{${1:family}}"
     },
+    "ISOPi{}[]()": {
+      "snippet": "ISOPi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISORho": {},
     "ISORho{}": {
       "snippet": "ISORho{${1:family}}"
     },
+    "ISORho{}[]()": {
+      "snippet": "ISORho{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOSigma": {},
     "ISOSigma{}": {
       "snippet": "ISOSigma{${1:family}}"
     },
+    "ISOSigma{}[]()": {
+      "snippet": "ISOSigma{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOUpsilon": {},
     "ISOUpsilon{}": {
       "snippet": "ISOUpsilon{${1:family}}"
     },
+    "ISOUpsilon{}[]()": {
+      "snippet": "ISOUpsilon{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOPhi": {},
     "ISOPhi{}": {
       "snippet": "ISOPhi{${1:family}}"
     },
+    "ISOPhi{}[]()": {
+      "snippet": "ISOPhi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOChi": {},
     "ISOChi{}": {
       "snippet": "ISOChi{${1:family}}"
     },
+    "ISOChi{}[]()": {
+      "snippet": "ISOChi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOPsi": {},
     "ISOPsi{}": {
       "snippet": "ISOPsi{${1:family}}"
     },
+    "ISOPsi{}[]()": {
+      "snippet": "ISOPsi{${1:family}}[${2:series}](${3:shape})"
+    },
     "ISOOmega": {},
     "ISOOmega{}": {
       "snippet": "ISOOmega{${1:family}}"
     },
+    "ISOOmega{}[]()": {
+      "snippet": "ISOOmega{${1:family}}[${2:series}](${3:shape})"
+    },
     "vectorsymbol{}": {
       "snippet": "vectorsymbol{${1:arg}}"
     },
diff --git a/dev/packages/pmdraw.json b/dev/packages/pmdraw.json
index dd6798c6b..c5b2c0045 100644
--- a/dev/packages/pmdraw.json
+++ b/dev/packages/pmdraw.json
@@ -42,6 +42,24 @@
       "blank bottom=${1:integer}",
       "row sep=${1:integer}",
       "vertices={${1:\\draw options}}",
+      "no vertex bottom 1=${1:integer}",
+      "no vertex bottom 2=${1:integer}",
+      "no vertex bottom 3=${1:integer}",
+      "no vertex bottom 4=${1:integer}",
+      "no vertex bottom 5=${1:integer}",
+      "no vertex bottom 6=${1:integer}",
+      "no vertex bottom 7=${1:integer}",
+      "no vertex bottom 8=${1:integer}",
+      "no vertex bottom 9=${1:integer}",
+      "no vertex top 1=${1:integer}",
+      "no vertex top 2=${1:integer}",
+      "no vertex top 3=${1:integer}",
+      "no vertex top 4=${1:integer}",
+      "no vertex top 5=${1:integer}",
+      "no vertex top 6=${1:integer}",
+      "no vertex top 7=${1:integer}",
+      "no vertex top 8=${1:integer}",
+      "no vertex top 9=${1:integer}",
       "vertices options={${1:code}}",
       "labels",
       "labels top",
@@ -49,6 +67,24 @@
       "labels start=${1:integer}",
       "labels top start=${1:integer}",
       "labels bottom start=${1:integer}",
+      "no label bottom 1=${1:integer}",
+      "no label bottom 2=${1:integer}",
+      "no label bottom 3=${1:integer}",
+      "no label bottom 4=${1:integer}",
+      "no label bottom 5=${1:integer}",
+      "no label bottom 6=${1:integer}",
+      "no label bottom 7=${1:integer}",
+      "no label bottom 8=${1:integer}",
+      "no label bottom 9=${1:integer}",
+      "no label top 1=${1:integer}",
+      "no label top 2=${1:integer}",
+      "no label top 3=${1:integer}",
+      "no label top 4=${1:integer}",
+      "no label top 5=${1:integer}",
+      "no label top 6=${1:integer}",
+      "no label top 7=${1:integer}",
+      "no label top 8=${1:integer}",
+      "no label top 9=${1:integer}",
       "labels top draw={${1:\\draw options}}",
       "labels top node={${1:\\node options}}",
       "labels bottom draw={${1:\\draw options}}",
@@ -58,6 +94,10 @@
       "no dots",
       "dots draw={${1:\\draw options}}",
       "dots node={${1:\\node options}}",
+      "vertices top phantom",
+      "vertices bottom phantom",
+      "vertices top uncover={${1:overlay spec}}",
+      "vertices bottom uncover={${1:overlay spec}}",
       "levels=${1:integer}",
       "levels top=${1:integer}",
       "levels bottom=${1:integer}",
@@ -71,6 +111,8 @@
       "edges transversal={${1:\\draw options}}",
       "edges first",
       "transversals first",
+      "edges phantom",
+      "edges uncover={${1:overlay spec}}",
       "brace={${1:options}}",
       "brace draw={${1:\\draw options}}",
       "brace node={${1:\\node options}}",
@@ -94,7 +136,9 @@
       "decorate after={${1:code}}",
       "diagram sep=${1:number}",
       "vertex sep=${1:number}",
-      "edges added={${1:\\draw options}}"
+      "edges added={${1:\\draw options}}",
+      "edges added phantom",
+      "edges added uncover={${1:overlay spec}}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pmhanguljamo-frkim.json b/dev/packages/pmhanguljamo-frkim.json
index 4539f7d1c..9381b1843 100644
--- a/dev/packages/pmhanguljamo-frkim.json
+++ b/dev/packages/pmhanguljamo-frkim.json
@@ -38,6 +38,12 @@
     "jamoul{}{}": {
       "snippet": "jamoul{${1:ulem csname}}{${2:jamo text}}"
     },
+    "RenewVowels{}": {
+      "snippet": "RenewVowels{${1:vowels}}"
+    },
+    "RenewLeadingZero{}": {
+      "snippet": "RenewLeadingZero{${1:arg}}"
+    },
     "frccg": {},
     "frccG": {},
     "frccn": {},
diff --git a/dev/packages/pmhanguljamo.json b/dev/packages/pmhanguljamo.json
index c8858ef82..9aeb46d57 100644
--- a/dev/packages/pmhanguljamo.json
+++ b/dev/packages/pmhanguljamo.json
@@ -73,7 +73,15 @@
     },
     "AddRule{}{}": {
       "snippet": "AddRule{${1:cho|jung|jong}}{${2:keyvals}}",
-      "option": "method=frkim"
+      "option": "frkim"
+    },
+    "RenewVowels{}": {
+      "snippet": "RenewVowels{${1:vowels}}",
+      "option": "frkim"
+    },
+    "RenewLeadingZero{}": {
+      "snippet": "RenewLeadingZero{${1:arg}}",
+      "option": "frkim"
     },
     "frccg": {
       "option": "frcccmds"
diff --git a/dev/packages/polyglossia.json b/dev/packages/polyglossia.json
index b51ef5473..d24c1fcda 100644
--- a/dev/packages/polyglossia.json
+++ b/dev/packages/polyglossia.json
@@ -1,7 +1,6 @@
 {
   "includes": {
     "etoolbox": [],
-    "xkeyval": [],
     "fontspec": [],
     "iftex": [],
     "bidi": [],
@@ -37,7 +36,7 @@
       "snippet": "setotherlanguage[${2:options}]{${1:language}}"
     },
     "setotherlanguages{}": {
-      "snippet": "setotherlanguages{${1:lang1,lang2,...}}"
+      "snippet": "setotherlanguages{${1:lang1,${2:lang2},...}}"
     },
     "inheritbabelshorthands{}{}": {
       "snippet": "inheritbabelshorthands{${1:source language}}{${2:target language}}"
@@ -1083,6 +1082,64 @@
     "ifxpginauxfile": {},
     "xpginauxfilefalse": {},
     "xpginauxfiletrue": {},
+    "XPGNoPatternsFallback{}": {
+      "snippet": "XPGNoPatternsFallback{${1:arg}}"
+    },
+    "XPGNoPatternsFallback[]{}": {
+      "snippet": "XPGNoPatternsFallback[${2:opt}]{${1:arg}}"
+    },
+    "PolyglossiaSetup{}{}": {
+      "snippet": "PolyglossiaSetup{${1:arg1}}{${2:arg2}}"
+    },
+    "CheckHyphenationPatterns{}": {
+      "snippet": "CheckHyphenationPatterns{${1:arg}}"
+    },
+    "SetupPolyglossiaLangPatterns{}": {
+      "snippet": "SetupPolyglossiaLangPatterns{${1:arg}}"
+    },
+    "SetupLatinPolyglossiaFont{}": {
+      "snippet": "SetupLatinPolyglossiaFont{${1:arg}}"
+    },
+    "SetupNonLatinPolyglossiaFont{}": {
+      "snippet": "SetupNonLatinPolyglossiaFont{${1:arg}}"
+    },
+    "InheritGlossFile{}": {
+      "snippet": "InheritGlossFile{${1:arg}}"
+    },
+    "SetGlossOptions{}{}": {
+      "snippet": "SetGlossOptions{${1:arg1}}{${2:arg2}}"
+    },
+    "InitializeGlossOptions{}{}": {
+      "snippet": "InitializeGlossOptions{${1:arg1}}{${2:arg2}}"
+    },
+    "SetLanguageAliasValues{}{}{}": {
+      "snippet": "SetLanguageAliasValues{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "IfMainLanguageTF{}{}{}": {
+      "snippet": "IfMainLanguageTF{${1:arg}}{${2:true}}{${3:false}}"
+    },
+    "IfMainLanguageT{}{}": {
+      "snippet": "IfMainLanguageT{${1:arg}}{${2:true}}"
+    },
+    "IfMainLanguageF{}{}": {
+      "snippet": "IfMainLanguageF{${1:arg}}{${2:false}}"
+    },
+    "IfLanguageDefinedTF{}{}{}": {
+      "snippet": "IfLanguageDefinedTF{${1:arg}}{${2:true}}{${3:false}}"
+    },
+    "IfLanguageDefinedT{}{}": {
+      "snippet": "IfLanguageDefinedT{${1:arg}}{${2:true}}"
+    },
+    "IfLanguageDefinedF{}{}": {
+      "snippet": "IfLanguageDefinedF{${1:arg}}{${2:false}}"
+    },
+    "TryPatternWithFallback{}{}": {
+      "snippet": "TryPatternWithFallback{${1:arg1}}{${2:arg2}}"
+    },
+    "setlocalhyphenmins{}{}{}": {
+      "snippet": "setlocalhyphenmins{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "InitializeBabelShorthands": {},
     "prefacename": {},
     "bibname": {},
     "chaptername": {},
diff --git a/dev/packages/polyhedra.json b/dev/packages/polyhedra.json
index b6b4327d3..6afdb01c0 100644
--- a/dev/packages/polyhedra.json
+++ b/dev/packages/polyhedra.json
@@ -10,7 +10,7 @@
   },
   "macros": {
     "point{}{}": {
-      "snippet": "point{${1:(${3:x,y,z})}}{${2:name}}"
+      "snippet": "point{${1:(${3:x},${4:y},${5:z})}}{${2:name}}"
     },
     "axes{}": {
       "snippet": "axes{${1:keyvals}}",
diff --git a/dev/packages/polynomial.json b/dev/packages/polynomial.json
index 4fe24e280..8ecc57ae2 100644
--- a/dev/packages/polynomial.json
+++ b/dev/packages/polynomial.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "polynomial{}": {
-      "snippet": "polynomial{${1:coeff1,coeff2,...}}"
+      "snippet": "polynomial{${1:coeff1,${2:coeff2},...}}"
     },
     "polynomial[]{}": {
-      "snippet": "polynomial[${2:options}]{${1:coeff1,coeff2,...}}",
+      "snippet": "polynomial[${2:options}]{${1:coeff1,${3:coeff2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/popupmenu.json b/dev/packages/popupmenu.json
index 77e136195..b80b259f5 100644
--- a/dev/packages/popupmenu.json
+++ b/dev/packages/popupmenu.json
@@ -12,6 +12,12 @@
     "puUseMenus{}": {
       "snippet": "puUseMenus{${1:menu array names}}"
     },
+    "popUpMenu()": {
+      "snippet": "popUpMenu(${1:name})"
+    },
+    "puProcessMenu()": {
+      "snippet": "puProcessMenu(${1:name})"
+    },
     "urlPath{}{}": {
       "snippet": "urlPath{${1:cmd}}{${2:path}}"
     },
diff --git a/dev/packages/poster.json b/dev/packages/poster.json
new file mode 100644
index 000000000..9ba0a2601
--- /dev/null
+++ b/dev/packages/poster.json
@@ -0,0 +1,57 @@
+{
+  "includes": {},
+  "macros": {
+    "poster{}": {
+      "snippet": "poster{${1:stuff}}"
+    },
+    "poster[]{}": {
+      "snippet": "poster[${2:options}]{${1:stuff}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "PosterPage": {},
+    "PosterPage[]": {
+      "snippet": "PosterPage[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "POSTERclip": {},
+    "POSTERcrop": {},
+    "POSTERhcenter": {},
+    "POSTERimageheight": {},
+    "POSTERimagewidth": {},
+    "POSTERlandscape": {},
+    "POSTERpaperheight": {},
+    "POSTERpaperwidth": {},
+    "POSTERvcenter": {},
+    "filedate": {},
+    "fileversion": {},
+    "Poster": {},
+    "endPoster": {},
+    "PosterLoaded": {},
+    "TheAtCode": {}
+  },
+  "envs": {
+    "Poster": {},
+    "Poster[]": {
+      "name": "Poster",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "paperwidth=",
+      "paperheight=",
+      "imagewidth=",
+      "imageheight=",
+      "landscape",
+      "hcenter",
+      "vcenter",
+      "crop=",
+      "clip="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/printlen.json b/dev/packages/printlen.json
new file mode 100644
index 000000000..250ef81a0
--- /dev/null
+++ b/dev/packages/printlen.json
@@ -0,0 +1,18 @@
+{
+  "includes": {},
+  "macros": {
+    "printlength{}": {
+      "snippet": "printlength{${1:length}}"
+    },
+    "uselengthunit{}": {
+      "snippet": "uselengthunit{${1:unit}}"
+    },
+    "unitspace": {},
+    "rndprintlength{}": {
+      "snippet": "rndprintlength{${1:length}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/probsoln.json b/dev/packages/probsoln.json
index b42d4d40e..0eed2e27e 100644
--- a/dev/packages/probsoln.json
+++ b/dev/packages/probsoln.json
@@ -61,16 +61,16 @@
       "snippet": "loadallproblems{${1:file}}"
     },
     "loadexceptproblems[]{}{}": {
-      "snippet": "loadexceptproblems[${3:data set}]{${1:label1,label2,...}}{${2:file}}"
+      "snippet": "loadexceptproblems[${3:data set}]{${1:label1,${4:label2},...}}{${2:file}}"
     },
     "loadexceptproblems{}{}": {
-      "snippet": "loadexceptproblems{${1:label1,label2,...}}{${2:file}}"
+      "snippet": "loadexceptproblems{${1:label1,${3:label2},...}}{${2:file}}"
     },
     "loadrandomexcept[]{}{}{}": {
-      "snippet": "loadrandomexcept[${4:data set}]{${1:n}}{${2:file}}{${3:label1,label2,...}}"
+      "snippet": "loadrandomexcept[${4:data set}]{${1:n}}{${2:file}}{${3:label1,${5:label2},...}}"
     },
     "loadrandomexcept{}{}{}": {
-      "snippet": "loadrandomexcept{${1:n}}{${2:file}}{${3:label1,label2,...}}"
+      "snippet": "loadrandomexcept{${1:n}}{${2:file}}{${3:label1,${4:label2},...}}"
     },
     "loadrandomproblems[]{}{}": {
       "snippet": "loadrandomproblems[${3:data set}]{${1:n}}{${2:file}}"
@@ -79,10 +79,10 @@
       "snippet": "loadrandomproblems{${1:n}}{${2:file}}"
     },
     "loadselectedproblems[]{}{}": {
-      "snippet": "loadselectedproblems[${3:data set}]{${1:label1,label2,...}}{${2:file}}"
+      "snippet": "loadselectedproblems[${3:data set}]{${1:label1,${4:label2},...}}{${2:file}}"
     },
     "loadselectedproblems{}{}": {
-      "snippet": "loadselectedproblems{${1:label1,label2,...}}{${2:file}}"
+      "snippet": "loadselectedproblems{${1:label1,${3:label2},...}}{${2:file}}"
     },
     "moveproblem{}{}{}": {
       "snippet": "moveproblem{${1:label}}{${2:source}}{${3:target}}"
diff --git a/dev/packages/projlib-language.json b/dev/packages/projlib-language.json
index ecf0c9852..12fb2a2cb 100644
--- a/dev/packages/projlib-language.json
+++ b/dev/packages/projlib-language.json
@@ -133,6 +133,7 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
+    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/proof.json b/dev/packages/proof.json
new file mode 100644
index 000000000..48afa3e46
--- /dev/null
+++ b/dev/packages/proof.json
@@ -0,0 +1,26 @@
+{
+  "includes": {},
+  "macros": {
+    "deduce{}{}": {
+      "snippet": "deduce{${1:conclusions}}{${2:premises}}"
+    },
+    "deduce[]{}{}": {
+      "snippet": "deduce[${3:label}]{${1:conclusions}}{${2:premises}}"
+    },
+    "infer{}{}": {
+      "snippet": "infer{${1:conclusions}}{${2:premises}}"
+    },
+    "infer[]{}{}": {
+      "snippet": "infer[${3:label}]{${1:conclusions}}{${2:premises}}"
+    },
+    "infer*{}{}": {
+      "snippet": "infer*{${1:conclusions}}{${2:premises}}"
+    },
+    "infer*[]{}{}": {
+      "snippet": "infer*[${3:label}]{${1:conclusions}}{${2:premises}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/pseudo.json b/dev/packages/pseudo.json
index 6cdcbd737..bb5921dac 100644
--- a/dev/packages/pseudo.json
+++ b/dev/packages/pseudo.json
@@ -31,7 +31,13 @@
     "fn{}": {
       "snippet": "fn{${1:name}}"
     },
+    "fn{}()": {
+      "snippet": "fn{${1:name}}(${2:arguments})"
+    },
     "fnfont": {},
+    "hd{}()": {
+      "snippet": "hd{${1:name}}(${2:arguments})"
+    },
     "id{}": {
       "snippet": "id{${1:name}}"
     },
@@ -43,6 +49,9 @@
     "pr{}": {
       "snippet": "pr{${1:name}}"
     },
+    "pr{}()": {
+      "snippet": "pr{${1:name}}(${2:arguments})"
+    },
     "prfont": {},
     "pseudocn{}": {
       "snippet": "pseudocn{${1:name}}"
@@ -53,6 +62,12 @@
     "pseudofn{}": {
       "snippet": "pseudofn{${1:name}}"
     },
+    "pseudofn{}()": {
+      "snippet": "pseudofn{${1:name}}(${2:arguments})"
+    },
+    "pseudohd{}()": {
+      "snippet": "pseudohd{${1:name}}(${2:arguments})"
+    },
     "pseudoid{}": {
       "snippet": "pseudoid{${1:name}}"
     },
@@ -62,6 +77,9 @@
     "pseudopr{}": {
       "snippet": "pseudopr{${1:name}}"
     },
+    "pseudopr{}()": {
+      "snippet": "pseudopr{${1:name}}(${2:arguments})"
+    },
     "pseudost{}": {
       "snippet": "pseudost{${1:string}}"
     },
diff --git a/dev/packages/pseudocode.json b/dev/packages/pseudocode.json
new file mode 100644
index 000000000..1d2cadd78
--- /dev/null
+++ b/dev/packages/pseudocode.json
@@ -0,0 +1,85 @@
+{
+  "includes": {
+    "fancybox": [],
+    "ifthen": []
+  },
+  "macros": {
+    "ADO": {},
+    "AND": {},
+    "BEGIN": {},
+    "BREAK": {},
+    "CALL{}{}": {
+      "snippet": "CALL{${1:procedure}}{${2:parameters}}"
+    },
+    "CASE": {},
+    "CELSE": {},
+    "COMMENT{}": {
+      "snippet": "COMMENT{${1:text}}"
+    },
+    "CTHEN": {},
+    "DO": {},
+    "DOWNTO": {},
+    "ELSE": {},
+    "ELSEIF": {},
+    "END": {},
+    "ENDCASE": {},
+    "ENDMAIN": {},
+    "ENDPROCEDURE": {},
+    "EXIT": {},
+    "EXTERNAL{}": {
+      "snippet": "EXTERNAL{${1:procedures}}"
+    },
+    "FAIL": {},
+    "FALSE": {},
+    "FOR": {},
+    "FORALL": {},
+    "FOREACH": {},
+    "GETS": {},
+    "GLOBAL{}": {
+      "snippet": "GLOBAL{${1:variables}}"
+    },
+    "GOTO": {},
+    "IF": {},
+    "LET": {},
+    "LOCAL{}": {
+      "snippet": "LOCAL{${1:variables}}"
+    },
+    "MAIN": {},
+    "NOT": {},
+    "OF": {},
+    "OR": {},
+    "OUTPUT{}": {
+      "snippet": "OUTPUT{${1:values}}"
+    },
+    "PROCEDURE{}{}": {
+      "snippet": "PROCEDURE{${1:name}}{${2:parameters}}"
+    },
+    "REPEAT": {},
+    "RETURN{}": {
+      "snippet": "RETURN{${1:values}}"
+    },
+    "STMTNUM{}{}": {
+      "snippet": "STMTNUM{${1:space}}{${2:label}}"
+    },
+    "SUCCESS": {},
+    "THEN": {},
+    "thepseudocode": {},
+    "thepseudonum": {},
+    "TO": {},
+    "TRUE": {},
+    "UNTIL": {},
+    "WHILE": {}
+  },
+  "envs": {
+    "pseudocode{}{}": {
+      "name": "pseudocode",
+      "snippet": "{${1:name}}{${2:parameters}}"
+    },
+    "pseudocode[]{}{}": {
+      "name": "pseudocode",
+      "snippet": "[${3:frame type}]{${1:name}}{${2:parameters}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/psfragx.json b/dev/packages/psfragx.json
index b18919a49..63223b9ab 100644
--- a/dev/packages/psfragx.json
+++ b/dev/packages/psfragx.json
@@ -13,6 +13,21 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "includegraphicx[](){}": {
+      "snippet": "includegraphicx[${2:options}](${3:psfrags}){${1:imagefile}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "includegraphicx[]()<>{}": {
+      "snippet": "includegraphicx[${2:options}](${4:psfrags})<${3:fg overpic}>{${1:imagefile}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "includegraphicx[]()<>[]{}": {
+      "snippet": "includegraphicx[${2:options}](${5:psfrags})<${4:fg overpic}>[${3:bg overpic}]{${1:imagefile}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "iflanguage{}{}{}": {
       "snippet": "iflanguage{${1:language}}{${2:true}}{${3:false}}"
     },
diff --git a/dev/packages/psgo.json b/dev/packages/psgo.json
index 212475e02..d23ef4c79 100644
--- a/dev/packages/psgo.json
+++ b/dev/packages/psgo.json
@@ -140,19 +140,19 @@
     },
     "psgopartialboard{}": {
       "name": "psgopartialboard",
-      "snippet": "{${1:(${2:x1,y1})(${3:x2,y2})}}"
+      "snippet": "{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})}}"
     },
     "psgopartialboard[]{}": {
       "name": "psgopartialboard",
-      "snippet": "[${2:size}]{${1:(${3:x1,y1})(${4:x2,y2})}}"
+      "snippet": "[${2:size}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})}}"
     },
     "psgopartialboard*{}": {
       "name": "psgopartialboard*",
-      "snippet": "{${1:(${2:x1,y1})(${3:x2,y2})}}"
+      "snippet": "{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})}}"
     },
     "psgopartialboard*[]{}": {
       "name": "psgopartialboard*",
-      "snippet": "[${2:size}]{${1:(${3:x1,y1})(${4:x2,y2})}}"
+      "snippet": "[${2:size}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})}}"
     },
     "gomoves": {}
   },
diff --git a/dev/packages/pst-2dplot.json b/dev/packages/pst-2dplot.json
index 848d91f0c..9485e2f29 100644
--- a/dev/packages/pst-2dplot.json
+++ b/dev/packages/pst-2dplot.json
@@ -21,7 +21,18 @@
       "snippet": "pstfileplot[${2:pstricks options}]{${1:file}}"
     }
   },
-  "envs": {},
+  "envs": {
+    "pstgraph(x0,y0)": {
+      "name": "pstgraph",
+      "snippet": "(${1:x0},${2:y0})"
+    },
+    "pstgraph[](x0,y0)": {
+      "name": "pstgraph",
+      "snippet": "[${1:options}](${2:x0},${3:y0})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
   "options": [],
   "keyvals": [
     [
diff --git a/dev/packages/pst-3d.json b/dev/packages/pst-3d.json
index 3e4399531..7d72b7c56 100644
--- a/dev/packages/pst-3d.json
+++ b/dev/packages/pst-3d.json
@@ -31,7 +31,13 @@
     "psTilt{}{}": {
       "snippet": "psTilt{${1:angle}}{${2:stuff}}"
     },
-    "PSTthreeDLoaded": {}
+    "PSTthreeDLoaded": {},
+    "ThreeDput(){}": {
+      "snippet": "ThreeDput(${2:x},${3:y},${4:z}){${1:stuff}}"
+    },
+    "ThreeDput[](){}": {
+      "snippet": "ThreeDput[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
+    }
   },
   "envs": {},
   "options": [],
diff --git a/dev/packages/pst-3dplot.json b/dev/packages/pst-3dplot.json
index cab2c9838..fba04e84d 100644
--- a/dev/packages/pst-3dplot.json
+++ b/dev/packages/pst-3dplot.json
@@ -17,12 +17,119 @@
     "psxyzlabel{}": {
       "snippet": "psxyzlabel{${1:text}}"
     },
+    "pstThreeDPlaneGrid()()": {
+      "snippet": "pstThreeDPlaneGrid(${1:xmin},${2:ymin})(${3:xmax},${4:ymax})"
+    },
+    "pstThreeDPlaneGrid[]()()": {
+      "snippet": "pstThreeDPlaneGrid[${1:options}](${2:xmin},${3:ymin})(${4:xmax},${5:ymax})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "pstThreeDPut(){}": {
+      "snippet": "pstThreeDPut(${2:x},${3:y},${4:z}){${1:stuff}}"
+    },
+    "pstThreeDPut[](){}": {
+      "snippet": "pstThreeDPut[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
+    },
+    "pstPlanePut(){}": {
+      "snippet": "pstPlanePut(${2:x},${3:y},${4:z}){${1:stuff}}"
+    },
+    "pstPlanePut[](){}": {
+      "snippet": "pstPlanePut[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
+    },
+    "pstThreeDNode(){}": {
+      "snippet": "pstThreeDNode(${2:x},${3:y},${4:z}){${1:node name}}"
+    },
+    "pstThreeDDot()": {
+      "snippet": "pstThreeDDot(${1:x},${2:y},${3:z})"
+    },
+    "pstThreeDDot[]()": {
+      "snippet": "pstThreeDDot[${1:options}](${2:x},${3:y},${4:z})"
+    },
+    "pstThreeDTriangle()()()": {
+      "snippet": "pstThreeDTriangle(${1:x1},${2:y1},${3:z1})(${4:x2},${5:y2},${6:z2})(${7:x3},${8:y3},${9:z3})"
+    },
+    "pstThreeDTriangle[]()()()": {
+      "snippet": "pstThreeDTriangle[${1:options}](${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2})(${8:x3},${9:y3},${10:z3})"
+    },
+    "pstThreeDSquare()()()": {
+      "snippet": "pstThreeDSquare(${1:x0},${2:y0},${3:z0})(${4:x1},${5:y1},${6:z1})(${7:x2},${8:y2},${9:z2})"
+    },
+    "pstThreeDSquare[]()()()": {
+      "snippet": "pstThreeDSquare[${1:options}](${2:x0},${3:y0},${4:z0})(${5:x1},${6:y1},${7:z1})(${8:x2},${9:y2},${10:z2})"
+    },
+    "pstThreeDBox()()()()": {
+      "snippet": "pstThreeDBox(${1:x0},${2:y0},${3:z0})(${4:x1},${5:y1},${6:z1})(${7:x2},${8:y2},${9:z2})(${10:x3},${11:y3},${12:z3})"
+    },
+    "pstThreeDBox[]()()()()": {
+      "snippet": "pstThreeDBox[${1:options}](${2:x0},${3:y0},${4:z0})(${5:x1},${6:y1},${7:z1})(${8:x2},${9:y2},${10:z2})(${11:x3},${12:y3},${13:z3})"
+    },
+    "psBox(){}{}{}": {
+      "snippet": "psBox(${4:x},${5:y},${6:z}){${1:width}}{${2:depth}}{${3:height}}"
+    },
+    "psBox[](){}{}{}": {
+      "snippet": "psBox[${4:options}](${5:x},${6:y},${7:z}){${1:width}}{${2:depth}}{${3:height}}"
+    },
+    "pstThreeDEllipse()()()": {
+      "snippet": "pstThreeDEllipse(${1:cx},${2:cy},${3:cz})(${4:ux},${5:uy},${6:uz})(${7:vx},${8:vy},${9:vz})"
+    },
+    "pstThreeDEllipse[]()()()": {
+      "snippet": "pstThreeDEllipse[${1:options}](${2:cx},${3:cy},${4:cz})(${5:ux},${6:uy},${7:uz})(${8:vx},${9:vy},${10:vz})"
+    },
+    "pstThreeDCircle()()()": {
+      "snippet": "pstThreeDCircle(${1:cx},${2:cy},${3:cz})(${4:ux},${5:uy},${6:uz})(${7:vx},${8:vy},${9:vz})"
+    },
+    "pstThreeDCircle[]()()()": {
+      "snippet": "pstThreeDCircle[${1:options}](${2:cx},${3:cy},${4:cz})(${5:ux},${6:uy},${7:uz})(${8:vx},${9:vy},${10:vz})"
+    },
+    "pstIIIDCylinder(){}{}": {
+      "snippet": "pstIIIDCylinder(${3:x},${4:y},${5:z}){${1:radius}}{${2:height}}"
+    },
+    "pstIIIDCylinder[](){}{}": {
+      "snippet": "pstIIIDCylinder[${3:options}](${4:x},${5:y},${6:z}){${1:radius}}{${2:height}}"
+    },
+    "psCylinder(){}{}": {
+      "snippet": "psCylinder(${3:x},${4:y},${5:z}){${1:radius}}{${2:height}}"
+    },
+    "psCylinder[](){}{}": {
+      "snippet": "psCylinder[${3:options}](${4:x},${5:y},${6:z}){${1:radius}}{${2:height}}"
+    },
     "pstParaboloid{}{}": {
       "snippet": "pstParaboloid{${1:height}}{${2:radius}}"
     },
     "pstParaboloid[]{}{}": {
       "snippet": "pstParaboloid[${3:options}]{${1:height}}{${2:radius}}"
     },
+    "pstThreeDSphere(){}": {
+      "snippet": "pstThreeDSphere(${2:x},${3:y},${4:z}){${1:radius}}"
+    },
+    "pstThreeDSphere[](){}": {
+      "snippet": "pstThreeDSphere[${2:options}](${3:x},${4:y},${5:z}){${1:radius}}"
+    },
+    "psplotThreeD()(){}": {
+      "snippet": "psplotThreeD(${2:xmin},${3:xmax})(${4:ymin},${5:ymax}){${1:function}}"
+    },
+    "psplotThreeD[]()(){}": {
+      "snippet": "psplotThreeD[${2:options}](${3:xmin},${4:xmax})(${5:ymin},${6:ymax}){${1:function}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "parametricplotThreeD()(){}": {
+      "snippet": "parametricplotThreeD(${2:t1},${3:t2})(${4:u1},${5:u2}){${1:functions x y z}}"
+    },
+    "parametricplotThreeD[]()(){}": {
+      "snippet": "parametricplotThreeD[${2:options}](${3:t1},${4:t2})(${5:u1},${6:u2}){${1:functions x y z}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "parametricplotThreeD(){}": {
+      "snippet": "parametricplotThreeD(${2:t1},${3:t2}){${1:functions x y z}}"
+    },
+    "parametricplotThreeD[](){}": {
+      "snippet": "parametricplotThreeD[${2:options}](${3:t1},${4:t2}){${1:functions x y z}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "fileplotThreeD{}": {
       "snippet": "fileplotThreeD{${1:datafile}}"
     },
@@ -42,7 +149,33 @@
       "snippet": "listplotThreeD[${2:options}]{${1:data object}}"
     },
     "ScalePointsThreeD": {},
+    "pstRotPointIIID(){}{}{}": {
+      "snippet": "pstRotPointIIID(${4:x},${5:y},${6:z}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}"
+    },
+    "pstRotPointIIID[](){}{}{}": {
+      "snippet": "pstRotPointIIID[${4:options}](${5:x},${6:y},${7:z}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "getThreeDCoor(){}": {
+      "snippet": "getThreeDCoor(${2:vector}){${1:macro}}"
+    },
+    "pstaddThreeDVec()(){}{}{}": {
+      "snippet": "pstaddThreeDVec(${4:vectorA})(${5:vectorB}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}"
+    },
+    "pstsubThreeDVec()(){}{}{}": {
+      "snippet": "pstsubThreeDVec(${4:vectorA})(${5:vectorB}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}"
+    },
     "setIIIDplotDefaults": {},
+    "ABinterCD()()()(){}": {
+      "snippet": "ABinterCD(${2:A})(${3:B})(${4:C})(${5:D}){${1:name}}"
+    },
+    "Arrows()()": {
+      "snippet": "Arrows(${1:A})(${2:B})"
+    },
+    "Arrows[]()()": {
+      "snippet": "Arrows[${1:options}](${2:A})(${3:B})"
+    },
     "CalculateCos{}": {
       "snippet": "CalculateCos{${1:angle}}"
     },
@@ -52,33 +185,105 @@
     "IIIDplotfiledate": {},
     "IIIDplotfileversion": {},
     "NormalIIIDCoor": {},
+    "Parallel()()()(){}": {
+      "snippet": "Parallel(${2:A})(${3:B})(${4:C})(${5:D}){${1:name}}"
+    },
+    "Parallel[]()()()(){}": {
+      "snippet": "Parallel[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:name}}"
+    },
     "UseCos{}": {
       "snippet": "UseCos{${1:angle}}"
     },
     "UseSin{}": {
       "snippet": "UseSin{${1:angle}}"
     },
+    "arrowLine()(){}": {
+      "snippet": "arrowLine(${2:A})(${3:B}){${1:n}}"
+    },
+    "arrowLine[]()(){}": {
+      "snippet": "arrowLine[${2:options}](${3:A})(${4:B}){${1:n}}"
+    },
     "noPT{}": {
       "snippet": "noPT{${1:arg}}"
     },
+    "nodeBetween()(){}": {
+      "snippet": "nodeBetween(${2:A})(${3:B}){${1:name}}"
+    },
+    "psBeforeLine()(){}": {
+      "snippet": "psBeforeLine(${2:A})(${3:B}){${1:name}}"
+    },
+    "psBeforeLine[]()(){}": {
+      "snippet": "psBeforeLine[${2:options}](${3:A})(${4:B}){${1:name}}"
+    },
+    "psOutLine()(){}": {
+      "snippet": "psOutLine(${2:A})(${3:B}){${1:name}}"
+    },
+    "psOutLine[]()(){}": {
+      "snippet": "psOutLine[${2:options}](${3:A})(${4:B}){${1:name}}"
+    },
+    "psplotImpIIID()(){}": {
+      "snippet": "psplotImpIIID(${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2}){${1:function}}"
+    },
+    "psplotImpIIID()()[]{}": {
+      "snippet": "psplotImpIIID(${3:x1},${4:y1},${5:z1})(${6:x2},${7:y2},${8:z2})[${2:PS code}]{${1:function}}"
+    },
     "pstAdd{}{}{}": {
       "snippet": "pstAdd{${1:num1}}{${2:num2}}{${3:macro}}"
     },
     "pstDiv{}{}{}": {
       "snippet": "pstDiv{${1:num1}}{${2:num2}}{${3:macro}}"
     },
+    "pstIIIDNode()()()()()": {
+      "snippet": "pstIIIDNode(${1:A})(${2:B})(${3:C})(${4:D})(${5:E})"
+    },
+    "pstIIIDNode[]()()()()()": {
+      "snippet": "pstIIIDNode[${1:options}](${2:A})(${3:B})(${4:C})(${5:D})(${6:E})"
+    },
     "pstMul{}{}{}": {
       "snippet": "pstMul{${1:num1}}{${2:num2}}{${3:macro}}"
     },
+    "pstRotNodeIIID()(){}": {
+      "snippet": "pstRotNodeIIID(${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2}){${1:name}}"
+    },
     "pstSinCos{}{}{}": {
       "snippet": "pstSinCos{${1:angle}}{${2:sine macro}}{${3:cosine macro}}"
     },
     "pstSub{}{}{}": {
       "snippet": "pstSub{${1:num1}}{${2:num2}}{${3:macro}}"
     },
+    "pstThreeDCone()()(){}": {
+      "snippet": "pstThreeDCone(${2:cx},${3:cy},${4:cz})(${5:ux},${6:uy},${7:uz})(${8:vx},${9:vy},${10:vz}){${1:height}}"
+    },
+    "pstThreeDCone[]()()(){}": {
+      "snippet": "pstThreeDCone[${2:options}](${3:cx},${4:cy},${5:cz})(${6:ux},${7:uy},${8:uz})(${9:vx},${10:vy},${11:vz}){${1:height}}"
+    },
     "pstThreeDPrism": {},
+    "pstThreeDmoveto()": {
+      "snippet": "pstThreeDmoveto(${1:x},${2:y},${3:z})"
+    },
+    "pstUThreeDPut(){}": {
+      "snippet": "pstUThreeDPut(${2:x},${3:y},${4:z}){${1:stuff}}"
+    },
+    "pstUThreeDPut[](){}": {
+      "snippet": "pstUThreeDPut[${2:refangle}](${3:x},${4:y},${5:z}){${1:stuff}}"
+    },
+    "rotateFrame()()()(){}": {
+      "snippet": "rotateFrame(${2:A})(${3:B})(${4:C})(${5:D}){${1:angle}}"
+    },
+    "rotateNode(){}": {
+      "snippet": "rotateNode(${2:A}){${1:angle}}"
+    },
+    "rotateTriangle()()(){}": {
+      "snippet": "rotateTriangle(${2:A})(${3:B})(${4:C}){${1:angle}}"
+    },
     "PSTThreeDplotLoaded": {},
-    "pszunit": {}
+    "pszunit": {},
+    "pstThreeDPlotFunc()(){}": {
+      "snippet": "pstThreeDPlotFunc(${2:xmin},${3:xmax})(${4:ymin},${5:ymax}){${1:function}}"
+    },
+    "pstThreeDPlotFunc[]()(){}": {
+      "snippet": "pstThreeDPlotFunc[${2:options}](${3:xmin},${4:xmax})(${5:ymin},${6:ymax}){${1:function}}"
+    }
   },
   "envs": {},
   "options": [],
@@ -128,6 +333,28 @@
       "linecolor=",
       "planecorr=",
       "linestyle=${1:style}"
+    ],
+    [
+      "planeGrid=",
+      "subticks=${1:integer}",
+      "planeGridOffset=${1:number}"
+    ],
+    [
+      "plotstyle=",
+      "showpoints",
+      "xPlotpoints=${1:number}",
+      "yPlotpoints=${1:number}",
+      "drawStyle=",
+      "hiddenLine",
+      "algebraic",
+      "linewidth=",
+      "fillstyle=${1:style}",
+      "linecolor="
+    ],
+    [
+      "RotX=${1:degrees}",
+      "RotY=${1:degrees}",
+      "RotZ=${1:degrees}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-abspos.json b/dev/packages/pst-abspos.json
index 1f1b099d5..dcbd5f02d 100644
--- a/dev/packages/pst-abspos.json
+++ b/dev/packages/pst-abspos.json
@@ -5,8 +5,17 @@
     "pst-xkey": []
   },
   "macros": {
+    "pstSetRelativeOrigin()": {
+      "snippet": "pstSetRelativeOrigin(${1:x},${2:y})"
+    },
     "pstSetAbsoluteOrigin": {},
     "pstSetPostScriptOrigin": {},
+    "pstPutAbs(){}": {
+      "snippet": "pstPutAbs(${2:x},${3:y}){${1:stuff}}"
+    },
+    "pstPutAbs[](){}": {
+      "snippet": "pstPutAbs[${2:options}](${3:x},${4:y}){${1:stuff}}"
+    },
     "PSTabsposLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-arrow.json b/dev/packages/pst-arrow.json
index 6391af13d..3aa102670 100644
--- a/dev/packages/pst-arrow.json
+++ b/dev/packages/pst-arrow.json
@@ -3,6 +3,12 @@
     "pstricks": []
   },
   "macros": {
+    "psBigArrow()()": {
+      "snippet": "psBigArrow(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psBigArrow[]()()": {
+      "snippet": "psBigArrow[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
     "PSTarrowLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-bar.json b/dev/packages/pst-bar.json
index 00bc129c1..6661acf03 100644
--- a/dev/packages/pst-bar.json
+++ b/dev/packages/pst-bar.json
@@ -28,6 +28,9 @@
       "snippet": "psbarlabel{${1:label}}"
     },
     "psbarlabelsep": {},
+    "psbarscale(){}": {
+      "snippet": "psbarscale(${2:scale}){${1:PostScript code}}"
+    },
     "setbarstyle{}": {
       "snippet": "setbarstyle{${1:style}}"
     },
diff --git a/dev/packages/pst-bezier.json b/dev/packages/pst-bezier.json
index eaf2fb4e3..2fbbb12f4 100644
--- a/dev/packages/pst-bezier.json
+++ b/dev/packages/pst-bezier.json
@@ -6,6 +6,14 @@
     "pst-node": []
   },
   "macros": {
+    "psRQBCmasse()()(){}": {
+      "snippet": "psRQBCmasse(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:w0,${8:w1},w2}}"
+    },
+    "psRQBCmasse[]()()(){}": {
+      "snippet": "psRQBCmasse[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:w0,${9:w1},w2}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "pscalculate{}": {
       "snippet": "pscalculate{${1:expr}}"
     },
@@ -16,5 +24,14 @@
   },
   "envs": {},
   "options": [],
-  "keyvals": []
+  "keyvals": [
+    [
+      "autoTrace",
+      "linecolor=",
+      "linewidth=",
+      "nPoints=${1:number}",
+      "showpoints",
+      "showPolygon"
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-circ.json b/dev/packages/pst-circ.json
index cb0f52e7e..134a4524f 100644
--- a/dev/packages/pst-circ.json
+++ b/dev/packages/pst-circ.json
@@ -6,12 +6,498 @@
     "multido": []
   },
   "macros": {
+    "wire()()": {
+      "snippet": "wire(${1:A})(${2:B})"
+    },
+    "wire[]()()": {
+      "snippet": "wire[${1:options}](${2:A})(${3:B})"
+    },
+    "tension()(){}": {
+      "snippet": "tension(${2:A})(${3:B}){${1:label}}"
+    },
+    "tension[]()(){}": {
+      "snippet": "tension[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "ground()": {
+      "snippet": "ground(${1:A})"
+    },
+    "ground{}()": {
+      "snippet": "ground{${1:angle}}(${2:A})"
+    },
+    "ground[]()": {
+      "snippet": "ground[${1:options}](${2:A})"
+    },
+    "ground[]{}()": {
+      "snippet": "ground[${2:options}]{${1:angle}}(${3:A})"
+    },
+    "resistor()(){}": {
+      "snippet": "resistor(${2:A})(${3:B}){${1:label}}"
+    },
+    "resistor[]()(){}": {
+      "snippet": "resistor[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "RFLine()(){}": {
+      "snippet": "RFLine(${2:A})(${3:B}){${1:label}}"
+    },
+    "RFLine[]()(){}": {
+      "snippet": "RFLine[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "capacitor()(){}": {
+      "snippet": "capacitor(${2:A})(${3:B}){${1:label}}"
+    },
+    "capacitor[]()(){}": {
+      "snippet": "capacitor[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "battery()(){}": {
+      "snippet": "battery(${2:A})(${3:B}){${1:label}}"
+    },
+    "battery[]()(){}": {
+      "snippet": "battery[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "coil()(){}": {
+      "snippet": "coil(${2:A})(${3:B}){${1:label}}"
+    },
+    "coil[]()(){}": {
+      "snippet": "coil[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "Ucc()(){}": {
+      "snippet": "Ucc(${2:A})(${3:B}){${1:label}}"
+    },
+    "Ucc[]()(){}": {
+      "snippet": "Ucc[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "Icc()(){}": {
+      "snippet": "Icc(${2:A})(${3:B}){${1:label}}"
+    },
+    "Icc[]()(){}": {
+      "snippet": "Icc[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "switch()(){}": {
+      "snippet": "switch(${2:A})(${3:B}){${1:label}}"
+    },
+    "switch[]()(){}": {
+      "snippet": "switch[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "arrowswitch()(){}": {
+      "snippet": "arrowswitch(${2:A})(${3:B}){${1:label}}"
+    },
+    "arrowswitch[]()(){}": {
+      "snippet": "arrowswitch[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "diode()(){}": {
+      "snippet": "diode(${2:A})(${3:B}){${1:label}}"
+    },
+    "diode[]()(){}": {
+      "snippet": "diode[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "Zener()(){}": {
+      "snippet": "Zener(${2:A})(${3:B}){${1:label}}"
+    },
+    "Zener[]()(){}": {
+      "snippet": "Zener[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "lamp()(){}": {
+      "snippet": "lamp(${2:A})(${3:B}){${1:label}}"
+    },
+    "lamp[]()(){}": {
+      "snippet": "lamp[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "circledipole()(){}": {
+      "snippet": "circledipole(${2:A})(${3:B}){${1:label}}"
+    },
+    "circledipole[]()(){}": {
+      "snippet": "circledipole[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "LED()(){}": {
+      "snippet": "LED(${2:A})(${3:B}){${1:label}}"
+    },
+    "LED[]()(){}": {
+      "snippet": "LED[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "SQUID()(){}": {
+      "snippet": "SQUID(${2:A})(${3:B}){${1:label}}"
+    },
+    "SQUID[]()(){}": {
+      "snippet": "SQUID[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "RelayNOP()(){}": {
+      "snippet": "RelayNOP(${2:A})(${3:B}){${1:label}}"
+    },
+    "RelayNOP[]()(){}": {
+      "snippet": "RelayNOP[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "Suppressor()(){}": {
+      "snippet": "Suppressor(${2:A})(${3:B}){${1:label}}"
+    },
+    "Suppressor[]()(){}": {
+      "snippet": "Suppressor[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "Arrestor()(){}": {
+      "snippet": "Arrestor(${2:A})(${3:B}){${1:label}}"
+    },
+    "Arrestor[]()(){}": {
+      "snippet": "Arrestor[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "cell()(){}": {
+      "snippet": "cell(${2:A})(${3:B}){${1:label}}"
+    },
+    "cell[]()(){}": {
+      "snippet": "cell[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "igbt()(){}": {
+      "snippet": "igbt(${2:A})(${3:B}){${1:label}}"
+    },
+    "igbt[]()(){}": {
+      "snippet": "igbt[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "OA()()()": {
+      "snippet": "OA(${1:A})(${2:B})(${3:C})"
+    },
+    "OA[]()()()": {
+      "snippet": "OA[${1:options}](${2:A})(${3:B})(${4:C})"
+    },
+    "GM()()()": {
+      "snippet": "GM(${1:A})(${2:B})(${3:C})"
+    },
+    "GM[]()()()": {
+      "snippet": "GM[${1:options}](${2:A})(${3:B})(${4:C})"
+    },
+    "Tswitch()()()": {
+      "snippet": "Tswitch(${1:A})(${2:B})(${3:C})"
+    },
+    "Tswitch[]()()()": {
+      "snippet": "Tswitch[${1:options}](${2:A})(${3:B})(${4:C})"
+    },
+    "potentiometer()()()": {
+      "snippet": "potentiometer(${1:A})(${2:B})(${3:C})"
+    },
+    "potentiometer[]()()()": {
+      "snippet": "potentiometer[${1:options}](${2:A})(${3:B})(${4:C})"
+    },
+    "transistor()()()": {
+      "snippet": "transistor(${1:A})(${2:B})(${3:C})"
+    },
+    "transistor[]()()()": {
+      "snippet": "transistor[${1:options}](${2:A})(${3:B})(${4:C})"
+    },
+    "quadripole()()()(){}": {
+      "snippet": "quadripole(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
+    },
+    "quadripole[]()()()(){}": {
+      "snippet": "quadripole[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
+    },
+    "transformer()()()(){}": {
+      "snippet": "transformer(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
+    },
+    "transformer[]()()()(){}": {
+      "snippet": "transformer[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
+    },
+    "newtransformer()()()(){}": {
+      "snippet": "newtransformer(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
+    },
+    "newtransformer[]()()()(){}": {
+      "snippet": "newtransformer[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
+    },
+    "newtransformerquad()()()(){}": {
+      "snippet": "newtransformerquad(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
+    },
+    "newtransformerquad[]()()()(){}": {
+      "snippet": "newtransformerquad[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
+    },
+    "optoCoupler()()()(){}": {
+      "snippet": "optoCoupler(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
+    },
+    "optoCoupler[]()()()(){}": {
+      "snippet": "optoCoupler[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
+    },
+    "multidipole()()": {
+      "snippet": "multidipole(${1:A})(${2:B})"
+    },
+    "multidipole[]()()": {
+      "snippet": "multidipole[${1:options}](${2:A})(${3:B})"
+    },
+    "OpenDipol()(){}": {
+      "snippet": "OpenDipol(${2:A})(${3:B}){${1:label}}"
+    },
+    "OpenDipol[]()(){}": {
+      "snippet": "OpenDipol[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "OpenTripol()(){}": {
+      "snippet": "OpenTripol(${2:A})(${3:B}){${1:label}}"
+    },
+    "OpenTripol[]()(){}": {
+      "snippet": "OpenTripol[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "dashpot()(){}": {
+      "snippet": "dashpot(${2:A})(${3:B}){${1:label}}"
+    },
+    "dashpot[]()(){}": {
+      "snippet": "dashpot[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "newground()": {
+      "snippet": "newground(${1:A})"
+    },
+    "newground{}()": {
+      "snippet": "newground{${1:angle}}(${2:A})"
+    },
+    "newground[]()": {
+      "snippet": "newground[${1:options}](${2:A})"
+    },
+    "newground[]{}()": {
+      "snippet": "newground[${2:options}]{${1:angle}}(${3:A})"
+    },
+    "newdiode()(){}": {
+      "snippet": "newdiode(${2:A})(${3:B}){${1:label}}"
+    },
+    "newdiode[]()(){}": {
+      "snippet": "newdiode[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "newZener()(){}": {
+      "snippet": "newZener(${2:A})(${3:B}){${1:label}}"
+    },
+    "newZener[]()(){}": {
+      "snippet": "newZener[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "newLED()(){}": {
+      "snippet": "newLED(${2:A})(${3:B}){${1:label}}"
+    },
+    "newLED[]()(){}": {
+      "snippet": "newLED[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "newSwitch()(){}": {
+      "snippet": "newSwitch(${2:A})(${3:B}){${1:label}}"
+    },
+    "newSwitch[]()(){}": {
+      "snippet": "newSwitch[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "newcapacitor()(){}": {
+      "snippet": "newcapacitor(${2:A})(${3:B}){${1:label}}"
+    },
+    "newcapacitor[]()(){}": {
+      "snippet": "newcapacitor[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "newarmature()(){}": {
+      "snippet": "newarmature(${2:A})(${3:B}){${1:label}}"
+    },
+    "newarmature[]()(){}": {
+      "snippet": "newarmature[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "vdc()(){}": {
+      "snippet": "vdc(${2:A})(${3:B}){${1:label}}"
+    },
+    "vdc[]()(){}": {
+      "snippet": "vdc[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "vac()(){}": {
+      "snippet": "vac(${2:A})(${3:B}){${1:label}}"
+    },
+    "vac[]()(){}": {
+      "snippet": "vac[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "antenna()": {
+      "snippet": "antenna(${1:A})"
+    },
+    "antenna{}()": {
+      "snippet": "antenna{${1:angle}}(${2:A})"
+    },
+    "antenna[]()": {
+      "snippet": "antenna[${1:options}](${2:A})"
+    },
+    "antenna[]{}()": {
+      "snippet": "antenna[${2:options}]{${1:angle}}(${3:A})"
+    },
+    "oscillator(){}{}": {
+      "snippet": "oscillator(${3:A}){${1:label}}{${2:pstricks options}}"
+    },
+    "oscillator[](){}{}": {
+      "snippet": "oscillator[${3:options}](${4:A}){${1:label}}{${2:pstricks options}}"
+    },
+    "filter()(){}": {
+      "snippet": "filter(${2:A})(${3:B}){${1:label}}"
+    },
+    "filter[]()(){}": {
+      "snippet": "filter[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "isolator()(){}": {
+      "snippet": "isolator(${2:A})(${3:B}){${1:label}}"
+    },
+    "isolator[]()(){}": {
+      "snippet": "isolator[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "freqmult()(){}": {
+      "snippet": "freqmult(${2:A})(${3:B}){${1:label}}"
+    },
+    "freqmult[]()(){}": {
+      "snippet": "freqmult[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "phaseshifter()(){}": {
+      "snippet": "phaseshifter(${2:A})(${3:B}){${1:label}}"
+    },
+    "phaseshifter[]()(){}": {
+      "snippet": "phaseshifter[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "vco()(){}": {
+      "snippet": "vco(${2:A})(${3:B}){${1:label}}"
+    },
+    "vco[]()(){}": {
+      "snippet": "vco[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "amplifier()(){}": {
+      "snippet": "amplifier(${2:A})(${3:B}){${1:label}}"
+    },
+    "amplifier[]()(){}": {
+      "snippet": "amplifier[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "detector()(){}": {
+      "snippet": "detector(${2:A})(${3:B}){${1:label}}"
+    },
+    "detector[]()(){}": {
+      "snippet": "detector[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "attenuator()(){}": {
+      "snippet": "attenuator(${2:A})(${3:B}){${1:label}}"
+    },
+    "attenuator[]()(){}": {
+      "snippet": "attenuator[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "mixer()()(){}{}": {
+      "snippet": "mixer(${3:A})(${4:B})(${5:C}){${1:label}}{${2:pstricks options}}"
+    },
+    "mixer[]()()(){}{}": {
+      "snippet": "mixer[${3:options}](${4:A})(${5:B})(${6:C}){${1:label}}{${2:pstricks options}}"
+    },
+    "splitter()()(){}{}": {
+      "snippet": "splitter(${3:A})(${4:B})(${5:C}){${1:label}}{${2:pstricks options}}"
+    },
+    "splitter[]()()(){}{}": {
+      "snippet": "splitter[${3:options}](${4:A})(${5:B})(${6:C}){${1:label}}{${2:pstricks options}}"
+    },
+    "circulator{}()()(){}{}": {
+      "snippet": "circulator{${1:angle}}(${4:A})(${5:B})(${6:C}){${2:label}}{${3:pstricks options}}"
+    },
+    "circulator[]{}()()(){}{}": {
+      "snippet": "circulator[${4:options}]{${1:angle}}(${5:A})(${6:B})(${7:C}){${2:label}}{${3:pstricks options}}"
+    },
+    "agc()()(){}{}": {
+      "snippet": "agc(${3:A})(${4:B})(${5:C}){${1:label}}{${2:pstricks options}}"
+    },
+    "agc[]()()(){}{}": {
+      "snippet": "agc[${3:options}](${4:A})(${5:B})(${6:C}){${1:label}}{${2:pstricks options}}"
+    },
+    "coupler()()()(){}{}": {
+      "snippet": "coupler(${3:A})(${4:B})(${5:C})(${6:D}){${1:label}}{${2:pstricks options}}"
+    },
+    "coupler[]()()()(){}{}": {
+      "snippet": "coupler[${3:options}](${4:A})(${5:B})(${6:C})(${7:D}){${1:label}}{${2:pstricks options}}"
+    },
     "logic{}": {
       "snippet": "logic{${1:label}}"
     },
+    "logic(){}": {
+      "snippet": "logic(${2:x},${3:y}){${1:label}}"
+    },
     "logic[]{}": {
       "snippet": "logic[${2:options}]{${1:label}}"
     },
+    "logic[](){}": {
+      "snippet": "logic[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "logicnot(){}": {
+      "snippet": "logicnot(${2:x},${3:y}){${1:label}}"
+    },
+    "logicnot[](){}": {
+      "snippet": "logicnot[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "logicand(){}": {
+      "snippet": "logicand(${2:x},${3:y}){${1:label}}"
+    },
+    "logicand[](){}": {
+      "snippet": "logicand[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "logicor(){}": {
+      "snippet": "logicor(${2:x},${3:y}){${1:label}}"
+    },
+    "logicor[](){}": {
+      "snippet": "logicor[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "logicxor(){}": {
+      "snippet": "logicxor(${2:x},${3:y}){${1:label}}"
+    },
+    "logicxor[](){}": {
+      "snippet": "logicxor[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "logicff(){}": {
+      "snippet": "logicff(${2:x},${3:y}){${1:label}}"
+    },
+    "logicff[](){}": {
+      "snippet": "logicff[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "logicic(){}": {
+      "snippet": "logicic(${2:x},${3:y}){${1:label}}"
+    },
+    "logicic[](){}": {
+      "snippet": "logicic[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "sevensegmentdisplay(){}": {
+      "snippet": "sevensegmentdisplay(${2:x},${3:y}){${1:label}}"
+    },
+    "sevensegmentdisplay[](){}": {
+      "snippet": "sevensegmentdisplay[${2:options}](${3:x},${4:y}){${1:label}}"
+    },
+    "xic()": {
+      "snippet": "xic(${1:x},${2:y})"
+    },
+    "xic[]()": {
+      "snippet": "xic[${1:options}](${2:x},${3:y})"
+    },
+    "xio()": {
+      "snippet": "xio(${1:x},${2:y})"
+    },
+    "xio[]()": {
+      "snippet": "xio[${1:options}](${2:x},${3:y})"
+    },
+    "ote()": {
+      "snippet": "ote(${1:x},${2:y})"
+    },
+    "ote[]()": {
+      "snippet": "ote[${1:options}](${2:x},${3:y})"
+    },
+    "osr()": {
+      "snippet": "osr(${1:x},${2:y})"
+    },
+    "osr[]()": {
+      "snippet": "osr[${1:options}](${2:x},${3:y})"
+    },
+    "res()": {
+      "snippet": "res(${1:x},${2:y})"
+    },
+    "res[]()": {
+      "snippet": "res[${1:options}](${2:x},${3:y})"
+    },
+    "swpb()": {
+      "snippet": "swpb(${1:x},${2:y})"
+    },
+    "swpb[]()": {
+      "snippet": "swpb[${1:options}](${2:x},${3:y})"
+    },
+    "swtog()": {
+      "snippet": "swtog(${1:x},${2:y})"
+    },
+    "swtog[]()": {
+      "snippet": "swtog[${1:options}](${2:x},${3:y})"
+    },
+    "contact()": {
+      "snippet": "contact(${1:x},${2:y})"
+    },
+    "contact[]()": {
+      "snippet": "contact[${1:options}](${2:x},${3:y})"
+    },
+    "armature()": {
+      "snippet": "armature(${1:x},${2:y})"
+    },
+    "armature[]()": {
+      "snippet": "armature[${1:options}](${2:x},${3:y})"
+    },
     "newCircDipole{}": {
       "snippet": "newCircDipole{${1:name}}"
     },
@@ -23,6 +509,33 @@
     "icleft": {},
     "icmid": {},
     "icright": {},
+    "node()": {
+      "snippet": "node(${1:x},${2:y})"
+    },
+    "modulator()(){}": {
+      "snippet": "modulator(${2:A})(${3:B}){${1:label}}"
+    },
+    "modulator[]()(){}": {
+      "snippet": "modulator[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "plug{}()": {
+      "snippet": "plug{${1:angle}}(${2:A})"
+    },
+    "plug[]{}()": {
+      "snippet": "plug[${2:options}]{${1:angle}}(${3:A})"
+    },
+    "ampsinu()(){}": {
+      "snippet": "ampsinu(${2:A})(${3:B}){${1:label}}"
+    },
+    "ampsinu[]()(){}": {
+      "snippet": "ampsinu[${2:options}](${3:A})(${4:B}){${1:label}}"
+    },
+    "powermeter()()(){}": {
+      "snippet": "powermeter(${2:A})(${3:B})(${4:C}){${1:label}}"
+    },
+    "powermeter[]()()(){}": {
+      "snippet": "powermeter[${2:options}](${3:A})(${4:B})(${5:C}){${1:label}}"
+    },
     "PSTcircLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-coil.json b/dev/packages/pst-coil.json
index 202fee6f9..63e6a59e3 100644
--- a/dev/packages/pst-coil.json
+++ b/dev/packages/pst-coil.json
@@ -5,6 +5,30 @@
     "pst-xkey": []
   },
   "macros": {
+    "pscoil()()": {
+      "snippet": "pscoil(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pscoil{}()()": {
+      "snippet": "pscoil{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil[]()()": {
+      "snippet": "pscoil[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil[]{}()()": {
+      "snippet": "pscoil[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pscoil*()()": {
+      "snippet": "pscoil*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pscoil*{}()()": {
+      "snippet": "pscoil*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil*[]()()": {
+      "snippet": "pscoil*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pscoil*[]{}()()": {
+      "snippet": "pscoil*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
     "psCoil{}{}": {
       "snippet": "psCoil{${1:angle1}}{${2:angle2}}"
     },
@@ -17,6 +41,54 @@
     "psCoil*[]{}{}": {
       "snippet": "psCoil*[${3:options}]{${1:angle1}}{${2:angle2}}"
     },
+    "pszigzag()()": {
+      "snippet": "pszigzag(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pszigzag{}()()": {
+      "snippet": "pszigzag{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag[]()()": {
+      "snippet": "pszigzag[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag[]{}()()": {
+      "snippet": "pszigzag[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pszigzag*()()": {
+      "snippet": "pszigzag*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pszigzag*{}()()": {
+      "snippet": "pszigzag*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag*[]()()": {
+      "snippet": "pszigzag*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pszigzag*[]{}()()": {
+      "snippet": "pszigzag*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pssin()()": {
+      "snippet": "pssin(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pssin{}()()": {
+      "snippet": "pssin{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin[]()()": {
+      "snippet": "pssin[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin[]{}()()": {
+      "snippet": "pssin[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "pssin*()()": {
+      "snippet": "pssin*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pssin*{}()()": {
+      "snippet": "pssin*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin*[]()()": {
+      "snippet": "pssin*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pssin*[]{}()()": {
+      "snippet": "pssin*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
     "nccoil{}{}": {
       "snippet": "nccoil{${1:nodeA}}{${2:nodeB}}"
     },
diff --git a/dev/packages/pst-contourplot.json b/dev/packages/pst-contourplot.json
index 19de0a24b..eb2187dc6 100644
--- a/dev/packages/pst-contourplot.json
+++ b/dev/packages/pst-contourplot.json
@@ -4,9 +4,14 @@
     "pst-xkey": []
   },
   "macros": {
+    "psContourPlot[]()()": {
+      "snippet": "psContourPlot[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "psReadData[]": {
       "snippet": "psReadData[${1:options}]",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "PSTCONTOURPLOTLoaded": {}
@@ -14,6 +19,22 @@
   "envs": {},
   "options": [],
   "keyvals": [
+    [
+      "a=${1:side length}",
+      "ChoicePoints=${1:n1 n2 ...}",
+      "FileName=${1:file name}",
+      "grid",
+      "linecolor=",
+      "linewidth=",
+      "ReverseColors",
+      "showpoints",
+      "unit=${1:number}",
+      "algebraic",
+      "Fill",
+      "fillcolor=",
+      "function=${1:function}",
+      "WriteData"
+    ],
     [
       "a=${1:side length}",
       "ChoicePoints=${1:n1 n2 ...}",
diff --git a/dev/packages/pst-dart.json b/dev/packages/pst-dart.json
index 785bb93ec..abf782773 100644
--- a/dev/packages/pst-dart.json
+++ b/dev/packages/pst-dart.json
@@ -6,10 +6,26 @@
   },
   "macros": {
     "psDartBoard": {},
+    "psDartBoard()": {
+      "snippet": "psDartBoard(${1:x},${2:y})"
+    },
     "psDartBoard[]": {
       "snippet": "psDartBoard[${1:options}]",
       "keyvalindex": 0,
       "keyvalpos": 0
+    },
+    "psDartBoard[]()": {
+      "snippet": "psDartBoard[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "psDart()": {
+      "snippet": "psDart(${1:x},${2:y})"
+    },
+    "psDart[]()": {
+      "snippet": "psDart[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
     }
   },
   "envs": {},
@@ -21,6 +37,11 @@
       "viewpoint=${1:x y z}",
       "preCode=${1:code}",
       "postCode=${1:code}"
+    ],
+    [
+      "rot=${1:degrees}",
+      "unit=${1:number}",
+      "dartcolor="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-dbicons.json b/dev/packages/pst-dbicons.json
index 7fe959b18..223659e92 100644
--- a/dev/packages/pst-dbicons.json
+++ b/dev/packages/pst-dbicons.json
@@ -76,6 +76,18 @@
     "relationshipbetween[]{}{}{}[]": {
       "snippet": "relationshipbetween[${4:property}]{${1:entity-id1}}{${2:entity-id2}}{${3:relationship-id}}[${5:relationship-name}]"
     },
+    "relationshipbetween{}()[]{}()[]{}": {
+      "snippet": "relationshipbetween{${1:entity-id1}}(${6:role1})[${2:card1}]{${3:entity-id2}}(${7:role2})[${4:card2}]{${5:relationship-id}}"
+    },
+    "relationshipbetween{}()[]{}()[]{}[]": {
+      "snippet": "relationshipbetween{${1:entity-id1}}(${7:role1})[${2:card1}]{${3:entity-id2}}(${8:role2})[${4:card2}]{${5:relationship-id}}[${6:relationship-name}]"
+    },
+    "relationshipbetween[]{}()[]{}()[]{}": {
+      "snippet": "relationshipbetween[${4:property}]{${1:entity-id1}}(${7:role1})[${5:card1}]{${2:entity-id2}}(${8:role2})[${6:card2}]{${3:relationship-id}}"
+    },
+    "relationshipbetween[]{}()[]{}()[]{}[]": {
+      "snippet": "relationshipbetween[${4:property}]{${1:entity-id1}}(${8:role1})[${5:card1}]{${2:entity-id2}}(${9:role2})[${6:card2}]{${3:relationship-id}}[${7:relationship-name}]"
+    },
     "inrelationship{}{}": {
       "snippet": "inrelationship{${1:entity-id}}{${2:relationship-id}}"
     },
@@ -88,12 +100,30 @@
     "inrelationship[]{}{}[]": {
       "snippet": "inrelationship[${3:property}]{${1:entity-id}}{${2:relationship-id}}[${4:relationship-name}]"
     },
+    "inrelationship{}()[]{}": {
+      "snippet": "inrelationship{${1:entity-id}}(${4:role})[${2:card}]{${3:relationship-id}}"
+    },
+    "inrelationship{}()[]{}[]": {
+      "snippet": "inrelationship{${1:entity-id}}(${5:role})[${2:card}]{${3:relationship-id}}[${4:relationship-name}]"
+    },
+    "inrelationship[]{}()[]{}": {
+      "snippet": "inrelationship[${3:property}]{${1:entity-id}}(${5:role})[${4:card}]{${2:relationship-id}}"
+    },
+    "inrelationship[]{}()[]{}[]": {
+      "snippet": "inrelationship[${3:property}]{${1:entity-id}}(${6:role})[${4:card}]{${2:relationship-id}}[${5:relationship-name}]"
+    },
+    "inrelationship[]{}()[]{}[]()": {
+      "snippet": "inrelationship[${3:property}]{${1:entity-id}}(${6:role})[${4:card}]{${2:relationship-id}}[${5:relationship-name}](${7:dist},${8:angle})"
+    },
     "rolepos{}": {
       "snippet": "rolepos{${1:number}}"
     },
     "cardpos{}": {
       "snippet": "cardpos{${1:number}}"
     },
+    "annote{}{}()": {
+      "snippet": "annote{${1:id}}{${2:text}}(${3:dist},${4:angle})"
+    },
     "nodeconnections{}": {
       "snippet": "nodeconnections{${1:node connections}}"
     },
diff --git a/dev/packages/pst-electricfield.json b/dev/packages/pst-electricfield.json
index 6b61bc1d9..3c300c992 100644
--- a/dev/packages/pst-electricfield.json
+++ b/dev/packages/pst-electricfield.json
@@ -11,6 +11,14 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "psEquipotential()()": {
+      "snippet": "psEquipotential(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psEquipotential[]()()": {
+      "snippet": "psEquipotential[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "PSTElectricFieldLoaded": {}
   },
   "envs": {},
@@ -26,6 +34,16 @@
       "posArrow=${1:factor}",
       "radius=",
       "runit=${1:number}"
+    ],
+    [
+      "Q={[${1:x1,y1,z1}][${2:x2,y2,z2}]${3:...}}",
+      "N=${1:integer}",
+      "linewidth=",
+      "linecolor=",
+      "Vmax=${1:number}",
+      "Vmin=${1:number}",
+      "stepV=${1:number}",
+      "stepFactor=${1:factor}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-eucl.json b/dev/packages/pst-eucl.json
index 2a51b839d..47004dac1 100644
--- a/dev/packages/pst-eucl.json
+++ b/dev/packages/pst-eucl.json
@@ -15,6 +15,12 @@
     "pstOrdinate{}": {
       "snippet": "pstOrdinate{${1:A}}"
     },
+    "pstMoveNode(){}{}": {
+      "snippet": "pstMoveNode(${3:dx},${4:dy}){${1:A}}{${2:B}}"
+    },
+    "pstMoveNode[](){}{}": {
+      "snippet": "pstMoveNode[${3:options}](${4:dx},${5:dy}){${1:A}}{${2:B}}"
+    },
     "pstSegmentMark{}{}": {
       "snippet": "pstSegmentMark{${1:A}}{${2:B}}"
     },
@@ -33,6 +39,36 @@
     "pstLabelAB*[]{}{}{}": {
       "snippet": "pstLabelAB*[${4:options}]{${1:A}}{${2:B}}{${3:label}}"
     },
+    "pstTriangle(){}(){}(){}": {
+      "snippet": "pstTriangle(${4:x1},${5:y1}){${1:A}}(${6:x2},${7:y2}){${2:B}}(${8:x3},${9:y3}){${3:C}}"
+    },
+    "pstTriangle[](){}(){}(){}": {
+      "snippet": "pstTriangle[${4:options}](${5:x1},${6:y1}){${1:A}}(${7:x2},${8:y2}){${2:B}}(${9:x3},${10:y3}){${3:C}}"
+    },
+    "pstTriangleSSS(){}(){}{}": {
+      "snippet": "pstTriangleSSS(${4:pos}){${1:A}}(${5:a},${6:b},${7:c}){${2:B}}{${3:C}}"
+    },
+    "pstTriangleSSS[](){}(){}{}": {
+      "snippet": "pstTriangleSSS[${4:options}](${5:pos}){${1:A}}(${6:a},${7:b},${8:c}){${2:B}}{${3:C}}"
+    },
+    "pstTriangleSAS(){}(){}{}": {
+      "snippet": "pstTriangleSAS(${4:pos}){${1:A}}(${5:b},${6:∠A},${7:c}){${2:B}}{${3:C}}"
+    },
+    "pstTriangleSAS[](){}(){}{}": {
+      "snippet": "pstTriangleSAS[${4:options}](${5:pos}){${1:A}}(${6:b},${7:∠A},${8:c}){${2:B}}{${3:C}}"
+    },
+    "pstTriangleAAS(){}(){}{}": {
+      "snippet": "pstTriangleAAS(${4:pos}){${1:A}}(${5:∠C},${6:∠A},${7:c}){${2:B}}{${3:C}}"
+    },
+    "pstTriangleAAS[](){}(){}{}": {
+      "snippet": "pstTriangleAAS[${4:options}](${5:pos}){${1:A}}(${6:∠C},${7:∠A},${8:c}){${2:B}}{${3:C}}"
+    },
+    "pstTriangleASA(){}(){}{}": {
+      "snippet": "pstTriangleASA(${4:pos}){${1:A}}(${5:∠A},${6:c},${7:∠B}){${2:B}}{${3:C}}"
+    },
+    "pstTriangleASA[](){}(){}{}": {
+      "snippet": "pstTriangleASA[${4:options}](${5:pos}){${1:A}}(${6:∠A},${7:c},${8:∠B}){${2:B}}{${3:C}}"
+    },
     "pstTriangleIC{}{}{}": {
       "snippet": "pstTriangleIC{${1:A}}{${2:B}}{${3:C}}"
     },
@@ -141,23 +177,53 @@
     "pstLine[]{}{}": {
       "snippet": "pstLine[${3:options}]{${1:A}}{${2:B}}"
     },
+    "pstLine{}()": {
+      "snippet": "pstLine{${1:A}}(${2:x},${3:y})"
+    },
+    "pstLine[]{}()": {
+      "snippet": "pstLine[${2:options}]{${1:A}}(${3:x},${4:y})"
+    },
+    "pstLine(){}": {
+      "snippet": "pstLine(${2:x},${3:y}){${1:B}}"
+    },
+    "pstLine[](){}": {
+      "snippet": "pstLine[${2:options}](${3:x},${4:y}){${1:B}}"
+    },
+    "pstLine()()": {
+      "snippet": "pstLine(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pstLine[]()()": {
+      "snippet": "pstLine[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
     "pstLineAA{}{}{}": {
       "snippet": "pstLineAA{${1:A}}{${2:angle}}{${3:B}}"
     },
     "pstLineAA[]{}{}{}": {
       "snippet": "pstLineAA[${4:options}]{${1:A}}{${2:angle}}{${3:B}}"
     },
+    "pstLineAA(){}{}": {
+      "snippet": "pstLineAA(${3:x},${4:y}){${1:angle}}{${2:B}}"
+    },
+    "pstLineAA[](){}{}": {
+      "snippet": "pstLineAA[${3:options}](${4:x},${5:y}){${1:angle}}{${2:B}}"
+    },
     "pstLineAS{}{}{}": {
       "snippet": "pstLineAS{${1:A}}{${2:gradient}}{${3:B}}"
     },
     "pstLineAS[]{}{}{}": {
       "snippet": "pstLineAS[${4:options}]{${1:A}}{${2:gradient}}{${3:B}}"
     },
+    "pstLineAS(){}{}": {
+      "snippet": "pstLineAS(${3:x},${4:y}){${1:gradient}}{${2:B}}"
+    },
+    "pstLineAS[](){}{}": {
+      "snippet": "pstLineAS[${3:options}](${4:x},${5:y}){${1:gradient}}{${2:B}}"
+    },
     "pstLineCoef{}{}{}": {
-      "snippet": "pstLineCoef{${1:a,b,c}}{${2:A}}{${3:B}}"
+      "snippet": "pstLineCoef{${1:a,${4:b},c}}{${2:A}}{${3:B}}"
     },
     "pstLineCoef[]{}{}{}": {
-      "snippet": "pstLineCoef[${4:options}]{${1:a,b,c}}{${2:A}}{${3:B}}"
+      "snippet": "pstLineCoef[${4:options}]{${1:a,${5:b},c}}{${2:A}}{${3:B}}"
     },
     "pstLineAbsNode{}{}{}{}": {
       "snippet": "pstLineAbsNode{${1:A}}{${2:B}}{${3:x}}{${4:C}}"
@@ -400,16 +466,16 @@
       "snippet": "pstSquareAB[${5:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
     },
     "pstRegularPolygonAB{}{}{}{}": {
-      "snippet": "pstRegularPolygonAB{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,A3,...}}"
+      "snippet": "pstRegularPolygonAB{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,${5:A3},...}}"
     },
     "pstRegularPolygonAB[]{}{}{}{}": {
-      "snippet": "pstRegularPolygonAB[${5:options}]{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,A3,...}}"
+      "snippet": "pstRegularPolygonAB[${5:options}]{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,${6:A3},...}}"
     },
     "pstRegularPolygonOA{}{}{}{}": {
-      "snippet": "pstRegularPolygonOA{${1:O}}{${2:A0}}{${3:n}}{${4:A1,A2,...}}"
+      "snippet": "pstRegularPolygonOA{${1:O}}{${2:A0}}{${3:n}}{${4:A1,${5:A2},...}}"
     },
     "pstRegularPolygonOA[]{}{}{}{}": {
-      "snippet": "pstRegularPolygonOA[${5:options}]{${1:O}}{${2:A0}}{${3:n}}{${4:A1,A2,...}}"
+      "snippet": "pstRegularPolygonOA[${5:options}]{${1:O}}{${2:A0}}{${3:n}}{${4:A1,${6:A2},...}}"
     },
     "pstGenericCurve{}{}{}": {
       "snippet": "pstGenericCurve{${1:radical}}{${2:n1}}{${3:n2}}"
@@ -417,6 +483,90 @@
     "pstGenericCurve[]{}{}{}": {
       "snippet": "pstGenericCurve[${4:options}]{${1:radical}}{${2:n1}}{${3:n2}}"
     },
+    "pstEllipse()()": {
+      "snippet": "pstEllipse(${1:O})(${2:a},${3:b})"
+    },
+    "pstEllipse()()[][]": {
+      "snippet": "pstEllipse(${3:O})(${4:a},${5:b})[${1:angleA}][${2:angleB}]"
+    },
+    "pstEllipse[]()()": {
+      "snippet": "pstEllipse[${1:options}](${2:O})(${3:a},${4:b})"
+    },
+    "pstEllipse[]()()[][]": {
+      "snippet": "pstEllipse[${1:options}](${4:O})(${5:a},${6:b})[${2:angleA}][${3:angleB}]"
+    },
+    "pstEllipseNode()(){}{}": {
+      "snippet": "pstEllipseNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:P}}"
+    },
+    "pstEllipseNode[]()(){}{}": {
+      "snippet": "pstEllipseNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:P}}"
+    },
+    "pstEllipseRotNode()(){}": {
+      "snippet": "pstEllipseRotNode(${2:O})(${3:a},${4:b}){${1:P}}"
+    },
+    "pstEllipseRotNode[]()(){}": {
+      "snippet": "pstEllipseRotNode[${2:options}](${3:O})(${4:a},${5:b}){${1:P}}"
+    },
+    "pstEllipseAbsNode()(){}{}{}": {
+      "snippet": "pstEllipseAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstEllipseAbsNode[]()(){}{}{}": {
+      "snippet": "pstEllipseAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstEllipseOrdNode()(){}{}{}": {
+      "snippet": "pstEllipseOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstEllipseOrdNode[]()(){}{}{}": {
+      "snippet": "pstEllipseOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstEllipseFocusNode()(){}{}": {
+      "snippet": "pstEllipseFocusNode(${3:O})(${4:a},${5:b}){${1:A}}{${2:B}}"
+    },
+    "pstEllipseFocusNode[]()(){}{}": {
+      "snippet": "pstEllipseFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}"
+    },
+    "pstEllipseDirectrixLine()(){}{}{}{}": {
+      "snippet": "pstEllipseDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstEllipseDirectrixLine[]()(){}{}{}{}": {
+      "snippet": "pstEllipseDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstEllipseLineInter()(){}{}{}{}": {
+      "snippet": "pstEllipseLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstEllipseLineInter[]()(){}{}{}{}": {
+      "snippet": "pstEllipseLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstEllipsePolarNode()(){}{}{}": {
+      "snippet": "pstEllipsePolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstEllipsePolarNode[]()(){}{}{}": {
+      "snippet": "pstEllipsePolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstEllipseTangentNode()(){}{}{}": {
+      "snippet": "pstEllipseTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstEllipseTangentNode[]()(){}{}{}": {
+      "snippet": "pstEllipseTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipse()()": {
+      "snippet": "pstGeneralEllipse(${1:O})(${2:a},${3:b})"
+    },
+    "pstGeneralEllipse()()[]": {
+      "snippet": "pstGeneralEllipse(${2:O})(${3:a},${4:b})[${1:θ}]"
+    },
+    "pstGeneralEllipse()()[][][]": {
+      "snippet": "pstGeneralEllipse(${4:O})(${5:a},${6:b})[${1:θ}][${2:angleA}][${3:angleB}]"
+    },
+    "pstGeneralEllipse[]()()": {
+      "snippet": "pstGeneralEllipse[${1:options}](${2:O})(${3:a},${4:b})"
+    },
+    "pstGeneralEllipse[]()()[]": {
+      "snippet": "pstGeneralEllipse[${1:options}](${3:O})(${4:a},${5:b})[${2:θ}]"
+    },
+    "pstGeneralEllipse[]()()[][][]": {
+      "snippet": "pstGeneralEllipse[${1:options}](${5:O})(${6:a},${7:b})[${2:θ}][${3:angleA}][${4:angleB}]"
+    },
     "pstGeneralEllipseFle{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralEllipseFle{${1:F}}{${2:A}}{${3:B}}{${4:e}}{${5:O}}{${6:Rab}}{${7:θ}}"
     },
@@ -430,10 +580,10 @@
       "snippet": "pstGeneralEllipseFFN[${6:options}]{${1:F1}}{${2:F2}}{${3:O}}{${4:Rab}}{${5:θ}}"
     },
     "pstGeneralEllipseCoef{}{}{}{}": {
-      "snippet": "pstGeneralEllipseCoef{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralEllipseCoef{${1:a,${5:b},${6:c},${7:d},${8:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralEllipseCoef[]{}{}{}{}": {
-      "snippet": "pstGeneralEllipseCoef[${5:options}]{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralEllipseCoef[${5:options}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralEllipseABCDE{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralEllipseABCDE{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
@@ -441,6 +591,291 @@
     "pstGeneralEllipseABCDE[]{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralEllipseABCDE[${9:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
     },
+    "pstGeneralEllipseNode()(){}{}": {
+      "snippet": "pstGeneralEllipseNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
+    },
+    "pstGeneralEllipseNode()()[]{}{}": {
+      "snippet": "pstGeneralEllipseNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:t}}{${2:A}}"
+    },
+    "pstGeneralEllipseNode[]()(){}{}": {
+      "snippet": "pstGeneralEllipseNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
+    },
+    "pstGeneralEllipseNode[]()()[]{}{}": {
+      "snippet": "pstGeneralEllipseNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:A}}"
+    },
+    "pstGeneralEllipseRotNode()(){}": {
+      "snippet": "pstGeneralEllipseRotNode(${2:O})(${3:a},${4:b}){${1:A}}"
+    },
+    "pstGeneralEllipseRotNode()()[]{}": {
+      "snippet": "pstGeneralEllipseRotNode(${3:O})(${4:a},${5:b})[${2:θ}]{${1:A}}"
+    },
+    "pstGeneralEllipseRotNode[]()(){}": {
+      "snippet": "pstGeneralEllipseRotNode[${2:options}](${3:O})(${4:a},${5:b}){${1:A}}"
+    },
+    "pstGeneralEllipseRotNode[]()()[]{}": {
+      "snippet": "pstGeneralEllipseRotNode[${2:options}](${4:O})(${5:a},${6:b})[${3:θ}]{${1:A}}"
+    },
+    "pstGeneralEllipseAbsNode()(){}{}{}": {
+      "snippet": "pstGeneralEllipseAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseAbsNode()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseAbsNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseAbsNode[]()(){}{}{}": {
+      "snippet": "pstGeneralEllipseAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseAbsNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseAbsNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseOrdNode()(){}{}{}": {
+      "snippet": "pstGeneralEllipseOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseOrdNode()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseOrdNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseOrdNode[]()(){}{}{}": {
+      "snippet": "pstGeneralEllipseOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseOrdNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseOrdNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseFocusNode()(){}{}{}": {
+      "snippet": "pstGeneralEllipseFocusNode(${4:O})(${5:a},${6:b}){${1:t}}{${2:F1}}{${3:F2}}"
+    },
+    "pstGeneralEllipseFocusNode()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseFocusNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:F1}}{${3:F2}}"
+    },
+    "pstGeneralEllipseFocusNode[]()(){}{}{}": {
+      "snippet": "pstGeneralEllipseFocusNode[${4:options}](${5:O})(${6:a},${7:b}){${1:t}}{${2:F1}}{${3:F2}}"
+    },
+    "pstGeneralEllipseFocusNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseFocusNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:t}}{${2:F1}}{${3:F2}}"
+    },
+    "pstGeneralEllipseDirectrixLine()(){}{}{}{}": {
+      "snippet": "pstGeneralEllipseDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralEllipseDirectrixLine()()[]{}{}{}{}": {
+      "snippet": "pstGeneralEllipseDirectrixLine(${6:O})(${7:a},${8:b})[${5:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralEllipseDirectrixLine[]()(){}{}{}{}": {
+      "snippet": "pstGeneralEllipseDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralEllipseDirectrixLine[]()()[]{}{}{}{}": {
+      "snippet": "pstGeneralEllipseDirectrixLine[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralEllipseLineInter()(){}{}{}{}": {
+      "snippet": "pstGeneralEllipseLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralEllipseLineInter()()[]{}{}{}{}": {
+      "snippet": "pstGeneralEllipseLineInter(${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralEllipseLineInter[]()(){}{}{}{}": {
+      "snippet": "pstGeneralEllipseLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralEllipseLineInter[]()()[]{}{}{}{}": {
+      "snippet": "pstGeneralEllipseLineInter[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralEllipsePolarNode()(){}{}{}": {
+      "snippet": "pstGeneralEllipsePolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralEllipsePolarNode()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipsePolarNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralEllipsePolarNode[]()(){}{}{}": {
+      "snippet": "pstGeneralEllipsePolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralEllipsePolarNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipsePolarNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralEllipseTangentNode()(){}{}{}": {
+      "snippet": "pstGeneralEllipseTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseTangentNode()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseTangentNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseTangentNode[]()(){}{}{}": {
+      "snippet": "pstGeneralEllipseTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralEllipseTangentNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralEllipseTangentNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstParabola(){}{}{}": {
+      "snippet": "pstParabola(${4:O}){${1:p}}{${2:x1}}{${3:x2}}"
+    },
+    "pstParabola[](){}{}{}": {
+      "snippet": "pstParabola[${4:options}](${5:O}){${1:p}}{${2:x1}}{${3:x2}}"
+    },
+    "pstParabolaNode(){}{}{}": {
+      "snippet": "pstParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstParabolaNode[](){}{}{}": {
+      "snippet": "pstParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstParabolaAbsNode(){}{}{}": {
+      "snippet": "pstParabolaAbsNode(${4:O}){${1:p}}{${2:x}}{${3:A}}"
+    },
+    "pstParabolaAbsNode[](){}{}{}": {
+      "snippet": "pstParabolaAbsNode[${4:options}](${5:O}){${1:p}}{${2:x}}{${3:A}}"
+    },
+    "pstParabolaOrdNode(){}{}{}{}": {
+      "snippet": "pstParabolaOrdNode(${5:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
+    },
+    "pstParabolaOrdNode[](){}{}{}{}": {
+      "snippet": "pstParabolaOrdNode[${5:options}](${6:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
+    },
+    "pstParabolaFocusNode(){}{}": {
+      "snippet": "pstParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
+    },
+    "pstParabolaFocusNode[](){}{}": {
+      "snippet": "pstParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
+    },
+    "pstParabolaDirectrixLine(){}{}{}": {
+      "snippet": "pstParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstParabolaDirectrixLine[](){}{}{}": {
+      "snippet": "pstParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstParabolaLineInter(){}{}{}{}{}": {
+      "snippet": "pstParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstParabolaPolarNode(){}{}{}{}": {
+      "snippet": "pstParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstParabolaPolarNode(){}(){}{}{}": {
+      "snippet": "pstParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstParabolaPolarNode(){}()[][]{}{}{}": {
+      "snippet": "pstParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
+    },
+    "pstParabolaPolarNode[](){}{}{}{}": {
+      "snippet": "pstParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstParabolaPolarNode[](){}(){}{}{}": {
+      "snippet": "pstParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstParabolaPolarNode[](){}()[][]{}{}{}": {
+      "snippet": "pstParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstParabolaTangentNode(){}{}{}{}": {
+      "snippet": "pstParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstParabolaTangentNode[](){}{}{}{}": {
+      "snippet": "pstParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstIParabola(){}{}{}": {
+      "snippet": "pstIParabola(${4:O}){${1:p}}{${2:y1}}{${3:y2}}"
+    },
+    "pstIParabola[](){}{}{}": {
+      "snippet": "pstIParabola[${4:options}](${5:O}){${1:p}}{${2:y1}}{${3:y2}}"
+    },
+    "pstIParabolaNode(){}{}{}": {
+      "snippet": "pstIParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstIParabolaNode[](){}{}{}": {
+      "snippet": "pstIParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstIParabolaAbsNode(){}{}{}{}": {
+      "snippet": "pstIParabolaAbsNode(${5:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstIParabolaAbsNode[](){}{}{}{}": {
+      "snippet": "pstIParabolaAbsNode[${5:options}](${6:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstIParabolaOrdNode(){}{}{}": {
+      "snippet": "pstIParabolaOrdNode(${4:O}){${1:p}}{${2:y}}{${3:A}}"
+    },
+    "pstIParabolaOrdNode[](){}{}{}": {
+      "snippet": "pstIParabolaOrdNode[${4:options}](${5:O}){${1:p}}{${2:y}}{${3:A}}"
+    },
+    "pstIParabolaFocusNode(){}{}": {
+      "snippet": "pstIParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
+    },
+    "pstIParabolaFocusNode[](){}{}": {
+      "snippet": "pstIParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
+    },
+    "pstIParabolaDirectrixLine(){}{}{}": {
+      "snippet": "pstIParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstIParabolaDirectrixLine[](){}{}{}": {
+      "snippet": "pstIParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstIParabolaLineInter(){}{}{}{}{}": {
+      "snippet": "pstIParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstIParabolaLineInter[](){}{}{}{}{}": {
+      "snippet": "pstIParabolaLineInter[${6:options}](${7:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstIParabolaPolarNode(){}{}{}{}": {
+      "snippet": "pstIParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstIParabolaPolarNode(){}(){}{}{}": {
+      "snippet": "pstIParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstIParabolaPolarNode(){}()[][]{}{}{}": {
+      "snippet": "pstIParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
+    },
+    "pstIParabolaPolarNode[](){}{}{}{}": {
+      "snippet": "pstIParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstIParabolaPolarNode[](){}(){}{}{}": {
+      "snippet": "pstIParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstIParabolaPolarNode[](){}()[][]{}{}{}": {
+      "snippet": "pstIParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstIParabolaTangentNode(){}{}{}{}": {
+      "snippet": "pstIParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstIParabolaTangentNode[](){}{}{}{}": {
+      "snippet": "pstIParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabola(){}{}{}": {
+      "snippet": "pstGeneralParabola(${4:O}){${1:p}}{${2:x1}}{${3:x2}}"
+    },
+    "pstGeneralParabola(){}[]{}{}": {
+      "snippet": "pstGeneralParabola(${5:O}){${1:p}}[${2:θ}]{${3:x1}}{${4:x2}}"
+    },
+    "pstGeneralParabola[](){}{}{}": {
+      "snippet": "pstGeneralParabola[${4:options}](${5:O}){${1:p}}{${2:x1}}{${3:x2}}"
+    },
+    "pstGeneralParabola[](){}[]{}{}": {
+      "snippet": "pstGeneralParabola[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:x1}}{${3:x2}}"
+    },
+    "pstGeneralParabolaNode(){}{}{}": {
+      "snippet": "pstGeneralParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstGeneralParabolaNode(){}[]{}{}": {
+      "snippet": "pstGeneralParabolaNode(${5:O}){${1:p}}[${2:θ}]{${3:t}}{${4:A}}"
+    },
+    "pstGeneralParabolaNode[](){}{}{}": {
+      "snippet": "pstGeneralParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstGeneralParabolaNode[](){}[]{}{}": {
+      "snippet": "pstGeneralParabolaNode[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:t}}{${3:A}}"
+    },
+    "pstGeneralParabolaAbsNode(){}{}{}{}": {
+      "snippet": "pstGeneralParabolaAbsNode(${5:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabolaAbsNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaAbsNode(${6:O}){${1:p}}[${2:θ}]{${3:x}}{${4:A}}{${5:B}}"
+    },
+    "pstGeneralParabolaAbsNode[](){}{}{}{}": {
+      "snippet": "pstGeneralParabolaAbsNode[${5:options}](${6:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabolaAbsNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaAbsNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabolaOrdNode(){}{}{}{}": {
+      "snippet": "pstGeneralParabolaOrdNode(${5:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabolaOrdNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaOrdNode(${6:O}){${1:p}}[${2:θ}]{${3:y}}{${4:A}}{${5:B}}"
+    },
+    "pstGeneralParabolaOrdNode[](){}{}{}{}": {
+      "snippet": "pstGeneralParabolaOrdNode[${5:options}](${6:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabolaOrdNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaOrdNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:y}}{${3:A}}{${4:B}}"
+    },
     "pstGeneralParabolaFl{}{}{}{}{}{}": {
       "snippet": "pstGeneralParabolaFl{${1:F}}{${2:A}}{${3:B}}{${4:O}}{${5:p}}{${6:θ}}"
     },
@@ -448,10 +883,10 @@
       "snippet": "pstGeneralParabolaFl[${7:options}]{${1:F}}{${2:A}}{${3:B}}{${4:O}}{${5:p}}{${6:θ}}"
     },
     "pstGeneralParabolaCoef{}{}{}{}": {
-      "snippet": "pstGeneralParabolaCoef{${1:a,b,c,d,e,f}}{${2:O}}{${3:p}}{${4:θ}}"
+      "snippet": "pstGeneralParabolaCoef{${1:a,${5:b},${6:c},${7:d},${8:e},f}}{${2:O}}{${3:p}}{${4:θ}}"
     },
     "pstGeneralParabolaCoef[]{}{}{}{}": {
-      "snippet": "pstGeneralParabolaCoef[${5:options}]{${1:a,b,c,d,e,f}}{${2:O}}{${3:p}}{${4:θ}}"
+      "snippet": "pstGeneralParabolaCoef[${5:options}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}{${2:O}}{${3:p}}{${4:θ}}"
     },
     "pstGeneralParabolaABCDE{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralParabolaABCDE{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:p}}{${8:θ}}"
@@ -459,6 +894,372 @@
     "pstGeneralParabolaABCDE[]{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralParabolaABCDE[${9:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:p}}{${8:θ}}"
     },
+    "pstGeneralParabolaFocusNode(){}{}": {
+      "snippet": "pstGeneralParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
+    },
+    "pstGeneralParabolaFocusNode(){}[]{}": {
+      "snippet": "pstGeneralParabolaFocusNode(${4:O}){${1:p}}[${2:θ}]{${3:F}}"
+    },
+    "pstGeneralParabolaFocusNode[](){}{}": {
+      "snippet": "pstGeneralParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
+    },
+    "pstGeneralParabolaFocusNode[](){}[]{}": {
+      "snippet": "pstGeneralParabolaFocusNode[${3:options}](${5:O}){${1:p}}[${4:θ}]{${2:F}}"
+    },
+    "pstGeneralParabolaDirectrixLine(){}{}{}": {
+      "snippet": "pstGeneralParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstGeneralParabolaDirectrixLine(){}[]{}{}": {
+      "snippet": "pstGeneralParabolaDirectrixLine(${5:O}){${1:p}}[${2:θ}]{${3:Lx}}{${4:Ly}}"
+    },
+    "pstGeneralParabolaDirectrixLine[](){}{}{}": {
+      "snippet": "pstGeneralParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstGeneralParabolaDirectrixLine[](){}[]{}{}": {
+      "snippet": "pstGeneralParabolaDirectrixLine[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:Lx}}{${3:Ly}}"
+    },
+    "pstGeneralParabolaLineInter(){}{}{}{}{}": {
+      "snippet": "pstGeneralParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstGeneralParabolaLineInter(){}[]{}{}{}{}": {
+      "snippet": "pstGeneralParabolaLineInter(${7:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:C}}{${6:D}}"
+    },
+    "pstGeneralParabolaLineInter[](){}{}{}{}{}": {
+      "snippet": "pstGeneralParabolaLineInter[${6:options}](${7:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstGeneralParabolaLineInter[](){}[]{}{}{}{}": {
+      "snippet": "pstGeneralParabolaLineInter[${6:options}](${8:O}){${1:p}}[${7:θ}]{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstGeneralParabolaPolarNode(){}{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaPolarNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode(${6:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:T}}"
+    },
+    "pstGeneralParabolaPolarNode(){}(){}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaPolarNode(){}[](){}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode(${6:O}){${1:p}}[${2:θ}](${7:F}){${3:A}}{${4:B}}{${5:T}}"
+    },
+    "pstGeneralParabolaPolarNode(){}()[][]{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
+    },
+    "pstGeneralParabolaPolarNode(){}[]()[][]{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode(${8:O}){${1:p}}[${2:θ}](${9:F})[${3:Lx}][${4:Ly}]{${5:A}}{${6:B}}{${7:T}}"
+    },
+    "pstGeneralParabolaPolarNode[](){}{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaPolarNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaPolarNode[](){}(){}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaPolarNode[](){}[](){}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}](${8:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaPolarNode[](){}()[][]{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaPolarNode[](){}[]()[][]{}{}{}": {
+      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${9:O}){${1:p}}[${6:θ}](${10:F})[${7:Lx}][${8:Ly}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralParabolaTangentNode(){}{}{}{}": {
+      "snippet": "pstGeneralParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabolaTangentNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaTangentNode(${6:O}){${1:p}}[${2:θ}]{${3:T}}{${4:A}}{${5:B}}"
+    },
+    "pstGeneralParabolaTangentNode[](){}{}{}{}": {
+      "snippet": "pstGeneralParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralParabolaTangentNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralParabolaTangentNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabola(){}{}{}": {
+      "snippet": "pstGeneralIParabola(${4:O}){${1:p}}{${2:y1}}{${3:y2}}"
+    },
+    "pstGeneralIParabola[](){}{}{}": {
+      "snippet": "pstGeneralIParabola[${4:options}](${5:O}){${1:p}}{${2:y1}}{${3:y2}}"
+    },
+    "pstGeneralIParabola(){}[]{}{}": {
+      "snippet": "pstGeneralIParabola(${5:O}){${1:p}}[${2:θ}]{${3:y1}}{${4:y2}}"
+    },
+    "pstGeneralIParabola[](){}[]{}{}": {
+      "snippet": "pstGeneralIParabola[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:y1}}{${3:y2}}"
+    },
+    "pstGeneralIParabolaNode(){}{}{}": {
+      "snippet": "pstGeneralIParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstGeneralIParabolaNode[](){}{}{}": {
+      "snippet": "pstGeneralIParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
+    },
+    "pstGeneralIParabolaNode(){}[]{}{}": {
+      "snippet": "pstGeneralIParabolaNode(${5:O}){${1:p}}[${2:θ}]{${3:t}}{${4:A}}"
+    },
+    "pstGeneralIParabolaNode[](){}[]{}{}": {
+      "snippet": "pstGeneralIParabolaNode[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:t}}{${3:A}}"
+    },
+    "pstGeneralIParabolaAbsNode(){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaAbsNode(${5:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaAbsNode[](){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaAbsNode[${5:options}](${6:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaAbsNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaAbsNode(${6:O}){${1:p}}[${2:θ}]{${3:x}}{${4:A}}{${5:B}}"
+    },
+    "pstGeneralIParabolaAbsNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaAbsNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:x}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaOrdNode(){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaOrdNode(${5:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaOrdNode[](){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaOrdNode[${5:options}](${6:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaOrdNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaOrdNode(${6:O}){${1:p}}[${2:θ}]{${3:y}}{${4:A}}{${5:B}}"
+    },
+    "pstGeneralIParabolaOrdNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaOrdNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:y}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaFocusNode(){}{}": {
+      "snippet": "pstGeneralIParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
+    },
+    "pstGeneralIParabolaFocusNode[](){}{}": {
+      "snippet": "pstGeneralIParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
+    },
+    "pstGeneralIParabolaFocusNode(){}[]{}": {
+      "snippet": "pstGeneralIParabolaFocusNode(${4:O}){${1:p}}[${2:θ}]{${3:F}}"
+    },
+    "pstGeneralIParabolaFocusNode[](){}[]{}": {
+      "snippet": "pstGeneralIParabolaFocusNode[${3:options}](${5:O}){${1:p}}[${4:θ}]{${2:F}}"
+    },
+    "pstGeneralIParabolaDirectrixLine(){}{}{}": {
+      "snippet": "pstGeneralIParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstGeneralIParabolaDirectrixLine[](){}{}{}": {
+      "snippet": "pstGeneralIParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
+    },
+    "pstGeneralIParabolaDirectrixLine(){}[]{}{}": {
+      "snippet": "pstGeneralIParabolaDirectrixLine(${5:O}){${1:p}}[${2:θ}]{${3:Lx}}{${4:Ly}}"
+    },
+    "pstGeneralIParabolaDirectrixLine[](){}[]{}{}": {
+      "snippet": "pstGeneralIParabolaDirectrixLine[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:Lx}}{${3:Ly}}"
+    },
+    "pstGeneralIParabolaLineInter(){}{}{}{}{}": {
+      "snippet": "pstGeneralIParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstGeneralIParabolaLineInter[](){}{}{}{}{}": {
+      "snippet": "pstGeneralIParabolaLineInter[${6:options}](${7:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstGeneralIParabolaLineInter(){}[]{}{}{}{}": {
+      "snippet": "pstGeneralIParabolaLineInter(${7:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:C}}{${6:D}}"
+    },
+    "pstGeneralIParabolaLineInter[](){}[]{}{}{}{}": {
+      "snippet": "pstGeneralIParabolaLineInter[${6:options}](${8:O}){${1:p}}[${7:θ}]{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
+    },
+    "pstGeneralIParabolaPolarNode(){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaPolarNode[](){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaPolarNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode(${6:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:T}}"
+    },
+    "pstGeneralIParabolaPolarNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaPolarNode(){}(){}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaPolarNode[](){}(){}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaPolarNode(){}[](){}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode(${6:O}){${1:p}}[${2:θ}](${7:F}){${3:A}}{${4:B}}{${5:T}}"
+    },
+    "pstGeneralIParabolaPolarNode[](){}[](){}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}](${8:F}){${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaPolarNode(){}()[][]{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
+    },
+    "pstGeneralIParabolaPolarNode[](){}()[][]{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaPolarNode(){}[]()[][]{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode(${8:O}){${1:p}}[${2:θ}](${9:F})[${3:Lx}][${4:Ly}]{${5:A}}{${6:B}}{${7:T}}"
+    },
+    "pstGeneralIParabolaPolarNode[](){}[]()[][]{}{}{}": {
+      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${9:O}){${1:p}}[${6:θ}](${10:F})[${7:Lx}][${8:Ly}]{${2:A}}{${3:B}}{${4:T}}"
+    },
+    "pstGeneralIParabolaTangentNode(){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaTangentNode[](){}{}{}{}": {
+      "snippet": "pstGeneralIParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstGeneralIParabolaTangentNode(){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaTangentNode(${6:O}){${1:p}}[${2:θ}]{${3:T}}{${4:A}}{${5:B}}"
+    },
+    "pstGeneralIParabolaTangentNode[](){}[]{}{}{}": {
+      "snippet": "pstGeneralIParabolaTangentNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:T}}{${3:A}}{${4:B}}"
+    },
+    "pstHyperbola()()": {
+      "snippet": "pstHyperbola(${1:O})(${2:a},${3:b})"
+    },
+    "pstHyperbola()()[]": {
+      "snippet": "pstHyperbola(${2:O})(${3:a},${4:b})[${1:angleX}]"
+    },
+    "pstHyperbola[]()()": {
+      "snippet": "pstHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
+    },
+    "pstHyperbola[]()()[]": {
+      "snippet": "pstHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:angleX}]"
+    },
+    "pstHyperbolaNode()(){}{}": {
+      "snippet": "pstHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
+    },
+    "pstHyperbolaNode[]()(){}{}": {
+      "snippet": "pstHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
+    },
+    "pstHyperbolaAbsNode()(){}{}{}": {
+      "snippet": "pstHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstHyperbolaAbsNode[]()(){}{}{}": {
+      "snippet": "pstHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstHyperbolaOrdNode()(){}{}{}": {
+      "snippet": "pstHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstHyperbolaOrdNode[]()(){}{}{}": {
+      "snippet": "pstHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstHyperbolaFocusNode()(){}{}": {
+      "snippet": "pstHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstHyperbolaFocusNode[]()(){}{}": {
+      "snippet": "pstHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstHyperbolaDirectrixLine()(){}{}{}{}": {
+      "snippet": "pstHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstHyperbolaDirectrixLine[]()(){}{}{}{}": {
+      "snippet": "pstHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstHyperbolaAsymptoteLine()(){}{}": {
+      "snippet": "pstHyperbolaAsymptoteLine(${3:O})(${4:a},${5:b}){${1:L1}}{${2:L2}}"
+    },
+    "pstHyperbolaAsymptoteLine[]()(){}{}": {
+      "snippet": "pstHyperbolaAsymptoteLine[${3:options}](${4:O})(${5:a},${6:b}){${1:L1}}{${2:L2}}"
+    },
+    "pstHyperbolaLineInter()(){}{}{}{}": {
+      "snippet": "pstHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstHyperbolaLineInter[]()(){}{}{}{}": {
+      "snippet": "pstHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstHyperbolaPolarNode()(){}{}{}": {
+      "snippet": "pstHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstHyperbolaPolarNode[]()(){}{}{}": {
+      "snippet": "pstHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstHyperbolaTangentNode()(){}{}{}": {
+      "snippet": "pstHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstHyperbolaTangentNode[]()(){}{}{}": {
+      "snippet": "pstHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstIHyperbola()()": {
+      "snippet": "pstIHyperbola(${1:O})(${2:a},${3:b})"
+    },
+    "pstIHyperbola()()[]": {
+      "snippet": "pstIHyperbola(${2:O})(${3:a},${4:b})[${1:angleY}]"
+    },
+    "pstIHyperbola[]()()": {
+      "snippet": "pstIHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
+    },
+    "pstIHyperbola[]()()[]": {
+      "snippet": "pstIHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:angleY}]"
+    },
+    "pstIHyperbolaNode()(){}{}": {
+      "snippet": "pstIHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
+    },
+    "pstIHyperbolaNode[]()(){}{}": {
+      "snippet": "pstIHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
+    },
+    "pstIHyperbolaAbsNode()(){}{}{}": {
+      "snippet": "pstIHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstIHyperbolaAbsNode[]()(){}{}{}": {
+      "snippet": "pstIHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstIHyperbolaOrdNode()(){}{}{}": {
+      "snippet": "pstIHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstIHyperbolaOrdNode[]()(){}{}{}": {
+      "snippet": "pstIHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstIHyperbolaFocusNode()(){}{}": {
+      "snippet": "pstIHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstIHyperbolaFocusNode[]()(){}{}": {
+      "snippet": "pstIHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstIHyperbolaDirectrixLine()(){}{}{}{}": {
+      "snippet": "pstIHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstIHyperbolaDirectrixLine[]()(){}{}{}{}": {
+      "snippet": "pstIHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstIHyperbolaAsymptoteLine()(){}{}": {
+      "snippet": "pstIHyperbolaAsymptoteLine(${3:O})(${4:a},${5:b}){${1:L1}}{${2:L2}}"
+    },
+    "pstIHyperbolaAsymptoteLine[]()(){}{}": {
+      "snippet": "pstIHyperbolaAsymptoteLine[${3:options}](${4:O})(${5:a},${6:b}){${1:L1}}{${2:L2}}"
+    },
+    "pstIHyperbolaLineInter()(){}{}{}{}": {
+      "snippet": "pstIHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstIHyperbolaLineInter[]()(){}{}{}{}": {
+      "snippet": "pstIHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstIHyperbolaPolarNode()(){}{}{}": {
+      "snippet": "pstIHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstIHyperbolaPolarNode[]()(){}{}{}": {
+      "snippet": "pstIHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstIHyperbolaTangentNode()(){}{}{}": {
+      "snippet": "pstIHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstIHyperbolaTangentNode[]()(){}{}{}": {
+      "snippet": "pstIHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbola()()": {
+      "snippet": "pstGeneralHyperbola(${1:O})(${2:a},${3:b})"
+    },
+    "pstGeneralHyperbola()()[]": {
+      "snippet": "pstGeneralHyperbola(${2:O})(${3:a},${4:b})[${1:θ}]"
+    },
+    "pstGeneralHyperbola()()[][]": {
+      "snippet": "pstGeneralHyperbola(${3:O})(${4:a},${5:b})[${1:θ}][${2:angleX}]"
+    },
+    "pstGeneralHyperbola[]()()": {
+      "snippet": "pstGeneralHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
+    },
+    "pstGeneralHyperbola[]()()[]": {
+      "snippet": "pstGeneralHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:θ}]"
+    },
+    "pstGeneralHyperbola[]()()[][]": {
+      "snippet": "pstGeneralHyperbola[${1:options}](${4:O})(${5:a},${6:b})[${2:θ}][${3:angleX}]"
+    },
     "pstGeneralHyperbolaFle{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralHyperbolaFle{${1:F}}{${2:A}}{${3:B}}{${4:e}}{${5:O}}{${6:Rab}}{${7:θ}}"
     },
@@ -472,10 +1273,10 @@
       "snippet": "pstGeneralHyperbolaFFN[${6:options}]{${1:F1}}{${2:F2}}{${3:O}}{${4:Rab}}{${5:θ}}"
     },
     "pstGeneralHyperbolaCoef{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaCoef{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralHyperbolaCoef{${1:a,${5:b},${6:c},${7:d},${8:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralHyperbolaCoef[]{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaCoef[${5:options}]{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralHyperbolaCoef[${5:options}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralHyperbolaABCDE{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralHyperbolaABCDE{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
@@ -483,113 +1284,425 @@
     "pstGeneralHyperbolaABCDE[]{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralHyperbolaABCDE[${9:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
     },
+    "pstGeneralHyperbolaNode()(){}{}": {
+      "snippet": "pstGeneralHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
+    },
+    "pstGeneralHyperbolaNode()()[]{}{}": {
+      "snippet": "pstGeneralHyperbolaNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:t}}{${2:A}}"
+    },
+    "pstGeneralHyperbolaNode[]()(){}{}": {
+      "snippet": "pstGeneralHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
+    },
+    "pstGeneralHyperbolaNode[]()()[]{}{}": {
+      "snippet": "pstGeneralHyperbolaNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:A}}"
+    },
+    "pstGeneralHyperbolaAbsNode()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaAbsNode()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaAbsNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaAbsNode[]()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaAbsNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaAbsNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaOrdNode()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaOrdNode()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaOrdNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaOrdNode[]()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaOrdNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaOrdNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaFocusNode()(){}{}": {
+      "snippet": "pstGeneralHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralHyperbolaFocusNode()()[]{}{}": {
+      "snippet": "pstGeneralHyperbolaFocusNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralHyperbolaFocusNode[]()(){}{}": {
+      "snippet": "pstGeneralHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralHyperbolaFocusNode[]()()[]{}{}": {
+      "snippet": "pstGeneralHyperbolaFocusNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralHyperbolaVertexNode()(){}{}": {
+      "snippet": "pstGeneralHyperbolaVertexNode(${3:O})(${4:a},${5:b}){${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralHyperbolaVertexNode()()[]{}{}": {
+      "snippet": "pstGeneralHyperbolaVertexNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralHyperbolaVertexNode[]()(){}{}": {
+      "snippet": "pstGeneralHyperbolaVertexNode[${3:options}](${4:O})(${5:a},${6:b}){${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralHyperbolaVertexNode[]()()[]{}{}": {
+      "snippet": "pstGeneralHyperbolaVertexNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralHyperbolaDirectrixLine()(){}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralHyperbolaDirectrixLine()()[]{}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaDirectrixLine(${6:O})(${7:a},${8:b})[${5:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralHyperbolaDirectrixLine[]()(){}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralHyperbolaDirectrixLine[]()()[]{}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaDirectrixLine[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralHyperbolaLineInter()(){}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralHyperbolaLineInter()()[]{}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaLineInter(${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralHyperbolaLineInter[]()(){}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralHyperbolaLineInter[]()()[]{}{}{}{}": {
+      "snippet": "pstGeneralHyperbolaLineInter[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralHyperbolaPolarNode()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralHyperbolaPolarNode()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaPolarNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralHyperbolaPolarNode[]()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralHyperbolaPolarNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaPolarNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralHyperbolaTangentNode()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaTangentNode()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaTangentNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaTangentNode[]()(){}{}{}": {
+      "snippet": "pstGeneralHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralHyperbolaTangentNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralHyperbolaTangentNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbola()()": {
+      "snippet": "pstGeneralIHyperbola(${1:O})(${2:a},${3:b})"
+    },
+    "pstGeneralIHyperbola()()[]": {
+      "snippet": "pstGeneralIHyperbola(${2:O})(${3:a},${4:b})[${1:θ}]"
+    },
+    "pstGeneralIHyperbola()()[][]": {
+      "snippet": "pstGeneralIHyperbola(${3:O})(${4:a},${5:b})[${1:θ}][${2:angleY}]"
+    },
+    "pstGeneralIHyperbola[]()()": {
+      "snippet": "pstGeneralIHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
+    },
+    "pstGeneralIHyperbola[]()()[]": {
+      "snippet": "pstGeneralIHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:θ}]"
+    },
+    "pstGeneralIHyperbola[]()()[][]": {
+      "snippet": "pstGeneralIHyperbola[${1:options}](${4:O})(${5:a},${6:b})[${2:θ}][${3:angleY}]"
+    },
+    "pstGeneralIHyperbolaNode()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
+    },
+    "pstGeneralIHyperbolaNode()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:t}}{${2:A}}"
+    },
+    "pstGeneralIHyperbolaNode[]()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
+    },
+    "pstGeneralIHyperbolaNode[]()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:A}}"
+    },
+    "pstGeneralIHyperbolaAbsNode()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaAbsNode()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaAbsNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaAbsNode[]()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaAbsNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaAbsNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:x}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaOrdNode()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaOrdNode()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaOrdNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaOrdNode[]()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaOrdNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaOrdNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:y}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaFocusNode()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralIHyperbolaFocusNode()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaFocusNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralIHyperbolaFocusNode[]()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralIHyperbolaFocusNode[]()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaFocusNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:F1}}{${2:F2}}"
+    },
+    "pstGeneralIHyperbolaVertexNode()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaVertexNode(${3:O})(${4:a},${5:b}){${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralIHyperbolaVertexNode()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaVertexNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralIHyperbolaVertexNode[]()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaVertexNode[${3:options}](${4:O})(${5:a},${6:b}){${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralIHyperbolaVertexNode[]()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaVertexNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:V1}}{${2:V2}}"
+    },
+    "pstGeneralIHyperbolaDirectrixLine()(){}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralIHyperbolaDirectrixLine()()[]{}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaDirectrixLine(${6:O})(${7:a},${8:b})[${5:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralIHyperbolaDirectrixLine[]()(){}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralIHyperbolaDirectrixLine[]()()[]{}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaDirectrixLine[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
+    },
+    "pstGeneralIHyperbolaAsymptoteLine()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaAsymptoteLine(${3:O})(${4:a},${5:b}){${1:L1}}{${2:L2}}"
+    },
+    "pstGeneralIHyperbolaAsymptoteLine()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaAsymptoteLine(${4:O})(${5:a},${6:b})[${3:θ}]{${1:L1}}{${2:L2}}"
+    },
+    "pstGeneralIHyperbolaAsymptoteLine[]()(){}{}": {
+      "snippet": "pstGeneralIHyperbolaAsymptoteLine[${3:options}](${4:O})(${5:a},${6:b}){${1:L1}}{${2:L2}}"
+    },
+    "pstGeneralIHyperbolaAsymptoteLine[]()()[]{}{}": {
+      "snippet": "pstGeneralIHyperbolaAsymptoteLine[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:L1}}{${2:L2}}"
+    },
+    "pstGeneralIHyperbolaLineInter()(){}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralIHyperbolaLineInter()()[]{}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaLineInter(${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralIHyperbolaLineInter[]()(){}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralIHyperbolaLineInter[]()()[]{}{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaLineInter[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
+    },
+    "pstGeneralIHyperbolaPolarNode()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralIHyperbolaPolarNode()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaPolarNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralIHyperbolaPolarNode[]()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralIHyperbolaPolarNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaPolarNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:T}}"
+    },
+    "pstGeneralIHyperbolaTangentNode()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaTangentNode()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaTangentNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaTangentNode[]()(){}{}{}": {
+      "snippet": "pstGeneralIHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
+    },
+    "pstGeneralIHyperbolaTangentNode[]()()[]{}{}{}": {
+      "snippet": "pstGeneralIHyperbolaTangentNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:T}}{${2:A}}{${3:B}}"
+    },
     "pstGeneralConicEquation{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicEquation{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,b,c,d,e,f}}"
+      "snippet": "pstGeneralConicEquation{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,${8:b},${9:c},${10:d},${11:e},f}}"
     },
     "pstGeneralConicEquation[]{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicEquation[${8:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,b,c,d,e,f}}"
+      "snippet": "pstGeneralConicEquation[${8:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,${9:b},${10:c},${11:d},${12:e},f}}"
+    },
+    "pstGeneralEllipseEquation()(){}": {
+      "snippet": "pstGeneralEllipseEquation(${2:O})(${3:a},${4:b}){${1:a,${5:b},${6:c},${7:d},${8:e},f}}"
+    },
+    "pstGeneralEllipseEquation[]()(){}": {
+      "snippet": "pstGeneralEllipseEquation[${2:options}](${3:O})(${4:a},${5:b}){${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
+    },
+    "pstGeneralEllipseEquation()()[]{}": {
+      "snippet": "pstGeneralEllipseEquation(${3:O})(${4:a},${5:b})[${2:θ}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
+    },
+    "pstGeneralEllipseEquation[]()()[]{}": {
+      "snippet": "pstGeneralEllipseEquation[${2:options}](${4:O})(${5:a},${6:b})[${3:θ}]{${1:a,${7:b},${8:c},${9:d},${10:e},f}}"
+    },
+    "pstGeneralHyperbolaEquation()(){}": {
+      "snippet": "pstGeneralHyperbolaEquation(${2:O})(${3:a},${4:b}){${1:a,${5:b},${6:c},${7:d},${8:e},f}}"
+    },
+    "pstGeneralHyperbolaEquation()()[]{}": {
+      "snippet": "pstGeneralHyperbolaEquation(${3:O})(${4:a},${5:b})[${2:θ}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
+    },
+    "pstGeneralHyperbolaEquation[]()(){}": {
+      "snippet": "pstGeneralHyperbolaEquation[${2:options}](${3:O})(${4:a},${5:b}){${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
+    },
+    "pstGeneralHyperbolaEquation[]()()[]{}": {
+      "snippet": "pstGeneralHyperbolaEquation[${2:options}](${4:O})(${5:a},${6:b})[${3:θ}]{${1:a,${7:b},${8:c},${9:d},${10:e},f}}"
+    },
+    "pstGeneralParabolaEquation(){}{}": {
+      "snippet": "pstGeneralParabolaEquation(${3:O}){${1:p}}{${2:a,${4:b},${5:c},${6:d},${7:e},f}}"
+    },
+    "pstGeneralParabolaEquation(){}[]{}": {
+      "snippet": "pstGeneralParabolaEquation(${4:O}){${1:p}}[${2:θ}]{${3:a,${5:b},${6:c},${7:d},${8:e},f}}"
+    },
+    "pstGeneralParabolaEquation[](){}{}": {
+      "snippet": "pstGeneralParabolaEquation[${3:options}](${4:O}){${1:p}}{${2:a,${5:b},${6:c},${7:d},${8:e},f}}"
+    },
+    "pstGeneralParabolaEquation[](){}[]{}": {
+      "snippet": "pstGeneralParabolaEquation[${3:options}](${5:O}){${1:p}}[${4:θ}]{${2:a,${6:b},${7:c},${8:d},${9:e},f}}"
     },
     "pstGeneralConicLineInter{}{}{}{}{}": {
-      "snippet": "pstGeneralConicLineInter{${1:A}}{${2:B}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}"
+      "snippet": "pstGeneralConicLineInter{${1:A}}{${2:B}}{${3:a,${6:b},${7:c},${8:d},${9:e},f}}{${4:C}}{${5:D}}"
     },
     "pstGeneralConicLineInter[]{}{}{}{}{}": {
-      "snippet": "pstGeneralConicLineInter[${6:options}]{${1:A}}{${2:B}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}"
+      "snippet": "pstGeneralConicLineInter[${6:options}]{${1:A}}{${2:B}}{${3:a,${7:b},${8:c},${9:d},${10:e},f}}{${4:C}}{${5:D}}"
     },
     "pstGeneralConicCircleInter{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicCircleInter{${1:O}}{${2:A}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
+      "snippet": "pstGeneralConicCircleInter{${1:O}}{${2:A}}{${3:a,${8:b},${9:c},${10:d},${11:e},f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
     },
     "pstGeneralConicCircleInter[]{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicCircleInter[${8:options}]{${1:O}}{${2:A}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
+      "snippet": "pstGeneralConicCircleInter[${8:options}]{${1:O}}{${2:A}}{${3:a,${9:b},${10:c},${11:d},${12:e},f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
+    },
+    "pstGeneralConicEllipseInter()(){}{}{}{}{}": {
+      "snippet": "pstGeneralConicEllipseInter(${6:O})(${7:m},${8:n}){${1:a,${9:b},${10:c},${11:d},${12:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
+    },
+    "pstGeneralConicEllipseInter[]()(){}{}{}{}{}": {
+      "snippet": "pstGeneralConicEllipseInter[${6:options}](${7:O})(${8:m},${9:n}){${1:a,${10:b},${11:c},${12:d},${13:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
+    },
+    "pstGeneralConicHyperbolaInter()(){}{}{}{}{}": {
+      "snippet": "pstGeneralConicHyperbolaInter(${6:O})(${7:m},${8:n}){${1:a,${9:b},${10:c},${11:d},${12:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
+    },
+    "pstGeneralConicHyperbolaInter[]()(){}{}{}{}{}": {
+      "snippet": "pstGeneralConicHyperbolaInter[${6:options}](${7:O})(${8:m},${9:n}){${1:a,${10:b},${11:c},${12:d},${13:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
+    },
+    "pstGeneralConicIHyperbolaInter()(){}{}{}{}{}": {
+      "snippet": "pstGeneralConicIHyperbolaInter(${6:O})(${7:m},${8:n}){${1:a,${9:b},${10:c},${11:d},${12:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
+    },
+    "pstGeneralConicIHyperbolaInter[]()(){}{}{}{}{}": {
+      "snippet": "pstGeneralConicIHyperbolaInter[${6:options}](${7:O})(${8:m},${9:n}){${1:a,${10:b},${11:c},${12:d},${13:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
+    },
+    "pstGeneralConicParabolaInter(){}{}{}{}{}{}": {
+      "snippet": "pstGeneralConicParabolaInter(${7:O}){${1:p}}{${2:a,${8:b},${9:c},${10:d},${11:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
+    },
+    "pstGeneralConicParabolaInter[](){}{}{}{}{}{}": {
+      "snippet": "pstGeneralConicParabolaInter[${7:options}](${8:O}){${1:p}}{${2:a,${9:b},${10:c},${11:d},${12:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
+    },
+    "pstGeneralConicIParabolaInter(){}{}{}{}{}{}": {
+      "snippet": "pstGeneralConicIParabolaInter(${7:O}){${1:p}}{${2:a,${8:b},${9:c},${10:d},${11:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
+    },
+    "pstGeneralConicIParabolaInter[](){}{}{}{}{}{}": {
+      "snippet": "pstGeneralConicIParabolaInter[${7:options}](${8:O}){${1:p}}{${2:a,${9:b},${10:c},${11:d},${12:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
     },
     "pstGeneralConicInter{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicInter{${1:a,b,c,d,e,f}}{${2:a',b',c',d',e',f'}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
+      "snippet": "pstGeneralConicInter{${1:a,${7:b},${8:c},${9:d},${10:e},${11:f}}{${2:a'},${12:b'},${13:c'},${14:d'},${15:e'},f'}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
     },
     "pstGeneralConicTangentLine{}{}{}": {
-      "snippet": "pstGeneralConicTangentLine{${1:A}}{${2:a,b,c,d,e,f}}{${3:B}}"
+      "snippet": "pstGeneralConicTangentLine{${1:A}}{${2:a,${4:b},${5:c},${6:d},${7:e},f}}{${3:B}}"
     },
     "pstGeneralConicTangentLine[]{}{}{}": {
-      "snippet": "pstGeneralConicTangentLine[${4:options}]{${1:A}}{${2:a,b,c,d,e,f}}{${3:B}}"
+      "snippet": "pstGeneralConicTangentLine[${4:options}]{${1:A}}{${2:a,${5:b},${6:c},${7:d},${8:e},f}}{${3:B}}"
     },
     "pstGeneralConicTangentChord{}{}{}{}": {
-      "snippet": "pstGeneralConicTangentChord{${1:T}}{${2:a,b,c,d,e,f}}{${3:A}}{${4:B}}"
+      "snippet": "pstGeneralConicTangentChord{${1:T}}{${2:a,${5:b},${6:c},${7:d},${8:e},f}}{${3:A}}{${4:B}}"
     },
     "pstGeneralConicTangentChord[]{}{}{}{}": {
-      "snippet": "pstGeneralConicTangentChord[${5:options}]{${1:T}}{${2:a,b,c,d,e,f}}{${3:A}}{${4:B}}"
+      "snippet": "pstGeneralConicTangentChord[${5:options}]{${1:T}}{${2:a,${6:b},${7:c},${8:d},${9:e},f}}{${3:A}}{${4:B}}"
     },
     "pstSymO{}{}": {
-      "snippet": "pstSymO{${1:O}}{${2:M1,...,Mn}}"
+      "snippet": "pstSymO{${1:O}}{${2:M1,${3:...},Mn}}"
     },
     "pstSymO{}{}[]": {
-      "snippet": "pstSymO{${1:O}}{${2:M1,...,Mn}}[${3:M1',...,Mn'}]"
+      "snippet": "pstSymO{${1:O}}{${2:M1,${4:...},${5:Mn}}[${3:M1'},${6:...},Mn'}]"
     },
     "pstSymO[]{}{}": {
-      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,...,Mn}}"
+      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,${4:...},Mn}}"
     },
     "pstSymO[]{}{}[]": {
-      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,...,Mn}}[${4:M1',...,Mn'}]"
+      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
     },
     "pstOrtSym{}{}{}": {
-      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
+      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,${4:...},Mn}}"
     },
     "pstOrtSym{}{}{}[]": {
-      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${4:M1',...,Mn'}]"
+      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
     },
     "pstOrtSym[]{}{}{}": {
-      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
+      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,${5:...},Mn}}"
     },
     "pstOrtSym[]{}{}{}[]": {
-      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${5:M1',...,Mn'}]"
+      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,${6:...},${7:Mn}}[${5:M1'},${8:...},Mn'}]"
     },
     "pstRotation{}{}": {
-      "snippet": "pstRotation{${1:O}}{${2:M1,...,Mn}}"
+      "snippet": "pstRotation{${1:O}}{${2:M1,${3:...},Mn}}"
     },
     "pstRotation{}{}[]": {
-      "snippet": "pstRotation{${1:O}}{${2:M1,...,Mn}}[${3:M1',...,Mn'}]"
+      "snippet": "pstRotation{${1:O}}{${2:M1,${4:...},${5:Mn}}[${3:M1'},${6:...},Mn'}]"
     },
     "pstRotation[]{}{}": {
-      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,...,Mn}}"
+      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,${4:...},Mn}}"
     },
     "pstRotation[]{}{}[]": {
-      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,...,Mn}}[${4:M1',...,Mn'}]"
+      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
     },
     "pstAngleAOB{}{}{}": {
       "snippet": "pstAngleAOB{${1:A}}{${2:O}}{${3:B}}"
     },
     "pstTranslation{}{}{}": {
-      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
+      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,${4:...},Mn}}"
     },
     "pstTranslation{}{}{}[]": {
-      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${4:M1',...,Mn'}]"
+      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
     },
     "pstTranslation[]{}{}{}": {
-      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
+      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,${5:...},Mn}}"
     },
     "pstTranslation[]{}{}{}[]": {
-      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${5:M1',...,Mn'}]"
+      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,${6:...},${7:Mn}}[${5:M1'},${8:...},Mn'}]"
     },
     "pstHomO{}{}": {
-      "snippet": "pstHomO{${1:O}}{${2:M1,...,Mn}}"
+      "snippet": "pstHomO{${1:O}}{${2:M1,${3:...},Mn}}"
     },
     "pstHomO{}{}[]": {
-      "snippet": "pstHomO{${1:O}}{${2:M1,...,Mn}}[${3:M1',...,Mn'}]"
+      "snippet": "pstHomO{${1:O}}{${2:M1,${4:...},${5:Mn}}[${3:M1'},${6:...},Mn'}]"
     },
     "pstHomO[]{}{}": {
-      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,...,Mn}}"
+      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,${4:...},Mn}}"
     },
     "pstHomO[]{}{}[]": {
-      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,...,Mn}}[${4:M1',...,Mn'}]"
+      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
     },
     "pstProjection{}{}{}": {
-      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
+      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,${4:...},Mn}}"
     },
     "pstProjection{}{}{}[]": {
-      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${4:M1',...,Mn'}]"
+      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
     },
     "pstProjection[]{}{}{}": {
-      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
+      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,${5:...},Mn}}"
     },
     "pstProjection[]{}{}{}[]": {
-      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${5:M1',...,Mn'}]"
+      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,${6:...},${7:Mn}}[${5:M1'},${8:...},Mn'}]"
     },
     "pstMiddleAB{}{}{}": {
       "snippet": "pstMiddleAB{${1:A}}{${2:B}}{${3:I}}"
@@ -663,6 +1776,18 @@
     "pstInterFC[]{}{}{}{}{}": {
       "snippet": "pstInterFC[${6:options}]{${1:f}}{${2:O}}{${3:A}}{${4:x0}}{${5:M}}"
     },
+    "psGetDistanceAB()(){}": {
+      "snippet": "psGetDistanceAB(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:name}}"
+    },
+    "psGetDistanceAB[]()(){}": {
+      "snippet": "psGetDistanceAB[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:name}}"
+    },
+    "psGetAngleABC()()(){}": {
+      "snippet": "psGetAngleABC(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3}){${1:name}}"
+    },
+    "psGetAngleABC[]()()(){}": {
+      "snippet": "psGetAngleABC[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:name}}"
+    },
     "AngleMarkCirc": {},
     "AngleMarkCros": {},
     "AngleMarkCross": {},
diff --git a/dev/packages/pst-feyn.json b/dev/packages/pst-feyn.json
index a3e319bad..6435be708 100644
--- a/dev/packages/pst-feyn.json
+++ b/dev/packages/pst-feyn.json
@@ -4,10 +4,139 @@
     "pst-xkey": []
   },
   "macros": {
+    "psArrowArc()()": {
+      "snippet": "psArrowArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
+    },
+    "psArrowArc[]()()": {
+      "snippet": "psArrowArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
+    },
+    "psArrowArcn()()": {
+      "snippet": "psArrowArcn(${1:x},${2:y})(${3:φ1},${4:φ2})"
+    },
+    "psArrowArcn[]()()": {
+      "snippet": "psArrowArcn[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
+    },
+    "psArrowLine()()": {
+      "snippet": "psArrowLine(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psArrowLine[]()()": {
+      "snippet": "psArrowLine[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "psBCirc(){}": {
+      "snippet": "psBCirc(${2:x},${3:y}){${1:radius}}"
+    },
+    "psBCirc[](){}": {
+      "snippet": "psBCirc[${2:options}](${3:x},${4:y}){${1:radius}}"
+    },
+    "psBText(){}": {
+      "snippet": "psBText(${2:x},${3:y}){${1:text}}"
+    },
+    "psBText[](){}": {
+      "snippet": "psBText[${2:options}](${3:x},${4:y}){${1:text}}"
+    },
+    "psCArc()()": {
+      "snippet": "psCArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
+    },
+    "psCArc[]()()": {
+      "snippet": "psCArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
+    },
+    "psCCirc(){}{}{}": {
+      "snippet": "psCCirc(${4:x},${5:y}){${1:radius}}{${2:color}}{${3:color}}"
+    },
+    "psCCirc[](){}{}{}": {
+      "snippet": "psCCirc[${4:options}](${5:x},${6:y}){${1:radius}}{${2:color}}{${3:color}}"
+    },
+    "psCText(){}{}{}": {
+      "snippet": "psCText(${4:x},${5:y}){${1:color}}{${2:color}}{${3:text}}"
+    },
+    "psCText[](){}{}{}": {
+      "snippet": "psCText[${4:options}](${5:x},${6:y}){${1:color}}{${2:color}}{${3:text}}"
+    },
+    "psGluonArc()()": {
+      "snippet": "psGluonArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
+    },
+    "psGluonArc[]()()": {
+      "snippet": "psGluonArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
+    },
+    "psGluon()()": {
+      "snippet": "psGluon(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psGluon[]()()": {
+      "snippet": "psGluon[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "psPhoton()()": {
+      "snippet": "psPhoton(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psPhoton[]()()": {
+      "snippet": "psPhoton[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "psPhotonArc()()": {
+      "snippet": "psPhotonArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
+    },
+    "psPhotonArc[]()()": {
+      "snippet": "psPhotonArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
+    },
+    "psPText()(){}": {
+      "snippet": "psPText(${2:x},${3:y})(${4:φ}){${1:text}}"
+    },
+    "psPText[]()(){}": {
+      "snippet": "psPText[${2:mode}](${3:x},${4:y})(${5:φ}){${1:text}}"
+    },
+    "psText(){}": {
+      "snippet": "psText(${2:x},${3:y}){${1:text}}"
+    },
+    "psText[](){}": {
+      "snippet": "psText[${2:mode}](${3:x},${4:y}){${1:text}}"
+    },
+    "psZigZag()()": {
+      "snippet": "psZigZag(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psZigZag[]()()": {
+      "snippet": "psZigZag[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "psLinAxis()()()": {
+      "snippet": "psLinAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:num_decs},${6:per_dec},${7:hashsize},${8:offset})"
+    },
+    "psLogAxis()()()": {
+      "snippet": "psLogAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:num_logs},${6:hashsize},${7:offset})"
+    },
     "axoxoff": {},
     "axoyoff": {},
     "axoxo": {},
     "axoyo": {},
+    "psLongArrowArc()()": {
+      "snippet": "psLongArrowArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
+    },
+    "psLongArrowArc[]()()": {
+      "snippet": "psLongArrowArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
+    },
+    "DashArrowArc()(){}": {
+      "snippet": "DashArrowArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "LongArrowArcn()()": {
+      "snippet": "LongArrowArcn(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
+    },
+    "DashArrowArcn()(){}": {
+      "snippet": "DashArrowArcn(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
+    },
+    "LongArrow()()": {
+      "snippet": "LongArrow(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "DashArrowLine()(){}": {
+      "snippet": "DashArrowLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
+    },
+    "psGCirc(){}{}": {
+      "snippet": "psGCirc(${3:x},${4:y}){${1:radius}}{${2:gray color spec}}"
+    },
+    "psGCirc[](){}{}": {
+      "snippet": "psGCirc[${3:options}](${4:x},${5:y}){${1:radius}}{${2:gray colorspec}}"
+    },
+    "psGText(){}{}": {
+      "snippet": "psGText(${3:x},${4:y}){${1:gray colorspec}}{${2:text}}"
+    },
+    "psGText[](){}{}": {
+      "snippet": "psGText[${3:options}](${4:x},${5:y}){${1:gray colorspec}}{${2:text}}"
+    },
     "PSTFeynLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-fractal.json b/dev/packages/pst-fractal.json
index 8aa9cf972..738d2f691 100644
--- a/dev/packages/pst-fractal.json
+++ b/dev/packages/pst-fractal.json
@@ -10,43 +10,109 @@
     "psCantor[]": {
       "snippet": "psCantor[${1:options}]"
     },
+    "psSier()()()": {
+      "snippet": "psSier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "psSier(){}{}": {
+      "snippet": "psSier(${3:x0},${4:y0}){${1:base}}{${2:recursion}}"
+    },
     "psSier[]": {
       "snippet": "psSier[${1:options}]"
     },
+    "psSier[]()()()": {
+      "snippet": "psSier[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
+    "psSier[](){}{}": {
+      "snippet": "psSier[${3:options}](${4:x0},${5:y0}){${1:base}}{${2:recursion}}"
+    },
     "psSierCarpet": {},
+    "psSierCarpet()": {
+      "snippet": "psSierCarpet(${1:x},${2:y})"
+    },
     "psSierCarpet[]": {
       "snippet": "psSierCarpet[${1:options}]"
     },
+    "psSierCarpet[]()": {
+      "snippet": "psSierCarpet[${1:options}](${2:x},${3:y})"
+    },
     "psfractal": {},
     "psfractal[]": {
       "snippet": "psfractal[${1:options}]"
     },
+    "psfractal()()": {
+      "snippet": "psfractal(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psfractal[]()()": {
+      "snippet": "psfractal[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "psPhyllotaxis": {},
     "psPhyllotaxis[]": {
       "snippet": "psPhyllotaxis[${1:options}]"
     },
+    "psPhyllotaxis()": {
+      "snippet": "psPhyllotaxis(${1:x},${2:y})"
+    },
+    "psPhyllotaxis[]()": {
+      "snippet": "psPhyllotaxis[${1:options}](${2:x},${3:y})"
+    },
     "psFern": {},
     "psFern[]": {
       "snippet": "psFern[${1:options}]"
     },
+    "psFern()": {
+      "snippet": "psFern(${1:x},${2:y})"
+    },
+    "psFern[]()": {
+      "snippet": "psFern[${1:options}](${2:x},${3:y})"
+    },
     "psKochflake": {},
     "psKochflake[]": {
       "snippet": "psKochflake[${1:options}]"
     },
+    "psKochflake()": {
+      "snippet": "psKochflake(${1:x},${2:y})"
+    },
+    "psKochflake[]()": {
+      "snippet": "psKochflake[${1:options}](${2:x},${3:y})"
+    },
     "psAppolonius": {},
     "psAppolonius[]": {
       "snippet": "psAppolonius[${1:options}]"
     },
+    "psAppolonius()": {
+      "snippet": "psAppolonius(${1:x},${2:y})"
+    },
+    "psAppolonius[]()": {
+      "snippet": "psAppolonius[${1:options}](${2:x},${3:y})"
+    },
     "psPTree": {},
     "psPTree[]": {
       "snippet": "psPTree[${1:options}]"
     },
+    "psPTree()": {
+      "snippet": "psPTree(${1:x},${2:y})"
+    },
+    "psPTree[]()": {
+      "snippet": "psPTree[${1:options}](${2:x},${3:y})"
+    },
     "psFArrow{}": {
       "snippet": "psFArrow{${1:fraction}}"
     },
     "psFArrow[]{}": {
       "snippet": "psFArrow[${2:options}]{${1:fraction}}"
     },
+    "psFArrow(){}": {
+      "snippet": "psFArrow(${2:x},${3:y}){${1:fraction}}"
+    },
+    "psFArrow[](){}": {
+      "snippet": "psFArrow[${2:options}](${3:x},${4:y}){${1:fraction}}"
+    },
+    "psFibonacciWord()": {
+      "snippet": "psFibonacciWord(${1:x},${2:y})"
+    },
+    "psFibonacciWord[]()": {
+      "snippet": "psFibonacciWord[${1:options}](${2:x},${3:y})"
+    },
     "psFibonacci": {},
     "psFibonacci[]": {
       "snippet": "psFibonacci[${1:options}]"
@@ -62,12 +128,21 @@
     "pskFibonacci[]": {
       "snippet": "pskFibonacci[${1:options}]"
     },
+    "pskFibonacci[]()": {
+      "snippet": "pskFibonacci[${1:options}](${2:x},${3:y})"
+    },
     "psBiperiodicFibonacci[]": {
       "snippet": "psBiperiodicFibonacci[${1:options}]"
     },
+    "psBiperiodicFibonacci[]()": {
+      "snippet": "psBiperiodicFibonacci[${1:options}](${2:x},${3:y})"
+    },
     "psFibonacciPolyominoes[]": {
       "snippet": "psFibonacciPolyominoes[${1:options}]"
     },
+    "psFibonacciPolyominoes[]()": {
+      "snippet": "psFibonacciPolyominoes[${1:options}](${2:x},${3:y})"
+    },
     "psHilbert": {},
     "psHilbert[]": {
       "snippet": "psHilbert[${1:options}]"
@@ -80,6 +155,12 @@
     "psHugo[]": {
       "snippet": "psHugo[${1:options}]"
     },
+    "psHugo()": {
+      "snippet": "psHugo(${1:x},${2:y})"
+    },
+    "psHugo[]()": {
+      "snippet": "psHugo[${1:options}](${2:x},${3:y})"
+    },
     "psdotcolor": {},
     "pscolorF": {},
     "PSTfractalLoaded": {}
diff --git a/dev/packages/pst-fun.json b/dev/packages/pst-fun.json
index 73e5fab64..3fbfdbd23 100644
--- a/dev/packages/pst-fun.json
+++ b/dev/packages/pst-fun.json
@@ -44,6 +44,12 @@
     "psKangaroo[]{}": {
       "snippet": "psKangaroo[${2:options}]{${1:scale}}"
     },
+    "psPig()": {
+      "snippet": "psPig(${1:x},${2:y})"
+    },
+    "psPig[]()": {
+      "snippet": "psPig[${1:options}](${2:x},${3:y})"
+    },
     "PSTfunLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-func.json b/dev/packages/pst-func.json
index e485b7534..4931b29db 100644
--- a/dev/packages/pst-func.json
+++ b/dev/packages/pst-func.json
@@ -18,6 +18,42 @@
     "psPolynomial[]{}{}": {
       "snippet": "psPolynomial[${3:options}]{${1:x start}}{${2:x end}}"
     },
+    "psBernstein()": {
+      "snippet": "psBernstein(${1:i},${2:n})"
+    },
+    "psBernstein()()": {
+      "snippet": "psBernstein(${1:t0},${2:t1})(${3:i},${4:n})"
+    },
+    "psBernstein[]()": {
+      "snippet": "psBernstein[${1:options}](${2:i},${3:n})"
+    },
+    "psBernstein[]()()": {
+      "snippet": "psBernstein[${1:options}](${2:t0},${3:t1})(${4:i},${5:n})"
+    },
+    "psLaguerre()": {
+      "snippet": "psLaguerre(${1:x0},${2:x1})"
+    },
+    "psLaguerre[]()": {
+      "snippet": "psLaguerre[${1:options}](${2:x0},${3:x1})"
+    },
+    "psLegendre()": {
+      "snippet": "psLegendre(${1:x0},${2:x1})"
+    },
+    "psLegendre[]()": {
+      "snippet": "psLegendre[${1:options}](${2:x0},${3:x1})"
+    },
+    "psZero(){}{}": {
+      "snippet": "psZero(${3:x0},${4:x1}){${1:function}}{${2:node name}}"
+    },
+    "psZero(){}[]{}": {
+      "snippet": "psZero(${4:x0},${5:x1}){${1:functionA}}[${2:functionB}]{${3:node name}}"
+    },
+    "psZero[](){}{}": {
+      "snippet": "psZero[${3:options}](${4:x0},${5:x1}){${1:function}}{${2:node name}}"
+    },
+    "psZero[](){}[]{}": {
+      "snippet": "psZero[${3:options}](${5:x0},${6:x1}){${1:functionA}}[${4:functionB}]{${2:node name}}"
+    },
     "psFourier{}{}": {
       "snippet": "psFourier{${1:x0}}{${2:x1}}"
     },
@@ -60,12 +96,24 @@
     "psci[]{}{}": {
       "snippet": "psci[${3:options}]{${1:x0}}{${2:x1}}"
     },
+    "psIntegral{}{}(){}": {
+      "snippet": "psIntegral{${1:x0}}{${2:x1}}(${4:a},${5:b}){${3:function}}"
+    },
+    "psIntegral[]{}{}(){}": {
+      "snippet": "psIntegral[${4:options}]{${1:x0}}{${2:x1}}(${5:a},${6:b}){${3:function}}"
+    },
     "psCumIntegral{}{}{}": {
       "snippet": "psCumIntegral{${1:x0}}{${2:x1}}{${3:function}}"
     },
     "psCumIntegral[]{}{}{}": {
       "snippet": "psCumIntegral[${4:options}]{${1:x0}}{${2:x1}}{${3:function}}"
     },
+    "psConv{}{}(){}{}": {
+      "snippet": "psConv{${1:x0}}{${2:x1}}(${5:a},${6:b}){${3:function f}}{${4:function g}}"
+    },
+    "psConv[]{}{}(){}{}": {
+      "snippet": "psConv[${5:options}]{${1:x0}}{${2:x1}}(${6:a},${7:b}){${3:function f}}{${4:function g}}"
+    },
     "psGauss{}{}": {
       "snippet": "psGauss{${1:x0}}{${2:x1}}"
     },
@@ -79,10 +127,10 @@
       "snippet": "psGaussI[${3:options}]{${1:x0}}{${2:x1}}"
     },
     "psBinomial{}{}": {
-      "snippet": "psBinomial{${1:<${3:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
+      "snippet": "psBinomial{${1:<${3:N}> or <m,${4:N> or <m},${5:n},N>}}{${2:probability}}"
     },
     "psBinomial[]{}{}": {
-      "snippet": "psBinomial[${3:options}]{${1:<${4:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
+      "snippet": "psBinomial[${3:options}]{${1:<${4:N}> or <m,${5:N> or <m},${6:n},N>}}{${2:probability}}"
     },
     "psBinomialC{}{}": {
       "snippet": "psBinomialC{${1:N}}{${2:probability}}"
@@ -97,16 +145,16 @@
       "snippet": "psBinomialN[${3:options}]{${1:N}}{${2:probability}}"
     },
     "psBinomialF{}{}": {
-      "snippet": "psBinomialF{${1:<${3:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
+      "snippet": "psBinomialF{${1:<${3:N}> or <m,${4:N> or <m},${5:n},N>}}{${2:probability}}"
     },
     "psBinomialF[]{}{}": {
-      "snippet": "psBinomialF[${3:options}]{${1:<${4:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
+      "snippet": "psBinomialF[${3:options}]{${1:<${4:N}> or <m,${5:N> or <m},${6:n},N>}}{${2:probability}}"
     },
     "psBinomialFS{}{}": {
-      "snippet": "psBinomialFS{${1:<${3:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
+      "snippet": "psBinomialFS{${1:<${3:N}> or <m,${4:N> or <m},${5:n},N>}}{${2:probability}}"
     },
     "psBinomialFS[]{}{}": {
-      "snippet": "psBinomialFS[${3:options}]{${1:<${4:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
+      "snippet": "psBinomialFS[${3:options}]{${1:<${4:N}> or <m,${5:N> or <m},${6:n},N>}}{${2:probability}}"
     },
     "psPoisson{}{}": {
       "snippet": "psPoisson{${1:<${3:N}> or <M,N>}}{${2:lambda}}"
@@ -216,6 +264,75 @@
     "psLame[]{}": {
       "snippet": "psLame[${2:options}]{${1:r}}"
     },
+    "psThomae(){}": {
+      "snippet": "psThomae(${2:x0},${3:x1}){${1:points}}"
+    },
+    "psThomae[](){}": {
+      "snippet": "psThomae[${2:options}](${3:x0},${4:x1}){${1:points}}"
+    },
+    "psWeierstrass(){}": {
+      "snippet": "psWeierstrass(${2:x0},${3:x1}){${1:a}}"
+    },
+    "psWeierstrass()[]{}": {
+      "snippet": "psWeierstrass(${3:x0},${4:x1})[${2:a}]{${1:b}}"
+    },
+    "psWeierstrass[](){}": {
+      "snippet": "psWeierstrass[${2:options}](${3:x0},${4:x1}){${1:a}}"
+    },
+    "psWeierstrass[]()[]{}": {
+      "snippet": "psWeierstrass[${2:options}](${4:x0},${5:x1})[${3:a}]{${1:b}}"
+    },
+    "psplotImp()(){}": {
+      "snippet": "psplotImp(${2:xmin},${3:ymin})(${4:xmax},${5:ymax}){${1:function}}"
+    },
+    "psplotImp()()[]{}": {
+      "snippet": "psplotImp(${3:xmin},${4:ymin})(${5:xmax},${6:ymax})[${2:PS code}]{${1:function}}"
+    },
+    "psplotImp[]()(){}": {
+      "snippet": "psplotImp[${2:options}](${3:xmin},${4:ymin})(${5:xmax},${6:ymax}){${1:function}}"
+    },
+    "psplotImp[]()()[]{}": {
+      "snippet": "psplotImp[${2:options}](${4:xmin},${5:ymin})(${6:xmax},${7:ymax})[${3:PS code}]{${1:function}}"
+    },
+    "psVolume(){}{}": {
+      "snippet": "psVolume(${3:x0},${4:x1}){${1:steps}}{${2:function}}"
+    },
+    "psVolume[](){}{}": {
+      "snippet": "psVolume[${3:options}](${4:x0},${5:x1}){${1:steps}}{${2:function}}"
+    },
+    "psGetZeros(){}": {
+      "snippet": "psGetZeros(${2:x0},${3:x1}){${1:function}}"
+    },
+    "psLaguerreC()()": {
+      "snippet": "psLaguerreC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
+    },
+    "psLaguerreC[]()()": {
+      "snippet": "psLaguerreC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
+    },
+    "psLaguerreCC()()": {
+      "snippet": "psLaguerreCC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
+    },
+    "psLaguerreCC[]()()": {
+      "snippet": "psLaguerreCC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
+    },
+    "psLaguerreCCC()()": {
+      "snippet": "psLaguerreCCC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
+    },
+    "psLaguerreCCC[]()()": {
+      "snippet": "psLaguerreCCC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
+    },
+    "psLaguerreCCCC()()": {
+      "snippet": "psLaguerreCCCC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
+    },
+    "psLaguerreCCCC[]()()": {
+      "snippet": "psLaguerreCCCC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
+    },
+    "psContourLaguerre()()": {
+      "snippet": "psContourLaguerre(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
+    },
+    "psContourLaguerre[]()()": {
+      "snippet": "psContourLaguerre[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
+    },
     "cplotstyle": {},
     "psCplot{}{}{}{}": {
       "snippet": "psCplot{${1:x0}}{${2:x1}}{${3:vars}}{${4:function}}"
diff --git a/dev/packages/pst-geo.json b/dev/packages/pst-geo.json
index 3775fc4e0..e6730cd7b 100644
--- a/dev/packages/pst-geo.json
+++ b/dev/packages/pst-geo.json
@@ -31,6 +31,21 @@
     },
     "psNodeLabelStyle": {},
     "TypeProjection": {},
+    "pnodeMap(){}": {
+      "snippet": "pnodeMap(${2:longitude},${3:latitude}){${1:name}}"
+    },
+    "mapput(){}": {
+      "snippet": "mapput(${2:longitude},${3:latitude}){${1:label}}"
+    },
+    "mapput()[]{}[]": {
+      "snippet": "mapput(${4:longitude},${5:latitude})[${2:node name}]{${1:label}}[${3:country}]"
+    },
+    "mapput[](){}": {
+      "snippet": "mapput[${2:angle}](${3:longitude},${4:latitude}){${1:label}}"
+    },
+    "mapput[]()[]{}[]": {
+      "snippet": "mapput[${2:angle}](${5:longitude},${6:latitude})[${3:node name}]{${1:label}}[${4:country}]"
+    },
     "psmeridiencolor": {},
     "psmapcolor": {},
     "psparallelcolor": {},
@@ -54,12 +69,36 @@
     "pswfraczonwidth": {},
     "pswmaglinwidth": {},
     "psridgewidth": {},
+    "pnodeMapIIID(){}": {
+      "snippet": "pnodeMapIIID(${2:longitude},${3:latitude}){${1:name}}"
+    },
+    "mapputIIID(){}": {
+      "snippet": "mapputIIID(${2:longitude},${3:latitude}){${1:label}}"
+    },
+    "mapputIIID()[]{}[]": {
+      "snippet": "mapputIIID(${4:longitude},${5:latitude})[${2:node name}]{${1:label}}[${3:country}]"
+    },
+    "mapputIIID[](){}": {
+      "snippet": "mapputIIID[${2:angle}](${3:longitude},${4:latitude}){${1:label}}"
+    },
+    "mapputIIID[]()[]{}[]": {
+      "snippet": "mapputIIID[${2:angle}](${5:longitude},${6:latitude})[${3:node name}]{${1:label}}[${4:country}]"
+    },
     "psmeridien{}": {
       "snippet": "psmeridien{${1:longitude}}"
     },
     "psparallel{}": {
       "snippet": "psparallel{${1:latitude}}"
     },
+    "psGlobeTellure(){}": {
+      "snippet": "psGlobeTellure(${2:longitude},${3:latitude}){${1:name}}"
+    },
+    "psGlobeTellure[](){}": {
+      "snippet": "psGlobeTellure[${2:options}](${3:longitude},${4:latitude}){${1:name}}"
+    },
+    "psepicenter(){}": {
+      "snippet": "psepicenter(${2:longitude},${3:latitude}){${1:label}}"
+    },
     "PSTGeoLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-geometrictools.json b/dev/packages/pst-geometrictools.json
index e0502be2c..8bea8fbd3 100644
--- a/dev/packages/pst-geometrictools.json
+++ b/dev/packages/pst-geometrictools.json
@@ -5,13 +5,52 @@
     "pst-node": []
   },
   "macros": {
+    "psProtractor{}()": {
+      "snippet": "psProtractor{${1:angle}}(${2:x},${3:y})"
+    },
+    "psProtractor[]{}()": {
+      "snippet": "psProtractor[${2:options}]{${1:angle}}(${3:x},${4:y})"
+    },
     "ProLineCol": {},
     "ProFillCol": {},
+    "psPencil{}()": {
+      "snippet": "psPencil{${1:angle}}(${2:x},${3:y})"
+    },
+    "psPencil[]{}()": {
+      "snippet": "psPencil[${2:options}]{${1:angle}}(${3:x},${4:y})"
+    },
     "pencilColA": {},
     "pencilColB": {},
+    "psRuler{}()": {
+      "snippet": "psRuler{${1:angle}}(${2:x},${3:y})"
+    },
+    "psRuler[]{}()": {
+      "snippet": "psRuler[${2:options}]{${1:angle}}(${3:x},${4:y})"
+    },
     "RulerFillCol": {},
+    "psCompass{}()": {
+      "snippet": "psCompass{${1:radius}}(${2:x},${3:y})"
+    },
+    "psCompass[]{}()": {
+      "snippet": "psCompass[${2:options}]{${1:radius}}(${3:x},${4:y})"
+    },
     "PoCFillCol": {},
     "PoCMineCol": {},
+    "psDistAB()(){}": {
+      "snippet": "psDistAB(${2:A})(${3:B}){${1:name}}"
+    },
+    "psAngleAB()(){}": {
+      "snippet": "psAngleAB(${2:A})(${3:B}){${1:name}}"
+    },
+    "psAngleAOB()()(){}": {
+      "snippet": "psAngleAOB(${2:A})(${3:O})(${4:B}){${1:name}}"
+    },
+    "psParallels()()()": {
+      "snippet": "psParallels(${1:A})(${2:B})(${3:C})"
+    },
+    "psParallels[]()()()": {
+      "snippet": "psParallels[${1:options}](${2:A})(${3:B})(${4:C})"
+    },
     "PSTgeometrictoolsLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-gr3d.json b/dev/packages/pst-gr3d.json
index a490df977..8edfb1dad 100644
--- a/dev/packages/pst-gr3d.json
+++ b/dev/packages/pst-gr3d.json
@@ -7,6 +7,12 @@
     "pst-xkey": []
   },
   "macros": {
+    "PstGridThreeD()": {
+      "snippet": "PstGridThreeD(${1:x},${2:y},${3:z})"
+    },
+    "PstGridThreeD[]()": {
+      "snippet": "PstGridThreeD[${1:options}](${2:x},${3:y},${4:z})"
+    },
     "PstGridThreeDYFace{}{}{}": {
       "snippet": "PstGridThreeDYFace{${1:arg1}}{${2:arg2}}{${3:arg3}}"
     },
diff --git a/dev/packages/pst-hsb.json b/dev/packages/pst-hsb.json
index dc4f1a907..03b1cb96f 100644
--- a/dev/packages/pst-hsb.json
+++ b/dev/packages/pst-hsb.json
@@ -11,6 +11,12 @@
     "psparametricplotHSB[]{}{}{}": {
       "snippet": "psparametricplotHSB[${4:options}]{${1:tmin}}{${2:tmax}}{${3:function}}"
     },
+    "pslineHSB()()": {
+      "snippet": "pslineHSB(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pslineHSB[]()()": {
+      "snippet": "pslineHSB[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
     "PSThsbLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-jtree.json b/dev/packages/pst-jtree.json
index befa58788..a92cc31f0 100644
--- a/dev/packages/pst-jtree.json
+++ b/dev/packages/pst-jtree.json
@@ -10,10 +10,19 @@
       "snippet": "jtree[${1:options}]"
     },
     "endjtree": {},
+    "defbranch<>()()": {
+      "snippet": "defbranch<${1:name}>(${2:height})(${3:slope})"
+    },
+    "deftriangle<>()()()": {
+      "snippet": "deftriangle<${1:name}>(${2:height})(${3:slopeA})(${4:slopeB})"
+    },
     "triline{}": {
       "snippet": "triline{${1:text}}"
     },
     "triwd": {},
+    "defvartriangle<>()": {
+      "snippet": "defvartriangle<${1:name}>(${2:height})"
+    },
     "jtlong": {},
     "jtshort": {},
     "jtwide": {},
@@ -31,6 +40,9 @@
     },
     "multiline": {},
     "endmultiline": {},
+    "psinterpolate()(){}{}": {
+      "snippet": "psinterpolate(${3:node1})(${4:node2}){${1:num}}{${2:node name}}"
+    },
     "elc{}": {
       "snippet": "elc{${1:text}}"
     },
diff --git a/dev/packages/pst-knot.json b/dev/packages/pst-knot.json
index c0bb75322..8995593f9 100644
--- a/dev/packages/pst-knot.json
+++ b/dev/packages/pst-knot.json
@@ -4,6 +4,18 @@
     "pst-xkey": []
   },
   "macros": {
+    "psKnot(){}": {
+      "snippet": "psKnot(${2:x},${3:y}){${1:knot type}}"
+    },
+    "psKnot[](){}": {
+      "snippet": "psKnot[${2:options}](${3:x},${4:y}){${1:knot type}}"
+    },
+    "psBorromean(){}{}": {
+      "snippet": "psBorromean(${3:x},${4:y}){${1:circle radius}}{${2:inner radius}}"
+    },
+    "psBorromean[](){}{}": {
+      "snippet": "psBorromean[${3:options}](${4:x},${5:y}){${1:circle radius}}{${2:inner radius}}"
+    },
     "PSTknotLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-labo.json b/dev/packages/pst-labo.json
index 8fdd1e751..c973e620f 100644
--- a/dev/packages/pst-labo.json
+++ b/dev/packages/pst-labo.json
@@ -71,6 +71,12 @@
     "pstDosage[]": {
       "snippet": "pstDosage[${1:options}]"
     },
+    "pstDistillation()()": {
+      "snippet": "pstDistillation(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pstDistillation[]()()": {
+      "snippet": "pstDistillation[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
     "pstSeparateFunnel": {},
     "pstSeparateFunnel[]": {
       "snippet": "pstSeparateFunnel[${1:options}]"
diff --git a/dev/packages/pst-lens.json b/dev/packages/pst-lens.json
index 2b4436632..a90e4492e 100644
--- a/dev/packages/pst-lens.json
+++ b/dev/packages/pst-lens.json
@@ -8,11 +8,19 @@
     "PstLens{}": {
       "snippet": "PstLens{${1:stuff}}"
     },
+    "PstLens(){}": {
+      "snippet": "PstLens(${2:x},${3:y}){${1:stuff}}"
+    },
     "PstLens[]{}": {
       "snippet": "PstLens[${2:options}]{${1:stuff}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "PstLens[](){}": {
+      "snippet": "PstLens[${2:options}](${3:x},${4:y}){${1:stuff}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "PstLensShape": {},
     "PSTLensLoaded": {}
   },
diff --git a/dev/packages/pst-lsystem.json b/dev/packages/pst-lsystem.json
index 679dc643b..83ab63e5b 100644
--- a/dev/packages/pst-lsystem.json
+++ b/dev/packages/pst-lsystem.json
@@ -4,9 +4,30 @@
     "pst-xkey": []
   },
   "macros": {
+    "pslsystem()": {
+      "snippet": "pslsystem(${1:x},${2:y})"
+    },
+    "pslsystem[]()": {
+      "snippet": "pslsystem[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "PSTlsystemLoaded": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": []
+  "keyvals": [
+    [
+      "F=${1:Rule F → (F)}",
+      "X=${1:Rule X → (F,X,Y)}",
+      "Y=${1:Rule Y → (F,X,Y)}",
+      "Start=${1:Startrule S → (F,X,Y)}",
+      "Angle=${1:degrees}",
+      "N=${1:number of recursive calls}",
+      "Ftype=",
+      "BaseLength=",
+      "usecolor=",
+      "linecolor="
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-magneticfield.json b/dev/packages/pst-magneticfield.json
index fcc5a145c..f93ce3a5b 100644
--- a/dev/packages/pst-magneticfield.json
+++ b/dev/packages/pst-magneticfield.json
@@ -8,10 +8,34 @@
     "pst-xkey": []
   },
   "macros": {
+    "psmagneticfield()()": {
+      "snippet": "psmagneticfield(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psmagneticfield[]()()": {
+      "snippet": "psmagneticfield[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "psmagneticfieldThreeD()()": {
+      "snippet": "psmagneticfieldThreeD(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "psmagneticfieldThreeD[]()()": {
+      "snippet": "psmagneticfieldThreeD[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "psBarMagnet": {},
+    "psBarMagnet()": {
+      "snippet": "psBarMagnet(${1:x},${2:y})"
+    },
     "psBarMagnet[]": {
       "snippet": "psBarMagnet[${1:options}]",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "psBarMagnet[]()": {
+      "snippet": "psBarMagnet[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "CalcIntermediaire": {},
@@ -21,6 +45,26 @@
   "envs": {},
   "options": [],
   "keyvals": [
+    [
+      "R=${1:number}",
+      "N=${1:number}",
+      "L=${1:number}",
+      "nL=${1:integer}",
+      "numSpires=",
+      "pointsB=${1:integer}",
+      "pointsS=${1:integer}",
+      "PasB=${1:number}",
+      "PasS=${1:number}",
+      "nS=${1:integer}",
+      "styleSpire=${1:style}",
+      "styleCourant=${1:style}",
+      "drawSelf",
+      "AntiHelmholtz",
+      "StreamDensityPlot",
+      "setgray",
+      "changeNS",
+      "linecolor="
+    ],
     [
       "rot=${1:degrees}",
       "showField",
diff --git a/dev/packages/pst-marble.json b/dev/packages/pst-marble.json
index ad77aadaa..17c8d0d9e 100644
--- a/dev/packages/pst-marble.json
+++ b/dev/packages/pst-marble.json
@@ -4,9 +4,46 @@
     "pst-xkey": []
   },
   "macros": {
+    "psMarble()": {
+      "snippet": "psMarble(${1:width},${2:height})"
+    },
+    "psMarble()()": {
+      "snippet": "psMarble(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psMarble[]()": {
+      "snippet": "psMarble[${1:options}](${2:width},${3:height})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "psMarble[]()()": {
+      "snippet": "psMarble[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "PSTMARBLELoaded": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": []
+  "keyvals": [
+    [
+      "actions={${1:marbling actions}}",
+      "spractions={${1:spray actions}}",
+      "shadings={${1:shading actions}}",
+      "background={[${1:r g b}]}",
+      "paper={[${1:r g b}]}",
+      "drawcontours",
+      "seed=${1:seed}",
+      "oversample=${1:number}",
+      "overscan=${1:number}",
+      "bckg",
+      "colors={[${1:r1 g1 b1}] ${2:[r2 b2 g2] ...}}",
+      "colors={(${1:RrGgBb}) ${2:(RrGgBb) ...}}",
+      "viscosity=${1:number}",
+      "linewidth=",
+      "linecolor=",
+      "blendmode=${1:mode number}",
+      "shapealpha=${1:number}",
+      "opacity=${1:factor}"
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-math.json b/dev/packages/pst-math.json
index e59c80a65..370e8f375 100644
--- a/dev/packages/pst-math.json
+++ b/dev/packages/pst-math.json
@@ -8,6 +8,9 @@
     "xkeyval": []
   },
   "macros": {
+    "defineRandIntervall(){}": {
+      "snippet": "defineRandIntervall(${2:min},${3:max}){${1:number}}"
+    },
     "makeSimpleRandomNumberList": {},
     "makeRandomNumberList": {},
     "getNumberFromList{}": {
diff --git a/dev/packages/pst-mirror.json b/dev/packages/pst-mirror.json
index b3bc428b6..92600d52c 100644
--- a/dev/packages/pst-mirror.json
+++ b/dev/packages/pst-mirror.json
@@ -7,9 +7,18 @@
     "pst-xkey": []
   },
   "macros": {
+    "pstSphereText(){}": {
+      "snippet": "pstSphereText(${2:x},${3:y},${4:z}){${1:text}}"
+    },
+    "pstSphereText[](){}": {
+      "snippet": "pstSphereText[${2:options}](${3:x},${4:y},${5:z}){${1:text}}"
+    },
     "pstSphereCube": {},
     "pstSphereDie": {},
     "pstSphereTetraedre": {},
+    "pstSpherePoint(){}": {
+      "snippet": "pstSpherePoint(${2:x},${3:y},${4:z}){${1:node name}}"
+    },
     "NormalIIIDCoor": {},
     "pstSphereCircle{}": {
       "snippet": "pstSphereCircle{${1:radius}}"
@@ -23,6 +32,18 @@
     "pstSphereArc[]{}{}{}": {
       "snippet": "pstSphereArc[${4:options}]{${1:radius}}{${2:angle min}}{${3:angle max}}"
     },
+    "pstSphereFrame()()": {
+      "snippet": "pstSphereFrame(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pstSphereFrame[]()()": {
+      "snippet": "pstSphereFrame[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pstSphereGrid()": {
+      "snippet": "pstSphereGrid(${1:x},${2:y},${3:z})"
+    },
+    "pstSphereGrid[]()": {
+      "snippet": "pstSphereGrid[${1:options}](${2:x},${3:y},${4:z})"
+    },
     "pstMirrorSphere{}": {
       "snippet": "pstMirrorSphere{${1:radius}}"
     },
@@ -39,6 +60,12 @@
       "snippet": "pstSphereCone[${3:options}]{${1:radius}}{${2:height}}"
     },
     "pstSpherePyramide": {},
+    "pstSphereImage(){}": {
+      "snippet": "pstSphereImage(${2:x},${3:y},${4:z}){${1:imagefile}}"
+    },
+    "pstSphereImage[](){}": {
+      "snippet": "pstSphereImage[${2:options}](${3:x},${4:y},${5:z}){${1:imagefile}}"
+    },
     "parametricplotSphere{}{}{}": {
       "snippet": "parametricplotSphere{${1:x0}}{${2:x1}}{${3:function}}"
     },
diff --git a/dev/packages/pst-moire.json b/dev/packages/pst-moire.json
index c9a6b1667..59e58b801 100644
--- a/dev/packages/pst-moire.json
+++ b/dev/packages/pst-moire.json
@@ -5,19 +5,35 @@
     "multido": []
   },
   "macros": {
+    "psmoire()": {
+      "snippet": "psmoire(${1:x},${2:y})"
+    },
+    "psmoire[]()": {
+      "snippet": "psmoire[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "addtomoirelisttype{}": {
       "snippet": "addtomoirelisttype{${1:name}}"
     },
     "psRandomDotPatterns": {},
     "psRandomDotPatterns[]": {
       "snippet": "psRandomDotPatterns[${1:options}]",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "psRandomDot()": {
+      "snippet": "psRandomDot(${1:x},${2:y})"
+    },
+    "psRandomDot[]()": {
+      "snippet": "psRandomDot[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "psGlassPattern": {},
     "psGlassPattern[]": {
       "snippet": "psGlassPattern[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "variablesMoirages": {}
@@ -25,6 +41,20 @@
   "envs": {},
   "options": [],
   "keyvals": [
+    [
+      "type=",
+      "rotate=${1:degrees}",
+      "Rmax=${1:length in cm}",
+      "scale=${1:factor}",
+      "Alpha=${1:degrees}",
+      "E=${1:distance in cm}",
+      "n=${1:number}",
+      "T=${1:distance in mm}",
+      "linewidth=",
+      "linecolor=",
+      "dotstyle=${1:style}",
+      "dotsize="
+    ],
     [
       "NumberDots=${1:integer}",
       "coefficients=${1:a b θ x0 y0}",
@@ -35,6 +65,18 @@
       "fillcolor=",
       "unit=${1:number}"
     ],
+    [
+      "hole=",
+      "r=${1:radius in pts}",
+      "p=${1:distance in pts}",
+      "rotate=${1:degrees}",
+      "k=${1:dispersion factor}",
+      "symbole=${1:digit or letter}",
+      "PSfont=${1:PS font name}",
+      "fontsize=${1:size in pts}",
+      "vadjust=${1:number}",
+      "hadjust=${1:number}"
+    ],
     [
       "function=${1:function}",
       "layers",
diff --git a/dev/packages/pst-node.json b/dev/packages/pst-node.json
index 942ece71b..4f4be32c9 100644
--- a/dev/packages/pst-node.json
+++ b/dev/packages/pst-node.json
@@ -10,9 +10,15 @@
     "algparnode{}{}{}": {
       "snippet": "algparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
+    "AplusB()(){}": {
+      "snippet": "AplusB(${2:A})(${3:B}){${1:C}}"
+    },
     "ArrowNotch{}{}{}{}": {
       "snippet": "ArrowNotch{${1:node name}}{${2:node index}}{${3:direction}}{${4:notch}}"
     },
+    "AtoB()(){}": {
+      "snippet": "AtoB(${2:A})(${3:B}){${1:C}}"
+    },
     "Circlenode*[]{}{}": {
       "snippet": "Circlenode*[${3:options}]{${1:name}}{${2:stuff}}"
     },
@@ -37,6 +43,78 @@
     "circlenode{}{}": {
       "snippet": "circlenode{${1:name}}{${2:stuff}}"
     },
+    "Cnode(){}": {
+      "snippet": "Cnode(${2:x},${3:y}){${1:name}}"
+    },
+    "cnode(){}{}": {
+      "snippet": "cnode(${3:x},${4:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnode*(){}": {
+      "snippet": "Cnode*(${2:x},${3:y}){${1:name}}"
+    },
+    "cnode*(){}{}": {
+      "snippet": "cnode*(${3:x},${4:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnode*[](){}": {
+      "snippet": "Cnode*[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "cnode*[](){}{}": {
+      "snippet": "cnode*[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnode[](){}": {
+      "snippet": "Cnode[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "cnode[](){}{}": {
+      "snippet": "cnode[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
+    },
+    "Cnodeput(){}{}{}": {
+      "snippet": "Cnodeput(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput(){}{}": {
+      "snippet": "cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput(){}{}": {
+      "snippet": "Cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*(){}{}{}": {
+      "snippet": "Cnodeput*(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput*(){}{}": {
+      "snippet": "cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*(){}{}": {
+      "snippet": "Cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*[](){}{}{}": {
+      "snippet": "Cnodeput*[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput*[](){}{}": {
+      "snippet": "cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput*[](){}{}": {
+      "snippet": "Cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "cnodeput*[]{}(){}{}": {
+      "snippet": "cnodeput*[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
+    },
+    "cnodeput*{}(){}{}": {
+      "snippet": "cnodeput*{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
+    },
+    "Cnodeput[](){}{}{}": {
+      "snippet": "Cnodeput[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
+    },
+    "cnodeput[](){}{}": {
+      "snippet": "cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "Cnodeput[](){}{}": {
+      "snippet": "Cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "cnodeput[]{}(){}{}": {
+      "snippet": "cnodeput[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
+    },
+    "cnodeput{}(){}{}": {
+      "snippet": "cnodeput{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
+    },
     "curvepnode{}{}{}": {
       "snippet": "curvepnode{${1:tval}}{${2:expr in t}}{${3:node name}}"
     },
@@ -58,8 +136,32 @@
     "dianode{}{}": {
       "snippet": "dianode{${1:name}}{${2:stuff}}"
     },
+    "dotnode(){}": {
+      "snippet": "dotnode(${2:x},${3:y}){${1:name}}"
+    },
+    "dotnode*(){}": {
+      "snippet": "dotnode*(${2:x},${3:y}){${1:name}}"
+    },
+    "dotnode*[](){}": {
+      "snippet": "dotnode*[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "dotnode[](){}": {
+      "snippet": "dotnode[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
     "endpsmatrix": {},
     "equalwhat": {},
+    "fnode(){}": {
+      "snippet": "fnode(${2:x},${3:y}){${1:name}}"
+    },
+    "fnode*(){}": {
+      "snippet": "fnode*(${2:x},${3:y}){${1:name}}"
+    },
+    "fnode*[](){}": {
+      "snippet": "fnode*[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "fnode[](){}": {
+      "snippet": "fnode[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
     "fnpnode{}{}{}": {
       "snippet": "fnpnode{${1:xval}}{${2:expr in x}}{${3:node name}}"
     },
@@ -81,6 +183,9 @@
     "MakeShortTablr{}{}{}{}": {
       "snippet": "MakeShortTablr{${1:char1}}{${2:char2}}{${3:char3}}{${4:char4}}"
     },
+    "midAB()(){}": {
+      "snippet": "midAB(${2:A})(${3:B}){${1:C}}"
+    },
     "naput*[]{}": {
       "snippet": "naput*[${2:options}]{${1:stuff}}"
     },
@@ -471,6 +576,12 @@
     "nczigzag{}{}": {
       "snippet": "nczigzag{${1:nodeA}}{${2:nodeB}}"
     },
+    "nlput()(){}{}": {
+      "snippet": "nlput(${3:A})(${4:B}){${1:distance}}{${2:text}}"
+    },
+    "nlput[]()(){}{}": {
+      "snippet": "nlput[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:text}}"
+    },
     "nodenameA": {},
     "nodenameB": {},
     "nodex{}": {
@@ -479,6 +590,9 @@
     "nodexn{}{}": {
       "snippet": "nodexn{${1:expr}}{${2:node name}}"
     },
+    "normalvec(){}": {
+      "snippet": "normalvec(${2:coords}){${1:node name}}"
+    },
     "nput*[]{}{}{}": {
       "snippet": "nput*[${4:options}]{${1:refangle}}{${2:name}}{${3:stuff}}"
     },
@@ -503,6 +617,237 @@
     "ovalnode{}{}": {
       "snippet": "ovalnode{${1:name}}{${2:stuff}}"
     },
+    "parsenodexn{}(){}": {
+      "snippet": "parsenodexn{${1:arg1}}(${3:arg2}){${2:arg3}}"
+    },
+    "pcangle()()": {
+      "snippet": "pcangle(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcangle*()()": {
+      "snippet": "pcangle*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcangle*[]()()": {
+      "snippet": "pcangle*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangle*[]{}()()": {
+      "snippet": "pcangle*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangle*{}()()": {
+      "snippet": "pcangle*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangle[]()()": {
+      "snippet": "pcangle[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangle[]{}()()": {
+      "snippet": "pcangle[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangle{}()()": {
+      "snippet": "pcangle{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles*()()": {
+      "snippet": "pcangles*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcangles*[]()()": {
+      "snippet": "pcangles*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles*[]{}()()": {
+      "snippet": "pcangles*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangles*{}()()": {
+      "snippet": "pcangles*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles[]()()": {
+      "snippet": "pcangles[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcangles[]{}()()": {
+      "snippet": "pcangles[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcangles{}()()": {
+      "snippet": "pcangles{${1:nodeA}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc()()": {
+      "snippet": "pcarc(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarc*()()": {
+      "snippet": "pcarc*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarc*[]()()": {
+      "snippet": "pcarc*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc*[]{}()()": {
+      "snippet": "pcarc*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcarc*{}()()": {
+      "snippet": "pcarc*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc[]()()": {
+      "snippet": "pcarc[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarc[]{}()()": {
+      "snippet": "pcarc[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcarc{}()()": {
+      "snippet": "pcarc{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarcbox()()": {
+      "snippet": "pcarcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarcbox*()()": {
+      "snippet": "pcarcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcarcbox*[]()()": {
+      "snippet": "pcarcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcarcbox[]()()": {
+      "snippet": "pcarcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar()()": {
+      "snippet": "pcbar(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbar*()()": {
+      "snippet": "pcbar*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbar*[]()()": {
+      "snippet": "pcbar*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar*[]{}()()": {
+      "snippet": "pcbar*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcbar*{}()()": {
+      "snippet": "pcbar*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar[]()()": {
+      "snippet": "pcbar[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbar[]{}()()": {
+      "snippet": "pcbar[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcbar{}()()": {
+      "snippet": "pcbar{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbox()()": {
+      "snippet": "pcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbox*()()": {
+      "snippet": "pcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcbox*[]()()": {
+      "snippet": "pcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcbox[]()()": {
+      "snippet": "pcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve()()": {
+      "snippet": "pccurve(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pccurve*()()": {
+      "snippet": "pccurve*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pccurve*[]()()": {
+      "snippet": "pccurve*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve*[]{}()()": {
+      "snippet": "pccurve*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pccurve*{}()()": {
+      "snippet": "pccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve[]()()": {
+      "snippet": "pccurve[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pccurve[]{}()()": {
+      "snippet": "pccurve[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pccurve{}()()": {
+      "snippet": "pccurve{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag()()": {
+      "snippet": "pcdiag(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcdiag*()()": {
+      "snippet": "pcdiag*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcdiag*[]()()": {
+      "snippet": "pcdiag*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag*[]{}()()": {
+      "snippet": "pcdiag*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcdiag*{}()()": {
+      "snippet": "pcdiag*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag[]()()": {
+      "snippet": "pcdiag[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiag[]{}()()": {
+      "snippet": "pcdiag[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcdiag{}()()": {
+      "snippet": "pcdiag{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcdiagg()()": {
+      "snippet": "pcdiagg(${1:nodeA})(${2:nodeB})"
+    },
+    "pcdiagg[]()()": {
+      "snippet": "pcdiagg[${1:options}](${2:nodeA})(${3:nodeB})"
+    },
+    "pcline()()": {
+      "snippet": "pcline(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcline*()()": {
+      "snippet": "pcline*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcline*[]()()": {
+      "snippet": "pcline*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcline*[]{}()()": {
+      "snippet": "pcline*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcline*{}()()": {
+      "snippet": "pcline*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcline[]()()": {
+      "snippet": "pcline[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcline[]{}()()": {
+      "snippet": "pcline[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcline{}()()": {
+      "snippet": "pcline{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop()()": {
+      "snippet": "pcloop(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcloop*()()": {
+      "snippet": "pcloop*(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "pcloop*[]()()": {
+      "snippet": "pcloop*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop*[]{}()()": {
+      "snippet": "pcloop*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcloop*{}()()": {
+      "snippet": "pcloop*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop[]()()": {
+      "snippet": "pcloop[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pcloop[]{}()()": {
+      "snippet": "pcloop[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pcloop{}()()": {
+      "snippet": "pcloop{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
+    },
+    "pnode(){}": {
+      "snippet": "pnode(${2:x},${3:y}){${1:name}}"
+    },
+    "pnode[](){}": {
+      "snippet": "pnode[${2:offset}](${3:x},${4:y}){${1:name}}"
+    },
+    "polyIntersections{}{}()(){}{}": {
+      "snippet": "polyIntersections{${1:name1}}{${2:name2}}(${5:A})(${6:B}){${3:P}}{${4:number}}"
+    },
     "pscloseNodeFile": {},
     "pscolhooki": {},
     "pscolhookii": {},
@@ -542,6 +887,15 @@
     "psLCNode{}{}{}": {
       "snippet": "psLCNode{${1:val1}}{${2:val2}}{${3:node name}}"
     },
+    "psLCNodeVar()()(){}": {
+      "snippet": "psLCNodeVar(${2:nodeA})(${3:nodeB})(${4:factorA},${5:factorB}){${1:node name}}"
+    },
+    "psLDNode()(){}{}": {
+      "snippet": "psLDNode(${3:A})(${4:B}){${1:distance}}{${2:node name}}"
+    },
+    "psLDNode[]()(){}{}": {
+      "snippet": "psLDNode[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:node name}}"
+    },
     "psLNode[][]{}{}": {
       "snippet": "psLNode[${3:P1}][${4:P2}]{${1:value}}{${2:node name}}"
     },
@@ -555,10 +909,67 @@
     "psmatrix[]": {
       "snippet": "psmatrix[${1:options}]"
     },
+    "psncurve(){}": {
+      "snippet": "psncurve(${2:x},${3:y}){${1:name}}"
+    },
+    "psncurve[](){}": {
+      "snippet": "psncurve[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psncurve[]{}(){}": {
+      "snippet": "psncurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psncurve{}(){}": {
+      "snippet": "psncurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
+    "psnccurve(){}": {
+      "snippet": "psnccurve(${2:x},${3:y}){${1:name}}"
+    },
+    "psnccurve[](){}": {
+      "snippet": "psnccurve[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psnccurve[]{}(){}": {
+      "snippet": "psnccurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psnccurve{}(){}": {
+      "snippet": "psnccurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
+    "psnline(){}": {
+      "snippet": "psnline(${2:x},${3:y}){${1:name}}"
+    },
+    "psnline[](){}": {
+      "snippet": "psnline[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psnline[]{}(){}": {
+      "snippet": "psnline[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psnline{}(){}": {
+      "snippet": "psnline{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
+    "psnode(){}{}": {
+      "snippet": "psnode(${3:x},${4:y}){${1:name}}{${2:stuff}}"
+    },
+    "psnode[](){}{}": {
+      "snippet": "psnode[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
+    },
+    "psnpolygon(){}": {
+      "snippet": "psnpolygon(${2:x},${3:y}){${1:name}}"
+    },
+    "psnpolygon[](){}": {
+      "snippet": "psnpolygon[${2:options}](${3:x},${4:y}){${1:name}}"
+    },
+    "psnpolygon[]{}(){}": {
+      "snippet": "psnpolygon[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
+    },
+    "psnpolygon{}(){}": {
+      "snippet": "psnpolygon{${1:arrows}}(${3:x},${4:y}){${2:name}}"
+    },
     "psopenNodeFile": {},
     "psparnode{}{}{}": {
       "snippet": "psparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
+    "psRelLineVar()()(){}": {
+      "snippet": "psRelLineVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
+    },
     "psRelNode[][]{}{}": {
       "snippet": "psRelNode[${3:P0}][${4:P1}]{${1:length factor}}{${2:end node name}}"
     },
@@ -568,6 +979,9 @@
     "psRelNode{}{}": {
       "snippet": "psRelNode{${1:length factor}}{${2:end node name}}"
     },
+    "psRelNodeVar()()(){}": {
+      "snippet": "psRelNodeVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
+    },
     "psrowhooki": {},
     "psrowhookii": {},
     "psrowhookiii": {},
@@ -586,6 +1000,21 @@
       "snippet": "pstloop{${1:arg}}"
     },
     "PSTnodesLoaded": {},
+    "psxline(){}{}": {
+      "snippet": "psxline(${3:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
+    },
+    "psxline[](){}{}": {
+      "snippet": "psxline[${3:options}](${4:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
+    },
+    "psxline[]{}(){}{}": {
+      "snippet": "psxline[${4:options}]{${1:arrows}}(${5:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
+    },
+    "psxline{}(){}{}": {
+      "snippet": "psxline{${1:arrows}}(${4:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
+    },
+    "rhombus{}()(){}{}": {
+      "snippet": "rhombus{${1:edge length}}(${4:A})(${5:B}){${2:C}}{${3:D}}"
+    },
     "rnode[]{}{}": {
       "snippet": "rnode[${3:refpoint}]{${1:name}}{${2:stuff}}"
     },
@@ -598,6 +1027,9 @@
     "saveDataAsNodes{}{}": {
       "snippet": "saveDataAsNodes{${1:data}}{${2:node prefix}}"
     },
+    "shownode()": {
+      "snippet": "shownode(${1:P})"
+    },
     "taput*[]{}": {
       "snippet": "taput*[${2:options}]{${1:stuff}}"
     },
@@ -723,6 +1155,24 @@
     "bput*[]{}{}": {
       "snippet": "bput*[${3:labelsep}]{${1:angle}}{${2:stuff}}"
     },
+    "Lput{}{}(){}": {
+      "snippet": "Lput{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
+    },
+    "Lput{}[]{}(){}": {
+      "snippet": "Lput{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
+    },
+    "Lput*{}{}(){}": {
+      "snippet": "Lput*{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
+    },
+    "Lput*{}[]{}(){}": {
+      "snippet": "Lput*{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
+    },
+    "lput(){}": {
+      "snippet": "lput(${2:pos}){${1:stuff}}"
+    },
+    "lput*(){}": {
+      "snippet": "lput*(${2:pos}){${1:stuff}}"
+    },
     "lput{}{}": {
       "snippet": "lput{${1:angle}}{${2:stuff}}"
     },
diff --git a/dev/packages/pst-optexp.json b/dev/packages/pst-optexp.json
index b07d5ba0f..b43928175 100644
--- a/dev/packages/pst-optexp.json
+++ b/dev/packages/pst-optexp.json
@@ -12,6 +12,570 @@
     "environ": []
   },
   "macros": {
+    "lens()()": {
+      "snippet": "lens(${1:in})(${2:out})"
+    },
+    "lens()(){}": {
+      "snippet": "lens(${2:in})(${3:out}){${1:label}}"
+    },
+    "lens[]()()": {
+      "snippet": "lens[${1:options}](${2:in})(${3:out})"
+    },
+    "lens[]()(){}": {
+      "snippet": "lens[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "asphericlens()()": {
+      "snippet": "asphericlens(${1:in})(${2:out})"
+    },
+    "asphericlens()(){}": {
+      "snippet": "asphericlens(${2:in})(${3:out}){${1:label}}"
+    },
+    "asphericlens[]()()": {
+      "snippet": "asphericlens[${1:options}](${2:in})(${3:out})"
+    },
+    "asphericlens[]()(){}": {
+      "snippet": "asphericlens[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optplate()()": {
+      "snippet": "optplate(${1:in})(${2:out})"
+    },
+    "optplate()(){}": {
+      "snippet": "optplate(${2:in})(${3:out}){${1:label}}"
+    },
+    "optplate[]()()": {
+      "snippet": "optplate[${1:options}](${2:in})(${3:out})"
+    },
+    "optplate[]()(){}": {
+      "snippet": "optplate[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optretplate()()": {
+      "snippet": "optretplate(${1:in})(${2:out})"
+    },
+    "optretplate()(){}": {
+      "snippet": "optretplate(${2:in})(${3:out}){${1:label}}"
+    },
+    "optretplate[]()()": {
+      "snippet": "optretplate[${1:options}](${2:in})(${3:out})"
+    },
+    "optretplate[]()(){}": {
+      "snippet": "optretplate[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "pinhole()()": {
+      "snippet": "pinhole(${1:in})(${2:out})"
+    },
+    "pinhole()(){}": {
+      "snippet": "pinhole(${2:in})(${3:out}){${1:label}}"
+    },
+    "pinhole[]()()": {
+      "snippet": "pinhole[${1:options}](${2:in})(${3:out})"
+    },
+    "pinhole[]()(){}": {
+      "snippet": "pinhole[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optbox()()": {
+      "snippet": "optbox(${1:in})(${2:out})"
+    },
+    "optbox()(){}": {
+      "snippet": "optbox(${2:in})(${3:out}){${1:label}}"
+    },
+    "optbox[]()()": {
+      "snippet": "optbox[${1:options}](${2:in})(${3:out})"
+    },
+    "optbox[]()(){}": {
+      "snippet": "optbox[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optarrowcomp()()": {
+      "snippet": "optarrowcomp(${1:in})(${2:out})"
+    },
+    "optarrowcomp()(){}": {
+      "snippet": "optarrowcomp(${2:in})(${3:out}){${1:label}}"
+    },
+    "optarrowcomp[]()()": {
+      "snippet": "optarrowcomp[${1:options}](${2:in})(${3:out})"
+    },
+    "optarrowcomp[]()(){}": {
+      "snippet": "optarrowcomp[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optbarcomp()()": {
+      "snippet": "optbarcomp(${1:in})(${2:out})"
+    },
+    "optbarcomp()(){}": {
+      "snippet": "optbarcomp(${2:in})(${3:out}){${1:label}}"
+    },
+    "optbarcomp[]()()": {
+      "snippet": "optbarcomp[${1:options}](${2:in})(${3:out})"
+    },
+    "optbarcomp[]()(){}": {
+      "snippet": "optbarcomp[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optsource()()": {
+      "snippet": "optsource(${1:in})(${2:out})"
+    },
+    "optsource()(){}": {
+      "snippet": "optsource(${2:in})(${3:out}){${1:label}}"
+    },
+    "optsource[]()()": {
+      "snippet": "optsource[${1:options}](${2:in})(${3:out})"
+    },
+    "optsource[]()(){}": {
+      "snippet": "optsource[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "crystal()()": {
+      "snippet": "crystal(${1:in})(${2:out})"
+    },
+    "crystal()(){}": {
+      "snippet": "crystal(${2:in})(${3:out}){${1:label}}"
+    },
+    "crystal[]()()": {
+      "snippet": "crystal[${1:options}](${2:in})(${3:out})"
+    },
+    "crystal[]()(){}": {
+      "snippet": "crystal[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optdiode()()": {
+      "snippet": "optdiode(${1:in})(${2:out})"
+    },
+    "optdiode()(){}": {
+      "snippet": "optdiode(${2:in})(${3:out}){${1:label}}"
+    },
+    "optdiode[]()()": {
+      "snippet": "optdiode[${1:options}](${2:in})(${3:out})"
+    },
+    "optdiode[]()(){}": {
+      "snippet": "optdiode[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "doveprism()()": {
+      "snippet": "doveprism(${1:in})(${2:out})"
+    },
+    "doveprism()(){}": {
+      "snippet": "doveprism(${2:in})(${3:out}){${1:label}}"
+    },
+    "doveprism[]()()": {
+      "snippet": "doveprism[${1:options}](${2:in})(${3:out})"
+    },
+    "doveprism[]()(){}": {
+      "snippet": "doveprism[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "glanthompson()()": {
+      "snippet": "glanthompson(${1:in})(${2:out})"
+    },
+    "glanthompson()(){}": {
+      "snippet": "glanthompson(${2:in})(${3:out}){${1:label}}"
+    },
+    "glanthompson[]()()": {
+      "snippet": "glanthompson[${1:options}](${2:in})(${3:out})"
+    },
+    "glanthompson[]()(){}": {
+      "snippet": "glanthompson[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "polarization()()": {
+      "snippet": "polarization(${1:in})(${2:out})"
+    },
+    "polarization()(){}": {
+      "snippet": "polarization(${2:in})(${3:out}){${1:label}}"
+    },
+    "polarization[]()()": {
+      "snippet": "polarization[${1:options}](${2:in})(${3:out})"
+    },
+    "polarization[]()(){}": {
+      "snippet": "polarization[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optwedge()()": {
+      "snippet": "optwedge(${1:in})(${2:out})"
+    },
+    "optwedge()(){}": {
+      "snippet": "optwedge(${2:in})(${3:out}){${1:label}}"
+    },
+    "optwedge[]()()": {
+      "snippet": "optwedge[${1:options}](${2:in})(${3:out})"
+    },
+    "optwedge[]()(){}": {
+      "snippet": "optwedge[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "axicon()()": {
+      "snippet": "axicon(${1:in})(${2:out})"
+    },
+    "axicon()(){}": {
+      "snippet": "axicon(${2:in})(${3:out}){${1:label}}"
+    },
+    "axicon[]()()": {
+      "snippet": "axicon[${1:options}](${2:in})(${3:out})"
+    },
+    "axicon[]()(){}": {
+      "snippet": "axicon[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "mirror()()()": {
+      "snippet": "mirror(${1:in})(${2:center})(${3:out})"
+    },
+    "mirror()()(){}": {
+      "snippet": "mirror(${2:in})(${3:center})(${4:out}){${1:label}}"
+    },
+    "mirror[]()()()": {
+      "snippet": "mirror[${1:options}](${2:in})(${3:center})(${4:out})"
+    },
+    "mirror[]()()(){}": {
+      "snippet": "mirror[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
+    },
+    "parabolicmirror()()": {
+      "snippet": "parabolicmirror(${1:in})(${2:out})"
+    },
+    "parabolicmirror()(){}": {
+      "snippet": "parabolicmirror(${2:in})(${3:out}){${1:label}}"
+    },
+    "parabolicmirror[]()()": {
+      "snippet": "parabolicmirror[${1:options}](${2:in})(${3:out})"
+    },
+    "parabolicmirror[]()(){}": {
+      "snippet": "parabolicmirror[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "oapmirror()()()": {
+      "snippet": "oapmirror(${1:in})(${2:center})(${3:focus})"
+    },
+    "oapmirror()()(){}": {
+      "snippet": "oapmirror(${2:in})(${3:center})(${4:focus}){${1:label}}"
+    },
+    "oapmirror[]()()()": {
+      "snippet": "oapmirror[${1:options}](${2:in})(${3:center})(${4:focus})"
+    },
+    "oapmirror[]()()(){}": {
+      "snippet": "oapmirror[${2:options}](${3:in})(${4:center})(${5:focus}){${1:label}}"
+    },
+    "beamsplitter()()()": {
+      "snippet": "beamsplitter(${1:in})(${2:center})(${3:out})"
+    },
+    "beamsplitter()()(){}": {
+      "snippet": "beamsplitter(${2:in})(${3:center})(${4:out}){${1:label}}"
+    },
+    "beamsplitter[]()()()": {
+      "snippet": "beamsplitter[${1:options}](${2:in})(${3:center})(${4:out})"
+    },
+    "beamsplitter[]()()(){}": {
+      "snippet": "beamsplitter[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
+    },
+    "optgrating()()()": {
+      "snippet": "optgrating(${1:in})(${2:center})(${3:out})"
+    },
+    "optgrating()()(){}": {
+      "snippet": "optgrating(${2:in})(${3:center})(${4:out}){${1:label}}"
+    },
+    "optgrating[]()()()": {
+      "snippet": "optgrating[${1:options}](${2:in})(${3:center})(${4:out})"
+    },
+    "optgrating[]()()(){}": {
+      "snippet": "optgrating[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
+    },
+    "transmissiongrating()()()": {
+      "snippet": "transmissiongrating(${1:in})(${2:center})(${3:out})"
+    },
+    "transmissiongrating()()(){}": {
+      "snippet": "transmissiongrating(${2:in})(${3:center})(${4:out}){${1:label}}"
+    },
+    "transmissiongrating[]()()()": {
+      "snippet": "transmissiongrating[${1:options}](${2:in})(${3:center})(${4:out})"
+    },
+    "transmissiongrating[]()()(){}": {
+      "snippet": "transmissiongrating[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
+    },
+    "optaom()()()": {
+      "snippet": "optaom(${1:in})(${2:trans})(${3:diff})"
+    },
+    "optaom()()(){}": {
+      "snippet": "optaom(${2:in})(${3:trans})(${4:diff}){${1:label}}"
+    },
+    "optaom[]()()()": {
+      "snippet": "optaom[${1:options}](${2:in})(${3:trans})(${4:diff})"
+    },
+    "optaom[]()()(){}": {
+      "snippet": "optaom[${2:options}](${3:in})(${4:trans})(${5:diff}){${1:label}}"
+    },
+    "optprism()()()": {
+      "snippet": "optprism(${1:in})(${2:center})(${3:out})"
+    },
+    "optprism()()(){}": {
+      "snippet": "optprism(${2:in})(${3:center})(${4:out}){${1:label}}"
+    },
+    "optprism[]()()()": {
+      "snippet": "optprism[${1:options}](${2:in})(${3:center})(${4:out})"
+    },
+    "optprism[]()()(){}": {
+      "snippet": "optprism[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
+    },
+    "rightangleprism()()()": {
+      "snippet": "rightangleprism(${1:in})(${2:center})(${3:out})"
+    },
+    "rightangleprism()()(){}": {
+      "snippet": "rightangleprism(${2:in})(${3:center})(${4:out}){${1:label}}"
+    },
+    "rightangleprism[]()()()": {
+      "snippet": "rightangleprism[${1:options}](${2:in})(${3:center})(${4:out})"
+    },
+    "rightangleprism[]()()(){}": {
+      "snippet": "rightangleprism[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
+    },
+    "pentaprism()()()": {
+      "snippet": "pentaprism(${1:in})(${2:center})(${3:out})"
+    },
+    "pentaprism()()(){}": {
+      "snippet": "pentaprism(${2:in})(${3:center})(${4:out}){${1:label}}"
+    },
+    "pentaprism[]()()()": {
+      "snippet": "pentaprism[${1:options}](${2:in})(${3:center})(${4:out})"
+    },
+    "pentaprism[]()()(){}": {
+      "snippet": "pentaprism[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
+    },
+    "optfiber()()": {
+      "snippet": "optfiber(${1:in})(${2:out})"
+    },
+    "optfiber()(){}": {
+      "snippet": "optfiber(${2:in})(${3:out}){${1:label}}"
+    },
+    "optfiber[]()()": {
+      "snippet": "optfiber[${1:options}](${2:in})(${3:out})"
+    },
+    "optfiber[]()(){}": {
+      "snippet": "optfiber[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optamp()()": {
+      "snippet": "optamp(${1:in})(${2:out})"
+    },
+    "optamp()(){}": {
+      "snippet": "optamp(${2:in})(${3:out}){${1:label}}"
+    },
+    "optamp[]()()": {
+      "snippet": "optamp[${1:options}](${2:in})(${3:out})"
+    },
+    "optamp[]()(){}": {
+      "snippet": "optamp[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optmzm()()": {
+      "snippet": "optmzm(${1:in})(${2:out})"
+    },
+    "optmzm()(){}": {
+      "snippet": "optmzm(${2:in})(${3:out}){${1:label}}"
+    },
+    "optmzm[]()()": {
+      "snippet": "optmzm[${1:options}](${2:in})(${3:out})"
+    },
+    "optmzm[]()(){}": {
+      "snippet": "optmzm[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "polcontrol()()": {
+      "snippet": "polcontrol(${1:in})(${2:out})"
+    },
+    "polcontrol()(){}": {
+      "snippet": "polcontrol(${2:in})(${3:out}){${1:label}}"
+    },
+    "polcontrol[]()()": {
+      "snippet": "polcontrol[${1:options}](${2:in})(${3:out})"
+    },
+    "polcontrol[]()(){}": {
+      "snippet": "polcontrol[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optisolator()()": {
+      "snippet": "optisolator(${1:in})(${2:out})"
+    },
+    "optisolator()(){}": {
+      "snippet": "optisolator(${2:in})(${3:out}){${1:label}}"
+    },
+    "optisolator[]()()": {
+      "snippet": "optisolator[${1:options}](${2:in})(${3:out})"
+    },
+    "optisolator[]()(){}": {
+      "snippet": "optisolator[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optswitch()()": {
+      "snippet": "optswitch(${1:in})(${2:out})"
+    },
+    "optswitch()(){}": {
+      "snippet": "optswitch(${2:in})(${3:out}){${1:label}}"
+    },
+    "optswitch[]()()": {
+      "snippet": "optswitch[${1:options}](${2:in})(${3:out})"
+    },
+    "optswitch[]()(){}": {
+      "snippet": "optswitch[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "fiberdelayline()()": {
+      "snippet": "fiberdelayline(${1:in})(${2:out})"
+    },
+    "fiberdelayline()(){}": {
+      "snippet": "fiberdelayline(${2:in})(${3:out}){${1:label}}"
+    },
+    "fiberdelayline[]()()": {
+      "snippet": "fiberdelayline[${1:options}](${2:in})(${3:out})"
+    },
+    "fiberdelayline[]()(){}": {
+      "snippet": "fiberdelayline[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optfiberpolarizer()()": {
+      "snippet": "optfiberpolarizer(${1:in})(${2:out})"
+    },
+    "optfiberpolarizer()(){}": {
+      "snippet": "optfiberpolarizer(${2:in})(${3:out}){${1:label}}"
+    },
+    "optfiberpolarizer[]()()": {
+      "snippet": "optfiberpolarizer[${1:options}](${2:in})(${3:out})"
+    },
+    "optfiberpolarizer[]()(){}": {
+      "snippet": "optfiberpolarizer[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optcirculator()()()": {
+      "snippet": "optcirculator(${1:left})(${2:right})(${3:bottom})"
+    },
+    "optcirculator()()(){}": {
+      "snippet": "optcirculator(${2:left})(${3:right})(${4:bottom}){${1:label}}"
+    },
+    "optcirculator[]()()()": {
+      "snippet": "optcirculator[${1:options}](${2:left})(${3:right})(${4:bottom})"
+    },
+    "optcirculator[]()()(){}": {
+      "snippet": "optcirculator[${2:options}](${3:left})(${4:right})(${5:bottom}){${1:label}}"
+    },
+    "optcoupler()()": {
+      "snippet": "optcoupler(${1:in})(${2:out})"
+    },
+    "optcoupler()(){}": {
+      "snippet": "optcoupler(${2:in})(${3:out}){${1:label}}"
+    },
+    "optcoupler()()()()": {
+      "snippet": "optcoupler(${1:tl})(${2:bl})(${3:tr})(${4:br})"
+    },
+    "optcoupler()()()(){}": {
+      "snippet": "optcoupler(${2:tl})(${3:bl})(${4:tr})(${5:br}){${1:label}}"
+    },
+    "optcoupler[]()()": {
+      "snippet": "optcoupler[${1:options}](${2:in})(${3:out})"
+    },
+    "optcoupler[]()(){}": {
+      "snippet": "optcoupler[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "optcoupler[]()()()()": {
+      "snippet": "optcoupler[${1:options}](${2:tl})(${3:bl})(${4:tr})(${5:br})"
+    },
+    "optcoupler[]()()()(){}": {
+      "snippet": "optcoupler[${2:options}](${3:tl})(${4:bl})(${5:tr})(${6:br}){${1:label}}"
+    },
+    "wdmcoupler()()": {
+      "snippet": "wdmcoupler(${1:in})(${2:out})"
+    },
+    "wdmcoupler()(){}": {
+      "snippet": "wdmcoupler(${2:in})(${3:out}){${1:label}}"
+    },
+    "wdmcoupler[]()()": {
+      "snippet": "wdmcoupler[${1:options}](${2:in})(${3:out})"
+    },
+    "wdmcoupler[]()(){}": {
+      "snippet": "wdmcoupler[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "wdmsplitter()()": {
+      "snippet": "wdmsplitter(${1:in})(${2:out})"
+    },
+    "wdmsplitter()(){}": {
+      "snippet": "wdmsplitter(${2:in})(${3:out}){${1:label}}"
+    },
+    "wdmsplitter[]()()": {
+      "snippet": "wdmsplitter[${1:options}](${2:in})(${3:out})"
+    },
+    "wdmsplitter[]()(){}": {
+      "snippet": "wdmsplitter[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "fiberbox()()": {
+      "snippet": "fiberbox(${1:in})(${2:out})"
+    },
+    "fiberbox()(){}": {
+      "snippet": "fiberbox(${2:in})(${3:out}){${1:label}}"
+    },
+    "fiberbox()()()()": {
+      "snippet": "fiberbox(${1:tl})(${2:bl})(${3:tr})(${4:br})"
+    },
+    "fiberbox()()()(){}": {
+      "snippet": "fiberbox(${2:tl})(${3:bl})(${4:tr})(${5:br}){${1:label}}"
+    },
+    "fiberbox[]()()": {
+      "snippet": "fiberbox[${1:options}](${2:in})(${3:out})"
+    },
+    "fiberbox[]()(){}": {
+      "snippet": "fiberbox[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "fiberbox[]()()()()": {
+      "snippet": "fiberbox[${1:options}](${2:tl})(${3:bl})(${4:tr})(${5:br})"
+    },
+    "fiberbox[]()()()(){}": {
+      "snippet": "fiberbox[${2:options}](${3:tl})(${4:bl})(${5:tr})(${6:br}){${1:label}}"
+    },
+    "eleccoupler()()()()": {
+      "snippet": "eleccoupler(${1:tl})(${2:bl})(${3:tr})(${4:br})"
+    },
+    "eleccoupler()()()(){}": {
+      "snippet": "eleccoupler(${2:tl})(${3:bl})(${4:tr})(${5:br}){${1:label}}"
+    },
+    "eleccoupler[]()()()()": {
+      "snippet": "eleccoupler[${1:options}](${2:tl})(${3:bl})(${4:tr})(${5:br})"
+    },
+    "eleccoupler[]()()()(){}": {
+      "snippet": "eleccoupler[${2:options}](${3:tl})(${4:bl})(${5:tr})(${6:br}){${1:label}}"
+    },
+    "elecsynthesizer()()": {
+      "snippet": "elecsynthesizer(${1:in})(${2:out})"
+    },
+    "elecsynthesizer()(){}": {
+      "snippet": "elecsynthesizer(${2:in})(${3:out}){${1:label}}"
+    },
+    "elecsynthesizer[]()()": {
+      "snippet": "elecsynthesizer[${1:options}](${2:in})(${3:out})"
+    },
+    "elecsynthesizer[]()(){}": {
+      "snippet": "elecsynthesizer[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "elecmixer()()()": {
+      "snippet": "elecmixer(${1:left})(${2:right})(${3:bottom})"
+    },
+    "elecmixer()()(){}": {
+      "snippet": "elecmixer(${2:left})(${3:right})(${4:bottom}){${1:label}}"
+    },
+    "elecmixer[]()()()": {
+      "snippet": "elecmixer[${1:options}](${2:left})(${3:right})(${4:bottom})"
+    },
+    "elecmixer[]()()(){}": {
+      "snippet": "elecmixer[${2:options}](${3:left})(${4:right})(${5:bottom}){${1:label}}"
+    },
+    "optfilter()()": {
+      "snippet": "optfilter(${1:in})(${2:out})"
+    },
+    "optfilter()(){}": {
+      "snippet": "optfilter(${2:in})(${3:out}){${1:label}}"
+    },
+    "optfilter[]()()": {
+      "snippet": "optfilter[${1:options}](${2:in})(${3:out})"
+    },
+    "optfilter[]()(){}": {
+      "snippet": "optfilter[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
+    "fibercollimator()()()()": {
+      "snippet": "fibercollimator(${1:in})(${2:A})(${3:B})(${4:out})"
+    },
+    "fibercollimator()()()(){}": {
+      "snippet": "fibercollimator(${2:in})(${3:A})(${4:B})(${5:out}){${1:label}}"
+    },
+    "fibercollimator[]()()()()": {
+      "snippet": "fibercollimator[${1:options}](${2:in})(${3:A})(${4:B})(${5:out})"
+    },
+    "fibercollimator[]()()()(){}": {
+      "snippet": "fibercollimator[${2:options}](${3:in})(${4:A})(${5:B})(${6:out}){${1:label}}"
+    },
+    "optdetector()()": {
+      "snippet": "optdetector(${1:in})(${2:out})"
+    },
+    "optdetector()(){}": {
+      "snippet": "optdetector(${2:in})(${3:out}){${1:label}}"
+    },
+    "optdetector[]()()": {
+      "snippet": "optdetector[${1:options}](${2:in})(${3:out})"
+    },
+    "optdetector[]()(){}": {
+      "snippet": "optdetector[${2:options}](${3:in})(${4:out}){${1:label}}"
+    },
     "oenode{}{}": {
       "snippet": "oenode{${1:node}}{${2:comp}}"
     },
@@ -72,12 +636,42 @@
     "oeBeamVecMedian{}": {
       "snippet": "oeBeamVecMedian{${1:number}}"
     },
+    "optplane()": {
+      "snippet": "optplane(${1:center})"
+    },
+    "optplane[]()": {
+      "snippet": "optplane[${1:options}](${2:center})"
+    },
     "backlayer{}": {
       "snippet": "backlayer{${1:code}}"
     },
     "frontlayer{}": {
       "snippet": "frontlayer{${1:code}}"
     },
+    "optdipole()(){}": {
+      "snippet": "optdipole(${2:in})(${3:out}){${1:comp}}"
+    },
+    "optdipole()(){}{}": {
+      "snippet": "optdipole(${3:in})(${4:out}){${1:comp}}{${2:label}}"
+    },
+    "optdipole[]()(){}": {
+      "snippet": "optdipole[${2:options}](${3:in})(${4:out}){${1:comp}}"
+    },
+    "optdipole[]()(){}{}": {
+      "snippet": "optdipole[${3:options}](${4:in})(${5:out}){${1:comp}}{${2:label}}"
+    },
+    "opttripole()()(){}": {
+      "snippet": "opttripole(${2:in})(${3:center})(${4:out}){${1:comp}}"
+    },
+    "opttripole()()(){}{}": {
+      "snippet": "opttripole(${3:in})(${4:center})(${5:out}){${1:comp}}{${2:label}}"
+    },
+    "opttripole[]()()(){}": {
+      "snippet": "opttripole[${2:options}](${3:in})(${4:center})(${5:out}){${1:comp}}"
+    },
+    "opttripole[]()()(){}{}": {
+      "snippet": "opttripole[${3:options}](${4:in})(${5:center})(${6:out}){${1:comp}}{${2:label}}"
+    },
     "newOptexpDipole{}": {
       "snippet": "newOptexpDipole{${1:name}}"
     },
diff --git a/dev/packages/pst-optic.json b/dev/packages/pst-optic.json
index 10b320722..eec3006b6 100644
--- a/dev/packages/pst-optic.json
+++ b/dev/packages/pst-optic.json
@@ -18,6 +18,9 @@
     "lensCVG": {},
     "lensDVG": {},
     "Transform": {},
+    "rayInterLens()()(){}": {
+      "snippet": "rayInterLens(${2:start node})(${3:intermediate node})(${4:lens distance}){${1:lens node}}"
+    },
     "telescope": {},
     "telescope[]": {
       "snippet": "telescope[${1:options}]"
@@ -30,10 +33,31 @@
     "mirrorDVG[]": {
       "snippet": "mirrorDVG[${1:options}]"
     },
+    "mirrorCVGRay()(){}": {
+      "snippet": "mirrorCVGRay(${2:node1})(${3:node2}){${1:mirror node}}"
+    },
+    "mirrorCVGRay[]()(){}": {
+      "snippet": "mirrorCVGRay[${2:options}](${3:node1})(${4:node2}){${1:mirror node}}"
+    },
+    "mirrorDVGRay()(){}": {
+      "snippet": "mirrorDVGRay(${2:node1})(${3:node2}){${1:mirror node}}"
+    },
+    "mirrorDVGRay[]()(){}": {
+      "snippet": "mirrorDVGRay[${2:options}](${3:node1})(${4:node2}){${1:mirror node}}"
+    },
+    "planMirrorRay()()(){}": {
+      "snippet": "planMirrorRay(${2:mirror begin})(${3:mirror end})(${4:original point}){${1:new point}}"
+    },
+    "symPlan()(){}": {
+      "snippet": "symPlan(${2:node1})(${3:node2}){${1:stuff}}"
+    },
     "beamLight": {},
     "beamLight[]": {
       "snippet": "beamLight[${1:options}]"
     },
+    "refractionRay()()()(){}{}{}": {
+      "snippet": "refractionRay(${4:A})(${5:B})(${6:C})(${7:D}){${1:n1}}{${2:n2}}{${3:end node}}"
+    },
     "psprism": {},
     "psprism[]": {
       "snippet": "psprism[${1:options}]"
@@ -42,7 +66,52 @@
     "lensSPH[]": {
       "snippet": "lensSPH[${1:options}]"
     },
+    "ABinterSPHLens()()(){}": {
+      "snippet": "ABinterSPHLens(${2:A})(${3:B})(${4:center}){${1:name}}"
+    },
+    "lensSPHRay()(){}{}{}": {
+      "snippet": "lensSPHRay(${4:A})(${5:B}){${1:refractA}}{${2:refractB}}{${3:node name}}"
+    },
+    "lensSPHRay[]()(){}{}{}": {
+      "snippet": "lensSPHRay[${4:options}](${5:A})(${6:B}){${1:refractA}}{${2:refractB}}{${3:node name}}"
+    },
+    "reflectionRay()(){}": {
+      "snippet": "reflectionRay(${2:A})(${3:B}){${1:node name}}"
+    },
+    "reflectionRay[]()(){}": {
+      "snippet": "reflectionRay[${2:options}](${3:A})(${4:B}){${1:node name}}"
+    },
     "eye": {},
+    "Arrows()()": {
+      "snippet": "Arrows(${1:nodeA})(${2:nodeB})"
+    },
+    "Arrows[]()()": {
+      "snippet": "Arrows[${1:options}](${2:nodeA})(${3:nodeB})"
+    },
+    "psOutLine()(){}": {
+      "snippet": "psOutLine(${2:nodeA})(${3:nodeB}){${1:end node}}"
+    },
+    "psOutLine[]()(){}": {
+      "snippet": "psOutLine[${2:options}](${3:nodeA})(${4:nodeB}){${1:end node}}"
+    },
+    "psBeforeLine()(){}": {
+      "snippet": "psBeforeLine(${2:nodeA})(${3:nodeB}){${1:start node}}"
+    },
+    "psBeforeLine[]()(){}": {
+      "snippet": "psBeforeLine[${2:options}](${3:nodeA})(${4:nodeB}){${1:start node}}"
+    },
+    "Parallel()()(){}": {
+      "snippet": "Parallel(${2:nodeA})(${3:nodeB})(${4:start node}){${1:end node}}"
+    },
+    "Parallel[]()()(){}": {
+      "snippet": "Parallel[${2:options}](${3:nodeA})(${4:nodeB})(${5:start node}){${1:end node}}"
+    },
+    "ABinterCD()()()(){}": {
+      "snippet": "ABinterCD(${2:A})(${3:B})(${4:C})(${5:D}){${1:E}}"
+    },
+    "nodeBetween()(){}": {
+      "snippet": "nodeBetween(${2:A})(${3:B}){${1:C}}"
+    },
     "rotateNode{}{}": {
       "snippet": "rotateNode{${1:node name}}{${2:degrees}}"
     },
@@ -52,6 +121,12 @@
     "rotateFrame{}{}{}{}{}": {
       "snippet": "rotateFrame{${1:nodeA}}{${2:nodeB}}{${3:nodeC}}{${4:nodeD}}{${5:degrees}}"
     },
+    "arrowLine()(){}": {
+      "snippet": "arrowLine(${2:start})(${3:end}){${1:arrow number}}"
+    },
+    "arrowLine[]()(){}": {
+      "snippet": "arrowLine[${2:options}](${3:start})(${4:end}){${1:arrow number}}"
+    },
     "mirrorTwo": {},
     "pslensDVG{}{}": {
       "snippet": "pslensDVG{${1:width}}{${2:height}}"
diff --git a/dev/packages/pst-pad.json b/dev/packages/pst-pad.json
index 588a16518..eac476b3c 100644
--- a/dev/packages/pst-pad.json
+++ b/dev/packages/pst-pad.json
@@ -6,6 +6,54 @@
     "pst-xkey": []
   },
   "macros": {
+    "PstWallToWall()": {
+      "snippet": "PstWallToWall(${1:x},${2:y})"
+    },
+    "PstWallToWall[]()": {
+      "snippet": "PstWallToWall[${1:options}](${2:x},${3:y})"
+    },
+    "PstSphereToWall()": {
+      "snippet": "PstSphereToWall(${1:x},${2:y})"
+    },
+    "PstSphereToWall[]()": {
+      "snippet": "PstSphereToWall[${1:options}](${2:x},${3:y})"
+    },
+    "PstPad()": {
+      "snippet": "PstPad(${1:x},${2:y})"
+    },
+    "PstPad[]()": {
+      "snippet": "PstPad[${1:options}](${2:x},${3:y})"
+    },
+    "PstFluid()": {
+      "snippet": "PstFluid(${1:x},${2:y})"
+    },
+    "PstFluid[]()": {
+      "snippet": "PstFluid[${1:options}](${2:x},${3:y})"
+    },
+    "PstWall()": {
+      "snippet": "PstWall(${1:x},${2:y})"
+    },
+    "PstWall[]()": {
+      "snippet": "PstWall[${1:options}](${2:x},${3:y})"
+    },
+    "PstWallRough()": {
+      "snippet": "PstWallRough(${1:x},${2:y})"
+    },
+    "PstWallRough[]()": {
+      "snippet": "PstWallRough[${1:options}](${2:x},${3:y})"
+    },
+    "PstSphere()": {
+      "snippet": "PstSphere(${1:x},${2:y})"
+    },
+    "PstSphere[]()": {
+      "snippet": "PstSphere[${1:options}](${2:x},${3:y})"
+    },
+    "PstFlattenedSphere()": {
+      "snippet": "PstFlattenedSphere(${1:x},${2:y})"
+    },
+    "PstFlattenedSphere[]()": {
+      "snippet": "PstFlattenedSphere[${1:options}](${2:x},${3:y})"
+    },
     "PSTpadLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-pdf.json b/dev/packages/pst-pdf.json
new file mode 100644
index 000000000..a33c62193
--- /dev/null
+++ b/dev/packages/pst-pdf.json
@@ -0,0 +1,101 @@
+{
+  "includes": {
+    "ifpdf": [],
+    "ifxetex": [],
+    "ifvtex": [],
+    "luatex85": [],
+    "graphicx": [],
+    "pstricks": [],
+    "preview": [],
+    "environ": [],
+    "pst-calculate": [
+      "useCalc"
+    ],
+    "pdfcolmk": [
+      "fixpdftex"
+    ]
+  },
+  "macros": {
+    "PDFcontainer": {},
+    "savepicture{}": {
+      "snippet": "savepicture{${1:name}}"
+    },
+    "usepicture{}": {
+      "snippet": "usepicture{${1:name}}"
+    },
+    "usepicture[]{}": {
+      "snippet": "usepicture[${2:options}]{${1:name}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "thepspicture": {}
+  },
+  "envs": {
+    "postscript": {},
+    "postscript[]": {
+      "name": "postscript",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [
+    "active",
+    "inactive",
+    "pstricks",
+    "nopstricks",
+    "draft",
+    "final",
+    "tightpage",
+    "notightpage",
+    "displaymath",
+    "noxcolor",
+    "useCalc",
+    "gsfonts",
+    "psfonts",
+    "noEngineCheck",
+    "pdf",
+    "xetex",
+    "distiller",
+    "monochrome",
+    "grayscale"
+  ],
+  "keyvals": [
+    [
+      "frame",
+      "innerframe",
+      "ignore",
+      "showname",
+      "namefont=${1:font commands}",
+      "alt={${1:alt text}}",
+      "bb=${1:llx lly urx ury}",
+      "bbllx=",
+      "bblly=",
+      "bburx=",
+      "bbury=",
+      "natwidth=",
+      "natheight=",
+      "hiresbb",
+      "pagebox=",
+      "viewport=${1:llx lly urx ury}",
+      "trim=${1:llx lly urx ury}",
+      "angle=${1:degrees}",
+      "origin=",
+      "width=",
+      "height=",
+      "totalheight=",
+      "keepaspectratio",
+      "scale=${1:factor}",
+      "clip",
+      "draft",
+      "type=${1:file type}",
+      "ext=${1:file extension}",
+      "read=${1:read-file extension}",
+      "command=",
+      "quiet",
+      "page=${1:page number}",
+      "interpolate",
+      "decodearray={${1:color array}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/pst-perspective.json b/dev/packages/pst-perspective.json
index 9ef8f6644..915f79f0c 100644
--- a/dev/packages/pst-perspective.json
+++ b/dev/packages/pst-perspective.json
@@ -5,6 +5,30 @@
     "pstricks-add": []
   },
   "macros": {
+    "pstransTS(){}{}": {
+      "snippet": "pstransTS(${3:x},${4:y}){${1:A}}{${2:A'}}"
+    },
+    "pstransTS[](){}{}": {
+      "snippet": "pstransTS[${3:options}](${4:x},${5:y}){${1:A}}{${2:A'}}"
+    },
+    "pstransTSX(){}{}": {
+      "snippet": "pstransTSX(${3:x},${4:y}){${1:A}}{${2:A'}}"
+    },
+    "pstransTSX[](){}{}": {
+      "snippet": "pstransTSX[${3:options}](${4:x},${5:y}){${1:A}}{${2:A'}}"
+    },
+    "pstransTSK(){}{}{}": {
+      "snippet": "pstransTSK(${4:x},${5:y}){${1:length}}{${2:A}}{${3:A'}}"
+    },
+    "pstransTSK[](){}{}{}": {
+      "snippet": "pstransTSK[${4:options}](${5:x},${6:y}){${1:length}}{${2:A}}{${3:A'}}"
+    },
+    "psboxTS(){}{}{}{}": {
+      "snippet": "psboxTS(${5:x},${6:y},${7:z}){${1:x length}}{${2:y width}}{${3:z height}}{${4:color}}"
+    },
+    "psboxTS[](){}{}{}{}": {
+      "snippet": "psboxTS[${5:options}](${6:x},${7:y},${8:z}){${1:x length}}{${2:y width}}{${3:z height}}{${4:color}}"
+    },
     "psCircleTS{}": {
       "snippet": "psCircleTS{${1:radius}}"
     },
diff --git a/dev/packages/pst-plot.json b/dev/packages/pst-plot.json
index ad9811114..edc5301fa 100644
--- a/dev/packages/pst-plot.json
+++ b/dev/packages/pst-plot.json
@@ -39,12 +39,42 @@
     "parametricplot{}{}{}": {
       "snippet": "parametricplot{${1:tmin}}{${2:tmax}}{${3:function}}"
     },
+    "psaxes()()()": {
+      "snippet": "psaxes(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "psaxes()()()[][]": {
+      "snippet": "psaxes(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})[${1:Xlabel,${9:Xangle}][${2:Ylabel},Yangle}]"
+    },
+    "psaxes[]()()()": {
+      "snippet": "psaxes[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
+    "psaxes[]()()()[][]": {
+      "snippet": "psaxes[${1:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
+    },
+    "psaxes[]{}()()()": {
+      "snippet": "psaxes[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})"
+    },
+    "psaxes[]{}()()()[][]": {
+      "snippet": "psaxes[${2:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2})[${3:Xlabel,${11:Xangle}][${4:Ylabel},Yangle}]"
+    },
+    "psaxes{}()()()": {
+      "snippet": "psaxes{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
+    "psaxes{}()()()[][]": {
+      "snippet": "psaxes{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
+    },
     "psBoxplot[]{}": {
       "snippet": "psBoxplot[${2:options}]{${1:macro}}"
     },
     "psBoxplot{}": {
       "snippet": "psBoxplot{${1:macro}}"
     },
+    "psCoordinates()": {
+      "snippet": "psCoordinates(${1:x},${2:y})"
+    },
+    "psCoordinates[]()": {
+      "snippet": "psCoordinates[${1:options}](${2:x},${3:y})"
+    },
     "psdataplot[]{}": {
       "snippet": "psdataplot[${2:options}]{${1:macro}}"
     },
@@ -63,11 +93,26 @@
     "psFixpoint{}{}{}": {
       "snippet": "psFixpoint{${1:x0}}{${2:f(${4:x})}}{${3:n}}"
     },
+    "psgraph()()(){}{}": {
+      "snippet": "psgraph(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[]()()(){}{}": {
+      "snippet": "psgraph[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[]{}()()(){}{}": {
+      "snippet": "psgraph[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph{}()()(){}{}": {
+      "snippet": "psgraph{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
+    },
     "psgraphLLx": {},
     "psgraphLLy": {},
     "psgraphURx": {},
     "psgraphURy": {},
     "pshlabel": {},
+    "pslegend[](){}": {
+      "snippet": "pslegend[${2:reference}](${3:xoffset},${4:yoffset}){${1:text}}"
+    },
     "pslegend[]{}": {
       "snippet": "pslegend[${2:reference}]{${1:text}}"
     },
@@ -143,16 +188,49 @@
     "PSTplotLoaded": {},
     "pstRadUnit": {},
     "pstRadUnitInv": {},
+    "pstScalePoints(){}{}": {
+      "snippet": "pstScalePoints(${3:xscale},${4:yscale}){${1:xPS}}{${2:yPS}}"
+    },
     "pstXPSScale": {},
     "pstXScale": {},
     "pstYPSScale": {},
     "pstYScale": {},
+    "psVectorfield()(){}": {
+      "snippet": "psVectorfield(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:f'(${6:x},${7:y})}}"
+    },
+    "psVectorfield[]()(){}": {
+      "snippet": "psVectorfield[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:f'(${7:x},${8:y})}}"
+    },
     "psvlabel": {},
     "psxlabelsep": {},
     "psxsubticklinestyle": {},
+    "psxTick(){}": {
+      "snippet": "psxTick(${2:x value}){${1:label}}"
+    },
+    "psxTick[](){}": {
+      "snippet": "psxTick[${2:options}](${3:x value}){${1:label}}"
+    },
+    "psxTick[]{}(){}": {
+      "snippet": "psxTick[${3:options}]{${1:rotation}}(${4:x value}){${2:label}}"
+    },
+    "psxTick{}(){}": {
+      "snippet": "psxTick{${1:rotation}}(${3:x value}){${2:label}}"
+    },
     "psxticklinestyle": {},
     "psylabelsep": {},
     "psysubticklinestyle": {},
+    "psyTick(){}": {
+      "snippet": "psyTick(${2:y value}){${1:label}}"
+    },
+    "psyTick[](){}": {
+      "snippet": "psyTick[${2:options}](${3:y value}){${1:label}}"
+    },
+    "psyTick[]{}(){}": {
+      "snippet": "psyTick[${3:options}]{${1:rotation}}(${4:y value}){${2:label}}"
+    },
+    "psyTick{}(){}": {
+      "snippet": "psyTick{${1:rotation}}(${3:y value}){${2:label}}"
+    },
     "psyticklinestyle": {},
     "readdata{}{}": {
       "snippet": "readdata{${1:macro}}{${2:file}}"
@@ -175,7 +253,40 @@
     "SpecialLabelsDonetrue": {},
     "stripDecimals": {}
   },
-  "envs": {},
+  "envs": {
+    "psgraph(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[](x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph",
+      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph*(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph*[](x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
+    },
+    "psgraph*[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
+    },
+    "psgraph*{}(x0,y0)(x1,y1)(x2,y2){}{}": {
+      "name": "psgraph*",
+      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
+    }
+  },
   "options": [
     "97"
   ],
diff --git a/dev/packages/pst-rputover.json b/dev/packages/pst-rputover.json
index d4f0190d7..620e27a64 100644
--- a/dev/packages/pst-rputover.json
+++ b/dev/packages/pst-rputover.json
@@ -5,12 +5,52 @@
     "pst-xkey": []
   },
   "macros": {
+    "rputover()(){}": {
+      "snippet": "rputover(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:stuff}}"
+    },
+    "rputover{}(){}": {
+      "snippet": "rputover{${1:angle}}(${3:x0},${4:y0}){${2:stuff}}"
+    },
+    "rputover{}()(){}": {
+      "snippet": "rputover{${1:angle}}(${3:x0},${4:y0})(${5:x1},${6:y1}){${2:stuff}}"
+    },
+    "rputover[]()(){}": {
+      "snippet": "rputover[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:stuff}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "rputover[]{}(){}": {
+      "snippet": "rputover[${3:options}]{${1:angle}}(${4:x0},${5:y0}){${2:stuff}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "rputover[]{}()(){}": {
+      "snippet": "rputover[${3:options}]{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:stuff}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "coverable{}": {
       "snippet": "coverable{${1:stuff}}"
     },
     "coverable[]{}": {
       "snippet": "coverable[${2:options}]{${1:stuff}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "pclineover()(){}": {
+      "snippet": "pclineover(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:stuff}}"
+    },
+    "pclineover[]()(){}": {
+      "snippet": "pclineover[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:stuff}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "pcarrowC()(){}": {
+      "snippet": "pcarrowC(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:stuff}}"
+    },
+    "pcarrowC[]()(){}": {
+      "snippet": "pcarrowC[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:stuff}}",
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "PSTRPUTOVERLoaded": {}
@@ -18,8 +58,27 @@
   "envs": {},
   "options": [],
   "keyvals": [
+    [
+      "autoangle",
+      "inverscl",
+      "boxpos=${1:pos}",
+      "fboxsep=",
+      "npos=${1:number}"
+    ],
     [
       "inverscl"
+    ],
+    [
+      "absnodesep=",
+      "angleadd=${1:degrees}",
+      "arrows=${1:arrows}",
+      "offset="
+    ],
+    [
+      "addbars=${1:bars}",
+      "baroffset=",
+      "Cbarwidth=",
+      "tbarsize="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-rubans.json b/dev/packages/pst-rubans.json
index e1aeb1735..482394439 100644
--- a/dev/packages/pst-rubans.json
+++ b/dev/packages/pst-rubans.json
@@ -8,18 +8,33 @@
     "pshelices[]": {
       "snippet": "pshelices[${1:options}]"
     },
+    "pshelices[]()": {
+      "snippet": "pshelices[${1:options}](${2:x},${3:y},${4:z})"
+    },
     "psSpiralRing[]": {
       "snippet": "psSpiralRing[${1:options}]"
     },
+    "psSpiralRing[]()": {
+      "snippet": "psSpiralRing[${1:options}](${2:x},${3:y},${4:z})"
+    },
     "psSphericalSpiral[]": {
       "snippet": "psSphericalSpiral[${1:options}]"
     },
+    "psSphericalSpiral[]()": {
+      "snippet": "psSphericalSpiral[${1:options}](${2:x},${3:y},${4:z})"
+    },
     "psSpiralParaboloid[]": {
       "snippet": "psSpiralParaboloid[${1:options}]"
     },
+    "psSpiralParaboloid[]()": {
+      "snippet": "psSpiralParaboloid[${1:options}](${2:x},${3:y},${4:z})"
+    },
     "psSpiralCone[]": {
       "snippet": "psSpiralCone[${1:options}]"
     },
+    "psSpiralCone[]()": {
+      "snippet": "psSpiralCone[${1:options}](${2:x},${3:y},${4:z})"
+    },
     "PSTRubansLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-shell.json b/dev/packages/pst-shell.json
index 0195dfdfb..71931e438 100644
--- a/dev/packages/pst-shell.json
+++ b/dev/packages/pst-shell.json
@@ -9,6 +9,11 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "psShell[]()": {
+      "snippet": "psShell[${1:options}](${2:x},${3:y},${4:z})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "PSTSHELLLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-sigsys.json b/dev/packages/pst-sigsys.json
index feb575f9a..8df95ae5b 100644
--- a/dev/packages/pst-sigsys.json
+++ b/dev/packages/pst-sigsys.json
@@ -5,12 +5,168 @@
     "pst-xkey": []
   },
   "macros": {
+    "psaxeslabels()()(){}{}": {
+      "snippet": "psaxeslabels(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:x label}}{${2:y label}}"
+    },
+    "psaxeslabels{}()()(){}{}": {
+      "snippet": "psaxeslabels{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:x label}}{${3:y label}}"
+    },
+    "psaxeslabels[]()()(){}{}": {
+      "snippet": "psaxeslabels[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:x label}}{${2:y label}}"
+    },
+    "psaxeslabels[]{}()()(){}{}": {
+      "snippet": "psaxeslabels[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:x label}}{${3:y label}}"
+    },
+    "pstick(){}": {
+      "snippet": "pstick(${2:x},${3:y}){${1:ticklength}}"
+    },
+    "pstick{}(){}": {
+      "snippet": "pstick{${1:angle}}(${3:x},${4:y}){${2:ticklength}}"
+    },
+    "pstick[](){}": {
+      "snippet": "pstick[${2:options}](${3:x},${4:y}){${1:ticklength}}"
+    },
+    "pstick[]{}(){}": {
+      "snippet": "pstick[${3:options}]{${1:angle}}(${4:x},${5:y}){${2:ticklength}}"
+    },
+    "psTick()": {
+      "snippet": "psTick(${1:x},${2:y})"
+    },
+    "psTick{}()": {
+      "snippet": "psTick{${1:angle}}(${2:x},${3:y})"
+    },
+    "psTick[]()": {
+      "snippet": "psTick[${1:options}](${2:x},${3:y})"
+    },
+    "psTick[]{}()": {
+      "snippet": "psTick[${2:options}]{${1:angle}}(${3:x},${4:y})"
+    },
+    "pssignal(){}{}": {
+      "snippet": "pssignal(${3:x},${4:y}){${1:node}}{${2:stuff}}"
+    },
+    "pssignal[](){}{}": {
+      "snippet": "pssignal[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
+    },
     "psstem{}": {
       "snippet": "psstem{${1:list}}"
     },
+    "psstem(){}": {
+      "snippet": "psstem(${2:x},${3:∆x}){${1:list}}"
+    },
     "psstem[]{}": {
       "snippet": "psstem[${2:options}]{${1:list}}"
     },
+    "psstem[](){}": {
+      "snippet": "psstem[${2:options}](${3:x},${4:∆x}){${1:list}}"
+    },
+    "pszero(){}": {
+      "snippet": "pszero(${2:x},${3:y}){${1:node}}"
+    },
+    "pszero[](){}": {
+      "snippet": "pszero[${2:options}](${3:x},${4:y}){${1:node}}"
+    },
+    "pspole(){}": {
+      "snippet": "pspole(${2:x},${3:y}){${1:node}}"
+    },
+    "pspole[](){}": {
+      "snippet": "pspole[${2:options}](${3:x},${4:y}){${1:node}}"
+    },
+    "pscircleop(){}": {
+      "snippet": "pscircleop(${2:x},${3:y}){${1:node}}"
+    },
+    "pscircleop[](){}": {
+      "snippet": "pscircleop[${2:options}](${3:x},${4:y}){${1:node}}"
+    },
+    "psframeop(){}": {
+      "snippet": "psframeop(${2:x},${3:y}){${1:node}}"
+    },
+    "psframeop[](){}": {
+      "snippet": "psframeop[${2:options}](${3:x},${4:y}){${1:node}}"
+    },
+    "psdisk(){}": {
+      "snippet": "psdisk(${2:x},${3:y}){${1:radius}}"
+    },
+    "psdisk[](){}": {
+      "snippet": "psdisk[${2:options}](${3:x},${4:y}){${1:radius}}"
+    },
+    "psring(){}{}": {
+      "snippet": "psring(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psring[](){}{}": {
+      "snippet": "psring[${3:options}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psdiskc()(){}": {
+      "snippet": "psdiskc(${2:x},${3:y})(${4:x0},${5:y0}){${1:radius}}"
+    },
+    "psdiskc[]()(){}": {
+      "snippet": "psdiskc[${2:options}](${3:x},${4:y})(${5:x0},${6:y0}){${1:radius}}"
+    },
+    "psldots()": {
+      "snippet": "psldots(${1:x},${2:y})"
+    },
+    "psldots{}()": {
+      "snippet": "psldots{${1:angle}}(${2:x},${3:y})"
+    },
+    "psldots[]()": {
+      "snippet": "psldots[${1:options}](${2:x},${3:y})"
+    },
+    "psldots[]{}()": {
+      "snippet": "psldots[${2:options}]{${1:angle}}(${3:x},${4:y})"
+    },
+    "ldotsnode(){}": {
+      "snippet": "ldotsnode(${2:x},${3:y}){${1:node}}"
+    },
+    "ldotsnode{}(){}": {
+      "snippet": "ldotsnode{${1:angle}}(${3:x},${4:y}){${2:node}}"
+    },
+    "ldotsnode[](){}": {
+      "snippet": "ldotsnode[${2:options}](${3:x},${4:y}){${1:node}}"
+    },
+    "ldotsnode[]{}(){}": {
+      "snippet": "ldotsnode[${3:options}]{${1:angle}}(${4:x},${5:y}){${2:node}}"
+    },
+    "psblock(){}{}": {
+      "snippet": "psblock(${3:x},${4:y}){${1:node}}{${2:stuff}}"
+    },
+    "psblock[](){}{}": {
+      "snippet": "psblock[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
+    },
+    "psfblock(){}{}": {
+      "snippet": "psfblock(${3:x},${4:y}){${1:node}}{${2:stuff}}"
+    },
+    "psfblock[](){}{}": {
+      "snippet": "psfblock[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
+    },
+    "psadaptive{}(){}": {
+      "snippet": "psadaptive{${1:nodeA}}(${3:x},${4:y}){${2:nodeB}}"
+    },
+    "psadaptive{}{}(){}": {
+      "snippet": "psadaptive{${1:arrows}}{${2:nodeA}}(${4:x},${5:y}){${3:nodeB}}"
+    },
+    "psadaptive[]{}(){}": {
+      "snippet": "psadaptive[${3:options}]{${1:nodeA}}(${4:x},${5:y}){${2:nodeB}}"
+    },
+    "psadaptive[]{}{}(){}": {
+      "snippet": "psadaptive[${4:options}]{${1:arrows}}{${2:nodeA}}(${5:x},${6:y}){${3:nodeB}}"
+    },
+    "psknob(){}": {
+      "snippet": "psknob(${2:x},${3:y}){${1:node}}"
+    },
+    "psknob[](){}": {
+      "snippet": "psknob[${2:options}](${3:x},${4:y}){${1:node}}"
+    },
+    "psusampler(){}{}": {
+      "snippet": "psusampler(${3:x},${4:y}){${1:node}}{${2:stuff}}"
+    },
+    "psusampler[](){}{}": {
+      "snippet": "psusampler[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
+    },
+    "psdsampler(){}{}": {
+      "snippet": "psdsampler(${3:x},${4:y}){${1:node}}{${2:stuff}}"
+    },
+    "psdsampler[](){}{}": {
+      "snippet": "psdsampler[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
+    },
     "nclist{}{}": {
       "snippet": "nclist{${1:nc csname}}{${2:list}}"
     },
@@ -59,6 +215,54 @@
     "ncstar[]{}{}[]{}{}": {
       "snippet": "ncstar[${5:options}]{${1:arrows}}{${2:nc csname}}[${6:nc label}]{${3:list}}{${4:node}}"
     },
+    "psBraceUp()(){}": {
+      "snippet": "psBraceUp(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceUp[]()(){}": {
+      "snippet": "psBraceUp[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psBraceUp*()(){}": {
+      "snippet": "psBraceUp*(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceUp*[]()(){}": {
+      "snippet": "psBraceUp*[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psBraceDown()(){}": {
+      "snippet": "psBraceDown(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceDown[]()(){}": {
+      "snippet": "psBraceDown[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psBraceDown*()(){}": {
+      "snippet": "psBraceDown*(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceDown*[]()(){}": {
+      "snippet": "psBraceDown*[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psBraceRight()(){}": {
+      "snippet": "psBraceRight(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceRight[]()(){}": {
+      "snippet": "psBraceRight[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psBraceRight*()(){}": {
+      "snippet": "psBraceRight*(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceRight*[]()(){}": {
+      "snippet": "psBraceRight*[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psBraceLeft()(){}": {
+      "snippet": "psBraceLeft(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceLeft[]()(){}": {
+      "snippet": "psBraceLeft[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psBraceLeft*()(){}": {
+      "snippet": "psBraceLeft*(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBraceLeft*[]()(){}": {
+      "snippet": "psBraceLeft*[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
     "pstsigsysFV": {},
     "pstsigsysFD": {},
     "PSTsigsysLoaded": {}
diff --git a/dev/packages/pst-slpe.json b/dev/packages/pst-slpe.json
index 18b4a825d..b47642c31 100644
--- a/dev/packages/pst-slpe.json
+++ b/dev/packages/pst-slpe.json
@@ -7,9 +7,15 @@
     "psBall{}{}": {
       "snippet": "psBall{${1:color}}{${2:radius}}"
     },
+    "psBall(){}{}": {
+      "snippet": "psBall(${3:x},${4:y}){${1:color}}{${2:radius}}"
+    },
     "psBall[]{}{}": {
       "snippet": "psBall[${3:options}]{${1:color}}{${2:radius}}"
     },
+    "psBall[](){}{}": {
+      "snippet": "psBall[${3:options}](${4:x},${5:y}){${1:color}}{${2:radius}}"
+    },
     "psslopesteps": {},
     "pstslpefileversion": {},
     "pstslpefiledate": {},
diff --git a/dev/packages/pst-solides3d.json b/dev/packages/pst-solides3d.json
index 7529a5647..e88c3884c 100644
--- a/dev/packages/pst-solides3d.json
+++ b/dev/packages/pst-solides3d.json
@@ -6,25 +6,89 @@
     "multido": []
   },
   "macros": {
+    "axesIIID()()": {
+      "snippet": "axesIIID(${1:x1},${2:y1},${3:z1})(${4:x2},${5:y2},${6:z2})"
+    },
+    "axesIIID[]()()": {
+      "snippet": "axesIIID[${1:options}](${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "psSolid[]": {
       "snippet": "psSolid[${1:object=name,options}]"
     },
+    "psSolid[]()": {
+      "snippet": "psSolid[${1:options}](${2:x},${3:y},${4:z})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "codejps{}": {
       "snippet": "codejps{${1:jps code}}"
     },
+    "defFunction{}(){}{}{}": {
+      "snippet": "defFunction{${1:name}}(${5:var}){${2:x}}{${3:y}}{${4:z}}"
+    },
+    "defFunction[]{}(){}{}{}": {
+      "snippet": "defFunction[${5:options}]{${1:name}}(${6:var}){${2:x}}{${3:y}}{${4:z}}"
+    },
+    "psSurface()(){}": {
+      "snippet": "psSurface(${2:xmin},${3:ymin})(${4:xmax},${5:ymax}){${1:surface definition}}"
+    },
+    "psSurface[]()(){}": {
+      "snippet": "psSurface[${2:options}](${3:xmin},${4:ymin})(${5:xmax},${6:ymax}){${1:surface definition}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "psImplicitSurface[]": {
       "snippet": "psImplicitSurface[${1:options}]",
-      "keyvalindex": 0,
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "psImplicitSurface[]()": {
+      "snippet": "psImplicitSurface[${1:options}](${2:x},${3:y},${4:z})",
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "composeSolid": {},
+    "psPoint(){}": {
+      "snippet": "psPoint(${2:x},${3:y},${4:z}){${1:name}}"
+    },
+    "psTransformPoint()(){}": {
+      "snippet": "psTransformPoint(${2:x},${3:y},${4:z})(${5:vx},${6:vy},${7:vz}){${1:name}}"
+    },
+    "psTransformPoint[]()(){}": {
+      "snippet": "psTransformPoint[${2:options}](${3:x},${4:y},${5:z})(${6:vx},${7:vy},${8:vz}){${1:name}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
     "psProjection[]": {
       "snippet": "psProjection[${1:object=name,options}]"
     },
+    "psProjection[]()": {
+      "snippet": "psProjection[${1:options}](${2:x},${3:y},${4:z})",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
     "psResetSolidKeys": {},
+    "gridIIID()()": {
+      "snippet": "gridIIID(${1:x1},${2:y1})(${3:x2},${4:y2})"
+    },
+    "gridIIID[]()()": {
+      "snippet": "gridIIID[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
     "psImage[]": {
       "snippet": "psImage[${1:filename=imagefile,options}]"
     },
+    "psImage[]()": {
+      "snippet": "psImage[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "Normale()": {
+      "snippet": "Normale(${1:radius},${2:longitude},${3:latitude})"
+    },
     "addtosolideslistobject{}": {
       "snippet": "addtosolideslistobject{${1:name}}"
     },
@@ -33,6 +97,135 @@
   "envs": {},
   "options": [],
   "keyvals": [
+    [
+      "arrowinset=${1:number}",
+      "arrowsize=",
+      "axisemph=${1:font commands}",
+      "axisnames={${1:x,y,z}}",
+      "labelsep=",
+      "linecolor=",
+      "linewidth=",
+      "mathLabel",
+      "showOrigin"
+    ],
+    [
+      "object=",
+      "a=${1:length}",
+      "action=",
+      "affinage=",
+      "affinagecoeff=${1:factor}",
+      "affinagerm",
+      "args=${1:args spec}",
+      "axe=${1:x y z}",
+      "b=${1:length}",
+      "base=${1:base spec}",
+      "biface",
+      "c=${1:length}",
+      "chanfrein",
+      "chanfreincoeff=${1:factor}",
+      "color1=${1:xcolor color}",
+      "color2=${1:xcolor color}",
+      "color3=${1:xcolor color}",
+      "color4=${1:xcolor color}",
+      "deactivatecolor",
+      "decal=${1:integer}",
+      "definition=",
+      "dualreg",
+      "faces={${1:faces spec}}",
+      "fcol=${1:n1 (col1) n2 (col2) ...}",
+      "fcolor=",
+      "filename=${1:file name}",
+      "fillcolor=",
+      "fontsize=",
+      "function=",
+      "grid",
+      "h=${1:height}",
+      "hollow",
+      "hue=${1:hue spec}",
+      "incolor=",
+      "inhue=${1:hue spec}",
+      "inouthue=${1:hue spec}",
+      "intersectioncolor=${1:(color1) (color2) ...}",
+      "intersectionlinewidth=${1:w1 w2 ...}",
+      "intersectionplan={[${1:eq1}] ${2:[eq2] ...}}",
+      "intersectiontype=",
+      "lightintensity=${1:number}",
+      "lightsrc=${1:x y z}",
+      "linecolor=",
+      "linestyle=${1:style}",
+      "linewidth=",
+      "load=${1:name}",
+      "mode=",
+      "name=${1:name}",
+      "ngrid=${1:<n> or <n1 n2>}",
+      "normal=${1:x y z}",
+      "num=",
+      "numfaces=",
+      "opacity=${1:factor}",
+      "origine=${1:x y z}",
+      "phi=${1:degrees}",
+      "plangrid",
+      "planmarks",
+      "plansection={${1:plan1 plan2 ...}}",
+      "plansepare={[${1:a b c d}]}",
+      "QZ=${1:number}",
+      "R=${1:outer radius}",
+      "r=${1:radius}",
+      "r0=${1:radius0}",
+      "r1=${1:radius1}",
+      "range=${1:xmin xmax}",
+      "resolution=${1:resolution}",
+      "rm=${1:face1 face2 face3}",
+      "RotSequence=${1:sequence}",
+      "RotX=${1:degrees}",
+      "RotY=${1:degrees}",
+      "RotZ=${1:degrees}",
+      "section=",
+      "show=",
+      "showbase",
+      "showBase",
+      "sommets=${1:data}",
+      "theta=${1:degrees}",
+      "transform={${1:transform}}",
+      "trunc=",
+      "trunccoeff=${1:factor}",
+      "unit=${1:number}",
+      "visibility"
+    ],
+    [
+      "algebraic",
+      "axesboxed",
+      "base=${1:base spec}",
+      "color1=${1:xcolor color}",
+      "color2=${1:xcolor color}",
+      "color3=${1:xcolor color}",
+      "color4=${1:xcolor color}",
+      "deactivatecolor",
+      "fcol=${1:n1 (col1) n2 (col2) ...}",
+      "fillcolor=",
+      "grid",
+      "hue=${1:hue spec}",
+      "incolor=",
+      "inhue=${1:hue spec}",
+      "inouthue=${1:hue spec}",
+      "intersectionplan={[${1:eq1}] ${2:[eq2] ...}}",
+      "intersectiontype=",
+      "intersectioncolor=${1:(color1) (color2) ...}",
+      "intersectionlinewidth=${1:w1 w2 ...}",
+      "lightintensity=${1:number}",
+      "lightsrc=${1:x y z}",
+      "linecolor=",
+      "linewidth=",
+      "ngrid=${1:<n> or <n1 n2>}",
+      "opacity=${1:factor}",
+      "QZ=${1:number}",
+      "spotX=${1:pos}",
+      "spotY=${1:pos}",
+      "spotZ=${1:pos}",
+      "xytranslate=${1:x y}",
+      "Zmax=${1:number}",
+      "Zmin=${1:number}"
+    ],
     [
       "algebraic",
       "axesboxed",
@@ -70,6 +263,56 @@
       "XMinMax=${1:min max step}",
       "YMinMax=${1:min max step}",
       "ZMinMax=${1:min max step}"
+    ],
+    [
+      "RotX=${1:degrees}",
+      "RotY=${1:degrees}",
+      "RotZ=${1:degrees}"
+    ],
+    [
+      "definition=",
+      "args=${1:args spec}",
+      "fillcolor=",
+      "fillstyle=",
+      "fontsize=",
+      "function=${1:function}",
+      "hatchcolor=",
+      "isolatin",
+      "linecolor=",
+      "linestyle=${1:style}",
+      "name=${1:name}",
+      "normal=${1:x y z}",
+      "object=",
+      "path={${1:PS code}}",
+      "phi=${1:degrees}",
+      "plan=${1:plan type}",
+      "pos=${1:pos}",
+      "PSfont=${1:font name}",
+      "range=${1:xmin xmax}",
+      "resolution=${1:resolution}",
+      "text=${1:text}",
+      "visibility"
+    ],
+    [
+      "axisemph=${1:font commands}",
+      "linecolor=",
+      "spotX=${1:pos}",
+      "spotY=${1:pos}",
+      "spotZ=${1:pos}",
+      "stepX=${1:number}",
+      "stepY=${1:number}",
+      "stepZ=${1:number}",
+      "ticklength=",
+      "Zmax=${1:number}",
+      "Zmin=${1:number}"
+    ],
+    [
+      "divisions=${1:integer}",
+      "filename=${1:imagefile}",
+      "normal=${1:x y z}",
+      "origine=${1:x y z}",
+      "phi=${1:degrees}",
+      "unitPicture=${1:number}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-spinner.json b/dev/packages/pst-spinner.json
index 2e5796052..85c9e6253 100644
--- a/dev/packages/pst-spinner.json
+++ b/dev/packages/pst-spinner.json
@@ -6,11 +6,19 @@
   },
   "macros": {
     "psFidgetSpinner": {},
+    "psFidgetSpinner()": {
+      "snippet": "psFidgetSpinner(${1:x},${2:y})"
+    },
     "psFidgetSpinner[]": {
       "snippet": "psFidgetSpinner[${1:options}]",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "psFidgetSpinner[]()": {
+      "snippet": "psFidgetSpinner[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "pstspinnerFV": {},
     "PSTSPINNERLoaded": {}
   },
diff --git a/dev/packages/pst-stru.json b/dev/packages/pst-stru.json
index e709f1ead..1bece281c 100644
--- a/dev/packages/pst-stru.json
+++ b/dev/packages/pst-stru.json
@@ -8,6 +8,9 @@
   },
   "macros": {
     "arrow": {},
+    "circput()(){}{}": {
+      "snippet": "circput(${3:nodeA})(${4:nodeB}){${1:stuffA}}{${2:stuffB}}"
+    },
     "clockCouple": {},
     "debut": {},
     "fin": {},
@@ -16,9 +19,18 @@
     "hinge": {},
     "interhinge": {},
     "noclockCouple": {},
+    "node()": {
+      "snippet": "node(${1:name})"
+    },
     "nStart": {},
     "PAS": {},
     "Position": {},
+    "psArrowCivil()(){}": {
+      "snippet": "psArrowCivil(${2:nodeA})(${3:nodeB}){${1:stuff}}"
+    },
+    "psArrowCivil[]()(){}": {
+      "snippet": "psArrowCivil[${2:options}](${3:nodeA})(${4:nodeB}){${1:stuff}}"
+    },
     "roller": {},
     "Start": {},
     "triload": {},
diff --git a/dev/packages/pst-text.json b/dev/packages/pst-text.json
index d4e2f18ad..a85cb983e 100644
--- a/dev/packages/pst-text.json
+++ b/dev/packages/pst-text.json
@@ -3,6 +3,12 @@
     "pstricks": []
   },
   "macros": {
+    "pstextpath[](){}{}": {
+      "snippet": "pstextpath[${3:pos}](${4:x},${5:y}){${1:graphics object}}{${2:text}}"
+    },
+    "pstextpath(){}{}": {
+      "snippet": "pstextpath(${3:x},${4:y}){${1:graphics object}}{${2:text}}"
+    },
     "pscharpath{}": {
       "snippet": "pscharpath{${1:text}}"
     },
@@ -34,12 +40,24 @@
     "psCircleText[]{}": {
       "snippet": "psCircleText[${2:options}]{${1:text}}"
     },
+    "psCircleText(){}": {
+      "snippet": "psCircleText(${2:x},${3:y}){${1:text}}"
+    },
+    "psCircleText[](){}": {
+      "snippet": "psCircleText[${2:options}](${3:x},${4:y}){${1:text}}"
+    },
     "psWarp{}": {
       "snippet": "psWarp{${1:text}}"
     },
     "psWarp[]{}": {
       "snippet": "psWarp[${2:options}]{${1:text}}"
     },
+    "psWarp(){}": {
+      "snippet": "psWarp(${2:x},${3:y}){${1:text}}"
+    },
+    "psWarp[](){}": {
+      "snippet": "psWarp[${2:options}](${3:x},${4:y}){${1:text}}"
+    },
     "TPoffset": {},
     "PSTextPathLoaded": {}
   },
diff --git a/dev/packages/pst-turtle.json b/dev/packages/pst-turtle.json
index 0d5928a68..3fabce086 100644
--- a/dev/packages/pst-turtle.json
+++ b/dev/packages/pst-turtle.json
@@ -3,7 +3,14 @@
     "pstricks": [],
     "pst-xkey": []
   },
-  "macros": {},
+  "macros": {
+    "psTurtle(){}": {
+      "snippet": "psTurtle(${2:x},${3:y}){${1:turtle code}}"
+    },
+    "psTurtle[](){}": {
+      "snippet": "psTurtle[${2:options}](${3:x},${4:y}){${1:turtle code}}"
+    }
+  },
   "envs": {},
   "options": [],
   "keyvals": []
diff --git a/dev/packages/pst-venn.json b/dev/packages/pst-venn.json
index 0d5928a68..9ced32fdf 100644
--- a/dev/packages/pst-venn.json
+++ b/dev/packages/pst-venn.json
@@ -3,8 +3,25 @@
     "pstricks": [],
     "pst-xkey": []
   },
-  "macros": {},
+  "macros": {
+    "psVenn()()(){}{}": {
+      "snippet": "psVenn(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:radius}}{${2:segments}}"
+    },
+    "psVenn[]()()(){}{}": {
+      "snippet": "psVenn[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:radius}}{${2:segments}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
   "envs": {},
   "options": [],
-  "keyvals": []
+  "keyvals": [
+    [
+      "bgcircle",
+      "bgcolor=",
+      "bgradius=",
+      "fgcolor=",
+      "vennfill="
+    ]
+  ]
 }
\ No newline at end of file
diff --git a/dev/packages/pstricks-add.json b/dev/packages/pstricks-add.json
index c78bd7c72..ad48655f4 100644
--- a/dev/packages/pstricks-add.json
+++ b/dev/packages/pstricks-add.json
@@ -20,6 +20,30 @@
     },
     "EndSaveFinalState": {},
     "parseRP": {},
+    "psBrace()()": {
+      "snippet": "psBrace(${1:A})(${2:B})"
+    },
+    "psbrace()(){}": {
+      "snippet": "psbrace(${2:A})(${3:B}){${1:text}}"
+    },
+    "psBrace*()()": {
+      "snippet": "psBrace*(${1:A})(${2:B})"
+    },
+    "psBrace*[]()()": {
+      "snippet": "psBrace*[${1:options}](${2:A})(${3:B})"
+    },
+    "psBrace[]()()": {
+      "snippet": "psBrace[${1:options}](${2:A})(${3:B})"
+    },
+    "psbrace[]()(){}": {
+      "snippet": "psbrace[${2:options}](${3:A})(${4:B}){${1:text}}"
+    },
+    "psCallout(){}": {
+      "snippet": "psCallout(${2:x},${3:y}){${1:text}}"
+    },
+    "psCallout[](){}": {
+      "snippet": "psCallout[${2:options}](${3:x},${4:y}){${1:text}}"
+    },
     "psCancel*[]{}": {
       "snippet": "psCancel*[${2:options}]{${1:stuff}}"
     },
@@ -38,6 +62,60 @@
     "psChart{}{}{}": {
       "snippet": "psChart{${1:list1}}{${2:list2}}{${3:radius}}"
     },
+    "psCircleTangents()(){}": {
+      "snippet": "psCircleTangents(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:radius}}"
+    },
+    "psCircleTangents(){}(){}": {
+      "snippet": "psCircleTangents(${3:x1},${4:y1}){${1:radius1}}(${5:x2},${6:y2}){${2:radius2}}"
+    },
+    "psComment()(){}": {
+      "snippet": "psComment(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:text}}"
+    },
+    "psComment()(){}[][]": {
+      "snippet": "psComment(${4:x0},${5:y0})(${6:x1},${7:y1}){${1:text}}[${2:line macro}][${3:put macro}]"
+    },
+    "psComment*()(){}": {
+      "snippet": "psComment*(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:text}}"
+    },
+    "psComment*()(){}[][]": {
+      "snippet": "psComment*(${4:x0},${5:y0})(${6:x1},${7:y1}){${1:text}}[${2:line macro}][${3:put macro}]"
+    },
+    "psComment*[]()(){}": {
+      "snippet": "psComment*[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:text}}"
+    },
+    "psComment*[]()(){}[][]": {
+      "snippet": "psComment*[${2:options}](${5:x0},${6:y0})(${7:x1},${8:y1}){${1:text}}[${3:line macro}][${4:put macro}]"
+    },
+    "psComment*[]{}()(){}": {
+      "snippet": "psComment*[${3:options}]{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:text}}"
+    },
+    "psComment*[]{}()(){}[][]": {
+      "snippet": "psComment*[${3:options}]{${1:arrows}}(${6:x0},${7:y0})(${8:x1},${9:y1}){${2:text}}[${4:line macro}][${5:put macro}]"
+    },
+    "psComment*{}()(){}": {
+      "snippet": "psComment*{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1}){${2:text}}"
+    },
+    "psComment*{}()(){}[][]": {
+      "snippet": "psComment*{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:text}}[${3:line macro}][${4:put macro}]"
+    },
+    "psComment[]()(){}": {
+      "snippet": "psComment[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:text}}"
+    },
+    "psComment[]()(){}[][]": {
+      "snippet": "psComment[${2:options}](${5:x0},${6:y0})(${7:x1},${8:y1}){${1:text}}[${3:line macro}][${4:put macro}]"
+    },
+    "psComment[]{}()(){}": {
+      "snippet": "psComment[${3:options}]{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:text}}"
+    },
+    "psComment[]{}()(){}[][]": {
+      "snippet": "psComment[${3:options}]{${1:arrows}}(${6:x0},${7:y0})(${8:x1},${9:y1}){${2:text}}[${4:line macro}][${5:put macro}]"
+    },
+    "psComment{}()(){}": {
+      "snippet": "psComment{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1}){${2:text}}"
+    },
+    "psComment{}()(){}[][]": {
+      "snippet": "psComment{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:text}}[${3:line macro}][${4:put macro}]"
+    },
     "pscurvepoints[]{}{}{}{}": {
       "snippet": "pscurvepoints[${5:options}]{${1:tmin}}{${2:tmax}}{${3:function of t}}{${4:root}}"
     },
@@ -51,12 +129,39 @@
       "snippet": "psdice{${1:number}}"
     },
     "psDiffSumValue": {},
+    "psEllipseTangents()()()": {
+      "snippet": "psEllipseTangents(${1:x0},${2:y0})(${3:a},${4:b})(${5:xp},${6:yp})"
+    },
+    "psEllipseTangentsN()()(){}": {
+      "snippet": "psEllipseTangentsN(${2:x0},${3:y0})(${4:a},${5:b})(${6:xp},${7:yp}){${1:node name}}"
+    },
     "psFormatInt[]{}": {
       "snippet": "psFormatInt[${2:options}]{${1:integer}}"
     },
     "psFormatInt{}": {
       "snippet": "psFormatInt{${1:integer}}"
     },
+    "psGetDistance()(){}": {
+      "snippet": "psGetDistance(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:macro}}"
+    },
+    "psGetDistance[]()(){}": {
+      "snippet": "psGetDistance[${2:decimals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:macro}}"
+    },
+    "psGetSlope()(){}": {
+      "snippet": "psGetSlope(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:macro}}"
+    },
+    "psGTriangle()()(){}{}{}": {
+      "snippet": "psGTriangle(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:color1}}{${2:color2}}{${3:color3}}"
+    },
+    "psHomothetie(){}{}": {
+      "snippet": "psHomothetie(${3:x},${4:y}){${1:factor}}{${2:stuff}}"
+    },
+    "psHomothetie[](){}{}": {
+      "snippet": "psHomothetie[${3:options}](${4:x},${5:y}){${1:factor}}{${2:stuff}}"
+    },
+    "psIntersectionPoint()()()(){}": {
+      "snippet": "psIntersectionPoint(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:node name}}"
+    },
     "psKiviat[]{}{}": {
       "snippet": "psKiviat[${3:options}]{${1:number of edges}}{${2:radius}}"
     },
@@ -89,6 +194,36 @@
       "snippet": "psMatrixPlot{${1:rows}}{${2:columns}}{${3:data file}}"
     },
     "psMiddleSumValue": {},
+    "psOlympicRings()": {
+      "snippet": "psOlympicRings(${1:x},${2:y})"
+    },
+    "psOlympicRings[]()": {
+      "snippet": "psOlympicRings[${1:options}](${2:x},${3:y})"
+    },
+    "psParallelLine()()(){}{}": {
+      "snippet": "psParallelLine(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:length}}{${2:end node name}}"
+    },
+    "psParallelLine[]()()(){}{}": {
+      "snippet": "psParallelLine[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:length}}{${2:end node name}}"
+    },
+    "psParallelLine[]{}()()(){}{}": {
+      "snippet": "psParallelLine[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:length}}{${3:end node name}}"
+    },
+    "psParallelLine{}()()(){}{}": {
+      "snippet": "psParallelLine{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:length}}{${3:end node name}}"
+    },
+    "psColorLine()()": {
+      "snippet": "psColorLine(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psColorLine{}()()": {
+      "snippet": "psColorLine{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psColorLine[]()()": {
+      "snippet": "psColorLine[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psColorLine[]{}()()": {
+      "snippet": "psColorLine[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
     "psparallelogrambox[]{}": {
       "snippet": "psparallelogrambox[${2:options}]{${1:stuff}}"
     },
@@ -96,10 +231,10 @@
       "snippet": "psparallelogrambox{${1:stuff}}"
     },
     "psplotDiffEqn[]{}{}{}{}": {
-      "snippet": "psplotDiffEqn[${5:options}]{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${6:x,y,y',...})}}"
+      "snippet": "psplotDiffEqn[${5:options}]{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${6:x},${7:y},${8:y'},${9:...})}}"
     },
     "psplotDiffEqn{}{}{}{}": {
-      "snippet": "psplotDiffEqn{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${5:x,y,y',...})}}"
+      "snippet": "psplotDiffEqn{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${5:x},${6:y},${7:y'},${8:...})}}"
     },
     "psplotTangent*[]{}{}{}": {
       "snippet": "psplotTangent*[${4:options}]{${1:x}}{${2:dx}}{${3:function}}"
@@ -119,6 +254,18 @@
     "pspolylineticks{}{}{}{}": {
       "snippet": "pspolylineticks{${1:root name}}{${2:function}}{${3:first tick}}{${4:tick count}}"
     },
+    "psRandom()(){}": {
+      "snippet": "psRandom(${2:xmin},${3:ymin})(${4:xmax},${5:ymax}){${1:clip path}}"
+    },
+    "psRandom(){}": {
+      "snippet": "psRandom(${2:xmin},${3:ymin}){${1:clip path}}"
+    },
+    "psRandom[]()(){}": {
+      "snippet": "psRandom[${2:options}](${3:xmin},${4:ymin})(${5:xmax},${6:ymax}){${1:clip path}}"
+    },
+    "psRandom[](){}": {
+      "snippet": "psRandom[${2:options}](${3:xmin},${4:ymin}){${1:clip path}}"
+    },
     "psRandom[]{}": {
       "snippet": "psRandom[${2:options}]{${1:}}"
     },
@@ -131,7 +278,46 @@
     "psRandomPointArea{}{}": {
       "snippet": "psRandomPointArea{${1:number}}{${2:function}}"
     },
+    "psRelLine()(){}{}": {
+      "snippet": "psRelLine(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:length factor}}{${2:end node name}}"
+    },
+    "psRelLine[]()(){}{}": {
+      "snippet": "psRelLine[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:length factor}}{${2:end node name}}"
+    },
+    "psRelLine[]{}()(){}{}": {
+      "snippet": "psRelLine[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:length factor}}{${3:end node name}}"
+    },
+    "psRelLine{}()(){}{}": {
+      "snippet": "psRelLine{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:length factor}}{${3:end node name}}"
+    },
+    "psRiemannSum(){}{}": {
+      "snippet": "psRiemannSum(${3:x0},${4:x1}){${1:n}}{${2:function}}"
+    },
     "psRightSumValue": {},
+    "psrotate(){}{}": {
+      "snippet": "psrotate(${3:x},${4:y}){${1:angle}}{${2:stuff}}"
+    },
+    "psrotate[](){}{}": {
+      "snippet": "psrotate[${3:options}](${4:x},${5:y}){${1:angle}}{${2:stuff}}"
+    },
+    "psStartPoint()": {
+      "snippet": "psStartPoint(${1:x},${2:y})"
+    },
+    "psStartPoint[]()": {
+      "snippet": "psStartPoint[${1:node basename}](${2:x},${3:y})"
+    },
+    "psStep(){}{}": {
+      "snippet": "psStep(${3:x},${4:y}){${1:n}}{${2:function}}"
+    },
+    "psStep[](){}{}": {
+      "snippet": "psStep[${3:options}](${4:x},${5:y}){${1:n}}{${2:function}}"
+    },
+    "psTangentLine()()(){}{}": {
+      "snippet": "psTangentLine(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:x}}{${2:dx}}"
+    },
+    "psTangentLine[]()()(){}{}": {
+      "snippet": "psTangentLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:x}}{${2:dx}}"
+    },
     "pstContour[]{}": {
       "snippet": "pstContour[${2:options}]{${1:data file}}"
     },
@@ -143,6 +329,30 @@
     "psVectorName": {},
     "pswavelengthToGRAY": {},
     "pswavelengthToRGB": {},
+    "Put(){}": {
+      "snippet": "Put(${2:position}){${1:stuff}}"
+    },
+    "Put*(){}": {
+      "snippet": "Put*(${2:position}){${1:stuff}}"
+    },
+    "Put*[](){}": {
+      "snippet": "Put*[${2:options}](${3:position}){${1:stuff}}"
+    },
+    "Put*[]{}(){}": {
+      "snippet": "Put*[${3:options}]{${1:ref}}(${4:position}){${2:stuff}}"
+    },
+    "Put*{}(){}": {
+      "snippet": "Put*{${1:ref}}(${3:position}){${2:stuff}}"
+    },
+    "Put[](){}": {
+      "snippet": "Put[${2:options}](${3:position}){${1:stuff}}"
+    },
+    "Put[]{}(){}": {
+      "snippet": "Put[${3:options}]{${1:ref}}(${4:position}){${2:stuff}}"
+    },
+    "Put{}(){}": {
+      "snippet": "Put{${1:ref}}(${3:position}){${2:stuff}}"
+    },
     "resetOptions": {}
   },
   "envs": {},
diff --git a/dev/packages/pstricks.json b/dev/packages/pstricks.json
index 65c804130..07a894c18 100644
--- a/dev/packages/pstricks.json
+++ b/dev/packages/pstricks.json
@@ -31,11 +31,8 @@
     "black": {},
     "blue": {},
     "Cartesian": {},
-    "clipbox[]{}": {
-      "snippet": "clipbox[${2:dim}]{${1:stuff}}"
-    },
-    "clipbox{}": {
-      "snippet": "clipbox{${1:stuff}}"
+    "Cartesian()": {
+      "snippet": "Cartesian(${1:x},${2:y})"
     },
     "closedshadow": {},
     "closedshadow[]": {
@@ -45,6 +42,33 @@
     "code{}": {
       "snippet": "code{${1:code}}"
     },
+    "cput*[]{}(){}": {
+      "snippet": "cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "Cput*[]{}(){}": {
+      "snippet": "Cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "cput*{}(){}": {
+      "snippet": "cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "Cput*{}(){}": {
+      "snippet": "Cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "cput[]{}(){}": {
+      "snippet": "cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "Cput[]{}(){}": {
+      "snippet": "Cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "cput{}(){}": {
+      "snippet": "cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "Cput{}(){}": {
+      "snippet": "Cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "curveto()()()": {
+      "snippet": "curveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
     "cyan": {},
     "darkgray": {},
     "degrees": {},
@@ -79,9 +103,48 @@
     "ifshowgrid": {},
     "KillGlue": {},
     "lightgray": {},
+    "lineto()": {
+      "snippet": "lineto(${1:coor})"
+    },
     "magenta": {},
+    "movepath()": {
+      "snippet": "movepath(${1:coor})"
+    },
+    "moveto()": {
+      "snippet": "moveto(${1:coor})"
+    },
     "mrestore": {},
     "msave": {},
+    "multips()(){}{}": {
+      "snippet": "multips(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:graphics}}"
+    },
+    "multips{}()(){}{}": {
+      "snippet": "multips{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:graphics}}"
+    },
+    "multirput()(){}{}": {
+      "snippet": "multirput(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput*()(){}{}": {
+      "snippet": "multirput*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput*[]()(){}{}": {
+      "snippet": "multirput*[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput*[]{}()(){}{}": {
+      "snippet": "multirput*[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
+    },
+    "multirput*{}()(){}{}": {
+      "snippet": "multirput*{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
+    },
+    "multirput[]()(){}{}": {
+      "snippet": "multirput[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
+    },
+    "multirput[]{}()(){}{}": {
+      "snippet": "multirput[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
+    },
+    "multirput{}()(){}{}": {
+      "snippet": "multirput{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
+    },
     "newcmykcolor{}{}": {
       "snippet": "newcmykcolor{${1:color}}{${2:num1 num2 num3 num4}}"
     },
@@ -122,6 +185,30 @@
       "snippet": "openshadow[${1:keyvals}]"
     },
     "overlaybox": {},
+    "parabola()()": {
+      "snippet": "parabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "parabola*()()": {
+      "snippet": "parabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "parabola*[]()()": {
+      "snippet": "parabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "parabola*[]{}()()": {
+      "snippet": "parabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "parabola*{}()()": {
+      "snippet": "parabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "parabola[]()()": {
+      "snippet": "parabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "parabola[]{}()()": {
+      "snippet": "parabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "parabola{}()()": {
+      "snippet": "parabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pgfforeach": {},
     "pgfforeach{}": {
       "snippet": "pgfforeach{${1:cmd}}"
@@ -130,8 +217,176 @@
     "psaddtolength{}{}": {
       "snippet": "psaddtolength{${1:cmd}}{${2:dim}}"
     },
+    "psarc(){}{}{}": {
+      "snippet": "psarc(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc*(){}{}{}": {
+      "snippet": "psarc*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc*[](){}{}{}": {
+      "snippet": "psarc*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc*[]{}(){}{}{}": {
+      "snippet": "psarc*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarc*{}(){}{}{}": {
+      "snippet": "psarc*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarc[](){}{}{}": {
+      "snippet": "psarc[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarc[]{}(){}{}{}": {
+      "snippet": "psarc[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarc{}(){}{}{}": {
+      "snippet": "psarc{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcAB()()()": {
+      "snippet": "psarcAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
+    },
+    "psarcAB[]()()()": {
+      "snippet": "psarcAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
+    "psarcAB[]{}()()()": {
+      "snippet": "psarcAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
+    },
+    "psarcAB{}()()()": {
+      "snippet": "psarcAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
+    "psarcn(){}{}{}": {
+      "snippet": "psarcn(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn*(){}{}{}": {
+      "snippet": "psarcn*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn*[](){}{}{}": {
+      "snippet": "psarcn*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn*[]{}(){}{}{}": {
+      "snippet": "psarcn*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcn*{}(){}{}{}": {
+      "snippet": "psarcn*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcn[](){}{}{}": {
+      "snippet": "psarcn[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
+    },
+    "psarcn[]{}(){}{}{}": {
+      "snippet": "psarcn[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcn{}(){}{}{}": {
+      "snippet": "psarcn{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
+    },
+    "psarcnAB()()()": {
+      "snippet": "psarcnAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
+    },
+    "psarcnAB[]()()()": {
+      "snippet": "psarcnAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
+    "psarcnAB[]{}()()()": {
+      "snippet": "psarcnAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
+    },
+    "psarcnAB{}()()()": {
+      "snippet": "psarcnAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
+    },
     "psarrowlinestyle": {},
+    "psbezier()()()()": {
+      "snippet": "psbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "psbezier*()()()()": {
+      "snippet": "psbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "psbezier*[]()()()()": {
+      "snippet": "psbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psbezier*[]{}()()()()": {
+      "snippet": "psbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "psbezier*{}()()()()": {
+      "snippet": "psbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psbezier[]()()()()": {
+      "snippet": "psbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psbezier[]{}()()()()": {
+      "snippet": "psbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "psbezier{}()()()()": {
+      "snippet": "psbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
     "psbordercolor": {},
+    "pscbezier()()()()": {
+      "snippet": "pscbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "pscbezier*()()()()": {
+      "snippet": "pscbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
+    },
+    "pscbezier*[]()()()()": {
+      "snippet": "pscbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "pscbezier*[]{}()()()()": {
+      "snippet": "pscbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "pscbezier*{}()()()()": {
+      "snippet": "pscbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "pscbezier[]()()()()": {
+      "snippet": "pscbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "pscbezier[]{}()()()()": {
+      "snippet": "pscbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
+    },
+    "pscbezier{}()()()()": {
+      "snippet": "pscbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
+    },
+    "psccurve()()": {
+      "snippet": "psccurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psccurve*()()": {
+      "snippet": "psccurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psccurve*[]()()": {
+      "snippet": "psccurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psccurve*[]{}()()": {
+      "snippet": "psccurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psccurve*{}()()": {
+      "snippet": "psccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psccurve[]()()": {
+      "snippet": "psccurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psccurve[]{}()()": {
+      "snippet": "psccurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psccurve{}()()": {
+      "snippet": "psccurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscircle(){}": {
+      "snippet": "pscircle(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "psCircle(){}": {
+      "snippet": "psCircle(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "pscircle*(){}": {
+      "snippet": "pscircle*(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "psCircle*(){}": {
+      "snippet": "psCircle*(${2:x0},${3:y0}){${1:radius}}"
+    },
+    "pscircle*[](){}": {
+      "snippet": "pscircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
+    "psCircle*[](){}": {
+      "snippet": "psCircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
+    "pscircle[](){}": {
+      "snippet": "pscircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
+    "psCircle[](){}": {
+      "snippet": "psCircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
+    },
     "pscirclebox*[]{}": {
       "snippet": "pscirclebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -156,10 +411,46 @@
     "psCirclebox{}": {
       "snippet": "psCirclebox{${1:stuff}}"
     },
+    "pscircleOA()()": {
+      "snippet": "pscircleOA(${1:xO},${2:yO})(${3:xA},${4:yA})"
+    },
+    "pscircleOA[]()()": {
+      "snippet": "pscircleOA[${1:keyvals}](${2:xO},${3:yO})(${4:xA},${5:yA})"
+    },
     "psclip{}": {
       "snippet": "psclip{${1:graphics}}"
     },
+    "psclipbox[]{}": {
+      "snippet": "psclipbox[${2:dim}]{${1:stuff}}"
+    },
+    "psclipbox{}": {
+      "snippet": "psclipbox{${1:stuff}}"
+    },
     "pscoor": {},
+    "pscurve()()": {
+      "snippet": "pscurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "pscurve*()()": {
+      "snippet": "pscurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "pscurve*[]()()": {
+      "snippet": "pscurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscurve*[]{}()()": {
+      "snippet": "pscurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "pscurve*{}()()": {
+      "snippet": "pscurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscurve[]()()": {
+      "snippet": "pscurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "pscurve[]{}()()": {
+      "snippet": "pscurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "pscurve{}()()": {
+      "snippet": "pscurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
     "pscustom*[]{}": {
       "snippet": "pscustom*[${2:keyvals}]{${1:commands}}"
     },
@@ -203,8 +494,128 @@
     "psdiabox{}": {
       "snippet": "psdiabox{${1:stuff}}"
     },
+    "psdiamond()()": {
+      "snippet": "psdiamond(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psdiamond*()()": {
+      "snippet": "psdiamond*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psdiamond*[]()()": {
+      "snippet": "psdiamond*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psdiamond[]()()": {
+      "snippet": "psdiamond[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psdot()": {
+      "snippet": "psdot(${1:x1},${2:y1})"
+    },
+    "psdot*()": {
+      "snippet": "psdot*(${1:x1},${2:y1})"
+    },
+    "psdot*[]()": {
+      "snippet": "psdot*[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psdot[]()": {
+      "snippet": "psdot[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psdots()()": {
+      "snippet": "psdots(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psdots*()()": {
+      "snippet": "psdots*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psdots*[]()()": {
+      "snippet": "psdots*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psdots[]()()": {
+      "snippet": "psdots[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
     "psdoublecolor": {},
     "psdoublesep": {},
+    "psecurve()()": {
+      "snippet": "psecurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psecurve*()()": {
+      "snippet": "psecurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
+    },
+    "psecurve*[]()()": {
+      "snippet": "psecurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psecurve*[]{}()()": {
+      "snippet": "psecurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psecurve*{}()()": {
+      "snippet": "psecurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psecurve[]()()": {
+      "snippet": "psecurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psecurve[]{}()()": {
+      "snippet": "psecurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
+    },
+    "psecurve{}()()": {
+      "snippet": "psecurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
+    },
+    "psellipse()()": {
+      "snippet": "psellipse(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psellipse*()()": {
+      "snippet": "psellipse*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psellipse*[]()()": {
+      "snippet": "psellipse*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psellipse[]()()": {
+      "snippet": "psellipse[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psellipseAB(){}": {
+      "snippet": "psellipseAB(${2:x},${3:y}){${1:half radius}}"
+    },
+    "psellipseAB*(){}": {
+      "snippet": "psellipseAB*(${2:x},${3:y}){${1:half radius}}"
+    },
+    "psellipseAB*[](){}": {
+      "snippet": "psellipseAB*[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
+    },
+    "psellipseAB[](){}": {
+      "snippet": "psellipseAB[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
+    },
+    "psellipticarc()(){}{}": {
+      "snippet": "psellipticarc(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarc*()(){}{}": {
+      "snippet": "psellipticarc*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarc*[]()(){}{}": {
+      "snippet": "psellipticarc*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarc[]()(){}{}": {
+      "snippet": "psellipticarc[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn()(){}{}": {
+      "snippet": "psellipticarcn(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn*()(){}{}": {
+      "snippet": "psellipticarcn*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn*[]()(){}{}": {
+      "snippet": "psellipticarcn*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticarcn[]()(){}{}": {
+      "snippet": "psellipticarcn[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge()(){}{}": {
+      "snippet": "psellipticwedge(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge*()(){}{}": {
+      "snippet": "psellipticwedge*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge*[]()(){}{}": {
+      "snippet": "psellipticwedge*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
+    "psellipticwedge[]()(){}{}": {
+      "snippet": "psellipticwedge[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
+    },
     "psfillcolor": {},
     "psforeach{}{}{}": {
       "snippet": "psforeach{${1:variable}}{${2:value list}}{${3:action}}"
@@ -212,6 +623,18 @@
     "psForeach{}{}{}": {
       "snippet": "psForeach{${1:variable}}{${2:value list}}{${3:action}}"
     },
+    "psframe()()": {
+      "snippet": "psframe(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psframe*()()": {
+      "snippet": "psframe*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psframe*[]()()": {
+      "snippet": "psframe*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psframe[]()()": {
+      "snippet": "psframe[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "psframebox*[]{}": {
       "snippet": "psframebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -234,6 +657,9 @@
     "psgetRGBColorValues{}": {
       "snippet": "psgetRGBColorValues{${1:color macro}}"
     },
+    "psgrid()()()": {
+      "snippet": "psgrid(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
     "psgridcolor": {},
     "psgridlabelcolor": {},
     "pshatchcolor": {},
@@ -244,6 +670,54 @@
     },
     "pslabelsep": {},
     "pslbrace": {},
+    "psline()()": {
+      "snippet": "psline(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine()()": {
+      "snippet": "psLine(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine()": {
+      "snippet": "psLine(${1:x1},${2:y1})"
+    },
+    "psline*()()": {
+      "snippet": "psline*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine*()()": {
+      "snippet": "psLine*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psLine*()": {
+      "snippet": "psLine*(${1:x1},${2:y1})"
+    },
+    "psline*[]()()": {
+      "snippet": "psline*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine*[]()()": {
+      "snippet": "psLine*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine*[]()": {
+      "snippet": "psLine*[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psline*[]{}()()": {
+      "snippet": "psline*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psline*{}()()": {
+      "snippet": "psline*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psline[]()()": {
+      "snippet": "psline[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine[]()()": {
+      "snippet": "psLine[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psLine[]()": {
+      "snippet": "psLine[${1:keyvals}](${2:x1},${3:y1})"
+    },
+    "psline[]{}()()": {
+      "snippet": "psline[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psline{}()()": {
+      "snippet": "psline{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pslinearc": {},
     "pslinecolor": {},
     "pslinestyle": {},
@@ -273,11 +747,77 @@
     "psoverlay{}": {
       "snippet": "psoverlay{${1:string}}"
     },
+    "psparabola()()": {
+      "snippet": "psparabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psparabola*()()": {
+      "snippet": "psparabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "psparabola*[]()()": {
+      "snippet": "psparabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psparabola*[]{}()()": {
+      "snippet": "psparabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psparabola*{}()()": {
+      "snippet": "psparabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psparabola[]()()": {
+      "snippet": "psparabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "psparabola[]{}()()": {
+      "snippet": "psparabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
+    },
+    "psparabola{}()()": {
+      "snippet": "psparabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pspicture[]": {
       "snippet": "pspicture[${1:keyvals}]"
     },
+    "psPline()()()": {
+      "snippet": "psPline(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
+    "psPline[]()()()": {
+      "snippet": "psPline[${1:keyvals}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
+    },
+    "pspolygon()()()": {
+      "snippet": "pspolygon(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pspolygon*()()()": {
+      "snippet": "pspolygon*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "pspolygon*[]()()()": {
+      "snippet": "pspolygon*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
+    "pspolygon[]()()()": {
+      "snippet": "pspolygon[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
+    },
     "psrbrace": {},
     "psresetColor": {},
+    "psRing()[]{}{}": {
+      "snippet": "psRing(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing(){}{}": {
+      "snippet": "psRing(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*()[]{}{}": {
+      "snippet": "psRing*(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*(){}{}": {
+      "snippet": "psRing*(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*[]()[]{}{}": {
+      "snippet": "psRing*[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing*[](){}{}": {
+      "snippet": "psRing*[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing[]()[]{}{}": {
+      "snippet": "psRing[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
+    },
+    "psRing[](){}{}": {
+      "snippet": "psRing[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
+    },
     "psrotatedown{}": {
       "snippet": "psrotatedown{${1:stuff}}"
     },
@@ -291,6 +831,9 @@
     "psscalebox{}{}": {
       "snippet": "psscalebox{${1:num1 num2}}{${2:stuff}}"
     },
+    "psscaleboxto(){}": {
+      "snippet": "psscaleboxto(${2:x},${3:y}){${1:stuff}}"
+    },
     "pssetGrayscale": {},
     "pssetlength{}{}": {
       "snippet": "pssetlength{${1:cmd}}{${2:dim}}"
@@ -322,12 +865,36 @@
     },
     "pstcustomize": {},
     "pstdriver": {},
+    "psTextFrame()(){}": {
+      "snippet": "psTextFrame(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
+    },
+    "psTextFrame*()(){}": {
+      "snippet": "psTextFrame*(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
+    },
+    "psTextFrame*[]()(){}": {
+      "snippet": "psTextFrame*[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
+    },
+    "psTextFrame[]()(){}": {
+      "snippet": "psTextFrame[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
+    },
     "pstheader{}": {
       "snippet": "pstheader{${1:arg}}"
     },
     "PSTlualatexfalse": {},
     "PSTlualatextrue": {},
     "pstnodescale": {},
+    "pstriangle()()": {
+      "snippet": "pstriangle(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pstriangle*()()": {
+      "snippet": "pstriangle*(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pstriangle*[]()()": {
+      "snippet": "pstriangle*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pstriangle[]()()": {
+      "snippet": "pstriangle[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
     "pstribox*[]{}": {
       "snippet": "pstribox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -356,15 +923,42 @@
     "psunit": {},
     "psverbboxfalse": {},
     "psverbboxtrue": {},
+    "pswedge(){}{}{}": {
+      "snippet": "pswedge(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
+    "pswedge*(){}{}{}": {
+      "snippet": "pswedge*(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
+    "pswedge*[](){}{}{}": {
+      "snippet": "pswedge*[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
+    "pswedge[](){}{}{}": {
+      "snippet": "pswedge[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
+    },
     "psxunit": {},
     "psyunit": {},
     "putoverlaybox{}": {
       "snippet": "putoverlaybox{${1:string}}"
     },
+    "qdisk(){}": {
+      "snippet": "qdisk(${2:coor}){${1:radius}}"
+    },
+    "qline()()": {
+      "snippet": "qline(${1:coor0})(${2:coor1})"
+    },
     "radians": {},
+    "rcurveto()()()": {
+      "snippet": "rcurveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
+    },
     "red": {},
     "resetArrowOptions": {},
     "reversepath": {},
+    "rlineto()": {
+      "snippet": "rlineto(${1:coor})"
+    },
+    "rmoveto()": {
+      "snippet": "rmoveto(${1:coor})"
+    },
     "rotate{}": {
       "snippet": "rotate{${1:angle}}"
     },
@@ -377,6 +971,33 @@
     "rotateright{}": {
       "snippet": "rotateright{${1:stuff}}"
     },
+    "rput(){}": {
+      "snippet": "rput(${2:x},${3:y}){${1:stuff}}"
+    },
+    "rput*(){}": {
+      "snippet": "rput*(${2:x},${3:y}){${1:stuff}}"
+    },
+    "rput*[](){}": {
+      "snippet": "rput*[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "rput*[]{}(){}": {
+      "snippet": "rput*[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "rput*{}(){}": {
+      "snippet": "rput*{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
+    },
+    "rput[](){}": {
+      "snippet": "rput[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "rput[]{}(){}": {
+      "snippet": "rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "Rput[]{}(){}": {
+      "snippet": "Rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "rput{}(){}": {
+      "snippet": "rput{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
+    },
     "scale{}": {
       "snippet": "scale{${1:num1 num2}}"
     },
@@ -391,6 +1012,33 @@
       "snippet": "stroke[${1:keyvals}]"
     },
     "swapaxes": {},
+    "translate()": {
+      "snippet": "translate(${1:coor})"
+    },
+    "uput*[](){}": {
+      "snippet": "uput*[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "uput*[]{}(){}": {
+      "snippet": "uput*[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "uput*{}[](){}": {
+      "snippet": "uput*{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
+    },
+    "uput*{}[]{}(){}": {
+      "snippet": "uput*{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
+    },
+    "uput[](){}": {
+      "snippet": "uput[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
+    },
+    "uput[]{}(){}": {
+      "snippet": "uput[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
+    },
+    "uput{}[](){}": {
+      "snippet": "uput{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
+    },
+    "uput{}[]{}(){}": {
+      "snippet": "uput{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
+    },
     "white": {},
     "yellow": {},
     "psarcOA": {},
@@ -428,6 +1076,22 @@
     "psclip{}": {
       "name": "psclip",
       "snippet": "{${1:graphics}}"
+    },
+    "pspicture*(x0,y0)(x1,y1)": {
+      "name": "pspicture*",
+      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pspicture*[](x0,y0)(x1,y1)": {
+      "name": "pspicture*",
+      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "pspicture(x0,y0)(x1,y1)": {
+      "name": "pspicture",
+      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "pspicture[](x0,y0)(x1,y1)": {
+      "name": "pspicture",
+      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
     }
   },
   "options": [
diff --git a/dev/packages/ptex.json b/dev/packages/ptex.json
new file mode 100644
index 000000000..351916eca
--- /dev/null
+++ b/dev/packages/ptex.json
@@ -0,0 +1,76 @@
+{
+  "includes": {
+    "tex": []
+  },
+  "macros": {
+    "autospacing": {},
+    "noautospacing": {},
+    "autoxspacing": {},
+    "noautoxspacing": {},
+    "showmode": {},
+    "inhibitglue": {},
+    "disinhibitglue": {},
+    "tate": {},
+    "yoko": {},
+    "dtou": {},
+    "iftdir": {},
+    "ifydir": {},
+    "ifddir": {},
+    "ifmdir": {},
+    "jfont": {},
+    "tfont": {},
+    "ptextracingfonts": {},
+    "ptexfontname": {},
+    "ptexversion": {},
+    "ptexminorversion": {},
+    "ptexrevision": {},
+    "omathchardef{}": {
+      "snippet": "omathchardef{${1:cmd}}"
+    },
+    "pagefistretch": {},
+    "hfi": {},
+    "vfi": {},
+    "pdfstrcmp{}{}": {
+      "snippet": "pdfstrcmp{${1:string1}}{${2:string2}}"
+    },
+    "pdfpagewidth": {},
+    "pdfpageheight": {},
+    "pdflastxpos": {},
+    "pdflastypos": {},
+    "pdfcreationdate": {},
+    "pdffilemoddate{}": {
+      "snippet": "pdffilemoddate{${1:file}}"
+    },
+    "pdffilesize{}": {
+      "snippet": "pdffilesize{${1:file}}"
+    },
+    "pdfshellescape": {},
+    "pdfmdfivesum{}": {
+      "snippet": "pdfmdfivesum{${1:text}}"
+    },
+    "pdfnormaldeviate": {},
+    "pdfrandomseed": {},
+    "pdfelapsedtime": {},
+    "pdfresettimer": {},
+    "expanded": {},
+    "ifincsname": {},
+    "epTeXversion": {},
+    "lastnodechar": {},
+    "lastnodefont": {},
+    "lastnodesubtype": {},
+    "epTeXinputencoding": {},
+    "readpapersizespecial": {},
+    "currentspacingmode": {},
+    "currentxspacingmode": {},
+    "suppresslongerror": {},
+    "suppressoutererror": {},
+    "suppressmathparerror": {},
+    "tracingstacklevels": {},
+    "partokencontext": {},
+    "showstream": {},
+    "synctex": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/puyotikz.json b/dev/packages/puyotikz.json
index 0a1fa00b2..3506e48b2 100644
--- a/dev/packages/puyotikz.json
+++ b/dev/packages/puyotikz.json
@@ -27,7 +27,7 @@
       "keyvalpos": 0
     },
     "puyocolor{}{}": {
-      "snippet": "puyocolor{${1:name}}{${2:r,g,b}}"
+      "snippet": "puyocolor{${1:name}}{${2:r,${3:g},b}}"
     }
   },
   "envs": {
diff --git a/dev/packages/pxbabel.json b/dev/packages/pxbabel.json
index d84bc75e2..201c9710e 100644
--- a/dev/packages/pxbabel.json
+++ b/dev/packages/pxbabel.json
@@ -75,7 +75,7 @@
       "snippet": "pxDeclareEncodingDispatcher{${1:encoding}}{${2:text}}"
     },
     "pxDispatchEncodings{}": {
-      "snippet": "pxDispatchEncodings{${1:enc1,enc2,...}}"
+      "snippet": "pxDispatchEncodings{${1:enc1,${2:enc2},...}}"
     },
     "pxIsEncodingDispatched{}": {
       "snippet": "pxIsEncodingDispatched{${1:encoding}}"
diff --git a/dev/packages/pygmentex.json b/dev/packages/pygmentex.json
new file mode 100644
index 000000000..3b0fb3ced
--- /dev/null
+++ b/dev/packages/pygmentex.json
@@ -0,0 +1,124 @@
+{
+  "includes": {
+    "fancyvrb": [],
+    "color": [],
+    "ifthen": [],
+    "caption": [],
+    "shellesc": [],
+    "pgfkeys": [],
+    "efbox": [],
+    "mdframed": [],
+    "tikz": []
+  },
+  "macros": {
+    "inputpygmented{}": {
+      "snippet": "inputpygmented{${1:file}}"
+    },
+    "inputpygmented[]{}": {
+      "snippet": "inputpygmented[${2:options}]{${1:file}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "pyginline": {
+      "snippet": "pyginline|${1:code}|"
+    },
+    "pyginline[]": {
+      "snippet": "pyginline[${1:options}]|${2:code}|",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "pyginline[]{}": {
+      "snippet": "pyginline[${2:options}]{${1:verbatimSymbol}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "setpygmented{}": {
+      "snippet": "setpygmented{${1:options}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "widest(){}{}": {
+      "snippet": "widest(${3:string list}){${1:code}}{${2:cmd}}"
+    },
+    "VerbatimOutAppend": {},
+    "remainingglobaloptions": {},
+    "remaininguseroptions": {},
+    "remainingoptions": {},
+    "FormatLineNumber{}": {
+      "snippet": "FormatLineNumber{${1:arg}}"
+    }
+  },
+  "envs": {
+    "pygmented": {},
+    "pygmented[]": {
+      "name": "pygmented",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "VerbatimOutAppend": {}
+  },
+  "options": [
+    "force"
+  ],
+  "keyvals": [
+    [
+      "lang=${1:language}",
+      "sty=${1:pygments style}",
+      "font=${1:font commands}",
+      "colback=",
+      "gobble=${1:integer}",
+      "tabsize=${1:integer}",
+      "linenos",
+      "linenostart=${1:integer}",
+      "linenostep=${1:integer}",
+      "linenosep=",
+      "caption=${1:caption}",
+      "label=",
+      "texcomments",
+      "mathescape",
+      "escapeinside=${1:two chars}",
+      "force",
+      "boxing method=${1:envname}"
+    ],
+    [
+      "lang=${1:language}",
+      "sty=${1:pygments style}",
+      "font=${1:font commands}",
+      "colback=",
+      "gobble=${1:integer}",
+      "tabsize=${1:integer}",
+      "linenos",
+      "linenostart=${1:integer}",
+      "linenostep=${1:integer}",
+      "linenosep=",
+      "caption=${1:caption}",
+      "label=",
+      "texcomments",
+      "mathescape",
+      "escapeinside=${1:two chars}",
+      "force",
+      "inline method=${1:csname}"
+    ],
+    [
+      "lang=${1:language}",
+      "sty=${1:pygments style}",
+      "font=${1:font commands}",
+      "colback=",
+      "gobble=${1:integer}",
+      "tabsize=${1:integer}",
+      "linenos",
+      "linenostart=${1:integer}",
+      "linenostep=${1:integer}",
+      "linenosep=",
+      "caption=${1:caption}",
+      "label=",
+      "texcomments",
+      "mathescape",
+      "escapeinside=${1:two chars}",
+      "force",
+      "inline method=${1:csname}",
+      "boxing method=${1:envname}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/pylatex.json b/dev/packages/pylatex.json
new file mode 100644
index 000000000..24c01497f
--- /dev/null
+++ b/dev/packages/pylatex.json
@@ -0,0 +1,29 @@
+{
+  "includes": {
+    "comment": [],
+    "listings": [],
+    "keyval": [],
+    "etoolbox": [],
+    "xcolor": [],
+    "pymacros": []
+  },
+  "macros": {
+    "pyverb{}": {
+      "snippet": "pyverb{${1:text}}"
+    },
+    "PySetup{}": {
+      "snippet": "PySetup{${1:keyvals}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "envs": {
+    "python": {}
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "action="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/pythontex.json b/dev/packages/pythontex.json
index a7cca554a..f93e66605 100644
--- a/dev/packages/pythontex.json
+++ b/dev/packages/pythontex.json
@@ -314,7 +314,7 @@
       "snippet": "setpythontexcontext{${1:key-value pairs}}"
     },
     "restartpythontexsession{}": {
-      "snippet": "restartpythontexsession{${1:counter value(s)}}"
+      "snippet": "restartpythontexsession{${1:counter value(${2:s})}}"
     },
     "setpythontexoutputdir{}": {
       "snippet": "setpythontexoutputdir{${1:output directory}}"
diff --git a/dev/packages/qcm.json b/dev/packages/qcm.json
new file mode 100644
index 000000000..9bd08b332
--- /dev/null
+++ b/dev/packages/qcm.json
@@ -0,0 +1,58 @@
+{
+  "includes": {
+    "ifthen": [],
+    "calc": [],
+    "verbatim": [],
+    "tabularx": []
+  },
+  "macros": {
+    "headerfont{}": {
+      "snippet": "headerfont{${1:font commands}}"
+    },
+    "X{}": {
+      "snippet": "X{${1:symbol}}"
+    },
+    "pbs{}": {
+      "snippet": "pbs{${1:arg}}"
+    },
+    "questionspace": {},
+    "answerstitle{}": {
+      "snippet": "answerstitle{${1:text}}"
+    },
+    "answerstitlefont{}": {
+      "snippet": "answerstitlefont{${1:font commands}}"
+    },
+    "answernumberfont{}": {
+      "snippet": "answernumberfont{${1:font commands}}"
+    },
+    "thequestion": {},
+    "truesymbol{}": {
+      "snippet": "truesymbol{${1:symbol}}"
+    },
+    "falsesymbol{}": {
+      "snippet": "falsesymbol{${1:symbol}}"
+    },
+    "true": {},
+    "false": {},
+    "correctionstyle{}": {
+      "snippet": "correctionstyle{${1:font commands}}"
+    },
+    "makeform": {},
+    "makemask": {}
+  },
+  "envs": {
+    "question{}": {
+      "name": "question",
+      "snippet": "{${1:question text}}"
+    },
+    "correction": {}
+  },
+  "options": [
+    "english",
+    "french",
+    "francais",
+    "nocorrection",
+    "correction"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/qrcode.json b/dev/packages/qrcode.json
new file mode 100644
index 000000000..ad56fa4b6
--- /dev/null
+++ b/dev/packages/qrcode.json
@@ -0,0 +1,56 @@
+{
+  "includes": {
+    "xcolor": []
+  },
+  "macros": {
+    "qrcode{}": {
+      "snippet": "qrcode{${1:URL}}"
+    },
+    "qrcode[]{}": {
+      "snippet": "qrcode[${2:options}]{${1:URL}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "qrcode*{}": {
+      "snippet": "qrcode*{${1:URL}}"
+    },
+    "qrcode*[]{}": {
+      "snippet": "qrcode*[${2:options}]{${1:URL}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "qrset{}": {
+      "snippet": "qrset{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "envs": {},
+  "options": [
+    "nolinks",
+    "draft",
+    "final",
+    "forget"
+  ],
+  "keyvals": [
+    [
+      "height=",
+      "level=",
+      "version=",
+      "tight",
+      "padding",
+      "draft",
+      "link",
+      "nolink",
+      "hyperlink"
+    ],
+    [
+      "height=",
+      "level=",
+      "version=",
+      "tight",
+      "padding",
+      "draft"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/qtree.json b/dev/packages/qtree.json
new file mode 100644
index 000000000..fadf5e3d9
--- /dev/null
+++ b/dev/packages/qtree.json
@@ -0,0 +1,48 @@
+{
+  "includes": {
+    "pict2e": []
+  },
+  "macros": {
+    "qtreecentertrue": {},
+    "qtreecenterfalse": {},
+    "qtreepadding": {},
+    "qroofpadding": {},
+    "qtreeunaryht": {},
+    "qtreeinithook": {},
+    "qtreefinalhook": {},
+    "qleafhook": {},
+    "qlabelhook": {},
+    "Tree[]": {
+      "snippet": "Tree[${1:qtree code}]"
+    },
+    "qroof{}": {
+      "snippet": "qroof{${1:text}}"
+    },
+    "qroofx": {},
+    "qroofy": {},
+    "automath": {},
+    "noautomath": {},
+    "qtreeprimes": {},
+    "qsetw{}": {
+      "snippet": "qsetw{${1:length}}"
+    },
+    "faketreewidth{}": {
+      "snippet": "faketreewidth{${1:text}}"
+    },
+    "qbalance": {},
+    "qframesubtree": {},
+    "qtreeshowframes": {},
+    "leaf{}": {
+      "snippet": "leaf{${1:text}}"
+    },
+    "branch{}{}": {
+      "snippet": "branch{${1:integer}}{${2:text}}"
+    },
+    "qobitree": {},
+    "nbranches": {},
+    "qTreeVersion": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/quantikz.json b/dev/packages/quantikz.json
new file mode 100644
index 000000000..6eefbd2c5
--- /dev/null
+++ b/dev/packages/quantikz.json
@@ -0,0 +1,10 @@
+{
+  "includes": {
+    "tikz": [],
+    "tikzlibraryquantikz2": []
+  },
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ran_toks.json b/dev/packages/ran_toks.json
index 778273909..18ef7bf2f 100644
--- a/dev/packages/ran_toks.json
+++ b/dev/packages/ran_toks.json
@@ -54,11 +54,11 @@
       "snippet": "useThisSeed{${1:init seed value}}"
     },
     "useTheseDBs{}": {
-      "snippet": "useTheseDBs{${1:db1,db2,...}}",
+      "snippet": "useTheseDBs{${1:db1,${2:db2},...}}",
       "option": "usedbapp"
     },
     "useProbDBs{}": {
-      "snippet": "useProbDBs{${1:db1,db2,...}}",
+      "snippet": "useProbDBs{${1:db1,${2:db2},...}}",
       "option": "usedbapp"
     },
     "ProbDBWarningMsg{}": {
diff --git a/dev/packages/randbild.json b/dev/packages/randbild.json
new file mode 100644
index 000000000..6deb2e3b7
--- /dev/null
+++ b/dev/packages/randbild.json
@@ -0,0 +1,36 @@
+{
+  "includes": {
+    "pst-plot": []
+  },
+  "macros": {
+    "showgrid": {}
+  },
+  "envs": {
+    "randbild{}{}": {
+      "name": "randbild",
+      "snippet": "{${1:x1,${3:y1}}{${2:x2},y2}}"
+    },
+    "randbild[]{}{}": {
+      "name": "randbild",
+      "snippet": "[${3:title}]{${1:x1,${4:y1}}{${2:x2},y2}}"
+    },
+    "randbild*{}{}": {
+      "name": "randbild*",
+      "snippet": "{${1:x1,${3:y1}}{${2:x2},y2}}"
+    },
+    "randbild*[]{}{}": {
+      "name": "randbild*",
+      "snippet": "[${3:title}]{${1:x1,${4:y1}}{${2:x2},y2}}"
+    },
+    "randbildbasis{}{}": {
+      "name": "randbildbasis",
+      "snippet": "{${1:x1,${3:y1}}{${2:x2},y2}}"
+    },
+    "randbildbasis[]{}{}": {
+      "name": "randbildbasis",
+      "snippet": "[${3:title}]{${1:x1,${4:y1}}{${2:x2},y2}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/rangen.json b/dev/packages/rangen.json
index c3d6e0bae..0157180e2 100644
--- a/dev/packages/rangen.json
+++ b/dev/packages/rangen.json
@@ -47,10 +47,10 @@
       "snippet": "nDivisionsPowerOfTen{${1:integer}}"
     },
     "RandomL{}{}": {
-      "snippet": "RandomL{${1:cmd}}{${2:n1,n2,...}}"
+      "snippet": "RandomL{${1:cmd}}{${2:n1,${3:n2},...}}"
     },
     "RandomL[]{}{}": {
-      "snippet": "RandomL[${3:options}]{${1:cmd}}{${2:n1,n2,...}}",
+      "snippet": "RandomL[${3:options}]{${1:cmd}}{${2:n1,${4:n2},...}}",
       "keyvalindex": 2,
       "keyvalpos": 0
     },
diff --git a/dev/packages/readarray.json b/dev/packages/readarray.json
index 3cdc6224b..53b951b5d 100644
--- a/dev/packages/readarray.json
+++ b/dev/packages/readarray.json
@@ -11,25 +11,25 @@
       "snippet": "readrecordarray{${1:file}}{${2:array-identifier}}"
     },
     "readarray{}{}[]": {
-      "snippet": "readarray{${1:data-macro}}{${2:array-identifier}}[${3:-,rows,columns}]"
+      "snippet": "readarray{${1:data-macro}}{${2:array-identifier}}[${3:-,${4:rows},columns}]"
     },
     "readarray*{}{}[]": {
-      "snippet": "readarray*{${1:data-macro}}{${2:array-identifier}}[${3:-,rows,columns}]"
+      "snippet": "readarray*{${1:data-macro}}{${2:array-identifier}}[${3:-,${4:rows},columns}]"
     },
     "initarray{}[]": {
-      "snippet": "initarray{${1:array-identifier}}[${2:planes,rows,columns}]"
+      "snippet": "initarray{${1:array-identifier}}[${2:planes,${3:rows},columns}]"
     },
     "mergearray{}{}[]": {
-      "snippet": "mergearray{${1:from-array-id}}{${2:to-array-id}}[${3:plane,row,column}]"
+      "snippet": "mergearray{${1:from-array-id}}{${2:to-array-id}}[${3:plane,${4:row},column}]"
     },
     "typesetarray{}": {
       "snippet": "typesetarray{${1:array-identifier}}"
     },
     "arraytomacro{}[]{}": {
-      "snippet": "arraytomacro{${1:array-identifier}}[${2:plane,row,column}]{${3:macro}}"
+      "snippet": "arraytomacro{${1:array-identifier}}[${2:plane,${4:row},column}]{${3:macro}}"
     },
     "setvalue{}[]{}": {
-      "snippet": "setvalue{${1:array-identifier}}[${2:plane,row,column}]{${3:value}}"
+      "snippet": "setvalue{${1:array-identifier}}[${2:plane,${4:row},column}]{${3:value}}"
     },
     "readarraysepchar{}": {
       "snippet": "readarraysepchar{${1:parsing-separator-char}}"
diff --git a/dev/packages/rec-thy.json b/dev/packages/rec-thy.json
index 9919c7487..b4d3ddaeb 100644
--- a/dev/packages/rec-thy.json
+++ b/dev/packages/rec-thy.json
@@ -170,7 +170,19 @@
     "forall*": {},
     "forallae": {},
     "forces": {},
+    "forces()": {
+      "snippet": "forces(${1:sup})"
+    },
+    "forces()[]": {
+      "snippet": "forces(${2:sup})[${1:sub}]"
+    },
     "forces*": {},
+    "forces*()": {
+      "snippet": "forces*(${1:sup})"
+    },
+    "forces*()[]": {
+      "snippet": "forces*(${2:sup})[${1:sub}]"
+    },
     "forces*[]": {
       "snippet": "forces*[${1:sub}]"
     },
@@ -191,9 +203,15 @@
     "Hop[]{}": {
       "snippet": "Hop[${2:sub2}]{${1:sub1}}"
     },
+    "Hop[]{}()": {
+      "snippet": "Hop[${2:sub2}]{${1:sub1}}(${3:arg})"
+    },
     "Hop{}": {
       "snippet": "Hop{${1:sub}}"
     },
+    "Hop{}()": {
+      "snippet": "Hop{${1:sub}}(${2:arg})"
+    },
     "hyp": {},
     "HYP": {},
     "iffdef": {},
@@ -218,7 +236,19 @@
       "snippet": "jumpn{${1:arg}}{${2:sup}}"
     },
     "kleeneO": {},
+    "kleeneO()": {
+      "snippet": "kleeneO(${1:sup})"
+    },
+    "kleeneO()[]": {
+      "snippet": "kleeneO(${2:sup})[${1:sub}]"
+    },
     "kleeneO*": {},
+    "kleeneO*()": {
+      "snippet": "kleeneO*(${1:sup})"
+    },
+    "kleeneO*()[]": {
+      "snippet": "kleeneO*(${2:sup})[${1:sub}]"
+    },
     "kleeneO*[]": {
       "snippet": "kleeneO*[${1:sub}]"
     },
@@ -437,6 +467,12 @@
     "REAop{}{}": {
       "snippet": "REAop{${1:sub}}{${2:sup}}"
     },
+    "recf(){}": {
+      "snippet": "recf(${2:sup}){${1:sub}}"
+    },
+    "recf[](){}": {
+      "snippet": "recf[${2:sub2}](${3:sup}){${1:sub1}}"
+    },
     "recf[]{}": {
       "snippet": "recf[${2:sub2}]{${1:sub1}}"
     },
@@ -476,6 +512,12 @@
     "require{}{}": {
       "snippet": "require{${1:letter}}{${2:sub}}"
     },
+    "REset(){}": {
+      "snippet": "REset(${2:sup}){${1:sub}}"
+    },
+    "REset[](){}": {
+      "snippet": "REset[${2:sub2}](${3:sup}){${1:sub1}}"
+    },
     "REset[]{}": {
       "snippet": "REset[${2:sub2}]{${1:sub1}}"
     },
diff --git a/dev/packages/rgltxdoc.json b/dev/packages/rgltxdoc.json
index 5c7241276..dc1c2ce7c 100644
--- a/dev/packages/rgltxdoc.json
+++ b/dev/packages/rgltxdoc.json
@@ -60,7 +60,7 @@
       "snippet": "pkgname{${1:package}}"
     },
     "pkgnames{}": {
-      "snippet": "pkgnames{${1:package1,package2,...}}"
+      "snippet": "pkgnames{${1:package1,${2:package2},...}}"
     },
     "cmarg{}": {
       "snippet": "cmarg{${1:arg}}"
diff --git a/dev/packages/ribbonproofs.json b/dev/packages/ribbonproofs.json
index 39f3f0c6f..a80c64ee7 100644
--- a/dev/packages/ribbonproofs.json
+++ b/dev/packages/ribbonproofs.json
@@ -48,16 +48,16 @@
       "keyvalpos": 0
     },
     "moveribbons{}": {
-      "snippet": "moveribbons{${1:ribbon1,ribbon2,...}}"
+      "snippet": "moveribbons{${1:ribbon1,${2:ribbon2},...}}"
     },
     "swapribbons{}{}": {
-      "snippet": "swapribbons{${1:name1,name2,...}}{${2:name'1,name'2,...}}"
+      "snippet": "swapribbons{${1:name1,${3:name2},${4:...}}{${2:name'1},${5:name'2},...}}"
     },
     "moveboxes{}": {
-      "snippet": "moveboxes{${1:box1,box2,...}}"
+      "snippet": "moveboxes{${1:box1,${2:box2},...}}"
     },
     "extendboxes{}": {
-      "snippet": "extendboxes{${1:box1,box2,...}}"
+      "snippet": "extendboxes{${1:box1,${2:box2},...}}"
     },
     "jusColor": {},
     "comColor": {},
diff --git a/dev/packages/rigidnotation.json b/dev/packages/rigidnotation.json
new file mode 100644
index 000000000..1fd71f642
--- /dev/null
+++ b/dev/packages/rigidnotation.json
@@ -0,0 +1,21 @@
+{
+  "includes": {
+    "mathtools": []
+  },
+  "macros": {
+    "NewRigidNotation{}{}": {
+      "snippet": "NewRigidNotation{${1:name}}{${2:symbol}}"
+    },
+    "SetConciseNotation{}": {
+      "snippet": "SetConciseNotation{${1:bool}}"
+    },
+    "UnsetConciseNotation": {},
+    "Tran": {},
+    "Inv": {},
+    "Herm": {},
+    "Conj": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/rterface.json b/dev/packages/rterface.json
index b0beded4b..4723657be 100644
--- a/dev/packages/rterface.json
+++ b/dev/packages/rterface.json
@@ -20,7 +20,7 @@
       "snippet": "Rvalue*[${2:sig figs}]{${1:expr}}"
     },
     "Rtable{}{}": {
-      "snippet": "Rtable{${1:col1,col2,...}}{${2:number of rows}}"
+      "snippet": "Rtable{${1:col1,${3:col2},...}}{${2:number of rows}}"
     },
     "Rset{}{}": {
       "snippet": "Rset{${1:variable}}{${2:expr}}"
diff --git a/dev/packages/ruby.json b/dev/packages/ruby.json
new file mode 100644
index 000000000..e8bead6e8
--- /dev/null
+++ b/dev/packages/ruby.json
@@ -0,0 +1,24 @@
+{
+  "includes": {
+    "CJK": []
+  },
+  "macros": {
+    "rubysize": {},
+    "rubysep": {},
+    "rubyoverlap": {},
+    "rubynooverlap": {},
+    "rubyCJK": {},
+    "rubylatin": {},
+    "ruby{}{}": {
+      "snippet": "ruby{${1:base characters}}{${2:ruby}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "overlap",
+    "nooverlap",
+    "CJK",
+    "latin"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/sankey.json b/dev/packages/sankey.json
index ec115ae33..27074d71a 100644
--- a/dev/packages/sankey.json
+++ b/dev/packages/sankey.json
@@ -174,10 +174,10 @@
       "keyvalpos": 0
     },
     "sankeyfork{}{}": {
-      "snippet": "sankeyfork{${1:node name}}{${2:qty1/name1,qty2/name2,...}}"
+      "snippet": "sankeyfork{${1:node name}}{${2:qty1/name1,${3:qty2/name2},...}}"
     },
     "sankeyfork[]{}{}": {
-      "snippet": "sankeyfork[${3:options}]{${1:node name}}{${2:qty1/name1,qty2/name2,...}}",
+      "snippet": "sankeyfork[${3:options}]{${1:node name}}{${2:qty1/name1,${4:qty2/name2},...}}",
       "keyvalindex": 3,
       "keyvalpos": 0
     },
diff --git a/dev/packages/scanpages.json b/dev/packages/scanpages.json
index 65f240a93..191879fd5 100644
--- a/dev/packages/scanpages.json
+++ b/dev/packages/scanpages.json
@@ -20,8 +20,23 @@
     "initviewport{}{}{}{}{}": {
       "snippet": "initviewport{${1:scale}}{${2:llx}}{${3:lly}}{${4:w}}{${5:h}}"
     },
+    "whitesq(){}": {
+      "snippet": "whitesq(${2:x},${3:y}){${1:scale}}"
+    },
+    "whitesq(){}[]": {
+      "snippet": "whitesq(${3:x},${4:y}){${1:x-scale}}[${2:y-scale}]"
+    },
+    "whitecirc(){}": {
+      "snippet": "whitecirc(${2:x},${3:y}){${1:scale}}"
+    },
+    "whitecirc(){}[]": {
+      "snippet": "whitecirc(${3:x},${4:y}){${1:x-scale}}[${2:y-scale}]"
+    },
     "origpgcmd": {},
     "origpgnum": {},
+    "putn(){}": {
+      "snippet": "putn(${2:x},${3:y}){${1:stuff}}"
+    },
     "thegrid{}{}": {
       "snippet": "thegrid{${1:width}}{${2:height}}"
     },
diff --git a/dev/packages/schule.json b/dev/packages/schule.json
index bbf31415e..9a5deec09 100644
--- a/dev/packages/schule.json
+++ b/dev/packages/schule.json
@@ -543,6 +543,10 @@
     "teilaufgaben": {},
     "loesung": {},
     "loesung*": {},
+    "mcumgebung(Spaltenzahl)": {
+      "name": "mcumgebung",
+      "snippet": "(${1:Spaltenzahl})"
+    },
     "bearbeitungshinweis": {},
     "aufgabenpoolHinweis": {},
     "erwartungen": {},
diff --git a/dev/packages/schwalbe.json b/dev/packages/schwalbe.json
new file mode 100644
index 000000000..2872bb882
--- /dev/null
+++ b/dev/packages/schwalbe.json
@@ -0,0 +1,29 @@
+{
+  "includes": {
+    "diagram": []
+  },
+  "macros": {
+    "rb{}": {
+      "snippet": "rb{${1:content}}"
+    },
+    "normaldia": {},
+    "smalldia": {},
+    "urdruck": {},
+    "windowpar": {},
+    "bel": {},
+    "ferner": {},
+    "reprint": {},
+    "helplength": {},
+    "boardskip": {},
+    "doublediagram{}": {
+      "snippet": "doublediagram{${1:content}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "10pt",
+    "11pt",
+    "12pt"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/scontents.json b/dev/packages/scontents.json
index 5de1371ef..fb164f17a 100644
--- a/dev/packages/scontents.json
+++ b/dev/packages/scontents.json
@@ -1,7 +1,5 @@
 {
-  "includes": {
-    "l3keys2e": []
-  },
+  "includes": {},
   "macros": {
     "setupsc{}": {
       "snippet": "setupsc{${1:options}}",
@@ -117,7 +115,8 @@
       "wrapper={${1:code}}"
     ],
     [
-      "width-tab=${1:integer}"
+      "width-tab=${1:integer}",
+      "${1:index}"
     ],
     [
       "store-env=${1:seq name}",
diff --git a/dev/packages/scrbase.json b/dev/packages/scrbase.json
new file mode 100644
index 000000000..44e9b89c9
--- /dev/null
+++ b/dev/packages/scrbase.json
@@ -0,0 +1,351 @@
+{
+  "includes": {
+    "scrlfile": [],
+    "keyval": [],
+    "scrlogo": []
+  },
+  "macros": {
+    "KOMAScriptVersion": {},
+    "rloop{}": {
+      "snippet": "rloop{${1:arg}}"
+    },
+    "IfLTXAtLeastTF{}{}{}": {
+      "snippet": "IfLTXAtLeastTF{${1:date}}{${2:then code}}{${3:else code}}"
+    },
+    "DefineFamily{}": {
+      "snippet": "DefineFamily{${1:family}}"
+    },
+    "DefineFamilyMember{}": {
+      "snippet": "DefineFamilyMember{${1:family}}"
+    },
+    "DefineFamilyMember[]{}": {
+      "snippet": "DefineFamilyMember[${2:member}]{${1:family}}"
+    },
+    "DefineFamilyKey{}{}{}": {
+      "snippet": "DefineFamilyKey{${1:family}}{${2:key}}{${3:action}}"
+    },
+    "DefineFamilyKey[]{}{}{}": {
+      "snippet": "DefineFamilyKey[${4:member}]{${1:family}}{${2:key}}{${3:action}}"
+    },
+    "DefineFamilyKey[]{}{}[]{}": {
+      "snippet": "DefineFamilyKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:action}}"
+    },
+    "RelaxFamilyKey{}{}": {
+      "snippet": "RelaxFamilyKey{${1:family}}{${2:key}}"
+    },
+    "RelaxFamilyKey[]{}{}": {
+      "snippet": "RelaxFamilyKey[${3:member}]{${1:family}}{${2:key}}"
+    },
+    "FamilyKeyState": {},
+    "FamilyKeyStateUnknown": {},
+    "FamilyKeyStateUnknownValue": {},
+    "FamilyKeyStateNeedValue": {},
+    "FamilyKeyStateProcessed": {},
+    "FamilyOfKey": {},
+    "FamilyMemberOfKey": {},
+    "FamilyProcessOptions{}": {
+      "snippet": "FamilyProcessOptions{${1:family}}"
+    },
+    "FamilyProcessOptions[]{}": {
+      "snippet": "FamilyProcessOptions[${2:member}]{${1:family}}"
+    },
+    "AtEndOfFamilyOptions{}": {
+      "snippet": "AtEndOfFamilyOptions{${1:action}}"
+    },
+    "AtEndOfFamilyOptions*{}": {
+      "snippet": "AtEndOfFamilyOptions*{${1:action}}"
+    },
+    "IfArgIsEmpty{}{}{}": {
+      "snippet": "IfArgIsEmpty{${1:arg}}{${2:then code}}{${3:else code}}"
+    },
+    "XdivY{}{}": {
+      "snippet": "XdivY{${1:dividend}}{${2:divisor}}"
+    },
+    "XmodY{}{}": {
+      "snippet": "XmodY{${1:dividend}}{${2:divisor}}"
+    },
+    "Ifundefinedorrelax{}{}{}": {
+      "snippet": "Ifundefinedorrelax{${1:name}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifnotundefined{}{}{}": {
+      "snippet": "Ifnotundefined{${1:name}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifstr{}{}{}{}": {
+      "snippet": "Ifstr{${1:string1}}{${2:string2}}{${3:then code}}{${4:else code}}"
+    },
+    "Ifstrstart{}{}{}{}": {
+      "snippet": "Ifstrstart{${1:string1}}{${2:string2}}{${3:then code}}{${4:else code}}"
+    },
+    "Ifislengthprimitive{}{}{}": {
+      "snippet": "Ifislengthprimitive{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisdimen{}{}{}": {
+      "snippet": "Ifisdimen{${1:string}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisskip{}{}{}": {
+      "snippet": "Ifisskip{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifiscount{}{}{}": {
+      "snippet": "Ifiscount{${1:count}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisdimexpr{}{}{}": {
+      "snippet": "Ifisdimexpr{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisglueexpr{}{}{}": {
+      "snippet": "Ifisglueexpr{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisnumexpr{}{}{}": {
+      "snippet": "Ifisnumexpr{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisdefchar{}{}{}": {
+      "snippet": "Ifisdefchar{${1:arg}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifiscounter{}{}{}": {
+      "snippet": "Ifiscounter{${1:counter}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisinteger{}{}{}": {
+      "snippet": "Ifisinteger{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisdimension{}{}{}": {
+      "snippet": "Ifisdimension{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifisglue{}{}{}": {
+      "snippet": "Ifisglue{${1:expression}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifnumber{}{}{}": {
+      "snippet": "Ifnumber{${1:string}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifintnumber{}{}{}": {
+      "snippet": "Ifintnumber{${1:string}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifdimen{}{}{}": {
+      "snippet": "Ifdimen{${1:string}}{${2:then code}}{${3:else code}}"
+    },
+    "Ifpdfoutput{}{}": {
+      "snippet": "Ifpdfoutput{${1:then code}}{${2:else code}}"
+    },
+    "Ifpsoutput{}{}": {
+      "snippet": "Ifpsoutput{${1:then code}}{${2:else code}}"
+    },
+    "Ifdvioutput{}{}": {
+      "snippet": "Ifdvioutput{${1:then code}}{${2:else code}}"
+    },
+    "IfRTL{}{}": {
+      "snippet": "IfRTL{${1:then code}}{${2:else code}}"
+    },
+    "IfLTR{}{}": {
+      "snippet": "IfLTR{${1:then code}}{${2:else code}}"
+    },
+    "PackageInfoNoLine{}{}": {
+      "snippet": "PackageInfoNoLine{${1:package}}{${2:information}}"
+    },
+    "ClassInfoNoLine{}{}": {
+      "snippet": "ClassInfoNoLine{${1:class}}{${2:information}}"
+    },
+    "IfActiveMkBoth{}{}": {
+      "snippet": "IfActiveMkBoth{${1:then code}}{${2:else code}}"
+    },
+    "BeforeFamilyProcessOptions{}{}": {
+      "snippet": "BeforeFamilyProcessOptions{${1:family}}{${2:code}}"
+    },
+    "BeforeFamilyProcessOptions[]{}{}": {
+      "snippet": "BeforeFamilyProcessOptions[${3:member}]{${1:family}}{${2:code}}"
+    },
+    "FamilyExecuteOptions{}{}": {
+      "snippet": "FamilyExecuteOptions{${1:family}}{${2:options list}}"
+    },
+    "FamilyExecuteOptions[]{}{}": {
+      "snippet": "FamilyExecuteOptions[${3:member}]{${1:family}}{${2:options list}}"
+    },
+    "FamilyOptions{}{}": {
+      "snippet": "FamilyOptions{${1:family}}{${2:options list}}"
+    },
+    "FamilyOption{}{}{}": {
+      "snippet": "FamilyOption{${1:family}}{${2:option}}{${3:value list}}"
+    },
+    "FamilyUnknownKeyValue{}{}{}{}": {
+      "snippet": "FamilyUnknownKeyValue{${1:family}}{${2:key}}{${3:value}}{${4:value list}}"
+    },
+    "FamilyElseValues": {},
+    "FamilyBoolKey{}{}{}": {
+      "snippet": "FamilyBoolKey{${1:family}}{${2:key}}{${3:switch name}}"
+    },
+    "FamilyBoolKey[]{}{}{}": {
+      "snippet": "FamilyBoolKey[${4:member}]{${1:family}}{${2:key}}{${3:switch name}}"
+    },
+    "FamilySetBool{}{}{}{}": {
+      "snippet": "FamilySetBool{${1:family}}{${2:key}}{${3:switch name}}{${4:value}}"
+    },
+    "FamilyInverseBoolKey{}{}{}": {
+      "snippet": "FamilyInverseBoolKey{${1:family}}{${2:key}}{${3:switch name}}"
+    },
+    "FamilyInverseBoolKey[]{}{}{}": {
+      "snippet": "FamilyInverseBoolKey[${4:member}]{${1:family}}{${2:key}}{${3:switch name}}"
+    },
+    "FamilySetInverseBool{}{}{}{}": {
+      "snippet": "FamilySetInverseBool{${1:family}}{${2:key}}{${3:switch name}}{${4:value}}"
+    },
+    "FamilyCounterKey{}{}{}": {
+      "snippet": "FamilyCounterKey{${1:family}}{${2:key}}{${3:counter}}"
+    },
+    "FamilyCounterKey[]{}{}{}": {
+      "snippet": "FamilyCounterKey[${4:member}]{${1:family}}{${2:key}}{${3:counter}}"
+    },
+    "FamilyCounterKey[]{}{}[]{}": {
+      "snippet": "FamilyCounterKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:counter}}"
+    },
+    "FamilySetCounter{}{}{}{}": {
+      "snippet": "FamilySetCounter{${1:family}}{${2:key}}{${3:counter}}{${4:value}}"
+    },
+    "FamilyCounterMacroKey{}{}{}": {
+      "snippet": "FamilyCounterMacroKey{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyCounterMacroKey{}{}[]{}": {
+      "snippet": "FamilyCounterMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
+    },
+    "FamilyCounterMacroKey[]{}{}{}": {
+      "snippet": "FamilyCounterMacroKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyCounterMacroKey[]{}{}[]{}": {
+      "snippet": "FamilyCounterMacroKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
+    },
+    "FamilySetCounterMacro{}{}{}{}": {
+      "snippet": "FamilySetCounterMacro{${1:family}}{${2:key}}{${3:macro}}{${4:value}}"
+    },
+    "FamilyLengthKey{}{}{}": {
+      "snippet": "FamilyLengthKey{${1:family}}{${2:key}}{${3:length}}"
+    },
+    "FamilyLengthKey[]{}{}{}": {
+      "snippet": "FamilyLengthKey[${4:member}]{${1:family}}{${2:key}}{${3:csname}}"
+    },
+    "FamilyLengthKey[]{}{}[]{}": {
+      "snippet": "FamilyLengthKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:csname}}"
+    },
+    "FamilySetLength{}{}{}{}": {
+      "snippet": "FamilySetLength{${1:family}}{${2:key}}{${3:length}}{${4:value}}"
+    },
+    "FamilyLengthMacroKey{}{}{}": {
+      "snippet": "FamilyLengthMacroKey{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyLengthMacroKey{}{}[]{}": {
+      "snippet": "FamilyLengthMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
+    },
+    "FamilyLengthMacroKey[]{}{}{}": {
+      "snippet": "FamilyLengthMacroKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyLengthMacroKey[]{}{}[]{}": {
+      "snippet": "FamilyLengthMacroKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
+    },
+    "FamilySetLengthMacro{}{}{}{}": {
+      "snippet": "FamilySetLengthMacro{${1:family}}{${2:key}}{${3:macro}}{${4:value}}"
+    },
+    "FamilyUseLengthMacroKey{}{}{}": {
+      "snippet": "FamilyUseLengthMacroKey{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyUseLengthMacroKey{}{}[]{}": {
+      "snippet": "FamilyUseLengthMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
+    },
+    "FamilyUseLengthMacroKey[]{}{}{}": {
+      "snippet": "FamilyUseLengthMacroKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyUseLengthMacroKey[]{}{}[]{}": {
+      "snippet": "FamilyUseLengthMacroKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
+    },
+    "FamilySetUseLengthMacro{}{}{}{}": {
+      "snippet": "FamilySetUseLengthMacro{${1:family}}{${2:key}}{${3:macro}}{${4:value}}"
+    },
+    "FamilyNumericalKey{}{}{}{}": {
+      "snippet": "FamilyNumericalKey{${1:family}}{${2:key}}{${3:macro}}{${4:value list}}"
+    },
+    "FamilyLengthMacroKey{}{}[]{}{}": {
+      "snippet": "FamilyLengthMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}{${5:value list}}"
+    },
+    "FamilyLengthMacroKey[]{}{}{}{}": {
+      "snippet": "FamilyLengthMacroKey[${5:member}]{${1:family}}{${2:key}}{${3:macro}}{${4:value list}}"
+    },
+    "FamilyLengthMacroKey[]{}{}[]{}{}": {
+      "snippet": "FamilyLengthMacroKey[${5:member}]{${1:family}}{${2:key}}[${6:default}]{${3:macro}}{${4:value list}}"
+    },
+    "FamilySetNumerical{}{}{}{}{}": {
+      "snippet": "FamilySetNumerical{${1:family}}{${2:key}}{${3:macro}}{${4:value list}}{${5:value}}"
+    },
+    "FamilyStringKey{}{}{}": {
+      "snippet": "FamilyStringKey{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyStringKey{}{}[]{}": {
+      "snippet": "FamilyStringKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
+    },
+    "FamilyStringKey[]{}{}{}": {
+      "snippet": "FamilyStringKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
+    },
+    "FamilyStringKey[]{}{}[]{}": {
+      "snippet": "FamilyStringKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
+    },
+    "FamilyCSKey{}{}{}": {
+      "snippet": "FamilyCSKey{${1:family}}{${2:key}}{${3:csname}}"
+    },
+    "ForDoHook{}{}": {
+      "snippet": "ForDoHook{${1:specification}}{${2:command}}"
+    },
+    "SplitDoHook{}{}{}": {
+      "snippet": "SplitDoHook{${1:specifier}}{${2:head macro}}{${3:remainder macro}}"
+    },
+    "ExecuteDoHook{}": {
+      "snippet": "ExecuteDoHook{${1:specifier}}"
+    },
+    "AddtoDoHook{}{}": {
+      "snippet": "AddtoDoHook{${1:name}}{${2:command}}"
+    },
+    "AddtoOneTimeDoHook{}{}": {
+      "snippet": "AddtoOneTimeDoHook{${1:name}}{${2:command}}"
+    },
+    "defcaptionname{}{}{}": {
+      "snippet": "defcaptionname{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "defcaptionname*{}{}{}": {
+      "snippet": "defcaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "providecaptionname{}{}{}": {
+      "snippet": "providecaptionname{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "providecaptionname*{}{}{}": {
+      "snippet": "providecaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "newcaptionname{}{}{}": {
+      "snippet": "newcaptionname{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "newcaptionname*{}{}{}": {
+      "snippet": "newcaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "renewcaptionname{}{}{}": {
+      "snippet": "renewcaptionname{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "renewcaptionname*{}{}{}": {
+      "snippet": "renewcaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
+    },
+    "ifnotundefined": {},
+    "ifislengthprimitive": {},
+    "ifisdefchar": {},
+    "ifstr": {},
+    "ifstrstart": {},
+    "ifisdimen": {},
+    "ifisskip": {},
+    "ifiscount": {},
+    "ifisdimexpr": {},
+    "ifisglueexpr": {},
+    "ifisnumexpr": {},
+    "ifiscounter": {},
+    "ifisinteger": {},
+    "ifisdimension": {},
+    "ifisglue": {},
+    "ifnumber": {},
+    "ifintnumber": {},
+    "ifdimen": {},
+    "ifpdfoutput": {},
+    "ifpsoutput": {},
+    "ifdvioutput": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/scrletter.json b/dev/packages/scrletter.json
index 608188182..5d2d150ef 100644
--- a/dev/packages/scrletter.json
+++ b/dev/packages/scrletter.json
@@ -192,6 +192,12 @@
       "snippet": "setshowstyle{${1:style}}"
     },
     "edgesize": {},
+    "showenvelope()()": {
+      "snippet": "showenvelope(${1:width},${2:height})(${3:h-offset},${4:v-offset})"
+    },
+    "showenvelope()()[]": {
+      "snippet": "showenvelope(${2:width},${3:height})(${4:h-offset},${5:v-offset})[${1:instructions}]"
+    },
     "showISOenvelope{}": {
       "snippet": "showISOenvelope{${1:format}}"
     },
diff --git a/dev/packages/se2packages.json b/dev/packages/se2packages.json
index 83bdc6502..f5d04904d 100644
--- a/dev/packages/se2packages.json
+++ b/dev/packages/se2packages.json
@@ -83,6 +83,18 @@
       "snippet": "margincites{${1:bibid}}{${2:bibid}}",
       "option": "biblatex=numeric"
     },
+    "margincites(){}{}": {
+      "snippet": "margincites(${3:post}){${1:bibid}}{${2:bibid}}",
+      "option": "biblatex=numeric"
+    },
+    "margincites()(){}{}": {
+      "snippet": "margincites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
+      "option": "biblatex=numeric"
+    },
+    "margincites()()[]{}[]{}": {
+      "snippet": "margincites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
+      "option": "biblatex=numeric"
+    },
     "margincites[]{}[]{}": {
       "snippet": "margincites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "biblatex=numeric"
@@ -91,6 +103,10 @@
       "snippet": "margincites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "biblatex=numeric"
     },
+    "margincites()()[][]{}[][]{}": {
+      "snippet": "margincites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
+      "option": "biblatex=numeric"
+    },
     "bibliofont": {
       "option": "biblatex=numeric"
     }
diff --git a/dev/packages/semantex.json b/dev/packages/semantex.json
new file mode 100644
index 000000000..58ae1342d
--- /dev/null
+++ b/dev/packages/semantex.json
@@ -0,0 +1,630 @@
+{
+  "includes": {
+    "l3keys2e": [],
+    "leftindex": [],
+    "semtex": []
+  },
+  "macros": {
+    "NewVariableClass{}": {
+      "snippet": "NewVariableClass{${1:\\Class}}"
+    },
+    "NewVariableClass{}[]": {
+      "snippet": "NewVariableClass{${1:\\Class}}[${2:options}]"
+    },
+    "DeclareVariableClass{}": {
+      "snippet": "DeclareVariableClass{${1:\\Class}}"
+    },
+    "DeclareVariableClass{}[]": {
+      "snippet": "DeclareVariableClass{${1:\\Class}}[${2:options}]"
+    },
+    "NewSymbolClass{}": {
+      "snippet": "NewSymbolClass{${1:\\Class}}"
+    },
+    "NewSymbolClass{}[]": {
+      "snippet": "NewSymbolClass{${1:\\Class}}[${2:options}]"
+    },
+    "DeclareSymbolClass{}": {
+      "snippet": "DeclareSymbolClass{${1:\\Class}}"
+    },
+    "DeclareSymbolClass{}[]": {
+      "snippet": "DeclareSymbolClass{${1:\\Class}}[${2:options}]"
+    },
+    "NewSimpleClass{}": {
+      "snippet": "NewSimpleClass{${1:\\Class}}"
+    },
+    "NewSimpleClass{}[]": {
+      "snippet": "NewSimpleClass{${1:\\Class}}[${2:options}]"
+    },
+    "DeclareSimpleClass{}": {
+      "snippet": "DeclareSimpleClass{${1:\\Class}}"
+    },
+    "DeclareSimpleClass{}[]": {
+      "snippet": "DeclareSimpleClass{${1:\\Class}}[${2:options}]"
+    },
+    "SemantexBaseObject": {},
+    "NewObject{}{}{}": {
+      "snippet": "NewObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}"
+    },
+    "NewObject{}{}{}[]": {
+      "snippet": "NewObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}[${4:options}]"
+    },
+    "DeclareObject{}{}{}": {
+      "snippet": "DeclareObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}"
+    },
+    "DeclareObject{}{}{}[]": {
+      "snippet": "DeclareObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}[${4:options}]"
+    },
+    "SetupClass{}{}": {
+      "snippet": "SetupClass{${1:\\Class}}{${2:keyvals}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "SetupObject{}{}": {
+      "snippet": "SetupObject{${1:\\object}}{${2:keyvals}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "UseClassInCommand{}{}": {
+      "snippet": "UseClassInCommand{${1:\\Class}}{${2:symbol}}"
+    },
+    "UseClassInCommand{}[]{}": {
+      "snippet": "UseClassInCommand{${1:\\Class}}[${2:options}]{${3:symbol}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "SemantexSetup{}": {
+      "snippet": "SemantexSetup{${1:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "SemantexRecordObject{}": {
+      "snippet": "SemantexRecordObject{${1:command}}"
+    },
+    "SemantexRecordSource{}": {
+      "snippet": "SemantexRecordSource{${1:source}}"
+    },
+    "SemantexThis": {},
+    "SemantexSetKeys{}": {
+      "snippet": "SemantexSetKeys{${1:keyvals}}"
+    },
+    "SemantexKeysSet{}": {
+      "snippet": "SemantexKeysSet{${1:keyvals}}"
+    },
+    "SemantexSetKeysx{}": {
+      "snippet": "SemantexSetKeysx{${1:keyvals}}"
+    },
+    "SemantexKeysSetx{}": {
+      "snippet": "SemantexKeysSetx{${1:keyvals}}"
+    },
+    "SemantexSetArgKeys{}": {
+      "snippet": "SemantexSetArgKeys{${1:keyvals}}"
+    },
+    "SemantexArgKeysSet{}": {
+      "snippet": "SemantexArgKeysSet{${1:keyvals}}"
+    },
+    "SemantexSetArgKeysx{}": {
+      "snippet": "SemantexSetArgKeysx{${1:keyvals}}"
+    },
+    "SemantexArgKeysSetx{}": {
+      "snippet": "SemantexArgKeysSetx{${1:keyvals}}"
+    },
+    "SemantexSetArgSingleKeys{}": {
+      "snippet": "SemantexSetArgSingleKeys{${1:keyvals}}"
+    },
+    "SemantexArgSingleKeysSet{}": {
+      "snippet": "SemantexArgSingleKeysSet{${1:keyvals}}"
+    },
+    "SemantexSetArgSingleKeysx{}": {
+      "snippet": "SemantexSetArgSingleKeysx{${1:keyvals}}"
+    },
+    "SemantexArgSingleKeysSetx{}": {
+      "snippet": "SemantexArgSingleKeysSetx{${1:keyvals}}"
+    },
+    "SemantexSetOneArgSingleKey{}": {
+      "snippet": "SemantexSetOneArgSingleKey{${1:keyvals}}"
+    },
+    "SemantexOneSingleArgKeySet{}": {
+      "snippet": "SemantexOneSingleArgKeySet{${1:keyvals}}"
+    },
+    "SemantexSetOneArgSingleKeyx{}": {
+      "snippet": "SemantexSetOneArgSingleKeyx{${1:keyvals}}"
+    },
+    "SemantexOneSingleArgKeySetx{}": {
+      "snippet": "SemantexOneSingleArgKeySetx{${1:keyvals}}"
+    },
+    "SemantexSetArgWithoutKeyval{}": {
+      "snippet": "SemantexSetArgWithoutKeyval{${1:keyvals}}"
+    },
+    "SemantexArgWithoutKeyvalSet{}": {
+      "snippet": "SemantexArgWithoutKeyvalSet{${1:keyvals}}"
+    },
+    "SemantexSetArgWithoutKeyvalx{}": {
+      "snippet": "SemantexSetArgWithoutKeyvalx{${1:keyvals}}"
+    },
+    "SemantexArgWithoutKeyvalSetx{}": {
+      "snippet": "SemantexArgWithoutKeyvalSetx{${1:keyvals}}"
+    },
+    "SemantexDataProvide{}": {
+      "snippet": "SemantexDataProvide{${1:data}}"
+    },
+    "SemantexDataSet{}{}": {
+      "snippet": "SemantexDataSet{${1:data}}{${2:value}}"
+    },
+    "SemantexDataSetx{}{}": {
+      "snippet": "SemantexDataSetx{${1:data}}{${2:value}}"
+    },
+    "SemantexDataPutLeft{}{}": {
+      "snippet": "SemantexDataPutLeft{${1:data}}{${2:value}}"
+    },
+    "SemantexDataPutLeftx{}{}": {
+      "snippet": "SemantexDataPutLeftx{${1:data}}{${2:value}}"
+    },
+    "SemantexDataPutRight{}{}": {
+      "snippet": "SemantexDataPutRight{${1:data}}{${2:value}}"
+    },
+    "SemantexDataPutRightx{}{}": {
+      "snippet": "SemantexDataPutRightx{${1:data}}{${2:value}}"
+    },
+    "SemantexDataGet{}": {
+      "snippet": "SemantexDataGet{${1:data}}"
+    },
+    "SemantexDataGetExpNot{}": {
+      "snippet": "SemantexDataGetExpNot{${1:data}}"
+    },
+    "SemantexDataClear{}": {
+      "snippet": "SemantexDataClear{${1:data}}"
+    },
+    "SemantexBoolProvide{}": {
+      "snippet": "SemantexBoolProvide{${1:boolean}}"
+    },
+    "SemantexBoolSetTrue{}": {
+      "snippet": "SemantexBoolSetTrue{${1:boolean}}"
+    },
+    "SemantexBoolSetFalse{}": {
+      "snippet": "SemantexBoolSetFalse{${1:boolean}}"
+    },
+    "SemantexBoolIfTF{}{}{}": {
+      "snippet": "SemantexBoolIfTF{${1:boolean}}{${2:true}}{${3:false}}"
+    },
+    "SemantexBoolIfT{}{}": {
+      "snippet": "SemantexBoolIfT{${1:boolean}}{${2:true}}"
+    },
+    "SemantexBoolIfF{}{}": {
+      "snippet": "SemantexBoolIfF{${1:boolean}}{${2:false}}"
+    },
+    "SemantexIntProvide{}": {
+      "snippet": "SemantexIntProvide{${1:integer}}"
+    },
+    "SemantexIntGet{}": {
+      "snippet": "SemantexIntGet{${1:integer}}"
+    },
+    "SemantexIntSet{}{}": {
+      "snippet": "SemantexIntSet{${1:integer}}{${2:value}}"
+    },
+    "SemantexIntIncr{}": {
+      "snippet": "SemantexIntIncr{${1:integer}}"
+    },
+    "SemantexIntIfEqTF{}{}{}{}": {
+      "snippet": "SemantexIntIfEqTF{${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}"
+    },
+    "SemantexIntIfEqT{}{}{}": {
+      "snippet": "SemantexIntIfEqT{${1:integer1}}{${2:integer2}}{${3:true}}"
+    },
+    "SemantexIntIfEqF{}{}{}": {
+      "snippet": "SemantexIntIfEqF{${1:integer1}}{${2:integer2}}{${3:false}}"
+    },
+    "SemantexIntIfGreaterTF{}{}{}{}": {
+      "snippet": "SemantexIntIfGreaterTF{${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}"
+    },
+    "SemantexIntIfGreaterT{}{}{}": {
+      "snippet": "SemantexIntIfGreaterT{${1:integer1}}{${2:integer2}}{${3:true}}"
+    },
+    "SemantexIntIfGreaterF{}{}{}": {
+      "snippet": "SemantexIntIfGreaterF{${1:integer1}}{${2:integer2}}{${3:false}}"
+    },
+    "SemantexIntIfLessTF{}{}{}{}": {
+      "snippet": "SemantexIntIfLessTF{${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}"
+    },
+    "SemantexIntIfLessT{}{}{}": {
+      "snippet": "SemantexIntIfLessT{${1:integer1}}{${2:integer2}}{${3:true}}"
+    },
+    "SemantexIntIfLessF{}{}{}": {
+      "snippet": "SemantexIntIfLessF{${1:integer1}}{${2:integer2}}{${3:false}}"
+    },
+    "SemantexIntClear{}": {
+      "snippet": "SemantexIntClear{${1:integer}}"
+    },
+    "SemantexIfBlankTF{}{}{}": {
+      "snippet": "SemantexIfBlankTF{${1:tokens}}{${2:true}}{${3:false}}"
+    },
+    "SemantexIfBlankT{}{}": {
+      "snippet": "SemantexIfBlankT{${1:tokens}}{${2:true}}"
+    },
+    "SemantexIfBlankF{}{}": {
+      "snippet": "SemantexIfBlankF{${1:tokens}}{${2:false}}"
+    },
+    "SemantexStrIfEqTF{}{}{}{}": {
+      "snippet": "SemantexStrIfEqTF{${1:string1}}{${2:string2}}{${3:true}}{${4:false}}"
+    },
+    "SemantexStrIfEqT{}{}{}": {
+      "snippet": "SemantexStrIfEqT{${1:string1}}{${2:string2}}{${3:true}}"
+    },
+    "SemantexStrIfEqF{}{}{}": {
+      "snippet": "SemantexStrIfEqF{${1:string1}}{${2:string2}}{${3:false}}"
+    },
+    "SemantexERROR{}": {
+      "snippet": "SemantexERROR{${1:error message}}"
+    },
+    "SemantexERRORKeyValueNotFound{}{}": {
+      "snippet": "SemantexERRORKeyValueNotFound{${1:key}}{${2:value}}"
+    },
+    "SemantexERRORArgKeyValueNotFound{}{}": {
+      "snippet": "SemantexERRORArgKeyValueNotFound{${1:key}}{${2:value}}"
+    },
+    "SemantexExpNot{}": {
+      "snippet": "SemantexExpNot{${1:value}}"
+    },
+    "RecordSemantexDelimiterSize": {},
+    "SemantexDelimiterSizeNoRecord": {},
+    "SemantexMathCloseAuto{}": {
+      "snippet": "SemantexMathCloseAuto{${1:arg1}}"
+    },
+    "SemantexMathCloseNoPar": {},
+    "SemantexMathClose{}": {
+      "snippet": "SemantexMathClose{${1:arg1}}"
+    },
+    "SemantexMathOpenAuto{}": {
+      "snippet": "SemantexMathOpenAuto{${1:arg1}}"
+    },
+    "SemantexMathOpenNoPar": {},
+    "SemantexMathOpen{}": {
+      "snippet": "SemantexMathOpen{${1:arg1}}"
+    },
+    "SemantexVersion": {},
+    "SemantexAddToRecordedSource": {},
+    "SemantexRecordOutput": {},
+    "SemantexID{}": {
+      "snippet": "SemantexID{${1:id}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "define keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
+      "define keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
+      "append keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
+      "append keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
+      "prepend keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
+      "prepend keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
+      "remove key=${1:key name}",
+      "remove key[${1:args}]=${2:key name}",
+      "define arg keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
+      "define arg keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
+      "append arg keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
+      "append arg keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
+      "prepend arg keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
+      "prepend arg keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
+      "remove arg key=${1:key name}",
+      "remove arg key[${1:args}]=${2:key name}",
+      "execute={${1:TeX code}}",
+      "set keys={${1:keyvals}}",
+      "set keys x={${1:keyvals}}",
+      "data provide={${1:data}}",
+      "data set={${1:data}}{${2:value}}",
+      "data set x={${1:data}}{${2:value}}",
+      "data put left={${1:data}}{${2:value}}",
+      "data put left x={${1:data}}{${2:value}}",
+      "data put right={${1:data}}{${2:value}}",
+      "data put right x={${1:data}}{${2:value}}",
+      "data clear={${1:data}}{${2:value}}",
+      "bool provide={${1:boolean}}",
+      "bool set true={${1:boolean}}",
+      "bool set false={${1:boolean}}",
+      "bool if TF={${1:boolean}}{${2:true}}{${3:false}}",
+      "bool if T={${1:boolean}}{${2:true}}",
+      "bool if F={${1:boolean}}{${2:false}}",
+      "int provide={${1:integer}}",
+      "int set={${1:integer}}{${2:value}}",
+      "int incr={${1:integer}}",
+      "int if eq TF={${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}",
+      "int if eq T={${1:integer1}}{${2:integer2}}{${3:true}}",
+      "int if eq F={${1:integer1}}{${2:integer2}}{${3:false}}",
+      "int if greater TF={${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}",
+      "int if greater T={${1:integer1}}{${2:integer2}}{${3:true}}",
+      "int if greater F={${1:integer1}}{${2:integer2}}{${3:false}}",
+      "int if less TF={${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}",
+      "int if less T={${1:integer1}}{${2:integer2}}{${3:true}}",
+      "int if less F={${1:integer1}}{${2:integer2}}{${3:false}}",
+      "int clear={${1:integer}}",
+      "if blank TF={${1:tokens}}{${2:true}}{${3:false}}",
+      "if blank T={${1:tokens}}{${2:true}}",
+      "if blank F={${1:tokens}}{${2:false}}",
+      "string if eq TF={${1:string1}}{${2:string2}}{${3:true}}{${4:false}}",
+      "string if eq T={${1:string1}}{${2:string2}}{${3:true}}",
+      "string if eq F={${1:string1}}{${2:string2}}{${3:false}}",
+      "ERROR={${1:error message}}",
+      "ERROR key value not found={${1:key}}{${2:value}}",
+      "ERROR arg key value not found={${1:key}}{${2:value}}",
+      "parent=${1:\\Class}",
+      "class=${1:\\Class}",
+      "copy=${1:\\object}",
+      "symbol={${1:value}}",
+      "symbol put left=${1:value}",
+      "symbol put right=${1:value}",
+      "height phantom=${1:value}",
+      "slanting phantom=${1:value}",
+      "grading position=",
+      "command=${1:command}",
+      "clear command",
+      "return",
+      "inner return",
+      "right return",
+      "left return",
+      "left index return",
+      "right index return",
+      "index return",
+      "left arg return",
+      "right arg return",
+      "arg return",
+      "output=${1:\\Class}",
+      "do output",
+      "output options={${1:keys}}",
+      "parse options={${1:keys}}",
+      "parse",
+      "parse code",
+      "math class=${1:command}",
+      "default=${1:value}",
+      "*",
+      "**",
+      "slot",
+      "dots",
+      "* with other sep=${1:separator}",
+      "** with other sep=${1:separator}",
+      "arg=${1:value}",
+      "smash",
+      "prime",
+      "par",
+      "no par",
+      "never par",
+      "use par=",
+      "par size=",
+      "left par=${1:parenthesis}",
+      "right par=${1:parenthesis}",
+      "spar",
+      "spar=",
+      "spar size=",
+      "left spar=${1:parenthesis}",
+      "right spar=${1:parenthesis}",
+      "other spar={${1:left parenthesis}}{${2:right parenthesis}}",
+      "Other spar={${1:left parenthesis}}{${2:right parenthesis}}{${3:normal|auto|*}}",
+      "set arg keys={${1:keyvals}}",
+      "set arg keys x={${1:keyvals}}",
+      "set arg single keys={${1:keyvals}}",
+      "set arg single keys x={${1:keyvals}}",
+      "set one arg single key=${1:key}",
+      "set one arg single key x=${1:key}",
+      "set arg without keyval=${1:value}",
+      "set arg without keyval x=${1:value}",
+      "pre arg=${1:value}",
+      "pre arg put left=${1:value}",
+      "post arg=${1:value}",
+      "post arg put right=${1:value}",
+      "set arg sep=${1:value}",
+      "set arg slot=${1:value}",
+      "set arg dots=${1:value}",
+      "arg keyval=",
+      "arg position=",
+      "next arg with sep",
+      "sep arg=${1:value}",
+      "comma arg=${1:value}",
+      "arg with other sep={${1:separator}}{${2:value}}",
+      "arg dots with other sep=${1:separator}",
+      "arg slot with other sep=${1:separator}",
+      "arg dots",
+      "comma arg dots",
+      "arg slot",
+      "comma arg slot",
+      "clear arg",
+      "clear pre arg",
+      "clear post arg",
+      "upper=${1:value}",
+      "sep upper=${1:value}",
+      "comman upper=${1:value}",
+      "pre upper=${1:value}",
+      "pre upper put left=${1:value}",
+      "post upper=${1:value}",
+      "post upper put right=${1:value}",
+      "upper put left=${1:value}",
+      "set upper sep=${1:value}",
+      "next upper with sep",
+      "upper with other sep={${1:separator}}{${2:value}}",
+      "upper slot",
+      "sep upper slot",
+      "comma upper slot",
+      "set upper slot=${1:value}",
+      "upper slot with other sep=${1:separator}",
+      "upper dots",
+      "sep upper dots",
+      "comma upper dots",
+      "set upper dots=${1:value}",
+      "upper dots with other sep=${1:separator}",
+      "upper *",
+      "upper **",
+      "sep upper *",
+      "sep upper **",
+      "comma upper *",
+      "comma upper **",
+      "upper * with other sep=${1:separator}",
+      "upper ** with other sep=${1:separator}",
+      "clear upper",
+      "clear pre upper",
+      "clear post upper",
+      "lower=${1:value}",
+      "sep lower=${1:value}",
+      "comma lower=${1:value}",
+      "pre lower=${1:value}",
+      "pre lower put left=${1:value}",
+      "post lower=${1:value}",
+      "post lower put right=${1:value}",
+      "lower put left=${1:value}",
+      "set lower sep=${1:value}",
+      "next lower with sep",
+      "lower with other sep={${1:separator}}{${2:value}}",
+      "lower slot",
+      "sep lower slot",
+      "comma lower slot",
+      "set lower slot=${1:value}",
+      "lower slot with other sep=${1:separator}",
+      "lower dots",
+      "sep lower dots",
+      "comma lower dots",
+      "set lower dots=${1:value}",
+      "lower dots with other sep=${1:separator}",
+      "lower *",
+      "lower **",
+      "sep lower *",
+      "sep lower **",
+      "comma lower *",
+      "comma lower **",
+      "lower * with other sep=${1:separator}",
+      "lower ** with other sep=${1:separator}",
+      "clear lower",
+      "clear pre lower",
+      "clear post lower",
+      "upper left=${1:value}",
+      "sep upper left=${1:value}",
+      "comman upper left=${1:value}",
+      "pre upper left=${1:value}",
+      "pre upper left put left=${1:value}",
+      "post upper left=${1:value}",
+      "post upper left put right=${1:value}",
+      "upper left put left=${1:value}",
+      "set upper left sep=${1:value}",
+      "next upper left with sep",
+      "upper left with other sep={${1:separator}}{${2:value}}",
+      "upper left slot",
+      "sep upper left slot",
+      "comma upper left slot",
+      "set upper left slot=${1:value}",
+      "upper left slot with other sep=${1:separator}",
+      "upper left dots",
+      "sep upper left dots",
+      "comma upper left dots",
+      "set upper left dots=${1:value}",
+      "upper left dots with other sep=${1:separator}",
+      "upper left *",
+      "upper left **",
+      "sep upper left *",
+      "sep upper left **",
+      "comma upper left *",
+      "comma upper left **",
+      "upper left * with other sep=${1:separator}",
+      "upper left ** with other sep=${1:separator}",
+      "clear upper left",
+      "clear pre upper left",
+      "clear post upper left",
+      "lower left=${1:value}",
+      "sep lower left=${1:value}",
+      "comman lower left=${1:value}",
+      "pre lower left=${1:value}",
+      "pre lower left put left=${1:value}",
+      "post lower left=${1:value}",
+      "post lower left put right=${1:value}",
+      "lower left put left=${1:value}",
+      "set lower left sep=${1:value}",
+      "next lower left with sep",
+      "lower left with other sep={${1:separator}}{${2:value}}",
+      "lower left slot",
+      "sep lower left slot",
+      "comma lower left slot",
+      "set lower left slot=${1:value}",
+      "lower left slot with other sep=${1:separator}",
+      "lower left dots",
+      "sep lower left dots",
+      "comma lower left dots",
+      "set lower left dots=${1:value}",
+      "lower left dots with other sep=${1:separator}",
+      "lower left *",
+      "lower left **",
+      "sep lower left *",
+      "sep lower left **",
+      "comma lower left *",
+      "comma lower left **",
+      "lower left * with other sep=${1:separator}",
+      "lower left ** with other sep=${1:separator}",
+      "clear lower left",
+      "clear pre lower left",
+      "clear post lower left",
+      "d=${1:value}",
+      "sep d=${1:value}",
+      "comma d=${1:value}",
+      "pre d=${1:value}",
+      "pre d put left=${1:value}",
+      "post d=${1:value}",
+      "post d put left=${1:value}",
+      "d put left=${1:value}",
+      "set d sep=${1:value}",
+      "next d with sep",
+      "d with other sep={${1:separator}}{${2:value}}",
+      "d slot",
+      "sep d slot",
+      "comma d slot",
+      "set d slot=${1:value}",
+      "d slot with other sep=${1:separator}",
+      "d dots",
+      "sep d dots",
+      "comma d dots",
+      "set d dots=${1:value}",
+      "d dots with other sep=${1:separator}",
+      "d *",
+      "d **",
+      "sep d *",
+      "sep d **",
+      "comma d *",
+      "comma d **",
+      "d * with other sep=${1:separator}",
+      "d ** with other sep=${1:separator}",
+      "clear d",
+      "clear pre d",
+      "clear post d",
+      "i=${1:value}",
+      "sep i=${1:value}",
+      "comma i=${1:value}",
+      "pre i=${1:value}",
+      "pre i put left=${1:value}",
+      "post d=${1:value}",
+      "post i put left=${1:value}",
+      "i put left=${1:value}",
+      "set i sep=${1:value}",
+      "next i with sep",
+      "i with other sep={${1:separator}}{${2:value}}",
+      "i slot",
+      "sep i slot",
+      "comma i slot",
+      "set i slot=${1:value}",
+      "i slot with other sep=${1:separator}",
+      "i dots",
+      "sep i dots",
+      "comma i dots",
+      "set i dots=${1:value}",
+      "i dots with other sep=${1:separator}",
+      "i *",
+      "i **",
+      "sep i *",
+      "sep i **",
+      "comma i *",
+      "comma i **",
+      "i * with other sep=${1:separator}",
+      "i ** with other sep=${1:separator}",
+      "clear i",
+      "clear pre i",
+      "clear post i"
+    ],
+    [
+      "keyval parser=${1:command}",
+      "single key parser=${1:command}",
+      "semtex file"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/semantic.json b/dev/packages/semantic.json
new file mode 100644
index 000000000..eba12bb3e
--- /dev/null
+++ b/dev/packages/semantic.json
@@ -0,0 +1,95 @@
+{
+  "includes": {},
+  "macros": {
+    "mathlig{}{}": {
+      "snippet": "mathlig{${1:characters}}{${2:ligature commands}}"
+    },
+    "mathligson": {},
+    "mathligsoff": {},
+    "mathligprotect{}": {
+      "snippet": "mathligprotect{${1:macro}}"
+    },
+    "inference{}{}": {
+      "snippet": "inference{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
+    },
+    "inference[]{}{}": {
+      "snippet": "inference[${3:name}]{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
+    },
+    "inference*{}{}": {
+      "snippet": "inference*{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
+    },
+    "inference*[]{}{}": {
+      "snippet": "inference*[${3:name}]{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
+    },
+    "setpremisesend{}": {
+      "snippet": "setpremisesend{${1:length}}"
+    },
+    "setpremisesspace{}": {
+      "snippet": "setpremisesspace{${1:length}}"
+    },
+    "setnamespace{}": {
+      "snippet": "setnamespace{${1:length}}"
+    },
+    "predicate{}": {
+      "snippet": "predicate{${1:formula}}"
+    },
+    "predicatebegin": {},
+    "predicateend": {},
+    "compiler{}": {
+      "snippet": "compiler{${1:source,${2:machine},target}}"
+    },
+    "interpreter{}": {
+      "snippet": "interpreter{${1:source,language}}"
+    },
+    "program{}": {
+      "snippet": "program{${1:program,language}}"
+    },
+    "machine{}": {
+      "snippet": "machine{${1:machine}}"
+    },
+    "reservestyle{}{}": {
+      "snippet": "reservestyle{${1:macro}}{${2:formatting}}"
+    },
+    "reservestyle[]{}{}": {
+      "snippet": "reservestyle[${3:spacing cmd}]{${1:macro}}{${2:formatting}}"
+    },
+    "<": {
+      "detail": "<",
+      "documentation": "LESS-THAN SIGN r:"
+    },
+    "comp{}{}": {
+      "snippet": "comp{${1:command}}{${2:environment}}"
+    },
+    "eval{}{}": {
+      "snippet": "eval{${1:command}}{${2:environment}}"
+    },
+    "evalsymbol": {},
+    "evalsymbol[]": {
+      "snippet": "evalsymbol[${1:superscript}]"
+    },
+    "compsymbol": {},
+    "compsymbol[]": {
+      "snippet": "compsymbol[${1:superscript}]"
+    },
+    "exe{}{}": {
+      "snippet": "exe{${1:program}}{${2:data}}"
+    },
+    "exe{}[]{}": {
+      "snippet": "exe{${1:program}}[${2:machine}]{${3:data}}"
+    },
+    "TestForConflict{}": {
+      "snippet": "TestForConflict{${1:command list}}"
+    },
+    "semanticDate": {},
+    "semanticVersion": {}
+  },
+  "envs": {},
+  "options": [
+    "ligature",
+    "inference",
+    "tdiagram",
+    "reserved",
+    "shorthand"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/semesterplannerlua.json b/dev/packages/semesterplannerlua.json
new file mode 100644
index 000000000..fc01e7df9
--- /dev/null
+++ b/dev/packages/semesterplannerlua.json
@@ -0,0 +1,99 @@
+{
+  "includes": {
+    "tikz": [],
+    "tikzlibrarycalendar": [],
+    "tikzlibrarypositioning": [],
+    "tikzlibraryshapes.misc": [],
+    "tikzlibrarybackgrounds": [],
+    "pgfkeys": [],
+    "xcolor": [],
+    "fontawesome": [],
+    "luapackageloader": []
+  },
+  "macros": {
+    "lecture": {},
+    "lecture[]": {
+      "snippet": "lecture[${1:options}]"
+    },
+    "seminar": {},
+    "seminar[]": {
+      "snippet": "seminar[${1:options}]"
+    },
+    "tutorial": {},
+    "tutorial[]": {
+      "snippet": "tutorial[${1:options}]"
+    },
+    "meeting": {},
+    "meeting[]": {
+      "snippet": "meeting[${1:options}]"
+    },
+    "officehour": {},
+    "officehour[]": {
+      "snippet": "officehour[${1:options}]"
+    },
+    "laboratory": {},
+    "laboratory[]": {
+      "snippet": "laboratory[${1:options}]"
+    },
+    "fieldstudy": {},
+    "fieldstudy[]": {
+      "snippet": "fieldstudy[${1:options}]"
+    },
+    "printSpCalendar{}{}": {
+      "snippet": "printSpCalendar{${1:start date}}{${2:end date}}"
+    },
+    "printSpCalendar[]{}{}": {
+      "snippet": "printSpCalendar[${3:cols}]{${1:start date}}{${2:end date}}"
+    },
+    "appointment": {},
+    "appointment[]": {
+      "snippet": "appointment[${1:options}]"
+    },
+    "exam": {},
+    "exam[]": {
+      "snippet": "exam[${1:options}]"
+    },
+    "deadline": {},
+    "deadline[]": {
+      "snippet": "deadline[${1:options}]"
+    },
+    "oral": {},
+    "written": {},
+    "pmandatory": {},
+    "phigh": {},
+    "pmid": {},
+    "plow": {},
+    "pnone": {},
+    "teams": {},
+    "zoom": {},
+    "youtube": {},
+    "BBB": {},
+    "tbd": {},
+    "tba": {}
+  },
+  "envs": {
+    "timetable": {},
+    "timetable[]": {
+      "name": "timetable",
+      "snippet": "[${1:options}]"
+    },
+    "appointments{}": {
+      "name": "appointments",
+      "snippet": "{${1:true|false}}"
+    },
+    "appointments[]{}": {
+      "name": "appointments",
+      "snippet": "[${2:header}]{${1:true|false}}"
+    },
+    "exams{}": {
+      "name": "exams",
+      "snippet": "{${1:true|false}}"
+    },
+    "deadlines{}": {
+      "name": "deadlines",
+      "snippet": "{${1:true|false}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/sepfootnotes.json b/dev/packages/sepfootnotes.json
index 65151aec2..13755e0d3 100644
--- a/dev/packages/sepfootnotes.json
+++ b/dev/packages/sepfootnotes.json
@@ -49,7 +49,8 @@
     "quiet",
     "warn",
     "error",
-    "global"
+    "global",
+    "after"
   ],
   "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/sets.json b/dev/packages/sets.json
new file mode 100644
index 000000000..f28c51cef
--- /dev/null
+++ b/dev/packages/sets.json
@@ -0,0 +1,35 @@
+{
+  "includes": {},
+  "macros": {
+    "newset{}{}": {
+      "snippet": "newset{${1:set}}{${2:elmt1|elmt2|...}}"
+    },
+    "newsetsimple{}{}": {
+      "snippet": "newsetsimple{${1:set}}{${2:elmt1|elmt2|...}}"
+    },
+    "listset{}": {
+      "snippet": "listset{${1:set}}"
+    },
+    "setseparator": {},
+    "is": {},
+    "iselementofset{}{}": {
+      "snippet": "iselementofset{${1:element}}{${2:set}}"
+    },
+    "to{}": {
+      "snippet": "to{${1:cmd}}"
+    },
+    "minus": {
+      "detail": "−",
+      "documentation": "MINUS SIGN"
+    },
+    "sortset{}{}": {
+      "snippet": "sortset{${1:set1}}{${2:set2}}"
+    },
+    "deleteduplicates{}{}": {
+      "snippet": "deleteduplicates{${1:set1}}{${2:set2}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/setspace.json b/dev/packages/setspace.json
new file mode 100644
index 000000000..f14880b84
--- /dev/null
+++ b/dev/packages/setspace.json
@@ -0,0 +1,35 @@
+{
+  "includes": {},
+  "macros": {
+    "singlespacing": {},
+    "onehalfspacing": {},
+    "doublespacing": {},
+    "SetSinglespace{}": {
+      "snippet": "SetSinglespace{${1:factor}}"
+    },
+    "setstretch{}": {
+      "snippet": "setstretch{${1:factor}}"
+    },
+    "displayskipstretch": {},
+    "setdisplayskipstretch{}": {
+      "snippet": "setdisplayskipstretch{${1:factor}}"
+    }
+  },
+  "envs": {
+    "singlespace": {},
+    "singlespace*": {},
+    "doublespace": {},
+    "onehalfspace": {},
+    "spacing{}": {
+      "name": "spacing",
+      "snippet": "{${1:factor}}"
+    }
+  },
+  "options": [
+    "nodisplayskipstretch",
+    "singlespacing",
+    "onehalfspacing",
+    "doublespacing"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/sf298.json b/dev/packages/sf298.json
index cd095a465..ad1454476 100644
--- a/dev/packages/sf298.json
+++ b/dev/packages/sf298.json
@@ -15,7 +15,7 @@
       "snippet": "AbstractLimitation{${1:type}}"
     },
     "Acronyms{}": {
-      "snippet": "Acronyms{${1:acro1,acro2,...}}"
+      "snippet": "Acronyms{${1:acro1,${2:acro2},...}}"
     },
     "Author{}": {
       "snippet": "Author{${1:names}}"
diff --git a/dev/packages/shadow.json b/dev/packages/shadow.json
new file mode 100644
index 000000000..cdfa0bafd
--- /dev/null
+++ b/dev/packages/shadow.json
@@ -0,0 +1,14 @@
+{
+  "includes": {},
+  "macros": {
+    "shabox{}": {
+      "snippet": "shabox{${1:text}}"
+    },
+    "sboxrule": {},
+    "sboxsep": {},
+    "sdim": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/shadowtext.json b/dev/packages/shadowtext.json
new file mode 100644
index 000000000..1e49b5ccc
--- /dev/null
+++ b/dev/packages/shadowtext.json
@@ -0,0 +1,28 @@
+{
+  "includes": {
+    "color": []
+  },
+  "macros": {
+    "shadowtext{}": {
+      "snippet": "shadowtext{${1:text}}"
+    },
+    "shadowoffset{}": {
+      "snippet": "shadowoffset{${1:dimen}}"
+    },
+    "shadowoffsetx{}": {
+      "snippet": "shadowoffsetx{${1:dimen}}"
+    },
+    "shadowoffsety{}": {
+      "snippet": "shadowoffsety{${1:dimen}}"
+    },
+    "shadowcolor{}": {
+      "snippet": "shadowcolor{${1:color}}"
+    },
+    "shadowrgb{}": {
+      "snippet": "shadowrgb{${1:r,${2:g},b}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/shapepar.json b/dev/packages/shapepar.json
index 41650c551..60dbedbbc 100644
--- a/dev/packages/shapepar.json
+++ b/dev/packages/shapepar.json
@@ -13,6 +13,9 @@
     "Shapepar[]{}": {
       "snippet": "Shapepar[${2:scale len}]{${1:shape spec}}"
     },
+    "cutout{}()": {
+      "snippet": "cutout{${1:side}}(${2:hoffset},${3:voffset})"
+    },
     "squareshape": {},
     "squarepar": {},
     "circleshape": {},
diff --git a/dev/packages/sidebars.json b/dev/packages/sidebars.json
index fa4c9432a..4e021e2f0 100644
--- a/dev/packages/sidebars.json
+++ b/dev/packages/sidebars.json
@@ -2,19 +2,19 @@
   "includes": {},
   "macros": {
     "backgroundcolor{}": {
-      "snippet": "backgroundcolor{${1:r,g,b}}"
+      "snippet": "backgroundcolor{${1:r,${2:g},b}}"
     },
     "sidebarcolor{}": {
-      "snippet": "sidebarcolor{${1:r,g,b}}"
+      "snippet": "sidebarcolor{${1:r,${2:g},b}}"
     },
     "highlightcolor{}": {
-      "snippet": "highlightcolor{${1:r,g,b}}"
+      "snippet": "highlightcolor{${1:r,${2:g},b}}"
     },
     "titlecolor{}": {
-      "snippet": "titlecolor{${1:r,g,b}}"
+      "snippet": "titlecolor{${1:r,${2:g},b}}"
     },
     "sidebartitlecolor{}": {
-      "snippet": "sidebartitlecolor{${1:r,g,b}}"
+      "snippet": "sidebartitlecolor{${1:r,${2:g},b}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/sidenotesplus.json b/dev/packages/sidenotesplus.json
index a0e7a94b6..ddcd0ca5f 100644
--- a/dev/packages/sidenotesplus.json
+++ b/dev/packages/sidenotesplus.json
@@ -33,7 +33,13 @@
       "snippet": "sidenotetextbefore*{${1:content}}"
     },
     "sidenotemark": {},
+    "sidenotemark()": {
+      "snippet": "sidenotemark(${1:mark})"
+    },
     "sidenotemark*": {},
+    "sidenotemark*()": {
+      "snippet": "sidenotemark*(${1:mark})"
+    },
     "sidealert{}": {
       "snippet": "sidealert{${1:content}}"
     },
diff --git a/dev/packages/simplekv.json b/dev/packages/simplekv.json
index ceacef524..21f07f3fc 100644
--- a/dev/packages/simplekv.json
+++ b/dev/packages/simplekv.json
@@ -2,10 +2,10 @@
   "includes": {},
   "macros": {
     "setKV[]{}": {
-      "snippet": "setKV[${2:keygroup name}]{${1:key1=val1,key2=val2,...}}"
+      "snippet": "setKV[${2:keygroup name}]{${1:key1=val1,${3:key2=val2},...}}"
     },
     "setKVdefault[]{}": {
-      "snippet": "setKVdefault[${2:keygroup name}]{${1:key1=val1,key2=val2,...}}"
+      "snippet": "setKVdefault[${2:keygroup name}]{${1:key1=val1,${3:key2=val2},...}}"
     },
     "useKV[]{}": {
       "snippet": "useKV[${2:keygroup}]{${1:key}}"
@@ -23,7 +23,7 @@
       "snippet": "showKV[${2:keygroup}]{${1:key}}"
     },
     "defKV[]{}": {
-      "snippet": "defKV[${2:keygroup}]{${1:key1=code1,key2=code2,...}}"
+      "snippet": "defKV[${2:keygroup}]{${1:key1=code1,${3:key2=code2},...}}"
     },
     "testboolKV{}{}{}": {
       "snippet": "testboolKV{${1:arg}}{${2:true code}}{${3:false code}}"
diff --git a/dev/packages/simplenodes.json b/dev/packages/simplenodes.json
index ab0e229c7..c652fda43 100644
--- a/dev/packages/simplenodes.json
+++ b/dev/packages/simplenodes.json
@@ -22,7 +22,7 @@
       "snippet": "link{${1:name1}}{${2:name2}}"
     },
     "gettikzxy{}{}{}": {
-      "snippet": "gettikzxy{${1:(${4:x,y})}}{${2:xcmd}}{${3:ycmd}}"
+      "snippet": "gettikzxy{${1:(${4:x},${5:y})}}{${2:xcmd}}{${3:ycmd}}"
     },
     "mynode{}{}": {
       "snippet": "mynode{${1:draw color}}{${2:fill color}}"
diff --git a/dev/packages/simpleoptics.json b/dev/packages/simpleoptics.json
index 14216bfb1..0cdbcf334 100644
--- a/dev/packages/simpleoptics.json
+++ b/dev/packages/simpleoptics.json
@@ -34,7 +34,7 @@
       "snippet": "lens{${1:x}}{${2:y}}{${3:focal length}}{${4:height}}{${5:thickness}}"
     },
     "straightline{}{}": {
-      "snippet": "straightline{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "straightline{${1:x1,${3:y1}}{${2:x2},y2}}"
     },
     "mirrorX": {},
     "mirrorY": {},
diff --git a/dev/packages/simples-matrices.json b/dev/packages/simples-matrices.json
index 686af770f..60066a9d8 100644
--- a/dev/packages/simples-matrices.json
+++ b/dev/packages/simples-matrices.json
@@ -21,6 +21,18 @@
     "matrice<>[]{}": {
       "snippet": "matrice<${3:keyvals}>[${2:type}]{${1:clist of coefficients}}"
     },
+    "matrice(){}": {
+      "snippet": "matrice(${2:prefix}){${1:clist of coefficients}}"
+    },
+    "matrice()[]{}": {
+      "snippet": "matrice(${3:prefix})[${2:type}]{${1:clist of coefficients}}"
+    },
+    "matrice()<>{}": {
+      "snippet": "matrice(${3:prefix})<${2:keyvals}>{${1:clist of coefficients}}"
+    },
+    "matrice()<>[]{}": {
+      "snippet": "matrice(${4:prefix})<${3:keyvals}>[${2:type}]{${1:clist of coefficients}}"
+    },
     "declarermatrice{}{}": {
       "snippet": "declarermatrice{${1:matrix name}}{${2:clist of coefficients}}"
     },
@@ -33,6 +45,18 @@
     "declarermatrice<>{}[]{}": {
       "snippet": "declarermatrice<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
     },
+    "declarermatrice(){}{}": {
+      "snippet": "declarermatrice(${3:prefix}){${1:matrix name}}{${2:clist of coefficients}}"
+    },
+    "declarermatrice(){}[]{}": {
+      "snippet": "declarermatrice(${4:prefix}){${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
+    },
+    "declarermatrice()<>{}{}": {
+      "snippet": "declarermatrice(${4:prefix})<${3:keyvals}>{${1:matrix name}}{${2:clist of coefficients}}"
+    },
+    "declarermatrice()<>{}[]{}": {
+      "snippet": "declarermatrice(${5:prefix})<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
+    },
     "declarermatrice*{}{}": {
       "snippet": "declarermatrice*{${1:matrix name}}{${2:clist of coefficients}}"
     },
@@ -45,12 +69,30 @@
     "declarermatrice*<>{}[]{}": {
       "snippet": "declarermatrice*<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
     },
+    "declarermatrice*(){}{}": {
+      "snippet": "declarermatrice*(${3:prefix}){${1:matrix name}}{${2:clist of coefficients}}"
+    },
+    "declarermatrice*(){}[]{}": {
+      "snippet": "declarermatrice*(${4:prefix}){${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
+    },
+    "declarermatrice*()<>{}{}": {
+      "snippet": "declarermatrice*(${4:prefix})<${3:keyvals}>{${1:matrix name}}{${2:clist of coefficients}}"
+    },
+    "declarermatrice*()<>{}[]{}": {
+      "snippet": "declarermatrice*(${5:prefix})<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
+    },
     "lamatrice{}": {
       "snippet": "lamatrice{${1:matrix name}}"
     },
     "lamatrice<>{}": {
       "snippet": "lamatrice<${2:keyvals}>{${1:matrix name}}"
     },
+    "lamatrice(){}": {
+      "snippet": "lamatrice(${2:prefix}){${1:matrix name}}"
+    },
+    "lamatrice()<>{}": {
+      "snippet": "lamatrice(${3:prefix})<${2:keyvals}>{${1:matrix name}}"
+    },
     "MatriceInterieur": {},
     "LaMatriceInterieur{}": {
       "snippet": "LaMatriceInterieur{${1:matrix name}}"
@@ -67,6 +109,18 @@
     "matid<>[]{}": {
       "snippet": "matid<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
     },
+    "matid(){}": {
+      "snippet": "matid(${2:prefix}){${1:number of columns}}"
+    },
+    "matid()[]{}": {
+      "snippet": "matid(${3:prefix})[${2:coefficient}]{${1:number of columns}}"
+    },
+    "matid()<>{}": {
+      "snippet": "matid(${3:prefix})<${2:keyvals}>{${1:number of columns}}"
+    },
+    "matid()<>[]{}": {
+      "snippet": "matid(${4:prefix})<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
+    },
     "matnulle{}": {
       "snippet": "matnulle{${1:number of columns}}"
     },
@@ -78,6 +132,18 @@
     },
     "matnulle<>[]{}": {
       "snippet": "matnulle<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
+    },
+    "matnulle(){}": {
+      "snippet": "matnulle(${2:prefix}){${1:number of columns}}"
+    },
+    "matnulle()[]{}": {
+      "snippet": "matnulle(${3:prefix})[${2:coefficient}]{${1:number of columns}}"
+    },
+    "matnulle()<>{}": {
+      "snippet": "matnulle(${3:prefix})<${2:keyvals}>{${1:number of columns}}"
+    },
+    "matnulle()<>[]{}": {
+      "snippet": "matnulle(${4:prefix})<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/siunitx.json b/dev/packages/siunitx.json
new file mode 100644
index 000000000..7cb39ca59
--- /dev/null
+++ b/dev/packages/siunitx.json
@@ -0,0 +1,2747 @@
+{
+  "includes": {
+    "translations": [],
+    "amstext": [],
+    "color": [],
+    "array": [],
+    "xspace": [
+      "use-xspace"
+    ]
+  },
+  "macros": {
+    "A": {
+      "detail": "𝐴",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
+    },
+    "ampere": {},
+    "amu": {},
+    "ang[]{}": {
+      "snippet": "ang[${2:options}]{${1:angle}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ang{}": {
+      "snippet": "ang{${1:angle}}"
+    },
+    "arcminute": {},
+    "arcsecond": {},
+    "as": {},
+    "astronomicalunit": {},
+    "atto": {},
+    "becquerel": {},
+    "bel": {},
+    "bit": {},
+    "byte": {},
+    "C": {
+      "detail": "𝐶",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL C"
+    },
+    "candela": {},
+    "centi": {},
+    "cm": {},
+    "complexnum{}": {
+      "snippet": "complexnum{${1:number}}"
+    },
+    "complexnum[]{}": {
+      "snippet": "complexnum[${2:options}]{${1:number}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "complexqty{}{}": {
+      "snippet": "complexqty{${1:number}}{${2:unit}}"
+    },
+    "complexqty[]{}{}": {
+      "snippet": "complexqty[${3:options}]{${1:number}}{${2:unit}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "coulomb": {},
+    "cubed": {},
+    "cubic": {},
+    "dalton": {},
+    "dB": {},
+    "deca": {},
+    "deci": {},
+    "decibel": {},
+    "DeclareSIPower{}{}{}": {
+      "snippet": "DeclareSIPower{${1:symbol-before}}{${2:symbol-after}}{${3:power}}"
+    },
+    "DeclareSIPrefix{}{}{}": {
+      "snippet": "DeclareSIPrefix{${1:prefix macro}}{${2:symbol}}{${3:power of 10}}"
+    },
+    "DeclareSIQualifier{}{}": {
+      "snippet": "DeclareSIQualifier{${1:qualifier}}{${2:symbol}}"
+    },
+    "DeclareSIUnit[]{}{}": {
+      "snippet": "DeclareSIUnit[${3:options}]{${1:unit}}{${2:definition}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "DeclareSIUnit{}{}": {
+      "snippet": "DeclareSIUnit{${1:unit}}{${2:definition}}"
+    },
+    "degreeCelsius": {},
+    "degree": {},
+    "deka": {},
+    "dm": {},
+    "electronvolt": {},
+    "eV": {},
+    "exa": {},
+    "exbi": {},
+    "F": {
+      "detail": "𝐹",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL F"
+    },
+    "farad": {},
+    "femto": {},
+    "fF": {},
+    "fg": {},
+    "fH": {},
+    "fmol": {},
+    "fs": {},
+    "g": {
+      "detail": "𝑔",
+      "documentation": "MATHEMATICAL ITALIC SMALL G"
+    },
+    "GeV": {},
+    "GHz": {},
+    "gibi": {},
+    "giga": {},
+    "GPa": {},
+    "gram": {},
+    "gray": {},
+    "GW": {},
+    "hectare": {},
+    "hecto": {},
+    "henry": {},
+    "hertz": {},
+    "highlight": {},
+    "hL": {},
+    "hl": {},
+    "hour": {},
+    "Hz": {},
+    "J": {
+      "detail": "𝐽",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL J"
+    },
+    "joule": {},
+    "K": {
+      "detail": "𝐾",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL K"
+    },
+    "kA": {},
+    "katal": {},
+    "kelvin": {},
+    "keV": {},
+    "kg": {},
+    "kHz": {},
+    "kibi": {},
+    "kilo": {},
+    "kilogram": {},
+    "kJ": {},
+    "km": {},
+    "kmol": {},
+    "kN": {},
+    "kohm": {},
+    "kPa": {},
+    "kV": {},
+    "kW": {},
+    "kWh": {},
+    "L": {
+      "detail": "𝐿",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL L"
+    },
+    "l": {
+      "detail": "𝑙",
+      "documentation": "MATHEMATICAL ITALIC SMALL L"
+    },
+    "liter": {},
+    "litre": {},
+    "lumen": {},
+    "lux": {},
+    "m": {
+      "detail": "𝑚",
+      "documentation": "MATHEMATICAL ITALIC SMALL M"
+    },
+    "mA": {},
+    "mC": {},
+    "mebi": {},
+    "mega": {},
+    "meter": {},
+    "metre": {},
+    "MeV": {},
+    "meV": {},
+    "mF": {},
+    "mg": {},
+    "mH": {},
+    "MHz": {},
+    "mHz": {},
+    "micro": {},
+    "milli": {},
+    "minute": {},
+    "mJ": {},
+    "mL": {},
+    "ml": {},
+    "mm": {},
+    "mmol": {},
+    "MN": {},
+    "mN": {},
+    "Mohm": {},
+    "mohm": {},
+    "mol": {},
+    "mole": {},
+    "mp": {
+      "detail": "∓",
+      "documentation": "MINUS-OR-PLUS SIGN"
+    },
+    "MPa": {},
+    "ms": {},
+    "mT": {},
+    "mV": {},
+    "MW": {},
+    "mW": {},
+    "N": {
+      "detail": "𝑁",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL N"
+    },
+    "nA": {},
+    "nano": {},
+    "nC": {},
+    "neper": {},
+    "newton": {},
+    "nF": {},
+    "ng": {},
+    "nm": {},
+    "nmol": {},
+    "ns": {},
+    "num[]{}": {
+      "snippet": "num[${2:options}]{${1:number}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "num{}": {
+      "snippet": "num{${1:number}}"
+    },
+    "numlist[]{}": {
+      "snippet": "numlist[${2:options}]{${1:numbers}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "numlist{}": {
+      "snippet": "numlist{${1:numbers}}"
+    },
+    "numproduct[]{}": {
+      "snippet": "numproduct[${2:options}]{${1:numbers}}",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "numproduct{}": {
+      "snippet": "numproduct{${1:numbers}}"
+    },
+    "numrange[]{}{}": {
+      "snippet": "numrange[${3:options}]{${1:number1}}{${2:number2}}",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "numrange{}{}": {
+      "snippet": "numrange{${1:number1}}{${2:number2}}"
+    },
+    "nV": {},
+    "nW": {},
+    "of{}": {
+      "snippet": "of{${1:text}}"
+    },
+    "ohm": {},
+    "Pa": {},
+    "pA": {},
+    "pascal": {},
+    "pebi": {},
+    "per": {},
+    "percent": {
+      "detail": "%",
+      "documentation": "PERCENT SIGN"
+    },
+    "peta": {},
+    "pF": {},
+    "pg": {},
+    "pH": {},
+    "pico": {},
+    "pmol": {},
+    "ps": {},
+    "pV": {},
+    "qty[]{}{}": {
+      "snippet": "qty[${3:options}]{${1:number}}{${2:unit}}",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "qty{}{}": {
+      "snippet": "qty{${1:number}}{${2:unit}}"
+    },
+    "qtylist[]{}{}": {
+      "snippet": "qtylist[${3:options}]{${1:numbers}}{${2:unit}}",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "qtylist{}{}": {
+      "snippet": "qtylist{${1:numbers}}{${2:unit}}"
+    },
+    "qtyproduct[]{}{}": {
+      "snippet": "qtyproduct[${3:options}]{${1:numbers}}{${2:unit}}",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "qtyproduct{}{}": {
+      "snippet": "qtyproduct{${1:numbers}}{${2:unit}}"
+    },
+    "qtyrange[]{}{}{}": {
+      "snippet": "qtyrange[${4:options}]{${1:number1}}{${2:number2}}{${3:unit}}",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "qtyrange{}{}{}": {
+      "snippet": "qtyrange{${1:number1}}{${2:number2}}{${3:unit}}"
+    },
+    "quecto": {},
+    "quetta": {},
+    "radian": {},
+    "raiseto{}": {
+      "snippet": "raiseto{${1:power}}"
+    },
+    "ronna": {},
+    "ronto": {},
+    "s": {
+      "detail": "𝑠",
+      "documentation": "MATHEMATICAL ITALIC SMALL S"
+    },
+    "second": {
+      "detail": "″",
+      "documentation": "DOUBLE PRIME or second, not superscripted"
+    },
+    "siemens": {},
+    "sievert": {},
+    "sisetup{}": {
+      "snippet": "sisetup{${1:options}}",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "square": {
+      "detail": "⬜",
+      "documentation": "WHITE LARGE SQUARE"
+    },
+    "squared": {},
+    "steradian": {},
+    "T": {
+      "detail": "𝑇",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL T"
+    },
+    "tablenum{}": {
+      "snippet": "tablenum{${1:number}}"
+    },
+    "tablenum[]{}": {
+      "snippet": "tablenum[${2:options}]{${1:number}}",
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "tebi": {},
+    "tera": {},
+    "tesla": {},
+    "TeV": {},
+    "THz": {},
+    "tonne": {},
+    "tothe{}": {
+      "snippet": "tothe{${1:power}}"
+    },
+    "uA": {},
+    "uC": {},
+    "uF": {},
+    "ug": {},
+    "uH": {},
+    "uJ": {},
+    "uL": {},
+    "ul": {},
+    "um": {},
+    "umol": {},
+    "unit[]{}": {
+      "snippet": "unit[${2:options}]{${1:unit}}",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "unit{}": {
+      "snippet": "unit{${1:unit}}"
+    },
+    "us": {},
+    "uT": {},
+    "uV": {},
+    "uW": {},
+    "V": {
+      "detail": "𝑉",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL V"
+    },
+    "volt": {},
+    "W": {
+      "detail": "𝑊",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL W"
+    },
+    "watt": {},
+    "weber": {},
+    "yobi": {},
+    "yocto": {},
+    "yotta": {},
+    "zebi": {},
+    "zepto": {},
+    "zetta": {},
+    "angstrom": {},
+    "atomicmassunit": {},
+    "bar": {
+      "detail": " ̄",
+      "documentation": "macron"
+    },
+    "barn": {},
+    "bohr": {},
+    "celsius": {},
+    "clight": {},
+    "DeclareBinaryPrefix{}{}{}": {
+      "snippet": "DeclareBinaryPrefix{${1:prefix macro}}{${2:symbol}}{${3:power of 2}}"
+    },
+    "DeclareSIPostPower{}{}": {
+      "snippet": "DeclareSIPostPower{${1:power macro}}{${2:number}}"
+    },
+    "DeclareSIPrePower{}{}": {
+      "snippet": "DeclareSIPrePower{${1:power macro}}{${2:number}}"
+    },
+    "electronmass": {},
+    "elementarycharge": {},
+    "hartree": {},
+    "knot": {},
+    "mmHg": {},
+    "nauticalmile": {},
+    "planckbar": {},
+    "SendSettingsToPgf": {},
+    "SI[]{}[]{}": {
+      "snippet": "SI[${3:options}]{${1:value}}[${4:pre-unit}]{${2:unit commands}}",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "SI[]{}{}": {
+      "snippet": "SI[${3:options}]{${1:value}}{${2:unit commands}}",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "SI{}[]{}": {
+      "snippet": "SI{${1:value}}[${2:pre-unit}]{${3:unit commands}}"
+    },
+    "SI{}{}": {
+      "snippet": "SI{${1:value}}{${2:unit commands}}"
+    },
+    "si[]{}": {
+      "snippet": "si[${2:options}]{${1:unit}}",
+      "keyvalindex": 15,
+      "keyvalpos": 0
+    },
+    "si{}": {
+      "snippet": "si{${1:unit}}"
+    },
+    "SIlist{}{}": {
+      "snippet": "SIlist{${1:values}}{${2:unit commands}}"
+    },
+    "SIlist[]{}{}": {
+      "snippet": "SIlist[${3:options}]{${1:values}}{${2:unit commands}}",
+      "keyvalindex": 16,
+      "keyvalpos": 0
+    },
+    "SIrange{}{}{}": {
+      "snippet": "SIrange{${1:value1}}{${2:value2}}{${3:unit commands}}"
+    },
+    "SIrange[]{}{}{}": {
+      "snippet": "SIrange[${4:options}]{${1:value1}}{${2:value2}}{${3:unit commands}}",
+      "keyvalindex": 17,
+      "keyvalpos": 0
+    },
+    "SIUnitSymbolAngstrom": {},
+    "SIUnitSymbolArcminute": {},
+    "SIUnitSymbolArcsecond": {},
+    "SIUnitSymbolCelsius": {},
+    "SIUnitSymbolDegree": {},
+    "SIUnitSymbolMicro": {},
+    "SIUnitSymbolOhm": {},
+    "ll": {
+      "detail": "≪",
+      "documentation": "much less type 2"
+    },
+    "gg": {
+      "detail": "≫",
+      "documentation": "much greater type 2"
+    },
+    "le": {
+      "detail": "≤",
+      "documentation": "r: less-than-or-equal"
+    },
+    "ge": {
+      "detail": "≥",
+      "documentation": "r: greater-than-or-equal"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "angle-mode=",
+      "angle-symbol-degree=${1:symbol}",
+      "angle-symbol-minute=${1:symbol}",
+      "angle-symbol-over-decimal",
+      "angle-symbol-second=${1:symbol}",
+      "angle-separator=${1:separator}",
+      "fill-angle-degrees",
+      "fill-angle-minutes",
+      "fill-angle-seconds",
+      "number-angle-product=${1:separator}",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "unit-math-rm=",
+      "unit-math-sf=",
+      "unit-math-tt=",
+      "unit-text-rm=",
+      "unit-text-sf=",
+      "unit-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "add-arc-degree-zero",
+      "add-arc-minute-zero",
+      "add-arc-second-zero",
+      "arc-separator=",
+      "math-arcminute=",
+      "math-arcsecond=",
+      "math-degree=",
+      "redefine-symbols",
+      "text-arcminute=",
+      "text-arcsecond=",
+      "text-degree="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "complex-angle-unit=",
+      "complex-mode=",
+      "complex-root-position=",
+      "complex-symbol-angle=${1:symbol}",
+      "complex-symbol-degree=${1:symbol}",
+      "input-complex-root=${1:tokens}",
+      "output-complex-root=${1:symbol}",
+      "print-complex-unity",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "unit-math-rm=",
+      "unit-math-sf=",
+      "unit-math-tt=",
+      "unit-text-rm=",
+      "unit-text-sf=",
+      "unit-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "fraction-function=",
+      "input-product=",
+      "input-quotient=",
+      "output-product=",
+      "output-quotient=",
+      "quotient-mode=",
+      "literal-superscript-as-power",
+      "power-font=",
+      "prefixes-as-symbols",
+      "allow-number-unit-breaks",
+      "exponent-to-prefix",
+      "number-unit-product=",
+      "multi-part-units=",
+      "table-align-text-pre",
+      "table-align-text-post",
+      "table-comparator",
+      "table-figures-decimal=",
+      "table-figures-exponent=",
+      "table-figures-integer=",
+      "table-figures-uncertainty=",
+      "table-parse-only",
+      "table-omit-exponent",
+      "table-space-text-pre=",
+      "table-space-text-post=",
+      "table-sign-exponent",
+      "table-sign-mantissa",
+      "table-unit-alignment=",
+      "math-angstrom=",
+      "math-celsius=",
+      "math-micro=",
+      "math-ohm=",
+      "text-angstrom=",
+      "text-celsius=",
+      "text-micro=",
+      "text-ohm=",
+      "math-arcminute=",
+      "math-arcsecond=",
+      "math-degree=",
+      "redefine-symbols",
+      "text-arcminute=",
+      "text-arcsecond=",
+      "text-degree="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "fraction-function=",
+      "input-product=",
+      "input-quotient=",
+      "output-product=",
+      "output-quotient=",
+      "quotient-mode="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "list-close-bracket=${1:symbol}",
+      "list-exponents=",
+      "list-final-separator=${1:separator}",
+      "list-independent-prefix",
+      "list-open-bracket=${1:symbol}",
+      "list-pair-separator=${1:separator}",
+      "list-separator=${1:separator}",
+      "list-units=",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "fraction-function=",
+      "input-product=",
+      "input-quotient=",
+      "output-product=",
+      "output-quotient=",
+      "quotient-mode="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "product-close-bracket=${1:symbol}",
+      "product-exponents=",
+      "product-independent-prefix",
+      "product-mode=",
+      "product-open-bracket=${1:symbol}",
+      "product-phrase=${1:text}",
+      "product-symbol=${1:symbol}",
+      "product-units=",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "range-close-bracket=${1:symbol}",
+      "range-exponents=",
+      "range-independent-prefix",
+      "range-open-bracket=${1:symbol}",
+      "range-open-phrase=${1:symbol}",
+      "range-phrase=${1:text}",
+      "range-units=",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "list-close-bracket=${1:symbol}",
+      "list-exponents=",
+      "list-final-separator=${1:separator}",
+      "list-independent-prefix",
+      "list-open-bracket=${1:symbol}",
+      "list-pair-separator=${1:separator}",
+      "list-separator=${1:separator}",
+      "list-units=",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "product-close-bracket=${1:symbol}",
+      "product-exponents=",
+      "product-independent-prefix",
+      "product-mode=",
+      "product-open-bracket=${1:symbol}",
+      "product-phrase=${1:text}",
+      "product-symbol=${1:symbol}",
+      "product-units=",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "range-close-bracket=${1:symbol}",
+      "range-exponents=",
+      "range-independent-prefix",
+      "range-open-bracket=${1:symbol}",
+      "range-open-phrase=${1:symbol}",
+      "range-phrase=${1:text}",
+      "range-units=",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "list-close-bracket=${1:symbol}",
+      "list-exponents=",
+      "list-final-separator=${1:separator}",
+      "list-independent-prefix",
+      "list-open-bracket=${1:symbol}",
+      "list-pair-separator=${1:separator}",
+      "list-separator=${1:separator}",
+      "list-units=",
+      "product-close-bracket=${1:symbol}",
+      "product-exponents=",
+      "product-independent-prefix",
+      "product-mode=",
+      "product-open-bracket=${1:symbol}",
+      "product-phrase=${1:text}",
+      "product-symbol=${1:symbol}",
+      "product-units=",
+      "range-close-bracket=${1:symbol}",
+      "range-exponents=",
+      "range-independent-prefix",
+      "range-open-bracket=${1:symbol}",
+      "range-open-phrase=${1:symbol}",
+      "range-phrase=${1:text}",
+      "range-units=",
+      "complex-angle-unit=",
+      "complex-mode=",
+      "complex-root-position=",
+      "complex-symbol-angle=${1:symbol}",
+      "complex-symbol-degree=${1:symbol}",
+      "input-complex-root=${1:tokens}",
+      "output-complex-root=${1:symbol}",
+      "print-complex-unity",
+      "angle-mode=",
+      "angle-symbol-degree=${1:symbol}",
+      "angle-symbol-minute=${1:symbol}",
+      "angle-symbol-over-decimal",
+      "angle-symbol-second=${1:symbol}",
+      "angle-separator=${1:separator}",
+      "fill-angle-degrees",
+      "fill-angle-minutes",
+      "fill-angle-seconds",
+      "number-angle-product=${1:separator}",
+      "free-standing-units",
+      "overwrite-functions",
+      "space-before-unit",
+      "unit-optional-argument",
+      "use-xspace",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "table-align-comparator",
+      "table-align-exponent",
+      "table-align-text-after",
+      "table-align-text-before",
+      "table-align-uncertainty",
+      "table-alignment=",
+      "table-alignment-mode=",
+      "table-auto-round",
+      "table-column-width=",
+      "table-fixed-width=",
+      "table-format=${1:format value}",
+      "table-model-setup=${1:commands}",
+      "table-number-alignment=",
+      "table-text-alignment=",
+      "locale=",
+      "list-input-separator=${1:separator}",
+      "product-input-separator=${1:separator}",
+      "table-column-type=${1:tokens}",
+      "detect-all",
+      "detect-display-math",
+      "detect-family",
+      "detect-inline-family=",
+      "detect-inline-weight=",
+      "detect-mode",
+      "detect-none",
+      "detect-shape",
+      "detect-weight",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "unit-math-rm=",
+      "unit-math-sf=",
+      "unit-math-tt=",
+      "unit-text-rm=",
+      "unit-text-sf=",
+      "unit-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "fraction-function=",
+      "input-product=",
+      "input-quotient=",
+      "output-product=",
+      "output-quotient=",
+      "quotient-mode=",
+      "add-arc-degree-zero",
+      "add-arc-minute-zero",
+      "add-arc-second-zero",
+      "arc-separator=",
+      "literal-superscript-as-power",
+      "power-font=",
+      "prefixes-as-symbols",
+      "allow-number-unit-breaks",
+      "exponent-to-prefix",
+      "number-unit-product=",
+      "multi-part-units=",
+      "table-align-text-pre",
+      "table-align-text-post",
+      "table-comparator",
+      "table-figures-decimal=",
+      "table-figures-exponent=",
+      "table-figures-integer=",
+      "table-figures-uncertainty=",
+      "table-parse-only",
+      "table-omit-exponent",
+      "table-space-text-pre=",
+      "table-space-text-post=",
+      "table-sign-exponent",
+      "table-sign-mantissa",
+      "table-unit-alignment=",
+      "math-angstrom=",
+      "math-celsius=",
+      "math-micro=",
+      "math-ohm=",
+      "text-angstrom=",
+      "text-celsius=",
+      "text-micro=",
+      "text-ohm=",
+      "math-arcminute=",
+      "math-arcsecond=",
+      "math-degree=",
+      "redefine-symbols",
+      "text-arcminute=",
+      "text-arcsecond=",
+      "text-degree="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "table-align-comparator",
+      "table-align-exponent",
+      "table-align-text-after",
+      "table-align-text-before",
+      "table-align-uncertainty",
+      "table-alignment=",
+      "table-alignment-mode=",
+      "table-auto-round",
+      "table-column-width=",
+      "table-fixed-width=",
+      "table-format=${1:format value}",
+      "table-model-setup=${1:commands}",
+      "table-number-alignment=",
+      "table-text-alignment=",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "locale="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "unit-math-rm=",
+      "unit-math-sf=",
+      "unit-math-tt=",
+      "unit-text-rm=",
+      "unit-text-sf=",
+      "unit-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "fraction-function=",
+      "input-product=",
+      "input-quotient=",
+      "output-product=",
+      "output-quotient=",
+      "quotient-mode=",
+      "literal-superscript-as-power",
+      "power-font=",
+      "prefixes-as-symbols",
+      "allow-number-unit-breaks",
+      "exponent-to-prefix",
+      "number-unit-product=",
+      "multi-part-units=",
+      "math-angstrom=",
+      "math-celsius=",
+      "math-micro=",
+      "math-ohm=",
+      "text-angstrom=",
+      "text-celsius=",
+      "text-micro=",
+      "text-ohm=",
+      "math-arcminute=",
+      "math-arcsecond=",
+      "math-degree=",
+      "redefine-symbols",
+      "text-arcminute=",
+      "text-arcsecond=",
+      "text-degree="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "bracket-unit-denominator",
+      "forbid-literal-units",
+      "fraction-command=${1:command}",
+      "inter-unit-product=${1:separator}",
+      "parse-units",
+      "per-mode=",
+      "display-per-mode=",
+      "inline-per-mode=",
+      "per-symbol-script-correction=${1:separator}",
+      "per-symbol=${1:symbol}",
+      "power-half-as-sqrt",
+      "qualifier-mode=",
+      "qualifier-phrase=${1:text}",
+      "sticky-per",
+      "unit-font-command=${1:command}",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "unit-math-rm=",
+      "unit-math-sf=",
+      "unit-math-tt=",
+      "unit-text-rm=",
+      "unit-text-sf=",
+      "unit-text-tt=",
+      "literal-superscript-as-power",
+      "power-font=",
+      "prefixes-as-symbols",
+      "math-angstrom=",
+      "math-celsius=",
+      "math-micro=",
+      "math-ohm=",
+      "text-angstrom=",
+      "text-celsius=",
+      "text-micro=",
+      "text-ohm=",
+      "math-arcminute=",
+      "math-arcsecond=",
+      "math-degree=",
+      "redefine-symbols",
+      "text-arcminute=",
+      "text-arcsecond=",
+      "text-degree="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "list-close-bracket=${1:symbol}",
+      "list-exponents=",
+      "list-final-separator=${1:separator}",
+      "list-independent-prefix",
+      "list-open-bracket=${1:symbol}",
+      "list-pair-separator=${1:separator}",
+      "list-separator=${1:separator}",
+      "list-units=",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "unit-math-rm=",
+      "unit-math-sf=",
+      "unit-math-tt=",
+      "unit-text-rm=",
+      "unit-text-sf=",
+      "unit-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "fraction-function=",
+      "input-product=",
+      "input-quotient=",
+      "output-product=",
+      "output-quotient=",
+      "quotient-mode=",
+      "literal-superscript-as-power",
+      "power-font=",
+      "prefixes-as-symbols",
+      "allow-number-unit-breaks",
+      "exponent-to-prefix",
+      "number-unit-product=",
+      "multi-part-units=",
+      "math-angstrom=",
+      "math-celsius=",
+      "math-micro=",
+      "math-ohm=",
+      "text-angstrom=",
+      "text-celsius=",
+      "text-micro=",
+      "text-ohm=",
+      "math-arcminute=",
+      "math-arcsecond=",
+      "math-degree=",
+      "redefine-symbols",
+      "text-arcminute=",
+      "text-arcsecond=",
+      "text-degree="
+    ],
+    [
+      "color=",
+      "mode=",
+      "number-color=",
+      "number-mode=",
+      "propagate-math-font",
+      "reset-math-version",
+      "reset-text-family",
+      "reset-text-series",
+      "reset-text-shape",
+      "text-family-to-math",
+      "text-subscript-command=${1:command}",
+      "text-superscript-command=${1:command}",
+      "text-font-command=${1:commands}",
+      "text-series-to-math",
+      "unit-color=",
+      "unit-mode=",
+      "evaluate-expression",
+      "expression=${1:expression}",
+      "input-close-uncertainty=${1:symbols}",
+      "input-comparators=${1:symbols}",
+      "input-decimal-markers=${1:symbols}",
+      "input-digits=${1:symbols}",
+      "input-exponent-markers=${1:symbols}",
+      "input-ignore=${1:symbols}",
+      "input-open-uncertainty=${1:symbols}",
+      "input-signs=${1:symbols}",
+      "input-uncertainty-divider=${1:symbol}",
+      "input-uncertainty-signs=${1:symbols}",
+      "parse-numbers",
+      "retain-explicit-decimal-marker",
+      "retain-explicit-plus",
+      "retain-negative-zero",
+      "retain-zero-uncertainty",
+      "drop-exponent",
+      "drop-uncertainty",
+      "drop-zero-decimal",
+      "exponent-mode=",
+      "exponent-thresholds=${1:min:max}",
+      "fixed-exponent=${1:integer}",
+      "minimum-integer-digits=${1:integer}",
+      "minimum-decimal-digits=${1:integer}",
+      "round-direction=",
+      "round-half=",
+      "round-minimum=${1:number}",
+      "round-mode=",
+      "round-pad",
+      "round-precision=${1:integer}",
+      "round-zero-positive",
+      "uncertainty-round-direction=",
+      "bracket-ambiguous-numbers",
+      "bracket-negative-numbers",
+      "digit-group-size=${1:integer}",
+      "digit-group-first-size=${1:integer}",
+      "digit-group-other-size=${1:integer}",
+      "exponent-base=${1:value}",
+      "exponent-product=${1:symbol}",
+      "group-digits=",
+      "group-minimum-digits=${1:integer}",
+      "group-separator=${1:separator}",
+      "negative-color=",
+      "output-close-uncertainty=${1:symbol}",
+      "output-decimal-marker=${1:symbol}",
+      "output-exponent-marker=${1:symbol}",
+      "output-open-uncertainty=${1:symbol}",
+      "print-exponent-implicit-plus",
+      "print-implicit-plus",
+      "print-mantissa-implicit-plus",
+      "print-unity-mantissa",
+      "print-zero-exponent",
+      "print-zero-integer",
+      "separate-uncertainty",
+      "tight-spacing",
+      "uncertainty-descriptor-mode=",
+      "uncertainty-descriptor-separator=${1:separator}",
+      "uncertainty-descriptors={${1:desc1,desc2,...}}",
+      "uncertainty-mode=",
+      "uncertainty-separator=${1:separator}",
+      "zero-decimal-as-symbol",
+      "zero-symbol=${1:symbol}",
+      "range-close-bracket=${1:symbol}",
+      "range-exponents=",
+      "range-independent-prefix",
+      "range-open-bracket=${1:symbol}",
+      "range-open-phrase=${1:symbol}",
+      "range-phrase=${1:text}",
+      "range-units=",
+      "allow-quantity-breaks",
+      "extract-mass-in-kilograms",
+      "prefix-mode=",
+      "quantity-product=${1:symbol}",
+      "separate-uncertainty-units=",
+      "locale=",
+      "math-rm=",
+      "math-sf=",
+      "math-tt=",
+      "text-rm=",
+      "text-sf=",
+      "text-tt=",
+      "text-tt=",
+      "number-math-rm=",
+      "number-math-sf=",
+      "number-math-tt=",
+      "number-text-rm=",
+      "number-text-sf=",
+      "number-text-tt=",
+      "unit-math-rm=",
+      "unit-math-sf=",
+      "unit-math-tt=",
+      "unit-text-rm=",
+      "unit-text-sf=",
+      "unit-text-tt=",
+      "input-protect-tokens=",
+      "input-symbols=",
+      "add-decimal-zero",
+      "add-integer-zero",
+      "explicit-sign=",
+      "omit-uncertainty",
+      "retain-unity-mantissa",
+      "retain-zero-exponent",
+      "round-integer-to-decimal",
+      "scientific-notation=",
+      "zero-decimal-to-integer",
+      "bracket-numbers",
+      "close-bracket=",
+      "copy-complex-root=",
+      "copy-decimal-marker=",
+      "open-bracket=",
+      "literal-superscript-as-power",
+      "power-font=",
+      "prefixes-as-symbols",
+      "allow-number-unit-breaks",
+      "exponent-to-prefix",
+      "number-unit-product=",
+      "math-angstrom=",
+      "math-celsius=",
+      "math-micro=",
+      "math-ohm=",
+      "text-angstrom=",
+      "text-celsius=",
+      "text-micro=",
+      "text-ohm=",
+      "math-arcminute=",
+      "math-arcsecond=",
+      "math-degree=",
+      "redefine-symbols",
+      "text-arcminute=",
+      "text-arcsecond=",
+      "text-degree="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/skak.json b/dev/packages/skak.json
new file mode 100644
index 000000000..2f7a395ff
--- /dev/null
+++ b/dev/packages/skak.json
@@ -0,0 +1,584 @@
+{
+  "includes": {
+    "chessfss": [],
+    "lambda": [],
+    "ifthen": [],
+    "calc": [],
+    "pstricks": [
+      "ps"
+    ],
+    "pst-node": [
+      "ps"
+    ]
+  },
+  "macros": {
+    "newgame": {},
+    "mainline{}": {
+      "snippet": "mainline{${1:moves}}"
+    },
+    "variation{}": {
+      "snippet": "variation{${1:moves}}"
+    },
+    "showboard": {},
+    "hidemoves{}": {
+      "snippet": "hidemoves{${1:moves}}"
+    },
+    "storegame{}": {
+      "snippet": "storegame{${1:name}}"
+    },
+    "restoregame{}": {
+      "snippet": "restoregame{${1:name}}"
+    },
+    "savegame{}": {
+      "snippet": "savegame{${1:name}}"
+    },
+    "loadgame{}": {
+      "snippet": "loadgame{${1:name}}"
+    },
+    "notationon": {},
+    "notationoff": {},
+    "notationOn": {},
+    "notationOff": {},
+    "showinverseboard": {},
+    "wmove{}": {
+      "snippet": "wmove{${1:move}}"
+    },
+    "bmove{}": {
+      "snippet": "bmove{${1:move}}"
+    },
+    "lastmove{}": {
+      "snippet": "lastmove{${1:move}}"
+    },
+    "showonlywhite": {},
+    "showonlyblack": {},
+    "showonly{}": {
+      "snippet": "showonly{${1:piece1,${2:piece2},...}}"
+    },
+    "showallbut{}": {
+      "snippet": "showallbut{${1:piece1,${2:piece2},...}}"
+    },
+    "fenboard{}": {
+      "snippet": "fenboard{${1:instructions}}"
+    },
+    "styleA": {},
+    "styleB": {},
+    "styleC": {},
+    "variationstyle": {},
+    "mainlinestyle": {},
+    "longmoves": {},
+    "shortmoves": {},
+    "newskaklanguage{}{}": {
+      "snippet": "newskaklanguage{${1:language}}{${2:pieces}}"
+    },
+    "skaklanguage[]": {
+      "snippet": "skaklanguage[${1:language}]"
+    },
+    "boardasfen": {},
+    "EnPassantSquare": {},
+    "variationcurrent": {},
+    "continuevariation": {},
+    "continuevariationcurrent": {},
+    "tinyboard": {},
+    "smallboard": {},
+    "normalboard": {},
+    "largeboard": {},
+    "movecomment{}": {
+      "snippet": "movecomment{${1:moves}}"
+    },
+    "showall": {},
+    "showonlypawns": {},
+    "showmoveron": {},
+    "showmoveroff": {},
+    "showmoverOn": {},
+    "showmoverOff": {},
+    "printarrow{}{}": {
+      "snippet": "printarrow{${1:from}}{${2:to}}"
+    },
+    "highlight{}": {
+      "snippet": "highlight{${1:square list}}"
+    },
+    "highlight[]{}": {
+      "snippet": "highlight[${2:marker}]{${1:square list}}"
+    },
+    "printknightmove{}{}": {
+      "snippet": "printknightmove{${1:from}}{${2:to}}"
+    },
+    "afterblack": {},
+    "AfterBlack": {},
+    "aftergrouplength": {},
+    "afterwhite": {},
+    "AfterWhite": {},
+    "Apply{}{}": {
+      "snippet": "Apply{${1:arg1}}{${2:arg2}}"
+    },
+    "arga": {},
+    "argb": {},
+    "BackwardDirection{}": {
+      "snippet": "BackwardDirection{${1:arg1}}"
+    },
+    "beforeblack": {},
+    "beforenumber": {},
+    "beforewhite": {},
+    "BlackCastling": {},
+    "BlackKingSquare": {},
+    "blackopen": {},
+    "BlackPiece{}": {
+      "snippet": "BlackPiece{${1:arg1}}"
+    },
+    "BlackSquarePiece{}": {
+      "snippet": "BlackSquarePiece{${1:arg1}}"
+    },
+    "BoolToString{}": {
+      "snippet": "BoolToString{${1:arg1}}"
+    },
+    "Capture": {},
+    "CastleDone{}": {
+      "snippet": "CastleDone{${1:arg1}}"
+    },
+    "CastleKingFile{}": {
+      "snippet": "CastleKingFile{${1:arg1}}"
+    },
+    "CastleRookFromFile{}": {
+      "snippet": "CastleRookFromFile{${1:arg1}}"
+    },
+    "CastleRookToFile{}": {
+      "snippet": "CastleRookToFile{${1:arg1}}"
+    },
+    "Castling": {},
+    "CheckTest": {},
+    "closecommands": {},
+    "currentlanguage": {},
+    "currentstyle": {},
+    "DoTheMove{}": {
+      "snippet": "DoTheMove{${1:arg1}}"
+    },
+    "DoTheMoveList{}": {
+      "snippet": "DoTheMoveList{${1:arg1}}"
+    },
+    "EatNumber{}": {
+      "snippet": "EatNumber{${1:arg1}}"
+    },
+    "EatNumberA()": {
+      "snippet": "EatNumberA(${1:arg1})"
+    },
+    "EmptyBoard": {},
+    "EqPiece{}{}": {
+      "snippet": "EqPiece{${1:arg1}}{${2:arg2}}"
+    },
+    "EqSquare{}{}": {
+      "snippet": "EqSquare{${1:arg1}}{${2:arg2}}"
+    },
+    "EqStr{}{}": {
+      "snippet": "EqStr{${1:arg1}}{${2:arg2}}"
+    },
+    "ExecuteCastling": {},
+    "ExecuteKingMove": {},
+    "ExecuteMoves": {},
+    "ExecutePawnMove": {},
+    "ExecutePieceMove": {},
+    "ExpectedColour": {},
+    "Explode{}": {
+      "snippet": "Explode{${1:arg1}}"
+    },
+    "ExplodeA{}{}": {
+      "snippet": "ExplodeA{${1:arg1}}{${2:arg2}}"
+    },
+    "ExtractBlackCastling{}": {
+      "snippet": "ExtractBlackCastling{${1:arg1}}"
+    },
+    "ExtractBlackCastlingA()": {
+      "snippet": "ExtractBlackCastlingA(${1:arg1})"
+    },
+    "ExtractWhiteCastling{}": {
+      "snippet": "ExtractWhiteCastling{${1:arg1}}"
+    },
+    "ExtractWhiteCastlingA()": {
+      "snippet": "ExtractWhiteCastlingA(${1:arg1})"
+    },
+    "FenBoard": {},
+    "FenConvert{}": {
+      "snippet": "FenConvert{${1:arg1}}"
+    },
+    "FF{}{}": {
+      "snippet": "FF{${1:arg1}}{${2:arg2}}"
+    },
+    "File{}": {
+      "snippet": "File{${1:arg1}}"
+    },
+    "FileDiscriminator": {},
+    "FileNames": {},
+    "FileOf()": {
+      "snippet": "FileOf(${1:arg})"
+    },
+    "FilterShowOnly{}": {
+      "snippet": "FilterShowOnly{${1:arg1}}"
+    },
+    "FindPieceSquares{}{}": {
+      "snippet": "FindPieceSquares{${1:arg1}}{${2:arg2}}"
+    },
+    "FirstChar()": {
+      "snippet": "FirstChar(${1:arg1})"
+    },
+    "FirstRank{}": {
+      "snippet": "FirstRank{${1:arg1}}"
+    },
+    "ForwardDirection{}": {
+      "snippet": "ForwardDirection{${1:arg1}}"
+    },
+    "FromRank": {},
+    "Get{}": {
+      "snippet": "Get{${1:arg1}}"
+    },
+    "GetBool{}": {
+      "snippet": "GetBool{${1:arg1}}"
+    },
+    "GetNeighbour{}{}": {
+      "snippet": "GetNeighbour{${1:arg1}}{${2:arg2}}"
+    },
+    "Glue{}{}": {
+      "snippet": "Glue{${1:arg1}}{${2:arg2}}"
+    },
+    "HandleMove()": {
+      "snippet": "HandleMove(${1:arg1})"
+    },
+    "InitBoard()": {
+      "snippet": "InitBoard(${1:arg1})"
+    },
+    "InitialRank": {},
+    "InitRank{}{}{}{}{}{}{}{}{}": {
+      "snippet": "InitRank{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}{${6:arg6}}{${7:arg7}}{${8:arg8}}{${9:arg9}}"
+    },
+    "IsBishopQueen{}{}": {
+      "snippet": "IsBishopQueen{${1:arg1}}{${2:arg2}}"
+    },
+    "IsCapture{}": {
+      "snippet": "IsCapture{${1:arg1}}"
+    },
+    "IsDash{}": {
+      "snippet": "IsDash{${1:arg1}}"
+    },
+    "IsFile{}": {
+      "snippet": "IsFile{${1:arg1}}"
+    },
+    "IsNil{}": {
+      "snippet": "IsNil{${1:arg1}}"
+    },
+    "IsO{}": {
+      "snippet": "IsO{${1:arg1}}"
+    },
+    "IsPieceName{}": {
+      "snippet": "IsPieceName{${1:arg1}}"
+    },
+    "IsPromotion{}": {
+      "snippet": "IsPromotion{${1:arg1}}"
+    },
+    "IsRank{}": {
+      "snippet": "IsRank{${1:arg1}}"
+    },
+    "IsRightPiece{}{}": {
+      "snippet": "IsRightPiece{${1:arg1}}{${2:arg2}}"
+    },
+    "IsRookQueen{}{}": {
+      "snippet": "IsRookQueen{${1:arg1}}{${2:arg2}}"
+    },
+    "KingSquare{}": {
+      "snippet": "KingSquare{${1:arg1}}"
+    },
+    "KnightSquares{}": {
+      "snippet": "KnightSquares{${1:arg1}}"
+    },
+    "LambdaAnd": {},
+    "LastCharWasCastle": {},
+    "LastMoveString": {},
+    "leavestylec": {},
+    "LeftDirection{}": {
+      "snippet": "LeftDirection{${1:arg1}}"
+    },
+    "LegalMove{}": {
+      "snippet": "LegalMove{${1:arg1}}"
+    },
+    "LongCastling": {},
+    "LookFor{}{}{}": {
+      "snippet": "LookFor{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "LookForA{}{}{}": {
+      "snippet": "LookForA{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "LookForMove()": {
+      "snippet": "LookForMove(${1:arg1})"
+    },
+    "Mainline()": {
+      "snippet": "Mainline(${1:arg1})"
+    },
+    "MakeMove{}": {
+      "snippet": "MakeMove{${1:arg1}}"
+    },
+    "MakeMoveMainline{}": {
+      "snippet": "MakeMoveMainline{${1:arg1}}"
+    },
+    "MateTest": {},
+    "Member{}{}{}": {
+      "snippet": "Member{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "MemberA{}{}{}{}": {
+      "snippet": "MemberA{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "MoveFrom": {},
+    "movehyphen": {},
+    "MoveRest": {},
+    "MoveTo": {},
+    "MoveToFile": {},
+    "MoveToRank": {},
+    "movewhite": {},
+    "MyEqual{}{}": {
+      "snippet": "MyEqual{${1:arg1}}{${2:arg2}}"
+    },
+    "MyEqualB{}{}{}{}": {
+      "snippet": "MyEqualB{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "MyFirst()": {
+      "snippet": "MyFirst(${1:arg})"
+    },
+    "myrestore{}": {
+      "snippet": "myrestore{${1:arg}}"
+    },
+    "myrightfile{}{}": {
+      "snippet": "myrightfile{${1:arg1}}{${2:arg2}}"
+    },
+    "MySecond()": {
+      "snippet": "MySecond(${1:arg})"
+    },
+    "mystore{}": {
+      "snippet": "mystore{${1:arg}}"
+    },
+    "next": {},
+    "NoEnemiesFound": {},
+    "normalstyles": {},
+    "NotMember{}{}": {
+      "snippet": "NotMember{${1:arg1}}{${2:arg2}}"
+    },
+    "NumberNext": {},
+    "oldpiece": {},
+    "opencommands": {},
+    "pap": {},
+    "ParseCastling()": {
+      "snippet": "ParseCastling(${1:arg1})"
+    },
+    "ParseCastlingA()": {
+      "snippet": "ParseCastlingA(${1:arg1})"
+    },
+    "ParseCoordinates()": {
+      "snippet": "ParseCoordinates(${1:arg1})"
+    },
+    "ParseFenRank{}": {
+      "snippet": "ParseFenRank{${1:arg1}}"
+    },
+    "ParseFenRankA()": {
+      "snippet": "ParseFenRankA(${1:arg1})"
+    },
+    "ParseMove{}": {
+      "snippet": "ParseMove{${1:arg1}}"
+    },
+    "ParseMoveA()": {
+      "snippet": "ParseMoveA(${1:arg1})"
+    },
+    "ParseMoveInit": {},
+    "PawnFrom": {},
+    "PieceNames": {},
+    "PieceNameToMove": {},
+    "PieceNameToPiece{}{}": {
+      "snippet": "PieceNameToPiece{${1:arg1}}{${2:arg2}}"
+    },
+    "PieceToFen{}": {
+      "snippet": "PieceToFen{${1:arg1}}"
+    },
+    "PieceToMove": {},
+    "PrintCastling": {},
+    "printfileangle{}{}": {
+      "snippet": "printfileangle{${1:arg1}}{${2:arg2}}"
+    },
+    "printmove": {},
+    "PrintMoves": {},
+    "printrankangle{}{}": {
+      "snippet": "printrankangle{${1:arg1}}{${2:arg2}}"
+    },
+    "Promotion": {},
+    "PromotionPieceName": {},
+    "Rank{}": {
+      "snippet": "Rank{${1:arg1}}"
+    },
+    "RankDiscriminator": {},
+    "ranklift": {},
+    "RankNames": {},
+    "RankOf()": {
+      "snippet": "RankOf(${1:arg})"
+    },
+    "RemoveLongCastling": {},
+    "RemoveShortCastling": {},
+    "RestChars()": {
+      "snippet": "RestChars(${1:arg1})"
+    },
+    "RightDirection{}": {
+      "snippet": "RightDirection{${1:arg1}}"
+    },
+    "RightFile()": {
+      "snippet": "RightFile(${1:arg1})"
+    },
+    "RightRank()": {
+      "snippet": "RightRank(${1:arg1})"
+    },
+    "runmoves{}": {
+      "snippet": "runmoves{${1:arg1}}"
+    },
+    "ScanDirections{}{}{}": {
+      "snippet": "ScanDirections{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "Set{}{}": {
+      "snippet": "Set{${1:arg1}}{${2:arg2}}"
+    },
+    "SetCheckKing{}{}": {
+      "snippet": "SetCheckKing{${1:arg1}}{${2:arg2}}"
+    },
+    "SetDownLeftNeighbour{}{}{}": {
+      "snippet": "SetDownLeftNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "SetDownNeighbour{}{}{}": {
+      "snippet": "SetDownNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "SetDownRightNeighbour{}{}{}": {
+      "snippet": "SetDownRightNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "SetKingSquare{}{}": {
+      "snippet": "SetKingSquare{${1:arg1}}{${2:arg2}}"
+    },
+    "SetKnightSquares{}{}": {
+      "snippet": "SetKnightSquares{${1:arg1}}{${2:arg2}}"
+    },
+    "SetLeftNeighbour{}{}{}": {
+      "snippet": "SetLeftNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "SetNeighbour{}{}{}": {
+      "snippet": "SetNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "SetRank{}{}": {
+      "snippet": "SetRank{${1:arg1}}{${2:arg2}}"
+    },
+    "SetRightNeighbour{}{}{}": {
+      "snippet": "SetRightNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "setupboard{}{}": {
+      "snippet": "setupboard{${1:arg1}}{${2:arg2}}"
+    },
+    "SetUpLeftNeighbour{}{}{}": {
+      "snippet": "SetUpLeftNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "SetUpNeighbour{}{}{}": {
+      "snippet": "SetUpNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "SetUpRightNeighbour{}{}{}": {
+      "snippet": "SetUpRightNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "Showchar{}": {
+      "snippet": "Showchar{${1:arg1}}"
+    },
+    "Showfile{}": {
+      "snippet": "Showfile{${1:arg1}}"
+    },
+    "Showfiles": {},
+    "ShowMover": {},
+    "ShowMoverBlackInverse": {},
+    "ShowMoverBlackNormal": {},
+    "ShowMoverWhiteInverse": {},
+    "ShowMoverWhiteNormal": {},
+    "ShowOnlyList": {},
+    "ShowParseInfo": {},
+    "Showrank{}": {
+      "snippet": "Showrank{${1:arg1}}"
+    },
+    "ShowrankInverse{}": {
+      "snippet": "ShowrankInverse{${1:arg1}}"
+    },
+    "ShowrankInverseWithNumber{}": {
+      "snippet": "ShowrankInverseWithNumber{${1:arg1}}"
+    },
+    "ShowrankNumber{}": {
+      "snippet": "ShowrankNumber{${1:arg1}}"
+    },
+    "ShowrankWithNumber{}": {
+      "snippet": "ShowrankWithNumber{${1:arg1}}"
+    },
+    "showskaklanguage": {},
+    "Sideeffect{}{}{}": {
+      "snippet": "Sideeffect{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "skakstore": {},
+    "squarelength": {},
+    "StoreBool{}{}": {
+      "snippet": "StoreBool{${1:arg1}}{${2:arg2}}"
+    },
+    "StoreLastMove": {},
+    "StringToTokens{}": {
+      "snippet": "StringToTokens{${1:arg1}}"
+    },
+    "StripMove()": {
+      "snippet": "StripMove(${1:arg1})"
+    },
+    "StrToTokens()": {
+      "snippet": "StrToTokens(${1:arg1})"
+    },
+    "tempCastling": {},
+    "TeXifx{}{}{}": {
+      "snippet": "TeXifx{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "thefileFrom": {},
+    "thefileTo": {},
+    "thehalfmove": {},
+    "thehelpgobble": {},
+    "thehelpnumber": {},
+    "thehelpnumberMove": {},
+    "themove": {},
+    "therankFrom": {},
+    "therankTo": {},
+    "tmpCastling": {},
+    "ToggleWhiteSquare": {},
+    "trimhelp": {},
+    "TrimMoveList{}": {
+      "snippet": "TrimMoveList{${1:arg1}}"
+    },
+    "TypeSetAfterBlack": {},
+    "TypeSetAfterWhite": {},
+    "TypeSetColour": {},
+    "TypeSetNumberNext": {},
+    "UndoMove{}": {
+      "snippet": "UndoMove{${1:arg1}}"
+    },
+    "UniqueMove": {},
+    "UpdateCastling": {},
+    "WhiteCastling": {},
+    "WhiteKingSquare": {},
+    "whiteopen": {},
+    "WhiteSquare": {},
+    "WhiteSquarePiece": {},
+    "WhiteToMove{}{}": {
+      "snippet": "WhiteToMove{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "tiny",
+    "small",
+    "normal",
+    "large",
+    "notation",
+    "mover",
+    "moveroff",
+    "notationoff",
+    "ps",
+    "psoff",
+    "english",
+    "styleA",
+    "styleB",
+    "styleC"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/skillicons.json b/dev/packages/skillicons.json
new file mode 100644
index 000000000..0592a71b7
--- /dev/null
+++ b/dev/packages/skillicons.json
@@ -0,0 +1,16 @@
+{
+  "includes": {
+    "graphicx": []
+  },
+  "macros": {
+    "photosymbol{}": {
+      "snippet": "photosymbol{${1:icon name}}"
+    },
+    "photosymbol[]{}": {
+      "snippet": "photosymbol[${2:size}]{${1:icon name}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/skmath.json b/dev/packages/skmath.json
index e2efacd14..0b5b73915 100644
--- a/dev/packages/skmath.json
+++ b/dev/packages/skmath.json
@@ -54,13 +54,13 @@
       "snippet": "d{${1:var}}"
     },
     "pd{}{}": {
-      "snippet": "pd{${1:func}}{${2:var1,var2,...}}"
+      "snippet": "pd{${1:func}}{${2:var1,${3:var2},...}}"
     },
     "pd*{}{}": {
-      "snippet": "pd*{${1:func}}{${2:var1,var2,...}}"
+      "snippet": "pd*{${1:func}}{${2:var1,${3:var2},...}}"
     },
     "td{}{}": {
-      "snippet": "td{${1:func}}{${2:var1,var2,...}}"
+      "snippet": "td{${1:func}}{${2:var1,${3:var2},...}}"
     },
     "E{}": {
       "snippet": "E{${1:expr}}"
diff --git a/dev/packages/snotez.json b/dev/packages/snotez.json
index 1fceba81b..79bc47b37 100644
--- a/dev/packages/snotez.json
+++ b/dev/packages/snotez.json
@@ -12,6 +12,12 @@
     "sidenote[]{}": {
       "snippet": "sidenote[${2:mark}]{${1:text}}"
     },
+    "sidenote(){}": {
+      "snippet": "sidenote(${2:offset}){${1:text}}"
+    },
+    "sidenote()[]{}": {
+      "snippet": "sidenote(${3:offset})[${2:mark}]{${1:text}}"
+    },
     "sidenote[][]{}": {
       "snippet": "sidenote[${2:offset}][${3:mark}]{${1:text}}",
       "option": "dblarg=true"
diff --git a/dev/packages/sparklines.json b/dev/packages/sparklines.json
new file mode 100644
index 000000000..47fd7b099
--- /dev/null
+++ b/dev/packages/sparklines.json
@@ -0,0 +1,25 @@
+{
+  "includes": {
+    "pgf": []
+  },
+  "macros": {
+    "sparkbottomline": {},
+    "sparkbottomline[]": {
+      "snippet": "sparkbottomline[${1:length}]"
+    },
+    "sparklinethickness": {},
+    "sparkdotwidth": {},
+    "sparkspikewidth": {},
+    "sparkbottomlinethickness": {},
+    "sparklineclipsep": {},
+    "sparklineheight": {}
+  },
+  "envs": {
+    "sparkline{}": {
+      "name": "sparkline",
+      "snippet": "{${1:width}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/spbmark.json b/dev/packages/spbmark.json
index afa17a1f6..54bb1e301 100644
--- a/dev/packages/spbmark.json
+++ b/dev/packages/spbmark.json
@@ -1,7 +1,5 @@
 {
-  "includes": {
-    "l3keys2e": []
-  },
+  "includes": {},
   "macros": {
     "super{}": {
       "snippet": "super{${1:content}}"
@@ -183,9 +181,12 @@
   "options": [
     "text",
     "math",
+    "math*",
     "foot",
     "both",
-    "all"
+    "all",
+    "spcore=",
+    "sbcore="
   ],
   "keyvals": [
     [
diff --git a/dev/packages/spectralsequences.json b/dev/packages/spectralsequences.json
index 0af7b7c13..e0e0c5d85 100644
--- a/dev/packages/spectralsequences.json
+++ b/dev/packages/spectralsequences.json
@@ -22,6 +22,22 @@
     "printpage[]": {
       "snippet": "printpage[${1:options}]"
     },
+    "class()": {
+      "snippet": "class(${1:x},${2:y})"
+    },
+    "class[]()": {
+      "snippet": "class[${1:options}](${2:x},${3:y})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "replaceclass()": {
+      "snippet": "replaceclass(${1:x},${2:y},${3:n})"
+    },
+    "replaceclass[]()": {
+      "snippet": "replaceclass[${1:options}](${2:x},${3:y},${4:n})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "replacesource": {},
     "replacesource[]": {
       "snippet": "replacesource[${1:options}]"
@@ -31,39 +47,82 @@
       "snippet": "replacetarget[${1:options}]"
     },
     "replacestructlines": {},
+    "replacestructlines()": {
+      "snippet": "replacestructlines(${1:source coord})"
+    },
+    "classoptions[]()": {
+      "snippet": "classoptions[${1:options}](${2:class name})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "classoptions[]": {
       "snippet": "classoptions[${1:options}]",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "structline": {},
     "structline[]": {
       "snippet": "structline[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "structline()()": {
+      "snippet": "structline(${1:source coord})(${2:target coord})"
+    },
+    "structline[]()()": {
+      "snippet": "structline[${1:options}](${2:source coord})(${3:target coord})",
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "structlineoptions[]": {
       "snippet": "structlineoptions[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "structlineoptions[]()()": {
+      "snippet": "structlineoptions[${1:options}](${2:source coord})(${3:target coord})",
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "extension": {},
     "extension[]": {
       "snippet": "extension[${1:options}]",
-      "keyvalindex": 2,
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "extension()()": {
+      "snippet": "extension(${1:source coord})(${2:target coord})"
+    },
+    "extension[]()()": {
+      "snippet": "extension[${1:options}](${2:source coord})(${3:target coord})",
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "extensionoptions[]": {
       "snippet": "extensionoptions[${1:options}]"
     },
+    "extensionoptions[]()()": {
+      "snippet": "extensionoptions[${1:options}](${2:source coord})(${3:target coord})"
+    },
+    "circleclasses()()": {
+      "snippet": "circleclasses(${1:source coord})(${2:target coord})"
+    },
+    "circleclasses[]()()": {
+      "snippet": "circleclasses[${1:options}](${2:source coord})(${3:target coord})",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
     "xcoord": {},
     "ycoord": {},
+    "isalive()": {
+      "snippet": "isalive(${1:coord})"
+    },
     "isalive{}": {
       "snippet": "isalive{${1:(${2:coord1})...(${3:coordN})}}"
     },
     "sseqset{}": {
       "snippet": "sseqset{${1:options}}",
-      "keyvalindex": 3,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "Do{}{}": {
@@ -112,6 +171,96 @@
     "SseqIfEmptyF{}{}": {
       "snippet": "SseqIfEmptyF{${1:expression}}{${2:false}}"
     },
+    "IfExistsTF{}(){}{}": {
+      "snippet": "IfExistsTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
+    },
+    "IfExistsT{}(){}": {
+      "snippet": "IfExistsT{${1:page}}(${3:coord}){${2:true}}"
+    },
+    "IfExistsF{}(){}": {
+      "snippet": "IfExistsF{${1:page}}(${3:coord}){${2:false}}"
+    },
+    "IfAliveTF{}(){}{}": {
+      "snippet": "IfAliveTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
+    },
+    "IfAliveT{}(){}": {
+      "snippet": "IfAliveT{${1:page}}(${3:coord}){${2:true}}"
+    },
+    "IfAliveF{}(){}": {
+      "snippet": "IfAliveF{${1:page}}(${3:coord}){${2:false}}"
+    },
+    "IfOutOfBoundsTF(){}{}": {
+      "snippet": "IfOutOfBoundsTF(${3:coord}){${1:true}}{${2:false}}"
+    },
+    "IfOutOfBoundsT(){}": {
+      "snippet": "IfOutOfBoundsT(${2:coord}){${1:true}}"
+    },
+    "IfOutOfBoundsF(){}": {
+      "snippet": "IfOutOfBoundsF(${2:coord}){${1:false}}"
+    },
+    "IfInBoundsTF(){}{}": {
+      "snippet": "IfInBoundsTF(${3:coord}){${1:true}}{${2:false}}"
+    },
+    "IfInBoundsT(){}": {
+      "snippet": "IfInBoundsT(${2:coord}){${1:true}}"
+    },
+    "IfInBoundsF(){}": {
+      "snippet": "IfInBoundsF(${2:coord}){${1:false}}"
+    },
+    "IfValidDifferentialTF{}(){}{}": {
+      "snippet": "IfValidDifferentialTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
+    },
+    "IfValidDifferentialTF{}()(){}{}": {
+      "snippet": "IfValidDifferentialTF{${1:page}}(${4:coord})(${5:target coord}){${2:true}}{${3:false}}"
+    },
+    "IfValidDifferentialT{}(){}": {
+      "snippet": "IfValidDifferentialT{${1:page}}(${3:coord}){${2:true}}"
+    },
+    "IfValidDifferentialT{}()(){}": {
+      "snippet": "IfValidDifferentialT{${1:page}}(${3:coord})(${4:target coord}){${2:true}}"
+    },
+    "IfValidDifferentialF{}(){}": {
+      "snippet": "IfValidDifferentialF{${1:page}}(${3:coord}){${2:false}}"
+    },
+    "IfValidDifferentialF{}()(){}": {
+      "snippet": "IfValidDifferentialF{${1:page}}(${3:coord})(${4:target coord}){${2:false}}"
+    },
+    "DrawIfValidDifferentialTF{}(){}{}": {
+      "snippet": "DrawIfValidDifferentialTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
+    },
+    "DrawIfValidDifferentialTF{}()(){}{}": {
+      "snippet": "DrawIfValidDifferentialTF{${1:page}}(${4:coord})(${5:target coord}){${2:true}}{${3:false}}"
+    },
+    "DrawIfValidDifferentialTF[]{}()(){}{}": {
+      "snippet": "DrawIfValidDifferentialTF[${4:options}]{${1:page}}(${5:coord})(${6:target coord}){${2:true}}{${3:false}}"
+    },
+    "DrawIfValidDifferentialT{}(){}": {
+      "snippet": "DrawIfValidDifferentialT{${1:page}}(${3:coord}){${2:true}}"
+    },
+    "DrawIfValidDifferentialT{}()(){}": {
+      "snippet": "DrawIfValidDifferentialT{${1:page}}(${3:coord})(${4:target coord}){${2:true}}"
+    },
+    "DrawIfValidDifferentialT[]{}()(){}": {
+      "snippet": "DrawIfValidDifferentialT[${3:options}]{${1:page}}(${4:coord})(${5:target coord}){${2:true}}"
+    },
+    "DrawIfValidDifferentialF{}(){}": {
+      "snippet": "DrawIfValidDifferentialF{${1:page}}(${3:coord}){${2:false}}"
+    },
+    "DrawIfValidDifferentialF{}()(){}": {
+      "snippet": "DrawIfValidDifferentialF{${1:page}}(${3:coord})(${4:target coord}){${2:false}}"
+    },
+    "DrawIfValidDifferentialF[]{}()(){}": {
+      "snippet": "DrawIfValidDifferentialF[${3:options}]{${1:page}}(${4:coord})(${5:target coord}){${2:false}}"
+    },
+    "DrawIfValidDifferential{}(){}": {
+      "snippet": "DrawIfValidDifferential{${1:page}}(${3:coord}){${2:true}}"
+    },
+    "DrawIfValidDifferential{}()(){}": {
+      "snippet": "DrawIfValidDifferential{${1:page}}(${3:coord})(${4:target coord}){${2:true}}"
+    },
+    "DrawIfValidDifferential[]{}()(){}": {
+      "snippet": "DrawIfValidDifferential[${3:options}]{${1:page}}(${4:coord})(${5:target coord}){${2:true}}"
+    },
     "SseqNormalizeMonomial{}": {
       "snippet": "SseqNormalizeMonomial{${1:monomial}}"
     },
@@ -120,6 +269,30 @@
       "snippet": "SseqNormalizeMonomialSetVariables{${1:monomial}}"
     },
     "SseqAHSSNameHandler": {},
+    "parsecoordinate{}()": {
+      "snippet": "parsecoordinate{${1:macro}}(${2:coord})"
+    },
+    "getdtarget{}{}()": {
+      "snippet": "getdtarget{${1:macro}}{${2:page}}(${3:source coord})"
+    },
+    "parsedifferential{}()": {
+      "snippet": "parsedifferential{${1:page}}(${2:differential coord})"
+    },
+    "parsedifferential{}()()": {
+      "snippet": "parsedifferential{${1:page}}(${2:differential coord})(${3:differential target})"
+    },
+    "nameclass{}()": {
+      "snippet": "nameclass{${1:name}}(${2:coord})"
+    },
+    "tagclass{}()": {
+      "snippet": "tagclass{${1:tag}}(${2:coord})"
+    },
+    "gettag{}()": {
+      "snippet": "gettag{${1:macro}}(${2:coord})"
+    },
+    "pushstack()": {
+      "snippet": "pushstack(${1:coord})"
+    },
     "savestack": {},
     "restorestack": {},
     "SseqNewClassPattern{}{}": {
@@ -164,14 +337,14 @@
     "sseqdata[]": {
       "name": "sseqdata",
       "snippet": "[${1:options}]",
-      "keyvalindex": 4,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "sseqpage": {},
     "sseqpage[]": {
       "name": "sseqpage",
       "snippet": "[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 7,
       "keyvalpos": 0
     },
     "quiet": {}
@@ -181,6 +354,37 @@
     "tooltips"
   ],
   "keyvals": [
+    [
+      "xshift=${1:integer}",
+      "yshift=${1:integer}",
+      "%color",
+      "\"${1:text}\"",
+      "\"${1:text}\" ${2:TikZ options}",
+      "\"${1:text}\"'",
+      "\"${1:text}\"' ${2:TikZ options}",
+      "pin={${1:TikZ options}}",
+      "description",
+      "circlen=${1:integer}",
+      "newellipse",
+      "ellipse ratio=${1:ratio}",
+      "isosceles triangle",
+      "rectangle",
+      "diamond",
+      "semicircle",
+      "regular polygon",
+      "regular polygon sides=${1:integer}",
+      "minimum width=",
+      "minimum height=",
+      "minimum size=",
+      "inner sep=",
+      "outer sep=",
+      "name=${1:node name}",
+      "show name={${1:label options}}",
+      "tag=${1:tag}",
+      "insert=${1:integer}",
+      "offset={(${1:x,y})}",
+      "tooltip=${1:text}"
+    ],
     [
       "xshift=${1:integer}",
       "yshift=${1:integer}",
@@ -269,6 +473,19 @@
       "in=${1:anchor}",
       "out=${1:anchor}"
     ],
+    [
+      "fit=${1:coords or nodes}",
+      "rounded rectangle",
+      "ellipse ratio=${1:ratio}",
+      "class style",
+      "permanent cycle style",
+      "transient cycle style",
+      "this page class style",
+      "differential style",
+      "struct line style",
+      "page=${1:page}",
+      "page=${1:page}--${2:page max}"
+    ],
     [
       "sseqs={${1:keys}}",
       "change sseqs={${1:keys}}",
diff --git a/dev/packages/spelatex.json b/dev/packages/spelatex.json
new file mode 100644
index 000000000..e22d740d9
--- /dev/null
+++ b/dev/packages/spelatex.json
@@ -0,0 +1,91 @@
+{
+  "includes": {
+    "hyperref": [],
+    "xcolor": [],
+    "ifthen": [],
+    "fancyvrb": [],
+    "newfile": [],
+    "rotating": [],
+    "babel": [],
+    "kvoptions": [],
+    "xkeyval": [],
+    "marginnote": []
+  },
+  "macros": {
+    "setenum{}": {
+      "snippet": "setenum{${1:arg}}",
+      "option": "extramath=true"
+    },
+    "setdesc{}": {
+      "snippet": "setdesc{${1:arg}}",
+      "option": "extramath=true"
+    },
+    "spelitem{}": {
+      "snippet": "spelitem{${1:text}}"
+    },
+    "spelitem[]{}": {
+      "snippet": "spelitem[${2:label}]{${1:text}}"
+    },
+    "spelmacpp{}{}": {
+      "snippet": "spelmacpp{${1:csname}}{${2:action}}"
+    },
+    "spelmacpp{}[]{}": {
+      "snippet": "spelmacpp{${1:csname}}[${2:args}]{${3:action}}"
+    },
+    "spelmacpp{}[][]{}": {
+      "snippet": "spelmacpp{${1:csname}}[${2:args}][${3:default}]{${4:action}}"
+    },
+    "spelenvpp{}{}": {
+      "snippet": "spelenvpp{${1:envname}}{${2:action}}"
+    },
+    "spelenvpp{}[]{}": {
+      "snippet": "spelenvpp{${1:envname}}[${2:args}]{${3:action}}"
+    },
+    "spelenvpp{}[][]{}": {
+      "snippet": "spelenvpp{${1:envname}}[${2:args}][${3:default}]{${4:action}}"
+    },
+    "spelmacad{}{}": {
+      "snippet": "spelmacad{${1:csname}}{${2:text}}"
+    },
+    "spelmacad{}[]{}": {
+      "snippet": "spelmacad{${1:csname}}[${2:args}]{${3:text}}"
+    },
+    "spelmacad{}[][]{}": {
+      "snippet": "spelmacad{${1:csname}}[${2:args}][${3:default}]{${4:text}}"
+    },
+    "spelenvad{}{}{}": {
+      "snippet": "spelenvad{${1:envname}}{${2:begin text}}{${3:end text}}"
+    },
+    "spelenvad{}[]{}{}": {
+      "snippet": "spelenvad{${1:envname}}[${2:args}]{${3:begin text}}{${4:end text}}"
+    },
+    "spelenvad{}[][]{}{}": {
+      "snippet": "spelenvad{${1:envname}}[${2:args}][${3:default}]{${4:begin text}}{${5:end text}}"
+    },
+    "spelatex": {},
+    "spelbox": {},
+    "spelpl": {},
+    "audiodir": {},
+    "chunkdir": {}
+  },
+  "envs": {
+    "spelchunk": {},
+    "spelchunk[]": {
+      "name": "spelchunk",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "spelchunkad": {}
+  },
+  "options": [
+    "format=${1:type}",
+    "disabled",
+    "extramath"
+  ],
+  "keyvals": [
+    [
+      "arealink"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/spot.json b/dev/packages/spot.json
index 1113146d8..42ff04626 100644
--- a/dev/packages/spot.json
+++ b/dev/packages/spot.json
@@ -12,24 +12,48 @@
     "spot[]{}": {
       "snippet": "spot[${2:node options}]{${1:text}}"
     },
+    "spot(){}": {
+      "snippet": "spot(${2:node name}){${1:text}}"
+    },
+    "spot()[]{}": {
+      "snippet": "spot(${3:node name})[${2:node options}]{${1:text}}"
+    },
     "spot<>{}": {
       "snippet": "spot<${2:overlay spec}>{${1:text}}"
     },
     "spot<>[]{}": {
       "snippet": "spot<${3:overlay spec}>[${2:node options}]{${1:text}}"
     },
+    "spot<>(){}": {
+      "snippet": "spot<${2:overlay spec}>(${3:node name}){${1:text}}"
+    },
+    "spot<>()[]{}": {
+      "snippet": "spot<${3:overlay spec}>(${4:node name})[${2:node options}]{${1:text}}"
+    },
     "spot*{}": {
       "snippet": "spot*{${1:text}}"
     },
     "spot*[]{}": {
       "snippet": "spot*[${2:node options}]{${1:text}}"
     },
+    "spot*(){}": {
+      "snippet": "spot*(${2:node name}){${1:text}}"
+    },
+    "spot*()[]{}": {
+      "snippet": "spot*(${3:node name})[${2:node options}]{${1:text}}"
+    },
     "spot*<>{}": {
       "snippet": "spot*<${2:overlay spec}>{${1:text}}"
     },
     "spot*<>[]{}": {
       "snippet": "spot*<${3:overlay spec}>[${2:node options}]{${1:text}}"
     },
+    "spot*<>(){}": {
+      "snippet": "spot*<${2:overlay spec}>(${3:node name}){${1:text}}"
+    },
+    "spot*<>()[]{}": {
+      "snippet": "spot*<${3:overlay spec}>(${4:node name})[${2:node options}]{${1:text}}"
+    },
     "setspotlightcolor{}": {
       "snippet": "setspotlightcolor{${1:color}}"
     },
diff --git a/dev/packages/spotcolor.json b/dev/packages/spotcolor.json
new file mode 100644
index 000000000..773299175
--- /dev/null
+++ b/dev/packages/spotcolor.json
@@ -0,0 +1,43 @@
+{
+  "includes": {
+    "graphics": []
+  },
+  "macros": {
+    "NewSpotColorSpace{}": {
+      "snippet": "NewSpotColorSpace{${1:name}}"
+    },
+    "AddSpotColor{}{}{}{}": {
+      "snippet": "AddSpotColor{${1:colorspace}}{${2:color}}{${3:pdf name}}{${4:specification}}"
+    },
+    "SpotSpace": {},
+    "SetPageColorSpace{}": {
+      "snippet": "SetPageColorSpace{${1:colorspace}}"
+    },
+    "SpotColor{}{}": {
+      "snippet": "SpotColor{${1:color}}{${2:number}}"
+    },
+    "SetPageColorResource{}": {
+      "snippet": "SetPageColorResource{${1:resource}}"
+    },
+    "thecolorprofile": {},
+    "thecolor": {},
+    "act": {},
+    "csgrab{}{}": {
+      "snippet": "csgrab{${1:arg1}}{${2:arg2}}"
+    },
+    "obj": {},
+    "tempcs": {},
+    "ifhks": {},
+    "hkstrue": {},
+    "hksfalse": {},
+    "ifpantone": {},
+    "pantonetrue": {},
+    "pantonefalse": {}
+  },
+  "envs": {},
+  "options": [
+    "hks",
+    "pantone"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/spreadtab.json b/dev/packages/spreadtab.json
index e75dba030..520206490 100644
--- a/dev/packages/spreadtab.json
+++ b/dev/packages/spreadtab.json
@@ -37,6 +37,12 @@
     "cmidrule{}": {
       "snippet": "cmidrule{${1:a-b}}"
     },
+    "cmidrule(){}": {
+      "snippet": "cmidrule(${2:trim}){${1:a-b}}"
+    },
+    "cmidrule[](){}": {
+      "snippet": "cmidrule[${2:line width}](${3:trim}){${1:a-b}}"
+    },
     "morecmidrules": {},
     "specialrule{}{}{}": {
       "snippet": "specialrule{${1:line width}}{${2:above space}}{${3:below space}}"
diff --git a/dev/packages/sseq.json b/dev/packages/sseq.json
new file mode 100644
index 000000000..fd2180414
--- /dev/null
+++ b/dev/packages/sseq.json
@@ -0,0 +1,410 @@
+{
+  "includes": {
+    "ifthen": [],
+    "calc": [],
+    "pifont": [],
+    "pgf": [],
+    "xkeyval": []
+  },
+  "macros": {
+    "sseqpacking": {},
+    "sspacksmart": {},
+    "sspackhorizontal": {},
+    "sspackvertical": {},
+    "sspackdiagonal": {},
+    "ssmoveto{}{}": {
+      "snippet": "ssmoveto{${1:x}}{${2:y}}"
+    },
+    "ssmove{}{}": {
+      "snippet": "ssmove{${1:x}}{${2:y}}"
+    },
+    "ssdrop{}": {
+      "snippet": "ssdrop{${1:math}}"
+    },
+    "ssdrop[]{}": {
+      "snippet": "ssdrop[${2:options}]{${1:math}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ssname{}": {
+      "snippet": "ssname{${1:name}}"
+    },
+    "ssgoto{}": {
+      "snippet": "ssgoto{${1:name}}"
+    },
+    "ssprefix{}": {
+      "snippet": "ssprefix{${1:prefix}}"
+    },
+    "ssresetprefix": {},
+    "ssabsgoto{}": {
+      "snippet": "ssabsgoto{${1:name}}"
+    },
+    "ssdroplabel{}": {
+      "snippet": "ssdroplabel{${1:label}}"
+    },
+    "ssdroplabel[]{}": {
+      "snippet": "ssdroplabel[${2:options}]{${1:label}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "ssdropextension": {},
+    "ssstroke": {},
+    "ssstroke[]": {
+      "snippet": "ssstroke[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "ssarrowhead": {},
+    "ssarrowhead[]": {
+      "snippet": "ssarrowhead[${1:arrow style}]"
+    },
+    "ssinversearrowhead": {},
+    "ssinversearrowhead[]": {
+      "snippet": "ssinversearrowhead[${1:arrow style}]"
+    },
+    "ssline{}{}": {
+      "snippet": "ssline{${1:x}}{${2:y}}"
+    },
+    "ssline[]{}{}": {
+      "snippet": "ssline[${3:options}]{${1:x}}{${2:y}}"
+    },
+    "ssarrow{}{}": {
+      "snippet": "ssarrow{${1:x}}{${2:y}}"
+    },
+    "ssarrow[]{}{}": {
+      "snippet": "ssarrow[${3:options}]{${1:x}}{${2:y}}"
+    },
+    "ssbullstring{}{}{}": {
+      "snippet": "ssbullstring{${1:x}}{${2:y}}{${3:n}}"
+    },
+    "ssinfbullstring{}{}{}": {
+      "snippet": "ssinfbullstring{${1:x}}{${2:y}}{${3:n}}"
+    },
+    "ssdropbull": {},
+    "ssdropboxed{}": {
+      "snippet": "ssdropboxed{${1:math}}"
+    },
+    "ssdropcircled{}": {
+      "snippet": "ssdropcircled{${1:math}}"
+    },
+    "sscurve{}": {
+      "snippet": "sscurve{${1:value}}"
+    },
+    "ssdashedstroke": {},
+    "ssdashedcurve{}": {
+      "snippet": "ssdashedcurve{${1:value}}"
+    },
+    "ssdottedstroke": {},
+    "ssdottedcurve{}": {
+      "snippet": "ssdottedcurve{${1:value}}"
+    },
+    "sscurvedline{}{}{}": {
+      "snippet": "sscurvedline{${1:value}}{${2:x}}{${3:y}}"
+    },
+    "ssdashedline{}{}": {
+      "snippet": "ssdashedline{${1:x}}{${2:y}}"
+    },
+    "sscurveddashedline{}{}{}": {
+      "snippet": "sscurveddashedline{${1:value}}{${2:x}}{${3:y}}"
+    },
+    "sscurvedarrow{}{}{}": {
+      "snippet": "sscurvedarrow{${1:value}}{${2:x}}{${3:y}}"
+    },
+    "ssdashedarrow{}{}": {
+      "snippet": "ssdashedarrow{${1:x}}{${2:y}}"
+    },
+    "sscurveddashedarrow{}{}{}": {
+      "snippet": "sscurveddashedarrow{${1:value}}{${2:x}}{${3:y}}"
+    },
+    "ssvoidline{}{}": {
+      "snippet": "ssvoidline{${1:x}}{${2:y}}"
+    },
+    "ssvoidarrow{}{}": {
+      "snippet": "ssvoidarrow{${1:x}}{${2:y}}"
+    },
+    "ssinversevoidarrow{}{}": {
+      "snippet": "ssinversevoidarrow{${1:x}}{${2:y}}"
+    },
+    "ssplaceboxed{}{}{}": {
+      "snippet": "ssplaceboxed{${1:arg1}}{${2:arg2}}{${3:math}}"
+    },
+    "ssplacecircled{}{}{}": {
+      "snippet": "ssplacecircled{${1:arg1}}{${2:arg2}}{${3:math}}"
+    },
+    "ssplace{}{}{}": {
+      "snippet": "ssplace{${1:arg1}}{${2:arg2}}{${3:math}}"
+    },
+    "currprefix": {},
+    "dropvarname{}{}": {
+      "snippet": "dropvarname{${1:arg1}}{${2:arg2}}"
+    },
+    "extractcoords": {},
+    "ifcurroutofrange": {},
+    "ifoutofrange": {},
+    "outofrangetrue": {},
+    "outofrangefalse": {},
+    "ifnodrop{}{}": {
+      "snippet": "ifnodrop{${1:arg1}}{${2:arg2}}"
+    },
+    "ifuniquedrop{}{}": {
+      "snippet": "ifuniquedrop{${1:arg1}}{${2:arg2}}"
+    },
+    "ntimes{}{}": {
+      "snippet": "ntimes{${1:arg1}}{${2:arg2}}"
+    },
+    "putxyq{}": {
+      "snippet": "putxyq{${1:code}}"
+    },
+    "putxy{}": {
+      "snippet": "putxy{${1:code}}"
+    },
+    "setcnt": {},
+    "ssassertsource": {},
+    "ssconncolor": {},
+    "ssdroperrormsg{}{}": {
+      "snippet": "ssdroperrormsg{${1:arg1}}{${2:arg2}}"
+    },
+    "sseqbullcnt": {},
+    "sseqconcludeconnection": {},
+    "sseqconncommand": {},
+    "sseqgridstyle": {},
+    "sseqpack{}{}": {
+      "snippet": "sseqpack{${1:arg1}}{${2:arg2}}"
+    },
+    "sseqrearrange{}{}{}{}{}": {
+      "snippet": "sseqrearrange{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
+    },
+    "sseqsavecnti": {},
+    "sseqsavecntii": {},
+    "sseqsavecntiii": {},
+    "sseqsavecntiv": {},
+    "sseqsavecntix": {},
+    "sseqsavecnto": {},
+    "sseqsavecntv": {},
+    "sseqsavecntvi": {},
+    "sseqsavecntvii": {},
+    "sseqsavecntviii": {},
+    "sseqstacking{}{}{}": {
+      "snippet": "sseqstacking{${1:x}}{${2:y}}{${3:n}}"
+    },
+    "sseqwritecolor{}": {
+      "snippet": "sseqwritecolor{${1:color}}"
+    },
+    "sseqxlabel": {},
+    "sseqylabel": {},
+    "ssfinishpos": {},
+    "ssglobalname{}": {
+      "snippet": "ssglobalname{${1:name}}"
+    },
+    "ssgridchess{}{}": {
+      "snippet": "ssgridchess{${1:arg1}}{${2:arg2}}"
+    },
+    "ssgridcrossword{}{}": {
+      "snippet": "ssgridcrossword{${1:arg1}}{${2:arg2}}"
+    },
+    "ssgriddots{}{}": {
+      "snippet": "ssgriddots{${1:arg1}}{${2:arg2}}"
+    },
+    "ssgridgo{}{}": {
+      "snippet": "ssgridgo{${1:arg1}}{${2:arg2}}"
+    },
+    "ssgridnone{}{}": {
+      "snippet": "ssgridnone{${1:arg1}}{${2:arg2}}"
+    },
+    "sslabelcolor": {},
+    "ssplacecolor": {},
+    "ssprepareline{}{}": {
+      "snippet": "ssprepareline{${1:arg1}}{${2:arg2}}"
+    },
+    "sssetglobalname{}": {
+      "snippet": "sssetglobalname{${1:name}}"
+    },
+    "act": {},
+    "for": {},
+    "lst": {},
+    "temp": {},
+    "tempcmd": {},
+    "tempoutercmd": {},
+    "temptwo": {},
+    "tmpcnt": {},
+    "tmpname": {},
+    "tmpval": {},
+    "pgfdecoratedcompleteddistance": {},
+    "pgfdecoratedremainingdistance": {},
+    "pgfdecoratedinputsegmentcompleteddistance": {},
+    "pgfdecoratedinputsegmentremainingdistance": {},
+    "pgfdecorationsegmentamplitude": {},
+    "pgfdecorationsegmentlength": {},
+    "pgfdecorationsegmentangle": {},
+    "pgfdecorationsegmentaspect": {},
+    "pgfmetadecorationsegmentamplitude": {},
+    "pgfmetadecorationsegmentlength": {},
+    "ifpgfdecoratepathhascorners": {},
+    "pgfdecoratepathhascornerstrue": {},
+    "pgfdecoratepathhascornersfalse": {},
+    "pgfdeclaredecoration{}{}{}": {
+      "snippet": "pgfdeclaredecoration{${1:name}}{${2:initial state}}{${3:states}}"
+    },
+    "state{}{}": {
+      "snippet": "state{${1:name}}{${2:code}}"
+    },
+    "state{}[]{}": {
+      "snippet": "state{${1:name}}[${2:options}]{${3:code}}",
+      "keyvalindex": 3,
+      "keyvalpos": 1
+    },
+    "pgfifdecoration{}{}{}": {
+      "snippet": "pgfifdecoration{${1:name}}{${2:if code}}{${3:else code}}"
+    },
+    "pgfdeclaremetadecoration{}{}{}": {
+      "snippet": "pgfdeclaremetadecoration{${1:name}}{${2:initial state}}{${3:states}}"
+    },
+    "pgfifmetadecoration{}{}{}": {
+      "snippet": "pgfifmetadecoration{${1:name}}{${2:if code}}{${3:else code}}"
+    },
+    "decoration{}": {
+      "snippet": "decoration{${1:name}}"
+    },
+    "beforedecoration{}": {
+      "snippet": "beforedecoration{${1:before code}}"
+    },
+    "afterdecoration{}": {
+      "snippet": "afterdecoration{${1:after code}}"
+    },
+    "pgfmetadecoratedpathlength": {},
+    "pgfmetadecoratedcompleteddistance": {},
+    "pgfmetadecoratedinputsegmentcompleteddistance": {},
+    "pgfmetadecoratedinputsegmentremainingdistance": {},
+    "pgfdecoratebeforecode": {},
+    "pgfdecorateaftercode": {},
+    "pgfdecoratepath{}{}": {
+      "snippet": "pgfdecoratepath{${1:name}}{${2:path commands}}"
+    },
+    "pgfdecoratecurrentpath{}": {
+      "snippet": "pgfdecoratecurrentpath{${1:name}}"
+    },
+    "pgfdecoration{}": {
+      "snippet": "pgfdecoration{${1:name}}"
+    },
+    "endpgfdecoration": {},
+    "pgfdecorationpath": {},
+    "pgfdecoratedpath": {},
+    "pgfdecorateexistingpath": {},
+    "pgfdecoratedpathlength": {},
+    "pgfpointdecoratedpathfirst": {},
+    "pgfpointdecoratedpathlast": {},
+    "pgfpointdecoratedinputsegmentfirst": {},
+    "pgfpointdecoratedinputsegmentlast": {},
+    "pgfsetdecorationsegmenttransformation{}": {
+      "snippet": "pgfsetdecorationsegmenttransformation{${1:code}}"
+    },
+    "pgfmetadecoratedremainingdistance": {},
+    "pgfpointmetadecoratedpathfirst": {},
+    "pgfpointmetadecoratedpathlast": {},
+    "pgfdecoratedinputsegmentlength": {},
+    "pgfdecoratedangle": {},
+    "pgfdecoratedinputsegmentstartangle": {},
+    "pgfdecoratedinputsegmentendangle": {},
+    "pgfdecorationcurrentinputsegment": {},
+    "pgfdecorationnextinputsegmentobject": {},
+    "pgfdecorationinputsegmentmoveto": {},
+    "pgfdecorationinputsegmentlineto": {},
+    "pgfdecorationinputsegmentcurveto": {},
+    "pgfdecorationinputsegmentclosepath": {},
+    "pgfdecorationinputsegmentlast": {},
+    "ifpgfdecoraterectangleclockwise": {},
+    "pgfdecoraterectangleclockwisetrue": {},
+    "pgfdecoraterectangleclockwisefalse": {},
+    "pgfmetadecoration{}": {
+      "snippet": "pgfmetadecoration{${1:name}}"
+    },
+    "endpgfmetadecoration": {}
+  },
+  "envs": {
+    "sseq{}{}": {
+      "name": "sseq",
+      "snippet": "{${1:x-range}}{${2:y-range}}"
+    },
+    "sseq[]{}{}": {
+      "name": "sseq",
+      "snippet": "[${3:options}]{${1:x-range}}{${2:y-range}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "pgfdecoration{}": {
+      "name": "pgfdecoration",
+      "snippet": "{${1:name}}"
+    },
+    "pgfmetadecoration{}": {
+      "name": "pgfmetadecoration",
+      "snippet": "{${1:name}}"
+    }
+  },
+  "options": [
+    "color",
+    "nocolor",
+    "debug"
+  ],
+  "keyvals": [
+    [
+      "circled",
+      "boxed",
+      "color=",
+      "name=${1:name}"
+    ],
+    [
+      "U",
+      "LU",
+      "RU",
+      "L",
+      "R",
+      "LD",
+      "RD",
+      "D",
+      "color="
+    ],
+    [
+      "color=",
+      "curve=${1:value}",
+      "dashed",
+      "dashed=${1:dash type}",
+      "dotted",
+      "dotted=${1:dash type}",
+      "arrowfrom",
+      "arrowfrom=${1:arrow style}",
+      "arrowto",
+      "arrowto=${1:arrow style}",
+      "void"
+    ],
+    [
+      "switch if less than=${1:dimen} to ${2:new state}",
+      "switch if input segment less than=${1:dimen} to ${2:new state}",
+      "width=",
+      "repeat state=${1:repetitions}",
+      "next state=${1:new state}",
+      "if input segment is closepath={${1:options}}",
+      "auto end on length=",
+      "auto corner on length=",
+      "persistent precomputation=${1:precode}",
+      "persistent postcomputation=${1:postcode}"
+    ],
+    [
+      "grid=",
+      "entrysize=",
+      "labels=${1:labels}",
+      "xlabels=${1:labels}",
+      "ylabels=${1:labels}",
+      "labelstep=${1:integer}",
+      "xlabelstep=${1:integer}",
+      "ylabelstep=${1:integer}",
+      "gapsize=",
+      "xgapsize=",
+      "ygapsize=",
+      "gridstroke=",
+      "leak=",
+      "xleak=",
+      "yleak=",
+      "arrows=${1:arrow type}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/stack.json b/dev/packages/stack.json
new file mode 100644
index 000000000..6acc44099
--- /dev/null
+++ b/dev/packages/stack.json
@@ -0,0 +1,23 @@
+{
+  "includes": {},
+  "macros": {
+    "NewStack{}{}": {
+      "snippet": "NewStack{${1:stack name}}{${2:value}}"
+    },
+    "Stack{}": {
+      "snippet": "Stack{${1:stack}}"
+    },
+    "Push{}{}": {
+      "snippet": "Push{${1:stack}}{${2:value}}"
+    },
+    "Pop{}": {
+      "snippet": "Pop{${1:stack}}"
+    },
+    "ShowTop{}": {
+      "snippet": "ShowTop{${1:stack}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/stackengine.json b/dev/packages/stackengine.json
new file mode 100644
index 000000000..e4ada51a4
--- /dev/null
+++ b/dev/packages/stackengine.json
@@ -0,0 +1,204 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "listofitems": [],
+    "calc": []
+  },
+  "macros": {
+    "Sstackgap": {},
+    "Lstackgap": {},
+    "setstackgap{}{}": {
+      "snippet": "setstackgap{${1:S or L}}{${2:gap}}"
+    },
+    "stackgap": {},
+    "stackalignment": {},
+    "quietstack": {},
+    "useanchorwidth": {},
+    "stacktype": {},
+    "stackMath": {},
+    "lstackMath": {},
+    "stackText": {},
+    "lstackText": {},
+    "strutlongstacks{}": {
+      "snippet": "strutlongstacks{${1:T or F}}"
+    },
+    "strutshortanchors{}": {
+      "snippet": "strutshortanchors{${1:T or F}}"
+    },
+    "setstackEOL{}": {
+      "snippet": "setstackEOL{${1:end-of-line character}}"
+    },
+    "stackengine{}{}{}{}{}{}{}{}": {
+      "snippet": "stackengine{${1:gap}}{${2:anchor}}{${3:item}}{${4:O or U}}{${5:align}}{${6:quiet-bool}}{${7:anchorwidth-bool}}{${8:type}}"
+    },
+    "stackon{}{}": {
+      "snippet": "stackon{${1:anchor}}{${2:item}}"
+    },
+    "stackon[]{}{}": {
+      "snippet": "stackon[${3:length}]{${1:anchor}}{${2:item}}"
+    },
+    "stackunder{}{}": {
+      "snippet": "stackunder{${1:anchor}}{${2:item}}"
+    },
+    "stackunder[]{}{}": {
+      "snippet": "stackunder[${3:length}]{${1:anchor}}{${2:item}}"
+    },
+    "Shortstack{}": {
+      "snippet": "Shortstack{${1:item1 ... itemN anchor}}"
+    },
+    "Shortstack[]{}": {
+      "snippet": "Shortstack[${2:align}]{${1:item1 ... itemN anchor}}"
+    },
+    "Longstack{}": {
+      "snippet": "Longstack{${1:item1 ... itemN anchor}}"
+    },
+    "Longstack[]{}": {
+      "snippet": "Longstack[${2:align}]{${1:item1 ... itemN anchor}}"
+    },
+    "Shortunderstack{}": {
+      "snippet": "Shortunderstack{${1:anchor item1 ... itemN}}"
+    },
+    "Shortunderstack[]{}": {
+      "snippet": "Shortunderstack[${2:align}]{${1:anchor item1 ... itemN}}"
+    },
+    "Longunderstack{}": {
+      "snippet": "Longunderstack{${1:anchor item1 ... itemN}}"
+    },
+    "Longunderstack[]{}": {
+      "snippet": "Longunderstack[${2:align}]{${1:anchor item1 ... itemN}}"
+    },
+    "tllap[]{}": {
+      "snippet": "tllap[${2:length}]{${1:item}}"
+    },
+    "tllap{}": {
+      "snippet": "tllap{${1:item}}"
+    },
+    "tclap[]{}": {
+      "snippet": "tclap[${2:length}]{${1:item}}"
+    },
+    "tclap{}": {
+      "snippet": "tclap{${1:item}}"
+    },
+    "trlap[]{}": {
+      "snippet": "trlap[${2:length}]{${1:item}}"
+    },
+    "trlap{}": {
+      "snippet": "trlap{${1:item}}"
+    },
+    "bllap[]{}": {
+      "snippet": "bllap[${2:length}]{${1:item}}"
+    },
+    "bllap{}": {
+      "snippet": "bllap{${1:item}}"
+    },
+    "bclap[]{}": {
+      "snippet": "bclap[${2:length}]{${1:item}}"
+    },
+    "bclap{}": {
+      "snippet": "bclap{${1:item}}"
+    },
+    "brlap[]{}": {
+      "snippet": "brlap[${2:length}]{${1:item}}"
+    },
+    "brlap{}": {
+      "snippet": "brlap{${1:item}}"
+    },
+    "toplap{}{}": {
+      "snippet": "toplap{${1:direction}}{${2:item}}"
+    },
+    "toplap[]{}{}": {
+      "snippet": "toplap[${3:length}]{${1:direction}}{${2:item}}"
+    },
+    "bottomlap{}{}": {
+      "snippet": "bottomlap{${1:direction}}{${2:item}}"
+    },
+    "bottomlap[]{}{}": {
+      "snippet": "bottomlap[${3:length}]{${1:direction}}{${2:item}}"
+    },
+    "stackanchor{}{}": {
+      "snippet": "stackanchor{${1:top item}}{${2:bottom item}}"
+    },
+    "stackanchor[]{}{}": {
+      "snippet": "stackanchor[${3:gap}]{${1:top item}}{${2:bottom item}}"
+    },
+    "Centerstack{}": {
+      "snippet": "Centerstack{${1:item1 ... itemN}}"
+    },
+    "Centerstack[]{}": {
+      "snippet": "Centerstack[${2:align}]{${1:item1 ... itemN}}"
+    },
+    "Vectorstack{}": {
+      "snippet": "Vectorstack{${1:item1 ... itemN}}"
+    },
+    "Vectorstack[]{}": {
+      "snippet": "Vectorstack[${2:align}]{${1:item1 ... itemN}}"
+    },
+    "parenVectorstack{}": {
+      "snippet": "parenVectorstack{${1:item1 ... itemN}}"
+    },
+    "parenVectorstack[]{}": {
+      "snippet": "parenVectorstack[${2:align}]{${1:item1 ... itemN}}"
+    },
+    "bracketVectorstack{}": {
+      "snippet": "bracketVectorstack{${1:item1 ... itemN}}"
+    },
+    "bracketVectorstack[]{}": {
+      "snippet": "bracketVectorstack[${2:align}]{${1:item1 ... itemN}}"
+    },
+    "braceVectorstack{}": {
+      "snippet": "braceVectorstack{${1:item1 ... itemN}}"
+    },
+    "braceVectorstack[]{}": {
+      "snippet": "braceVectorstack[${2:align}]{${1:item1 ... itemN}}"
+    },
+    "vertVectorstack{}": {
+      "snippet": "vertVectorstack{${1:item1 ... itemN}}"
+    },
+    "vertVectorstack[]{}": {
+      "snippet": "vertVectorstack[${2:align}]{${1:item1 ... itemN}}"
+    },
+    "ensurestackMath{}": {
+      "snippet": "ensurestackMath{${1:formula}}"
+    },
+    "abovebaseline{}": {
+      "snippet": "abovebaseline{${1:item}}"
+    },
+    "abovebaseline[]{}": {
+      "snippet": "abovebaseline[${2:gap}]{${1:item}}"
+    },
+    "belowbaseline{}": {
+      "snippet": "belowbaseline{${1:item}}"
+    },
+    "belowbaseline[]{}": {
+      "snippet": "belowbaseline[${2:gap}]{${1:item}}"
+    },
+    "stackinset{}{}{}{}{}{}": {
+      "snippet": "stackinset{${1:Halign}}{${2:Hoffset}}{${3:Valign}}{${4:Voffset}}{${5:inset item}}{${6:anchor item}}"
+    },
+    "addstackgap{}": {
+      "snippet": "addstackgap{${1:item}}"
+    },
+    "addstackgap[]{}": {
+      "snippet": "addstackgap[${2:gap}]{${1:item}}"
+    },
+    "hsmash{}": {
+      "snippet": "hsmash{${1:item}}"
+    },
+    "savestack{}{}": {
+      "snippet": "savestack{${1:macro}}{${2:stacking operation}}"
+    },
+    "stackengineversionnumber": {},
+    "removebs{}": {
+      "snippet": "removebs{${1:arg}}"
+    },
+    "stackedbox": {},
+    "bottominset": {},
+    "topinset": {}
+  },
+  "envs": {},
+  "options": [
+    "usestackEOL",
+    "oldsyntax"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/standalone.json b/dev/packages/standalone.json
new file mode 100644
index 000000000..c18b7b32f
--- /dev/null
+++ b/dev/packages/standalone.json
@@ -0,0 +1,89 @@
+{
+  "includes": {
+    "adjustbox": [],
+    "currfile": [],
+    "filemod-expmin": [],
+    "gincltex": [],
+    "ifluatex": [],
+    "ifpdf": [],
+    "ifxetex": [],
+    "shellesc": [],
+    "trimclip": [],
+    "varwidth": [],
+    "xkeyval": []
+  },
+  "macros": {
+    "includestandalone{}": {
+      "snippet": "includestandalone{${1:file}}"
+    },
+    "includestandalone[]{}": {
+      "snippet": "includestandalone[${2:options}]{${1:file}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "standaloneconfig{}": {
+      "snippet": "standaloneconfig{${1:options}}"
+    },
+    "standaloneignore": {},
+    "ifstandalone": {},
+    "standalonetrue": {},
+    "standalonefalse": {},
+    "ifstandalonebeamer": {},
+    "standalonebeamertrue": {},
+    "standalonebeamerfalse": {},
+    "IfStandalone{}{}": {
+      "snippet": "IfStandalone{${1:code for standalone}}{${2:code for main document}}"
+    },
+    "onlyifstandalone{}": {
+      "snippet": "onlyifstandalone{${1:code}}"
+    }
+  },
+  "envs": {
+    "standalone": {}
+  },
+  "options": [
+    "subpreambles",
+    "sort",
+    "print",
+    "comments",
+    "nocomments",
+    "obeyclassoptions",
+    "group",
+    "mode=",
+    "extension=${1:extension}",
+    "build={${1:build options}}"
+  ],
+  "keyvals": [
+    [
+      "alt={${1:alt text}}",
+      "bb=${1:llx lly urx ury}",
+      "bbllx=",
+      "bblly=",
+      "bburx=",
+      "bbury=",
+      "natwidth=",
+      "natheight=",
+      "hiresbb",
+      "pagebox=",
+      "viewport=${1:llx lly urx ury}",
+      "trim=${1:llx lly urx ury}",
+      "angle=${1:degrees}",
+      "origin=",
+      "width=",
+      "height=",
+      "totalheight=",
+      "keepaspectratio",
+      "scale=${1:factor}",
+      "clip",
+      "draft",
+      "type=${1:file type}",
+      "ext=${1:file extension}",
+      "read=${1:read-file extension}",
+      "command=",
+      "quiet",
+      "page=${1:page number}",
+      "interpolate",
+      "decodearray={${1:color array}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/standardsectioning.json b/dev/packages/standardsectioning.json
new file mode 100644
index 000000000..fd59ac739
--- /dev/null
+++ b/dev/packages/standardsectioning.json
@@ -0,0 +1,11 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {},
+  "options": [
+    "article",
+    "book",
+    "report"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/statistics.json b/dev/packages/statistics.json
new file mode 100644
index 000000000..9550446ee
--- /dev/null
+++ b/dev/packages/statistics.json
@@ -0,0 +1,527 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "siunitx": [],
+    "tikz": [],
+    "tikzlibrarydatavisualization": [],
+    "tikzlibraryfit": []
+  },
+  "macros": {
+    "StatsSortData{}": {
+      "snippet": "StatsSortData{${1:cmd}}"
+    },
+    "StatsRangeData{}": {
+      "snippet": "StatsRangeData{${1:cmd}}"
+    },
+    "statisticssetup{}": {
+      "snippet": "statisticssetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "statisticssetup[]{}": {
+      "snippet": "statisticssetup[${2:module}]{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 1
+    },
+    "StatsTable{}": {
+      "snippet": "StatsTable{${1:data source}}"
+    },
+    "StatsTable[]{}": {
+      "snippet": "StatsTable[${2:options}]{${1:data source}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "StatsTable{}[]": {
+      "snippet": "StatsTable{${1:data source}}[${2:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "StatsTable[]{}[]": {
+      "snippet": "StatsTable[${2:options}]{${1:data source}}[${3:options}]",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "IN": {},
+    "currentcolumn": {},
+    "valuename": {},
+    "countname": {},
+    "freqname": {},
+    "iccname": {},
+    "icfname": {},
+    "dccname": {},
+    "dcfname": {},
+    "firsthline": {},
+    "lasthline": {},
+    "StatsGraph{}": {
+      "snippet": "StatsGraph{${1:data source}}"
+    },
+    "StatsGraph[]{}": {
+      "snippet": "StatsGraph[${2:options}]{${1:data source}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "StatsGraph{}[]": {
+      "snippet": "StatsGraph{${1:data source}}[${2:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 1
+    },
+    "StatsGraph[]{}[]": {
+      "snippet": "StatsGraph[${2:options}]{${1:data source}}[${3:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "ccountname": {},
+    "cfreqname": {},
+    "min": {},
+    "max": {},
+    "range": {},
+    "xstep": {},
+    "total": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "values",
+      "values=${1:row header text}",
+      "counts",
+      "counts=${1:row header text}",
+      "frequencies",
+      "frequencies=${1:row header text}",
+      "icc",
+      "icc=${1:row header text}",
+      "icf",
+      "icf=${1:row header text}",
+      "dcc",
+      "dcc=${1:row header text}",
+      "dcf",
+      "dcf=${1:row header text}",
+      "novalues",
+      "nocounts",
+      "nofrequencies",
+      "noicc",
+      "nodcc",
+      "noicf",
+      "nodcf",
+      "values/header=${1:row header text}",
+      "counts/header=${1:row header text}",
+      "frequencies/header=${1:row header text}",
+      "icc/header=${1:row header text}",
+      "icf/header=${1:row header text}",
+      "dcc/header=${1:row header text}",
+      "dcf/header=${1:row header text}",
+      "values/format=${1:formatting code}",
+      "counts/format=${1:formatting code}",
+      "frequencies/format=${1:formatting code}",
+      "icc/format=${1:formatting code}",
+      "icf/format=${1:formatting code}",
+      "dcc/format=${1:formatting code}",
+      "dcf/format=${1:formatting code}",
+      "allcounts/format=${1:formatting code}",
+      "allfreqs/format=${1:formatting code}",
+      "allfreqs/format/percent",
+      "allfreqs/format/real",
+      "digits=${1:integer}",
+      "showonly={${1:integer/range list}}",
+      "showonly/hidden=${1:formatting code}",
+      "showonly/shown=${1:formatting code}",
+      "maxcols={${1:integer list}}",
+      "tablesep=${1:TeX content}",
+      "preline=${1:array content}",
+      "postline=${1:array content}",
+      "outline=${1:array content}",
+      "newline=${1:array content}",
+      "coltype=${1:coltype}",
+      "headcoltype=${1:coltype}",
+      "frame=",
+      "valign=",
+      "picture={${1:TikZ options}}",
+      "picture/reset",
+      "axissystem={${1:TikZ axis options}}",
+      "axissystem/reset",
+      "width=",
+      "height",
+      "tikzinfo'={${1:TikZ picture code}}",
+      "tikzinfo'/reset",
+      "tikzinfo={${1:TikZ picture code}}",
+      "tikzinfo/reset",
+      "style={${1:TikZ path options}}",
+      "style/reset",
+      "comb/style={${1:TikZ path options}}",
+      "comb/style/reset",
+      "histogram/style={${1:TikZ path options}}",
+      "histogram/style/reset",
+      "cumulative/style={${1:TikZ path options}}",
+      "cumulative/style/reset",
+      "showonly={${1:integer/range list}}",
+      "counts",
+      "counts=${1:label}",
+      "frequencies",
+      "frequencies=${1:label}",
+      "comb/counts",
+      "comb/counts=${1:label}",
+      "comb/frequencies",
+      "comb/frequencies=${1:label}",
+      "histogram/counts",
+      "histogram/counts=${1:label}",
+      "histogram/frequencies",
+      "histogram/frequencies=${1:label}",
+      "cumulative/counts",
+      "cumulative/counts=${1:label}",
+      "cumulative/frequencies",
+      "cumulative/frequencies=${1:label}",
+      "counts/label=${1:label}",
+      "frequencies/label=${1:label}",
+      "comb/counts/label=${1:label}",
+      "comb/frequencies/label=${1:label}",
+      "histogram/counts/label=${1:label}",
+      "histogram/frequencies/label=${1:label}",
+      "cumulative/counts/label=${1:label}",
+      "cumulative/frequencies/label=${1:label}",
+      "y/label=${1:label}",
+      "comb/y/label=${1:label}",
+      "histogram/y/label=${1:label}",
+      "cumulative/y/label=${1:label}",
+      "counts/axis={${1:TikZ axis options}}",
+      "frequencies/axis={${1:TikZ axis options}}",
+      "comb/counts/axis={${1:TikZ axis options}}",
+      "comb/frequencies/axis={${1:TikZ axis options}}",
+      "histogram/counts/axis={${1:TikZ axis options}}",
+      "histogram/frequencies/axis={${1:TikZ axis options}}",
+      "cumulative/counts/axis={${1:TikZ axis options}}",
+      "cumulative/frequencies/axis={${1:TikZ axis options}}",
+      "counts/axis/reset",
+      "frequencies/axis/reset",
+      "comb/counts/axis/reset",
+      "comb/frequencies/axis/reset",
+      "histogram/counts/axis/reset",
+      "histogram/frequencies/axis/reset",
+      "cumulative/counts/axis/reset",
+      "cumulative/frequencies/axis/reset",
+      "y/axis={${1:TikZ axis options}}",
+      "y/axis/reset",
+      "comb/axis={${1:TikZ axis options}}",
+      "comb/axis/reset",
+      "histogram/axis={${1:TikZ axis options}}",
+      "histogram/axis/reset",
+      "cumulative/axis={${1:TikZ axis options}}",
+      "cumulative/axis/reset",
+      "counts/format=${1:formatting code}",
+      "frequencies/format=${1:formatting code}",
+      "y/format=${1:formatting code}",
+      "comb/counts/format=${1:formatting code}",
+      "comb/frequencies/format=${1:formatting code}",
+      "comb/y/format=${1:formatting code}",
+      "histogram/counts/format=${1:formatting code}",
+      "histogram/frequencies/format=${1:formatting code}",
+      "histogram/y/format=${1:formatting code}",
+      "cumulative/counts/format=${1:formatting code}",
+      "cumulative/frequencies/format=${1:formatting code}",
+      "cumulative/y/format=${1:formatting code}",
+      "frequencies/format/real=${1:places}",
+      "comb/frequencies/format/real=${1:places}",
+      "histogram/frequencies/format/real=${1:places}",
+      "cumulative/frequencies/format/real=${1:places}",
+      "frequencies/format/percent=${1:places}",
+      "comb/frequencies/format/percent=${1:places}",
+      "histogram/frequencies/format/percent=${1:places}",
+      "cumulative/frequencies/format/percent=${1:places}",
+      "counts/margin=${1:expr}",
+      "frequencies/margin=${1:expr}",
+      "y/margin=${1:expr}",
+      "comb/counts/margin=${1:expr}",
+      "comb/frequencies/margin=${1:expr}",
+      "comb/y/margin=${1:expr}",
+      "histogram/counts/margin=${1:expr}",
+      "histogram/frequencies/margin=${1:expr}",
+      "histogram/y/margin=${1:expr}",
+      "cumulative/counts/margin=${1:expr}",
+      "cumulative/frequencies/margin=${1:expr}",
+      "cumulative/y/margin=${1:expr}",
+      "values/label=${1:label}",
+      "x/label=${1:label}",
+      "comb/values/label=${1:label}",
+      "comb/x/label=${1:label}",
+      "histogram/values/label=${1:label}",
+      "histogram/x/label=${1:label}",
+      "cumulative/values/label=${1:label}",
+      "cumulative/x/label=${1:label}",
+      "values/axis={${1:TikZ axis options}}",
+      "x/axis={${1:TikZ axis options}}",
+      "comb/values/axis={${1:TikZ axis options}}",
+      "comb/x/axis={${1:TikZ axis options}}",
+      "histogram/values/axis={${1:TikZ axis options}}",
+      "histogram/x/axis={${1:TikZ axis options}}",
+      "cumulative/values/axis={${1:TikZ axis options}}",
+      "cumulative/x/axis={${1:TikZ axis options}}",
+      "values/axis/reset",
+      "x/axis/reset",
+      "comb/values/axis/reset",
+      "comb/x/axis/reset",
+      "histogram/values/axis/reset",
+      "histogram/x/axis/reset",
+      "cumulative/values/axis/reset",
+      "cumulative/x/axis/reset",
+      "values/format=${1:formatting code}",
+      "x/format=${1:formatting code}",
+      "comb/values/format=${1:formatting code}",
+      "comb/x/format=${1:formatting code}",
+      "histogram/values/format=${1:formatting code}",
+      "histogram/x/format=${1:formatting code}",
+      "cumulative/values/format=${1:formatting code}",
+      "cumulative/x/format=${1:formatting code}",
+      "values/margin=${1:expr}",
+      "x/margin=${1:expr}",
+      "comb/values/margin=${1:expr}",
+      "comb/x/margin=${1:expr}",
+      "histogram/values/margin=${1:expr}",
+      "histogram/x/margin=${1:expr}",
+      "cumulative/values/margin=${1:expr}",
+      "cumulative/x/margin=${1:expr}",
+      "cumulative",
+      "decreasing",
+      "histogram/areas",
+      "histogram/areas/style={${1:TikZ node options}}",
+      "histogram/areas/style/reset",
+      "histogram/counts/autostep",
+      "histogram/counts/autostep=${1:fp expr}",
+      "histogram/frequencies/autostep",
+      "histogram/frequencies/autostep=${1:fp expr}",
+      "histogram/y/autostep",
+      "histogram/y/autostep=${1:fp expr}",
+      "histogram/legend={${1:legend keys}}",
+      "histogram/legend/x",
+      "histogram/legend/x=${1:fp expr}",
+      "histogram/legend/w",
+      "histogram/legend/w=${1:fp expr}",
+      "histogram/legend/y=${1:fp expr}",
+      "histogram/legend/h=${1:fp expr}",
+      "histogram/legend/area=${1:fp expr}",
+      "histogram/legend/options={${1:TikZ node options}}",
+      "histogram/legend/options/reset",
+      "histogram/legend/label=${1:TikZ label value}"
+    ],
+    [
+      "values",
+      "values=${1:row header text}",
+      "counts",
+      "counts=${1:row header text}",
+      "frequencies",
+      "frequencies=${1:row header text}",
+      "icc",
+      "icc=${1:row header text}",
+      "icf",
+      "icf=${1:row header text}",
+      "dcc",
+      "dcc=${1:row header text}",
+      "dcf",
+      "dcf=${1:row header text}",
+      "novalues",
+      "nocounts",
+      "nofrequencies",
+      "noicc",
+      "nodcc",
+      "noicf",
+      "nodcf",
+      "values/header=${1:row header text}",
+      "counts/header=${1:row header text}",
+      "frequencies/header=${1:row header text}",
+      "icc/header=${1:row header text}",
+      "icf/header=${1:row header text}",
+      "dcc/header=${1:row header text}",
+      "dcf/header=${1:row header text}",
+      "values/format=${1:formatting code}",
+      "counts/format=${1:formatting code}",
+      "frequencies/format=${1:formatting code}",
+      "icc/format=${1:formatting code}",
+      "icf/format=${1:formatting code}",
+      "dcc/format=${1:formatting code}",
+      "dcf/format=${1:formatting code}",
+      "allcounts/format=${1:formatting code}",
+      "allfreqs/format=${1:formatting code}",
+      "allfreqs/format/percent",
+      "allfreqs/format/real",
+      "digits=${1:integer}",
+      "showonly={${1:integer/range list}}",
+      "showonly/hidden=${1:formatting code}",
+      "showonly/shown=${1:formatting code}",
+      "maxcols={${1:integer list}}",
+      "tablesep=${1:TeX content}",
+      "preline=${1:array content}",
+      "postline=${1:array content}",
+      "outline=${1:array content}",
+      "newline=${1:array content}",
+      "coltype=${1:coltype}",
+      "headcoltype=${1:coltype}",
+      "frame=",
+      "valign="
+    ],
+    [
+      "picture={${1:TikZ options}}",
+      "picture/reset",
+      "axissystem={${1:TikZ axis options}}",
+      "axissystem/reset",
+      "width=",
+      "height",
+      "tikzinfo'={${1:TikZ picture code}}",
+      "tikzinfo'/reset",
+      "tikzinfo={${1:TikZ picture code}}",
+      "tikzinfo/reset",
+      "style={${1:TikZ path options}}",
+      "style/reset",
+      "comb/style={${1:TikZ path options}}",
+      "comb/style/reset",
+      "histogram/style={${1:TikZ path options}}",
+      "histogram/style/reset",
+      "cumulative/style={${1:TikZ path options}}",
+      "cumulative/style/reset",
+      "showonly={${1:integer/range list}}",
+      "counts",
+      "counts=${1:label}",
+      "frequencies",
+      "frequencies=${1:label}",
+      "comb/counts",
+      "comb/counts=${1:label}",
+      "comb/frequencies",
+      "comb/frequencies=${1:label}",
+      "histogram/counts",
+      "histogram/counts=${1:label}",
+      "histogram/frequencies",
+      "histogram/frequencies=${1:label}",
+      "cumulative/counts",
+      "cumulative/counts=${1:label}",
+      "cumulative/frequencies",
+      "cumulative/frequencies=${1:label}",
+      "counts/label=${1:label}",
+      "frequencies/label=${1:label}",
+      "comb/counts/label=${1:label}",
+      "comb/frequencies/label=${1:label}",
+      "histogram/counts/label=${1:label}",
+      "histogram/frequencies/label=${1:label}",
+      "cumulative/counts/label=${1:label}",
+      "cumulative/frequencies/label=${1:label}",
+      "y/label=${1:label}",
+      "comb/y/label=${1:label}",
+      "histogram/y/label=${1:label}",
+      "cumulative/y/label=${1:label}",
+      "counts/axis={${1:TikZ axis options}}",
+      "frequencies/axis={${1:TikZ axis options}}",
+      "comb/counts/axis={${1:TikZ axis options}}",
+      "comb/frequencies/axis={${1:TikZ axis options}}",
+      "histogram/counts/axis={${1:TikZ axis options}}",
+      "histogram/frequencies/axis={${1:TikZ axis options}}",
+      "cumulative/counts/axis={${1:TikZ axis options}}",
+      "cumulative/frequencies/axis={${1:TikZ axis options}}",
+      "counts/axis/reset",
+      "frequencies/axis/reset",
+      "comb/counts/axis/reset",
+      "comb/frequencies/axis/reset",
+      "histogram/counts/axis/reset",
+      "histogram/frequencies/axis/reset",
+      "cumulative/counts/axis/reset",
+      "cumulative/frequencies/axis/reset",
+      "y/axis={${1:TikZ axis options}}",
+      "y/axis/reset",
+      "comb/axis={${1:TikZ axis options}}",
+      "comb/axis/reset",
+      "histogram/axis={${1:TikZ axis options}}",
+      "histogram/axis/reset",
+      "cumulative/axis={${1:TikZ axis options}}",
+      "cumulative/axis/reset",
+      "counts/format=${1:formatting code}",
+      "frequencies/format=${1:formatting code}",
+      "y/format=${1:formatting code}",
+      "comb/counts/format=${1:formatting code}",
+      "comb/frequencies/format=${1:formatting code}",
+      "comb/y/format=${1:formatting code}",
+      "histogram/counts/format=${1:formatting code}",
+      "histogram/frequencies/format=${1:formatting code}",
+      "histogram/y/format=${1:formatting code}",
+      "cumulative/counts/format=${1:formatting code}",
+      "cumulative/frequencies/format=${1:formatting code}",
+      "cumulative/y/format=${1:formatting code}",
+      "frequencies/format/real=${1:places}",
+      "comb/frequencies/format/real=${1:places}",
+      "histogram/frequencies/format/real=${1:places}",
+      "cumulative/frequencies/format/real=${1:places}",
+      "frequencies/format/percent=${1:places}",
+      "comb/frequencies/format/percent=${1:places}",
+      "histogram/frequencies/format/percent=${1:places}",
+      "cumulative/frequencies/format/percent=${1:places}",
+      "counts/margin=${1:expr}",
+      "frequencies/margin=${1:expr}",
+      "y/margin=${1:expr}",
+      "comb/counts/margin=${1:expr}",
+      "comb/frequencies/margin=${1:expr}",
+      "comb/y/margin=${1:expr}",
+      "histogram/counts/margin=${1:expr}",
+      "histogram/frequencies/margin=${1:expr}",
+      "histogram/y/margin=${1:expr}",
+      "cumulative/counts/margin=${1:expr}",
+      "cumulative/frequencies/margin=${1:expr}",
+      "cumulative/y/margin=${1:expr}",
+      "values/label=${1:label}",
+      "x/label=${1:label}",
+      "comb/values/label=${1:label}",
+      "comb/x/label=${1:label}",
+      "histogram/values/label=${1:label}",
+      "histogram/x/label=${1:label}",
+      "cumulative/values/label=${1:label}",
+      "cumulative/x/label=${1:label}",
+      "values/axis={${1:TikZ axis options}}",
+      "x/axis={${1:TikZ axis options}}",
+      "comb/values/axis={${1:TikZ axis options}}",
+      "comb/x/axis={${1:TikZ axis options}}",
+      "histogram/values/axis={${1:TikZ axis options}}",
+      "histogram/x/axis={${1:TikZ axis options}}",
+      "cumulative/values/axis={${1:TikZ axis options}}",
+      "cumulative/x/axis={${1:TikZ axis options}}",
+      "values/axis/reset",
+      "x/axis/reset",
+      "comb/values/axis/reset",
+      "comb/x/axis/reset",
+      "histogram/values/axis/reset",
+      "histogram/x/axis/reset",
+      "cumulative/values/axis/reset",
+      "cumulative/x/axis/reset",
+      "values/format=${1:formatting code}",
+      "x/format=${1:formatting code}",
+      "comb/values/format=${1:formatting code}",
+      "comb/x/format=${1:formatting code}",
+      "histogram/values/format=${1:formatting code}",
+      "histogram/x/format=${1:formatting code}",
+      "cumulative/values/format=${1:formatting code}",
+      "cumulative/x/format=${1:formatting code}",
+      "values/margin=${1:expr}",
+      "x/margin=${1:expr}",
+      "comb/values/margin=${1:expr}",
+      "comb/x/margin=${1:expr}",
+      "histogram/values/margin=${1:expr}",
+      "histogram/x/margin=${1:expr}",
+      "cumulative/values/margin=${1:expr}",
+      "cumulative/x/margin=${1:expr}",
+      "cumulative",
+      "decreasing",
+      "histogram/areas",
+      "histogram/areas/style={${1:TikZ node options}}",
+      "histogram/areas/style/reset",
+      "histogram/counts/autostep",
+      "histogram/counts/autostep=${1:fp expr}",
+      "histogram/frequencies/autostep",
+      "histogram/frequencies/autostep=${1:fp expr}",
+      "histogram/y/autostep",
+      "histogram/y/autostep=${1:fp expr}",
+      "histogram/legend={${1:legend keys}}",
+      "histogram/legend/x",
+      "histogram/legend/x=${1:fp expr}",
+      "histogram/legend/w",
+      "histogram/legend/w=${1:fp expr}",
+      "histogram/legend/y=${1:fp expr}",
+      "histogram/legend/h=${1:fp expr}",
+      "histogram/legend/area=${1:fp expr}",
+      "histogram/legend/options={${1:TikZ node options}}",
+      "histogram/legend/options/reset",
+      "histogram/legend/label=${1:TikZ label value}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/stex.json b/dev/packages/stex.json
new file mode 100644
index 000000000..7e4ac8e51
--- /dev/null
+++ b/dev/packages/stex.json
@@ -0,0 +1,985 @@
+{
+  "includes": {
+    "l3keys2e": [],
+    "ltxcmds": [],
+    "stex-logo": [],
+    "standalone": [],
+    "babel": [],
+    "stex-tikzinput": []
+  },
+  "macros": {
+    "libinput{}": {
+      "snippet": "libinput{${1:file}}"
+    },
+    "libusepackage{}": {
+      "snippet": "libusepackage{${1:package}}"
+    },
+    "libusepackage[]{}": {
+      "snippet": "libusepackage[${2:options}]{${1:package}}"
+    },
+    "addmhbibresource{}": {
+      "snippet": "addmhbibresource{${1:bib file}}"
+    },
+    "addmhbibresource[]{}": {
+      "snippet": "addmhbibresource[${2:archive}]{${1:bib file}}"
+    },
+    "libusetikzlibrary{}": {
+      "snippet": "libusetikzlibrary{${1:library}}"
+    },
+    "ifstexhtml": {},
+    "stexhtmlfalse": {},
+    "stexhtmltrue": {},
+    "STEXinvisible{}": {
+      "snippet": "STEXinvisible{${1:code}}"
+    },
+    "skipfragment": {},
+    "setsectionlevel{}": {
+      "snippet": "setsectionlevel{${1:level}}"
+    },
+    "currentsectionlevel": {},
+    "Currentsectionlevel": {},
+    "inputref{}": {
+      "snippet": "inputref{${1:file}}"
+    },
+    "inputref[]{}": {
+      "snippet": "inputref[${2:archive}]{${1:file}}"
+    },
+    "mhinput{}": {
+      "snippet": "mhinput{${1:file}}"
+    },
+    "mhinput[]{}": {
+      "snippet": "mhinput[${2:archive}]{${1:file}}"
+    },
+    "ifinputref": {},
+    "inputreftrue": {},
+    "inputreffalse": {},
+    "IfInputref{}{}": {
+      "snippet": "IfInputref{${1:true}}{${2:false}}"
+    },
+    "mhgraphics{}": {
+      "snippet": "mhgraphics{${1:imagefile}}"
+    },
+    "mhgraphics[]{}": {
+      "snippet": "mhgraphics[${2:options}]{${1:imagefile}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "cmhgraphics{}": {
+      "snippet": "cmhgraphics{${1:imagefile}}"
+    },
+    "cmhgraphics[]{}": {
+      "snippet": "cmhgraphics[${2:options}]{${1:imagefile}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "lstinputmhlisting{}": {
+      "snippet": "lstinputmhlisting{${1:file}}"
+    },
+    "lstinputmhlisting[]{}": {
+      "snippet": "lstinputmhlisting[${2:options}]{${1:file}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "clstinputmhlisting{}": {
+      "snippet": "clstinputmhlisting{${1:file}}"
+    },
+    "clstinputmhlisting[]{}": {
+      "snippet": "clstinputmhlisting[${2:options}]{${1:file}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "sref{}": {
+      "snippet": "sref{${1:label}}"
+    },
+    "sref[]{}": {
+      "snippet": "sref[${2:options}]{${1:label}}"
+    },
+    "sref[]{}[]": {
+      "snippet": "sref[${2:options1}]{${1:label}}[${3:options2}]"
+    },
+    "srefsetin{}{}": {
+      "snippet": "srefsetin{${1:file}}{${2:title}}"
+    },
+    "srefsetin[]{}{}": {
+      "snippet": "srefsetin[${3:archive}]{${1:file}}{${2:title}}"
+    },
+    "sreflabel{}": {
+      "snippet": "sreflabel{${1:label}}"
+    },
+    "extref{}{}": {
+      "snippet": "extref{${1:label}}{${2:keyvals}}"
+    },
+    "extref[]{}{}": {
+      "snippet": "extref[${3:options}]{${1:label}}{${2:keyvals}}"
+    },
+    "STEXexport{}": {
+      "snippet": "STEXexport{${1:code}}"
+    },
+    "symdecl{}": {
+      "snippet": "symdecl{${1:name}}"
+    },
+    "symdecl{}[]": {
+      "snippet": "symdecl{${1:name}}[${2:options}]"
+    },
+    "symdecl*{}": {
+      "snippet": "symdecl*{${1:name}}"
+    },
+    "symdecl*{}[]": {
+      "snippet": "symdecl*{${1:name}}[${2:options}]"
+    },
+    "textsymdecl{}{}": {
+      "snippet": "textsymdecl{${1:name}}{${2:definition}}"
+    },
+    "textsymdecl{}[]{}": {
+      "snippet": "textsymdecl{${1:name}}[${2:options}]{${3:definition}}"
+    },
+    "symdef{}{}": {
+      "snippet": "symdef{${1:name}}{${2:definition}}"
+    },
+    "symdef{}[]{}": {
+      "snippet": "symdef{${1:name}}[${2:options}]{${3:definition}}"
+    },
+    "symref{}{}": {
+      "snippet": "symref{${1:name}}{${2:text}}"
+    },
+    "sr{}{}": {
+      "snippet": "sr{${1:name}}{${2:text}}"
+    },
+    "symname{}": {
+      "snippet": "symname{${1:name}}"
+    },
+    "symname[]{}": {
+      "snippet": "symname[${2:options}]{${1:name}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "sn{}": {
+      "snippet": "sn{${1:name}}"
+    },
+    "sn[]{}": {
+      "snippet": "sn[${2:options}]{${1:name}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Symname{}": {
+      "snippet": "Symname{${1:name}}"
+    },
+    "Symname[]{}": {
+      "snippet": "Symname[${2:options}]{${1:name}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Sn{}": {
+      "snippet": "Sn{${1:name}}"
+    },
+    "Sn[]{}": {
+      "snippet": "Sn[${2:options}]{${1:name}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "sns{}": {
+      "snippet": "sns{${1:name}}"
+    },
+    "Sns{}": {
+      "snippet": "Sns{${1:name}}"
+    },
+    "srefsym{}{}": {
+      "snippet": "srefsym{${1:name}}{${2:text}}"
+    },
+    "srefsymuri{}{}": {
+      "snippet": "srefsymuri{${1:URI}}{${2:text}}"
+    },
+    "symuse{}": {
+      "snippet": "symuse{${1:name}}"
+    },
+    "notation{}{}": {
+      "snippet": "notation{${1:name}}{${2:definition}}"
+    },
+    "notation{}[]{}": {
+      "snippet": "notation{${1:name}}[${2:options}]{${3:definition}}"
+    },
+    "notation*{}{}": {
+      "snippet": "notation*{${1:name}}{${2:definition}}"
+    },
+    "notation*{}[]{}": {
+      "snippet": "notation*{${1:name}}[${2:options}]{${3:definition}}"
+    },
+    "comp{}": {
+      "snippet": "comp{${1:component}}"
+    },
+    "maincomp{}": {
+      "snippet": "maincomp{${1:component}}"
+    },
+    "setnotation{}{}": {
+      "snippet": "setnotation{${1:name}}{${2:id}}"
+    },
+    "infprec": {},
+    "neginfprec": {},
+    "dobrackets{}": {
+      "snippet": "dobrackets{${1:code}}"
+    },
+    "withbrackets{}{}{}": {
+      "snippet": "withbrackets{${1:left}}{${2:right}}{${3:code}}"
+    },
+    "argsep{}{}": {
+      "snippet": "argsep{${1:parameter token}}{${2:separator}}"
+    },
+    "argmap{}{}{}": {
+      "snippet": "argmap{${1:parameter token}}{${2:code}}{${3:separator}}"
+    },
+    "argarraymap{}{}{}{}": {
+      "snippet": "argarraymap{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "arg{}": {
+      "snippet": "arg{${1:code}}"
+    },
+    "arg[]{}": {
+      "snippet": "arg[${2:i}]{${1:code}}"
+    },
+    "arg*{}": {
+      "snippet": "arg*{${1:code}}"
+    },
+    "arg*[]{}": {
+      "snippet": "arg*[${2:i}]{${1:code}}"
+    },
+    "usemodule{}": {
+      "snippet": "usemodule{${1:module}}"
+    },
+    "usemodule[]{}": {
+      "snippet": "usemodule[${2:archive}]{${1:module}}"
+    },
+    "requiremodule{}": {
+      "snippet": "requiremodule{${1:module}}"
+    },
+    "requiremodule[]{}": {
+      "snippet": "requiremodule[${2:archive}]{${1:module}}"
+    },
+    "importmodule{}": {
+      "snippet": "importmodule{${1:module}}"
+    },
+    "importmodule[]{}": {
+      "snippet": "importmodule[${2:archive}]{${1:module}}"
+    },
+    "vardef{}{}": {
+      "snippet": "vardef{${1:name}}{${2:definition}}"
+    },
+    "vardef{}[]{}": {
+      "snippet": "vardef{${1:name}}[${2:options}]{${3:definition}}"
+    },
+    "varnotation{}{}": {
+      "snippet": "varnotation{${1:name}}{${2:definition}}"
+    },
+    "varnotation{}[]{}": {
+      "snippet": "varnotation{${1:name}}[${2:options}]{${3:definition}}"
+    },
+    "svar{}": {
+      "snippet": "svar{${1:text}}"
+    },
+    "svar[]{}": {
+      "snippet": "svar[${2:name}]{${1:text}}"
+    },
+    "varseq{}{}{}": {
+      "snippet": "varseq{${1:name}}{${2:range}}{${3:definition}}"
+    },
+    "varseq{}[]{}{}": {
+      "snippet": "varseq{${1:name}}[${2:options}]{${3:range}}{${4:definition}}"
+    },
+    "ellipses": {},
+    "seqmap{}{}": {
+      "snippet": "seqmap{${1:code}}{${2:sequence}}"
+    },
+    "this": {},
+    "usestructure{}": {
+      "snippet": "usestructure{${1:struct}}"
+    },
+    "inlineass{}": {
+      "snippet": "inlineass{${1:text}}"
+    },
+    "inlineass[]{}": {
+      "snippet": "inlineass[${2:options}]{${1:text}}"
+    },
+    "inlinedef{}": {
+      "snippet": "inlinedef{${1:text}}"
+    },
+    "inlinedef[]{}": {
+      "snippet": "inlinedef[${2:options}]{${1:text}}"
+    },
+    "inlineex{}": {
+      "snippet": "inlineex{${1:text}}"
+    },
+    "inlineex[]{}": {
+      "snippet": "inlineex[${2:options}]{${1:text}}"
+    },
+    "varbind{}": {
+      "snippet": "varbind{${1:cls}}"
+    },
+    "definiendum{}{}": {
+      "snippet": "definiendum{${1:name}}{${2:code}}"
+    },
+    "definame{}": {
+      "snippet": "definame{${1:name}}"
+    },
+    "definame[]{}": {
+      "snippet": "definame[${2:options}]{${1:name}}"
+    },
+    "Definame{}": {
+      "snippet": "Definame{${1:name}}"
+    },
+    "Definame[]{}": {
+      "snippet": "Definame[${2:options}]{${1:name}}"
+    },
+    "defnotation{}": {
+      "snippet": "defnotation{${1:code}}"
+    },
+    "definiens{}": {
+      "snippet": "definiens{${1:code}}"
+    },
+    "definiens[]{}": {
+      "snippet": "definiens[${2:name}]{${1:code}}"
+    },
+    "premise{}": {
+      "snippet": "premise{${1:text}}"
+    },
+    "conclusion{}": {
+      "snippet": "conclusion{${1:text}}"
+    },
+    "conclusion[]{}": {
+      "snippet": "conclusion[${2:symbol}]{${1:text}}"
+    },
+    "symrefemph{}": {
+      "snippet": "symrefemph{${1:text}}"
+    },
+    "compemph{}": {
+      "snippet": "compemph{${1:text}}"
+    },
+    "defemph{}": {
+      "snippet": "defemph{${1:text}}"
+    },
+    "varemph{}": {
+      "snippet": "varemph{${1:text}}"
+    },
+    "stexstylemodule{}": {
+      "snippet": "stexstylemodule{${1:definition}}"
+    },
+    "stexstylemodule[]{}": {
+      "snippet": "stexstylemodule[${2:style}]{${1:definition}}"
+    },
+    "stexstylecopymodule{}": {
+      "snippet": "stexstylecopymodule{${1:definition}}"
+    },
+    "stexstylecopymodule[]{}": {
+      "snippet": "stexstylecopymodule[${2:style}]{${1:definition}}"
+    },
+    "stexstyleinterpretmodule{}": {
+      "snippet": "stexstyleinterpretmodule{${1:definition}}"
+    },
+    "stexstyleinterpretmodule[]{}": {
+      "snippet": "stexstyleinterpretmodule[${2:style}]{${1:definition}}"
+    },
+    "stexstylerealization{}": {
+      "snippet": "stexstylerealization{${1:definition}}"
+    },
+    "stexstylerealization[]{}": {
+      "snippet": "stexstylerealization[${2:style}]{${1:definition}}"
+    },
+    "stexstylemathstructure{}": {
+      "snippet": "stexstylemathstructure{${1:definition}}"
+    },
+    "stexstylemathstructure[]{}": {
+      "snippet": "stexstylemathstructure[${2:style}]{${1:definition}}"
+    },
+    "stexstyleextstructure{}": {
+      "snippet": "stexstyleextstructure{${1:definition}}"
+    },
+    "stexstyleextstructure[]{}": {
+      "snippet": "stexstyleextstructure[${2:style}]{${1:definition}}"
+    },
+    "stexstyledefinition{}": {
+      "snippet": "stexstyledefinition{${1:definition}}"
+    },
+    "stexstyledefinition[]{}": {
+      "snippet": "stexstyledefinition[${2:style}]{${1:definition}}"
+    },
+    "stexstyleassertion{}": {
+      "snippet": "stexstyleassertion{${1:definition}}"
+    },
+    "stexstyleassertion[]{}": {
+      "snippet": "stexstyleassertion[${2:style}]{${1:definition}}"
+    },
+    "stexstyleexample{}": {
+      "snippet": "stexstyleexample{${1:definition}}"
+    },
+    "stexstyleexample[]{}": {
+      "snippet": "stexstyleexample[${2:style}]{${1:definition}}"
+    },
+    "stexstyleparagraph{}": {
+      "snippet": "stexstyleparagraph{${1:definition}}"
+    },
+    "stexstyleparagraph[]{}": {
+      "snippet": "stexstyleparagraph[${2:style}]{${1:definition}}"
+    },
+    "stexstyleproof{}": {
+      "snippet": "stexstyleproof{${1:definition}}"
+    },
+    "stexstyleproof[]{}": {
+      "snippet": "stexstyleproof[${2:style}]{${1:definition}}"
+    },
+    "stexstylesubproof{}": {
+      "snippet": "stexstylesubproof{${1:definition}}"
+    },
+    "stexstylesubproof[]{}": {
+      "snippet": "stexstylesubproof[${2:style}]{${1:definition}}"
+    },
+    "stexstyleusemodule{}": {
+      "snippet": "stexstyleusemodule{${1:definition}}"
+    },
+    "stexstyleusemodule[]{}": {
+      "snippet": "stexstyleusemodule[${2:style}]{${1:definition}}"
+    },
+    "stexstyleimportmodule{}": {
+      "snippet": "stexstyleimportmodule{${1:definition}}"
+    },
+    "stexstyleimportmodule[]{}": {
+      "snippet": "stexstyleimportmodule[${2:style}]{${1:definition}}"
+    },
+    "stexstylerequiremodule{}": {
+      "snippet": "stexstylerequiremodule{${1:definition}}"
+    },
+    "stexstylerequiremodule[]{}": {
+      "snippet": "stexstylerequiremodule[${2:style}]{${1:definition}}"
+    },
+    "stexstyleassign{}": {
+      "snippet": "stexstyleassign{${1:definition}}"
+    },
+    "stexstyleassign[]{}": {
+      "snippet": "stexstyleassign[${2:style}]{${1:definition}}"
+    },
+    "stexstylerenamedecl{}": {
+      "snippet": "stexstylerenamedecl{${1:definition}}"
+    },
+    "stexstylerenamedecl[]{}": {
+      "snippet": "stexstylerenamedecl[${2:style}]{${1:definition}}"
+    },
+    "stexstyleassignMorphism{}": {
+      "snippet": "stexstyleassignMorphism{${1:definition}}"
+    },
+    "stexstyleassignMorphism[]{}": {
+      "snippet": "stexstyleassignMorphism[${2:style}]{${1:definition}}"
+    },
+    "stexstylecopymod{}": {
+      "snippet": "stexstylecopymod{${1:definition}}"
+    },
+    "stexstylecopymod[]{}": {
+      "snippet": "stexstylecopymod[${2:style}]{${1:definition}}"
+    },
+    "stexstyleinterpretmod{}": {
+      "snippet": "stexstyleinterpretmod{${1:definition}}"
+    },
+    "stexstyleinterpretmod[]{}": {
+      "snippet": "stexstyleinterpretmod[${2:style}]{${1:definition}}"
+    },
+    "stexstylerealize{}": {
+      "snippet": "stexstylerealize{${1:definition}}"
+    },
+    "stexstylerealize[]{}": {
+      "snippet": "stexstylerealize[${2:style}]{${1:definition}}"
+    },
+    "stexstylesymdecl{}": {
+      "snippet": "stexstylesymdecl{${1:definition}}"
+    },
+    "stexstylesymdecl[]{}": {
+      "snippet": "stexstylesymdecl[${2:style}]{${1:definition}}"
+    },
+    "stexstyletextsymdecl{}": {
+      "snippet": "stexstyletextsymdecl{${1:definition}}"
+    },
+    "stexstyletextsymdecl[]{}": {
+      "snippet": "stexstyletextsymdecl[${2:style}]{${1:definition}}"
+    },
+    "stexstylenotation{}": {
+      "snippet": "stexstylenotation{${1:definition}}"
+    },
+    "stexstylenotation[]{}": {
+      "snippet": "stexstylenotation[${2:style}]{${1:definition}}"
+    },
+    "stexstylevarnotation{}": {
+      "snippet": "stexstylevarnotation{${1:definition}}"
+    },
+    "stexstylevarnotation[]{}": {
+      "snippet": "stexstylevarnotation[${2:style}]{${1:definition}}"
+    },
+    "stexstylesymdef{}": {
+      "snippet": "stexstylesymdef{${1:definition}}"
+    },
+    "stexstylesymdef[]{}": {
+      "snippet": "stexstylesymdef[${2:style}]{${1:definition}}"
+    },
+    "stexstylevardef{}": {
+      "snippet": "stexstylevardef{${1:definition}}"
+    },
+    "stexstylevardef[]{}": {
+      "snippet": "stexstylevardef[${2:style}]{${1:definition}}"
+    },
+    "stexstylevarseq{}": {
+      "snippet": "stexstylevarseq{${1:definition}}"
+    },
+    "stexstylevarseq[]{}": {
+      "snippet": "stexstylevarseq[${2:style}]{${1:definition}}"
+    },
+    "stexstylespfsketch{}": {
+      "snippet": "stexstylespfsketch{${1:definition}}"
+    },
+    "stexstylespfsketch[]{}": {
+      "snippet": "stexstylespfsketch[${2:style}]{${1:definition}}"
+    },
+    "stexstyleMMTinclude{}": {
+      "snippet": "stexstyleMMTinclude{${1:definition}}"
+    },
+    "stexstyleMMTinclude[]{}": {
+      "snippet": "stexstyleMMTinclude[${2:style}]{${1:definition}}"
+    },
+    "assign{}{}": {
+      "snippet": "assign{${1:arg1}}{${2:arg2}}"
+    },
+    "assignMorphism": {},
+    "assumption{}": {
+      "snippet": "assumption{${1:text}}"
+    },
+    "conclude[]{}": {
+      "snippet": "conclude[${2:options}]{${1:text}}"
+    },
+    "conclude{}": {
+      "snippet": "conclude{${1:text}}"
+    },
+    "eqstep*{}": {
+      "snippet": "eqstep*{${1:text}}"
+    },
+    "eqstep{}": {
+      "snippet": "eqstep{${1:text}}"
+    },
+    "mathhub": {},
+    "mmlarg{}{}": {
+      "snippet": "mmlarg{${1:arg1}}{${2:arg2}}"
+    },
+    "mmlintent{}{}": {
+      "snippet": "mmlintent{${1:arg1}}{${2:arg2}}"
+    },
+    "mmtdef{}": {
+      "snippet": "mmtdef{${1:arg}}"
+    },
+    "mmtdef{}[]": {
+      "snippet": "mmtdef{${1:arg}}[${2:opt}]"
+    },
+    "MMTinclude{}": {
+      "snippet": "MMTinclude{${1:arg1}}"
+    },
+    "MMTrule{}{}": {
+      "snippet": "MMTrule{${1:arg1}}{${2:arg2}}"
+    },
+    "MSC{}": {
+      "snippet": "MSC{${1:arg1}}"
+    },
+    "objective{}{}": {
+      "snippet": "objective{${1:arg1}}{${2:arg2}}"
+    },
+    "precondition{}{}": {
+      "snippet": "precondition{${1:arg1}}{${2:arg2}}"
+    },
+    "realize{}{}": {
+      "snippet": "realize{${1:arg1}}{${2:arg2}}"
+    },
+    "renamedecl[]{}{}": {
+      "snippet": "renamedecl[${3:optarg1}]{${1:arg2}}{${2:arg3}}"
+    },
+    "renamedecl{}{}": {
+      "snippet": "renamedecl{${1:arg1}}{${2:arg2}}"
+    },
+    "spfjust{}": {
+      "snippet": "spfjust{${1:text}}"
+    },
+    "spfstep[]{}": {
+      "snippet": "spfstep[${2:options}]{${1:text}}"
+    },
+    "spfstep{}": {
+      "snippet": "spfstep{${1:text}}"
+    },
+    "sproofend": {},
+    "stexcommentfont": {},
+    "stexdoctitle{}": {
+      "snippet": "stexdoctitle{${1:arg}}"
+    },
+    "STEXInternalSetSrefSymURL{}{}": {
+      "snippet": "STEXInternalSetSrefSymURL{${1:arg1}}{${2:arg2}}"
+    },
+    "STEXInternalSrefRestoreTarget{}{}{}{}{}": {
+      "snippet": "STEXInternalSrefRestoreTarget{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
+    },
+    "STEXInternalSymbolAfterInvokationTL": {},
+    "STEXInternalTermMathArgiii{}{}{}": {
+      "snippet": "STEXInternalTermMathArgiii{${1:arg1}}{${2:arg2}}{${3:arg3}}"
+    },
+    "STEXInternalTermMathAssocArgiiiii{}{}{}{}{}": {
+      "snippet": "STEXInternalTermMathAssocArgiiiii{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
+    },
+    "STEXRestoreNotsEnd": {},
+    "thisarchive": {},
+    "thiscopyname": {},
+    "thismodulename": {},
+    "thismoduleuri": {},
+    "thisstyle": {},
+    "thistitle": {},
+    "yield{}": {
+      "snippet": "yield{${1:text}}"
+    }
+  },
+  "envs": {
+    "sfragment{}": {
+      "name": "sfragment",
+      "snippet": "{${1:title}}"
+    },
+    "sfragment[]{}": {
+      "name": "sfragment",
+      "snippet": "[${2:keyvals}]{${1:title}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "blindfragment": {},
+    "smodule{}": {
+      "name": "smodule",
+      "snippet": "{${1:module}}"
+    },
+    "smodule[]{}": {
+      "name": "smodule",
+      "snippet": "[${2:options}]{${1:module}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "mathstructure{}": {
+      "name": "mathstructure",
+      "snippet": "{${1:name}}"
+    },
+    "mathstructure{}[]": {
+      "name": "mathstructure",
+      "snippet": "{${1:name}}[${2:options}]"
+    },
+    "extstructure{}{}": {
+      "name": "extstructure",
+      "snippet": "{${1:name}}{${2:structs}}"
+    },
+    "extstructure{}[]{}": {
+      "name": "extstructure",
+      "snippet": "{${1:name}}[${2:options}]{${3:structs}}"
+    },
+    "extstructure*{}{}": {
+      "name": "extstructure*",
+      "snippet": "{${1:name}}{${2:struct}}"
+    },
+    "sdefinition": {},
+    "sdefinition[]": {
+      "name": "sdefinition",
+      "snippet": "[${1:options}]"
+    },
+    "sassertion": {},
+    "sassertion[]": {
+      "name": "sassertion",
+      "snippet": "[${1:options}]"
+    },
+    "sexample": {},
+    "sexample[]": {
+      "name": "sexample",
+      "snippet": "[${1:options}]"
+    },
+    "sparagraph": {},
+    "sparagraph[]": {
+      "name": "sparagraph",
+      "snippet": "[${1:options}]"
+    },
+    "sproof": {},
+    "sproof[]": {
+      "name": "sproof",
+      "snippet": "[${1:options}]"
+    },
+    "copymodule{}{}": {
+      "name": "copymodule",
+      "snippet": "{${1:arg1}}{${2:arg2}}"
+    },
+    "interpretmodule{}{}": {
+      "name": "interpretmodule",
+      "snippet": "{${1:arg1}}{${2:arg2}}"
+    },
+    "mmtinterface[]{}{}": {
+      "name": "mmtinterface",
+      "snippet": "[${3:opt}]{${1:arg1}}{${2:arg2}}"
+    },
+    "mmtinterface{}{}": {
+      "name": "mmtinterface",
+      "snippet": "{${1:arg1}}{${2:arg2}}"
+    },
+    "realization[]{}": {
+      "name": "realization",
+      "snippet": "[${2:optarg1}]{${1:arg2}}"
+    },
+    "realization{}": {
+      "name": "realization",
+      "snippet": "{${1:arg1}}"
+    },
+    "spfblock": {},
+    "subproof[]{}": {
+      "name": "subproof",
+      "snippet": "[${2:options}]{${1:text}}"
+    },
+    "subproof{}": {
+      "name": "subproof",
+      "snippet": "{${1:text}}"
+    }
+  },
+  "options": [
+    "lang=${1:language}",
+    "mathhub=${1:directory}",
+    "writesms",
+    "usems",
+    "image",
+    "nofrontmatter",
+    "debug=${1:log-prefix}",
+    "checkterms"
+  ],
+  "keyvals": [
+    [
+      "archive=${1:file path}",
+      "alt={${1:alt text}}",
+      "bb=${1:llx lly urx ury}",
+      "bbllx=",
+      "bblly=",
+      "bburx=",
+      "bbury=",
+      "natwidth=",
+      "natheight=",
+      "hiresbb",
+      "pagebox=",
+      "viewport=${1:llx lly urx ury}",
+      "trim=${1:llx lly urx ury}",
+      "angle=${1:degrees}",
+      "origin=",
+      "width=",
+      "height=",
+      "totalheight=",
+      "keepaspectratio",
+      "scale=${1:factor}",
+      "clip",
+      "draft",
+      "type=${1:file type}",
+      "ext=${1:file extension}",
+      "read=${1:read-file extension}",
+      "command=",
+      "quiet",
+      "page=${1:page number}",
+      "interpolate",
+      "decodearray={${1:color array}}"
+    ],
+    [
+      "inputpath=${1:path}",
+      "aboveskip=",
+      "belowskip=",
+      "lineskip=",
+      "boxpos=",
+      "print",
+      "showlines",
+      "emptylines=${1:number}",
+      "emptylines=*${1:number}",
+      "gobble=${1:number}",
+      "style=${1:style name}",
+      "language=${1:language}",
+      "language=[${1:dialect}]${2:language}",
+      "alsolanguage=${1:language}",
+      "alsolanguage=[${1:dialect}]${2:language}",
+      "defaultdialect=[${1:dialect}]${2:language}",
+      "printpod",
+      "usekeywordsintag",
+      "tagstyle=${1:style}",
+      "markfirstintag=${1:style}",
+      "makemacrouse",
+      "basicstyle=${1:style}",
+      "identifierstyle=${1:style}",
+      "commentstyle=${1:style}",
+      "stringstyle=${1:style}",
+      "keywordstyle=${1:style}",
+      "keywordstyle=[${1:number}]${2:style}",
+      "keywordstyle=[${1:number}]*${2:style}",
+      "ndkeywordstyle=${1:style}",
+      "classoffset=${1:number}",
+      "texcsstyle=${1:style}",
+      "texcsstyle=[${1:class number}]${2:style}",
+      "texcsstyle=*[${1:class number}]${2:style}",
+      "directivestyle=${1:style}",
+      "emph={${1:identifier list}}",
+      "emph=[${1:number}]{${2:identifier list}}",
+      "moreemph={${1:identifier list}}",
+      "moreemph=[${1:number}]{${2:identifier list}}",
+      "deleteemph={${1:identifier list}}",
+      "deleteemph=[${1:number}]{${2:identifier list}}",
+      "emphstyle={${1:style}}",
+      "emphstyle=[${1:number}]{${2:style}}",
+      "delim=[${1:type}][${2:style}]${3:delimiters}",
+      "delim=*[${1:type}][${2:style}]${3:delimiters}",
+      "delim=**[${1:type}][${2:style}]${3:delimiters}",
+      "moredelim=[${1:type}][${2:style}]${3:delimiters}",
+      "moredelim=*[${1:type}][${2:style}]${3:delimiters}",
+      "moredelim=**[${1:type}][${2:style}]${3:delimiters}",
+      "deletedelim=[${1:type}][${2:style}]${3:delimiters}",
+      "deletedelim=*[${1:type}][${2:style}]${3:delimiters}",
+      "deletedelim=**[${1:type}][${2:style}]${3:delimiters}",
+      "extendedchars",
+      "inputencoding=${1:encoding}",
+      "upquote",
+      "tabsize=${1:number}",
+      "showtabs",
+      "tab=${1:tokens}",
+      "showspaces",
+      "showstringspaces",
+      "formfeed=${1:tokens}",
+      "numbers=",
+      "stepnumber=${1:number}",
+      "numberfirstline",
+      "numberstyle=${1:style}",
+      "numbersep=",
+      "numberblanklines",
+      "firstnumber=${1:auto|last|<number>}",
+      "name=${1:name}",
+      "title=${1:title text}",
+      "caption={${1:caption text}}",
+      "caption={[${1:short}]${2:caption text}}",
+      "label=",
+      "nolol",
+      "numberbychapter",
+      "captionpos=${1:subset of tb}",
+      "abovecaptionskip=",
+      "belowcaptionskip=",
+      "linewidth=",
+      "xleftmargin=",
+      "xrightmargin=",
+      "resetmargins",
+      "breaklines",
+      "breakatwhitespace",
+      "prebreak=${1:tokens}",
+      "postbreak=${1:tokens}",
+      "breakindent=",
+      "breakautoindent",
+      "frame=${1:type}",
+      "frameround=",
+      "framesep=",
+      "rulesep=",
+      "framerule=",
+      "framexleftmargin=",
+      "framexrightmargin=",
+      "framextopmargin=",
+      "framexbottommargin=",
+      "backgroundcolor=",
+      "rulecolor=",
+      "fillcolor=",
+      "rulesepcolor=",
+      "frameshape={${1:top shape}}{${2:left shape}}{${3:right shape}}{${4:bottom shape}}",
+      "index={${1:identifiers}}",
+      "index=[${1:number}]{${2:identifiers}}",
+      "index=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
+      "moreindex={${1:identifiers}}",
+      "moreindex=[${1:number}]{${2:identifiers}}",
+      "moreindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
+      "deleteindex={${1:identifiers}}",
+      "deleteindex=[${1:number}]{${2:identifiers}}",
+      "deleteindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
+      "indexstyle=${1:one-parameter macro}",
+      "indexstyle=[${1:number}]${2:one-parameter macro}",
+      "columns=${1:alignment}",
+      "columns=[${1:c|l|r}]${2:alignment}",
+      "flexiblecolumns",
+      "keepspaces",
+      "basewidth=",
+      "fontadjust",
+      "texcl",
+      "mathescape",
+      "escapechar=${1:character}",
+      "escapeinside=${1:<char1><char2>}",
+      "escapebegin=${1:tokens}",
+      "escapeend=${1:tokens}",
+      "fancyvrb",
+      "fvcmdparams=${1:<cmd1> <num1> ...}",
+      "morefvcmdparams=${1:<cmd1> <num1> ...}",
+      "literate={${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
+      "literate=*{${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
+      "rangebeginprefix=${1:prefix}",
+      "rangebeginsuffix=${1:suffix}",
+      "rangeendprefix=${1:prefix}",
+      "rangeendsuffix=${1:suffix}",
+      "rangeprefix=${1:prefix}",
+      "rangesuffix=${1:suffix}",
+      "includerangemarker",
+      "multicols=${1:number}",
+      "float",
+      "float=${1:subset of tbph}",
+      "float=*${1:subset of tbph}",
+      "floatplacement=${1:place specifiers}",
+      "firstline=${1:number}",
+      "lastline=${1:number}",
+      "linerange={${1:first1-last1,first2-last2,...}}",
+      "consecutivenumbers",
+      "keywordsprefix=${1:prefix}",
+      "keywords={${1:list of keywords}}",
+      "keywords=[${1:number}]{${2:list of keywords}}",
+      "morekeywords={${1:list of keywords}}",
+      "morekeywords=[${1:number}]{${2:list of keywords}}",
+      "deletekeywords={${1:list of keywords}}",
+      "deletekeywords=[${1:number}]{${2:list of keywords}}",
+      "ndkeywords={${1:list of keywords}}",
+      "moreendkeywords={${1:list of keywords}}",
+      "deleteendkeywords={${1:list of keywords}}",
+      "texcs={${1:list of csnames}}",
+      "texcs=[${1:class number}]{${2:list of csnames}}",
+      "moretexcs={${1:list of csnames}}",
+      "moretexcs=[${1:class number}]{${2:list of csnames}}",
+      "deletetexcs={${1:list of csnames}}",
+      "deletetexcs=[${1:class number}]{${2:list of csnames}}",
+      "directives={${1:list of compiler directives}}",
+      "moredirectives={${1:list of compiler directives}}",
+      "deletedirectives={${1:list of compiler directives}}",
+      "sensitive",
+      "alsoletter={${1:character sequence}}",
+      "alsodigit={${1:character sequence}}",
+      "alsoother={${1:character sequence}}",
+      "otherkeywords={${1:keywords}}",
+      "tag=${1:<char1><char2>}",
+      "string=${1:delimiter}",
+      "string=[${1:b|d|m|bd|s}]${2:delimiter}",
+      "morestring=${1:delimiter}",
+      "morestring=[${1:b|d|m|bd|s}]${2:delimiter}",
+      "deletestring=${1:delimiter}",
+      "deletestring=[${1:b|d|m|bd|s}]${2:delimiter}",
+      "comment=${1:delimiter(s)}",
+      "comment=[${1:type}]${2:delimiter(s)}",
+      "morecomment=${1:delimiter(s)}",
+      "morecomment=[${1:type}]${2:delimiter(s)}",
+      "deletecomment=${1:delimiter(s)}",
+      "deletecomment=[${1:type}]${2:delimiter(s)}",
+      "keywordcomment={${1:keywords}}",
+      "morekeywordcomment={${1:keywords}}",
+      "deletekeywordcomment={${1:keywords}}",
+      "keywordcommentsemicolon={${1:keywords}}{${2:keywords}}{${3:keywords}}",
+      "podcomment"
+    ],
+    [
+      "pre=",
+      "post="
+    ],
+    [
+      "id=",
+      "short=${1:short title}"
+    ],
+    [
+      "title={${1:text}}",
+      "style=",
+      "id=",
+      "ns=${1:URI}",
+      "lang=${1:language}",
+      "sig=${1:language}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/structmech.json b/dev/packages/structmech.json
index ac32ce4a1..d783ebc79 100644
--- a/dev/packages/structmech.json
+++ b/dev/packages/structmech.json
@@ -27,28 +27,28 @@
       "snippet": "NodalForce[${3:color}]{${1:x,y}}[${4:Hlabel}][${5:Vlabel}][${6:Rlabel}]{${2:rotation}}[${7:scale}]"
     },
     "BasicForce{}{}{}": {
-      "snippet": "BasicForce{${1:x1,y1}}{${2:x2,y2}}{${3:label}}"
+      "snippet": "BasicForce{${1:x1,${4:y1}}{${2:x2},y2}}{${3:label}}"
     },
     "BasicForce[]{}{}{}": {
-      "snippet": "BasicForce[${4:number}]{${1:x1,y1}}{${2:x2,y2}}{${3:label}}"
+      "snippet": "BasicForce[${4:number}]{${1:x1,${5:y1}}{${2:x2},y2}}{${3:label}}"
     },
     "BasicForce[]{}{}{}{}": {
-      "snippet": "BasicForce[${5:number}]{${1:x1,y1}}{${2:x2,y2}}{${3:label}}{${4:TikZ keys}}"
+      "snippet": "BasicForce[${5:number}]{${1:x1,${6:y1}}{${2:x2},y2}}{${3:label}}{${4:TikZ keys}}"
     },
     "BasicForce[]{}{}{}{}[][][]": {
-      "snippet": "BasicForce[${5:number}]{${1:x1,y1}}{${2:x2,y2}}{${3:label}}{${4:TikZ keys}}[${6:label1}][${7:label2}][${8:label3}]"
+      "snippet": "BasicForce[${5:number}]{${1:x1,${9:y1}}{${2:x2},y2}}{${3:label}}{${4:TikZ keys}}[${6:label1}][${7:label2}][${8:label3}]"
     },
     "UDL{}{}": {
-      "snippet": "UDL{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "UDL{${1:x1,${3:y1}}{${2:x2},y2}}"
     },
     "UDL[]{}{}": {
-      "snippet": "UDL[${3:F}]{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "UDL[${3:F}]{${1:x1,${4:y1}}{${2:x2},y2}}"
     },
     "UDL[]{}{}[]": {
-      "snippet": "UDL[${3:F}]{${1:x1,y1}}{${2:x2,y2}}[${4:label}]"
+      "snippet": "UDL[${3:F}]{${1:x1,${5:y1}}{${2:x2},y2}}[${4:label}]"
     },
     "UDL[]{}{}[]{}": {
-      "snippet": "UDL[${4:F}]{${1:x1,y1}}{${2:x2,y2}}[${5:label}]{${3:scale}}"
+      "snippet": "UDL[${4:F}]{${1:x1,${6:y1}}{${2:x2},y2}}[${5:label}]{${3:scale}}"
     },
     "HingeSupport{}": {
       "snippet": "HingeSupport{${1:x,y}}"
@@ -120,70 +120,70 @@
       "snippet": "CoorOrigin[${3:rotation}]{${1:x,y}}[${4:xlabel}][${5:ylabel}]{${2:scale}}"
     },
     "IForceA{}{}{}{}": {
-      "snippet": "IForceA{${1:x1,y1}}{${2:x2,y2}}{${3:force-lower}}{${4:force-higher}}"
+      "snippet": "IForceA{${1:x1,${5:y1}}{${2:x2},y2}}{${3:force-lower}}{${4:force-higher}}"
     },
     "IForceA[]{}{}{}{}": {
-      "snippet": "IForceA[${5:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:force-lower}}{${4:force-higher}}"
+      "snippet": "IForceA[${5:color}]{${1:x1,${6:y1}}{${2:x2},y2}}{${3:force-lower}}{${4:force-higher}}"
     },
     "IForceA[]{}{}{}{}{}": {
-      "snippet": "IForceA[${6:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:force-lower}}{${4:force-higher}}{${5:scale}}"
+      "snippet": "IForceA[${6:color}]{${1:x1,${7:y1}}{${2:x2},y2}}{${3:force-lower}}{${4:force-higher}}{${5:scale}}"
     },
     "IForceB{}{}{}{}{}": {
-      "snippet": "IForceB{${1:x1,y1}}{${2:x2,y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
+      "snippet": "IForceB{${1:x1,${6:y1}}{${2:x2},y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
     },
     "IForceB[]{}{}{}{}{}": {
-      "snippet": "IForceB[${6:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
+      "snippet": "IForceB[${6:color}]{${1:x1,${7:y1}}{${2:x2},y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
     },
     "IForceB[]{}{}{}{}{}{}": {
-      "snippet": "IForceB[${7:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}{${6:scale}}"
+      "snippet": "IForceB[${7:color}]{${1:x1,${8:y1}}{${2:x2},y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}{${6:scale}}"
     },
     "BeamDeformP{}{}{}{}": {
-      "snippet": "BeamDeformP{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}{${4:disp-higher}}"
+      "snippet": "BeamDeformP{${1:x1,${5:y1}}{${2:x2},y2}}{${3:disp-lower}}{${4:disp-higher}}"
     },
     "BeamDeformP[]{}{}{}{}": {
-      "snippet": "BeamDeformP[${5:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}{${4:disp-higher}}"
+      "snippet": "BeamDeformP[${5:color}]{${1:x1,${6:y1}}{${2:x2},y2}}{${3:disp-lower}}{${4:disp-higher}}"
     },
     "BeamDeformP[]{}{}{}[]{}[]": {
-      "snippet": "BeamDeformP[${5:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}[${6:rot-lower}]{${4:disp-higher}}[${7:rot-higher}]"
+      "snippet": "BeamDeformP[${5:color}]{${1:x1,${8:y1}}{${2:x2},y2}}{${3:disp-lower}}[${6:rot-lower}]{${4:disp-higher}}[${7:rot-higher}]"
     },
     "BeamDeformP[]{}{}{}[]{}[]{}": {
-      "snippet": "BeamDeformP[${6:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}[${7:rot-lower}]{${4:disp-higher}}[${8:rot-higher}]{${5:scale}}"
+      "snippet": "BeamDeformP[${6:color}]{${1:x1,${9:y1}}{${2:x2},y2}}{${3:disp-lower}}[${7:rot-lower}]{${4:disp-higher}}[${8:rot-higher}]{${5:scale}}"
     },
     "BeamDeformR{}{}": {
-      "snippet": "BeamDeformR{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "BeamDeformR{${1:x1,${3:y1}}{${2:x2},y2}}"
     },
     "BeamDeformR[]{}{}": {
-      "snippet": "BeamDeformR[${3:color}]{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "BeamDeformR[${3:color}]{${1:x1,${4:y1}}{${2:x2},y2}}"
     },
     "BeamDeformR[]{}{}[][]": {
-      "snippet": "BeamDeformR[${3:color}]{${1:x1,y1}}{${2:x2,y2}}[${4:rot-lower}][${5:rot-higher}]"
+      "snippet": "BeamDeformR[${3:color}]{${1:x1,${6:y1}}{${2:x2},y2}}[${4:rot-lower}][${5:rot-higher}]"
     },
     "BeamDeformR[]{}{}[][]{}": {
-      "snippet": "BeamDeformR[${4:color}]{${1:x1,y1}}{${2:x2,y2}}[${5:rot-lower}][${6:rot-higher}]{${3:scale}}"
+      "snippet": "BeamDeformR[${4:color}]{${1:x1,${7:y1}}{${2:x2},y2}}[${5:rot-lower}][${6:rot-higher}]{${3:scale}}"
     },
     "Dashpot{}{}": {
-      "snippet": "Dashpot{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "Dashpot{${1:x1,${3:y1}}{${2:x2},y2}}"
     },
     "Dashpot{}{}{}": {
-      "snippet": "Dashpot{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
+      "snippet": "Dashpot{${1:x1,${4:y1}}{${2:x2},y2}}{${3:scale}}"
     },
     "Dashpot[]{}{}": {
-      "snippet": "Dashpot[${3:color}]{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "Dashpot[${3:color}]{${1:x1,${4:y1}}{${2:x2},y2}}"
     },
     "Dashpot[]{}{}{}": {
-      "snippet": "Dashpot[${4:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
+      "snippet": "Dashpot[${4:color}]{${1:x1,${5:y1}}{${2:x2},y2}}{${3:scale}}"
     },
     "Spring{}{}": {
-      "snippet": "Spring{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "Spring{${1:x1,${3:y1}}{${2:x2},y2}}"
     },
     "Spring{}{}{}": {
-      "snippet": "Spring{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
+      "snippet": "Spring{${1:x1,${4:y1}}{${2:x2},y2}}{${3:scale}}"
     },
     "Spring[]{}{}": {
-      "snippet": "Spring[${3:color}]{${1:x1,y1}}{${2:x2,y2}}"
+      "snippet": "Spring[${3:color}]{${1:x1,${4:y1}}{${2:x2},y2}}"
     },
     "Spring[]{}{}{}": {
-      "snippet": "Spring[${4:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
+      "snippet": "Spring[${4:color}]{${1:x1,${5:y1}}{${2:x2},y2}}{${3:scale}}"
     },
     "Angle": {},
     "FAC": {},
diff --git a/dev/packages/struktex.json b/dev/packages/struktex.json
index 33ef1fae6..8bb4d27c0 100644
--- a/dev/packages/struktex.json
+++ b/dev/packages/struktex.json
@@ -140,6 +140,14 @@
     "dfrend": {}
   },
   "envs": {
+    "struktogramm(width,height)": {
+      "name": "struktogramm",
+      "snippet": "(${1:width},${2:height})"
+    },
+    "struktogramm(width,height)[]": {
+      "name": "struktogramm",
+      "snippet": "(${2:width},${3:height})[${1:title}]"
+    },
     "declaration": {},
     "declaration[]": {
       "name": "declaration",
diff --git a/dev/packages/styledcmd.json b/dev/packages/styledcmd.json
index b619881a4..cbbb8fcb1 100644
--- a/dev/packages/styledcmd.json
+++ b/dev/packages/styledcmd.json
@@ -52,7 +52,7 @@
       "snippet": "providestyledcmdExp{${1:cmd}}{${2:style name}}[${3:args}]{${4:definition}}"
     },
     "AddCMDToGroup{}{}": {
-      "snippet": "AddCMDToGroup{${1:group name}}{${2:cmd1,cmd2,...}}"
+      "snippet": "AddCMDToGroup{${1:group name}}{${2:cmd1,${3:cmd2},...}}"
     },
     "SetGroupStyle{}{}": {
       "snippet": "SetGroupStyle{${1:group name}}{${2:style name}}"
diff --git a/dev/packages/subfigure.json b/dev/packages/subfigure.json
index f1f87bac9..1b0c33e68 100644
--- a/dev/packages/subfigure.json
+++ b/dev/packages/subfigure.json
@@ -49,6 +49,9 @@
     "iftabletopcap": {},
     "tabletopcaptrue": {},
     "tabletopcapfalse": {},
+    "label(){}": {
+      "snippet": "label(${2:bookmark}){${1:key}}"
+    },
     "subcapfont": {},
     "subcaplabelfont": {},
     "subcapsize": {},
diff --git a/dev/packages/sudoku.json b/dev/packages/sudoku.json
new file mode 100644
index 000000000..930a7f9b3
--- /dev/null
+++ b/dev/packages/sudoku.json
@@ -0,0 +1,14 @@
+{
+  "includes": {},
+  "macros": {
+    "sudokuformat": {},
+    "sudokusize": {},
+    "sudokuthickline": {},
+    "sudokuthinline": {}
+  },
+  "envs": {
+    "sudoku": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/suffix.json b/dev/packages/suffix.json
new file mode 100644
index 000000000..bd04b2481
--- /dev/null
+++ b/dev/packages/suffix.json
@@ -0,0 +1,7 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/sverb.json b/dev/packages/sverb.json
new file mode 100644
index 000000000..2cb6b4958
--- /dev/null
+++ b/dev/packages/sverb.json
@@ -0,0 +1,35 @@
+{
+  "includes": {},
+  "macros": {
+    "listingsize": {},
+    "listingindent": {},
+    "verbinput{}": {
+      "snippet": "verbinput{${1:file}}"
+    },
+    "matcher{}{}{}": {
+      "snippet": "matcher{${1:cmd}}{${2:target}}{${3:process-cmd}}"
+    }
+  },
+  "envs": {
+    "listing": {},
+    "listing*{}": {
+      "name": "listing*",
+      "snippet": "{${1:end string}}"
+    },
+    "verbwrite{}": {
+      "name": "verbwrite",
+      "snippet": "{${1:file}}"
+    },
+    "demo{}": {
+      "name": "demo",
+      "snippet": "{${1:title}}"
+    },
+    "demo[]{}": {
+      "name": "demo",
+      "snippet": "[${2:shape}]{${1:title}}"
+    },
+    "ignore": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/svg.json b/dev/packages/svg.json
new file mode 100644
index 000000000..9bb95c627
--- /dev/null
+++ b/dev/packages/svg.json
@@ -0,0 +1,102 @@
+{
+  "includes": {
+    "iftex": [],
+    "scrbase": [],
+    "pdftexcmds": [],
+    "trimspaces": [],
+    "graphicx": [],
+    "shellesc": [],
+    "ifplatform": [],
+    "xcolor": [],
+    "transparent": [],
+    "pgfsys": []
+  },
+  "macros": {
+    "svgsetup{}": {
+      "snippet": "svgsetup{${1:options}}"
+    },
+    "svgpath{}": {
+      "snippet": "svgpath{${1:path}}"
+    },
+    "includesvg{}": {
+      "snippet": "includesvg{${1:imagefile}}"
+    },
+    "includesvg[]{}": {
+      "snippet": "includesvg[${2:options}]{${1:imagefile}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "includeinkscape{}": {
+      "snippet": "includeinkscape{${1:imagefile}}"
+    },
+    "includeinkscape[]{}": {
+      "snippet": "includeinkscape[${2:options}]{${1:imagefile}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "setsvg{}": {
+      "snippet": "setsvg{${1:options}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "usexcolor=",
+    "usetransparent=",
+    "noxcolor",
+    "notransparent",
+    "inkscape=",
+    "inkscapepath=",
+    "inkscapeexe=${1:exec path}",
+    "inkscapeversion=",
+    "inkscapename=${1:file name}",
+    "inkscapeformat=",
+    "inkscapelatex",
+    "inkscapearea=",
+    "inkscapedpi=${1:integer}",
+    "inkscapeopt=${1:Inkscape option}",
+    "svgextension=${1:extension}",
+    "width=",
+    "height=",
+    "distort",
+    "scale=${1:factor}",
+    "pretex=${1:code}",
+    "apptex=${1:code}",
+    "draft",
+    "lastpage"
+  ],
+  "keyvals": [
+    [
+      "inkscape=",
+      "inkscapeformat=",
+      "inkscapelatex",
+      "inkscapearea=",
+      "inkscapedpi=${1:integer}",
+      "inkscapeopt=${1:Inkscape option}",
+      "svgextension=${1:extension}",
+      "width=",
+      "height=",
+      "distort",
+      "scale=${1:factor}",
+      "pretex=${1:code}",
+      "apptex=${1:code}",
+      "draft",
+      "lastpage",
+      "angle=${1:degrees}",
+      "origin="
+    ],
+    [
+      "inkscapeformat=",
+      "inkscapelatex",
+      "width=",
+      "height=",
+      "distort",
+      "scale=${1:factor}",
+      "pretex=${1:code}",
+      "apptex=${1:code}",
+      "draft",
+      "lastpage",
+      "angle=${1:degrees}",
+      "origin="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/swfigure.json b/dev/packages/swfigure.json
index 4912e0075..4b379f520 100644
--- a/dev/packages/swfigure.json
+++ b/dev/packages/swfigure.json
@@ -18,6 +18,9 @@
     "DFimage[]{}[]{}[]": {
       "snippet": "DFimage[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}]"
     },
+    "DFimage[]{}[]{}[]()<>": {
+      "snippet": "DFimage[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}](${7:height coor})<${6:line corr}>"
+    },
     "cleartoeven{}": {
       "snippet": "cleartoeven{${1:number}}"
     },
@@ -70,6 +73,9 @@
     "FSfigure{}[]{}[]": {
       "snippet": "FSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "FSfigure{}[]{}[]()<>": {
+      "snippet": "FSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "FSfigure{}{}": {
       "snippet": "FSfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -82,6 +88,9 @@
     "HSfigure{}[]{}[]": {
       "snippet": "HSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "HSfigure{}[]{}[]()<>": {
+      "snippet": "HSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "HSfigure{}{}": {
       "snippet": "HSfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -95,6 +104,9 @@
     "NFfigure{}[]{}[]": {
       "snippet": "NFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "NFfigure{}[]{}[]()<>": {
+      "snippet": "NFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "NFfigure{}{}": {
       "snippet": "NFfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -107,6 +119,9 @@
     "RFfigure{}[]{}[]": {
       "snippet": "RFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "RFfigure{}[]{}[]()<>": {
+      "snippet": "RFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "RFfigure{}{}": {
       "snippet": "RFfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -116,7 +131,7 @@
     "RFx": {},
     "RFy": {},
     "SetList{}{}": {
-      "snippet": "SetList{${1:cmd}}{${2:item1,item2,...}}"
+      "snippet": "SetList{${1:cmd}}{${2:item1,${3:item2},...}}"
     },
     "spreadwidth": {},
     "SWcaptionShift": {},
@@ -126,6 +141,9 @@
     "SWfigure{}[]{}[]": {
       "snippet": "SWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "SWfigure{}[]{}[]()<>": {
+      "snippet": "SWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "SWfigure{}{}": {
       "snippet": "SWfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -141,6 +159,9 @@
     "THfigure{}[]{}[]": {
       "snippet": "THfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "THfigure{}[]{}[]()<>": {
+      "snippet": "THfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "THfigure{}{}": {
       "snippet": "THfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -154,6 +175,9 @@
     "TWfigure{}[]{}[]": {
       "snippet": "TWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "TWfigure{}[]{}[]()<>": {
+      "snippet": "TWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "TWfigure{}{}": {
       "snippet": "TWfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -166,6 +190,9 @@
     "VSfigure{}[]{}[]": {
       "snippet": "VSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
+    "VSfigure{}[]{}[]()<>": {
+      "snippet": "VSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
+    },
     "VSfigure{}{}": {
       "snippet": "VSfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -189,6 +216,10 @@
     "DFimage[]{}[]{}[]": {
       "name": "DFimage",
       "snippet": "[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}]"
+    },
+    "DFimage[]{}[]{}[](height coor)<>": {
+      "name": "DFimage",
+      "snippet": "[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}](${7:height coor})<${6:line corr}>"
     }
   },
   "options": [],
diff --git a/dev/packages/synthslant.json b/dev/packages/synthslant.json
index cade81c80..1cfcba6b0 100644
--- a/dev/packages/synthslant.json
+++ b/dev/packages/synthslant.json
@@ -1,5 +1,6 @@
 {
   "includes": {
+    "etoolbox": [],
     "iftex": [],
     "xkeyval": [],
     "fontspec": [
diff --git a/dev/packages/systeme.json b/dev/packages/systeme.json
index d384ae0ff..f3aaae59b 100644
--- a/dev/packages/systeme.json
+++ b/dev/packages/systeme.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "systeme{}": {
-      "snippet": "systeme{${1:eq1,eq2,...}}"
+      "snippet": "systeme{${1:eq1,${2:eq2},...}}"
     },
     "systeme[]{}": {
-      "snippet": "systeme[${2:alignment_chars}]{${1:eq1,eq2,...}}"
+      "snippet": "systeme[${2:alignment_chars}]{${1:eq1,${3:eq2},...}}"
     },
     "syslineskipcoeff{}": {
       "snippet": "syslineskipcoeff{${1:value}}"
diff --git a/dev/packages/tableof.json b/dev/packages/tableof.json
new file mode 100644
index 000000000..09c0d080f
--- /dev/null
+++ b/dev/packages/tableof.json
@@ -0,0 +1,59 @@
+{
+  "includes": {
+    "atveryend": []
+  },
+  "macros": {
+    "toftagstart{}": {
+      "snippet": "toftagstart{${1:tag1,${2:tag2},...}}"
+    },
+    "toftagstop{}": {
+      "snippet": "toftagstop{${1:tag1,${2:tag2},...}}"
+    },
+    "toftagthis{}": {
+      "snippet": "toftagthis{${1:tag1,${2:tag2},...}}"
+    },
+    "tofuntagthis{}": {
+      "snippet": "tofuntagthis{${1:tag1,${2:tag2},...}}"
+    },
+    "nexttocwithtags{}{}": {
+      "snippet": "nexttocwithtags{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "nexttocwithtags*{}{}": {
+      "snippet": "nexttocwithtags*{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "nexttocwithtags{}*{}": {
+      "snippet": "nexttocwithtags{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "nexttocwithtags*{}*{}": {
+      "snippet": "nexttocwithtags*{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "tableoftaggedcontents{}{}": {
+      "snippet": "tableoftaggedcontents{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "tableoftaggedcontents*{}{}": {
+      "snippet": "tableoftaggedcontents*{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "tableoftaggedcontents{}*{}": {
+      "snippet": "tableoftaggedcontents{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "tableoftaggedcontents*{}*{}": {
+      "snippet": "tableoftaggedcontents*{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
+    },
+    "tableof{}": {
+      "snippet": "tableof{${1:required-tag1,${2:required-tag2},...}}"
+    },
+    "tableof*{}": {
+      "snippet": "tableof*{${1:required-tag1,${2:required-tag2},...}}"
+    },
+    "tablenotof{}": {
+      "snippet": "tablenotof{${1:excluded-tag1,${2:excluded-tag2},...}}"
+    },
+    "tablenotof*{}": {
+      "snippet": "tablenotof*{${1:excluded-tag1,${2:excluded-tag2},...}}"
+    },
+    "tofOpenTocFileForWrite": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/tablvar.json b/dev/packages/tablvar.json
index 0c5a6df68..05245f151 100644
--- a/dev/packages/tablvar.json
+++ b/dev/packages/tablvar.json
@@ -30,7 +30,7 @@
     },
     "discont": {},
     "hachure{}{}": {
-      "snippet": "hachure{${1:llx,lly}}{${2:urx,ury}}"
+      "snippet": "hachure{${1:llx,${3:lly}}{${2:urx},ury}}"
     },
     "haut{}": {
       "snippet": "haut{${1:label}}"
diff --git a/dev/packages/tabstackengine.json b/dev/packages/tabstackengine.json
index a49c05df1..c956744f2 100644
--- a/dev/packages/tabstackengine.json
+++ b/dev/packages/tabstackengine.json
@@ -32,7 +32,7 @@
     },
     "TABruleshift": {},
     "TABcline{}": {
-      "snippet": "TABcline{${1:cols1,cols2,...}}"
+      "snippet": "TABcline{${1:cols1,${2:cols2},...}}"
     },
     "relaxTABsyntax": {
       "option": "TABcline"
diff --git a/dev/packages/tabto.json b/dev/packages/tabto.json
index a48c96ee4..a015114d0 100644
--- a/dev/packages/tabto.json
+++ b/dev/packages/tabto.json
@@ -11,7 +11,7 @@
     "TabPrevPos": {},
     "tab": {},
     "TabPositions{}": {
-      "snippet": "TabPositions{${1:length1,length2,...}}"
+      "snippet": "TabPositions{${1:length1,${2:length2},...}}"
     },
     "NumTabs{}": {
       "snippet": "NumTabs{${1:number}}"
diff --git a/dev/packages/tabu.json b/dev/packages/tabu.json
new file mode 100644
index 000000000..d88a74fab
--- /dev/null
+++ b/dev/packages/tabu.json
@@ -0,0 +1,87 @@
+{
+  "includes": {
+    "array": [],
+    "varwidth": [],
+    "delarray": [
+      "delarray"
+    ],
+    "linegoal": [
+      "linegoal"
+    ]
+  },
+  "macros": {
+    "tabulinestyle{}": {
+      "snippet": "tabulinestyle{${1:style}}"
+    },
+    "usetabu{}": {
+      "snippet": "usetabu{${1:username}}"
+    },
+    "tabucline{}": {
+      "snippet": "tabucline{${1:from-to}}"
+    },
+    "tabucline[]{}": {
+      "snippet": "tabucline[${2:spec}]{${1:from-to}}"
+    },
+    "savetabu{}": {
+      "snippet": "savetabu{${1:username}}"
+    },
+    "preamble{}": {
+      "snippet": "preamble{${1:username}}"
+    },
+    "tabuphantomline": {},
+    "extrarowdepth": {},
+    "abovetabulinesep": {},
+    "belowtabulinesep": {},
+    "tabustrutrule": {},
+    "taburulecolor{}": {
+      "snippet": "taburulecolor|${2:doubleRuleSepColor}|{${1:color}}"
+    },
+    "tabureset": {},
+    "newtabulinestyle{}": {
+      "snippet": "newtabulinestyle{${1:style}}"
+    },
+    "everyrow{}": {
+      "snippet": "everyrow{${1:code}}"
+    },
+    "rowfont[]{}": {
+      "snippet": "rowfont[${2:alignment}]{${1:fontSpec}}"
+    },
+    "tabudecimal{}": {
+      "snippet": "tabudecimal{${1:code}}"
+    },
+    "firstline": {},
+    "lastline": {},
+    "iftabuscantokens": {},
+    "tabuscantokenstrue": {},
+    "tabuscantokensfalse": {},
+    "tabucolumn{}": {
+      "snippet": "tabucolumn{${1:arg}}"
+    },
+    "tabucolX": {},
+    "tabudefaulttarget": {},
+    "tabuDisableCommands": {},
+    "tabuendlongtrial": {},
+    "tabulineoff": {},
+    "tabulineon": {},
+    "tabuthepreamble": {},
+    "thetaburow": {},
+    "tracingtabu": {}
+  },
+  "envs": {
+    "tabu{}": {
+      "name": "tabu",
+      "snippet": "{${1:preamble}}"
+    },
+    "longtabu{}": {
+      "name": "longtabu",
+      "snippet": "{${1:preamble}}"
+    }
+  },
+  "options": [
+    "delarray",
+    "linegoal",
+    "scantokens",
+    "debugshow"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/tabularcalc.json b/dev/packages/tabularcalc.json
index 3a42bde07..0e8f53e58 100644
--- a/dev/packages/tabularcalc.json
+++ b/dev/packages/tabularcalc.json
@@ -6,11 +6,11 @@
   },
   "macros": {
     "htablecalc{}{}{}{}": {
-      "snippet": "htablecalc{${1:cell (${5:0,0})}}{${2:var=val1,val2,...}}{${3:label}}{${4:formula}}"
+      "snippet": "htablecalc{${1:cell (${5:0},${6:0})}}{${2:var=val1,${7:val2},...}}{${3:label}}{${4:formula}}"
     },
     "tclistsep": {},
     "vtablecalc{}{}{}{}": {
-      "snippet": "vtablecalc{${1:cell (${5:0,0})}}{${2:var=val1,val2,...}}{${3:label}}{${4:formula}}"
+      "snippet": "vtablecalc{${1:cell (${5:0},${6:0})}}{${2:var=val1,${7:val2},...}}{${3:label}}{${4:formula}}"
     },
     "tcnoshowmark": {},
     "tcatbeginrow": {},
diff --git a/dev/packages/tagpdf.json b/dev/packages/tagpdf.json
index 850d45f92..e69dbe4b5 100644
--- a/dev/packages/tagpdf.json
+++ b/dev/packages/tagpdf.json
@@ -41,9 +41,6 @@
     },
     "tagpdfsuppressmarks{}": {
       "snippet": "tagpdfsuppressmarks{${1:arg}}"
-    },
-    "UseTaggingSocket{}": {
-      "snippet": "UseTaggingSocket{${1:socket name}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/tasks.json b/dev/packages/tasks.json
index 847ec4429..aa8f15119 100644
--- a/dev/packages/tasks.json
+++ b/dev/packages/tasks.json
@@ -7,10 +7,22 @@
     "task[]": {
       "snippet": "task[${1:label text}]"
     },
+    "task[]()": {
+      "snippet": "task[${1:label text}](${2:cols})"
+    },
+    "task()": {
+      "snippet": "task(${1:cols})"
+    },
     "task*": {},
     "task*[]": {
       "snippet": "task*[${1:label text}]"
     },
+    "task*[]()": {
+      "snippet": "task*[${1:label text}](${2:cols})"
+    },
+    "task*()": {
+      "snippet": "task*(${1:cols})"
+    },
     "startnewitemline": {},
     "settasks{}": {
       "snippet": "settasks{${1:keyvals}}",
@@ -20,9 +32,19 @@
     "NewTasksEnvironment{}": {
       "snippet": "NewTasksEnvironment{${1:envname}}"
     },
+    "NewTasksEnvironment[]{}[]()": {
+      "snippet": "NewTasksEnvironment[${2:keyvals}]{${1:envname}}[${3:separator}](${4:cols})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "RenewTasksEnvironment{}": {
       "snippet": "RenewTasksEnvironment{${1:envname}}"
     },
+    "RenewTasksEnvironment[]{}[]()": {
+      "snippet": "RenewTasksEnvironment[${2:keyvals}]{${1:envname}}[${3:separator}](${4:cols})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
     "tasksifmeasuringTF{}{}": {
       "snippet": "tasksifmeasuringTF{${1:true}}{${2:false}}"
     },
@@ -43,6 +65,16 @@
       "snippet": "[${1:keyvals}]",
       "keyvalindex": 0,
       "keyvalpos": 0
+    },
+    "tasks[](cols)": {
+      "name": "tasks",
+      "snippet": "[${1:keyvals}](${2:cols})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "tasks(cols)": {
+      "name": "tasks",
+      "snippet": "(${1:cols})"
     }
   },
   "options": [],
diff --git a/dev/packages/tcolorbox.json b/dev/packages/tcolorbox.json
index d5522ce87..d9199d4b2 100644
--- a/dev/packages/tcolorbox.json
+++ b/dev/packages/tcolorbox.json
@@ -2,7 +2,7 @@
   "includes": {
     "environ": [],
     "etoolbox": [],
-    "pgf": [],
+    "tikz": [],
     "verbatim": [],
     "tcolorboxlibraryskins": [
       "skins"
@@ -815,7 +815,6 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
-      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
@@ -1165,7 +1164,6 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
-      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
diff --git a/dev/packages/tcolorboxlibrarydocumentation.json b/dev/packages/tcolorboxlibrarydocumentation.json
index 63cbebb85..75f2d7b92 100644
--- a/dev/packages/tcolorboxlibrarydocumentation.json
+++ b/dev/packages/tcolorboxlibrarydocumentation.json
@@ -313,6 +313,7 @@
       "doc into index",
       "doc no index",
       "keywords bold",
+      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -397,6 +398,7 @@
       "doc head key={${1:options}}",
       "doc raster key={${1:options}}",
       "keywords bold",
+      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -475,6 +477,7 @@
       "doc head command={${1:options}}",
       "doc raster command={${1:options}}",
       "keywords bold",
+      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -553,6 +556,7 @@
       "doc head environment={${1:options}}",
       "doc raster environment={${1:options}}",
       "keywords bold",
+      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -631,6 +635,7 @@
       "doc head path={${1:options}}",
       "doc raster path={${1:options}}",
       "keywords bold",
+      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -691,9 +696,8 @@
       "documentation minted options={${1:minted keys}}",
       "documentation minted style=${1:minted style}",
       "documentation minted language=${1:language}",
-      "before example={${1:code}}",
-      "after example={${1:code}}",
       "keywords bold",
+      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
diff --git a/dev/packages/tcolorboxlibraryskins.json b/dev/packages/tcolorboxlibraryskins.json
index ca9c55f26..4c6433f5a 100644
--- a/dev/packages/tcolorboxlibraryskins.json
+++ b/dev/packages/tcolorboxlibraryskins.json
@@ -1,6 +1,5 @@
 {
   "includes": {
-    "tikz": [],
     "tikzfill.image": []
   },
   "macros": {
diff --git a/dev/packages/ted.json b/dev/packages/ted.json
new file mode 100644
index 000000000..069b1e140
--- /dev/null
+++ b/dev/packages/ted.json
@@ -0,0 +1,28 @@
+{
+  "includes": {},
+  "macros": {
+    "Substitute{}{}{}": {
+      "snippet": "Substitute{${1:input}}{${2:from}}{${3:to}}"
+    },
+    "Substitute*{}{}{}": {
+      "snippet": "Substitute*{${1:input}}{${2:from}}{${3:to}}"
+    },
+    "Substitute[]{}{}{}": {
+      "snippet": "Substitute[${4:output}]{${1:input}}{${2:from}}{${3:to}}"
+    },
+    "Substitute*[]{}{}{}": {
+      "snippet": "Substitute*[${4:output}]{${1:input}}{${2:from}}{${3:to}}"
+    },
+    "ShowTokens{}": {
+      "snippet": "ShowTokens{${1:token list}}"
+    },
+    "ShowTokens*{}": {
+      "snippet": "ShowTokens*{${1:token list}}"
+    },
+    "ShowTokensLogonly": {},
+    "ShowTokensOnline": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/tensor.json b/dev/packages/tensor.json
new file mode 100644
index 000000000..09f07cca4
--- /dev/null
+++ b/dev/packages/tensor.json
@@ -0,0 +1,45 @@
+{
+  "includes": {},
+  "macros": {
+    "indices{}": {
+      "snippet": "indices{${1:^sup1_sub1^sup2_sub2...}}"
+    },
+    "indices*{}": {
+      "snippet": "indices*{${1:^sup1_sub1^sup2_sub2...}}"
+    },
+    "tensor{}{}": {
+      "snippet": "tensor{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
+    },
+    "tensor[]{}{}": {
+      "snippet": "tensor[${3:pre-indices}]{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
+    },
+    "tensor*{}{}": {
+      "snippet": "tensor*{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
+    },
+    "tensor*[]{}{}": {
+      "snippet": "tensor*[${3:pre-indices}]{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
+    },
+    "indexmarker": {},
+    "nuclide{}": {
+      "snippet": "nuclide{${1:symbol}}"
+    },
+    "nuclide[]{}": {
+      "snippet": "nuclide[${2:mass no}]{${1:symbol}}"
+    },
+    "nuclide[][]{}": {
+      "snippet": "nuclide[${2:mass no}][${3:atomic no}]{${1:symbol}}"
+    },
+    "nuclideFont": {},
+    "massnumFont": {},
+    "tensorSmash": {},
+    "tensorStrut": {}
+  },
+  "envs": {},
+  "options": [
+    "align",
+    "text",
+    "nosmash",
+    "nostrut"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/tex.json b/dev/packages/tex.json
new file mode 100644
index 000000000..984786914
--- /dev/null
+++ b/dev/packages/tex.json
@@ -0,0 +1,1425 @@
+{
+  "includes": {},
+  "macros": {
+    "above": {},
+    "abovedisplayshortskip": {},
+    "abovedisplayskip": {},
+    "abovewithdelims": {},
+    "accent": {},
+    "adjdemerits": {},
+    "advance": {},
+    "afterassignment": {},
+    "aftergroup": {},
+    "atop": {},
+    "atopwithdelims": {},
+    "badness": {},
+    "baselineskip": {},
+    "batchmode": {},
+    "begingroup": {},
+    "belowdisplayshortskip": {},
+    "belowdisplayskip": {},
+    "binoppenalty": {},
+    "botmark": {},
+    "box": {},
+    "boxmaxdepth": {},
+    "brokenpenalty": {},
+    "catcode": {},
+    "char": {},
+    "chardef": {},
+    "chardef{}": {
+      "snippet": "chardef{${1:cmd}}"
+    },
+    "cleaders": {},
+    "closein": {},
+    "closeout": {},
+    "clubpenalty": {},
+    "copy": {},
+    "count": {},
+    "countdef": {},
+    "countdef{}": {
+      "snippet": "countdef{${1:cmd}}"
+    },
+    "cr": {},
+    "crcr": {},
+    "csname": {},
+    "day": {},
+    "deadcycles": {},
+    "def": {},
+    "def{}": {
+      "snippet": "def{${1:cmd}}"
+    },
+    "defaulthyphenchar": {},
+    "defaultskewchar": {},
+    "delcode": {},
+    "delimiter": {},
+    "delimiterfactor": {},
+    "delimitershortfall": {},
+    "dimen": {},
+    "dimendef": {},
+    "dimendef{}": {
+      "snippet": "dimendef{${1:cmd}}"
+    },
+    "discretionary{}{}{}": {
+      "snippet": "discretionary{${1:pre-break}}{${2:post-break}}{${3:no-break}}"
+    },
+    "displayindent": {},
+    "displaylimits": {},
+    "displaywidowpenalty": {},
+    "displaywidth": {},
+    "divide": {},
+    "doublehyphendemerits": {},
+    "dp": {},
+    "dump": {},
+    "edef": {},
+    "edef{}": {
+      "snippet": "edef{${1:cmd}}"
+    },
+    "else": {},
+    "emergencystretch": {},
+    "end": {},
+    "endcsname": {},
+    "endgroup": {},
+    "endinput": {},
+    "endlinechar": {},
+    "eqno{}": {
+      "snippet": "eqno{${1:eqn num}}"
+    },
+    "errhelp": {},
+    "errmessage{}": {
+      "snippet": "errmessage{${1:text}}"
+    },
+    "errorcontextlines": {},
+    "errorstopmode": {},
+    "escapechar": {},
+    "everycr": {},
+    "everydisplay": {},
+    "everyhbox": {},
+    "everyjob": {},
+    "everymath": {},
+    "everypar": {},
+    "everyvbox": {},
+    "exhyphenpenalty": {},
+    "expandafter": {},
+    "fam": {},
+    "fi": {},
+    "finalhyphendemerits": {},
+    "firstmark": {},
+    "floatingpenalty": {},
+    "font": {},
+    "font{}": {
+      "snippet": "font{${1:cmd}}"
+    },
+    "fontdimen": {},
+    "fontname": {},
+    "futurelet": {},
+    "futurelet{}": {
+      "snippet": "futurelet{${1:cmd}}"
+    },
+    "gdef": {},
+    "gdef{}": {
+      "snippet": "gdef{${1:cmd}}"
+    },
+    "global": {},
+    "globaldefs": {},
+    "halign": {},
+    "hangafter": {},
+    "hangindent": {},
+    "hbadness": {},
+    "hbox{}": {
+      "snippet": "hbox{${1:text}}"
+    },
+    "hfil": {},
+    "hfill": {},
+    "hfilneg": {},
+    "hfuzz": {},
+    "hoffset": {},
+    "holdinginserts": {},
+    "hrule": {},
+    "hsize": {},
+    "hskip": {},
+    "hss": {},
+    "ht": {},
+    "hyphenation{}": {
+      "snippet": "hyphenation{${1:space separated words}}"
+    },
+    "hyphenchar": {},
+    "hyphenpenalty": {},
+    "if": {},
+    "ifcase": {},
+    "ifcat": {},
+    "ifdim": {},
+    "ifeof": {},
+    "iffalse": {},
+    "ifhbox": {},
+    "ifhmode": {},
+    "ifinner": {},
+    "ifmmode": {},
+    "ifnum": {},
+    "ifodd": {},
+    "iftrue": {},
+    "ifvbox": {},
+    "ifvmode": {},
+    "ifvoid": {},
+    "ifx": {},
+    "ignorespaces": {},
+    "immediate": {},
+    "indent": {},
+    "insert": {},
+    "insertpenalties": {},
+    "interlinepenalty": {},
+    "jobname": {},
+    "kern": {},
+    "language": {},
+    "lastbox": {},
+    "lastkern": {},
+    "lastpenalty": {},
+    "lastskip": {},
+    "lccode": {},
+    "leaders": {},
+    "left": {
+      "snippet": "left|${1}\\right|"
+    },
+    "lefthyphenmin": {},
+    "leftskip": {},
+    "leqno{}": {
+      "snippet": "leqno{${1:eqn num}}"
+    },
+    "let": {},
+    "let{}{}": {
+      "snippet": "let{${1:cmd}}{${2:def}}"
+    },
+    "limits": {},
+    "linepenalty": {},
+    "lineskip": {},
+    "lineskiplimit": {},
+    "long": {},
+    "looseness": {},
+    "lower": {},
+    "lowercase{}": {
+      "snippet": "lowercase{${1:text}}"
+    },
+    "mag": {},
+    "mark{}": {
+      "snippet": "mark{${1:mark text}}"
+    },
+    "mathaccent": {},
+    "mathbin": {},
+    "mathchar": {},
+    "mathchardef": {},
+    "mathchardef{}": {
+      "snippet": "mathchardef{${1:cmd}}"
+    },
+    "mathchoice{}{}{}{}": {
+      "snippet": "mathchoice{${1:display}}{${2:text}}{${3:subscript}}{${4:subsubscript}}"
+    },
+    "mathclose": {},
+    "mathcode": {},
+    "mathinner": {},
+    "mathop": {},
+    "mathopen": {},
+    "mathord": {},
+    "mathpunct": {},
+    "mathrel": {},
+    "mathsurround": {},
+    "maxdeadcycles": {},
+    "maxdepth": {},
+    "meaning": {},
+    "medmuskip": {},
+    "message{}": {
+      "snippet": "message{${1:text}}"
+    },
+    "mkern": {},
+    "month": {},
+    "moveleft": {},
+    "moveright": {},
+    "mskip": {},
+    "multiply": {},
+    "muskip": {},
+    "muskipdef": {},
+    "muskipdef{}": {
+      "snippet": "muskipdef{${1:cmd}}"
+    },
+    "newlinechar": {},
+    "noalign{}": {
+      "snippet": "noalign{${1:material}}"
+    },
+    "noboundary": {},
+    "noexpand": {},
+    "nolimits": {},
+    "nonscript": {},
+    "nonstopmode": {},
+    "nulldelimiterspace": {},
+    "nullfont": {},
+    "number": {},
+    "omit": {},
+    "openin": {},
+    "openout": {},
+    "or": {},
+    "outer": {},
+    "output": {},
+    "outputpenalty": {},
+    "over": {},
+    "overfullrule": {},
+    "overwithdelims": {},
+    "pagedepth": {},
+    "pagefilllstretch": {},
+    "pagefillstretch": {},
+    "pagefilstretch": {},
+    "pagegoal": {},
+    "pageshrink": {},
+    "pagestretch": {},
+    "pagetotal": {},
+    "par": {},
+    "parfillskip": {},
+    "parindent": {},
+    "parshape": {},
+    "parskip": {},
+    "patterns{}": {
+      "snippet": "patterns{${1:patterns}}"
+    },
+    "pausing": {},
+    "penalty": {},
+    "postdisplaypenalty": {},
+    "predisplaypenalty": {},
+    "predisplaysize": {},
+    "pretolerance": {},
+    "prevdepth": {},
+    "prevgraf": {},
+    "radical": {},
+    "raise": {},
+    "read": {},
+    "relax": {},
+    "relpenalty": {},
+    "right": {},
+    "rightskip": {},
+    "righthyphenmin": {},
+    "romannumeral": {},
+    "scriptfont": {},
+    "scriptscriptfont": {},
+    "scriptscriptstyle": {},
+    "scriptspace": {},
+    "scriptstyle": {},
+    "scrollmode": {},
+    "setbox": {},
+    "setlanguage": {},
+    "sfcode": {},
+    "shipout": {},
+    "show": {},
+    "showbox": {},
+    "showboxbreadth": {},
+    "showboxdepth": {},
+    "showlists": {},
+    "showthe": {},
+    "skewchar": {},
+    "skip": {},
+    "skipdef": {},
+    "skipdef{}": {
+      "snippet": "skipdef{${1:cmd}}"
+    },
+    "spacefactor": {},
+    "spaceskip": {},
+    "span": {},
+    "special{}": {
+      "snippet": "special{${1:code}}"
+    },
+    "splitbotmark": {},
+    "splitfirstmark": {},
+    "splitmaxdepth": {},
+    "splittopskip": {},
+    "string": {},
+    "string{}": {
+      "snippet": "string{${1:cmd}}"
+    },
+    "tabskip": {},
+    "textfont": {},
+    "textstyle": {},
+    "the": {},
+    "thickmuskip": {},
+    "thinmuskip": {},
+    "time": {},
+    "toks": {},
+    "toksdef": {},
+    "toksdef{}": {
+      "snippet": "toksdef{${1:cmd}}"
+    },
+    "tolerance": {},
+    "topmark": {},
+    "topskip": {},
+    "tracingcommands": {},
+    "tracinglostchars": {},
+    "tracingmacros": {},
+    "tracingonline": {},
+    "tracingoutput": {},
+    "tracingpages": {},
+    "tracingparagraphs": {},
+    "tracingrestores": {},
+    "tracingstats": {},
+    "uccode": {},
+    "uchyph": {},
+    "unhbox": {},
+    "unhcopy": {},
+    "unkern": {},
+    "unpenalty": {},
+    "unskip": {},
+    "unvbox": {},
+    "unvcopy": {},
+    "uppercase{}": {
+      "snippet": "uppercase{${1:text}}"
+    },
+    "vadjust{}": {
+      "snippet": "vadjust{${1:vertical mode material}}"
+    },
+    "valign{}": {
+      "snippet": "valign{${1:⟨preamble⟩ \\cr ⟨column⟩ \\cr ... ⟨column⟩ \\cr}}"
+    },
+    "vbadness": {},
+    "vbox{}": {
+      "snippet": "vbox{${1:text}}"
+    },
+    "vcenter{}": {
+      "snippet": "vcenter{${1:vertical mode material}}"
+    },
+    "vfil": {},
+    "vfill": {},
+    "vfilneg": {},
+    "vfuzz": {},
+    "voffset": {},
+    "vrule": {},
+    "vsize": {},
+    "vskip": {},
+    "vsplit": {},
+    "vss": {},
+    "vtop{}": {
+      "snippet": "vtop{${1:vertical mode material}}"
+    },
+    "wd": {},
+    "widowpenalty": {},
+    "write": {},
+    "xdef": {},
+    "xdef{}": {
+      "snippet": "xdef{${1:cmd}}"
+    },
+    "xleaders": {},
+    "xspaceskip": {},
+    "year": {},
+    "aa": {},
+    "AA": {},
+    "active": {},
+    "ae": {},
+    "AE": {},
+    "aleph": {
+      "detail": "ℵ",
+      "documentation": "aleph, hebrew"
+    },
+    "allowbreak": {},
+    "amalg": {
+      "detail": "⨿",
+      "documentation": "AMALGAMATION OR COPRODUCT"
+    },
+    "angle": {
+      "detail": "∠",
+      "documentation": "ANGLE"
+    },
+    "arccos": {},
+    "arcsin": {},
+    "arctan": {},
+    "arg": {},
+    "arrowvert": {},
+    "Arrowvert": {},
+    "ast": {
+      "detail": "∗",
+      "documentation": "ASTERISK OPERATOR (Hodge star operator)"
+    },
+    "asymp": {
+      "detail": "≍",
+      "documentation": "asymptotically equal to"
+    },
+    "b{}": {
+      "snippet": "b{${1:o}}"
+    },
+    "backslash": {
+      "detail": "\\",
+      "documentation": "REVERSE SOLIDUS"
+    },
+    "bf": {},
+    "bgroup": {},
+    "big": {
+      "snippet": "big|${1}\\big|"
+    },
+    "Big": {
+      "snippet": "Big|${1}\\Big|"
+    },
+    "bigbreak": {},
+    "bigcirc": {},
+    "bigg": {},
+    "Bigg": {},
+    "biggl": {},
+    "Biggl": {},
+    "biggm": {},
+    "Biggm": {},
+    "biggr": {},
+    "Biggr": {},
+    "bigl": {},
+    "Bigl": {},
+    "bigm": {},
+    "Bigm": {},
+    "bigodot": {
+      "detail": "⨀",
+      "documentation": "N-ARY CIRCLED DOT OPERATOR"
+    },
+    "bigoplus": {
+      "detail": "⨁",
+      "documentation": "N-ARY CIRCLED PLUS OPERATOR"
+    },
+    "bigotimes": {
+      "detail": "⨂",
+      "documentation": "N-ARY CIRCLED TIMES OPERATOR"
+    },
+    "bigr": {},
+    "Bigr": {},
+    "bigskip": {},
+    "bigskipamount": {},
+    "bigsqcup": {
+      "detail": "⨆",
+      "documentation": "N-ARY SQUARE UNION OPERATOR"
+    },
+    "bigtriangledown": {
+      "detail": "▽",
+      "documentation": "big down open"
+    },
+    "bigtriangleup": {
+      "detail": "△",
+      "documentation": "big up open"
+    },
+    "biguplus": {
+      "detail": "⨄",
+      "documentation": "N-ARY UNION OPERATOR WITH PLUS"
+    },
+    "bigvee": {
+      "detail": "⋁",
+      "documentation": "logical and operator"
+    },
+    "bigwedge": {
+      "detail": "⋀",
+      "documentation": "logical or operator"
+    },
+    "bmod": {},
+    "bordermatrix{}": {
+      "snippet": "bordermatrix{${1:line \\cr ... line \\cr}}"
+    },
+    "bot": {
+      "detail": "⊥",
+      "documentation": "UP TACK, bottom"
+    },
+    "bowtie": {
+      "detail": "⋈",
+      "documentation": "BOWTIE"
+    },
+    "brace": {},
+    "bracevert": {},
+    "brack": {},
+    "break": {},
+    "buildrel": {},
+    "bullet": {
+      "detail": "∙",
+      "documentation": "BULLET OPERATOR"
+    },
+    "c{}": {
+      "snippet": "c{${1:o}}"
+    },
+    "cal": {},
+    "cases{}": {
+      "snippet": "cases{${1:contents}}"
+    },
+    "cdotp": {
+      "detail": "·",
+      "documentation": "b: MIDDLE DOT"
+    },
+    "choose": {},
+    "clap{}": {
+      "snippet": "clap{${1:text}}"
+    },
+    "clubsuit": {
+      "detail": "♣",
+      "documentation": "club suit symbol"
+    },
+    "colon": {
+      "detail": ":",
+      "documentation": "COLON (not ratio)"
+    },
+    "cong": {
+      "detail": "≅",
+      "documentation": "congruent with"
+    },
+    "coprod": {
+      "detail": "∐",
+      "documentation": "coproduct operator"
+    },
+    "copyright": {},
+    "cos": {},
+    "cosh": {},
+    "cot": {},
+    "coth": {},
+    "csc": {},
+    "d{}": {
+      "snippet": "d{${1:o}}"
+    },
+    "dag": {},
+    "dagger": {
+      "detail": "†",
+      "documentation": "DAGGER relation"
+    },
+    "dashv": {
+      "detail": "⊣",
+      "documentation": "LEFT TACK, non- does no (dash, vertical)"
+    },
+    "ddag": {},
+    "ddagger": {
+      "detail": "‡",
+      "documentation": "DOUBLE DAGGER relation"
+    },
+    "deg": {},
+    "det": {},
+    "diamond": {
+      "detail": "⋄",
+      "documentation": "DIAMOND OPERATOR (white diamond)"
+    },
+    "diamondsuit": {
+      "detail": "♢",
+      "documentation": "diamond suit symbol"
+    },
+    "dim": {},
+    "displaylines{}": {
+      "snippet": "displaylines{${1:line \\cr ... line \\cr}}"
+    },
+    "doteq": {
+      "detail": "≐",
+      "documentation": "equals, single dot above"
+    },
+    "dotfill": {},
+    "dots": {},
+    "downarrow": {
+      "detail": "↓",
+      "documentation": "downward arrow"
+    },
+    "Downarrow": {
+      "detail": "⇓",
+      "documentation": "down double arrow"
+    },
+    "downbracefill": {},
+    "egroup": {},
+    "eject": {},
+    "ell": {
+      "detail": "ℓ",
+      "documentation": "cursive small l"
+    },
+    "empty": {},
+    "emptyset": {},
+    "endgraf": {},
+    "endline": {},
+    "enskip": {},
+    "enspace": {},
+    "exp": {},
+    "filbreak": {},
+    "flat": {
+      "detail": "♭",
+      "documentation": "musical flat"
+    },
+    "fmtname": {},
+    "fmtversion": {},
+    "frenchspacing": {},
+    "frown": {
+      "detail": "⌢",
+      "documentation": "FROWN (down curve)"
+    },
+    "gcd": {},
+    "ge": {
+      "detail": "≥",
+      "documentation": "r: greater-than-or-equal"
+    },
+    "gets": {
+      "detail": "←",
+      "documentation": "a: leftward arrow"
+    },
+    "gg": {
+      "detail": "≫",
+      "documentation": "much greater type 2"
+    },
+    "goodbreak": {},
+    "H{}": {
+      "snippet": "H{${1:o}}"
+    },
+    "hbar": {},
+    "heartsuit": {
+      "detail": "♡",
+      "documentation": "heart suit symbol"
+    },
+    "hglue": {},
+    "hidewidth": {},
+    "hom": {},
+    "hookleftarrow": {
+      "detail": "↩",
+      "documentation": "left arrow-hooked"
+    },
+    "hookrightarrow": {
+      "detail": "↪",
+      "documentation": "right arrow-hooked"
+    },
+    "hphantom{}": {
+      "snippet": "hphantom{${1:text}}"
+    },
+    "hrulefill": {},
+    "i": {
+      "detail": "𝑖",
+      "documentation": "MATHEMATICAL ITALIC SMALL I"
+    },
+    "ialign{}": {
+      "snippet": "ialign{${1:⟨preamble⟩ \\cr ⟨row⟩ \\cr ... ⟨row⟩ \\cr}}"
+    },
+    "iff": {
+      "detail": "⟺",
+      "documentation": "LONG LEFT RIGHT DOUBLE ARROW"
+    },
+    "Im": {
+      "detail": "ℑ",
+      "documentation": "imaginary part"
+    },
+    "imath": {
+      "detail": "𝚤",
+      "documentation": "MATHEMATICAL ITALIC SMALL DOTLESS I"
+    },
+    "inf": {},
+    "int": {
+      "detail": "∫",
+      "documentation": "INTEGRAL operator"
+    },
+    "it": {},
+    "j": {
+      "detail": "𝑗",
+      "documentation": "MATHEMATICAL ITALIC SMALL J"
+    },
+    "jmath": {
+      "detail": "𝚥",
+      "documentation": "MATHEMATICAL ITALIC SMALL DOTLESS J"
+    },
+    "jot": {},
+    "ker": {},
+    "l": {
+      "detail": "𝑙",
+      "documentation": "MATHEMATICAL ITALIC SMALL L"
+    },
+    "L": {
+      "detail": "𝐿",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL L"
+    },
+    "land": {
+      "detail": "∧",
+      "documentation": "b: LOGICAL AND"
+    },
+    "langle": {
+      "detail": "⟨",
+      "documentation": "MATHEMATICAL LEFT ANGLE BRACKET"
+    },
+    "lbrace": {
+      "detail": "{",
+      "documentation": "LEFT CURLY BRACKET"
+    },
+    "lbrack": {
+      "detail": "[",
+      "documentation": "LEFT SQUARE BRACKET"
+    },
+    "lceil": {
+      "detail": "⌈",
+      "documentation": "LEFT CEILING"
+    },
+    "ldotp": {},
+    "le": {
+      "detail": "≤",
+      "documentation": "r: less-than-or-equal"
+    },
+    "leftarrowfill": {},
+    "leftharpoondown": {
+      "detail": "↽",
+      "documentation": "left harpoon-down"
+    },
+    "leftharpoonup": {
+      "detail": "↼",
+      "documentation": "left harpoon-up"
+    },
+    "leftline{}": {
+      "snippet": "leftline{${1:text}}"
+    },
+    "leftrightarrow": {
+      "detail": "⇆",
+      "documentation": "left arrow over right arrow"
+    },
+    "lfloor": {
+      "detail": "⌊",
+      "documentation": "LEFT FLOOR"
+    },
+    "lg": {},
+    "lgroup": {
+      "detail": "⟮",
+      "documentation": "MATHEMATICAL LEFT FLATTENED PARENTHESIS"
+    },
+    "lim": {},
+    "liminf": {},
+    "limsup": {},
+    "line{}": {
+      "snippet": "line{${1:text}}"
+    },
+    "ll": {
+      "detail": "≪",
+      "documentation": "much less type 2"
+    },
+    "llap{}": {
+      "snippet": "llap{${1:text}}"
+    },
+    "lmoustache": {
+      "detail": "⎰",
+      "documentation": "? \\lmous UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION"
+    },
+    "ln": {},
+    "lnot": {
+      "detail": "¬",
+      "documentation": "NOT SIGN"
+    },
+    "log": {},
+    "loggingall": {},
+    "longleftarrow": {
+      "detail": "⟵",
+      "documentation": "LONG LEFTWARDS ARROW"
+    },
+    "Longleftarrow": {
+      "detail": "⟸",
+      "documentation": "LONG LEFTWARDS DOUBLE ARROW"
+    },
+    "longleftrightarrow": {
+      "detail": "⟷",
+      "documentation": "LONG LEFT RIGHT ARROW"
+    },
+    "Longleftrightarrow": {
+      "detail": "⟺",
+      "documentation": "LONG LEFT RIGHT DOUBLE ARROW"
+    },
+    "longmapsto": {
+      "detail": "⟼",
+      "documentation": "LONG RIGHTWARDS ARROW FROM BAR"
+    },
+    "longrightarrow": {
+      "detail": "⟶",
+      "documentation": "LONG RIGHTWARDS ARROW"
+    },
+    "Longrightarrow": {
+      "detail": "⟹",
+      "documentation": "LONG RIGHTWARDS DOUBLE ARROW"
+    },
+    "loop": {},
+    "lor": {
+      "detail": "∨",
+      "documentation": "b: LOGICAL OR"
+    },
+    "lq": {},
+    "magstep": {},
+    "magstephalf": {},
+    "mapsto": {
+      "detail": "↦",
+      "documentation": "maps righ z notation maplet"
+    },
+    "mathpalette{}{}": {
+      "snippet": "mathpalette{${1:arg1}}{${2:arg2}}"
+    },
+    "mathstrut": {},
+    "matrix{}": {
+      "snippet": "matrix{${1:line \\cr ... line \\cr}}"
+    },
+    "max": {},
+    "maxdimen": {},
+    "medbreak": {},
+    "medskip": {},
+    "medskipamount": {},
+    "min": {},
+    "mit": {},
+    "models": {
+      "detail": "⊧",
+      "documentation": "MODELS (ver short double dash)"
+    },
+    "mp": {
+      "detail": "∓",
+      "documentation": "MINUS-OR-PLUS SIGN"
+    },
+    "nabla": {
+      "detail": "∇",
+      "documentation": "NABLA, del, hamilton operator"
+    },
+    "narrower": {},
+    "natural": {
+      "detail": "♮",
+      "documentation": "music natural"
+    },
+    "nearrow": {
+      "detail": "↗",
+      "documentation": "ne pointing arrow"
+    },
+    "ne": {
+      "detail": "≠",
+      "documentation": "r: not equal"
+    },
+    "negthinspace": {},
+    "newbox": {},
+    "newbox{}": {
+      "snippet": "newbox{${1:cmd}}"
+    },
+    "newcount": {},
+    "newcount{}": {
+      "snippet": "newcount{${1:cmd}}"
+    },
+    "newdimen": {},
+    "newdimen{}": {
+      "snippet": "newdimen{${1:cmd}}"
+    },
+    "newfam": {},
+    "newfam{}": {
+      "snippet": "newfam{${1:cmd}}"
+    },
+    "newhelp": {},
+    "newhelp{}{}": {
+      "snippet": "newhelp{${1:cmd}}{${2:help text}}"
+    },
+    "newif": {},
+    "newif{}": {
+      "snippet": "newif{${1:definition}}"
+    },
+    "newinsert": {},
+    "newinsert{}": {
+      "snippet": "newinsert{${1:cmd}}"
+    },
+    "newlanguage": {},
+    "newlanguage{}": {
+      "snippet": "newlanguage{${1:cmd}}"
+    },
+    "newmuskip": {},
+    "newmuskip{}": {
+      "snippet": "newmuskip{${1:cmd}}"
+    },
+    "newread": {},
+    "newread{}": {
+      "snippet": "newread{${1:cmd}}"
+    },
+    "newskip": {},
+    "newskip{}": {
+      "snippet": "newskip{${1:cmd}}"
+    },
+    "newtoks": {},
+    "newtoks{}": {
+      "snippet": "newtoks{${1:cmd}}"
+    },
+    "newwrite": {},
+    "newwrite{}": {
+      "snippet": "newwrite{${1:cmd}}"
+    },
+    "ni": {
+      "detail": "∋",
+      "documentation": "con variant"
+    },
+    "nobreak": {},
+    "nointerlineskip": {},
+    "nonfrenchspacing": {},
+    "normalbaselines": {},
+    "normalbaselineskip": {},
+    "normallineskip": {},
+    "normallineskiplimit": {},
+    "not": {
+      "detail": " ̸",
+      "documentation": "COMBINING LONG SOLIDUS OVERLAY"
+    },
+    "null": {},
+    "nwarrow": {
+      "detail": "↖",
+      "documentation": "nw pointing arrow"
+    },
+    "o": {
+      "detail": "𝑜",
+      "documentation": "MATHEMATICAL ITALIC SMALL O"
+    },
+    "O": {
+      "detail": "𝑂",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL O"
+    },
+    "oalign{}": {
+      "snippet": "oalign{${1:arg}}"
+    },
+    "obeylines": {},
+    "obeyspaces": {},
+    "odot": {
+      "detail": "⊙",
+      "documentation": "middle dot in circle"
+    },
+    "oe": {},
+    "OE": {},
+    "offinterlineskip": {},
+    "oint": {
+      "detail": "∮",
+      "documentation": "CONTOUR INTEGRAL operator"
+    },
+    "ominus": {
+      "detail": "⊖",
+      "documentation": "minus sign in circle"
+    },
+    "ooalign{}": {
+      "snippet": "ooalign{${1:arg}}"
+    },
+    "oplus": {
+      "detail": "⊕",
+      "documentation": "plus sign in circle"
+    },
+    "oslash": {
+      "detail": "⊘",
+      "documentation": "solidus in circle"
+    },
+    "otimes": {
+      "detail": "⊗",
+      "documentation": "multiply sign in circle"
+    },
+    "overleftarrow{}": {
+      "snippet": "overleftarrow{${1:text}}"
+    },
+    "overrightarrow{}": {
+      "snippet": "overrightarrow{${1:text}}"
+    },
+    "owns": {
+      "detail": "∋",
+      "documentation": "con variant"
+    },
+    "P": {
+      "detail": "𝑃",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL P"
+    },
+    "parallel": {
+      "detail": "∥",
+      "documentation": "parallel"
+    },
+    "perp": {
+      "detail": "⟂",
+      "documentation": "PERPENDICULAR"
+    },
+    "phantom{}": {
+      "snippet": "phantom{${1:text}}"
+    },
+    "pmatrix{}": {
+      "snippet": "pmatrix{${1:line \\cr ${2:line} \\cr}}"
+    },
+    "pmod": {},
+    "Pr": {},
+    "prec": {
+      "detail": "≺",
+      "documentation": "PRECEDES"
+    },
+    "preceq": {
+      "detail": "⪯",
+      "documentation": "PRECEDES ABOVE SINGLE-LINE EQUALS SIGN"
+    },
+    "propto": {
+      "detail": "∝",
+      "documentation": "is PROPORTIONAL TO"
+    },
+    "qquad": {},
+    "quad": {
+      "detail": " ",
+      "documentation": "emquad"
+    },
+    "raggedbottom": {},
+    "rangle": {
+      "detail": "⟩",
+      "documentation": "MATHEMATICAL RIGHT ANGLE BRACKET"
+    },
+    "rbrace": {
+      "detail": "}",
+      "documentation": "RIGHT CURLY BRACKET"
+    },
+    "rbrack": {
+      "detail": "]",
+      "documentation": "RIGHT SQUARE BRACKET"
+    },
+    "rceil": {
+      "detail": "⌉",
+      "documentation": "RIGHT CEILING"
+    },
+    "Re": {
+      "detail": "ℜ",
+      "documentation": "real part"
+    },
+    "repeat": {},
+    "rfloor": {
+      "detail": "⌋",
+      "documentation": "RIGHT FLOOR"
+    },
+    "rgroup": {
+      "detail": "⟯",
+      "documentation": "MATHEMATICAL RIGHT FLATTENED PARENTHESIS"
+    },
+    "rightarrowfill": {},
+    "rightharpoondown": {
+      "detail": "⇁",
+      "documentation": "right harpoon-down"
+    },
+    "rightharpoonup": {
+      "detail": "⇀",
+      "documentation": "right harpoon-up"
+    },
+    "rightleftharpoons": {
+      "detail": "⇌",
+      "documentation": "right harpoon over left"
+    },
+    "rightline{}": {
+      "snippet": "rightline{${1:text}}"
+    },
+    "rlap{}": {
+      "snippet": "rlap{${1:text}}"
+    },
+    "rm": {},
+    "rmoustache": {
+      "detail": "⎱",
+      "documentation": "? \\rmous UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION"
+    },
+    "root": {},
+    "rq": {},
+    "S": {
+      "detail": "𝑆",
+      "documentation": "MATHEMATICAL ITALIC CAPITAL S"
+    },
+    "sb{}": {
+      "snippet": "sb{${1:subscript}}"
+    },
+    "searrow": {
+      "detail": "↘",
+      "documentation": "se pointing arrow"
+    },
+    "sec": {},
+    "sharp": {
+      "detail": "♯",
+      "documentation": "= \\ MUSIC SHARP SIGN, z notation infix bag count"
+    },
+    "showhyphens{}": {
+      "snippet": "showhyphens{${1:space separated words}}"
+    },
+    "sim": {
+      "detail": "∼",
+      "documentation": "similar TILDE OPERATOR"
+    },
+    "simeq": {
+      "detail": "≃",
+      "documentation": "similar, equals"
+    },
+    "sin": {},
+    "sinh": {},
+    "skew{}{}{}": {
+      "snippet": "skew{${1:num}}{${2:math accent}}{${3:text}}"
+    },
+    "sl": {},
+    "slash": {
+      "detail": "∕",
+      "documentation": "DIVISION SLASH"
+    },
+    "smallbreak": {},
+    "smallint": {},
+    "smallskip": {},
+    "smallskipamount": {},
+    "smash{}": {
+      "snippet": "smash{${1:text}}"
+    },
+    "smile": {
+      "detail": "⌣",
+      "documentation": "SMILE (up curve)"
+    },
+    "sp{}": {
+      "snippet": "sp{${1:superscript}}"
+    },
+    "space": {},
+    "spadesuit": {
+      "detail": "♠",
+      "documentation": "spades suit symbol"
+    },
+    "sqcap": {
+      "detail": "⊓",
+      "documentation": "square intersection"
+    },
+    "sqcup": {
+      "detail": "⊔",
+      "documentation": "square union"
+    },
+    "sqsubseteq": {
+      "detail": "⊑",
+      "documentation": "square subset, equals"
+    },
+    "sqsupseteq": {
+      "detail": "⊒",
+      "documentation": "square superset, equals"
+    },
+    "ss": {},
+    "star": {
+      "detail": "⋆",
+      "documentation": "small s filled, low"
+    },
+    "strut": {},
+    "strutbox": {},
+    "subseteq": {
+      "detail": "⊆",
+      "documentation": "subset, equals"
+    },
+    "succ": {
+      "detail": "≻",
+      "documentation": "SUCCEEDS"
+    },
+    "succeq": {
+      "detail": "⪰",
+      "documentation": "SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN"
+    },
+    "sup": {},
+    "supseteq": {
+      "detail": "⊇",
+      "documentation": "superset, equals"
+    },
+    "surd": {},
+    "swarrow": {
+      "detail": "↙",
+      "documentation": "sw pointing arrow"
+    },
+    "t{}": {
+      "snippet": "t{${1:oo}}"
+    },
+    "tan": {},
+    "tanh": {},
+    "TeX": {},
+    "thinspace": {},
+    "to": {
+      "detail": "→",
+      "documentation": "rightward arrow, z notation total function"
+    },
+    "top": {
+      "detail": "⊤",
+      "documentation": "DOWN TACK, top"
+    },
+    "tracingall": {},
+    "triangle": {
+      "detail": "△",
+      "documentation": "big up open"
+    },
+    "triangleleft": {
+      "detail": "◁",
+      "documentation": "(large) lef open; z notation domain restriction"
+    },
+    "triangleright": {
+      "detail": "▷",
+      "documentation": "(large) righ open; z notation range restriction"
+    },
+    "tt": {},
+    "u{}": {
+      "snippet": "u{${1:o}}"
+    },
+    "underbar{}": {
+      "snippet": "underbar{${1:text}}"
+    },
+    "uparrow": {
+      "detail": "↑",
+      "documentation": "upward arrow"
+    },
+    "Uparrow": {
+      "detail": "⇑",
+      "documentation": "up double arrow"
+    },
+    "upbracefill": {},
+    "updownarrow": {
+      "detail": "↕",
+      "documentation": "up and down arrow"
+    },
+    "Updownarrow": {
+      "detail": "⇕",
+      "documentation": "up and down double arrow"
+    },
+    "uplus": {
+      "detail": "⊎",
+      "documentation": "plus sign in union"
+    },
+    "v{}": {
+      "snippet": "v{${1:o}}"
+    },
+    "vdash": {
+      "detail": "⊢",
+      "documentation": "RIGHT TACK, proves, implies, yields, (ver dash)"
+    },
+    "vert": {
+      "detail": "|",
+      "documentation": "vertical bar"
+    },
+    "Vert": {
+      "detail": "‖",
+      "documentation": "double vertical bar"
+    },
+    "vglue": {},
+    "vphantom{}": {
+      "snippet": "vphantom{${1:text}}"
+    },
+    "wlog{}": {
+      "snippet": "wlog{${1:token list}}"
+    },
+    "wp": {
+      "detail": "℘",
+      "documentation": "weierstrass p"
+    },
+    "wr": {
+      "detail": "≀",
+      "documentation": "WREATH PRODUCT"
+    },
+    "allocationnumber": {},
+    "braceld": {},
+    "bracelu": {},
+    "bracerd": {},
+    "braceru": {},
+    "do": {},
+    "dospecials": {},
+    "footins": {},
+    "footnoterule": {},
+    "hideskip": {},
+    "interdisplaylinepenalty": {},
+    "interfootnotelinepenalty": {},
+    "intop": {},
+    "joinrel": {},
+    "leavevmode": {},
+    "lhook": {},
+    "mapstochar": {},
+    "mathhexbox": {},
+    "ointop": {},
+    "relbar": {},
+    "Relbar": {},
+    "removelastskip": {},
+    "rhook": {},
+    "rootbox": {},
+    "vdots": {
+      "detail": "⋮",
+      "documentation": "VERTICAL ELLIPSIS"
+    },
+    "big(": {
+      "snippet": "big(${2:${1}\\big})"
+    },
+    "big[": {
+      "snippet": "big[${1}\\big]"
+    },
+    "Big(": {
+      "snippet": "Big(${2:${1}\\Big})"
+    },
+    "Big[": {
+      "snippet": "Big[${1}\\Big]"
+    },
+    "bigl(": {
+      "snippet": "bigl(${2:${1}\\bigr})"
+    },
+    "bigl[": {
+      "snippet": "bigl[${1}\\bigr]"
+    },
+    "Bigl(": {
+      "snippet": "Bigl(${2:${1}\\Bigr})"
+    },
+    "Bigl[": {
+      "snippet": "Bigl[${1}\\Bigr]"
+    },
+    "biggl(": {
+      "snippet": "biggl(${2:${1}\\biggr})"
+    },
+    "biggl[": {
+      "snippet": "biggl[${1}\\biggr]"
+    },
+    "Biggl(": {
+      "snippet": "Biggl(${2:${1}\\Biggr})"
+    },
+    "Biggl[": {
+      "snippet": "Biggl[${1}\\Biggr]"
+    },
+    "left(": {
+      "snippet": "left(${2:${1}\\right})"
+    },
+    "left[": {
+      "snippet": "left[${1}\\right]"
+    },
+    "int_{}^{}": {
+      "snippet": "int_{${1:min}}^{${2:max}}"
+    },
+    "lim_{}": {
+      "snippet": "lim_{${1:min}}"
+    },
+    "prod_{}^{}": {
+      "snippet": "prod_{${1:min}}^{${2:max}}"
+    },
+    "sum_{}^{}": {
+      "snippet": "sum_{${1:min}}^{${2:max}}"
+    },
+    "beginL": {},
+    "beginR": {},
+    "detokenize{}": {
+      "snippet": "detokenize{${1:arg}}"
+    },
+    "endL": {},
+    "endR": {},
+    "eTeXrevision": {},
+    "eTeXversion": {},
+    "everyeof{}": {
+      "snippet": "everyeof{${1:arg}}"
+    },
+    "currentgrouplevel": {},
+    "currentgrouptype": {},
+    "currentiflevel": {},
+    "currentiftype": {},
+    "currentifbranch": {},
+    "ifcsname": {},
+    "ifdefined": {},
+    "interactionmode": {},
+    "lastlinefit": {},
+    "lastnodetype": {},
+    "middle": {},
+    "numexpr": {},
+    "parshapedimen": {},
+    "parshapeindent": {},
+    "parshapelength": {},
+    "predisplaydirection": {},
+    "protected": {},
+    "scantokens{}": {
+      "snippet": "scantokens{${1:arg}}"
+    },
+    "showgroups": {},
+    "showtokens{}": {
+      "snippet": "showtokens{${1:arg}}"
+    },
+    "TeXXeTstate": {},
+    "tracingassigns": {},
+    "tracinggroups": {},
+    "tracingifs": {},
+    "tracingscantokens": {},
+    "unexpanded{}": {
+      "snippet": "unexpanded{${1:arg}}"
+    },
+    "unless": {},
+    "dimexpr": {},
+    "glueexpr": {},
+    "muexpr": {},
+    "gluestretch": {},
+    "glueshrink": {},
+    "gluestretchorder": {},
+    "glueshrinkorder": {},
+    "gluetomu": {},
+    "mutoglue": {},
+    "interlinepenalties": {},
+    "clubpenalties": {},
+    "widowpenalties": {},
+    "displaywidowpenalties": {},
+    "tracingnesting": {},
+    "savingvdiscards": {},
+    "savinghyphcodes": {},
+    "showifs": {},
+    "pagediscards": {},
+    "splitdiscards": {},
+    "iffontchar": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/tex4ht.json b/dev/packages/tex4ht.json
index ddab06faf..79fdc8d02 100644
--- a/dev/packages/tex4ht.json
+++ b/dev/packages/tex4ht.json
@@ -30,7 +30,7 @@
       "snippet": "CssFile[${1:list of CSS files}]"
     },
     "CutAt{}": {
-      "snippet": "CutAt{${1:at-unit,until-unit1,until-unit2,...}}"
+      "snippet": "CutAt{${1:at-unit,${2:until-unit1},${3:until-unit2},...}}"
     },
     "EndCss": {},
     "EndCssFile": {},
@@ -139,10 +139,10 @@
     "SkipRefstepAnchor": {},
     "TableOfContents": {},
     "tableofcontents[]": {
-      "snippet": "tableofcontents[${1:unit1,unit2,...}]"
+      "snippet": "tableofcontents[${1:unit1,${2:unit2},...}]"
     },
     "TableOfContents[]": {
-      "snippet": "TableOfContents[${1:unit1,unit2,...}]"
+      "snippet": "TableOfContents[${1:unit1,${2:unit2},...}]"
     },
     "Tag{}{}": {
       "snippet": "Tag{${1:label}}{${2:content}}"
@@ -153,7 +153,7 @@
     "TitleCount": {},
     "TitleMark": {},
     "TocAt{}": {
-      "snippet": "TocAt{${1:section-type1,section-type2,...}}"
+      "snippet": "TocAt{${1:section-type1,${2:section-type2},...}}"
     },
     "TocCount": {},
     "AddFontFace{}{}{}{}": {
diff --git a/dev/packages/texdraw.json b/dev/packages/texdraw.json
index f0bc783db..973b9ba26 100644
--- a/dev/packages/texdraw.json
+++ b/dev/packages/texdraw.json
@@ -9,14 +9,50 @@
     "everytexdraw{}": {
       "snippet": "everytexdraw{${1:TeXdraw commands}}"
     },
+    "move ()": {
+      "snippet": "move (${1:x y})"
+    },
+    "lvec ()": {
+      "snippet": "lvec (${1:x y})"
+    },
+    "avec ()": {
+      "snippet": "avec (${1:x y})"
+    },
+    "rmove ()": {
+      "snippet": "rmove (${1:dx dy})"
+    },
+    "rlvec ()": {
+      "snippet": "rlvec (${1:dx dy})"
+    },
+    "ravec ()": {
+      "snippet": "ravec (${1:dx dy})"
+    },
+    "lpatt ()": {
+      "snippet": "lpatt (${1:pattern})"
+    },
+    "htext (){}": {
+      "snippet": "htext (${2:x y}){${1:text}}"
+    },
     "htext{}": {
       "snippet": "htext{${1:text}}"
     },
+    "vtext (){}": {
+      "snippet": "vtext (${2:x y}){${1:text}}"
+    },
     "vtext{}": {
       "snippet": "vtext{${1:text}}"
     },
+    "clvec ()()()": {
+      "snippet": "clvec (${1:x1 y1})(${2:x2 y2})(${3:x3 y3})"
+    },
     "bsegment": {},
     "esegment": {},
+    "savecurrpos ()": {
+      "snippet": "savecurrpos (${1:*${2:px} *py})"
+    },
+    "savepos ()()": {
+      "snippet": "savepos (${1:x y})(${2:*${3:px} *py})"
+    },
     "drawbb": {},
     "writeps{}": {
       "snippet": "writeps{${1:ps-commands}}"
@@ -33,6 +69,9 @@
     "intdiv{}{}{}": {
       "snippet": "intdiv{${1:numerator}}{${2:denominator}}{${3:macro}}"
     },
+    "listtopix (){}": {
+      "snippet": "listtopix (${2:list}){${1:macro}}"
+    },
     "pixtobp{}{}": {
       "snippet": "pixtobp{${1:pixels}}{${2:macro}}"
     },
diff --git a/dev/packages/texshade.json b/dev/packages/texshade.json
index f2436e186..d75a6fcf7 100644
--- a/dev/packages/texshade.json
+++ b/dev/packages/texshade.json
@@ -71,7 +71,7 @@
       "snippet": "clearlogocolors[${1:color}]"
     },
     "codon{}{}": {
-      "snippet": "codon{${1:amino-acid}}{${2:triplet1,triplet2,...}}"
+      "snippet": "codon{${1:amino-acid}}{${2:triplet1,${3:triplet2},...}}"
     },
     "colorscalestretch{}": {
       "snippet": "colorscalestretch{${1:factor}}"
@@ -88,7 +88,7 @@
     },
     "disallowzero": {},
     "DNAgroups{}": {
-      "snippet": "DNAgroups{${1:group1,group2,...}}"
+      "snippet": "DNAgroups{${1:group1,${2:group2},...}}"
     },
     "DNAsims{}{}": {
       "snippet": "DNAsims{${1:residue}}{${2:similars}}"
@@ -98,7 +98,7 @@
       "snippet": "domaingaprule{${1:thickness}}"
     },
     "donotshade{}": {
-      "snippet": "donotshade{${1:seq1,seq2,...}}"
+      "snippet": "donotshade{${1:seq1,${2:seq2},...}}"
     },
     "echostructurefile{}": {
       "snippet": "echostructurefile{${1:strucref}}"
@@ -249,12 +249,12 @@
     "hidelegend": {},
     "hidelogoscale": {},
     "hidename{}": {
-      "snippet": "hidename{${1:seq1,seq2,...}}"
+      "snippet": "hidename{${1:seq1,${2:seq2},...}}"
     },
     "hidenames": {},
     "hidenegatives": {},
     "hidenumber{}": {
-      "snippet": "hidenumber{${1:seq1,seq2,...}}"
+      "snippet": "hidenumber{${1:seq1,${2:seq2},...}}"
     },
     "hidenumbering": {},
     "hideonDSSP{}": {
@@ -279,7 +279,7 @@
       "snippet": "hideruler[${1:top/bottom}]"
     },
     "hideseq{}": {
-      "snippet": "hideseq{${1:seq1,seq2,...}}"
+      "snippet": "hideseq{${1:seq1,${2:seq2},...}}"
     },
     "hideseqs": {},
     "hidesequencelogo": {},
@@ -318,7 +318,7 @@
       "snippet": "includeTCoffee{${1:file}}"
     },
     "killseq{}": {
-      "snippet": "killseq{${1:seq1,seq2,...}}"
+      "snippet": "killseq{${1:seq1,${2:seq2},...}}"
     },
     "legendbf": {},
     "legendcolor{}": {
@@ -388,7 +388,7 @@
       "snippet": "movelegend{${1:x-offset}}{${2:y-offset}}"
     },
     "namecolor{}{}": {
-      "snippet": "namecolor{${1:seq1,seq2,...}}{${2:color}}"
+      "snippet": "namecolor{${1:seq1,${3:seq2},...}}{${2:color}}"
     },
     "nameconsensus{}": {
       "snippet": "nameconsensus{${1:name}}"
@@ -442,7 +442,7 @@
     "noblockskip": {},
     "nosepline": {},
     "numbercolor{}{}": {
-      "snippet": "numbercolor{${1:seq1,seq2,...}}{${2:color}}"
+      "snippet": "numbercolor{${1:seq1,${3:seq2},...}}{${2:color}}"
     },
     "numberingbf": {},
     "numberingcolor{}": {
@@ -471,10 +471,10 @@
     },
     "numcount": {},
     "orderseqs{}": {
-      "snippet": "orderseqs{${1:seq1,seq2,...}}"
+      "snippet": "orderseqs{${1:seq1,${2:seq2},...}}"
     },
     "pepgroups{}": {
-      "snippet": "pepgroups{${1:group1,group2,...}}"
+      "snippet": "pepgroups{${1:group1,${2:group2},...}}"
     },
     "pepsims{}{}": {
       "snippet": "pepsims{${1:residue}}{${2:similars}}"
diff --git a/dev/packages/textopo.json b/dev/packages/textopo.json
index ae1c40332..eb708b7de 100644
--- a/dev/packages/textopo.json
+++ b/dev/packages/textopo.json
@@ -11,7 +11,7 @@
       "snippet": "getsequence[${3:option}]{${1:type}}{${2:file}}"
     },
     "MRs{}": {
-      "snippet": "MRs{${1:start1${1}stop1,start2${2}stop2,...}}"
+      "snippet": "MRs{${1:start1${1}stop1,${2:start2${2}stop2},...}}"
     },
     "Nterm{}": {
       "snippet": "Nterm{${1:intra|extra}}"
@@ -53,10 +53,10 @@
       "snippet": "labelinside[${2:left|right}]{${1:text}}"
     },
     "moveinsidelabel{}": {
-      "snippet": "moveinsidelabel{${1:⟨dir,dist⟩ or ⟨x,y⟩}}"
+      "snippet": "moveinsidelabel{${1:⟨dir,${2:dist⟩ or ⟨x},y⟩}}"
     },
     "moveoutsidelabel{}": {
-      "snippet": "moveoutsidelabel{${1:⟨dir,dist⟩ or ⟨x,y⟩}}"
+      "snippet": "moveoutsidelabel{${1:⟨dir,${2:dist⟩ or ⟨x},y⟩}}"
     },
     "broadenmembrane{}{}": {
       "snippet": "broadenmembrane{${1:left|right}}{${2:length}}"
@@ -78,10 +78,10 @@
       "snippet": "labelTM{${1:num}}{${2:label-text}}"
     },
     "labelTM[]{}{}": {
-      "snippet": "labelTM[${3:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:num}}{${2:label-text}}"
+      "snippet": "labelTM[${3:⟨dir,${4:dist⟩ or ⟨x},y⟩}]{${1:num}}{${2:label-text}}"
     },
     "moveTMlabel{}{}": {
-      "snippet": "moveTMlabel{${1:num}}{${2:⟨dir,dist⟩ or ⟨x,y⟩}}"
+      "snippet": "moveTMlabel{${1:num}}{${2:⟨dir,${3:dist⟩ or ⟨x},y⟩}}"
     },
     "TMlabelcolor{}": {
       "snippet": "TMlabelcolor{${1:color}}"
@@ -91,10 +91,10 @@
       "snippet": "labelloops{${1:style}}"
     },
     "labelloop[]{}{}": {
-      "snippet": "labelloop[${3:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:num}}{${2:label-text}}"
+      "snippet": "labelloop[${3:⟨dir,${4:dist⟩ or ⟨x},y⟩}]{${1:num}}{${2:label-text}}"
     },
     "movelooplabel{}{}": {
-      "snippet": "movelooplabel{${1:num}}{${2:⟨dir,dist⟩ or ⟨x,y⟩}}"
+      "snippet": "movelooplabel{${1:num}}{${2:⟨dir,${3:dist⟩ or ⟨x},y⟩}}"
     },
     "looplabelcolor{}": {
       "snippet": "looplabelcolor{${1:color}}"
@@ -111,7 +111,7 @@
       "snippet": "labelregion{${1:list-of-regions}}{${2:style-name}}{${3:label-text}}"
     },
     "labelregion[]{}{}{}": {
-      "snippet": "labelregion[${4:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:list-of-regions}}{${2:style-name}}{${3:label-text}}"
+      "snippet": "labelregion[${4:⟨dir,${5:dist⟩ or ⟨x},y⟩}]{${1:list-of-regions}}{${2:style-name}}{${3:label-text}}"
     },
     "phosphorylation{}": {
       "snippet": "phosphorylation{${1:list-of-positions}}"
@@ -135,13 +135,13 @@
       "snippet": "addtagtoNterm{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "addtagtoNterm[]{}{}{}": {
-      "snippet": "addtagtoNterm[${4:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
+      "snippet": "addtagtoNterm[${4:⟨dir,${5:dist⟩ or ⟨x},y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "addtagtoCterm{}{}{}": {
       "snippet": "addtagtoCterm{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "addtagtoCterm[]{}{}{}": {
-      "snippet": "addtagtoCterm[${4:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
+      "snippet": "addtagtoCterm[${4:⟨dir,${5:dist⟩ or ⟨x},y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "seqstart{}": {
       "snippet": "seqstart{${1:num}}"
diff --git a/dev/packages/textpos.json b/dev/packages/textpos.json
index e022fa471..0ca728011 100644
--- a/dev/packages/textpos.json
+++ b/dev/packages/textpos.json
@@ -59,7 +59,24 @@
       "snippet": "tekstblokroolkulur{${1:color}}"
     }
   },
-  "envs": {},
+  "envs": {
+    "textblock{}(hpos,vpos)": {
+      "name": "textblock",
+      "snippet": "{${1:hsize}}(${2:hpos},${3:vpos})"
+    },
+    "textblock{}[](hpos,vpos)": {
+      "name": "textblock",
+      "snippet": "{${1:hsize}}[${2:ho,vo}](${3:hpos},${4:vpos})"
+    },
+    "textblock*{}(hpos,vpos)": {
+      "name": "textblock*",
+      "snippet": "{${1:hsize}}(${2:hpos},${3:vpos})"
+    },
+    "textblock*{}[](hpos,vpos)": {
+      "name": "textblock*",
+      "snippet": "{${1:hsize}}[${2:ho,vo}](${3:hpos},${4:vpos})"
+    }
+  },
   "options": [
     "showboxes",
     "noshowtext",
diff --git a/dev/packages/theorem.json b/dev/packages/theorem.json
new file mode 100644
index 000000000..779eca14d
--- /dev/null
+++ b/dev/packages/theorem.json
@@ -0,0 +1,19 @@
+{
+  "includes": {},
+  "macros": {
+    "theoremstyle{}": {
+      "snippet": "theoremstyle{${1:style}}"
+    },
+    "theorembodyfont{}": {
+      "snippet": "theorembodyfont{${1:font}}"
+    },
+    "theoremheaderfont{}": {
+      "snippet": "theoremheaderfont{${1:font}}"
+    },
+    "theorempreskipamount": {},
+    "theorempostskipamount": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/thm-listof.json b/dev/packages/thm-listof.json
index a084f0619..9dce45088 100644
--- a/dev/packages/thm-listof.json
+++ b/dev/packages/thm-listof.json
@@ -21,13 +21,13 @@
       "snippet": "thmtformatoptarg{${1:arg}}"
     },
     "showtheorems{}": {
-      "snippet": "showtheorems{${1:thm1,thm2,...}}"
+      "snippet": "showtheorems{${1:thm1,${2:thm2},...}}"
     },
     "ignoretheorems{}": {
-      "snippet": "ignoretheorems{${1:thm1,thm2,...}}"
+      "snippet": "ignoretheorems{${1:thm1,${2:thm2},...}}"
     },
     "onlynamedtheorems{}": {
-      "snippet": "onlynamedtheorems{${1:thm1,thm2,...}}"
+      "snippet": "onlynamedtheorems{${1:thm1,${2:thm2},...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/tikz-3dplot.json b/dev/packages/tikz-3dplot.json
index f127362cf..2c0006c27 100644
--- a/dev/packages/tikz-3dplot.json
+++ b/dev/packages/tikz-3dplot.json
@@ -42,6 +42,12 @@
     "tdplotgetpolarcoords{}{}{}": {
       "snippet": "tdplotgetpolarcoords{${1:x}}{${2:y}}{${3:z}}"
     },
+    "tdplotcrossprod()()": {
+      "snippet": "tdplotcrossprod(${1:x1},${2:y1},${3:z1})(${4:x2},${5:y2},${6:z2})"
+    },
+    "tdplotdefinepoints()()()": {
+      "snippet": "tdplotdefinepoints(${1:vx},${2:vy},${3:vz})(${4:x1},${5:y1},${6:z1})(${7:x2},${8:y2},${9:z2})"
+    },
     "tdplotdrawarc{}{}{}{}{}{}": {
       "snippet": "tdplotdrawarc{${1:center}}{${2:r}}{${3:angle start}}{${4:angle end}}{${5:label options}}{${6:label}}"
     },
diff --git a/dev/packages/tikz-inet.json b/dev/packages/tikz-inet.json
index b9b38bc80..aa6b11a7a 100644
--- a/dev/packages/tikz-inet.json
+++ b/dev/packages/tikz-inet.json
@@ -7,10 +7,31 @@
     "inetcell{}": {
       "snippet": "inetcell{${1:symbol}}"
     },
+    "inetcell[](){}[]": {
+      "snippet": "inetcell[${2:options}](${4:node name}){${1:symbol}}[${3:angle}]"
+    },
+    "inetwire()()": {
+      "snippet": "inetwire(${1:cell1.port1})(${2:cell2.port2})"
+    },
+    "inetwire[]()()": {
+      "snippet": "inetwire[${1:options}](${2:cell1.port1})(${3:cell2.port2})"
+    },
     "inetloop": {},
     "inetloop[]": {
       "snippet": "inetloop[${1:options}]"
     },
+    "inetwirecoords()()": {
+      "snippet": "inetwirecoords(${1:node1})(${2:node2})"
+    },
+    "inetwirecoords[]()()": {
+      "snippet": "inetwirecoords[${1:options}](${2:node1})(${3:node2})"
+    },
+    "inetwirefree()": {
+      "snippet": "inetwirefree(${1:cell.port})"
+    },
+    "inetwirefree[]()": {
+      "snippet": "inetwirefree[${1:options}](${2:cell.port})"
+    },
     "inetbox{}{}": {
       "snippet": "inetbox{${1:(${3:cell1}) (${4:cell2}) ...}}{${2:node name}}"
     },
diff --git a/dev/packages/tikz-lake-fig.json b/dev/packages/tikz-lake-fig.json
index 2d6579516..dcac31432 100644
--- a/dev/packages/tikz-lake-fig.json
+++ b/dev/packages/tikz-lake-fig.json
@@ -13,6 +13,9 @@
     "relsize": []
   },
   "macros": {
+    "mystrut()": {
+      "snippet": "mystrut(${1:height},${2:depth})"
+    },
     "lakediagramgreen[]": {
       "snippet": "lakediagramgreen[${1:scale}]"
     },
diff --git a/dev/packages/tikz-network.json b/dev/packages/tikz-network.json
index 780db3a03..855d3bce3 100644
--- a/dev/packages/tikz-network.json
+++ b/dev/packages/tikz-network.json
@@ -23,12 +23,20 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "Edge()()": {
+      "snippet": "Edge(${1:vertex1})(${2:vertex2})"
+    },
+    "Edge[]()()": {
+      "snippet": "Edge[${1:options}](${2:vertex1})(${3:vertex2})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "Text{}": {
       "snippet": "Text{${1:text}}"
     },
     "Text[]{}": {
       "snippet": "Text[${2:options}]{${1:text}}",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "Vertices{}": {
@@ -36,7 +44,7 @@
     },
     "Vertices[]{}": {
       "snippet": "Vertices[${2:options}]{${1:file}}",
-      "keyvalindex": 2,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "Edges{}": {
@@ -44,12 +52,12 @@
     },
     "Edges[]{}": {
       "snippet": "Edges[${2:options}]{${1:file}}",
-      "keyvalindex": 3,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "Plane[]": {
       "snippet": "Plane[${1:options}]",
-      "keyvalindex": 4,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "SetDefaultUnit{}": {
@@ -66,24 +74,24 @@
     },
     "SetVertexStyle[]": {
       "snippet": "SetVertexStyle[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "SetEdgeStyle[]": {
       "snippet": "SetEdgeStyle[${1:options}]",
-      "keyvalindex": 6,
+      "keyvalindex": 7,
       "keyvalpos": 0
     },
     "EdgesNotInBG": {},
     "EdgesInBG": {},
     "SetTextStyle[]": {
       "snippet": "SetTextStyle[${1:options}]",
-      "keyvalindex": 7,
+      "keyvalindex": 8,
       "keyvalpos": 0
     },
     "SetPlaneStyle[]": {
       "snippet": "SetPlaneStyle[${1:options}]",
-      "keyvalindex": 8,
+      "keyvalindex": 9,
       "keyvalpos": 0
     },
     "SetPlaneWidth{}": {
@@ -119,6 +127,27 @@
       "RGB",
       "Pseudo"
     ],
+    [
+      "lw=",
+      "color=",
+      "opacity=",
+      "bend=",
+      "label=",
+      "fontsize=",
+      "fontcolor=",
+      "fontscale=",
+      "position=",
+      "distance=",
+      "style=",
+      "path={${1:vertex list}}",
+      "loopsize=",
+      "loopposition=",
+      "loopshape=",
+      "Direct",
+      "Math",
+      "RGB",
+      "NotInBG"
+    ],
     [
       "x=",
       "y=",
diff --git a/dev/packages/tikz-truchet.json b/dev/packages/tikz-truchet.json
index 51f11325f..c3601aeff 100644
--- a/dev/packages/tikz-truchet.json
+++ b/dev/packages/tikz-truchet.json
@@ -7,45 +7,45 @@
       "snippet": "truchetsquare{${1:Center}}{${2:NE}}{${3:NW}}{${4:SW}}{${5:SE}}"
     },
     "truchetsquare[]{}{}{}{}{}": {
-      "snippet": "truchetsquare[${6:(${7:x,y})}]{${1:Center}}{${2:NE}}{${3:NW}}{${4:SW}}{${5:SE}}"
+      "snippet": "truchetsquare[${6:(${7:x},${8:y})}]{${1:Center}}{${2:NE}}{${3:NW}}{${4:SW}}{${5:SE}}"
     },
     "diagonalsquare{}{}{}{}": {
       "snippet": "diagonalsquare{${1:NE}}{${2:NW}}{${3:SW}}{${4:SE}}"
     },
     "diagonalsquare[]{}{}{}{}": {
-      "snippet": "diagonalsquare[${5:(${6:x,y})}]{${1:NE}}{${2:NW}}{${3:SW}}{${4:SE}}"
+      "snippet": "diagonalsquare[${5:(${6:x},${7:y})}]{${1:NE}}{${2:NW}}{${3:SW}}{${4:SE}}"
     },
     "tileA": {},
     "tileA[]": {
-      "snippet": "tileA[${1:(${2:x,y})}]"
+      "snippet": "tileA[${1:(${2:x},${3:y})}]"
     },
     "tileB": {},
     "tileB[]": {
-      "snippet": "tileB[${1:(${2:x,y})}]"
+      "snippet": "tileB[${1:(${2:x},${3:y})}]"
     },
     "tileC": {},
     "tileC[]": {
-      "snippet": "tileC[${1:(${2:x,y})}]"
+      "snippet": "tileC[${1:(${2:x},${3:y})}]"
     },
     "tileD": {},
     "tileD[]": {
-      "snippet": "tileD[${1:(${2:x,y})}]"
+      "snippet": "tileD[${1:(${2:x},${3:y})}]"
     },
     "truchethex{}{}{}{}{}{}{}": {
       "snippet": "truchethex{${1:Center}}{${2:NW}}{${3:W}}{${4:SW}}{${5:SE}}{${6:E}}{${7:NW}}"
     },
     "truchethex[]{}{}{}{}{}{}{}": {
-      "snippet": "truchethex[${8:(${9:x,y})}]{${1:Center}}{${2:NW}}{${3:W}}{${4:SW}}{${5:SE}}{${6:E}}{${7:NW}}"
+      "snippet": "truchethex[${8:(${9:x},${10:y})}]{${1:Center}}{${2:NW}}{${3:W}}{${4:SW}}{${5:SE}}{${6:E}}{${7:NW}}"
     },
     "truchetsplithex": {},
     "truchetsplithex[]": {
-      "snippet": "truchetsplithex[${1:(${2:x,y})}]"
+      "snippet": "truchetsplithex[${1:(${2:x},${3:y})}]"
     },
     "truchetcube{}{}{}{}{}{}": {
       "snippet": "truchetcube{${1:Bottom}}{${2:Front}}{${3:Right}}{${4:Back}}{${5:Left}}{${6:Right}}"
     },
     "truchetcube[]{}{}{}{}{}{}": {
-      "snippet": "truchetcube[${7:(${8:x,y})}]{${1:Bottom}}{${2:Front}}{${3:Right}}{${4:Back}}{${5:Left}}{${6:Right}}"
+      "snippet": "truchetcube[${7:(${8:x},${9:y})}]{${1:Bottom}}{${2:Front}}{${3:Right}}{${4:Back}}{${5:Left}}{${6:Right}}"
     }
   },
   "envs": {
diff --git a/dev/packages/tikz.json b/dev/packages/tikz.json
new file mode 100644
index 000000000..d4d5ac964
--- /dev/null
+++ b/dev/packages/tikz.json
@@ -0,0 +1,1508 @@
+{
+  "includes": {
+    "pgf": [],
+    "pgffor": []
+  },
+  "macros": {
+    "scoped": {},
+    "scoped[]": {
+      "snippet": "scoped[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "tikzset{}": {
+      "snippet": "tikzset{${1:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "tikzoption{}{}": {
+      "snippet": "tikzoption{${1:key}}{${2:value}}"
+    },
+    "tikzaddafternodepathoption{}": {
+      "snippet": "tikzaddafternodepathoption{${1:arg}}"
+    },
+    "tikzparentanchor": {},
+    "tikzchildanchor": {},
+    "tikzparentnode": {},
+    "tikzchildnode": {},
+    "tikzpicture": {},
+    "endtikzpicture": {},
+    "tikz": {},
+    "tikz[]": {
+      "snippet": "tikz[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "tikzdeclarecoordinatesystem{}{}": {
+      "snippet": "tikzdeclarecoordinatesystem{${1:name}}{${2:code}}"
+    },
+    "tikzaliascoordinatesystem{}{}": {
+      "snippet": "tikzaliascoordinatesystem{${1:new name}}{${2:old name}}"
+    },
+    "tikzifinpicture{}{}": {
+      "snippet": "tikzifinpicture{${1:in code}}{${2:out code}}"
+    },
+    "tikzaddtikzonlycommandshortcutlet{}{}": {
+      "snippet": "tikzaddtikzonlycommandshortcutlet{${1:short cmd}}{${2:cmd}}"
+    },
+    "tikzaddtikzonlycommandshortcutdef{}{}": {
+      "snippet": "tikzaddtikzonlycommandshortcutdef{${1:short cmd}}{${2:def}}"
+    },
+    "nodepart{}": {
+      "snippet": "nodepart{${1:part name}}"
+    },
+    "nodepart[]{}": {
+      "snippet": "nodepart[${2:options}]{${1:part name}}",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "pgfextra{}": {
+      "snippet": "pgfextra{${1:code}}"
+    },
+    "endpgfextra": {},
+    "pgfstrokehook": {},
+    "tikztostart": {},
+    "tikztotarget": {},
+    "tikztonodes": {},
+    "tikzlastnode": {},
+    "pgfplotlastpoint": {},
+    "tikzerror{}": {
+      "snippet": "tikzerror{${1:message}}"
+    },
+    "tikzleveldistance": {},
+    "tikzsiblingdistance": {},
+    "tikztreelevel": {},
+    "tikznumberofchildren": {},
+    "tikznumberofcurrentchild": {},
+    "tikzpathuptonow": {},
+    "tikzpictext": {},
+    "tikzpictextoptions": {},
+    "tikzdeclarepic{}{}": {
+      "snippet": "tikzdeclarepic{${1:arg1}}{${2:arg2}}"
+    },
+    "p": {
+      "detail": "𝑝",
+      "documentation": "MATHEMATICAL ITALIC SMALL P"
+    },
+    "x": {
+      "detail": "𝑥",
+      "documentation": "MATHEMATICAL ITALIC SMALL X"
+    },
+    "y": {
+      "detail": "𝑦",
+      "documentation": "MATHEMATICAL ITALIC SMALL Y"
+    },
+    "tikzgdeventcallback{}{}": {
+      "snippet": "tikzgdeventcallback{${1:arg1}}{${2:arg2}}"
+    },
+    "tikzgdeventgroupcallback{}": {
+      "snippet": "tikzgdeventgroupcallback{${1:arg1}}"
+    },
+    "tikzgdlatenodeoptionacallback{}": {
+      "snippet": "tikzgdlatenodeoptionacallback{${1:arg1}}"
+    },
+    "usetikzlibrary{}": {
+      "snippet": "usetikzlibrary{${1:library list}}",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "pgfplothandlercurveto": {},
+    "pgfsetplottension{}": {
+      "snippet": "pgfsetplottension{${1:tension}}"
+    },
+    "pgfplothandlerclosedcurve": {},
+    "pgfplothandlerxcomb": {},
+    "pgfplothandlerycomb": {},
+    "pgfplotxzerolevelstreamstart": {},
+    "pgfplotxzerolevelstreamend": {},
+    "pgfplotxzerolevelstreamnext": {},
+    "pgfplotyzerolevelstreamstart": {},
+    "pgfplotyzerolevelstreamend": {},
+    "pgfplotyzerolevelstreamnext": {},
+    "pgfplotxzerolevelstreamconstant{}": {
+      "snippet": "pgfplotxzerolevelstreamconstant{${1:dimen}}"
+    },
+    "pgfplotyzerolevelstreamconstant{}": {
+      "snippet": "pgfplotyzerolevelstreamconstant{${1:dimen}}"
+    },
+    "pgfplotbarwidth": {},
+    "pgfplotbarshift": {},
+    "pgfplothandlerybar": {},
+    "pgfplothandlerxbar": {},
+    "pgfplothandlerybarinterval": {},
+    "pgfplothandlerxbarinterval": {},
+    "pgfplothandlerconstantlineto": {},
+    "pgfplothandlerconstantlinetomarkright": {},
+    "pgfplothandlerconstantlinetomarkmid": {},
+    "pgfplothandlerjumpmarkright": {},
+    "pgfplothandlerjumpmarkleft": {},
+    "pgfplothandlerjumpmarkmid": {},
+    "pgfplothandlerpolarcomb": {},
+    "pgfplothandlermark{}": {
+      "snippet": "pgfplothandlermark{${1:mark code}}"
+    },
+    "pgfsetplotmarkrepeat{}": {
+      "snippet": "pgfsetplotmarkrepeat{${1:repeat count}}"
+    },
+    "pgfsetplotmarkphase{}": {
+      "snippet": "pgfsetplotmarkphase{${1:index}}"
+    },
+    "pgfplothandlermarklisted{}{}": {
+      "snippet": "pgfplothandlermarklisted{${1:code}}{${2:positions}}"
+    },
+    "pgfdeclareplotmark{}{}": {
+      "snippet": "pgfdeclareplotmark{${1:name}}{${2:code}}"
+    },
+    "pgfsetplotmarksize{}": {
+      "snippet": "pgfsetplotmarksize{${1:size}}"
+    },
+    "pgfplotmarksize": {},
+    "pgfuseplotmark{}": {
+      "snippet": "pgfuseplotmark{${1:name}}"
+    },
+    "pgfplothandlergaplineto": {},
+    "pgfplothandlergapcycle": {},
+    "ifpgfmatrix": {},
+    "pgfmatrixtrue": {},
+    "pgfmatrixfalse": {},
+    "pgfmatrixcurrentrow": {},
+    "pgfmatrixcurrentcolumn": {},
+    "pgfmatrixbeforeassemblenode{}": {
+      "snippet": "pgfmatrixbeforeassemblenode{${1:code}}"
+    },
+    "pgfsetmatrixrowsep{}": {
+      "snippet": "pgfsetmatrixrowsep{${1:sep list}}"
+    },
+    "pgfsetmatrixcolumnsep{}": {
+      "snippet": "pgfsetmatrixcolumnsep{${1:sep list}}"
+    },
+    "pgfmatrixrowsep": {},
+    "pgfmatrixcolumnsep": {},
+    "pgfmatrix{}{}{}{}{}{}{}": {
+      "snippet": "pgfmatrix{${1:shape}}{${2:anchor}}{${3:name}}{${4:usage}}{${5:shift}}{${6:precode}}{${7:matrix cells}}"
+    },
+    "pgfmatrixnextcell": {},
+    "pgfmatrixnextcell[]": {
+      "snippet": "pgfmatrixnextcell[${1:additional sep list}]"
+    },
+    "pgfmatrixbegincode": {},
+    "pgfmatrixendcode": {},
+    "pgfmatrixemptycode": {},
+    "pgfmatrixendrow": {},
+    "pgfmatrixendrow[]": {
+      "snippet": "pgfmatrixendrow[${1:additional sep list}]"
+    }
+  },
+  "envs": {
+    "scope": {},
+    "scope[]": {
+      "name": "scope",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "tikzpicture": {},
+    "tikzpicture[]": {
+      "name": "tikzpicture",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "execute at begin scope=${1:code}",
+      "execute at end scope=${1:code}",
+      "transparency group",
+      "transparency group=${1:options}",
+      "every path/.style={${1:options}}",
+      "every circle/.style={${1:options}}",
+      "every to/.style={${1:options}}",
+      "every node/.style={${1:options}}",
+      "every lower node part/.style={${1:options}}",
+      "every label/.style={${1:options}}",
+      "every pin/.style={${1:options}}",
+      "every pin edge/.style={${1:options}}",
+      "every edge/.style={${1:options}}",
+      "every pic/.style={${1:options}}",
+      "every new ->/.style={${1:options}}",
+      "every new --/.style={${1:options}}",
+      "every new <->/.style={${1:options}}",
+      "every new <-/.style={${1:options}}",
+      "every new -!-/.style={${1:options}}",
+      "every matrix/.style={${1:options}}",
+      "every outer matrix/.style={${1:options}}",
+      "every child/.style={${1:options}}",
+      "every child node/.style={${1:options}}",
+      "every plot/.style={${1:options}}",
+      "every mark/.style={${1:options}}",
+      "every loop/.style={${1:options}}",
+      "execute at begin to=${1:code}",
+      "execute at end to=${1:code}",
+      "execute at begin node=${1:code}",
+      "execute at end node=${1:code}",
+      "trim left",
+      "trim left=${1:<dimen> or <coord> or default}",
+      "trim right",
+      "trim right=${1:<dimen> or <coord> or default}",
+      "tri lowlevel",
+      "name prefix=${1:text}",
+      "name suffix=${1:text}",
+      "badness warnings for centered text",
+      "node halign header=${1:macro}",
+      "level/.style={${1:options}}",
+      "level ${1:n}/.style={${2:options}}",
+      "level distance=",
+      "sibling distance=",
+      "edge from parent/.style={${1:options}}",
+      "variable=${1:macro}",
+      "samples=${1:number}",
+      "domain=${1:start}:${2:end}",
+      "samples at=${1:samples list}",
+      "parametric",
+      "range=${1:start}:${2:end}",
+      "yrange=${1:start}:${2:end}",
+      "xrange=${1:start}:${2:end}",
+      "id=${1:id}",
+      "prefix",
+      "raw gnuplot",
+      "mark=${1:mark}",
+      "mark repeat=${1:number}",
+      "mark phase=${1:number}",
+      "mark indices=${1:list}",
+      "mark size=",
+      "mark options={${1:options}}",
+      "no marks",
+      "no markers",
+      "sharp plot",
+      "smooth",
+      "tension=${1:value}",
+      "smooth cycle",
+      "const plot",
+      "const plot mark left",
+      "const plot mark right",
+      "const plot mark mid",
+      "jump mark left",
+      "jump mark right",
+      "jump mark mid",
+      "ycomb",
+      "xcomb",
+      "polar comb",
+      "ybar",
+      "xbar",
+      "ybar interval",
+      "xbar interval",
+      "only marks",
+      "blend mode=",
+      "blend group=",
+      "matrix/inner style order={${1:list}}",
+      "bar width=",
+      "bar shift=",
+      "bar interval shift=${1:factor}",
+      "bar interval width=${1:scale}",
+      "gap around stream point=",
+      "x=${1:<dimen> or <coord>}",
+      "y=${1:<dimen> or <coord>}",
+      "z=${1:<dimen> or <coord>}",
+      "name=${1:name}",
+      "append after command=${1:path}",
+      "prefix after command=${1:path}",
+      "rounded corners",
+      "rounded corners=",
+      "sharp corners",
+      "x radius=${1:<num> or <dimen>}",
+      "y radius=${1:<num> or <dimen>}",
+      "radius=",
+      "at=${1:coord}",
+      "start angle=${1:degrees}",
+      "end angle=${1:degrees}",
+      "delta angle=${1:degrees}",
+      "step=${1:<num> or <dimen> or <coord>}",
+      "xstep=${1:<num> or <dimen>}",
+      "ystep=${1:<num> or <dimen>}",
+      "help lines",
+      "bend=${1:coord}",
+      "bend pos=${1:fraction}",
+      "parabola height=",
+      "bend at start",
+      "bend at end",
+      "to path=${1:path}",
+      "save path=${1:macro}",
+      "use path=${1:macro}",
+      "color=",
+      "%color",
+      "draw",
+      "draw=",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line cap=",
+      "line join=",
+      "miter limit=${1:factor}",
+      "dash pattern=${1:dash pattern}",
+      "dash phase=${1:dash phase}",
+      "dash=${1:dash pattern} phase ${2:dash phase}",
+      "dash expand off",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "double",
+      "double=",
+      "double distance=",
+      "double distance between line centers=",
+      "double equal sign distance",
+      "fill",
+      "fill=",
+      "pattern",
+      "pattern=${1:name}",
+      "pattern color=",
+      "nonzero rule",
+      "even odd rule",
+      "shade",
+      "shading=",
+      "shading angle=${1:degrees}",
+      "arrows=${1:start spec}-${2:end spec}",
+      "->",
+      "<-",
+      "<->",
+      "tips",
+      "tips=",
+      ">=${1:end arrow spec}",
+      "shorten <=",
+      "shorten >=",
+      "inner sep=",
+      "inner xsep=",
+      "inner ysep=",
+      "outer sep=${1:<dimen> or auto}",
+      "outer xsep=",
+      "outer ysep=",
+      "minimum height=",
+      "minimum width=",
+      "minimum size=",
+      "shape aspect=${1:aspect ratio}",
+      "shape border uses incircle",
+      "shape border rotate=${1:degrees}",
+      "text=",
+      "node font=${1:font commands}",
+      "font=${1:font commands}",
+      "text width=",
+      "align=",
+      "text height=",
+      "text depth=",
+      "anchor=",
+      "above",
+      "above=",
+      "below",
+      "below=",
+      "right",
+      "right=",
+      "left",
+      "left=",
+      "above left",
+      "above right",
+      "below left",
+      "below right",
+      "centered",
+      "transform shape",
+      "transform shape nonlinear",
+      "pos=${1:fraction}",
+      "auto",
+      "auto=",
+      "swap",
+      "sloped",
+      "allow upside down",
+      "midway",
+      "near start",
+      "near end",
+      "very near start",
+      "very near end",
+      "at start",
+      "at end",
+      "label=${1:angle}:${2:text}",
+      "label=[${1:options}]${2:angle}:${3:text}",
+      "label position=${1:degrees}",
+      "absolute",
+      "label distance=",
+      "pin=${1:angle}:${2:text}",
+      "pin=[${1:options}]${2:angle}:${3:text}",
+      "pin distance=",
+      "pin edge={${1:options}}",
+      "remember picture",
+      "overlay",
+      "growth parent anchor=",
+      "growth function=${1:macro}",
+      "edge from parent path=${1:path}",
+      "draw opacity=${1:value}",
+      "opacity=${1:value}",
+      "transparent",
+      "ultra nearly transparent",
+      "very nearly transparent",
+      "nearly transparent",
+      "semitransparent",
+      "nearly opaque",
+      "very nearly opaque",
+      "ultra nearly opaque",
+      "opaque",
+      "fill opacity=${1:value}",
+      "text opacity=${1:value}",
+      "shift={${1:coordinate}}",
+      "shift only",
+      "xshift=",
+      "yshift=",
+      "scale=${1:scale}",
+      "xscale=${1:scale}",
+      "yscale=${1:scale}",
+      "xslant=${1:factor}",
+      "yslant=${1:factor}",
+      "rotate=${1:degrees}",
+      "rotate around={${1:degree}:${2:coordinate}}",
+      "rotate around x=${1:degrees}",
+      "rotate around y=${1:degrees}",
+      "rotate around z=${1:degrees}",
+      "cm={${1:a,b,c,d,coord}}",
+      "reset cm",
+      "transform canvas={${1:options}}",
+      "out=${1:degrees}",
+      "in=${1:degrees}",
+      "relative",
+      "bend left",
+      "bend left=${1:degrees}",
+      "bend right",
+      "bend right=${1:degrees}",
+      "bend angle=${1:degrees}",
+      "looseness=${1:number}",
+      "out looseness=${1:number}",
+      "in looseness=${1:number}",
+      "min distance=",
+      "max distance=",
+      "out min distance=",
+      "out max distance=",
+      "in min distance=",
+      "in max distance=",
+      "distance=",
+      "out distance=",
+      "in distance=",
+      "out control=${1:coord}",
+      "in control=${1:coord}",
+      "controls=${1:coord1} and ${2:coord2}",
+      "%tikzstyle",
+      "pic type=${1:type}",
+      "pics/code=${1:code}",
+      "pics/foreground code=${1:code}",
+      "pics/background code=${1:code}",
+      "pic text=${1:text}",
+      "pic text options={${1:options}}",
+      "column sep=",
+      "row sep=",
+      "every cell={${1:row}}{${2:column}}",
+      "cells={${1:options}}",
+      "nodes={${1:options}}",
+      "column ${1:n}/.style={${2:options}}",
+      "every odd column/.style={${1:options}}",
+      "every even column/.style={${1:options}}",
+      "row ${1:m}/.style={${2:options}}",
+      "every odd row/.style={${1:options}}",
+      "every even row/.style={${1:options}}",
+      "row ${1:m} column ${2:n}/.style={${3:options}}",
+      "execute at begin cell=${1:code}",
+      "execute at end cell=${1:code}",
+      "execute at empty cell=${1:code}",
+      "matrix anchor=${1:anchor}",
+      "ampersand replacement=${1:macro}"
+    ],
+    [
+      "every picture/.style={${1:options}}",
+      "baseline",
+      "baseline=${1:<dimen> or <coord> or default}",
+      "execute at begin picture=${1:code}",
+      "execute at end picture=${1:code}",
+      "every scope/.style={${1:options}}",
+      "execute at begin scope=${1:code}",
+      "execute at end scope=${1:code}",
+      "transparency group",
+      "transparency group=${1:options}",
+      "every path/.style={${1:options}}",
+      "every circle/.style={${1:options}}",
+      "every to/.style={${1:options}}",
+      "every node/.style={${1:options}}",
+      "every lower node part/.style={${1:options}}",
+      "every label/.style={${1:options}}",
+      "every pin/.style={${1:options}}",
+      "every pin edge/.style={${1:options}}",
+      "every edge/.style={${1:options}}",
+      "every pic/.style={${1:options}}",
+      "every new ->/.style={${1:options}}",
+      "every new --/.style={${1:options}}",
+      "every new <->/.style={${1:options}}",
+      "every new <-/.style={${1:options}}",
+      "every new -!-/.style={${1:options}}",
+      "every matrix/.style={${1:options}}",
+      "every outer matrix/.style={${1:options}}",
+      "every child/.style={${1:options}}",
+      "every child node/.style={${1:options}}",
+      "every plot/.style={${1:options}}",
+      "every mark/.style={${1:options}}",
+      "every loop/.style={${1:options}}",
+      "execute at begin to=${1:code}",
+      "execute at end to=${1:code}",
+      "execute at begin node=${1:code}",
+      "execute at end node=${1:code}",
+      "trim left",
+      "trim left=${1:<dimen> or <coord> or default}",
+      "trim right",
+      "trim right=${1:<dimen> or <coord> or default}",
+      "tri lowlevel",
+      "name prefix=${1:text}",
+      "name suffix=${1:text}",
+      "badness warnings for centered text",
+      "node halign header=${1:macro}",
+      "level/.style={${1:options}}",
+      "level ${1:n}/.style={${2:options}}",
+      "level distance=",
+      "sibling distance=",
+      "edge from parent/.style={${1:options}}",
+      "variable=${1:macro}",
+      "samples=${1:number}",
+      "domain=${1:start}:${2:end}",
+      "samples at=${1:samples list}",
+      "parametric",
+      "range=${1:start}:${2:end}",
+      "yrange=${1:start}:${2:end}",
+      "xrange=${1:start}:${2:end}",
+      "id=${1:id}",
+      "prefix",
+      "raw gnuplot",
+      "mark=${1:mark}",
+      "mark repeat=${1:number}",
+      "mark phase=${1:number}",
+      "mark indices=${1:list}",
+      "mark size=",
+      "mark options={${1:options}}",
+      "no marks",
+      "no markers",
+      "sharp plot",
+      "smooth",
+      "tension=${1:value}",
+      "smooth cycle",
+      "const plot",
+      "const plot mark left",
+      "const plot mark right",
+      "const plot mark mid",
+      "jump mark left",
+      "jump mark right",
+      "jump mark mid",
+      "ycomb",
+      "xcomb",
+      "polar comb",
+      "ybar",
+      "xbar",
+      "ybar interval",
+      "xbar interval",
+      "only marks",
+      "blend mode=",
+      "blend group=",
+      "matrix/inner style order={${1:list}}",
+      "bar width=",
+      "bar shift=",
+      "bar interval shift=${1:factor}",
+      "bar interval width=${1:scale}",
+      "gap around stream point=",
+      "x=${1:<dimen> or <coord>}",
+      "y=${1:<dimen> or <coord>}",
+      "z=${1:<dimen> or <coord>}",
+      "name=${1:name}",
+      "append after command=${1:path}",
+      "prefix after command=${1:path}",
+      "rounded corners",
+      "rounded corners=",
+      "sharp corners",
+      "x radius=${1:<num> or <dimen>}",
+      "y radius=${1:<num> or <dimen>}",
+      "radius=",
+      "at=${1:coord}",
+      "start angle=${1:degrees}",
+      "end angle=${1:degrees}",
+      "delta angle=${1:degrees}",
+      "step=${1:<num> or <dimen> or <coord>}",
+      "xstep=${1:<num> or <dimen>}",
+      "ystep=${1:<num> or <dimen>}",
+      "help lines",
+      "bend=${1:coord}",
+      "bend pos=${1:fraction}",
+      "parabola height=",
+      "bend at start",
+      "bend at end",
+      "to path=${1:path}",
+      "save path=${1:macro}",
+      "use path=${1:macro}",
+      "color=",
+      "%color",
+      "draw",
+      "draw=",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line cap=",
+      "line join=",
+      "miter limit=${1:factor}",
+      "dash pattern=${1:dash pattern}",
+      "dash phase=${1:dash phase}",
+      "dash=${1:dash pattern} phase ${2:dash phase}",
+      "dash expand off",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "double",
+      "double=",
+      "double distance=",
+      "double distance between line centers=",
+      "double equal sign distance",
+      "fill",
+      "fill=",
+      "pattern",
+      "pattern=${1:name}",
+      "pattern color=",
+      "nonzero rule",
+      "even odd rule",
+      "shade",
+      "shading=",
+      "shading angle=${1:degrees}",
+      "arrows=${1:start spec}-${2:end spec}",
+      "->",
+      "<-",
+      "<->",
+      "tips",
+      "tips=",
+      ">=${1:end arrow spec}",
+      "shorten <=",
+      "shorten >=",
+      "inner sep=",
+      "inner xsep=",
+      "inner ysep=",
+      "outer sep=${1:<dimen> or auto}",
+      "outer xsep=",
+      "outer ysep=",
+      "minimum height=",
+      "minimum width=",
+      "minimum size=",
+      "shape aspect=${1:aspect ratio}",
+      "shape border uses incircle",
+      "shape border rotate=${1:degrees}",
+      "text=",
+      "node font=${1:font commands}",
+      "font=${1:font commands}",
+      "text width=",
+      "align=",
+      "text height=",
+      "text depth=",
+      "anchor=",
+      "above",
+      "above=",
+      "below",
+      "below=",
+      "right",
+      "right=",
+      "left",
+      "left=",
+      "above left",
+      "above right",
+      "below left",
+      "below right",
+      "centered",
+      "transform shape",
+      "transform shape nonlinear",
+      "pos=${1:fraction}",
+      "auto",
+      "auto=",
+      "swap",
+      "sloped",
+      "allow upside down",
+      "midway",
+      "near start",
+      "near end",
+      "very near start",
+      "very near end",
+      "at start",
+      "at end",
+      "label=${1:angle}:${2:text}",
+      "label=[${1:options}]${2:angle}:${3:text}",
+      "label position=${1:degrees}",
+      "absolute",
+      "label distance=",
+      "pin=${1:angle}:${2:text}",
+      "pin=[${1:options}]${2:angle}:${3:text}",
+      "pin distance=",
+      "pin edge={${1:options}}",
+      "remember picture",
+      "overlay",
+      "growth parent anchor=",
+      "growth function=${1:macro}",
+      "edge from parent path=${1:path}",
+      "draw opacity=${1:value}",
+      "opacity=${1:value}",
+      "transparent",
+      "ultra nearly transparent",
+      "very nearly transparent",
+      "nearly transparent",
+      "semitransparent",
+      "nearly opaque",
+      "very nearly opaque",
+      "ultra nearly opaque",
+      "opaque",
+      "fill opacity=${1:value}",
+      "text opacity=${1:value}",
+      "shift={${1:coordinate}}",
+      "shift only",
+      "xshift=",
+      "yshift=",
+      "scale=${1:scale}",
+      "xscale=${1:scale}",
+      "yscale=${1:scale}",
+      "xslant=${1:factor}",
+      "yslant=${1:factor}",
+      "rotate=${1:degrees}",
+      "rotate around={${1:degree}:${2:coordinate}}",
+      "rotate around x=${1:degrees}",
+      "rotate around y=${1:degrees}",
+      "rotate around z=${1:degrees}",
+      "cm={${1:a,b,c,d,coord}}",
+      "reset cm",
+      "transform canvas={${1:options}}",
+      "out=${1:degrees}",
+      "in=${1:degrees}",
+      "relative",
+      "bend left",
+      "bend left=${1:degrees}",
+      "bend right",
+      "bend right=${1:degrees}",
+      "bend angle=${1:degrees}",
+      "looseness=${1:number}",
+      "out looseness=${1:number}",
+      "in looseness=${1:number}",
+      "min distance=",
+      "max distance=",
+      "out min distance=",
+      "out max distance=",
+      "in min distance=",
+      "in max distance=",
+      "distance=",
+      "out distance=",
+      "in distance=",
+      "out control=${1:coord}",
+      "in control=${1:coord}",
+      "controls=${1:coord1} and ${2:coord2}",
+      "%tikzstyle",
+      "pic type=${1:type}",
+      "pics/code=${1:code}",
+      "pics/foreground code=${1:code}",
+      "pics/background code=${1:code}",
+      "pic text=${1:text}",
+      "pic text options={${1:options}}",
+      "column sep=",
+      "row sep=",
+      "every cell={${1:row}}{${2:column}}",
+      "cells={${1:options}}",
+      "nodes={${1:options}}",
+      "column ${1:n}/.style={${2:options}}",
+      "every odd column/.style={${1:options}}",
+      "every even column/.style={${1:options}}",
+      "row ${1:m}/.style={${2:options}}",
+      "every odd row/.style={${1:options}}",
+      "every even row/.style={${1:options}}",
+      "row ${1:m} column ${2:n}/.style={${3:options}}",
+      "execute at begin cell=${1:code}",
+      "execute at end cell=${1:code}",
+      "execute at empty cell=${1:code}",
+      "matrix anchor=${1:anchor}",
+      "ampersand replacement=${1:macro}"
+    ],
+    [
+      "baseline",
+      "baseline=${1:<dimen> or <coord> or default}",
+      "execute at begin picture=${1:code}",
+      "execute at end picture=${1:code}",
+      "every scope/.style={${1:options}}",
+      "every path/.style={${1:options}}",
+      "every circle/.style={${1:options}}",
+      "every to/.style={${1:options}}",
+      "every node/.style={${1:options}}",
+      "every lower node part/.style={${1:options}}",
+      "every label/.style={${1:options}}",
+      "every pin/.style={${1:options}}",
+      "every pin edge/.style={${1:options}}",
+      "every edge/.style={${1:options}}",
+      "every pic/.style={${1:options}}",
+      "every new ->/.style={${1:options}}",
+      "every new --/.style={${1:options}}",
+      "every new <->/.style={${1:options}}",
+      "every new <-/.style={${1:options}}",
+      "every new -!-/.style={${1:options}}",
+      "every matrix/.style={${1:options}}",
+      "every outer matrix/.style={${1:options}}",
+      "every child/.style={${1:options}}",
+      "every child node/.style={${1:options}}",
+      "every plot/.style={${1:options}}",
+      "every mark/.style={${1:options}}",
+      "every loop/.style={${1:options}}",
+      "execute at begin to=${1:code}",
+      "execute at end to=${1:code}",
+      "execute at begin node=${1:code}",
+      "execute at end node=${1:code}",
+      "trim left",
+      "trim left=${1:<dimen> or <coord> or default}",
+      "trim right",
+      "trim right=${1:<dimen> or <coord> or default}",
+      "tri lowlevel",
+      "name prefix=${1:text}",
+      "name suffix=${1:text}",
+      "badness warnings for centered text",
+      "node halign header=${1:macro}",
+      "level/.style={${1:options}}",
+      "level ${1:n}/.style={${2:options}}",
+      "level distance=",
+      "sibling distance=",
+      "edge from parent/.style={${1:options}}",
+      "variable=${1:macro}",
+      "samples=${1:number}",
+      "domain=${1:start}:${2:end}",
+      "samples at=${1:samples list}",
+      "parametric",
+      "range=${1:start}:${2:end}",
+      "yrange=${1:start}:${2:end}",
+      "xrange=${1:start}:${2:end}",
+      "id=${1:id}",
+      "prefix",
+      "raw gnuplot",
+      "mark=${1:mark}",
+      "mark repeat=${1:number}",
+      "mark phase=${1:number}",
+      "mark indices=${1:list}",
+      "mark size=",
+      "mark options={${1:options}}",
+      "no marks",
+      "no markers",
+      "sharp plot",
+      "smooth",
+      "tension=${1:value}",
+      "smooth cycle",
+      "const plot",
+      "const plot mark left",
+      "const plot mark right",
+      "const plot mark mid",
+      "jump mark left",
+      "jump mark right",
+      "jump mark mid",
+      "ycomb",
+      "xcomb",
+      "polar comb",
+      "ybar",
+      "xbar",
+      "ybar interval",
+      "xbar interval",
+      "only marks",
+      "blend mode=",
+      "blend group=",
+      "matrix/inner style order={${1:list}}",
+      "bar width=",
+      "bar shift=",
+      "bar interval shift=${1:factor}",
+      "bar interval width=${1:scale}",
+      "gap around stream point=",
+      "x=${1:<dimen> or <coord>}",
+      "y=${1:<dimen> or <coord>}",
+      "z=${1:<dimen> or <coord>}",
+      "name=${1:name}",
+      "append after command=${1:path}",
+      "prefix after command=${1:path}",
+      "rounded corners",
+      "rounded corners=",
+      "sharp corners",
+      "x radius=${1:<num> or <dimen>}",
+      "y radius=${1:<num> or <dimen>}",
+      "radius=",
+      "at=${1:coord}",
+      "start angle=${1:degrees}",
+      "end angle=${1:degrees}",
+      "delta angle=${1:degrees}",
+      "step=${1:<num> or <dimen> or <coord>}",
+      "xstep=${1:<num> or <dimen>}",
+      "ystep=${1:<num> or <dimen>}",
+      "help lines",
+      "bend=${1:coord}",
+      "bend pos=${1:fraction}",
+      "parabola height=",
+      "bend at start",
+      "bend at end",
+      "to path=${1:path}",
+      "save path=${1:macro}",
+      "use path=${1:macro}",
+      "color=",
+      "%color",
+      "draw",
+      "draw=",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line cap=",
+      "line join=",
+      "miter limit=${1:factor}",
+      "dash pattern=${1:dash pattern}",
+      "dash phase=${1:dash phase}",
+      "dash=${1:dash pattern} phase ${2:dash phase}",
+      "dash expand off",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "double",
+      "double=",
+      "double distance=",
+      "double distance between line centers=",
+      "double equal sign distance",
+      "fill",
+      "fill=",
+      "pattern",
+      "pattern=${1:name}",
+      "pattern color=",
+      "nonzero rule",
+      "even odd rule",
+      "shade",
+      "shading=",
+      "shading angle=${1:degrees}",
+      "arrows=${1:start spec}-${2:end spec}",
+      "->",
+      "<-",
+      "<->",
+      "tips",
+      "tips=",
+      ">=${1:end arrow spec}",
+      "shorten <=",
+      "shorten >=",
+      "inner sep=",
+      "inner xsep=",
+      "inner ysep=",
+      "outer sep=${1:<dimen> or auto}",
+      "outer xsep=",
+      "outer ysep=",
+      "minimum height=",
+      "minimum width=",
+      "minimum size=",
+      "shape aspect=${1:aspect ratio}",
+      "shape border uses incircle",
+      "shape border rotate=${1:degrees}",
+      "text=",
+      "node font=${1:font commands}",
+      "font=${1:font commands}",
+      "text width=",
+      "align=",
+      "text height=",
+      "text depth=",
+      "anchor=",
+      "above",
+      "above=",
+      "below",
+      "below=",
+      "right",
+      "right=",
+      "left",
+      "left=",
+      "above left",
+      "above right",
+      "below left",
+      "below right",
+      "centered",
+      "transform shape",
+      "transform shape nonlinear",
+      "pos=${1:fraction}",
+      "auto",
+      "auto=",
+      "swap",
+      "sloped",
+      "allow upside down",
+      "midway",
+      "near start",
+      "near end",
+      "very near start",
+      "very near end",
+      "at start",
+      "at end",
+      "label=${1:angle}:${2:text}",
+      "label=[${1:options}]${2:angle}:${3:text}",
+      "label position=${1:degrees}",
+      "absolute",
+      "label distance=",
+      "pin=${1:angle}:${2:text}",
+      "pin=[${1:options}]${2:angle}:${3:text}",
+      "pin distance=",
+      "pin edge={${1:options}}",
+      "remember picture",
+      "overlay",
+      "growth parent anchor=",
+      "growth function=${1:macro}",
+      "edge from parent path=${1:path}",
+      "draw opacity=${1:value}",
+      "opacity=${1:value}",
+      "transparent",
+      "ultra nearly transparent",
+      "very nearly transparent",
+      "nearly transparent",
+      "semitransparent",
+      "nearly opaque",
+      "very nearly opaque",
+      "ultra nearly opaque",
+      "opaque",
+      "fill opacity=${1:value}",
+      "text opacity=${1:value}",
+      "shift={${1:coordinate}}",
+      "shift only",
+      "xshift=",
+      "yshift=",
+      "scale=${1:scale}",
+      "xscale=${1:scale}",
+      "yscale=${1:scale}",
+      "xslant=${1:factor}",
+      "yslant=${1:factor}",
+      "rotate=${1:degrees}",
+      "rotate around={${1:degree}:${2:coordinate}}",
+      "rotate around x=${1:degrees}",
+      "rotate around y=${1:degrees}",
+      "rotate around z=${1:degrees}",
+      "cm={${1:a,b,c,d,coord}}",
+      "reset cm",
+      "transform canvas={${1:options}}",
+      "out=${1:degrees}",
+      "in=${1:degrees}",
+      "relative",
+      "bend left",
+      "bend left=${1:degrees}",
+      "bend right",
+      "bend right=${1:degrees}",
+      "bend angle=${1:degrees}",
+      "looseness=${1:number}",
+      "out looseness=${1:number}",
+      "in looseness=${1:number}",
+      "min distance=",
+      "max distance=",
+      "out min distance=",
+      "out max distance=",
+      "in min distance=",
+      "in max distance=",
+      "distance=",
+      "out distance=",
+      "in distance=",
+      "out control=${1:coord}",
+      "in control=${1:coord}",
+      "controls=${1:coord1} and ${2:coord2}",
+      "%tikzstyle",
+      "pic type=${1:type}",
+      "pics/code=${1:code}",
+      "pics/foreground code=${1:code}",
+      "pics/background code=${1:code}",
+      "pic text=${1:text}",
+      "pic text options={${1:options}}",
+      "column sep=",
+      "row sep=",
+      "every cell={${1:row}}{${2:column}}",
+      "cells={${1:options}}",
+      "nodes={${1:options}}",
+      "column ${1:n}/.style={${2:options}}",
+      "every odd column/.style={${1:options}}",
+      "every even column/.style={${1:options}}",
+      "row ${1:m}/.style={${2:options}}",
+      "every odd row/.style={${1:options}}",
+      "every even row/.style={${1:options}}",
+      "row ${1:m} column ${2:n}/.style={${3:options}}",
+      "execute at begin cell=${1:code}",
+      "execute at end cell=${1:code}",
+      "execute at empty cell=${1:code}",
+      "matrix anchor=${1:anchor}",
+      "ampersand replacement=${1:macro}"
+    ],
+    [
+      "x=${1:<dimen> or <coord>}",
+      "y=${1:<dimen> or <coord>}",
+      "z=${1:<dimen> or <coord>}",
+      "name=${1:name}",
+      "append after command=${1:path}",
+      "prefix after command=${1:path}",
+      "rounded corners",
+      "rounded corners=",
+      "sharp corners",
+      "x radius=${1:<num> or <dimen>}",
+      "y radius=${1:<num> or <dimen>}",
+      "radius=",
+      "at=${1:coord}",
+      "start angle=${1:degrees}",
+      "end angle=${1:degrees}",
+      "delta angle=${1:degrees}",
+      "step=${1:<num> or <dimen> or <coord>}",
+      "xstep=${1:<num> or <dimen>}",
+      "ystep=${1:<num> or <dimen>}",
+      "help lines",
+      "bend=${1:coord}",
+      "bend pos=${1:fraction}",
+      "parabola height=",
+      "bend at start",
+      "bend at end",
+      "to path=${1:path}",
+      "save path=${1:macro}",
+      "use path=${1:macro}",
+      "color=",
+      "%color",
+      "draw",
+      "draw=",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line cap=",
+      "line join=",
+      "miter limit=${1:factor}",
+      "dash pattern=${1:dash pattern}",
+      "dash phase=${1:dash phase}",
+      "dash=${1:dash pattern} phase ${2:dash phase}",
+      "dash expand off",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "double",
+      "double=",
+      "double distance=",
+      "double distance between line centers=",
+      "double equal sign distance",
+      "fill",
+      "fill=",
+      "pattern",
+      "pattern=${1:name}",
+      "pattern color=",
+      "nonzero rule",
+      "even odd rule",
+      "shade",
+      "shading=",
+      "shading angle=${1:degrees}",
+      "arrows=${1:start spec}-${2:end spec}",
+      "->",
+      "<-",
+      "<->",
+      "tips",
+      "tips=",
+      ">=${1:end arrow spec}",
+      "shorten <=",
+      "shorten >=",
+      "inner sep=",
+      "inner xsep=",
+      "inner ysep=",
+      "outer sep=${1:<dimen> or auto}",
+      "outer xsep=",
+      "outer ysep=",
+      "minimum height=",
+      "minimum width=",
+      "minimum size=",
+      "shape aspect=${1:aspect ratio}",
+      "shape border uses incircle",
+      "shape border rotate=${1:degrees}",
+      "text=",
+      "node font=${1:font commands}",
+      "font=${1:font commands}",
+      "text width=",
+      "align=",
+      "text height=",
+      "text depth=",
+      "anchor=",
+      "above",
+      "above=",
+      "below",
+      "below=",
+      "right",
+      "right=",
+      "left",
+      "left=",
+      "above left",
+      "above right",
+      "below left",
+      "below right",
+      "centered",
+      "transform shape",
+      "transform shape nonlinear",
+      "pos=${1:fraction}",
+      "auto",
+      "auto=",
+      "swap",
+      "sloped",
+      "allow upside down",
+      "midway",
+      "near start",
+      "near end",
+      "very near start",
+      "very near end",
+      "at start",
+      "at end",
+      "label=${1:angle}:${2:text}",
+      "label=[${1:options}]${2:angle}:${3:text}",
+      "label position=${1:degrees}",
+      "absolute",
+      "label distance=",
+      "pin=${1:angle}:${2:text}",
+      "pin=[${1:options}]${2:angle}:${3:text}",
+      "pin distance=",
+      "pin edge={${1:options}}",
+      "remember picture",
+      "overlay",
+      "growth parent anchor=",
+      "growth function=${1:macro}",
+      "edge from parent path=${1:path}",
+      "draw opacity=${1:value}",
+      "opacity=${1:value}",
+      "transparent",
+      "ultra nearly transparent",
+      "very nearly transparent",
+      "nearly transparent",
+      "semitransparent",
+      "nearly opaque",
+      "very nearly opaque",
+      "ultra nearly opaque",
+      "opaque",
+      "fill opacity=${1:value}",
+      "text opacity=${1:value}",
+      "shift={${1:coordinate}}",
+      "shift only",
+      "xshift=",
+      "yshift=",
+      "scale=${1:scale}",
+      "xscale=${1:scale}",
+      "yscale=${1:scale}",
+      "xslant=${1:factor}",
+      "yslant=${1:factor}",
+      "rotate=${1:degrees}",
+      "rotate around={${1:degree}:${2:coordinate}}",
+      "rotate around x=${1:degrees}",
+      "rotate around y=${1:degrees}",
+      "rotate around z=${1:degrees}",
+      "cm={${1:a,b,c,d,coord}}",
+      "reset cm",
+      "transform canvas={${1:options}}",
+      "out=${1:degrees}",
+      "in=${1:degrees}",
+      "relative",
+      "bend left",
+      "bend left=${1:degrees}",
+      "bend right",
+      "bend right=${1:degrees}",
+      "bend angle=${1:degrees}",
+      "looseness=${1:number}",
+      "out looseness=${1:number}",
+      "in looseness=${1:number}",
+      "min distance=",
+      "max distance=",
+      "out min distance=",
+      "out max distance=",
+      "in min distance=",
+      "in max distance=",
+      "distance=",
+      "out distance=",
+      "in distance=",
+      "out control=${1:coord}",
+      "in control=${1:coord}",
+      "controls=${1:coord1} and ${2:coord2}",
+      "%tikzstyle",
+      "matrix",
+      "shape=${1:shape}",
+      "circle",
+      "rectangle"
+    ],
+    [
+      "3d",
+      "angles",
+      "animations",
+      "arrows.meta",
+      "automata",
+      "babel",
+      "backgrounds",
+      "bayesnet",
+      "bbox",
+      "bending",
+      "braids",
+      "calc",
+      "calendar",
+      "calligraphy",
+      "cd",
+      "celtic",
+      "chains",
+      "circuits",
+      "circuits.ee",
+      "circuits.ee.IEC",
+      "circuits.ee.IEC.relay",
+      "circuits.logic",
+      "circuits.logic.CDH",
+      "circuits.logic.IEC",
+      "circuits.logic.US",
+      "circuits.plc.ladder",
+      "circuits.plc.sfc",
+      "colorbrewer",
+      "commutative-diagrams",
+      "curvilinear",
+      "datavisualization",
+      "datavisualization.3d",
+      "datavisualization.barcharts",
+      "datavisualization.formats.functions",
+      "datavisualization.polar",
+      "datavisualization.sparklines",
+      "decorations",
+      "decorations.footprints",
+      "decorations.fractals",
+      "decorations.markings",
+      "decorations.pathmorphing",
+      "decorations.pathreplacing",
+      "decorations.shapes",
+      "decorations.text",
+      "dubins",
+      "ducks",
+      "er",
+      "ext.calendar-plus",
+      "ext.misc",
+      "ext.node-families",
+      "ext.node-families.shapes.geometric",
+      "ext.paths.arcto",
+      "ext.paths.ortho",
+      "ext.paths.timer",
+      "ext.patterns.images",
+      "ext.positioning-plus",
+      "ext.scalepicture",
+      "ext.shapes.circlearrow",
+      "ext.shapes.circlecrosssplit",
+      "ext.shapes.heatmark",
+      "ext.shapes.rectangleroundedcorners",
+      "ext.shapes.superellipse",
+      "ext.shapes.uncenteredrectangle",
+      "ext.topaths.arcthrough",
+      "ext.transformations.mirror",
+      "external",
+      "fadings",
+      "fill.hexagon",
+      "fill.image",
+      "fill.rhombus",
+      "fit",
+      "fixedpointarithmetic",
+      "folding",
+      "fpu",
+      "graphdrawing",
+      "graphs",
+      "graphs.standard",
+      "hobby",
+      "intersections",
+      "karnaugh",
+      "knots",
+      "lindenmayersystems",
+      "math",
+      "matrix",
+      "matrix.skeleton",
+      "mindmap",
+      "nef",
+      "ocgx",
+      "optics",
+      "overlay-beamer-styles",
+      "patterns",
+      "patterns.images",
+      "patterns.meta",
+      "penrose",
+      "perspective",
+      "petri",
+      "plothandlers",
+      "plotmarks",
+      "positioning",
+      "profiler",
+      "quantikz",
+      "quotes",
+      "rdf",
+      "rulercompass",
+      "scopes",
+      "shadings",
+      "shadows",
+      "shadows.blur",
+      "shapes",
+      "shapes.arrows",
+      "shapes.callouts",
+      "shapes.gates.ee",
+      "shapes.gates.ee.IEC",
+      "shapes.gates.logic",
+      "shapes.gates.logic.IEC",
+      "shapes.gates.logic.US",
+      "shapes.geometric",
+      "shapes.misc",
+      "shapes.multipart",
+      "shapes.symbols",
+      "spath3",
+      "spy",
+      "svg.path",
+      "swigs",
+      "switching-architectures",
+      "through",
+      "tikzmark",
+      "topaths",
+      "tqft",
+      "trees",
+      "turtle",
+      "views",
+      "zx-calculus"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/tikz3d-fr.json b/dev/packages/tikz3d-fr.json
index 90c03751f..9c90456ad 100644
--- a/dev/packages/tikz3d-fr.json
+++ b/dev/packages/tikz3d-fr.json
@@ -57,6 +57,12 @@
     "MarquePointsEspace[]{}": {
       "snippet": "MarquePointsEspace[${2:clés}]{${1:liste}}"
     },
+    "TraceSegmentEspace()()": {
+      "snippet": "TraceSegmentEspace(${1:point})(${2:point})"
+    },
+    "TraceSegmentEspace[]()()": {
+      "snippet": "TraceSegmentEspace[${1:options TikZ}](${2:point})(${3:point})"
+    },
     "TraceSegmentsEspace{}": {
       "snippet": "TraceSegmentsEspace{${1:liste}}"
     },
diff --git a/dev/packages/tikzdotncross.json b/dev/packages/tikzdotncross.json
index 168ba2ad3..66d9d5e01 100644
--- a/dev/packages/tikzdotncross.json
+++ b/dev/packages/tikzdotncross.json
@@ -5,6 +5,24 @@
   "macros": {
     "showcoordstrue": {},
     "showcoordsfalse": {},
+    "ncoord()": {
+      "snippet": "ncoord(${1:coord})"
+    },
+    "pincoord()": {
+      "snippet": "pincoord(${1:coord})"
+    },
+    "dotcoord()": {
+      "snippet": "dotcoord(${1:coord})"
+    },
+    "dotpincoord()": {
+      "snippet": "dotpincoord(${1:coord})"
+    },
+    "odotcoord()": {
+      "snippet": "odotcoord(${1:coord})"
+    },
+    "odotpincoord()": {
+      "snippet": "odotpincoord(${1:coord})"
+    },
     "pathcross{}{}{}": {
       "snippet": "pathcross{${1:coordA}}{${2:coordB}}{${3:path-name}}"
     },
diff --git a/dev/packages/tikzinput.json b/dev/packages/tikzinput.json
new file mode 100644
index 000000000..a46fc5e25
--- /dev/null
+++ b/dev/packages/tikzinput.json
@@ -0,0 +1,63 @@
+{
+  "includes": {
+    "l3keys2e": [],
+    "graphicx": [],
+    "tikz": [],
+    "standalone": []
+  },
+  "macros": {
+    "tikzinput{}": {
+      "snippet": "tikzinput{${1:file}}"
+    },
+    "tikzinput[]{}": {
+      "snippet": "tikzinput[${2:options}]{${1:file}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ctikzinput{}": {
+      "snippet": "ctikzinput{${1:file}}"
+    },
+    "ctikzinput[]{}": {
+      "snippet": "ctikzinput[${2:options}]{${1:file}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "envs": {},
+  "options": [
+    "image"
+  ],
+  "keyvals": [
+    [
+      "alt={${1:alt text}}",
+      "bb=${1:llx lly urx ury}",
+      "bbllx=",
+      "bblly=",
+      "bburx=",
+      "bbury=",
+      "natwidth=",
+      "natheight=",
+      "hiresbb",
+      "pagebox=",
+      "viewport=${1:llx lly urx ury}",
+      "trim=${1:llx lly urx ury}",
+      "angle=${1:degrees}",
+      "origin=",
+      "width=",
+      "height=",
+      "totalheight=",
+      "keepaspectratio",
+      "scale=${1:factor}",
+      "clip",
+      "draft",
+      "type=${1:file type}",
+      "ext=${1:file extension}",
+      "read=${1:read-file extension}",
+      "command=",
+      "quiet",
+      "page=${1:page number}",
+      "interpolate",
+      "decodearray={${1:color array}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/tikzlibrarycommutative-diagrams.json b/dev/packages/tikzlibrarycommutative-diagrams.json
index fdca12bdf..01b854ac6 100644
--- a/dev/packages/tikzlibrarycommutative-diagrams.json
+++ b/dev/packages/tikzlibrarycommutative-diagrams.json
@@ -254,6 +254,9 @@
     "kDVelosFetchFirstSourceThen{}": {
       "snippet": "kDVelosFetchFirstSourceThen{${1:arg}}"
     },
+    "kDVelosFFSBracketsThen{}()": {
+      "snippet": "kDVelosFFSBracketsThen{${1:arg1}}(${2:arg2})"
+    },
     "kDVelosFFSTillOverThen{}{}": {
       "snippet": "kDVelosFFSTillOverThen{${1:arg1}}{${2:arg2}}"
     },
@@ -297,6 +300,9 @@
     "kDVelosCurLstTar": {},
     "kDVelosPrvLstTar": {},
     "kDVelosFetchTargetThen": {},
+    "kDVelosFTBracketsThen{}()": {
+      "snippet": "kDVelosFTBracketsThen{${1:arg1}}(${2:arg2})"
+    },
     "kDVelosFTTillOverThen{}": {
       "snippet": "kDVelosFTTillOverThen{${1:arg}}"
     },
diff --git a/dev/packages/tikzlibrarydatavisualization.json b/dev/packages/tikzlibrarydatavisualization.json
index c8ae99f15..735d07980 100644
--- a/dev/packages/tikzlibrarydatavisualization.json
+++ b/dev/packages/tikzlibrarydatavisualization.json
@@ -40,6 +40,9 @@
     "pgfooclass{}{}": {
       "snippet": "pgfooclass{${1:class name}}{${2:body}}"
     },
+    "pgfooclass(){}{}": {
+      "snippet": "pgfooclass(${3:list of superclasses}){${1:class name}}{${2:body}}"
+    },
     "pgfoonew{}": {
       "snippet": "pgfoonew{${1:cmd}}"
     },
diff --git a/dev/packages/tikzlings.json b/dev/packages/tikzlings.json
new file mode 100644
index 000000000..a4f66f888
--- /dev/null
+++ b/dev/packages/tikzlings.json
@@ -0,0 +1,163 @@
+{
+  "includes": {
+    "tikz": [],
+    "tikzlings-anteaters": [],
+    "tikzlings-bats": [],
+    "tikzlings-bears": [],
+    "tikzlings-bees": [],
+    "tikzlings-bugs": [],
+    "tikzlings-cats": [],
+    "tikzlings-chickens": [],
+    "tikzlings-coatis": [],
+    "tikzlings-elephants": [],
+    "tikzlings-hippos": [],
+    "tikzlings-koalas": [],
+    "tikzlings-marmots": [],
+    "tikzlings-mice": [],
+    "tikzlings-moles": [],
+    "tikzlings-owls": [],
+    "tikzlings-pandas": [],
+    "tikzlings-penguins": [],
+    "tikzlings-pigs": [],
+    "tikzlings-rhinos": [],
+    "tikzlings-sheep": [],
+    "tikzlings-sloths": [],
+    "tikzlings-snowmen": [],
+    "tikzlings-squirrels": [],
+    "tikzlings-wolves": [],
+    "tikzlings-addons": []
+  },
+  "macros": {
+    "tikzling": {},
+    "tikzling[]": {
+      "snippet": "tikzling[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ExpArgsNnx": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "body=",
+      "back",
+      "3D",
+      "contour",
+      "contour=",
+      "hat",
+      "hat=",
+      "tophat",
+      "tophat=",
+      "beret",
+      "beret=",
+      "strawhat",
+      "strawhat=",
+      "ribbon",
+      "ribbon=",
+      "harlequin",
+      "harlequin=",
+      "niuqelrah",
+      "niuqelrah=",
+      "witch",
+      "witch=",
+      "magichat",
+      "magichat=",
+      "magicstars",
+      "magicstars=",
+      "crown",
+      "crown=",
+      "queencrown",
+      "queencrown=",
+      "kingcrown",
+      "kingcrown=",
+      "santa",
+      "santa=",
+      "chef",
+      "chef=",
+      "graduate",
+      "graduate=",
+      "tassel",
+      "tassel=",
+      "alien",
+      "alien=",
+      "book",
+      "book={${1:text}}",
+      "bookcolour=",
+      "signpost",
+      "signpost={${1:text}}",
+      "signcolour=",
+      "signback=",
+      "speech",
+      "speech={${1:text}}",
+      "bubblecolour=",
+      "think",
+      "think={${1:text}}",
+      "pizza",
+      "cheese",
+      "cheese=",
+      "baguette",
+      "baguette=",
+      "cake",
+      "cake=",
+      "icecream",
+      "icecream=",
+      "flavoura=",
+      "flavourb=",
+      "flavourc=",
+      "milkshake",
+      "milkshake=",
+      "wine",
+      "wine=",
+      "cricket",
+      "cricket=",
+      "hockey",
+      "hockey=",
+      "football",
+      "football=",
+      "crystalball",
+      "crystalball=",
+      "magicwand",
+      "rollingpin",
+      "rollingpin=",
+      "lightsaber",
+      "lightsaber=",
+      "torch",
+      "torch=",
+      "basket",
+      "basket=",
+      "easter",
+      "easter=",
+      "egga=",
+      "eggb=",
+      "eggc=",
+      "crozier",
+      "crozier=",
+      "shovel",
+      "shovel=",
+      "pickaxe",
+      "pickaxe=",
+      "strawbroom",
+      "strawbroom=",
+      "strawbroomstick",
+      "strawbroomstick=",
+      "strawbroomribbon",
+      "strawbroomribbon=",
+      "broom",
+      "broom=",
+      "broomstick",
+      "broomstick=",
+      "umbrella",
+      "umbrella=",
+      "umbrellaclosed",
+      "umbrellaclosed=",
+      "handbag",
+      "handbag=",
+      "cocktail",
+      "rotate=${1:degrees}",
+      "scale=${1:factor}",
+      "xshift=",
+      "yshift="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/tikzpingus.json b/dev/packages/tikzpingus.json
index 9a99e81c5..a1cee9dc4 100644
--- a/dev/packages/tikzpingus.json
+++ b/dev/packages/tikzpingus.json
@@ -30,12 +30,12 @@
       "keyvalpos": 0
     },
     "pinguloadlibrary{}": {
-      "snippet": "pinguloadlibrary{${1:library1,library2,...}}",
+      "snippet": "pinguloadlibrary{${1:library1,${2:library2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "pinguloadlibraries{}": {
-      "snippet": "pinguloadlibraries{${1:library1,library2,...}}",
+      "snippet": "pinguloadlibraries{${1:library1,${2:library2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
diff --git a/dev/packages/tikzquests.json b/dev/packages/tikzquests.json
index 9f15f6eb2..a86d088c4 100644
--- a/dev/packages/tikzquests.json
+++ b/dev/packages/tikzquests.json
@@ -55,6 +55,9 @@
     "ftikzQuestion[]{}[]": {
       "snippet": "ftikzQuestion[${2:repository}]{${1:name}}[${3:keyvals}]"
     },
+    "ftikzQuestion()[]{}[]<>": {
+      "snippet": "ftikzQuestion(${5:scale})[${2:repository}]{${1:name}}[${3:keyvals}]<${4:annotation}>"
+    },
     "tikzQuestion{}": {
       "snippet": "tikzQuestion{${1:name}}"
     },
@@ -64,6 +67,9 @@
     "tikzQuestion[]{}[]": {
       "snippet": "tikzQuestion[${2:repository}]{${1:name}}[${3:keyvals}]"
     },
+    "tikzQuestion()[]{}[]<>": {
+      "snippet": "tikzQuestion(${5:scale})[${2:repository}]{${1:name}}[${3:keyvals}]<${4:annotation}>"
+    },
     "rawtikzQuestion{}": {
       "snippet": "rawtikzQuestion{${1:name}}"
     },
diff --git a/dev/packages/tikzrput.json b/dev/packages/tikzrput.json
index d91efd418..2f3b59b02 100644
--- a/dev/packages/tikzrput.json
+++ b/dev/packages/tikzrput.json
@@ -4,6 +4,18 @@
     "iftex": []
   },
   "macros": {
+    "rput(){}": {
+      "snippet": "rput(${2:x},${3:y}){${1:object}}"
+    },
+    "rput[](){}": {
+      "snippet": "rput[${2:refpoint}](${3:x},${4:y}){${1:object}}"
+    },
+    "rput{}(){}": {
+      "snippet": "rput{${1:angle}}(${3:x},${4:y}){${2:object}}"
+    },
+    "rput[]{}(){}": {
+      "snippet": "rput[${3:refpoint}]{${1:angle}}(${4:x},${5:y}){${2:object}}"
+    },
     "tikzrputPtVirCode": {},
     "tikzrputAtCode": {},
     "tikzrputTwoPtCode": {},
diff --git a/dev/packages/time.json b/dev/packages/time.json
new file mode 100644
index 000000000..c0be4a8c8
--- /dev/null
+++ b/dev/packages/time.json
@@ -0,0 +1,11 @@
+{
+  "includes": {},
+  "macros": {
+    "now": {},
+    "hour": {},
+    "minute": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/titlefoot.json b/dev/packages/titlefoot.json
index d95122840..90ce13bf7 100644
--- a/dev/packages/titlefoot.json
+++ b/dev/packages/titlefoot.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "keywords{}": {
-      "snippet": "keywords{${1:word1,word2,...}}"
+      "snippet": "keywords{${1:word1,${2:word2},...}}"
     },
     "runningtitle{}": {
       "snippet": "runningtitle{${1:text}}"
diff --git a/dev/packages/titleps.json b/dev/packages/titleps.json
index 057aa10e6..d96f5f6e9 100644
--- a/dev/packages/titleps.json
+++ b/dev/packages/titleps.json
@@ -60,10 +60,10 @@
       "snippet": "ifthesubparagraph{${1:true}}{${2:false}}"
     },
     "settitlemarks{}": {
-      "snippet": "settitlemarks{${1:level-name,sublevel-name,...}}"
+      "snippet": "settitlemarks{${1:level-name,${2:sublevel-name},...}}"
     },
     "settitlemarks*{}": {
-      "snippet": "settitlemarks*{${1:level-name,sublevel-name,...}}",
+      "snippet": "settitlemarks*{${1:level-name,${2:sublevel-name},...}}",
       "option": "extramarks"
     },
     "headrule": {},
diff --git a/dev/packages/titleref.json b/dev/packages/titleref.json
new file mode 100644
index 000000000..0e5178d0a
--- /dev/null
+++ b/dev/packages/titleref.json
@@ -0,0 +1,15 @@
+{
+  "includes": {},
+  "macros": {
+    "theTitleReference{}{}": {
+      "snippet": "theTitleReference{${1:number}}{${2:title}}"
+    },
+    "titleref{}": {
+      "snippet": "titleref{${1:label}}"
+    },
+    "currenttitle": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/tkz-base.json b/dev/packages/tkz-base.json
index e82d42577..4d1b57414 100644
--- a/dev/packages/tkz-base.json
+++ b/dev/packages/tkz-base.json
@@ -82,32 +82,103 @@
       "keyvalindex": 8,
       "keyvalpos": 0
     },
+    "tkzGrid[]()()": {
+      "snippet": "tkzGrid[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "tkzDefPoint(){}": {
+      "snippet": "tkzDefPoint(${2:angle:radius}){${1:name}}"
+    },
+    "tkzDefPoint[](){}": {
+      "snippet": "tkzDefPoint[${2:options}](${3:angle:radius}){${1:name}}",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
     "tkzDefPoints{}": {
-      "snippet": "tkzDefPoints{${1:x1/y1/name1,x2/y2/name2,...}}"
+      "snippet": "tkzDefPoints{${1:x1/y1/name1,${2:x2/y2/name2},...}}"
     },
     "tkzDefPoints[]{}": {
-      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,x2/y2/name2,...}}"
+      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,${3:x2/y2/name2},...}}"
+    },
+    "tkzDefShiftPoint[](){}": {
+      "snippet": "tkzDefShiftPoint[${2:point}](${3:angle:radius}){${1:name}}"
+    },
+    "tkzDefShiftPointCoord[](){}": {
+      "snippet": "tkzDefShiftPointCoord[${2:a,b}](${3:angle:radius}){${1:name}}"
+    },
+    "tkzDrawPoint()": {
+      "snippet": "tkzDrawPoint(${1:point})"
+    },
+    "tkzDrawPoint[]()": {
+      "snippet": "tkzDrawPoint[${1:options}](${2:point})",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "tkzDrawPoints()": {
+      "snippet": "tkzDrawPoints(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawPoints[]()": {
+      "snippet": "tkzDrawPoints[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "tkzLabelPoint(){}": {
+      "snippet": "tkzLabelPoint(${2:point}){${1:label}}"
+    },
+    "tkzLabelPoint[](){}": {
+      "snippet": "tkzLabelPoint[${2:TikZ options}](${3:point}){${1:label}}"
+    },
+    "tkzLabelPoints()": {
+      "snippet": "tkzLabelPoints(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzLabelPoints[]()": {
+      "snippet": "tkzLabelPoints[${1:TikZ options}](${2:point1},${3:point2},${4:...})"
+    },
+    "tkzAutoLabelPoints[]()": {
+      "snippet": "tkzAutoLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 11,
+      "keyvalpos": 0
     },
     "tkzSetUpPoint[]": {
       "snippet": "tkzSetUpPoint[${1:options}]",
-      "keyvalindex": 9,
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "tkzPointShowCoord()": {
+      "snippet": "tkzPointShowCoord(${1:point})"
+    },
+    "tkzPointShowCoord[]()": {
+      "snippet": "tkzPointShowCoord[${1:options}](${2:point})",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "tkzShowPointCoord()": {
+      "snippet": "tkzShowPointCoord(${1:point})"
+    },
+    "tkzShowPointCoord[]()": {
+      "snippet": "tkzShowPointCoord[${1:options}](${2:point})",
+      "keyvalindex": 13,
       "keyvalpos": 0
     },
     "tkzClip": {},
     "tkzClip[]": {
       "snippet": "tkzClip[${1:options}]",
-      "keyvalindex": 10,
+      "keyvalindex": 14,
       "keyvalpos": 0
     },
     "tkzShowBB[]": {
       "snippet": "tkzShowBB[${1:TikZ options}]"
     },
     "tkzClipBB": {},
+    "tkzSetBB()()": {
+      "snippet": "tkzSetBB(${1:point1})(${2:point2})"
+    },
     "tkzSaveBB": {},
     "tkzRestoreBB": {},
     "tkzRep[]": {
       "snippet": "tkzRep[${1:options}]",
-      "keyvalindex": 11,
+      "keyvalindex": 15,
       "keyvalpos": 0
     },
     "tkzHLine{}": {
@@ -115,7 +186,7 @@
     },
     "tkzHLine[]{}": {
       "snippet": "tkzHLine[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 12,
+      "keyvalindex": 16,
       "keyvalpos": 0
     },
     "tkzHLines{}": {
@@ -123,7 +194,7 @@
     },
     "tkzHLines[]{}": {
       "snippet": "tkzHLines[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 12,
+      "keyvalindex": 16,
       "keyvalpos": 0
     },
     "tkzVLine{}": {
@@ -131,7 +202,7 @@
     },
     "tkzVLine[]{}": {
       "snippet": "tkzVLine[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 12,
+      "keyvalindex": 16,
       "keyvalpos": 0
     },
     "tkzVLines{}": {
@@ -139,7 +210,7 @@
     },
     "tkzVLines[]{}": {
       "snippet": "tkzVLines[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 12,
+      "keyvalindex": 16,
       "keyvalpos": 0
     },
     "tkzHTick{}": {
@@ -147,7 +218,7 @@
     },
     "tkzHTick[]{}": {
       "snippet": "tkzHTick[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 13,
+      "keyvalindex": 17,
       "keyvalpos": 0
     },
     "tkzHTicks{}": {
@@ -155,7 +226,7 @@
     },
     "tkzHTicks[]{}": {
       "snippet": "tkzHTicks[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 13,
+      "keyvalindex": 17,
       "keyvalpos": 0
     },
     "tkzVTick{}": {
@@ -163,7 +234,7 @@
     },
     "tkzVTick[]{}": {
       "snippet": "tkzVTick[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 13,
+      "keyvalindex": 17,
       "keyvalpos": 0
     },
     "tkzVTicks{}": {
@@ -171,30 +242,54 @@
     },
     "tkzVTicks[]{}": {
       "snippet": "tkzVTicks[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 13,
+      "keyvalindex": 17,
       "keyvalpos": 0
     },
     "tkzDefSetOfPoints{}": {
-      "snippet": "tkzDefSetOfPoints{${1:x1/y1,x2/y2,...}}"
+      "snippet": "tkzDefSetOfPoints{${1:x1/y1,${2:x2/y2},...}}"
     },
     "tkzDefSetOfPoints[]{}": {
-      "snippet": "tkzDefSetOfPoints[${2:options}]{${1:x1/y1,x2/y2,...}}",
-      "keyvalindex": 14,
+      "snippet": "tkzDefSetOfPoints[${2:options}]{${1:x1/y1,${3:x2/y2},...}}",
+      "keyvalindex": 18,
       "keyvalpos": 0
     },
     "tkzDrawSetOfPoints[]": {
       "snippet": "tkzDrawSetOfPoints[${1:options}]",
-      "keyvalindex": 14,
+      "keyvalindex": 18,
       "keyvalpos": 0
     },
     "tkzJoinSetOfPoints[]": {
       "snippet": "tkzJoinSetOfPoints[${1:options}]",
-      "keyvalindex": 14,
+      "keyvalindex": 18,
+      "keyvalpos": 0
+    },
+    "tkzDrawMark()": {
+      "snippet": "tkzDrawMark(${1:point})"
+    },
+    "tkzDrawMark[]()": {
+      "snippet": "tkzDrawMark[${1:options}](${2:point})",
+      "keyvalindex": 18,
+      "keyvalpos": 0
+    },
+    "tkzDrawMarks()": {
+      "snippet": "tkzDrawMarks(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawMarks[]()": {
+      "snippet": "tkzDrawMarks[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 18,
       "keyvalpos": 0
     },
     "tkzSetUpMark[]": {
       "snippet": "tkzSetUpMark[${1:options}]",
-      "keyvalindex": 15,
+      "keyvalindex": 19,
+      "keyvalpos": 0
+    },
+    "tkzText(){}": {
+      "snippet": "tkzText(${2:x},${3:y}){${1:text}}"
+    },
+    "tkzText[](){}": {
+      "snippet": "tkzText[${2:options}](${3:x},${4:y}){${1:text}}",
+      "keyvalindex": 20,
       "keyvalpos": 0
     },
     "tkzLegend{}": {
@@ -202,7 +297,7 @@
     },
     "tkzLegend[]{}": {
       "snippet": "tkzLegend[${2:options}]{${1:style/size/color/text}}",
-      "keyvalindex": 16,
+      "keyvalindex": 21,
       "keyvalpos": 0
     },
     "tkzGetPoint{}": {
@@ -275,9 +370,24 @@
     },
     "DisabledNumprint": {},
     "EnabledNumprint": {},
+    "tkzSwapPoints()": {
+      "snippet": "tkzSwapPoints(${1:A},${2:B})"
+    },
+    "tkzPermute()": {
+      "snippet": "tkzPermute(${1:A},${2:B},${3:C})"
+    },
+    "tkzDotProduct()": {
+      "snippet": "tkzDotProduct(${1:A},${2:B},${3:C})"
+    },
     "tkzGetResult{}": {
       "snippet": "tkzGetResult{${1:name}}"
     },
+    "tkzIsLinear()": {
+      "snippet": "tkzIsLinear(${1:A},${2:B},${3:C})"
+    },
+    "tkzIsOrtho()": {
+      "snippet": "tkzIsOrtho(${1:A},${2:B},${3:C})"
+    },
     "tkzHelpGrid": {},
     "setupcolorkeys{}": {
       "snippet": "setupcolorkeys{${1:color keys}}"
@@ -301,11 +411,20 @@
     "tkzSetUpGrid[]": {
       "snippet": "tkzSetUpGrid[${1:options}]"
     },
+    "tkzRenamePoint(){}": {
+      "snippet": "tkzRenamePoint(${2:arg1}){${1:arg2}}"
+    },
     "tkzGetPoints{}{}": {
       "snippet": "tkzGetPoints{${1:arg1}}{${2:arg2}}"
     },
     "tkzSetUpLabel[]": {
       "snippet": "tkzSetUpLabel[${1:options}]"
+    },
+    "tkzGetPointCoord(){}": {
+      "snippet": "tkzGetPointCoord(${2:arg1}){${1:arg2}}"
+    },
+    "tkzGetPointxy(){}": {
+      "snippet": "tkzGetPointxy(${2:arg1}){${1:arg2}}"
     }
   },
   "envs": {},
@@ -392,12 +511,32 @@
       "subystep=${1:number}",
       "line width="
     ],
+    [
+      "shift=(${1:x},${2:y})"
+    ],
+    [
+      "shape=",
+      "size=",
+      "color="
+    ],
+    [
+      "center=",
+      "dist=${1:factor}"
+    ],
     [
       "shape=",
       "size=${1:number}",
       "color=",
       "fill="
     ],
+    [
+      "xlabel=${1:text}",
+      "xstyle=",
+      "noxdraw",
+      "ylabel=${1:text}",
+      "ystyle=",
+      "noydraw"
+    ],
     [
       "space=${1:number}"
     ],
@@ -431,6 +570,17 @@
       "fill=",
       "size="
     ],
+    [
+      "draw",
+      "color=",
+      "text=",
+      "fill=",
+      "opacity=${1:factor}",
+      "line width=",
+      "rotate=${1:degrees}",
+      "inner sep=",
+      "text width="
+    ],
     [
       "line"
     ]
diff --git a/dev/packages/tkz-berge.json b/dev/packages/tkz-berge.json
index 2cbdd5d6f..73310c8db 100644
--- a/dev/packages/tkz-berge.json
+++ b/dev/packages/tkz-berge.json
@@ -33,7 +33,7 @@
       "snippet": "EdgeIdentity{${1:prefix1}}{${2:prefix2}}{${3:number of vertices}}"
     },
     "EdgeIdentity*{}{}{}": {
-      "snippet": "EdgeIdentity*{${1:prefix1}}{${2:prefix2}}{${3:vertex1,vertex2,...}}"
+      "snippet": "EdgeIdentity*{${1:prefix1}}{${2:prefix2}}{${3:vertex1,${4:vertex2},...}}"
     },
     "EdgeFromOneToAll{}{}{}{}": {
       "snippet": "EdgeFromOneToAll{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:number of vertices}}"
@@ -42,7 +42,7 @@
       "snippet": "EdgeFromOneToSeq{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:start}}{${5:end}}"
     },
     "EdgeFromOneToSel{}{}{}{}": {
-      "snippet": "EdgeFromOneToSel{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:vertex1,vertex2,...}}"
+      "snippet": "EdgeFromOneToSel{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:vertex1,${5:vertex2},...}}"
     },
     "EdgeFromOneToComp{}{}{}{}": {
       "snippet": "EdgeFromOneToComp{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:number of vertices}}"
@@ -89,10 +89,10 @@
       "keyvalpos": 0
     },
     "grCirculant{}{}": {
-      "snippet": "grCirculant{${1:number of vertices}}{${2:step1,step2,...}}"
+      "snippet": "grCirculant{${1:number of vertices}}{${2:step1,${3:step2},...}}"
     },
     "grCirculant[]{}{}": {
-      "snippet": "grCirculant[${3:options}]{${1:number of vertices}}{${2:step1,step2,...}}",
+      "snippet": "grCirculant[${3:options}]{${1:number of vertices}}{${2:step1,${4:step2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -153,7 +153,7 @@
       "keyvalpos": 0
     },
     "grLCF[]{}{}": {
-      "snippet": "grLCF[${3:RA-number}]{${1:num1,num2,...}}{${2:number}}"
+      "snippet": "grLCF[${3:RA-number}]{${1:num1,${4:num2},...}}{${2:number}}"
     },
     "tkzSetUpColors[]": {
       "snippet": "tkzSetUpColors[${1:options}]",
@@ -161,10 +161,10 @@
       "keyvalpos": 0
     },
     "AssignVertexLabel{}{}": {
-      "snippet": "AssignVertexLabel{${1:prefix}}{${2:name1,name2,...}}"
+      "snippet": "AssignVertexLabel{${1:prefix}}{${2:name1,${3:name2},...}}"
     },
     "AssignVertexLabel[]{}{}": {
-      "snippet": "AssignVertexLabel[${3:options}]{${1:prefix}}{${2:name1,name2,...}}",
+      "snippet": "AssignVertexLabel[${3:options}]{${1:prefix}}{${2:name1,${4:name2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
diff --git a/dev/packages/tkz-elements.json b/dev/packages/tkz-elements.json
index 334a677e4..98c32aee7 100644
--- a/dev/packages/tkz-elements.json
+++ b/dev/packages/tkz-elements.json
@@ -12,6 +12,12 @@
     },
     "tkzDN[]{}": {
       "snippet": "tkzDN[${2:n}]{${1:r}}"
+    },
+    "tkzDrawLuaEllipse()": {
+      "snippet": "tkzDrawLuaEllipse(${1:pt1},${2:pt2},${3:pt3})"
+    },
+    "tkzDrawLuaEllipse[]()": {
+      "snippet": "tkzDrawLuaEllipse[${1:options}](${2:pt1},${3:pt2},${4:pt3})"
     }
   },
   "envs": {
diff --git a/dev/packages/tkz-euclide.json b/dev/packages/tkz-euclide.json
index 14bfda990..8da3dd027 100644
--- a/dev/packages/tkz-euclide.json
+++ b/dev/packages/tkz-euclide.json
@@ -47,11 +47,25 @@
       "snippet": "tkzCos{${1:arg}}",
       "option": "lua"
     },
+    "tkzDefPoint(){}": {
+      "snippet": "tkzDefPoint(${2:angle:radius}){${1:ref}}"
+    },
+    "tkzDefPoint[](){}": {
+      "snippet": "tkzDefPoint[${2:options}](${3:angle:radius}){${1:ref}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "tkzDefShiftPoint[](){}": {
+      "snippet": "tkzDefShiftPoint[${2:point}](${3:angle:radius}){${1:ref}}"
+    },
+    "tkzDefShiftPointCoord[](){}": {
+      "snippet": "tkzDefShiftPointCoord[${2:point1}](${3:angle:radius}){${1:point2}}"
+    },
     "tkzDefPoints{}": {
-      "snippet": "tkzDefPoints{${1:x1/y1/name1,x2/y2/name2,...}}"
+      "snippet": "tkzDefPoints{${1:x1/y1/name1,${2:x2/y2/name2},...}}"
     },
     "tkzDefPoints[]{}": {
-      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,x2/y2/name2,...}}"
+      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,${3:x2/y2/name2},...}}"
     },
     "tkzGetPoint{}": {
       "snippet": "tkzGetPoint{${1:ref}}"
@@ -71,64 +85,639 @@
     "tkzGetLength{}": {
       "snippet": "tkzGetLength{${1:csname}}"
     },
+    "tkzDefMidPoint()": {
+      "snippet": "tkzDefMidPoint(${1:point1},${2:point2})"
+    },
+    "tkzDefBarycentricPoint()": {
+      "snippet": "tkzDefBarycentricPoint(${1:point1=num1},${2:point2=num2},${3:...})"
+    },
+    "tkzDefSimilitudeCenter()()": {
+      "snippet": "tkzDefSimilitudeCenter(${1:O},${2:A})(${3:O'},${4:B})"
+    },
+    "tkzDefSimilitudeCenter[]()()": {
+      "snippet": "tkzDefSimilitudeCenter[${1:options}](${2:O},${3:A})(${4:O'},${5:B})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "tkzDefHarmonic()": {
+      "snippet": "tkzDefHarmonic(${1:A},${2:B},${3:C})"
+    },
+    "tkzDefHarmonic[]()": {
+      "snippet": "tkzDefHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "tkzDefGoldenRatio()": {
+      "snippet": "tkzDefGoldenRatio(${1:point1},${2:point2})"
+    },
+    "tkzDefEquiPoints()": {
+      "snippet": "tkzDefEquiPoints(${1:point1},${2:point2})"
+    },
+    "tkzDefEquiPoints[]()": {
+      "snippet": "tkzDefEquiPoints[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "tkzDefMidArc()": {
+      "snippet": "tkzDefMidArc(${1:A},${2:B},${3:C})"
+    },
+    "tkzDefTriangleCenter()": {
+      "snippet": "tkzDefTriangleCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefTriangleCenter[]()": {
+      "snippet": "tkzDefTriangleCenter[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "tkzDefProjExcenter()(){}": {
+      "snippet": "tkzDefProjExcenter(${2:A},${3:B},${4:C})(${5:a},${6:b},${7:c}){${1:X,${8:Y},Z}}"
+    },
+    "tkzDefProjExcenter[]()(){}": {
+      "snippet": "tkzDefProjExcenter[${2:options}](${3:A},${4:B},${5:C})(${6:a},${7:b},${8:c}){${1:X,${9:Y},Z}}",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "tkzDefPointOnLine()": {
+      "snippet": "tkzDefPointOnLine(${1:point1},${2:point2})"
+    },
+    "tkzDefPointOnLine[]()": {
+      "snippet": "tkzDefPointOnLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
     "tkzDefPointOnCircle[]": {
       "snippet": "tkzDefPointOnCircle[${1:options}]",
-      "keyvalindex": 0,
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "tkzDefPointBy()": {
+      "snippet": "tkzDefPointBy(${1:point})"
+    },
+    "tkzDefPointBy[]()": {
+      "snippet": "tkzDefPointBy[${1:options}](${2:point})",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "tkzDefPointsBy(){}": {
+      "snippet": "tkzDefPointsBy(${2:point1},${3:point2},${4:...}){${1:point1,${5:point2},...}}"
+    },
+    "tkzDefPointsBy[](){}": {
+      "snippet": "tkzDefPointsBy[${2:options}](${3:point1},${4:point2},${5:...}){${1:point1,${6:point2},...}}",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "tkzDefPointWith()": {
+      "snippet": "tkzDefPointWith(${1:point1},${2:point2})"
+    },
+    "tkzDefPointWith[]()": {
+      "snippet": "tkzDefPointWith[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 9,
+      "keyvalpos": 0
+    },
+    "tkzGetVectxy(){}": {
+      "snippet": "tkzGetVectxy(${2:point1},${3:point2}){${1:text}}"
+    },
+    "tkzDefLine()": {
+      "snippet": "tkzDefLine(${1:point1},${2:point2})"
+    },
+    "tkzDefLine[]()": {
+      "snippet": "tkzDefLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 10,
+      "keyvalpos": 0
+    },
+    "tkzDefTangent()": {
+      "snippet": "tkzDefTangent(${1:point1},${2:point2})"
+    },
+    "tkzDefTangent[]()": {
+      "snippet": "tkzDefTangent[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 11,
+      "keyvalpos": 0
+    },
+    "tkzDefTriangle[]()": {
+      "snippet": "tkzDefTriangle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 12,
+      "keyvalpos": 0
+    },
+    "tkzDefSpcTriangle[](){}": {
+      "snippet": "tkzDefSpcTriangle[${2:options}](${3:point1},${4:point2},${5:point3}){${1:ref1,${6:ref2},ref3}}",
+      "keyvalindex": 13,
+      "keyvalpos": 0
+    },
+    "tkzPermute()": {
+      "snippet": "tkzPermute(${1:A},${2:B},${3:C})"
+    },
+    "tkzDefSquare()": {
+      "snippet": "tkzDefSquare(${1:point1},${2:point2})"
+    },
+    "tkzDefRectangle()": {
+      "snippet": "tkzDefRectangle(${1:point1},${2:point2})"
+    },
+    "tkzDefParallelogram()": {
+      "snippet": "tkzDefParallelogram(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefGoldenRectangle()": {
+      "snippet": "tkzDefGoldenRectangle(${1:point1},${2:point2})"
+    },
+    "tkzDefGoldRectangle()": {
+      "snippet": "tkzDefGoldRectangle(${1:point1},${2:point2})"
+    },
+    "tkzDefRegPolygon()": {
+      "snippet": "tkzDefRegPolygon(${1:point1},${2:point2})"
+    },
+    "tkzDefRegPolygon[]()": {
+      "snippet": "tkzDefRegPolygon[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 14,
+      "keyvalpos": 0
+    },
+    "tkzDefCircle()": {
+      "snippet": "tkzDefCircle(${1:point1},${2:point2})"
+    },
+    "tkzDefCircle[]()": {
+      "snippet": "tkzDefCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 15,
+      "keyvalpos": 0
+    },
+    "tkzDefCircleBy()": {
+      "snippet": "tkzDefCircleBy(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleBy[]()": {
+      "snippet": "tkzDefCircleBy[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 16,
+      "keyvalpos": 0
+    },
+    "tkzInterLL()()": {
+      "snippet": "tkzInterLL(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterLC()()": {
+      "snippet": "tkzInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterLC[]()()": {
+      "snippet": "tkzInterLC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
+      "keyvalindex": 17,
+      "keyvalpos": 0
+    },
+    "tkzInterCC()()": {
+      "snippet": "tkzInterCC(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterCC[]()()": {
+      "snippet": "tkzInterCC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
+      "keyvalindex": 17,
       "keyvalpos": 0
     },
+    "tkzTestInterCC()()": {
+      "snippet": "tkzTestInterCC(${1:O},${2:A})(${3:O'},${4:B})"
+    },
     "iftkzFlagCC": {},
     "tkzFlagCCtrue": {},
     "tkzFlagCCfalse": {},
+    "tkzInterCCN()()": {
+      "snippet": "tkzInterCCN(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzInterCCR()()": {
+      "snippet": "tkzInterCCR(${1:point1},${2:radius1})(${3:point2},${4:radius2})"
+    },
+    "tkzGetAngle()": {
+      "snippet": "tkzGetAngle(${1:csname})"
+    },
     "tkzAngleResult": {},
+    "tkzFindAngle()": {
+      "snippet": "tkzFindAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFindSlopeAngle()": {
+      "snippet": "tkzFindSlopeAngle(${1:point1},${2:point2})"
+    },
     "tkzDefRandPointOn[]": {
       "snippet": "tkzDefRandPointOn[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 18,
+      "keyvalpos": 0
+    },
+    "tkzDrawPoint()": {
+      "snippet": "tkzDrawPoint(${1:name})"
+    },
+    "tkzDrawPoint[]()": {
+      "snippet": "tkzDrawPoint[${1:options}](${2:name})",
+      "keyvalindex": 19,
+      "keyvalpos": 0
+    },
+    "tkzDrawPoints()": {
+      "snippet": "tkzDrawPoints(${1:name1},${2:name2},${3:...})"
+    },
+    "tkzDrawPoints[]()": {
+      "snippet": "tkzDrawPoints[${1:options}](${2:name1},${3:name2},${4:...})",
+      "keyvalindex": 19,
+      "keyvalpos": 0
+    },
+    "tkzDrawLine()": {
+      "snippet": "tkzDrawLine(${1:point1},${2:point2})"
+    },
+    "tkzDrawLine[]()": {
+      "snippet": "tkzDrawLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 20,
+      "keyvalpos": 0
+    },
+    "tkzDrawLines()": {
+      "snippet": "tkzDrawLines(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawLines[]()": {
+      "snippet": "tkzDrawLines[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 20,
+      "keyvalpos": 0
+    },
+    "tkzDrawSegment()": {
+      "snippet": "tkzDrawSegment(${1:point1},${2:point2})"
+    },
+    "tkzDrawSegment[]()": {
+      "snippet": "tkzDrawSegment[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 21,
+      "keyvalpos": 0
+    },
+    "tkzDrawSegments()": {
+      "snippet": "tkzDrawSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzDrawSegments[]()": {
+      "snippet": "tkzDrawSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 21,
+      "keyvalpos": 0
+    },
+    "tkzDrawPolygon()": {
+      "snippet": "tkzDrawPolygon(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawPolygon[]()": {
+      "snippet": "tkzDrawPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 22,
+      "keyvalpos": 0
+    },
+    "tkzDrawPolySeg()": {
+      "snippet": "tkzDrawPolySeg(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawPolySeg[]()": {
+      "snippet": "tkzDrawPolySeg[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 22,
+      "keyvalpos": 0
+    },
+    "tkzDrawCircle()": {
+      "snippet": "tkzDrawCircle(${1:point1},${2:point2})"
+    },
+    "tkzDrawCircle[]()": {
+      "snippet": "tkzDrawCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 23,
+      "keyvalpos": 0
+    },
+    "tkzDrawCircles()": {
+      "snippet": "tkzDrawCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzDrawCircles[]()": {
+      "snippet": "tkzDrawCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 23,
+      "keyvalpos": 0
+    },
+    "tkzDrawSemiCircle()": {
+      "snippet": "tkzDrawSemiCircle(${1:point1},${2:point2})"
+    },
+    "tkzDrawSemiCircle[]()": {
+      "snippet": "tkzDrawSemiCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 24,
+      "keyvalpos": 0
+    },
+    "tkzDrawSemiCircles()": {
+      "snippet": "tkzDrawSemiCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzDrawSemiCircles[]()": {
+      "snippet": "tkzDrawSemiCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 24,
+      "keyvalpos": 0
+    },
+    "tkzDrawArc()()": {
+      "snippet": "tkzDrawArc(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzDrawArc[]()()": {
+      "snippet": "tkzDrawArc[${1:options}](${2:point1},${3:point2})(${4:point3})",
+      "keyvalindex": 25,
+      "keyvalpos": 0
+    },
+    "tkzDrawSector()()": {
+      "snippet": "tkzDrawSector(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzDrawSector[]()()": {
+      "snippet": "tkzDrawSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
+      "keyvalindex": 26,
+      "keyvalpos": 0
+    },
+    "tkzFillCircle()": {
+      "snippet": "tkzFillCircle(${1:point1},${2:point2})"
+    },
+    "tkzFillCircle[]()": {
+      "snippet": "tkzFillCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 27,
+      "keyvalpos": 0
+    },
+    "tkzFillCircles()": {
+      "snippet": "tkzFillCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzFillCircles[]()": {
+      "snippet": "tkzFillCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 27,
+      "keyvalpos": 0
+    },
+    "tkzFillPolygon()": {
+      "snippet": "tkzFillPolygon(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzFillPolygon[]()": {
+      "snippet": "tkzFillPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 28,
+      "keyvalpos": 0
+    },
+    "tkzFillSector()()": {
+      "snippet": "tkzFillSector(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzFillSector[]()()": {
+      "snippet": "tkzFillSector[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillAngle()": {
+      "snippet": "tkzFillAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFillAngle[]()": {
+      "snippet": "tkzFillAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 29,
       "keyvalpos": 0
     },
     "tkzInit[]": {
       "snippet": "tkzInit[${1:options}]",
-      "keyvalindex": 2,
+      "keyvalindex": 30,
       "keyvalpos": 0
     },
     "tkzClip": {},
     "tkzClip[]": {
       "snippet": "tkzClip[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 31,
       "keyvalpos": 0
     },
     "tkzShowBB": {},
     "tkzShowBB[]": {
       "snippet": "tkzShowBB[${1:options}]",
-      "keyvalindex": 4,
+      "keyvalindex": 32,
       "keyvalpos": 0
     },
     "tkzClipBB": {},
+    "tkzClipPolygon()": {
+      "snippet": "tkzClipPolygon(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzClipPolygon[]()": {
+      "snippet": "tkzClipPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 33,
+      "keyvalpos": 0
+    },
+    "tkzClipCircle()": {
+      "snippet": "tkzClipCircle(${1:point1},${2:point2})"
+    },
+    "tkzClipCircle[]()": {
+      "snippet": "tkzClipCircle[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 33,
+      "keyvalpos": 0
+    },
+    "tkzClipSector[]()()": {
+      "snippet": "tkzClipSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
+      "keyvalindex": 34,
+      "keyvalpos": 0
+    },
+    "tkzClipSector()()": {
+      "snippet": "tkzClipSector(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzMarkSegment()": {
+      "snippet": "tkzMarkSegment(${1:point1},${2:point2})"
+    },
+    "tkzMarkSegment[]()": {
+      "snippet": "tkzMarkSegment[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "tkzMarkSegments()": {
+      "snippet": "tkzMarkSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzMarkSegments[]()": {
+      "snippet": "tkzMarkSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "tkzMarkArc()": {
+      "snippet": "tkzMarkArc(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMarkArc[]()": {
+      "snippet": "tkzMarkArc[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 35,
+      "keyvalpos": 0
+    },
+    "tkzMarkAngle()": {
+      "snippet": "tkzMarkAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMarkAngle[]()": {
+      "snippet": "tkzMarkAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 36,
+      "keyvalpos": 0
+    },
+    "tkzMarkRightAngle()": {
+      "snippet": "tkzMarkRightAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMarkRightAngle[]()": {
+      "snippet": "tkzMarkRightAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 37,
+      "keyvalpos": 0
+    },
+    "tkzPicAngle()": {
+      "snippet": "tkzPicAngle(${1:A},${2:O},${3:B})"
+    },
+    "tkzPicAngle[]()": {
+      "snippet": "tkzPicAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
+    },
+    "tkzPicRightAngle()": {
+      "snippet": "tkzPicRightAngle(${1:A},${2:O},${3:B})"
+    },
+    "tkzPicRightAngle[]()": {
+      "snippet": "tkzPicRightAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
+    },
+    "tkzLabelPoint(){}": {
+      "snippet": "tkzLabelPoint(${2:point}){${1:label}}"
+    },
+    "tkzLabelPoint[](){}": {
+      "snippet": "tkzLabelPoint[${2:options}](${3:point}){${1:label}}",
+      "keyvalindex": 38,
+      "keyvalpos": 0
+    },
+    "tkzLabelPoints()": {
+      "snippet": "tkzLabelPoints(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzLabelPoints[]()": {
+      "snippet": "tkzLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 38,
+      "keyvalpos": 0
+    },
+    "tkzAutoLabelPoints()": {
+      "snippet": "tkzAutoLabelPoints(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzAutoLabelPoints[]()": {
+      "snippet": "tkzAutoLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
+      "keyvalindex": 39,
+      "keyvalpos": 0
+    },
+    "tkzLabelSegment(){}": {
+      "snippet": "tkzLabelSegment(${2:point1},${3:point2}){${1:label}}"
+    },
+    "tkzLabelSegment[](){}": {
+      "snippet": "tkzLabelSegment[${2:options}](${3:point1},${4:point2}){${1:label}}",
+      "keyvalindex": 40,
+      "keyvalpos": 0
+    },
+    "tkzLabelSegments(){}": {
+      "snippet": "tkzLabelSegments(${2:pt1},${3:pt2 pt3},${4:pt4 ...}){${1:label}}"
+    },
+    "tkzLabelSegments[](){}": {
+      "snippet": "tkzLabelSegments[${2:options}](${3:pt1},${4:pt2 pt3},${5:pt4 ...}){${1:label}}",
+      "keyvalindex": 40,
+      "keyvalpos": 0
+    },
+    "tkzLabelLine(){}": {
+      "snippet": "tkzLabelLine(${2:point1},${3:point2}){${1:label}}"
+    },
+    "tkzLabelLine[](){}": {
+      "snippet": "tkzLabelLine[${2:options}](${3:point1},${4:point2}){${1:label}}"
+    },
+    "tkzLabelAngle()": {
+      "snippet": "tkzLabelAngle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzLabelAngle[]()": {
+      "snippet": "tkzLabelAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
+      "keyvalindex": 41,
+      "keyvalpos": 0
+    },
+    "tkzLabelCircle()(){}": {
+      "snippet": "tkzLabelCircle(${2:point1},${3:point2})(${4:angle}){${1:label}}"
+    },
+    "tkzLabelCircle[]()(){}": {
+      "snippet": "tkzLabelCircle[${2:options}](${3:point1},${4:point2})(${5:angle}){${1:label}}",
+      "keyvalindex": 42,
+      "keyvalpos": 0
+    },
+    "tkzLabelArc(){}": {
+      "snippet": "tkzLabelArc(${2:point1},${3:point2},${4:point3}){${1:label}}"
+    },
+    "tkzLabelArc[](){}": {
+      "snippet": "tkzLabelArc[${2:options}](${3:point1},${4:point2},${5:point3}){${1:label}}",
+      "keyvalindex": 43,
+      "keyvalpos": 0
+    },
+    "tkzCompass()": {
+      "snippet": "tkzCompass(${1:point1},${2:point2})"
+    },
+    "tkzCompass[]()": {
+      "snippet": "tkzCompass[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 44,
+      "keyvalpos": 0
+    },
+    "tkzCompasss()": {
+      "snippet": "tkzCompasss(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
+    },
+    "tkzCompasss[]()": {
+      "snippet": "tkzCompasss[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
+      "keyvalindex": 44,
+      "keyvalpos": 0
+    },
+    "tkzShowLine()": {
+      "snippet": "tkzShowLine(${1:point1},${2:point2})"
+    },
+    "tkzShowLine[]()": {
+      "snippet": "tkzShowLine[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 45,
+      "keyvalpos": 0
+    },
+    "tkzShowTransformation()": {
+      "snippet": "tkzShowTransformation(${1:point1},${2:point2})"
+    },
+    "tkzShowTransformation[]()": {
+      "snippet": "tkzShowTransformation[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 46,
+      "keyvalpos": 0
+    },
+    "tkzProtractor()": {
+      "snippet": "tkzProtractor(${1:point1},${2:point2})"
+    },
+    "tkzProtractor[]()": {
+      "snippet": "tkzProtractor[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 47,
+      "keyvalpos": 0
+    },
+    "tkzDuplicateSegment()()": {
+      "snippet": "tkzDuplicateSegment(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzDuplicateSegment()(){}": {
+      "snippet": "tkzDuplicateSegment(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
+    },
+    "tkzDuplicateLength()()": {
+      "snippet": "tkzDuplicateLength(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzDuplicateLength()(){}": {
+      "snippet": "tkzDuplicateLength(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
+    },
+    "tkzCalcLength()": {
+      "snippet": "tkzCalcLength(${1:point1},${2:point2})"
+    },
+    "tkzCalcLength[]()": {
+      "snippet": "tkzCalcLength[${1:options}](${2:point1},${3:point2})",
+      "keyvalindex": 48,
+      "keyvalpos": 0
+    },
+    "tkzpttocm(){}": {
+      "snippet": "tkzpttocm(${2:number}){${1:csname}}"
+    },
+    "tkzcmtopt(){}": {
+      "snippet": "tkzcmtopt(${2:number}){${1:csname}}"
+    },
+    "tkzGetPointCoord(){}": {
+      "snippet": "tkzGetPointCoord(${2:point}){${1:csname}}"
+    },
+    "tkzSwapPoints()": {
+      "snippet": "tkzSwapPoints(${1:A},${2:B})"
+    },
+    "tkzDotProduct()": {
+      "snippet": "tkzDotProduct(${1:A},${2:B},${3:C})"
+    },
+    "tkzPowerCircle()()": {
+      "snippet": "tkzPowerCircle(${1:A})(${2:O},${3:M})"
+    },
+    "tkzDefRadicalAxis()()": {
+      "snippet": "tkzDefRadicalAxis(${1:A},${2:B})(${3:C},${4:D})"
+    },
+    "tkzIsLinear()": {
+      "snippet": "tkzIsLinear(${1:A},${2:B},${3:C})"
+    },
+    "tkzIsOrtho()": {
+      "snippet": "tkzIsOrtho(${1:A},${2:B},${3:C})"
+    },
     "tkzGetResult{}": {
       "snippet": "tkzGetResult{${1:csname}}"
     },
     "tkzSetUpColors[]": {
       "snippet": "tkzSetUpColors[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 49,
       "keyvalpos": 0
     },
     "tkzSetUpPoint[]": {
       "snippet": "tkzSetUpPoint[${1:options}]",
-      "keyvalindex": 6,
+      "keyvalindex": 50,
       "keyvalpos": 0
     },
     "tkzSetUpLine[]": {
       "snippet": "tkzSetUpLine[${1:options}]",
-      "keyvalindex": 7,
+      "keyvalindex": 51,
       "keyvalpos": 0
     },
     "tkzSetUpArc[]": {
       "snippet": "tkzSetUpArc[${1:options}]",
-      "keyvalindex": 8,
+      "keyvalindex": 52,
       "keyvalpos": 0
     },
     "tkzSetUpCompass[]": {
       "snippet": "tkzSetUpCompass[${1:options}]",
-      "keyvalindex": 8,
+      "keyvalindex": 52,
       "keyvalpos": 0
     },
     "tkzSetUpLabel[]": {
@@ -140,6 +729,21 @@
     "tkzLengthResult": {},
     "fileversion": {},
     "filedate": {},
+    "tkzDrawBisector()": {
+      "snippet": "tkzDrawBisector(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefIntSimilitudeCenter()()": {
+      "snippet": "tkzDefIntSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
+    "tkzDefExtSimilitudeCenter()()": {
+      "snippet": "tkzDefExtSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
+    "tkzDefIntHomotheticCenter()()": {
+      "snippet": "tkzDefIntHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
+    "tkzDefExtHomotheticCenter()()": {
+      "snippet": "tkzDefExtHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
+    },
     "tkzDrawMedian": {},
     "tkzDrawBisector": {},
     "tkzDrawAltitude": {},
@@ -163,6 +767,9 @@
     "tkzSetUpAllColors[]": {
       "snippet": "tkzSetUpAllColors[${1:options}]"
     },
+    "tkzNormalizeAngle()": {
+      "snippet": "tkzNormalizeAngle(${1:arg})"
+    },
     "tkzpointnormalised{}": {
       "snippet": "tkzpointnormalised{${1:arg}}"
     },
@@ -193,12 +800,20 @@
     "EnabledNumprint": {},
     "tkzMathResult": {},
     "tkzHelpGrid": {},
+    "tkzText(){}": {
+      "snippet": "tkzText(${2:x},${3:y}){${1:text}}"
+    },
+    "tkzText[](){}": {
+      "snippet": "tkzText[${2:options}](${3:x},${4:y}){${1:text}}",
+      "keyvalindex": 53,
+      "keyvalpos": 0
+    },
     "tkzLegend{}": {
       "snippet": "tkzLegend{${1:style/size/color/text}}"
     },
     "tkzLegend[]{}": {
       "snippet": "tkzLegend[${2:options}]{${1:style/size/color/text}}",
-      "keyvalindex": 9,
+      "keyvalindex": 54,
       "keyvalpos": 0
     },
     "ifinteger": {},
@@ -211,15 +826,27 @@
     "tkzDrawX": {},
     "tkzDrawX[]": {
       "snippet": "tkzDrawX[${1:options}]",
-      "keyvalindex": 10,
+      "keyvalindex": 55,
       "keyvalpos": 0
     },
     "tkzDrawY": {},
     "tkzDrawY[]": {
       "snippet": "tkzDrawY[${1:options}]",
-      "keyvalindex": 11,
+      "keyvalindex": 56,
       "keyvalpos": 0
     },
+    "tkzDrawPolygons()": {
+      "snippet": "tkzDrawPolygons(${1:point1},${2:point2},${3:...})"
+    },
+    "tkzDrawPolygons[]()": {
+      "snippet": "tkzDrawPolygons[${1:options}](${2:point1},${3:point2},${4:...})"
+    },
+    "tkzLabelRegPolygon(){}": {
+      "snippet": "tkzLabelRegPolygon(${2:point}){${1:label1,${3:label2},...}}"
+    },
+    "tkzLabelRegPolygon[](){}": {
+      "snippet": "tkzLabelRegPolygon[${2:options}](${3:point}){${1:label1,${4:label2},...}}"
+    },
     "iftkzClipOutPoly": {},
     "tkzClipOutPolytrue": {},
     "tkzClipOutPolyfalse": {},
@@ -234,25 +861,505 @@
     },
     "tkzGrid[]": {
       "snippet": "tkzGrid[${1:options}]",
-      "keyvalindex": 12,
+      "keyvalindex": 57,
+      "keyvalpos": 0
+    },
+    "tkzGrid[]()()": {
+      "snippet": "tkzGrid[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
+      "keyvalindex": 57,
       "keyvalpos": 0
     },
+    "tkzDefCircleTranslation()": {
+      "snippet": "tkzDefCircleTranslation(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleHomothety()": {
+      "snippet": "tkzDefCircleHomothety(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleReflection()": {
+      "snippet": "tkzDefCircleReflection(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleSymmetry()": {
+      "snippet": "tkzDefCircleSymmetry(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleRotation()": {
+      "snippet": "tkzDefCircleRotation(${1:point1},${2:point2})"
+    },
+    "tkzDefOrthogonalCircle()": {
+      "snippet": "tkzDefOrthogonalCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefOrthoThroughCircle()": {
+      "snippet": "tkzDefOrthoThroughCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
+    },
+    "tkzDefInversionCircle()": {
+      "snippet": "tkzDefInversionCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
+    },
+    "tkzDefEquilateral()": {
+      "snippet": "tkzDefEquilateral(${1:point1},${2:point2})"
+    },
+    "tkzDefIsoscelesRightTriangle()": {
+      "snippet": "tkzDefIsoscelesRightTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDrawEquilateral[]()": {
+      "snippet": "tkzDrawEquilateral[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzDefIsoscelesRightTriangle[]()": {
+      "snippet": "tkzDefIsoscelesRightTriangle[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzDefTwoOne()": {
+      "snippet": "tkzDefTwoOne(${1:point1},${2:point2})"
+    },
+    "tkzDefPythagore()": {
+      "snippet": "tkzDefPythagore(${1:point1},${2:point2})"
+    },
+    "tkzDefSchoolTriangle()": {
+      "snippet": "tkzDefSchoolTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefGoldTriangle()": {
+      "snippet": "tkzDefGoldTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefEuclideTriangle()": {
+      "snippet": "tkzDefEuclideTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefGoldenTriangle()": {
+      "snippet": "tkzDefGoldenTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefCheopsTriangle()": {
+      "snippet": "tkzDefCheopsTriangle(${1:point1},${2:point2})"
+    },
+    "tkzDefTwoAnglesTriangle()": {
+      "snippet": "tkzDefTwoAnglesTriangle(${1:point1},${2:point2})"
+    },
     "SetUpPTTR{}": {
       "snippet": "SetUpPTTR{${1:options}}"
     },
+    "tkzDefIncentralTriangle[]()()": {
+      "snippet": "tkzDefIncentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefExcentralTriangle[]()()": {
+      "snippet": "tkzDefExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzExcentralTriangle[]()()": {
+      "snippet": "tkzExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefIntouchTriangle[]()()": {
+      "snippet": "tkzDefIntouchTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefContactTriangle[]()()": {
+      "snippet": "tkzDefContactTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefFeuerbachTriangle[]()()": {
+      "snippet": "tkzDefFeuerbachTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefCentroidTriangle[]()()": {
+      "snippet": "tkzDefCentroidTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefMedialTriangle[]()()": {
+      "snippet": "tkzDefMedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefMidpointTriangle[]()()": {
+      "snippet": "tkzDefMidpointTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefOrthicTriangle[]()()": {
+      "snippet": "tkzDefOrthicTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefAltitudeTriangle[]()()": {
+      "snippet": "tkzDefAltitudeTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefEulerTriangle[]()()": {
+      "snippet": "tkzDefEulerTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefTangentialTriangle[]()()": {
+      "snippet": "tkzDefTangentialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzDefSymmedialTriangle[]()()": {
+      "snippet": "tkzDefSymmedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
+    },
+    "tkzPointShowCoord()": {
+      "snippet": "tkzPointShowCoord(${1:point})"
+    },
+    "tkzPointShowCoord[]()": {
+      "snippet": "tkzPointShowCoord[${1:options}](${2:point})",
+      "keyvalindex": 58,
+      "keyvalpos": 0
+    },
+    "tkzShowPointCoord()": {
+      "snippet": "tkzShowPointCoord(${1:point})"
+    },
+    "tkzShowPointCoord[]()": {
+      "snippet": "tkzShowPointCoord[${1:options}](${2:point})",
+      "keyvalindex": 58,
+      "keyvalpos": 0
+    },
+    "tkzDefCircleR()": {
+      "snippet": "tkzDefCircleR(${1:point1},${2:point2})"
+    },
+    "tkzDefCircleD()": {
+      "snippet": "tkzDefCircleD(${1:point1},${2:point2})"
+    },
+    "tkzDefCircumCircle()": {
+      "snippet": "tkzDefCircumCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefInCircle()": {
+      "snippet": "tkzDefInCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefExCircle()": {
+      "snippet": "tkzDefExCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefExRadius()": {
+      "snippet": "tkzDefExRadius(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerCircle()": {
+      "snippet": "tkzDefEulerCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefNinePointsCircle()": {
+      "snippet": "tkzDefNinePointsCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFeuerBachCircle()": {
+      "snippet": "tkzFeuerBachCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerRadius()": {
+      "snippet": "tkzDefEulerRadius(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefApolloniusCircle()": {
+      "snippet": "tkzDefApolloniusCircle(${1:point1},${2:point2})"
+    },
+    "tkzDefSpiekerCircle()": {
+      "snippet": "tkzDefSpiekerCircle(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDrawSectorRAngles[]()()": {
+      "snippet": "tkzDrawSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorN[]()()": {
+      "snippet": "tkzDrawSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorRotate[]()()": {
+      "snippet": "tkzDrawSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorAngles[]()()": {
+      "snippet": "tkzDrawSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorRwithNodesAngles[]()()": {
+      "snippet": "tkzDrawSectorRwithNodesAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawSectorR[]()()": {
+      "snippet": "tkzDrawSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorRAngles[]()()": {
+      "snippet": "tkzFillSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorN[]()()": {
+      "snippet": "tkzFillSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorRotate[]()()": {
+      "snippet": "tkzFillSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorAngles[]()()": {
+      "snippet": "tkzFillSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzFillSectorR[]()()": {
+      "snippet": "tkzFillSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDefLineLL[]()": {
+      "snippet": "tkzDefLineLL[${1:options}](${2:point1},${3:point2},${4:point3})"
+    },
+    "tkzDefOrthLine[]()": {
+      "snippet": "tkzDefOrthLine[${1:options}](${2:point1},${3:point2},${4:point3})"
+    },
+    "tkzDefMediatorLine[]()": {
+      "snippet": "tkzDefMediatorLine[${1:options}](${2:point1},${3:point2},${4:point3})"
+    },
+    "tkzDefBisectorLine()": {
+      "snippet": "tkzDefBisectorLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefBisectorOutLine()": {
+      "snippet": "tkzDefBisectorOutLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefSymmedianLine()": {
+      "snippet": "tkzDefSymmedianLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefAltitudeLine()": {
+      "snippet": "tkzDefAltitudeLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerLine()": {
+      "snippet": "tkzDefEulerLine(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzTgtAt()()": {
+      "snippet": "tkzTgtAt(${1:point1})(${2:point2})"
+    },
+    "tkzTgtFromP()()": {
+      "snippet": "tkzTgtFromP(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzTgtFromPR()()": {
+      "snippet": "tkzTgtFromPR(${1:point1},${2:point2})(${3:point3})"
+    },
+    "tkzRegPolygonCenter()": {
+      "snippet": "tkzRegPolygonCenter(${1:point1},${2:point2})"
+    },
+    "tkzRegPolygonSide()": {
+      "snippet": "tkzRegPolygonSide(${1:point1},${2:point2})"
+    },
+    "tkzRenamePoint(){}": {
+      "snippet": "tkzRenamePoint(${2:arg1}){${1:arg2}}"
+    },
+    "tkzGetPointxy(){}": {
+      "snippet": "tkzGetPointxy(${2:arg1}){${1:arg2}}"
+    },
+    "tkzDrawArcTowards[]()()": {
+      "snippet": "tkzDrawArcTowards[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRotate[]()()": {
+      "snippet": "tkzDrawArcRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcAngles[]()()": {
+      "snippet": "tkzDrawArcAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRwithNodes[]()()": {
+      "snippet": "tkzDrawArcRwithNodes[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcR[]()()": {
+      "snippet": "tkzDrawArcR[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRAngles[]()()": {
+      "snippet": "tkzDrawArcRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzDrawArcRAN[]()()": {
+      "snippet": "tkzDrawArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzPathArcRAN[]()()": {
+      "snippet": "tkzPathArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
+    },
+    "tkzRandPointOnRect()": {
+      "snippet": "tkzRandPointOnRect(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnSegment()": {
+      "snippet": "tkzRandPointOnSegment(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnLine()": {
+      "snippet": "tkzRandPointOnLine(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnCircle()": {
+      "snippet": "tkzRandPointOnCircle(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnCircleThrough()": {
+      "snippet": "tkzRandPointOnCircleThrough(${1:point1},${2:point2})"
+    },
+    "tkzRandPointOnDisk()": {
+      "snippet": "tkzRandPointOnDisk(${1:point1},${2:point2})"
+    },
+    "tkzVecKOrth[]()": {
+      "snippet": "tkzVecKOrth[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzVecK[]()": {
+      "snippet": "tkzVecK[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzVecKOrthNorm[]()": {
+      "snippet": "tkzVecKOrthNorm[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzVecKNorm[]()": {
+      "snippet": "tkzVecKNorm[${1:options}](${2:point1},${3:point2})"
+    },
+    "tkzShowMediatorLine[]()": {
+      "snippet": "tkzShowMediatorLine[${1:opts}](${2:arg})"
+    },
+    "tkzShowLLLine[]()()": {
+      "snippet": "tkzShowLLLine[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowOrthLine[]()()": {
+      "snippet": "tkzShowOrthLine[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowBisectorLine[]()()": {
+      "snippet": "tkzShowBisectorLine[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowTranslation[]()()": {
+      "snippet": "tkzShowTranslation[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowSymOrth[]()()": {
+      "snippet": "tkzShowSymOrth[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowCSym[]()()": {
+      "snippet": "tkzShowCSym[${1:opts}](${2:arg1})(${3:arg2})"
+    },
+    "tkzShowProjection[]()()": {
+      "snippet": "tkzShowProjection[${1:opts}](${2:arg1})(${3:arg2})"
+    },
     "ExtractPoint": {},
     "FirstPointInList{}": {
       "snippet": "FirstPointInList{${1:arg}}"
     },
+    "tkzTranslation()(){}": {
+      "snippet": "tkzTranslation(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUTranslation()()": {
+      "snippet": "tkzUTranslation(${1:arg1})(${2:arg2})"
+    },
+    "tkzCSym()(){}": {
+      "snippet": "tkzCSym(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUCSym()()": {
+      "snippet": "tkzUCSym(${1:arg1})(${2:arg2})"
+    },
+    "tkzSymOrth()(){}": {
+      "snippet": "tkzSymOrth(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUSymOrth()()": {
+      "snippet": "tkzUSymOrth(${1:arg1})(${2:arg2})"
+    },
+    "tkzProjection()(){}": {
+      "snippet": "tkzProjection(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUProjection()()": {
+      "snippet": "tkzUProjection(${1:arg1})(${2:arg2})"
+    },
+    "tkzHomo()(){}": {
+      "snippet": "tkzHomo(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUHomo()()": {
+      "snippet": "tkzUHomo(${1:arg1})(${2:arg2})"
+    },
+    "tkzRotateAngle()(){}": {
+      "snippet": "tkzRotateAngle(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzURotateAngle()()": {
+      "snippet": "tkzURotateAngle(${1:arg1})(${2:arg2})"
+    },
+    "tkzRotateInRad()(){}": {
+      "snippet": "tkzRotateInRad(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzURotateInRad()()": {
+      "snippet": "tkzURotateInRad(${1:arg1})(${2:arg2})"
+    },
+    "tkzInversePoint()(){}": {
+      "snippet": "tkzInversePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUInversePoint()()": {
+      "snippet": "tkzUInversePoint(${1:arg1})(${2:arg2})"
+    },
+    "tkzInverseNegativePoint()(){}": {
+      "snippet": "tkzInverseNegativePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
+    "tkzUInverseNegativePoint()()": {
+      "snippet": "tkzUInverseNegativePoint(${1:arg1})(${2:arg2})"
+    },
+    "tkzDefBCPoint()": {
+      "snippet": "tkzDefBCPoint(${1:point1=num1},${2:point2=num2},${3:...})"
+    },
+    "tkzDivHarmonic()": {
+      "snippet": "tkzDivHarmonic(${1:pt1},${2:pt2},${3:pt3})"
+    },
+    "tkzDivHarmonic[]()": {
+      "snippet": "tkzDivHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})"
+    },
+    "tkzOrthoCenter()": {
+      "snippet": "tkzOrthoCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefOrthoCenter()": {
+      "snippet": "tkzDefOrthoCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzCentroid()": {
+      "snippet": "tkzCentroid(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzBaryCenter()": {
+      "snippet": "tkzBaryCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzCircumCenter()": {
+      "snippet": "tkzCircumCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefCircumCenter()": {
+      "snippet": "tkzDefCircumCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzInCenter()": {
+      "snippet": "tkzInCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefInCenter()": {
+      "snippet": "tkzDefInCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzExCenter()": {
+      "snippet": "tkzExCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefExCenter()": {
+      "snippet": "tkzDefExCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzEulerCenter()": {
+      "snippet": "tkzEulerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzNinePointCenter()": {
+      "snippet": "tkzNinePointCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefEulerCenter()": {
+      "snippet": "tkzDefEulerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzSymmedianCenter()": {
+      "snippet": "tkzSymmedianCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzLemoinePoint()": {
+      "snippet": "tkzLemoinePoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzGrebePoint()": {
+      "snippet": "tkzGrebePoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefLemoinePoint()": {
+      "snippet": "tkzDefLemoinePoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzSpiekerCenter()": {
+      "snippet": "tkzSpiekerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefSpiekerCenter()": {
+      "snippet": "tkzDefSpiekerCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzGergonneCenter()": {
+      "snippet": "tkzGergonneCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefGergonneCenter()": {
+      "snippet": "tkzDefGergonneCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzNagelCenter()": {
+      "snippet": "tkzNagelCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefNagelCenter()": {
+      "snippet": "tkzDefNagelCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzMittenpunktCenter()": {
+      "snippet": "tkzMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefMittenpunktCenter()": {
+      "snippet": "tkzDefMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefMiddlespoint()": {
+      "snippet": "tkzDefMiddlespoint(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzFeuerbachCenter()": {
+      "snippet": "tkzFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzDefFeuerbachCenter()": {
+      "snippet": "tkzDefFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
+    },
+    "tkzOrthogonalCenter()": {
+      "snippet": "tkzOrthogonalCenter(${1:point1},${2:point2})"
+    },
     "usetkzobj{}": {
       "snippet": "usetkzobj{${1:list of objects}}"
     },
     "usetkztool{}": {
       "snippet": "usetkztool{${1:list of tools}}"
     },
+    "tkzInterLLxy()()": {
+      "snippet": "tkzInterLLxy(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
+    "tkzTestInterLC()()": {
+      "snippet": "tkzTestInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
+    },
     "iftkzFlagLC": {},
     "tkzFlagLCtrue": {},
     "tkzFlagLCfalse": {},
+    "tkzInterLCR()(){}{}": {
+      "snippet": "tkzInterLCR(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
+    },
+    "tkzInterLCWithNodes()(){}{}": {
+      "snippet": "tkzInterLCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
+    },
+    "tkzInterCCWithNodes()(){}{}": {
+      "snippet": "tkzInterCCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
+    },
     "tkzAddName[]{}": {
       "snippet": "tkzAddName[${2:options}]{${1:name}}"
     },
@@ -277,12 +1384,162 @@
     "lua"
   ],
   "keyvals": [
+    [
+      "label=${1:text}",
+      "shift=(${1:x},${2:y})",
+      "shift=(${1:angle}:${2:radius})"
+    ],
+    [
+      "ext",
+      "int"
+    ],
+    [
+      "both",
+      "ext",
+      "int"
+    ],
+    [
+      "dist=",
+      "from=${1:point}",
+      "show",
+      "/tkzcompass/delta=${1:number}"
+    ],
+    [
+      "ortho",
+      "orthic",
+      "centroid",
+      "median",
+      "circum",
+      "in",
+      "ex",
+      "euler",
+      "gergonne",
+      "symmedian",
+      "lemoine",
+      "grebe",
+      "spieker",
+      "nagel",
+      "mittenpunkt",
+      "feuerbach"
+    ],
+    [
+      "name=${1:name}"
+    ],
+    [
+      "pos=${1:number}"
+    ],
     [
       "through=center ${1:point1} angle ${2:degrees} point ${3:point2}",
       "R=center ${1:point} angle ${2:degrees} radius ${3:radius}",
       "through in rad=center ${1:point1} angle ${2:radians} point ${3:point2}",
       "R in rad=center ${1:point} angle ${2:radians} radius ${3:radius}"
     ],
+    [
+      "translation=from ${1:point1} to ${2:point2}",
+      "homothety=center ${1:point} ratio ${2:number}",
+      "reflection=over ${1:point1}--${2:point2}",
+      "symmetry=center ${1:point}",
+      "projection=onto ${1:point1}--${2:point2}",
+      "rotation=center ${1:point} angle ${2:degrees}",
+      "rotation in rad=center ${1:point} angle ${2:radians}",
+      "inversion=center ${1:point1} through ${2:point2}",
+      "inversion negative=center ${1:point1} through ${2:point2}"
+    ],
+    [
+      "orthogonal",
+      "orthogonal normed",
+      "linear",
+      "linear normed",
+      "colinear=at ${1:point}",
+      "colinear normed=at ${1:point}",
+      "K=${1:number}"
+    ],
+    [
+      "mediator",
+      "perpendicular=through ${1:point}",
+      "orthogonal=through ${1:point}",
+      "parallel=through ${1:point}",
+      "bisector",
+      "bisector out",
+      "symmedian",
+      "altitude",
+      "euler",
+      "tangent at=${1:point}",
+      "tangent from=${1:point}",
+      "K=${1:number}",
+      "normed"
+    ],
+    [
+      "at=${1:point}",
+      "from=${1:point}",
+      "from with R=${1:point}"
+    ],
+    [
+      "two angles=${1:angle1} and ${2:angle2}",
+      "equilateral",
+      "isosceles right",
+      "pythagore",
+      "pythagoras",
+      "egyptian",
+      "school",
+      "gold",
+      "euclid",
+      "golden",
+      "cheops",
+      "swap"
+    ],
+    [
+      "orthic",
+      "centroid",
+      "medial",
+      "in",
+      "incentral",
+      "ex",
+      "excentral",
+      "extouch",
+      "intouch",
+      "contact",
+      "euler",
+      "symmedial",
+      "tangential",
+      "feuerbach",
+      "name=${1:name}",
+      "ortho"
+    ],
+    [
+      "name=${1:name}",
+      "sides=${1:integer}",
+      "center",
+      "side"
+    ],
+    [
+      "R",
+      "diameter",
+      "circum",
+      "in",
+      "ex",
+      "euler",
+      "nine",
+      "spieker",
+      "apollonius",
+      "orthogonal from=${1:point}",
+      "orthogonal through=${1:point1} and ${2:point2}",
+      "K=${1:number}"
+    ],
+    [
+      "translation=from ${1:point1} to ${2:point2}",
+      "homothety=center ${1:point} ratio ${2:number}",
+      "reflection=over ${1:point1}--${2:point2}",
+      "symmetry=center ${1:point}",
+      "projection=onto ${1:point1}--${2:point2}",
+      "rotation=center ${1:point} angle ${2:degrees}",
+      "inversion=center ${1:point1} through ${2:point2}"
+    ],
+    [
+      "N",
+      "R",
+      "with nodes"
+    ],
     [
       "rectangle=${1:point1} and ${2:point2}",
       "segment=${1:point1}--${2:point2}",
@@ -291,6 +1548,279 @@
       "circle through=center ${1:point1} through ${2:point2}",
       "disk through=center ${1:point1} through ${2:point2}"
     ],
+    [
+      "shape=",
+      "size=${1:number}",
+      "color=",
+      "%color",
+      "fill=",
+      "draw=",
+      "opacity=${1:factor}",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "add=${1:num1} and ${2:num2}",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "style={${1:TikZ options}}",
+      "->",
+      "<-",
+      "<->",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line width=",
+      "double",
+      "double distance="
+    ],
+    [
+      "add=${1:num1} and ${2:num2}",
+      "dim={${1:label},${2:dim},${3:option}}",
+      "color=",
+      "%color",
+      "opacity=${1:factor}",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "style={${1:TikZ options}}",
+      "->",
+      "<-",
+      "<->",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line width=",
+      "double",
+      "double distance="
+    ],
+    [
+      "color=",
+      "%color",
+      "fill=",
+      "draw=",
+      "opacity=${1:factor}",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "style={${1:TikZ options}}",
+      "->",
+      "<-",
+      "<->",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "line width=",
+      "line join=",
+      "double",
+      "double distance="
+    ],
+    [
+      "through",
+      "R",
+      "color=",
+      "%color",
+      "fill=",
+      "opacity=${1:factor}",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "through",
+      "diameter",
+      "color=",
+      "%color",
+      "fill=",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "towards",
+      "rotate",
+      "R",
+      "R with nodes",
+      "angles",
+      "delta=${1:number}",
+      "reverse",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "towards",
+      "rotate",
+      "R",
+      "R with nodes",
+      "fill=",
+      "opacity=${1:factor}",
+      "color=",
+      "%color",
+      "draw=",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick",
+      "double",
+      "double distance="
+    ],
+    [
+      "radius",
+      "R",
+      "color=",
+      "%color",
+      "fill=",
+      "opacity=${1:factor}"
+    ],
+    [
+      "color=",
+      "%color",
+      "opacity=${1:factor}",
+      "fill="
+    ],
+    [
+      "size=${1:number}",
+      "color=",
+      "%color",
+      "opacity=${1:factor}",
+      "fill=",
+      "left color=",
+      "right color="
+    ],
     [
       "xmin=${1:number}",
       "xmax=${1:number}",
@@ -309,6 +1839,229 @@
       "color=",
       "%color"
     ],
+    [
+      "out"
+    ],
+    [
+      "towards",
+      "rotate",
+      "R"
+    ],
+    [
+      "pos=${1:number}",
+      "color=",
+      "%color",
+      "mark=${1:mark}",
+      "size=",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "arc=",
+      "size=",
+      "mark=${1:mark}",
+      "mksize=",
+      "mkcolor=",
+      "color=",
+      "mkpos=${1:number}"
+    ],
+    [
+      "german",
+      "size=${1:number}",
+      "fill=",
+      "opacity=${1:factor}",
+      "draw=",
+      "color=",
+      "%color",
+      "line width="
+    ],
+    [
+      "left",
+      "right",
+      "above",
+      "below",
+      "above right",
+      "above left",
+      "below right",
+      "below left",
+      "color=",
+      "%color",
+      "font=${1:font commands}",
+      "label=${1:text}",
+      "centered"
+    ],
+    [
+      "left",
+      "right",
+      "above",
+      "below",
+      "above right",
+      "above left",
+      "below right",
+      "below left",
+      "color=",
+      "%color",
+      "font=${1:font commands}",
+      "label=${1:text}",
+      "centered",
+      "center=${1:point}",
+      "dist=${1:number}"
+    ],
+    [
+      "pos=${1:number}",
+      "swap",
+      "auto",
+      "below=",
+      "above=",
+      "left=",
+      "right=",
+      "below left=",
+      "below right=",
+      "above left=",
+      "above right=",
+      "sloped",
+      "midway",
+      "near start",
+      "near end",
+      "very near start",
+      "very near end",
+      "at start",
+      "at end",
+      "color=",
+      "%color"
+    ],
+    [
+      "pos=${1:number}",
+      "circle",
+      "draw",
+      "fill=",
+      "font=${1:font commands}"
+    ],
+    [
+      "radius",
+      "R",
+      "below=",
+      "above=",
+      "left=",
+      "right=",
+      "below left=",
+      "below right=",
+      "above left=",
+      "above right=",
+      "color=",
+      "%color",
+      "fill=",
+      "font=${1:font commands}",
+      "draw",
+      "text width=",
+      "text centered"
+    ],
+    [
+      "pos=${1:number}",
+      "below=",
+      "above=",
+      "left=",
+      "right=",
+      "below left=",
+      "below right=",
+      "above left=",
+      "above right=",
+      "color=",
+      "%color"
+    ],
+    [
+      "delta=${1:degrees}",
+      "length=${1:number}",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "mediator",
+      "parallel=through ${1:point}",
+      "perpendicular=through ${1:point}",
+      "orthogonal",
+      "bisector",
+      "K=${1:number}",
+      "length=${1:number}",
+      "ratio=${1:number}",
+      "gap=${1:number}",
+      "size=${1:number}",
+      "color=",
+      "%color",
+      "solid",
+      "dotted",
+      "densely dotted",
+      "loosely dotted",
+      "dashed",
+      "densely dashed",
+      "loosely dashed",
+      "dash dot",
+      "densely dash dot",
+      "loosely dash dot",
+      "dash dot dot",
+      "densely dash dot dot",
+      "loosely dash dot dot",
+      "line width=",
+      "style={${1:TikZ options}}",
+      "line width=",
+      "ultra thin",
+      "very thin",
+      "thin",
+      "semithick",
+      "thick",
+      "very thick",
+      "ultra thick"
+    ],
+    [
+      "reflection=over ${1:point1}--${2:point2}",
+      "symmetry=center ${1:point}",
+      "projection=onto ${1:point1}--${2:point2}",
+      "translation=from ${1:point1} to ${2:point2}",
+      "K=${1:number}",
+      "length=${1:number}",
+      "ratio=${1:number}",
+      "gap=${1:number}",
+      "size=${1:number}",
+      "color=",
+      "%color"
+    ],
+    [
+      "lw=",
+      "scale=${1:factor}",
+      "return"
+    ],
+    [
+      "cm"
+    ],
     [
       "background=",
       "text="
@@ -333,6 +2086,17 @@
       "add=${1:num1} and ${2:num2}",
       "delta=${1:number}"
     ],
+    [
+      "draw",
+      "color=",
+      "text=",
+      "fill=",
+      "opacity=${1:factor}",
+      "line width=",
+      "rotate=${1:degrees}",
+      "inner sep=",
+      "text width="
+    ],
     [
       "line"
     ],
@@ -366,6 +2130,14 @@
       "subxstep=${1:number}",
       "subystep=${1:number}",
       "line width="
+    ],
+    [
+      "xlabel=${1:text}",
+      "xstyle=",
+      "noxdraw",
+      "ylabel=${1:text}",
+      "ystyle=",
+      "noydraw"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/tkz-fct.json b/dev/packages/tkz-fct.json
index 707595a8f..06bfe08e8 100644
--- a/dev/packages/tkz-fct.json
+++ b/dev/packages/tkz-fct.json
@@ -12,34 +12,50 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "tkzDefPointByFct()": {
+      "snippet": "tkzDefPointByFct(${1:number})"
+    },
+    "tkzDefPointByFct[]()": {
+      "snippet": "tkzDefPointByFct[${1:options}](${2:number})",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "tkzDrawTangentLine()": {
+      "snippet": "tkzDrawTangentLine(${1:number})"
+    },
+    "tkzDrawTangentLine[]()": {
+      "snippet": "tkzDrawTangentLine[${1:options}](${2:number})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "tkzDrawArea[]": {
       "snippet": "tkzDrawArea[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "tkzDrawAreafg[]": {
       "snippet": "tkzDrawAreafg[${1:options}]",
-      "keyvalindex": 2,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSum[]": {
       "snippet": "tkzDrawRiemannSum[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSumInf[]": {
       "snippet": "tkzDrawRiemannSumInf[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSumSup[]": {
       "snippet": "tkzDrawRiemannSumSup[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSumMid[]": {
       "snippet": "tkzDrawRiemannSumMid[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "tkzFctPar{}{}": {
@@ -70,6 +86,17 @@
       "line width=",
       "style="
     ],
+    [
+      "draw",
+      "with=",
+      "ref="
+    ],
+    [
+      "draw",
+      "with=",
+      "kr=",
+      "kl="
+    ],
     [
       "domain=",
       "with=",
diff --git a/dev/packages/tkz-graph.json b/dev/packages/tkz-graph.json
index 7bd668926..16fc83c19 100644
--- a/dev/packages/tkz-graph.json
+++ b/dev/packages/tkz-graph.json
@@ -12,13 +12,77 @@
       "keyvalpos": 0
     },
     "Vertices{}{}": {
-      "snippet": "Vertices{${1:type}}{${2:vertex1,vertex2,...}}"
+      "snippet": "Vertices{${1:type}}{${2:vertex1,${3:vertex2},...}}"
     },
     "Vertices[]{}{}": {
-      "snippet": "Vertices[${3:options}]{${1:type}}{${2:vertex1,vertex2,...}}",
+      "snippet": "Vertices[${3:options}]{${1:type}}{${2:vertex1,${4:vertex2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
+    "EA(){}": {
+      "snippet": "EA(${2:vertex1}){${1:vertex2}}"
+    },
+    "EA[](){}": {
+      "snippet": "EA[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "WE(){}": {
+      "snippet": "WE(${2:vertex1}){${1:vertex2}}"
+    },
+    "WE[](){}": {
+      "snippet": "WE[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "NO(){}": {
+      "snippet": "NO(${2:vertex1}){${1:vertex2}}"
+    },
+    "NO[](){}": {
+      "snippet": "NO[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "SO(){}": {
+      "snippet": "SO(${2:vertex1}){${1:vertex2}}"
+    },
+    "SO[](){}": {
+      "snippet": "SO[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "NOEA(){}": {
+      "snippet": "NOEA(${2:vertex1}){${1:vertex2}}"
+    },
+    "NOEA[](){}": {
+      "snippet": "NOEA[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "NOWE(){}": {
+      "snippet": "NOWE(${2:vertex1}){${1:vertex2}}"
+    },
+    "NOWE[](){}": {
+      "snippet": "NOWE[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "SOEA(){}": {
+      "snippet": "SOEA(${2:vertex1}){${1:vertex2}}"
+    },
+    "SOEA[](){}": {
+      "snippet": "SOEA[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "SOWE(){}": {
+      "snippet": "SOWE(${2:vertex1}){${1:vertex2}}"
+    },
+    "SOWE[](){}": {
+      "snippet": "SOWE[${2:options}](${3:vertex1}){${1:vertex2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
     "SetGraphUnit{}": {
       "snippet": "SetGraphUnit{${1:number}}"
     },
@@ -27,9 +91,31 @@
     "SetVertexLabel": {},
     "SetVertexLabelOut": {},
     "SetVertexLabelIn": {},
+    "Edge()()": {
+      "snippet": "Edge(${1:vertex1})(${2:vertex2})"
+    },
+    "Edge[]()()": {
+      "snippet": "Edge[${1:options}](${2:vertex1})(${3:vertex2})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "Loop()": {
+      "snippet": "Loop(${1:vertex})"
+    },
+    "Loop[]()": {
+      "snippet": "Loop[${1:options}](${2:vertex})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "Edges()": {
+      "snippet": "Edges(${1:vertex1},${2:vertex2},${3:...})"
+    },
+    "Edges[]()": {
+      "snippet": "Edges[${1:options}](${2:vertex1},${3:vertex2},${4:...})"
+    },
     "GraphInit[]": {
       "snippet": "GraphInit[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "VertexInnerSep": {},
@@ -54,22 +140,22 @@
     "SetVertexSimple": {},
     "SetVertexSimple[]": {
       "snippet": "SetVertexSimple[${1:options}]",
-      "keyvalindex": 2,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "SetVertexNormal[]": {
       "snippet": "SetVertexNormal[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "SetUpVertex[]": {
       "snippet": "SetUpVertex[${1:options}]",
-      "keyvalindex": 4,
+      "keyvalindex": 7,
       "keyvalpos": 0
     },
     "SetUpEdge[]": {
       "snippet": "SetUpEdge[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 8,
       "keyvalpos": 0
     },
     "SetGraphShadeColor{}{}{}": {
@@ -86,7 +172,7 @@
     },
     "grProb[]{}{}{}{}{}{}": {
       "snippet": "grProb[${7:options}]{${1:left-vertex}}{${2:right-vertex}}{${3:toplabel}}{${4:bottomlabel}}{${5:leftlabel}}{${6:rightlabel}}",
-      "keyvalindex": 6,
+      "keyvalindex": 9,
       "keyvalpos": 0
     },
     "grProbThree{}{}{}{}{}{}": {
@@ -94,11 +180,11 @@
     },
     "grProbThree[]{}{}{}{}{}{}": {
       "snippet": "grProbThree[${7:options}]{${1:right-vertex}}{${2:up-vertex}}{${3:down-vertex}}{${4:rr/ru/rd}}{${5:uu/ud/ur}}{${6:dd/dr/du}}",
-      "keyvalindex": 6,
+      "keyvalindex": 9,
       "keyvalpos": 0
     },
     "AddVertexColor{}{}": {
-      "snippet": "AddVertexColor{${1:color}}{${2:vertex1,vertex2,...}}"
+      "snippet": "AddVertexColor{${1:color}}{${2:vertex1,${3:vertex2},...}}"
     },
     "SetVertexArt": {}
   },
@@ -120,6 +206,46 @@
       "Ldist=",
       "Lpos="
     ],
+    [
+      "x=",
+      "y=",
+      "a=",
+      "d=",
+      "Node",
+      "position=",
+      "dir=",
+      "NoLabel",
+      "LabelOut",
+      "L=",
+      "Math",
+      "Ldist=",
+      "Lpos=",
+      "unit="
+    ],
+    [
+      "local",
+      "color=",
+      "lw=",
+      "label=",
+      "labeltext=",
+      "labelcolor=",
+      "labelstyle=",
+      "style="
+    ],
+    [
+      "color=",
+      "lw=",
+      "label=",
+      "labelstyle=",
+      "style=",
+      "color=",
+      "lw=",
+      "label=",
+      "labelstyle=",
+      "style=",
+      "dir=",
+      "dist="
+    ],
     [
       "vstyle="
     ],
diff --git a/dev/packages/tkz-kiviat.json b/dev/packages/tkz-kiviat.json
index 5ea78437b..5b7825c00 100644
--- a/dev/packages/tkz-kiviat.json
+++ b/dev/packages/tkz-kiviat.json
@@ -5,15 +5,15 @@
   },
   "macros": {
     "tkzKiviatDiagram{}": {
-      "snippet": "tkzKiviatDiagram{${1:name1,name2,...}}"
+      "snippet": "tkzKiviatDiagram{${1:name1,${2:name2},...}}"
     },
     "tkzKiviatDiagram[]{}": {
-      "snippet": "tkzKiviatDiagram[${2:options}]{${1:name1,name2,...}}",
+      "snippet": "tkzKiviatDiagram[${2:options}]{${1:name1,${3:name2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "tkzKiviatLine[]{}": {
-      "snippet": "tkzKiviatLine[${2:options}]{${1:num1,num2,...}}",
+      "snippet": "tkzKiviatLine[${2:options}]{${1:num1,${3:num2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -22,12 +22,17 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
+    "tkzKiviatGrad[]()": {
+      "snippet": "tkzKiviatGrad[${1:options}](${2:integer})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "tkzKiviatDiagramFromFile{}": {
       "snippet": "tkzKiviatDiagramFromFile{${1:file}}"
     },
     "tkzKiviatDiagramFromFile[]{}": {
       "snippet": "tkzKiviatDiagramFromFile[${2:options}]{${1:file}}",
-      "keyvalindex": 2,
+      "keyvalindex": 3,
       "keyvalpos": 0
     }
   },
@@ -47,6 +52,12 @@
       "fill=",
       "opacity="
     ],
+    [
+      "graduation distance=",
+      "prefix=",
+      "suffix=",
+      "unity="
+    ],
     [
       "lattice=",
       "gap=",
diff --git a/dev/packages/tkz-tab.json b/dev/packages/tkz-tab.json
index 938fc3909..3b6d4c642 100644
--- a/dev/packages/tkz-tab.json
+++ b/dev/packages/tkz-tab.json
@@ -7,10 +7,10 @@
   },
   "macros": {
     "tkzTabInit{}{}": {
-      "snippet": "tkzTabInit{${1:expr1/height1,expr2/height2,...}}{${2:expr1,expr2,...}}"
+      "snippet": "tkzTabInit{${1:expr1/height1,${3:expr2/height2},${4:...}}{${2:expr1},${5:expr2},...}}"
     },
     "tkzTabInit[]{}{}": {
-      "snippet": "tkzTabInit[${3:options}]{${1:expr1/height1,expr2/height2,...}}{${2:expr1,expr2,...}}",
+      "snippet": "tkzTabInit[${3:options}]{${1:expr1/height1,${4:expr2/height2},${5:...}}{${2:expr1},${6:expr2},...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
@@ -23,18 +23,18 @@
       "keyvalpos": 0
     },
     "tkzTabLine{}": {
-      "snippet": "tkzTabLine{${1:symbol1,symbol2,...}}"
+      "snippet": "tkzTabLine{${1:symbol1,${2:symbol2},...}}"
     },
     "tkzTabLine[]{}": {
-      "snippet": "tkzTabLine[${2:options}]{${1:symbol1,symbol2,...}}",
+      "snippet": "tkzTabLine[${2:options}]{${1:symbol1,${3:symbol2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "tkzTabVar{}": {
-      "snippet": "tkzTabVar{${1:symbol1/expr,symbol2/expr1/expr2,...}}"
+      "snippet": "tkzTabVar{${1:symbol1/expr,${2:symbol2/expr1/expr2},...}}"
     },
     "tkzTabVar[]{}": {
-      "snippet": "tkzTabVar[${2:options}]{${1:symbol1/expr,symbol2/expr1/expr2,...}}",
+      "snippet": "tkzTabVar[${2:options}]{${1:symbol1/expr,${3:symbol2/expr1/expr2},...}}",
       "keyvalindex": 2,
       "keyvalpos": 0
     },
@@ -79,7 +79,7 @@
       "keyvalpos": 0
     },
     "tkzTabSlope{}": {
-      "snippet": "tkzTabSlope{${1:num1/leftexpr1/rightexpr1,num2/leftexpr2/rightexpr3,...}}"
+      "snippet": "tkzTabSlope{${1:num1/leftexpr1/rightexpr1,${2:num2/leftexpr2/rightexpr3},...}}"
     },
     "tkzTabSetup": {},
     "tkzTabSetup[]": {
diff --git a/dev/packages/tocbasic.json b/dev/packages/tocbasic.json
new file mode 100644
index 000000000..8afe9ceee
--- /dev/null
+++ b/dev/packages/tocbasic.json
@@ -0,0 +1,288 @@
+{
+  "includes": {
+    "scrbase": [],
+    "scrlogo": []
+  },
+  "macros": {
+    "Ifattoclist{}{}{}": {
+      "snippet": "Ifattoclist{${1:extension}}{${2:then code}}{${3:else code}}"
+    },
+    "addtotoclist{}": {
+      "snippet": "addtotoclist{${1:extension}}"
+    },
+    "addtotoclist[]{}": {
+      "snippet": "addtotoclist[${2:owner}]{${1:extension}}"
+    },
+    "owneroftoc{}": {
+      "snippet": "owneroftoc{${1:arg}}"
+    },
+    "categoryoftoc{}": {
+      "snippet": "categoryoftoc{${1:arg}}"
+    },
+    "AtAddToTocList{}": {
+      "snippet": "AtAddToTocList{${1:commands}}"
+    },
+    "AtAddToTocList[]{}": {
+      "snippet": "AtAddToTocList[${2:owner}]{${1:commands}}"
+    },
+    "removefromtoclist{}": {
+      "snippet": "removefromtoclist{${1:extension}}"
+    },
+    "removefromtoclist[]{}": {
+      "snippet": "removefromtoclist[${2:owner}]{${1:extension}}"
+    },
+    "doforeachtocfile{}": {
+      "snippet": "doforeachtocfile{${1:commands}}"
+    },
+    "doforeachtocfile[]{}": {
+      "snippet": "doforeachtocfile[${2:owner}]{${1:commands}}"
+    },
+    "addtoeachtocfile{}": {
+      "snippet": "addtoeachtocfile{${1:content}}"
+    },
+    "addtoeachtocfile[]{}": {
+      "snippet": "addtoeachtocfile[${2:owner}]{${1:content}}"
+    },
+    "addcontentslinetoeachtocfile{}{}": {
+      "snippet": "addcontentslinetoeachtocfile{${1:level}}{${2:text}}"
+    },
+    "addcontentslinetoeachtocfile[]{}{}": {
+      "snippet": "addcontentslinetoeachtocfile[${3:owner}]{${1:level}}{${2:text}}"
+    },
+    "addxcontentsline{}{}{}": {
+      "snippet": "addxcontentsline{${1:extension}}{${2:level}}{${3:text}}"
+    },
+    "addxcontentsline{}{}[]{}": {
+      "snippet": "addxcontentsline{${1:extension}}{${2:level}}[${3:section number}]{${4:text}}"
+    },
+    "nonumberline": {},
+    "addxcontentslinetoeachtocfile{}{}": {
+      "snippet": "addxcontentslinetoeachtocfile{${1:level}}{${2:text}}"
+    },
+    "addxcontentslinetoeachtocfile{}[]{}": {
+      "snippet": "addxcontentslinetoeachtocfile{${1:level}}[${2:section number}]{${3:text}}"
+    },
+    "addxcontentslinetoeachtocfile[]{}{}": {
+      "snippet": "addxcontentslinetoeachtocfile[${3:owner}]{${1:level}}{${2:text}}"
+    },
+    "addxcontentslinetoeachtocfile[]{}[]{}": {
+      "snippet": "addxcontentslinetoeachtocfile[${3:owner}]{${1:level}}[${4:section number}]{${2:text}}"
+    },
+    "BeforeStartingTOC{}": {
+      "snippet": "BeforeStartingTOC{${1:commands}}"
+    },
+    "BeforeStartingTOC[]{}": {
+      "snippet": "BeforeStartingTOC[${2:extension}]{${1:commands}}"
+    },
+    "AfterStartingTOC{}": {
+      "snippet": "AfterStartingTOC{${1:commands}}"
+    },
+    "AfterStartingTOC[]{}": {
+      "snippet": "AfterStartingTOC[${2:extension}]{${1:commands}}"
+    },
+    "listoftoc{}": {
+      "snippet": "listoftoc{${1:extension}}"
+    },
+    "listoftoc[]{}": {
+      "snippet": "listoftoc[${2:list-of title}]{${1:extension}}"
+    },
+    "listoftoc*{}": {
+      "snippet": "listoftoc*{${1:extension}}"
+    },
+    "listofname": {},
+    "listofeachtoc": {},
+    "listofeachtoc[]": {
+      "snippet": "listofeachtoc[${1:owner}]"
+    },
+    "BeforeTOCHead{}": {
+      "snippet": "BeforeTOCHead{${1:commands}}"
+    },
+    "BeforeTOCHead[]{}": {
+      "snippet": "BeforeTOCHead[${2:extension}]{${1:commands}}"
+    },
+    "AfterTOCHead{}": {
+      "snippet": "AfterTOCHead{${1:commands}}"
+    },
+    "AfterTOCHead[]{}": {
+      "snippet": "AfterTOCHead[${2:extension}]{${1:commands}}"
+    },
+    "deftocheading{}{}": {
+      "snippet": "deftocheading{${1:extension}}{${2:definition}}"
+    },
+    "setuptoc{}{}": {
+      "snippet": "setuptoc{${1:extension}}{${2:feature list}}"
+    },
+    "unsettoc{}{}": {
+      "snippet": "unsettoc{${1:extension}}{${2:feature list}}"
+    },
+    "Iftocfeature{}{}{}{}": {
+      "snippet": "Iftocfeature{${1:extension}}{${2:feature}}{${3:then code}}{${4:else code}}"
+    },
+    "tocbasicautomode": {},
+    "DeclareNewTOC{}": {
+      "snippet": "DeclareNewTOC{${1:extension}}"
+    },
+    "DeclareNewTOC[]{}": {
+      "snippet": "DeclareNewTOC[${2:options}]{${1:extension}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "usetocbasicnumberline": {},
+    "usetocbasicnumberline[]": {
+      "snippet": "usetocbasicnumberline[${1:code}]"
+    },
+    "TOCEntryStyleInitCode{}{}": {
+      "snippet": "TOCEntryStyleInitCode{${1:style}}{${2:initial code}}"
+    },
+    "TOCEntryStyleInitCode*{}{}": {
+      "snippet": "TOCEntryStyleInitCode*{${1:style}}{${2:initial code}}"
+    },
+    "TOCEntryStyleStartInitCode{}{}": {
+      "snippet": "TOCEntryStyleStartInitCode{${1:style}}{${2:initial code}}"
+    },
+    "DefineTOCEntryBooleanOption{}{}{}{}": {
+      "snippet": "DefineTOCEntryBooleanOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
+    },
+    "DefineTOCEntryBooleanOption{}[]{}{}{}": {
+      "snippet": "DefineTOCEntryBooleanOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
+    },
+    "DefineTOCEntryCommandOption{}{}{}{}": {
+      "snippet": "DefineTOCEntryCommandOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
+    },
+    "DefineTOCEntryCommandOption{}[]{}{}{}": {
+      "snippet": "DefineTOCEntryCommandOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
+    },
+    "DefineTOCEntryIfOption{}{}{}{}": {
+      "snippet": "DefineTOCEntryIfOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
+    },
+    "DefineTOCEntryIfOption{}[]{}{}{}": {
+      "snippet": "DefineTOCEntryIfOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
+    },
+    "DefineTOCEntryLengthOption{}{}{}{}": {
+      "snippet": "DefineTOCEntryLengthOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
+    },
+    "DefineTOCEntryLengthOption{}[]{}{}{}": {
+      "snippet": "DefineTOCEntryLengthOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
+    },
+    "DefineTOCEntryListOption{}{}{}{}": {
+      "snippet": "DefineTOCEntryListOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
+    },
+    "DefineTOCEntryListOption{}[]{}{}{}": {
+      "snippet": "DefineTOCEntryListOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
+    },
+    "DefineTOCEntryNumberOption{}{}{}{}": {
+      "snippet": "DefineTOCEntryNumberOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
+    },
+    "DefineTOCEntryNumberOption{}[]{}{}{}": {
+      "snippet": "DefineTOCEntryNumberOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
+    },
+    "DefineTOCEntryOption{}{}": {
+      "snippet": "DefineTOCEntryOption{${1:option}}{${2:code}}"
+    },
+    "DefineTOCEntryOption{}[]{}": {
+      "snippet": "DefineTOCEntryOption{${1:option}}[${2:default}]{${3:code}}"
+    },
+    "AddToDeclareTOCEntryStylePreCheckNeeds{}": {
+      "snippet": "AddToDeclareTOCEntryStylePreCheckNeeds{${1:code}}"
+    },
+    "PreToDeclareTOCEntryStylePreCheckNeeds{}": {
+      "snippet": "PreToDeclareTOCEntryStylePreCheckNeeds{${1:code}}"
+    },
+    "TOCEntryStyleNeedsCommandByOption{}{}{}{}{}": {
+      "snippet": "TOCEntryStyleNeedsCommandByOption{${1:option}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
+    },
+    "DeclareTOCEntryStyle{}{}": {
+      "snippet": "DeclareTOCEntryStyle{${1:style}}{${2:command code}}"
+    },
+    "DeclareTOCEntryStyle{}[]{}": {
+      "snippet": "DeclareTOCEntryStyle{${1:style}}[${2:initial code}]{${3:command code}}"
+    },
+    "CloneTOCEntryStyle{}{}": {
+      "snippet": "CloneTOCEntryStyle{${1:style}}{${2:new style}}"
+    },
+    "DeclareTOCStyleEntry{}{}": {
+      "snippet": "DeclareTOCStyleEntry{${1:style}}{${2:entry level}}"
+    },
+    "DeclareTOCStyleEntry[]{}{}": {
+      "snippet": "DeclareTOCStyleEntry[${3:option list}]{${1:style}}{${2:entry level}}"
+    },
+    "DeclareTOCStyleEntries{}{}": {
+      "snippet": "DeclareTOCStyleEntries{${1:style}}{${2:entry level}}"
+    },
+    "DeclareTOCStyleEntries[]{}{}": {
+      "snippet": "DeclareTOCStyleEntries[${3:option list}]{${1:style}}{${2:entry level}}"
+    },
+    "LastTOCLevelWasHigher": {},
+    "LastTOCLevelWasSame": {},
+    "LastTOCLevelWasLower": {},
+    "TOCLineLeaderFill": {},
+    "TOCLineLeaderFill[]": {
+      "snippet": "TOCLineLeaderFill[${1:leader}]"
+    },
+    "MakeMarkcase{}": {
+      "snippet": "MakeMarkcase{${1:text}}"
+    },
+    "parttocdepth": {},
+    "sectiontocdepth": {},
+    "subsectiontocdepth": {},
+    "subsubsectiontocdepth": {},
+    "paragraphtocdepth": {},
+    "subparagraphtocdepth": {},
+    "ifattoclist": {},
+    "iftocfeature": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "atbegin=${1:commands}",
+      "atend=${1:commands}",
+      "category=${1:string}",
+      "counterwithin=${1:counter}",
+      "float",
+      "floatpos=${1:float positions}",
+      "floattype=${1:number}",
+      "forcenames",
+      "hang=",
+      "indent=",
+      "level=${1:number}",
+      "listname=${1:title}",
+      "name=${1:entry name}",
+      "nonfloat",
+      "owner=${1:string}",
+      "setup={${1:list of attributes}}",
+      "tocentrystyle=${1:TOC-entry style}",
+      "tocentryafterpar=${1:code}",
+      "tocentrybeforeskip=",
+      "tocentrybreakafternumber=",
+      "tocentrydynindent=",
+      "tocentrydynnumwidth=",
+      "tocentryentryformat=${1:command}",
+      "tocentryentrynumberformat=${1:command}",
+      "tocentryindent=",
+      "tocentrylevel=${1:integer}",
+      "tocentryindentfollows={${1:list of levels}}",
+      "tocentrylinefill=${1:code}",
+      "tocentrynumsep=",
+      "tocentrynumwidth=",
+      "tocentryonendentry=${1:code}",
+      "tocentryonendlastentry=${1:code}",
+      "tocentryonstartentry=${1:code}",
+      "tocentryonstartfirstentry=${1:code}",
+      "tocentryonstarthigherlevel=${1:code}",
+      "tocentryonstartlowerlevel=${1:code}",
+      "tocentryonstartsamelevel=${1:code}",
+      "tocentrypagenumberbox=${1:command}",
+      "tocentrypagenumberformat=${1:command}",
+      "tocentrypagenumberwidth=",
+      "tocentryprepagenumber=${1:code}",
+      "tocentryraggedentrytext=",
+      "tocentryraggedpagenumber=",
+      "tocentryraggedright=",
+      "tocentryrightindent=",
+      "type=${1:entry type}",
+      "types=${1:string}",
+      "unset={${1:list of attributes}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/todo.json b/dev/packages/todo.json
new file mode 100644
index 000000000..13b819bf6
--- /dev/null
+++ b/dev/packages/todo.json
@@ -0,0 +1,62 @@
+{
+  "includes": {
+    "amssymb": []
+  },
+  "macros": {
+    "todo{}": {
+      "snippet": "todo{${1:text}}"
+    },
+    "todo[]{}": {
+      "snippet": "todo[${2:mark text}]{${1:text}}"
+    },
+    "todo*{}": {
+      "snippet": "todo*{${1:text}}"
+    },
+    "todo*[]{}": {
+      "snippet": "todo*[${2:mark text}]{${1:text}}"
+    },
+    "Todo{}": {
+      "snippet": "Todo{${1:text}}"
+    },
+    "Todo[]{}": {
+      "snippet": "Todo[${2:mark text}]{${1:text}}"
+    },
+    "Todo*{}": {
+      "snippet": "Todo*{${1:text}}"
+    },
+    "Todo*[]{}": {
+      "snippet": "Todo*[${2:mark text}]{${1:text}}"
+    },
+    "todoformat": {},
+    "todomark": {},
+    "done": {},
+    "done[]": {
+      "snippet": "done[${1:done text}]"
+    },
+    "todoopen": {},
+    "todoclose": {},
+    "astodos{}": {
+      "snippet": "astodos{${1:mark text}}"
+    },
+    "todoenvformat": {},
+    "todos": {},
+    "todoname": {},
+    "thetodo": {},
+    "doneitem{}{}": {
+      "snippet": "doneitem{${1:arg1}}{${2:arg2}}"
+    },
+    "todoitem{}{}": {
+      "snippet": "todoitem{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {
+    "todoenv": {}
+  },
+  "options": [
+    "nothing",
+    "hide",
+    "superscript",
+    "marginpar"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/todonotes.json b/dev/packages/todonotes.json
new file mode 100644
index 000000000..398bc16ad
--- /dev/null
+++ b/dev/packages/todonotes.json
@@ -0,0 +1,148 @@
+{
+  "includes": {
+    "ifthen": [],
+    "xkeyval": [],
+    "xcolor": [],
+    "tikz": [],
+    "tikzlibrarypositioning": [],
+    "calc": [],
+    "tikzlibraryshadows": [
+      "loadshadowlibrary"
+    ]
+  },
+  "macros": {
+    "todo{}": {
+      "snippet": "todo{${1:text}}"
+    },
+    "todo[]{}": {
+      "snippet": "todo[${2:options}]{${1:text}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "setuptodonotes{}": {
+      "snippet": "setuptodonotes{${1:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "todostyle{}{}": {
+      "snippet": "todostyle{${1:name}}{${2:options}}",
+      "keyvalindex": 1,
+      "keyvalpos": 1
+    },
+    "missingfigure{}": {
+      "snippet": "missingfigure{${1:text}}"
+    },
+    "missingfigure[]{}": {
+      "snippet": "missingfigure[${2:options}]{${1:text}}",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "listoftodos": {},
+    "listoftodos[]": {
+      "snippet": "listoftodos[${1:name}]"
+    },
+    "todototoc": {},
+    "todoformat{}": {
+      "snippet": "todoformat{${1:arg}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "disable",
+    "obeyDraft",
+    "obeyFinal",
+    "danish",
+    "german",
+    "ngerman",
+    "english",
+    "french",
+    "swedish",
+    "spanish",
+    "catalan",
+    "italian",
+    "portuguese",
+    "dutch",
+    "croatian",
+    "colorinlistoftodos",
+    "color=",
+    "backgroundcolor=",
+    "linecolor=",
+    "bordercolor=",
+    "tickmarkheight=",
+    "textwidth=",
+    "textsize=${1:fontsize csname}",
+    "format=${1:csname}",
+    "prependcaption={${1:text}}",
+    "loadshadowlibrary",
+    "shadow",
+    "dvistyle",
+    "figwidth="
+  ],
+  "keyvals": [
+    [
+      "disable",
+      "color=",
+      "backgroundcolor=",
+      "textcolor=",
+      "linecolor=",
+      "bordercolor=",
+      "shadow",
+      "noshadow",
+      "tickmarkheight=",
+      "format=${1:csname}",
+      "line",
+      "noline",
+      "inline",
+      "noinline",
+      "size=${1:fontsize command}",
+      "list",
+      "nolist",
+      "caption={${1:text}}",
+      "prepend",
+      "noprepend",
+      "fancyline",
+      "author=${1:author}",
+      "inlinewidth=",
+      "inlinepar",
+      "noinlinepar",
+      "%todonotesstyle"
+    ],
+    [
+      "disable",
+      "color=",
+      "backgroundcolor=",
+      "textcolor=",
+      "linecolor=",
+      "bordercolor=",
+      "shadow",
+      "noshadow",
+      "tickmarkheight=",
+      "format=${1:csname}",
+      "line",
+      "noline",
+      "inline",
+      "noinline",
+      "size=${1:fontsize command}",
+      "list",
+      "nolist",
+      "caption={${1:text}}",
+      "prepend",
+      "noprepend",
+      "fancyline",
+      "author=${1:author}",
+      "inlinewidth=",
+      "inlinepar",
+      "noinlinepar",
+      "figwidth=",
+      "figheight=",
+      "figcolor=",
+      "%todonotesstyle"
+    ],
+    [
+      "figwidth=",
+      "figheight=",
+      "figcolor=",
+      "%todonotesstyle"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/tokcycle.json b/dev/packages/tokcycle.json
index 12857490d..734d6dfc1 100644
--- a/dev/packages/tokcycle.json
+++ b/dev/packages/tokcycle.json
@@ -62,7 +62,7 @@
       "snippet": "groupedcytoks{${1:code}}"
     },
     "stripimplicitgroupingcase{}": {
-      "snippet": "stripimplicitgroupingcase{${1:0, 1, or -1}}"
+      "snippet": "stripimplicitgroupingcase{${1:0,${2: 1}, or -1}}"
     },
     "tcpeek{}": {
       "snippet": "tcpeek{${1:cmd}}"
diff --git a/dev/packages/tone.json b/dev/packages/tone.json
new file mode 100644
index 000000000..c75a6bbe7
--- /dev/null
+++ b/dev/packages/tone.json
@@ -0,0 +1,19 @@
+{
+  "includes": {
+    "tipa": []
+  },
+  "macros": {
+    "tone{}": {
+      "snippet": "tone{${1:arg}}"
+    },
+    "rtone{}": {
+      "snippet": "rtone{${1:arg}}"
+    },
+    "stone{}": {
+      "snippet": "stone{${1:arg}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/toolbox.json b/dev/packages/toolbox.json
new file mode 100644
index 000000000..4f88eb448
--- /dev/null
+++ b/dev/packages/toolbox.json
@@ -0,0 +1,120 @@
+{
+  "includes": {},
+  "macros": {
+    "toolboxMakeDef{}{}": {
+      "snippet": "toolboxMakeDef{${1:name}}{${2:replacement}}"
+    },
+    "toolboxMakeDef[]{}{}": {
+      "snippet": "toolboxMakeDef[${3:prefix}]{${1:name}}{${2:replacement}}"
+    },
+    "toolboxFreeDef{}": {
+      "snippet": "toolboxFreeDef{${1:name}}"
+    },
+    "toolboxFreeDef[]{}": {
+      "snippet": "toolboxFreeDef[${2:prefix}]{${1:name}}"
+    },
+    "toolboxFreeDef*{}": {
+      "snippet": "toolboxFreeDef*{${1:name}}"
+    },
+    "toolboxFreeDef*[]{}": {
+      "snippet": "toolboxFreeDef*[${2:prefix}]{${1:name}}"
+    },
+    "toolboxFuturelet{}": {
+      "snippet": "toolboxFuturelet{${1:cmd}}"
+    },
+    "toolboxGobbleNext{}": {
+      "snippet": "toolboxGobbleNext{${1:cmd}}"
+    },
+    "toolboxIfNextToken{}{}{}": {
+      "snippet": "toolboxIfNextToken{${1:token}}{${2:if}}{${3:else}}"
+    },
+    "toolboxToken": {},
+    "toolboxIfNextGobbling{}{}{}": {
+      "snippet": "toolboxIfNextGobbling{${1:token}}{${2:if}}{${3:else}}"
+    },
+    "toolboxIfEmpty{}{}{}": {
+      "snippet": "toolboxIfEmpty{${1:arg}}{${2:if}}{${3:else}}"
+    },
+    "toolboxIfX{}{}{}{}": {
+      "snippet": "toolboxIfX{${1:arg1}}{${2:arg2}}{${3:if}}{${4:else}}"
+    },
+    "toolboxIfElse{}{}{}": {
+      "snippet": "toolboxIfElse{${1:ifcmd}}{${2:if}}{${3:else}}"
+    },
+    "toolboxLoop{}{}": {
+      "snippet": "toolboxLoop{${1:items}}{${2:action}}"
+    },
+    "toolboxLoopName{}{}{}": {
+      "snippet": "toolboxLoopName{${1:name}}{${2:items}}{${3:action}}"
+    },
+    "toolboxTokenLoop{}{}": {
+      "snippet": "toolboxTokenLoop{${1:tokens}}{${2:action}}"
+    },
+    "toolboxTokenLoopName{}{}{}": {
+      "snippet": "toolboxTokenLoopName{${1:name}}{${2:tokens}}{${3:action}}"
+    },
+    "toolboxDef{}": {
+      "snippet": "toolboxDef{${1:cmd}}"
+    },
+    "toolboxSpace": {},
+    "toolboxAppend{}": {
+      "snippet": "toolboxAppend{${1:cmd}}"
+    },
+    "toolboxTokDef{}{}": {
+      "snippet": "toolboxTokDef{${1:argumentlist}}{${2:cmd}}"
+    },
+    "toolboxSplitAt{}{}{}{}": {
+      "snippet": "toolboxSplitAt{${1:argument}}{${2:search}}{${3:\\beforestring}}{${4:\\afterstring}}"
+    },
+    "toolboxSplitAt*{}{}{}{}": {
+      "snippet": "toolboxSplitAt*{${1:argument}}{${2:search}}{${3:\\beforestring}}{${4:\\afterstring}}"
+    },
+    "toolboxMakeSplit{}{}": {
+      "snippet": "toolboxMakeSplit{${1:search}}{${2:cmd}}"
+    },
+    "toolboxMakeSplit*{}{}": {
+      "snippet": "toolboxMakeSplit*{${1:search}}{${2:cmd}}"
+    },
+    "toolboxFreeSplit{}": {
+      "snippet": "toolboxFreeSplit{${1:cmd}}"
+    },
+    "toolboxMakeHarmless{}": {
+      "snippet": "toolboxMakeHarmless{${1:cmd}}"
+    },
+    "toolboxDropBrace{}": {
+      "snippet": "toolboxDropBrace{${1:cmd}}"
+    },
+    "toolboxIf{}{}{}": {
+      "snippet": "toolboxIf{${1:comparison}}{${2:def cmds}}{${3:cmd}}"
+    },
+    "toolboxNewiftrue{}": {
+      "snippet": "toolboxNewiftrue{${1:name}}"
+    },
+    "toolboxNewiffalse{}": {
+      "snippet": "toolboxNewiffalse{${1:name}}"
+    },
+    "toolboxNewifTrue{}": {
+      "snippet": "toolboxNewifTrue{${1:name}}"
+    },
+    "toolboxNewifFalse{}": {
+      "snippet": "toolboxNewifFalse{${1:name}}"
+    },
+    "toolboxLet{}": {
+      "snippet": "toolboxLet{${1:cmd}}"
+    },
+    "toolboxEmpty": {},
+    "toolboxSpaceToken": {},
+    "toolboxFirstOfTwo{}{}": {
+      "snippet": "toolboxFirstOfTwo{${1:arg1}}{${2:arg2}}"
+    },
+    "toolboxSecondOfTwo{}{}": {
+      "snippet": "toolboxSecondOfTwo{${1:arg1}}{${2:arg2}}"
+    },
+    "toolboxGobbleArg{}": {
+      "snippet": "toolboxGobbleArg{${1:arg}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/toptesi.json b/dev/packages/toptesi.json
new file mode 100644
index 000000000..e410fb8d7
--- /dev/null
+++ b/dev/packages/toptesi.json
@@ -0,0 +1,256 @@
+{
+  "includes": {
+    "xkeyval": [],
+    "scrextend": [],
+    "iftex": [],
+    "xspace": [],
+    "topfront": [],
+    "graphicx": [],
+    "etoolbox": [],
+    "topcoman": [],
+    "frontespizio": [
+      "tipotesi=frontespizio"
+    ],
+    "toptesi-scudo": [
+      "tipotesi=scudo"
+    ],
+    "toptesi-sss": [
+      "tipotesi=secondaria",
+      "tipotesi=sss"
+    ]
+  },
+  "macros": {
+    "CandidateNames{}": {
+      "snippet": "CandidateNames{${1:candidate list headings}}",
+      "option": "tipotesi=magistrale"
+    },
+    "corsodistudi{}": {
+      "snippet": "corsodistudi{${1:degree proper name}}",
+      "option": "tipotesi=monografia"
+    },
+    "giorno{}": {
+      "snippet": "giorno{${1:date}}",
+      "option": "tipotesi=monografia"
+    },
+    "luogo{}": {
+      "snippet": "luogo{${1:location}}",
+      "option": "tipotesi=monografia"
+    },
+    "NomeAteneo{}": {
+      "snippet": "NomeAteneo{${1:university proper name}}",
+      "option": "tipotesi=monografia"
+    },
+    "NomeCorsoDiStudi": {
+      "option": "tipotesi=monografia"
+    },
+    "NomeElaborato{}": {
+      "snippet": "NomeElaborato{${1:thesis name}}",
+      "option": "tipotesi=monografia"
+    },
+    "NomeRelatore{}{}": {
+      "snippet": "NomeRelatore{${1:singular}}{${2:plural}}",
+      "option": "tipotesi=monografia"
+    },
+    "StrutturaDi{}": {
+      "snippet": "StrutturaDi{${1:name}}",
+      "option": "tipotesi=monografia"
+    },
+    "TitoloListaCandidati{}": {
+      "snippet": "TitoloListaCandidati{${1:candidate list headings}}",
+      "option": "tipotesi=magistrale"
+    },
+    "backmatter": {},
+    "captionof{}{}": {
+      "snippet": "captionof{${1:float type}}{${2:text}}"
+    },
+    "english": {},
+    "ExtendCaptions{}{}{}": {
+      "snippet": "ExtendCaptions{${1:language}}{${2:summary title}}{${3:acknowledgements title}}"
+    },
+    "figurespagetrue": {},
+    "frontmatter": {},
+    "goodpagebreak": {},
+    "goodpagebreak[]": {
+      "snippet": "goodpagebreak[${1:n}]"
+    },
+    "indici": {},
+    "indici[]": {
+      "snippet": "indici[${1:pagestyle}]"
+    },
+    "inglese": {},
+    "italiano": {},
+    "mainmatter": {},
+    "nota[]{}": {
+      "snippet": "nota[${2:mark}]{${1:text}}"
+    },
+    "nota{}": {
+      "snippet": "nota{${1:text}}"
+    },
+    "NoteWhiteLine": {},
+    "paginavuota": {},
+    "ringraziamenti": {},
+    "setbindingcorrection{}": {
+      "snippet": "setbindingcorrection{${1:length}}"
+    },
+    "sommario": {},
+    "tablespagetrue": {},
+    "tomo": {},
+    "captionSD*[]{}": {
+      "snippet": "captionSD*[${2:short text}]{${1:text}}"
+    },
+    "captionSD*{}": {
+      "snippet": "captionSD*{${1:text}}"
+    },
+    "captionSD[]{}": {
+      "snippet": "captionSD[${2:short text}]{${1:text}}"
+    },
+    "captionSD{}": {
+      "snippet": "captionSD{${1:text}}"
+    },
+    "SDcaption[]{}{}": {
+      "snippet": "SDcaption[${3:short text}]{${1:text}}{${2:label}}"
+    },
+    "SDcaption{}{}": {
+      "snippet": "SDcaption{${1:text}}{${2:label}}"
+    },
+    "SDimage{}": {
+      "snippet": "SDimage{${1:image commands}}"
+    },
+    "acknowledgements": {},
+    "acknowledgename": {},
+    "allcontents": {},
+    "allcontents[]": {
+      "snippet": "allcontents[${1:pagestyle}]"
+    },
+    "blankpagestyle{}": {
+      "snippet": "blankpagestyle{${1:pagestyle}}"
+    },
+    "captionsetup{}": {
+      "snippet": "captionsetup{${1:options}}"
+    },
+    "captionwidth": {},
+    "chapterbibliographyfalse": {},
+    "chapterbibliographytrue": {},
+    "customfalse": {},
+    "emptypage": {},
+    "figurespagefalse": {},
+    "frontmatterfalse": {},
+    "frontmattertrue": {},
+    "fullwidth": {},
+    "headWarn{}": {
+      "snippet": "headWarn{${1:text}}"
+    },
+    "ifchapterbibliography": {},
+    "ifcustom": {},
+    "ifempty{}": {
+      "snippet": "ifempty{${1:arg}}"
+    },
+    "iffigurespage": {},
+    "iffrontmatter": {},
+    "iflibro": {},
+    "ifNumberFloat": {},
+    "ifnumeriromani": {},
+    "iftablespage": {},
+    "iftoc": {},
+    "ifTOPfolioinhead": {},
+    "ifTOPnocenterfolio": {},
+    "ifTOPnocenterhead": {},
+    "ifTOPnumerazioneromana": {},
+    "interno": {},
+    "lapagina": {},
+    "librofalse": {},
+    "librotrue": {},
+    "NoValidTipo{}": {
+      "snippet": "NoValidTipo{${1:option}}"
+    },
+    "NumberFloatfalse": {},
+    "NumberFloattrue": {},
+    "numeriromanifalse": {},
+    "numeriromanitrue": {},
+    "originalcaption[]{}": {
+      "snippet": "originalcaption[${2:short text}]{${1:text}}"
+    },
+    "originalcaption{}": {
+      "snippet": "originalcaption{${1:text}}"
+    },
+    "phantomsection": {},
+    "saveaddvspace": {},
+    "SDcapbox": {},
+    "SDcaptionwidth": {},
+    "SDfigbox": {},
+    "SDfigurewidth": {},
+    "SDlinewidth": {},
+    "SDtabular{}": {
+      "snippet": "SDtabular{${1:image commands}}"
+    },
+    "summary": {},
+    "summaryname": {},
+    "tablespagefalse": {},
+    "theNumberSD": {},
+    "tocfalse": {},
+    "toctrue": {},
+    "TOPfolioinheadfalse": {},
+    "TOPfolioinheadtrue": {},
+    "TOPnocenterfoliofalse": {},
+    "TOPnocenterfoliotrue": {},
+    "TOPnocenterheadfalse": {},
+    "TOPnocenterheadtrue": {},
+    "TOPnumerazioneromanafalse": {},
+    "TOPnumerazioneromanatrue": {},
+    "TOPsecnumdepth": {},
+    "TROF": {},
+    "TROFF": {},
+    "TRON": {}
+  },
+  "envs": {
+    "ThesisTitlePage": {
+      "option": "tipotesi=dottorale"
+    },
+    "ThesisTitlePage*": {
+      "name": "ThesisTitlePage",
+      "snippet": "*",
+      "option": "tipotesi=dottorale"
+    },
+    "citazioni": {},
+    "dedica": {},
+    "dedication": {},
+    "interlinea{}": {
+      "name": "interlinea",
+      "snippet": "{${1:factor}}"
+    },
+    "pdfxmetadata": {},
+    "wittysentences": {},
+    "SDbox{}": {
+      "name": "SDbox",
+      "snippet": "{${1:float type}}"
+    },
+    "SDbox{}*": {
+      "name": "SDbox",
+      "snippet": "{${1:float type}}*"
+    },
+    "SDbox{}[]": {
+      "name": "SDbox",
+      "snippet": "{${1:float type}}[${2:width factor}]"
+    },
+    "SDbox{}*[]": {
+      "name": "SDbox",
+      "snippet": "{${1:float type}}*[${2:width factor}]"
+    }
+  },
+  "options": [
+    "cucitura=",
+    "corpo=",
+    "chapterbib",
+    "evenboxes",
+    "libro",
+    "stile=",
+    "autoretitolo",
+    "oldstyle",
+    "nocenterfolio",
+    "nocenterhead",
+    "folioinhead",
+    "numerazioneromana",
+    "tipotesi="
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/totpages.json b/dev/packages/totpages.json
new file mode 100644
index 000000000..7fa6261af
--- /dev/null
+++ b/dev/packages/totpages.json
@@ -0,0 +1,25 @@
+{
+  "includes": {
+    "everyshi": [],
+    "keyval": []
+  },
+  "macros": {
+    "theTotPages": {},
+    "TotPerSheet": {},
+    "TotSheets": {},
+    "ifTotPagesToDvi": {},
+    "TotPagesToDvitrue": {},
+    "TotPagesToDvifalse": {},
+    "ifPagesPerSheet": {},
+    "PagesPerSheettrue": {},
+    "PagesPerSheetfalse": {}
+  },
+  "envs": {},
+  "options": [
+    "dvi",
+    "nodvi",
+    "pagespersheet=${1:integer}",
+    "nopagespersheet"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/trace.json b/dev/packages/trace.json
new file mode 100644
index 000000000..90fa86830
--- /dev/null
+++ b/dev/packages/trace.json
@@ -0,0 +1,13 @@
+{
+  "includes": {},
+  "macros": {
+    "traceon": {},
+    "traceoff": {}
+  },
+  "envs": {},
+  "options": [
+    "logonly",
+    "full"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/translations.json b/dev/packages/translations.json
new file mode 100644
index 000000000..d196b30f8
--- /dev/null
+++ b/dev/packages/translations.json
@@ -0,0 +1,143 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "pdftexcmds": []
+  },
+  "macros": {
+    "DeclareLanguage{}": {
+      "snippet": "DeclareLanguage{${1:lang}}"
+    },
+    "DeclareLanguageAlias{}{}": {
+      "snippet": "DeclareLanguageAlias{${1:lang2}}{${2:lang1}}"
+    },
+    "DeclareLanguageDialect{}{}": {
+      "snippet": "DeclareLanguageDialect{${1:dialect}}{${2:lang}}"
+    },
+    "NewTranslation{}{}{}": {
+      "snippet": "NewTranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "NewTranslationFallback{}{}": {
+      "snippet": "NewTranslationFallback{${1:key}}{${2:translation}}"
+    },
+    "RenewTranslation{}{}{}": {
+      "snippet": "RenewTranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "RenewTranslationFallback{}{}": {
+      "snippet": "RenewTranslationFallback{${1:key}}{${2:translation}}"
+    },
+    "ProvideTranslation{}{}{}": {
+      "snippet": "ProvideTranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "ProvideTranslationFallback{}{}": {
+      "snippet": "ProvideTranslationFallback{${1:key}}{${2:translation}}"
+    },
+    "DeclareTranslation{}{}{}": {
+      "snippet": "DeclareTranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "DeclareTranslationFallback{}{}": {
+      "snippet": "DeclareTranslationFallback{${1:key}}{${2:fallback}}"
+    },
+    "definetranslation{}{}{}": {
+      "snippet": "definetranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "definetranslationfallback{}{}": {
+      "snippet": "definetranslationfallback{${1:key}}{${2:translation}}"
+    },
+    "redefinetranslation{}{}{}": {
+      "snippet": "redefinetranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "redefinetranslationfallback{}{}": {
+      "snippet": "redefinetranslationfallback{${1:key}}{${2:translation}}"
+    },
+    "addtranslation{}{}{}": {
+      "snippet": "addtranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "addtranslationfallback{}{}": {
+      "snippet": "addtranslationfallback{${1:key}}{${2:translation}}"
+    },
+    "declaretranslation{}{}{}": {
+      "snippet": "declaretranslation{${1:lang}}{${2:key}}{${3:translation}}"
+    },
+    "declaretranslationfallback{}{}": {
+      "snippet": "declaretranslationfallback{${1:key}}{${2:translation}}"
+    },
+    "IfTranslation{}{}{}{}": {
+      "snippet": "IfTranslation{${1:lang}}{${2:key}}{${3:true}}{${4:false}}"
+    },
+    "GetTranslationFor{}{}": {
+      "snippet": "GetTranslationFor{${1:lang}}{${2:key}}"
+    },
+    "GetTranslation{}": {
+      "snippet": "GetTranslation{${1:key}}"
+    },
+    "GetLCTranslationFor{}{}": {
+      "snippet": "GetLCTranslationFor{${1:lang}}{${2:key}}"
+    },
+    "GetLCTranslation{}": {
+      "snippet": "GetLCTranslation{${1:key}}"
+    },
+    "GetTranslationForWarn{}{}": {
+      "snippet": "GetTranslationForWarn{${1:lang}}{${2:key}}"
+    },
+    "GetTranslationWarn{}": {
+      "snippet": "GetTranslationWarn{${1:key}}"
+    },
+    "GetLCTranslationForWarn{}{}": {
+      "snippet": "GetLCTranslationForWarn{${1:lang}}{${2:key}}"
+    },
+    "GetLCTranslationWarn{}": {
+      "snippet": "GetLCTranslationWarn{${1:key}}"
+    },
+    "SaveTranslationFor{}{}{}": {
+      "snippet": "SaveTranslationFor{${1:cmd}}{${2:lang}}{${3:key}}"
+    },
+    "SaveTranslation{}{}": {
+      "snippet": "SaveTranslation{${1:cmd}}{${2:key}}"
+    },
+    "LoadDictionary{}": {
+      "snippet": "LoadDictionary{${1:name}}"
+    },
+    "LoadDictionaryFor{}{}": {
+      "snippet": "LoadDictionaryFor{${1:lang}}{${2:name}}"
+    },
+    "LoadDictionaryForDialect{}{}": {
+      "snippet": "LoadDictionaryForDialect{${1:lang}}{${2:name}}"
+    },
+    "NewDictTranslation{}{}": {
+      "snippet": "NewDictTranslation{${1:key}}{${2:translation}}"
+    },
+    "RenewDictTranslation{}{}": {
+      "snippet": "RenewDictTranslation{${1:key}}{${2:translation}}"
+    },
+    "ProvideDictTranslation{}{}": {
+      "snippet": "ProvideDictTranslation{${1:key}}{${2:translation}}"
+    },
+    "DeclareDictTranslation{}{}": {
+      "snippet": "DeclareDictTranslation{${1:key}}{${2:translation}}"
+    },
+    "ProvideDictionaryFor{}{}[]": {
+      "snippet": "ProvideDictionaryFor{${1:lang}}{${2:name}}[${3:date}]"
+    },
+    "PrintDictionaryFor{}{}{}{}{}": {
+      "snippet": "PrintDictionaryFor{${1:lang}}{${2:name}}{${3:pre}}{${4:mid}}{${5:post}}"
+    },
+    "baselanguage{}": {
+      "snippet": "baselanguage{${1:lang}}"
+    },
+    "ifcurrentlanguage{}{}{}": {
+      "snippet": "ifcurrentlanguage{${1:lang}}{${2:true}}{${3:false}}"
+    },
+    "ifcurrentlang{}": {
+      "snippet": "ifcurrentlang{${1:lang}}"
+    },
+    "ifcurrentbaselanguage{}{}{}": {
+      "snippet": "ifcurrentbaselanguage{${1:lang}}{${2:true}}{${3:false}}"
+    },
+    "ifcurrentbaselang{}": {
+      "snippet": "ifcurrentbaselang{${1:lang}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/translator.json b/dev/packages/translator.json
new file mode 100644
index 000000000..2b871d622
--- /dev/null
+++ b/dev/packages/translator.json
@@ -0,0 +1,77 @@
+{
+  "includes": {
+    "keyval": []
+  },
+  "macros": {
+    "newtranslation{}{}": {
+      "snippet": "newtranslation{${1:key}}{${2:translation}}"
+    },
+    "newtranslation[]{}{}": {
+      "snippet": "newtranslation[${3:options}]{${1:key}}{${2:translation}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "renewtranslation{}{}": {
+      "snippet": "renewtranslation{${1:key}}{${2:translation}}"
+    },
+    "renewtranslation[]{}{}": {
+      "snippet": "renewtranslation[${3:options}]{${1:key}}{${2:translation}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "providetranslation{}{}": {
+      "snippet": "providetranslation{${1:key}}{${2:translation}}"
+    },
+    "providetranslation[]{}{}": {
+      "snippet": "providetranslation[${3:options}]{${1:key}}{${2:translation}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "deftranslation{}{}": {
+      "snippet": "deftranslation{${1:key}}{${2:translation}}"
+    },
+    "deftranslation[]{}{}": {
+      "snippet": "deftranslation[${3:options}]{${1:key}}{${2:translation}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "ProvidesDictionary{}{}": {
+      "snippet": "ProvidesDictionary{${1:kind}}{${2:language}}"
+    },
+    "ProvidesDictionary{}{}[]": {
+      "snippet": "ProvidesDictionary{${1:kind}}{${2:language}}[${3:version}]"
+    },
+    "usedictionary{}": {
+      "snippet": "usedictionary{${1:kind}}"
+    },
+    "uselanguage{}": {
+      "snippet": "uselanguage{${1:lang1,${2:lang2},...}}"
+    },
+    "translate{}": {
+      "snippet": "translate{${1:key}}"
+    },
+    "translate[]{}": {
+      "snippet": "translate[${2:options}]{${1:key}}"
+    },
+    "translatelet{}{}": {
+      "snippet": "translatelet{${1:macro}}{${2:key}}"
+    },
+    "translatelet[]{}{}": {
+      "snippet": "translatelet[${3:options}]{${1:macro}}{${2:key}}"
+    },
+    "languagepath{}": {
+      "snippet": "languagepath{${1:path}}"
+    },
+    "languagealias{}{}": {
+      "snippet": "languagealias{${1:name}}{${2:language list}}"
+    },
+    "languagename": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "to=${1:language}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/trees.json b/dev/packages/trees.json
new file mode 100644
index 000000000..05a48d4c3
--- /dev/null
+++ b/dev/packages/trees.json
@@ -0,0 +1,15 @@
+{
+  "includes": {},
+  "macros": {
+    "branchlabels{}{}{}": {
+      "snippet": "branchlabels{${1:label1}}{${2:label2}}{${3:label3}}"
+    },
+    "branchwidth": {},
+    "coordstep": {},
+    "xcoord": {},
+    "ycoord": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/trig.json b/dev/packages/trig.json
new file mode 100644
index 000000000..5620e18c4
--- /dev/null
+++ b/dev/packages/trig.json
@@ -0,0 +1,26 @@
+{
+  "includes": {},
+  "macros": {
+    "CalculateSin{}": {
+      "snippet": "CalculateSin{${1:angle}}"
+    },
+    "CalculateCos{}": {
+      "snippet": "CalculateCos{${1:angle}}"
+    },
+    "UseSin{}": {
+      "snippet": "UseSin{${1:angle}}"
+    },
+    "UseCos{}": {
+      "snippet": "UseCos{${1:angle}}"
+    },
+    "CalculateTan{}": {
+      "snippet": "CalculateTan{${1:angle}}"
+    },
+    "UseTan{}": {
+      "snippet": "UseTan{${1:angle}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/truncate.json b/dev/packages/truncate.json
new file mode 100644
index 000000000..3212f5bce
--- /dev/null
+++ b/dev/packages/truncate.json
@@ -0,0 +1,20 @@
+{
+  "includes": {},
+  "macros": {
+    "truncate{}{}": {
+      "snippet": "truncate{${1:width}}{${2:text}}"
+    },
+    "truncate[]{}{}": {
+      "snippet": "truncate[${3:marker}]{${1:width}}{${2:text}}"
+    },
+    "TruncateMarker": {}
+  },
+  "envs": {},
+  "options": [
+    "breakwords",
+    "breakall",
+    "hyphenate",
+    "fit"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/truthtable.json b/dev/packages/truthtable.json
new file mode 100644
index 000000000..5a15ed6b8
--- /dev/null
+++ b/dev/packages/truthtable.json
@@ -0,0 +1,16 @@
+{
+  "includes": {
+    "luacode": []
+  },
+  "macros": {
+    "truthtable{}{}{}{}{}{}": {
+      "snippet": "truthtable{${1:vars}}{${2:dvars}}{${3:statements}}{${4:dstatements}}{${5:true val}}{${6:false val}}"
+    },
+    "truthtableasc{}{}{}{}{}{}": {
+      "snippet": "truthtableasc{${1:vars}}{${2:dvars}}{${3:statements}}{${4:dstatements}}{${5:true val}}{${6:false val}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/tsvtemplate.json b/dev/packages/tsvtemplate.json
index 52b8ee3a5..151ae3318 100644
--- a/dev/packages/tsvtemplate.json
+++ b/dev/packages/tsvtemplate.json
@@ -8,7 +8,7 @@
       "snippet": "tsvtemplate{${1:template}}{${2:file}}"
     },
     "tsvtemplate[]{}{}": {
-      "snippet": "tsvtemplate[${3:colname1,colname2,...}]{${1:template}}{${2:file}}"
+      "snippet": "tsvtemplate[${3:colname1,${4:colname2},...}]{${1:template}}{${2:file}}"
     },
     "applytemplate{}{}{}{}": {
       "snippet": "applytemplate{${1:separator}}{${2:colnames}}{${3:template}}{${4:file}}"
@@ -22,7 +22,7 @@
     },
     "tsv template[]{}": {
       "name": "tsv template",
-      "snippet": "[${2:colname1,colname2,...}]{${1:file}}"
+      "snippet": "[${2:colname1,${3:colname2},...}]{${1:file}}"
     }
   },
   "options": [],
diff --git a/dev/packages/twemojis.json b/dev/packages/twemojis.json
new file mode 100644
index 000000000..4760f8c5c
--- /dev/null
+++ b/dev/packages/twemojis.json
@@ -0,0 +1,58 @@
+{
+  "includes": {
+    "tikz": [],
+    "ifthen": []
+  },
+  "macros": {
+    "twemoji{}": {
+      "snippet": "twemoji{${1:emoji name}}"
+    },
+    "twemoji[]{}": {
+      "snippet": "twemoji[${2:options}]{${1:emoji name}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "texttwemoji{}": {
+      "snippet": "texttwemoji{${1:emoji name}}"
+    },
+    "twemojiDefaultHeight": {},
+    "defineTwemoji{}{}": {
+      "snippet": "defineTwemoji{${1:number}}{${2:name}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "alt={${1:alt text}}",
+      "bb=${1:llx lly urx ury}",
+      "bbllx=",
+      "bblly=",
+      "bburx=",
+      "bbury=",
+      "natwidth=",
+      "natheight=",
+      "hiresbb",
+      "pagebox=",
+      "viewport=${1:llx lly urx ury}",
+      "trim=${1:llx lly urx ury}",
+      "angle=${1:degrees}",
+      "origin=",
+      "width=",
+      "height=",
+      "totalheight=",
+      "keepaspectratio",
+      "scale=${1:factor}",
+      "clip",
+      "draft",
+      "type=${1:file type}",
+      "ext=${1:file extension}",
+      "read=${1:read-file extension}",
+      "command=",
+      "quiet",
+      "page=${1:page number}",
+      "interpolate",
+      "decodearray={${1:color array}}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/typog.json b/dev/packages/typog.json
index f267a2aad..f445572c3 100644
--- a/dev/packages/typog.json
+++ b/dev/packages/typog.json
@@ -8,6 +8,9 @@
     "typogget{}": {
       "snippet": "typogget{${1:key}}"
     },
+    "typoggetnth{}{}{}": {
+      "snippet": "typoggetnth{${1:csname}}{${2:key}}{${3:index}}"
+    },
     "fontsizeinfo{}": {
       "snippet": "fontsizeinfo{${1:csname}}"
     },
@@ -88,6 +91,33 @@
     "Singleguillemetright": {},
     "Doubleguillemetleft": {},
     "Doubleguillemetright": {},
+    "uppercaseadjustlabelitems{}": {
+      "snippet": "uppercaseadjustlabelitems{${1:levels-to-adjust}}"
+    },
+    "lowercaseadjustlabelitems{}": {
+      "snippet": "lowercaseadjustlabelitems{${1:levels-to-adjust}}"
+    },
+    "noadjustlabelitems{}": {
+      "snippet": "noadjustlabelitems{${1:levels-to-adjust}}"
+    },
+    "typogadjuststairs{}{}{}": {
+      "snippet": "typogadjuststairs{${1:step-size}}{${2:number-of-steps}}{${3:sample}}"
+    },
+    "typogadjuststairs[]{}{}{}": {
+      "snippet": "typogadjuststairs[${4:scale}]{${1:step-size}}{${2:number-of-steps}}{${3:sample}}"
+    },
+    "typoguppercaseadjustcheck{}": {
+      "snippet": "typoguppercaseadjustcheck{${1:sample}}"
+    },
+    "typoguppercaseadjustcheck[]{}": {
+      "snippet": "typoguppercaseadjustcheck[${2:scale}]{${1:sample}}"
+    },
+    "typoglowercaseadjustcheck{}": {
+      "snippet": "typoglowercaseadjustcheck{${1:sample}}"
+    },
+    "typoglowercaseadjustcheck[]{}": {
+      "snippet": "typoglowercaseadjustcheck[${2:scale}]{${1:sample}}"
+    },
     "widespace": {},
     "widespace*": {},
     "narrowspace": {},
@@ -126,6 +156,9 @@
     "smoothraggedrightleftskip": {},
     "smoothraggedrightparindent": {},
     "smoothraggedrightragwidth": {},
+    "typogadjuststairsfor{}{}{}{}{}": {
+      "snippet": "typogadjuststairsfor{${1:scale-factor}}{${2:step-size}}{${3:number-of-steps}}{${4:sample}}{${5:N}}"
+    },
     "typoglogo": {}
   },
   "envs": {
@@ -277,6 +310,7 @@
     "debug",
     "nodebug",
     "ligaturekern=",
+    "lowercaselabelitemadjustments={${1:dim1,dim2,dim3,dim4}}",
     "mathitalicscorrection=",
     "raise*=",
     "raisecapitaldash=",
@@ -289,7 +323,8 @@
     "stretchlimits={${1:lim1,lim2,lim3}}",
     "slashkern=",
     "textitalicscorrection=",
-    "trackingttspacing=${1:outer-spacing}"
+    "trackingttspacing=${1:outer-spacing}",
+    "uppercaselabelitemadjustments={${1:dim1,dim2,dim3,dim4}}"
   ],
   "keyvals": [
     [
diff --git a/dev/packages/ucs.json b/dev/packages/ucs.json
new file mode 100644
index 000000000..666c0964a
--- /dev/null
+++ b/dev/packages/ucs.json
@@ -0,0 +1,276 @@
+{
+  "includes": {
+    "ucshyper": [
+      "hyperref"
+    ],
+    "graphicx": [
+      "graphics"
+    ]
+  },
+  "macros": {
+    "SetUnicodeOption{}": {
+      "snippet": "SetUnicodeOption{${1:option}}"
+    },
+    "SetUnicodeOption[]{}": {
+      "snippet": "SetUnicodeOption[${2:priority}]{${1:option}}"
+    },
+    "ifUnicodeOptioncombine": {},
+    "UnicodeOptioncombinetrue": {},
+    "UnicodeOptioncombinefalse": {},
+    "ifUnicodeOptiondefault": {},
+    "UnicodeOptiondefaulttrue": {},
+    "UnicodeOptiondefaultfalse": {},
+    "ifUnicodeOptiondocument": {},
+    "UnicodeOptiondocumenttrue": {},
+    "UnicodeOptiondocumentfalse": {},
+    "ifUnicodeOptionfasterrors": {},
+    "UnicodeOptionfasterrorstrue": {},
+    "UnicodeOptionfasterrorsfalse": {},
+    "ifUnicodeOptiongraphics": {},
+    "UnicodeOptiongraphicstrue": {},
+    "UnicodeOptiongraphicsfalse": {},
+    "ifUnicodeOptionsavemem": {},
+    "UnicodeOptionsavememtrue": {},
+    "UnicodeOptionsavememfalse": {},
+    "ifUnicodeOptionwarnunknown": {},
+    "UnicodeOptionwarnunknowntrue": {},
+    "UnicodeOptionwarnunknownfalse": {},
+    "ifUnicodeOptionautogenerated": {},
+    "UnicodeOptionautogeneratedtrue": {},
+    "UnicodeOptionautogeneratedfalse": {},
+    "ifUnicodeOptioncjkgb": {},
+    "UnicodeOptioncjkgbtrue": {},
+    "UnicodeOptioncjkgbfalse": {},
+    "ifUnicodeOptioncjkhangul": {},
+    "UnicodeOptioncjkhangultrue": {},
+    "UnicodeOptioncjkhangulfalse": {},
+    "ifUnicodeOptioncjkjis": {},
+    "UnicodeOptioncjkjistrue": {},
+    "UnicodeOptioncjkjisfalse": {},
+    "ifUnicodeOptionmathletters": {},
+    "UnicodeOptionmathletterstrue": {},
+    "UnicodeOptionmathlettersfalse": {},
+    "ifUnicodeOptionpostscript": {},
+    "UnicodeOptionpostscripttrue": {},
+    "UnicodeOptionpostscriptfalse": {},
+    "ifUnicodeOptionprivatecsur": {},
+    "UnicodeOptionprivatecsurtrue": {},
+    "UnicodeOptionprivatecsurfalse": {},
+    "ifUnicodeOptiontipa": {},
+    "UnicodeOptiontipatrue": {},
+    "UnicodeOptiontipafalse": {},
+    "XDeclareUnicodeOption{}{}{}{}{}": {
+      "snippet": "XDeclareUnicodeOption{${1:package}}{${2:name}}{${3:activate}}{${4:on}}{${5:off}}"
+    },
+    "DeclareUnicodeOption{}": {
+      "snippet": "DeclareUnicodeOption{${1:name}}"
+    },
+    "DeclareUnicodeOption[]{}": {
+      "snippet": "DeclareUnicodeOption[${2:package}]{${1:name}}"
+    },
+    "unicodevirtual{}": {
+      "snippet": "unicodevirtual{${1:code}}"
+    },
+    "unicodecombine": {},
+    "PreloadUnicodePage{}": {
+      "snippet": "PreloadUnicodePage{${1:number}}"
+    },
+    "PrerenderUnicode{}": {
+      "snippet": "PrerenderUnicode{${1:code}}"
+    },
+    "DeclareUnicodeCharacter{}{}": {
+      "snippet": "DeclareUnicodeCharacter{${1:slot}}{${2:macro}}"
+    },
+    "DeclareUnicodeCharacterAsOptional{}{}{}": {
+      "snippet": "DeclareUnicodeCharacterAsOptional{${1:slot}}{${2:option}}{${3:macro}}"
+    },
+    "unichar{}": {
+      "snippet": "unichar{${1:slot}}"
+    },
+    "unicodesuper{}": {
+      "snippet": "unicodesuper{${1:text}}"
+    },
+    "PrintUnicodeName{}": {
+      "snippet": "PrintUnicodeName{${1:number}}"
+    },
+    "UnicodeCharFilter{}": {
+      "snippet": "UnicodeCharFilter{${1:command}}"
+    },
+    "UCSProtectionNone": {},
+    "UCSProtectionIeC": {},
+    "UCSProtectionUnichar": {},
+    "textascii{}": {
+      "snippet": "textascii{${1:text}}"
+    },
+    "textasciiencoding": {},
+    "textpentehkaton": {},
+    "textstigmavariant": {},
+    "textqoppavariant": {},
+    "textsanpi": {},
+    "textdialytikaperispomeni{}": {
+      "snippet": "textdialytikaperispomeni{${1:arg}}"
+    },
+    "textdialytikatonos{}": {
+      "snippet": "textdialytikatonos{${1:arg}}"
+    },
+    "textdialytikaoxia{}": {
+      "snippet": "textdialytikaoxia{${1:arg}}"
+    },
+    "textdialytikavaria{}": {
+      "snippet": "textdialytikavaria{${1:arg}}"
+    },
+    "textoxia{}": {
+      "snippet": "textoxia{${1:arg}}"
+    },
+    "textparenleft": {},
+    "textparenright": {},
+    "textdasia{}": {
+      "snippet": "textdasia{${1:arg}}"
+    },
+    "textpsili{}": {
+      "snippet": "textpsili{${1:arg}}"
+    },
+    "textquestion": {},
+    "textdasiaperispomeni{}": {
+      "snippet": "textdasiaperispomeni{${1:arg}}"
+    },
+    "textdasiavaria{}": {
+      "snippet": "textdasiavaria{${1:arg}}"
+    },
+    "textdasiaoxia{}": {
+      "snippet": "textdasiaoxia{${1:arg}}"
+    },
+    "textpsiliperispomeni{}": {
+      "snippet": "textpsiliperispomeni{${1:arg}}"
+    },
+    "textpsilioxia{}": {
+      "snippet": "textpsilioxia{${1:arg}}"
+    },
+    "textpsilivaria{}": {
+      "snippet": "textpsilivaria{${1:arg}}"
+    },
+    "textsubiota{}": {
+      "snippet": "textsubiota{${1:arg}}"
+    },
+    "textpsiliiota{}": {
+      "snippet": "textpsiliiota{${1:arg}}"
+    },
+    "textdasiaiota{}": {
+      "snippet": "textdasiaiota{${1:arg}}"
+    },
+    "textvariaiota{}": {
+      "snippet": "textvariaiota{${1:arg}}"
+    },
+    "textoxiaiota{}": {
+      "snippet": "textoxiaiota{${1:arg}}"
+    },
+    "textpsilivariaiota{}": {
+      "snippet": "textpsilivariaiota{${1:arg}}"
+    },
+    "textdasiavariaiota{}": {
+      "snippet": "textdasiavariaiota{${1:arg}}"
+    },
+    "textpsilioxiaiota{}": {
+      "snippet": "textpsilioxiaiota{${1:arg}}"
+    },
+    "textdasiaoxiaiota{}": {
+      "snippet": "textdasiaoxiaiota{${1:arg}}"
+    },
+    "textperispomeniiota{}": {
+      "snippet": "textperispomeniiota{${1:arg}}"
+    },
+    "textpsiliperispomeniiota{}": {
+      "snippet": "textpsiliperispomeniiota{${1:arg}}"
+    },
+    "textdasiaperispomeniiota{}": {
+      "snippet": "textdasiaperispomeniiota{${1:arg}}"
+    },
+    "texthbar": {},
+    "textHbar": {},
+    "textbhook": {},
+    "textBhook": {},
+    "textdhook": {},
+    "textDhook": {},
+    "texteopen": {},
+    "textEopen": {},
+    "textschwa": {},
+    "texteturned": {},
+    "textEreversed": {},
+    "textGammaafrican": {},
+    "textgammalatinsmall": {},
+    "textKhook": {},
+    "textkhook": {},
+    "textDafrican": {},
+    "textdtail": {},
+    "textTretroflexhook": {},
+    "texttretroflexhook": {},
+    "textOopen": {},
+    "textoopen": {},
+    "textIotaafrican": {},
+    "textiotalatin": {},
+    "textFhook": {},
+    "textYhook": {},
+    "textyhook": {},
+    "textEsh": {},
+    "textesh": {},
+    "textThook": {},
+    "textthook": {},
+    "textEzh": {},
+    "textezh": {},
+    "textChook": {},
+    "textchook": {},
+    "textTbar": {},
+    "texttbar": {},
+    "textVhook": {},
+    "textvhook": {},
+    "textPhook": {},
+    "textphook": {},
+    "textNhookleft": {},
+    "textnhookleft": {},
+    "texttesh": {},
+    "textdblgravecmb{}": {
+      "snippet": "textdblgravecmb{${1:arg}}"
+    },
+    "LinkUnicodeOptionToPkg{}{}": {
+      "snippet": "LinkUnicodeOptionToPkg{${1:option}}{${2:package}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "combine",
+    "nocombine",
+    "default",
+    "nodefault",
+    "document",
+    "nodocument",
+    "fasterrors",
+    "nofasterrors",
+    "graphics",
+    "nographics",
+    "savemem",
+    "nosavemem",
+    "warnunknown",
+    "nowarnunknown",
+    "autogenerated",
+    "noautogenerated",
+    "cjkbg5",
+    "nocjkbg5",
+    "cjkgb",
+    "nocjkgb",
+    "cjkhangul",
+    "nocjkhangul",
+    "cjkjis",
+    "nocjkjis",
+    "mathletters",
+    "nomathletters",
+    "postscript",
+    "nopostscript",
+    "privatecsur",
+    "noprivatecsur",
+    "tipa",
+    "notipa",
+    "showmagickern",
+    "hyperref"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/ucshyper.json b/dev/packages/ucshyper.json
new file mode 100644
index 000000000..21cb3154f
--- /dev/null
+++ b/dev/packages/ucshyper.json
@@ -0,0 +1,21 @@
+{
+  "includes": {
+    "hyperref": []
+  },
+  "macros": {
+    "UCSPU{}": {
+      "snippet": "UCSPU{${1:number}}"
+    },
+    "UCSPUrange{}{}": {
+      "snippet": "UCSPUrange{${1:num1}}{${2:num2}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "nodirect",
+    "direct",
+    "noprerender",
+    "prerender"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/uni.json b/dev/packages/uni.json
new file mode 100644
index 000000000..c5451ddff
--- /dev/null
+++ b/dev/packages/uni.json
@@ -0,0 +1,111 @@
+{
+  "includes": {},
+  "macros": {
+    "textuni{}": {
+      "snippet": "textuni{${1:text}}"
+    },
+    "uni": {},
+    "textunirm{}": {
+      "snippet": "textunirm{${1:text}}"
+    },
+    "unirm": {},
+    "textunisl{}": {
+      "snippet": "textunisl{${1:text}}"
+    },
+    "unisl": {},
+    "textunisc{}": {
+      "snippet": "textunisc{${1:text}}"
+    },
+    "unisc": {},
+    "textunist{}": {
+      "snippet": "textunist{${1:text}}"
+    },
+    "unist": {},
+    "textunibf{}": {
+      "snippet": "textunibf{${1:text}}"
+    },
+    "unibf": {},
+    "textunibsl{}": {
+      "snippet": "textunibsl{${1:text}}"
+    },
+    "unibsl": {},
+    "textunibsc{}": {
+      "snippet": "textunibsc{${1:text}}"
+    },
+    "unibsc": {},
+    "textunibst{}": {
+      "snippet": "textunibst{${1:text}}"
+    },
+    "unibst": {},
+    "bausquare": {},
+    "baucircle": {},
+    "bautriangle": {},
+    "bauhead": {},
+    "bauforms": {},
+    "dh": {},
+    "dj": {},
+    "ng": {},
+    "th": {},
+    "varQ": {},
+    "DH": {},
+    "DJ": {},
+    "NG": {},
+    "TH": {},
+    "guilsinglleft": {},
+    "guilsinglright": {},
+    "guillemoleft": {},
+    "guillemoright": {},
+    "quotesinglbase": {},
+    "quotedblbase": {},
+    "textogonek": {},
+    "textcmr{}": {
+      "snippet": "textcmr{${1:text}}",
+      "option": "default"
+    },
+    "cmr": {
+      "option": "default"
+    },
+    "cmrdefault": {
+      "option": "default"
+    },
+    "cmrenc": {
+      "option": "default"
+    },
+    "cmrfamily": {
+      "option": "default"
+    },
+    "unifamily": {},
+    "unifamilydefault": {},
+    "uniseries": {},
+    "uniseriesdefault": {},
+    "unishape": {},
+    "unishapedefault": {},
+    "stshape": {},
+    "stdefault": {},
+    "k{}": {
+      "snippet": "k{${1:arg}}"
+    },
+    "DeclareUniChar{}{}": {
+      "snippet": "DeclareUniChar{${1:command}}{${2:slot}}"
+    },
+    "DeclareUniCommand{}{}": {
+      "snippet": "DeclareUniCommand{${1:command}}{${2:definition}}"
+    },
+    "DeclareUniCommand{}[]{}": {
+      "snippet": "DeclareUniCommand{${1:command}}[${2:args}]{${3:definition}}"
+    },
+    "UniError{}": {
+      "snippet": "UniError{${1:message}}"
+    },
+    "unifiledate": {},
+    "unifileversion": {}
+  },
+  "envs": {},
+  "options": [
+    "strict",
+    "default",
+    "medium",
+    "bold"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/units.json b/dev/packages/units.json
new file mode 100644
index 000000000..b8b99c399
--- /dev/null
+++ b/dev/packages/units.json
@@ -0,0 +1,28 @@
+{
+  "includes": {
+    "ifthen": [],
+    "nicefrac": []
+  },
+  "macros": {
+    "unit[]{}": {
+      "snippet": "unit[${2:value}]{${1:dimension}}"
+    },
+    "unit{}": {
+      "snippet": "unit{${1:dimension}}"
+    },
+    "unitfrac[]{}{}": {
+      "snippet": "unitfrac[${3:value}]{${1:num}}{${2:den}}"
+    },
+    "unitfrac{}{}": {
+      "snippet": "unitfrac{${1:num}}{${2:den}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "tight",
+    "loose",
+    "nice",
+    "ugly"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/upmethodology-document.json b/dev/packages/upmethodology-document.json
new file mode 100644
index 000000000..07fcb006c
--- /dev/null
+++ b/dev/packages/upmethodology-document.json
@@ -0,0 +1,699 @@
+{
+  "includes": {
+    "upmethodology-p-common": [],
+    "babel": [],
+    "vmargin": [],
+    "upmethodology-extension": [],
+    "upmethodology-fmt": [],
+    "upmethodology-version": [],
+    "draftwatermark": []
+  },
+  "macros": {
+    "listendskip": {},
+    "declaredocument{}{}{}": {
+      "snippet": "declaredocument{${1:project}}{${2:name}}{${3:ref}}"
+    },
+    "declaredocumentex{}{}{}{}": {
+      "snippet": "declaredocumentex{${1:project}}{${2:subproject}}{${3:name}}{${4:ref}}"
+    },
+    "upmdocumentsummary": {},
+    "upmdocumentsummary[]": {
+      "snippet": "upmdocumentsummary[${1:width}]"
+    },
+    "upmdocinfopage": {},
+    "upmpublicationpage": {},
+    "upmpublicationminipage": {},
+    "theupmproject": {},
+    "theupmsubproject": {},
+    "theupmdocname": {},
+    "theupmdocref": {},
+    "theupmsmalldoclogo": {},
+    "theupmdoclogo": {},
+    "defupmsmalllogo{}": {
+      "snippet": "defupmsmalllogo{${1:imagefile}}"
+    },
+    "defupmlogo{}": {
+      "snippet": "defupmlogo{${1:imagefile}}"
+    },
+    "theupmfulldocname": {},
+    "setdocabstract{}": {
+      "snippet": "setdocabstract{${1:text}}"
+    },
+    "setdocabstract[]{}": {
+      "snippet": "setdocabstract[${2:language}]{${1:text}}"
+    },
+    "setdockeywords{}": {
+      "snippet": "setdockeywords{${1:keywords}}"
+    },
+    "setdockeywords[]{}": {
+      "snippet": "setdockeywords[${2:language}]{${1:keywords}}"
+    },
+    "theupmdocabstract": {},
+    "theupmdockeywords": {},
+    "theauthorlist": {},
+    "ifdocumentauthor{}{}{}": {
+      "snippet": "ifdocumentauthor{${1:name}}{${2:true}}{${3:false}}"
+    },
+    "addauthor{}{}": {
+      "snippet": "addauthor{${1:first name}}{${2:name}}"
+    },
+    "addauthor[]{}{}": {
+      "snippet": "addauthor[${3:email}]{${1:first name}}{${2:name}}"
+    },
+    "addauthor*{}{}{}": {
+      "snippet": "addauthor*{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "addauthor*[]{}{}{}": {
+      "snippet": "addauthor*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "upmdocumentauthors": {},
+    "upmdocumentauthors[]": {
+      "snippet": "upmdocumentauthors[${1:width}]"
+    },
+    "thevalidatorlist": {},
+    "addvalidator{}{}": {
+      "snippet": "addvalidator{${1:first name}}{${2:name}}"
+    },
+    "addvalidator[]{}{}": {
+      "snippet": "addvalidator[${3:email}]{${1:first name}}{${2:name}}"
+    },
+    "addvalidator*{}{}{}": {
+      "snippet": "addvalidator*{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "addvalidator*[]{}{}{}": {
+      "snippet": "addvalidator*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "upmdocumentvalidators": {},
+    "upmdocumentvalidators[]": {
+      "snippet": "upmdocumentvalidators[${1:width}]"
+    },
+    "addauthorvalidator{}{}": {
+      "snippet": "addauthorvalidator{${1:first name}}{${2:name}}"
+    },
+    "addauthorvalidator[]{}{}": {
+      "snippet": "addauthorvalidator[${3:email}]{${1:first name}}{${2:name}}"
+    },
+    "addauthorvalidator*{}{}{}": {
+      "snippet": "addauthorvalidator*{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "addauthorvalidator*[]{}{}{}": {
+      "snippet": "addauthorvalidator*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "theinformedlist": {},
+    "addinformed{}{}": {
+      "snippet": "addinformed{${1:first name}}{${2:name}}"
+    },
+    "addinformed[]{}{}": {
+      "snippet": "addinformed[${3:email}]{${1:first name}}{${2:name}}"
+    },
+    "addinformed*{}{}{}": {
+      "snippet": "addinformed*{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "addinformed*[]{}{}{}": {
+      "snippet": "addinformed*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
+    },
+    "upmdocumentinformedpeople": {},
+    "upmdocumentinformedpeople[]": {
+      "snippet": "upmdocumentinformedpeople[${1:width}]"
+    },
+    "theupmcopyrighter": {},
+    "theupmpublisher": {},
+    "theupmprintedin": {},
+    "theupmisbn": {},
+    "theupmissn": {},
+    "theupmdoi": {},
+    "theupmpublishingdate": {},
+    "theupmformattedpublisher": {},
+    "theupmformattedcopyrighter": {},
+    "setdocumentpurpose{}": {
+      "snippet": "setdocumentpurpose{${1:text}}"
+    },
+    "setpublisher{}": {
+      "snippet": "setpublisher{${1:name}}"
+    },
+    "setcopyrighter{}": {
+      "snippet": "setcopyrighter{${1:name}}"
+    },
+    "setprintingaddress{}": {
+      "snippet": "setprintingaddress{${1:address}}"
+    },
+    "setisbn{}": {
+      "snippet": "setisbn{${1:ISBN}}"
+    },
+    "setissn{}": {
+      "snippet": "setissn{${1:ISSN}}"
+    },
+    "setdoi{}": {
+      "snippet": "setdoi{${1:DOI}}"
+    },
+    "captionsenglish": {},
+    "dateenglish": {},
+    "extrasenglish": {},
+    "noextrasenglish": {},
+    "englishhyphenmins": {},
+    "britishhyphenmins": {},
+    "americanhyphenmins": {},
+    "prefacename": {
+      "option": "francais"
+    },
+    "bibname": {
+      "option": "francais"
+    },
+    "chaptername": {
+      "option": "francais"
+    },
+    "enclname": {
+      "option": "francais"
+    },
+    "ccname": {
+      "option": "francais"
+    },
+    "headtoname": {
+      "option": "francais"
+    },
+    "seename": {
+      "option": "francais"
+    },
+    "alsoname": {
+      "option": "francais"
+    },
+    "proofname": {
+      "option": "francais"
+    },
+    "glossaryname": {
+      "option": "francais"
+    },
+    "frenchsetup{}": {
+      "snippet": "frenchsetup{${1:options}}",
+      "option": "francais",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "frenchbsetup{}": {
+      "snippet": "frenchbsetup{${1:options}}",
+      "option": "francais",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "AddThinSpaceBeforeFootnotes": {
+      "option": "francais"
+    },
+    "at": {
+      "option": "francais"
+    },
+    "AutoSpaceBeforeFDP": {
+      "option": "francais"
+    },
+    "boi": {
+      "option": "francais"
+    },
+    "bsc{}": {
+      "snippet": "bsc{${1:text}}",
+      "option": "francais"
+    },
+    "CaptionSeparator": {
+      "option": "francais"
+    },
+    "captionsfrench": {
+      "option": "francais"
+    },
+    "circonflexe": {
+      "option": "francais"
+    },
+    "dateacadian": {
+      "option": "francais"
+    },
+    "datefrench": {
+      "option": "francais"
+    },
+    "DecimalMathComma": {
+      "option": "francais"
+    },
+    "degre": {
+      "option": "francais"
+    },
+    "degres": {
+      "option": "francais"
+    },
+    "descindentFB": {
+      "option": "francais"
+    },
+    "dotFFN": {
+      "option": "francais"
+    },
+    "extrasfrench": {
+      "option": "francais"
+    },
+    "FBcolonspace": {
+      "option": "francais"
+    },
+    "FBdatebox": {
+      "option": "francais"
+    },
+    "FBdatespace": {
+      "option": "francais"
+    },
+    "FBeverylineguill": {
+      "option": "francais"
+    },
+    "FBfigtabshape": {
+      "option": "francais"
+    },
+    "FBfnindent": {
+      "option": "francais"
+    },
+    "FBFrenchFootnotesfalse": {
+      "option": "francais"
+    },
+    "FBFrenchFootnotestrue": {
+      "option": "francais"
+    },
+    "FBFrenchSuperscriptstrue": {
+      "option": "francais"
+    },
+    "FBGlobalLayoutFrenchtrue": {
+      "option": "francais"
+    },
+    "FBgspchar": {
+      "option": "francais"
+    },
+    "FBguillopen": {
+      "option": "francais"
+    },
+    "FBguillspace": {
+      "option": "francais"
+    },
+    "FBInnerGuillSinglefalse": {
+      "option": "francais"
+    },
+    "FBInnerGuillSingletrue": {
+      "option": "francais"
+    },
+    "FBListItemsAsParfalse": {
+      "option": "francais"
+    },
+    "FBListItemsAsPartrue": {
+      "option": "francais"
+    },
+    "FBLowercaseSuperscriptstrue": {
+      "option": "francais"
+    },
+    "FBmedkern": {
+      "option": "francais"
+    },
+    "FBPartNameFulltrue": {
+      "option": "francais"
+    },
+    "FBsetspaces[]{}{}{}{}": {
+      "snippet": "FBsetspaces[${5:language}]{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
+      "option": "francais"
+    },
+    "FBsetspaces{}{}{}{}": {
+      "snippet": "FBsetspaces{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
+      "option": "francais"
+    },
+    "FBSmallCapsFigTabCaptionstrue": {
+      "option": "francais"
+    },
+    "FBStandardEnumerateEnvtrue": {
+      "option": "francais"
+    },
+    "FBStandardItemizeEnvtrue": {
+      "option": "francais"
+    },
+    "FBStandardItemLabelstrue": {
+      "option": "francais"
+    },
+    "FBStandardLayouttrue": {
+      "option": "francais"
+    },
+    "FBStandardListSpacingtrue": {
+      "option": "francais"
+    },
+    "FBStandardListstrue": {
+      "option": "francais"
+    },
+    "FBsupR": {
+      "option": "francais"
+    },
+    "FBsupS": {
+      "option": "francais"
+    },
+    "FBtextellipsis": {
+      "option": "francais"
+    },
+    "FBthickkern": {
+      "option": "francais"
+    },
+    "FBthinspace": {
+      "option": "francais"
+    },
+    "FBthousandsep": {
+      "option": "francais"
+    },
+    "FBWarning{}": {
+      "snippet": "FBWarning{${1:message}}",
+      "option": "francais"
+    },
+    "fg": {
+      "option": "francais"
+    },
+    "fgi": {
+      "option": "francais"
+    },
+    "fgii": {
+      "option": "francais"
+    },
+    "fprimo)": {
+      "option": "francais"
+    },
+    "frenchdate{}{}{}": {
+      "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
+      "option": "francais"
+    },
+    "FrenchEnumerate{}": {
+      "snippet": "FrenchEnumerate{${1:arg}}",
+      "option": "francais"
+    },
+    "FrenchFootnotes": {
+      "option": "francais"
+    },
+    "FrenchLabelItem": {
+      "option": "francais"
+    },
+    "frenchpartfirst": {
+      "option": "francais"
+    },
+    "frenchpartsecond": {
+      "option": "francais"
+    },
+    "FrenchPopularEnumerate{}": {
+      "snippet": "FrenchPopularEnumerate{${1:arg}}",
+      "option": "francais"
+    },
+    "frenchtoday": {
+      "option": "francais"
+    },
+    "Frlabelitemi": {
+      "option": "francais"
+    },
+    "Frlabelitemii": {
+      "option": "francais"
+    },
+    "Frlabelitemiii": {
+      "option": "francais"
+    },
+    "Frlabelitemiv": {
+      "option": "francais"
+    },
+    "frquote{}": {
+      "snippet": "frquote{${1:text}}",
+      "option": "francais"
+    },
+    "fup{}": {
+      "snippet": "fup{${1:text}}",
+      "option": "francais"
+    },
+    "ieme": {
+      "option": "francais"
+    },
+    "iemes": {
+      "option": "francais"
+    },
+    "ier": {
+      "option": "francais"
+    },
+    "iere": {
+      "option": "francais"
+    },
+    "ieres": {
+      "option": "francais"
+    },
+    "iers": {
+      "option": "francais"
+    },
+    "ifFBAutoSpaceFootnotes": {
+      "option": "francais"
+    },
+    "ifFBCompactItemize": {
+      "option": "francais"
+    },
+    "ifFBCustomiseFigTabCaptions": {
+      "option": "francais"
+    },
+    "ifFBfrench": {
+      "option": "francais"
+    },
+    "ifFBFrenchFootnotes": {
+      "option": "francais"
+    },
+    "ifFBFrenchSuperscripts": {
+      "option": "francais"
+    },
+    "ifFBGlobalLayoutFrench": {
+      "option": "francais"
+    },
+    "ifFBIndentFirst": {
+      "option": "francais"
+    },
+    "ifFBINGuillSpace": {
+      "option": "francais"
+    },
+    "ifFBListItemsAsPar": {
+      "option": "francais"
+    },
+    "ifFBListOldLayout": {
+      "option": "francais"
+    },
+    "ifFBLowercaseSuperscripts": {
+      "option": "francais"
+    },
+    "ifFBLuaTeX": {
+      "option": "francais"
+    },
+    "ifFBOldFigTabCaptions": {
+      "option": "francais"
+    },
+    "ifFBOriginalTypewriter": {
+      "option": "francais"
+    },
+    "ifFBPartNameFull": {
+      "option": "francais"
+    },
+    "ifFBReduceListSpacing": {
+      "option": "francais"
+    },
+    "ifFBShowOptions": {
+      "option": "francais"
+    },
+    "ifFBSmallCapsFigTabCaptions": {
+      "option": "francais"
+    },
+    "ifFBStandardEnumerateEnv": {
+      "option": "francais"
+    },
+    "ifFBStandardItemizeEnv": {
+      "option": "francais"
+    },
+    "ifFBStandardItemLabels": {
+      "option": "francais"
+    },
+    "ifFBStandardLayout": {
+      "option": "francais"
+    },
+    "ifFBStandardLists": {
+      "option": "francais"
+    },
+    "ifFBStandardListSpacing": {
+      "option": "francais"
+    },
+    "ifFBSuppressWarning": {
+      "option": "francais"
+    },
+    "ifFBThinColonSpace": {
+      "option": "francais"
+    },
+    "ifFBThinSpaceInFrenchNumbers": {
+      "option": "francais"
+    },
+    "ifFBunicode": {
+      "option": "francais"
+    },
+    "ifFBXeTeX": {
+      "option": "francais"
+    },
+    "ifLaTeXe": {
+      "option": "francais"
+    },
+    "kernFFN": {
+      "option": "francais"
+    },
+    "labelindentFB": {
+      "option": "francais"
+    },
+    "labelwidthFB": {
+      "option": "francais"
+    },
+    "leftmarginFB": {
+      "option": "francais"
+    },
+    "listfigurename": {
+      "option": "francais"
+    },
+    "listindentFB": {
+      "option": "francais"
+    },
+    "No": {
+      "option": "francais"
+    },
+    "no": {
+      "option": "francais"
+    },
+    "NoAutoSpaceBeforeFDP": {
+      "option": "francais"
+    },
+    "NoAutoSpacing": {
+      "option": "francais"
+    },
+    "NoEveryParQuote": {
+      "option": "francais"
+    },
+    "noextrasfrench": {
+      "option": "francais"
+    },
+    "nombre{}": {
+      "snippet": "nombre{${1:arg}}",
+      "option": "francais"
+    },
+    "nos": {
+      "option": "francais"
+    },
+    "Nos": {
+      "option": "francais"
+    },
+    "og": {
+      "option": "francais"
+    },
+    "ogi": {
+      "option": "francais"
+    },
+    "ogii": {
+      "option": "francais"
+    },
+    "parindentFFN": {
+      "option": "francais"
+    },
+    "partfirst": {
+      "option": "francais"
+    },
+    "partnameord": {
+      "option": "francais"
+    },
+    "partsecond": {
+      "option": "francais"
+    },
+    "primo": {
+      "option": "francais"
+    },
+    "quarto": {
+      "option": "francais"
+    },
+    "rmfamilyFB": {
+      "option": "francais"
+    },
+    "secundo": {
+      "option": "francais"
+    },
+    "sffamilyFB": {
+      "option": "francais"
+    },
+    "StandardFootnotes": {
+      "option": "francais"
+    },
+    "StandardMathComma": {
+      "option": "francais"
+    },
+    "tertio": {
+      "option": "francais"
+    },
+    "tild": {
+      "option": "francais"
+    },
+    "ttfamilyFB": {
+      "option": "francais"
+    },
+    "up{}": {
+      "snippet": "up{${1:text}}",
+      "option": "francais"
+    },
+    "xspace": {
+      "option": "francais"
+    }
+  },
+  "envs": {
+    "descriptionFB": {
+      "option": "francais"
+    },
+    "enumerateFB": {
+      "option": "francais"
+    },
+    "itemizeFB": {
+      "option": "francais"
+    },
+    "listFB{}": {
+      "name": "listFB",
+      "snippet": "{${1:symbol}}",
+      "option": "francais"
+    },
+    "listORI{}": {
+      "name": "listORI",
+      "snippet": "{${1:symbol}}",
+      "option": "francais"
+    }
+  },
+  "options": [
+    "french",
+    "francais",
+    "english"
+  ],
+  "keyvals": [
+    [
+      "ShowOptions",
+      "StandardLayout",
+      "GlobalLayoutFrench",
+      "IndentFirst",
+      "PartNameFull",
+      "ListItemsAsPar",
+      "StandardListSpacing",
+      "StandardItemizeEnv",
+      "StandardEnumerateEnv",
+      "StandardItemLabels",
+      "ItemLabels=",
+      "ItemLabeli=",
+      "ItemLabelii=",
+      "ItemLabeliii=",
+      "ItemLabeliv=",
+      "StandardLists",
+      "ListOldLayout",
+      "FrenchFootnotes",
+      "AutoSpaceFootnotes",
+      "AutoSpacePunctuation",
+      "ThinColonSpace",
+      "OriginalTypewriter",
+      "UnicodeNoBreakSpaces",
+      "og=",
+      "fg=",
+      "INGuillSpace",
+      "EveryParGuill=",
+      "EveryLineGuill=",
+      "InnerGuillSingle",
+      "ThinSpaceInFrenchNumbers",
+      "SmallCapsFigTabCaptions",
+      "CustomiseFigTabCaptions",
+      "OldFigTabCaptions",
+      "FrenchSuperscripts",
+      "LowercaseSuperscripts",
+      "SuppressWarning"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/upmethodology-extension.json b/dev/packages/upmethodology-extension.json
index 32a1b5f4c..4d839af75 100644
--- a/dev/packages/upmethodology-extension.json
+++ b/dev/packages/upmethodology-extension.json
@@ -45,6 +45,9 @@
     "DeclareCopyright[]{}{}{}{}": {
       "snippet": "DeclareCopyright[${5:language}]{${1:extname}}{${2:year}}{${3:copyrighter}}{${4:text}}"
     },
+    "Put(){}": {
+      "snippet": "Put(${2:x},${3:y}){${1:stuff}}"
+    },
     "UseExtension{}": {
       "snippet": "UseExtension{${1:extname}}"
     }
diff --git a/dev/packages/uptex.json b/dev/packages/uptex.json
new file mode 100644
index 000000000..985bf79ad
--- /dev/null
+++ b/dev/packages/uptex.json
@@ -0,0 +1,21 @@
+{
+  "includes": {
+    "ptex": []
+  },
+  "macros": {
+    "disablecjktoken": {},
+    "enablecjktoken": {},
+    "forcecjktoken": {},
+    "kchar": {},
+    "kchardef": {},
+    "kchardef{}": {
+      "snippet": "kchardef{${1:cmd}}"
+    },
+    "uptexrevision": {},
+    "uptexversion": {},
+    "currentcjktoken": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/uri.json b/dev/packages/uri.json
new file mode 100644
index 000000000..e0bbc37a0
--- /dev/null
+++ b/dev/packages/uri.json
@@ -0,0 +1,97 @@
+{
+  "includes": {
+    "kvoptions": [],
+    "url": []
+  },
+  "macros": {
+    "urisetup{}": {
+      "snippet": "urisetup{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "uref{}{}": {
+      "snippet": "uref{${1:URL}}{${2:link text}}"
+    },
+    "arxiv{}": {
+      "snippet": "arxiv{${1:arXiv path}}"
+    },
+    "asin{}": {
+      "snippet": "asin{${1:Amazon number}}"
+    },
+    "doi{}": {
+      "snippet": "doi{${1:DOI number}}"
+    },
+    "hdl{}": {
+      "snippet": "hdl{${1:handle.net path}}"
+    },
+    "nbn{}": {
+      "snippet": "nbn{${1:NBN spec}}"
+    },
+    "oclc{}": {
+      "snippet": "oclc{${1:WorldCat number}}"
+    },
+    "oid{}": {
+      "snippet": "oid{${1:OID number}}"
+    },
+    "pubmed{}": {
+      "snippet": "pubmed{${1:PubMed number}}"
+    },
+    "tinyuri{}": {
+      "snippet": "tinyuri{${1:TinyURL path}}"
+    },
+    "tinypuri{}": {
+      "snippet": "tinypuri{${1:TinyURL path}}"
+    },
+    "wc{}": {
+      "snippet": "wc{${1:WebCite path}}"
+    },
+    "citeurl{}": {
+      "snippet": "citeurl{${1:URL}}"
+    },
+    "mailto{}": {
+      "snippet": "mailto{${1:address}}"
+    },
+    "mailto[]{}": {
+      "snippet": "mailto[${2:subject}]{${1:address}}"
+    },
+    "ukoeln{}": {
+      "snippet": "ukoeln{${1:UKoeln address}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": [
+    [
+      "arxivpre={%|}",
+      "arxivpost={%|}",
+      "asinpre={%|}",
+      "asinpost={%|}",
+      "doipre={%|}",
+      "doipost={%|}",
+      "hdlpre={%|}",
+      "hdlpost={%|}",
+      "nbnpre={%|}",
+      "nbnpost={%|}",
+      "oclcpre={%|}",
+      "oclcpost={%|}",
+      "oidpre={%|}",
+      "oidpost={%|}",
+      "pubmedpre={%|}",
+      "pubmedpost={%|}",
+      "tinyuripre={%|}",
+      "tinyuripost={%|}",
+      "tinypuripre={%|}",
+      "tinypuripost={%|}",
+      "wcpre={%|}",
+      "wcpost={%|}",
+      "xmpppre={%|}",
+      "xmpppost={%|}",
+      "citeurlpre={%|}",
+      "citeurlpost={%|}",
+      "mailtopre={%|}",
+      "mailtopost={%|}",
+      "ukoelnpre={%|}",
+      "ukoelnpost={%|}"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/url.json b/dev/packages/url.json
new file mode 100644
index 000000000..35d88459d
--- /dev/null
+++ b/dev/packages/url.json
@@ -0,0 +1,41 @@
+{
+  "includes": {},
+  "macros": {
+    "url{}": {
+      "snippet": "url{${1:URL}}"
+    },
+    "path{}": {
+      "snippet": "path{${1:URL}}"
+    },
+    "urldef{}": {
+      "snippet": "urldef{${1:cmd}}"
+    },
+    "DeclareUrlCommand{}{}": {
+      "snippet": "DeclareUrlCommand{${1:cmd}}{${2:definition}}"
+    },
+    "urlstyle{}": {
+      "snippet": "urlstyle{${1:style}}"
+    },
+    "UrlBreaks": {},
+    "UrlBigBreaks": {},
+    "UrlNoBreaks": {},
+    "UrlOrds": {},
+    "UrlSpecials": {},
+    "UrlTildeSpecial": {},
+    "UrlFont": {},
+    "UrlLeft": {},
+    "UrlRight": {},
+    "Urlmuskip": {},
+    "UrlBreakPenalty": {},
+    "UrlBigBreakPenalty": {}
+  },
+  "envs": {},
+  "options": [
+    "obeyspaces",
+    "hyphens",
+    "spaces",
+    "lowtilde",
+    "allowmove"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/va.json b/dev/packages/va.json
new file mode 100644
index 000000000..3f1d8455f
--- /dev/null
+++ b/dev/packages/va.json
@@ -0,0 +1,21 @@
+{
+  "includes": {},
+  "macros": {
+    "va": {},
+    "textva{}": {
+      "snippet": "textva{${1:text}}"
+    },
+    "vacal": {},
+    "textvacal{}": {
+      "snippet": "textvacal{${1:text}}"
+    },
+    "filename": {},
+    "fileversion": {},
+    "filedate": {},
+    "docversion": {},
+    "docdate": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/varioref.json b/dev/packages/varioref.json
new file mode 100644
index 000000000..cd710e686
--- /dev/null
+++ b/dev/packages/varioref.json
@@ -0,0 +1,151 @@
+{
+  "includes": {},
+  "macros": {
+    "vref{}": {
+      "snippet": "vref{${1:label}}"
+    },
+    "vref*{}": {
+      "snippet": "vref*{${1:label}}"
+    },
+    "vpageref{}": {
+      "snippet": "vpageref{${1:label}}"
+    },
+    "vpageref*{}": {
+      "snippet": "vpageref*{${1:label}}"
+    },
+    "vpageref[]{}": {
+      "snippet": "vpageref[${2:samepage}]{${1:label}}"
+    },
+    "vpageref*[]{}": {
+      "snippet": "vpageref*[${2:samepage}]{${1:label}}"
+    },
+    "vpageref[][]{}": {
+      "snippet": "vpageref[${2:samepage}][${3:otherpage}]{${1:label}}"
+    },
+    "vpageref*[][]{}": {
+      "snippet": "vpageref*[${2:samepage}][${3:otherpage}]{${1:label}}"
+    },
+    "vrefrange{}{}": {
+      "snippet": "vrefrange{${1:fromlabel}}{${2:tolabel}}"
+    },
+    "vrefrange[]{}{}": {
+      "snippet": "vrefrange[${3:same page text}]{${1:fromlabel}}{${2:tolabel}}"
+    },
+    "vpagerefrange{}{}": {
+      "snippet": "vpagerefrange{${1:fromlabel}}{${2:tolabel}}"
+    },
+    "vpagerefrange*{}{}": {
+      "snippet": "vpagerefrange*{${1:fromlabel}}{${2:tolabel}}"
+    },
+    "vpagerefrange[]{}{}": {
+      "snippet": "vpagerefrange[${3:same page text}]{${1:fromlabel}}{${2:tolabel}}"
+    },
+    "vpagerefrange*[]{}{}": {
+      "snippet": "vpagerefrange*[${3:same page text}]{${1:fromlabel}}{${2:tolabel}}"
+    },
+    "vrefpagenum{}{}": {
+      "snippet": "vrefpagenum{${1:cmd}}{${2:label}}"
+    },
+    "vpagerefcompare{}{}{}{}": {
+      "snippet": "vpagerefcompare{${1:label1}}{${2:label2}}{${3:true}}{${4:false}}"
+    },
+    "vpagerefnearby{}{}{}": {
+      "snippet": "vpagerefnearby{${1:label}}{${2:true}}{${3:false}}"
+    },
+    "labelformat{}{}": {
+      "snippet": "labelformat{${1:counter}}{${2:argument}}"
+    },
+    "Vref{}": {
+      "snippet": "Vref{${1:label}}"
+    },
+    "Vref*{}": {
+      "snippet": "Vref*{${1:label}}"
+    },
+    "Ref{}": {
+      "snippet": "Ref{${1:label}}"
+    },
+    "thevpagerefnum": {},
+    "reftextbefore": {},
+    "reftextfacebefore": {},
+    "reftextafter": {},
+    "reftextfaceafter": {},
+    "reftextcurrent": {},
+    "reftextfaraway{}": {
+      "snippet": "reftextfaraway{${1:label}}"
+    },
+    "reftextvario{}{}": {
+      "snippet": "reftextvario{${1:text1}}{${2:text2}}"
+    },
+    "reftextpagerange{}{}": {
+      "snippet": "reftextpagerange{${1:label1}}{${2:label2}}"
+    },
+    "reftextlabelrange{}{}": {
+      "snippet": "reftextlabelrange{${1:label1}}{${2:label2}}"
+    },
+    "vrefformat": {},
+    "Vrefformat": {},
+    "vrefrangeformat": {},
+    "fullrefformat": {},
+    "vrefdefaultformat": {},
+    "Vrefdefaultformat": {},
+    "vrefrangedefaultformat": {},
+    "fullrefdefaultformat": {},
+    "vrefwarning": {},
+    "vrefshowerrors": {},
+    "fullref{}": {
+      "snippet": "fullref{${1:label}}"
+    },
+    "vpagerefcomparenearby{}{}{}{}": {
+      "snippet": "vpagerefcomparenearby{${1:label1}}{${2:label2}}{${3:true}}{${4:false}}"
+    }
+  },
+  "envs": {},
+  "options": [
+    "afrikaans",
+    "american",
+    "arabic",
+    "austrian",
+    "naustrian",
+    "basque",
+    "bahasam",
+    "brazil",
+    "breton",
+    "bulgarian",
+    "catalan",
+    "croatian",
+    "czech",
+    "danish",
+    "dutch",
+    "english",
+    "esperanto",
+    "finnish",
+    "french",
+    "galician",
+    "german",
+    "ngerman",
+    "greek",
+    "icelandic",
+    "italian",
+    "japanese",
+    "magyar",
+    "norsk",
+    "nynorsk",
+    "polish",
+    "portuges",
+    "romanian",
+    "russian",
+    "slovak",
+    "slovene",
+    "spanish",
+    "swedish",
+    "turkish",
+    "ukrainian",
+    "francais",
+    "germanb",
+    "draft",
+    "final",
+    "space",
+    "nospace"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/varwidth.json b/dev/packages/varwidth.json
new file mode 100644
index 000000000..4e5c09a0d
--- /dev/null
+++ b/dev/packages/varwidth.json
@@ -0,0 +1,14 @@
+{
+  "includes": {},
+  "macros": {
+    "narrowragged": {}
+  },
+  "envs": {
+    "varwidth{}": {
+      "name": "varwidth",
+      "snippet": "{${1:width}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/vector.json b/dev/packages/vector.json
new file mode 100644
index 000000000..855d9a55b
--- /dev/null
+++ b/dev/packages/vector.json
@@ -0,0 +1,56 @@
+{
+  "includes": {
+    "calc": [],
+    "ifthen": []
+  },
+  "macros": {
+    "bvec{}": {
+      "snippet": "bvec{${1:arg}}"
+    },
+    "buvec{}": {
+      "snippet": "buvec{${1:arg}}"
+    },
+    "svec{}": {
+      "snippet": "svec{${1:arg}}"
+    },
+    "suvec{}": {
+      "snippet": "suvec{${1:arg}}"
+    },
+    "uvec{}": {
+      "snippet": "uvec{${1:arg}}"
+    },
+    "uuvec{}": {
+      "snippet": "uuvec{${1:arg}}"
+    },
+    "firstelement{}": {
+      "snippet": "firstelement{${1:start index}}"
+    },
+    "irvec{}": {
+      "snippet": "irvec{${1:arg}}"
+    },
+    "irvec[]{}": {
+      "snippet": "irvec[${2:end index}]{${1:arg}}"
+    },
+    "icvec{}": {
+      "snippet": "icvec{${1:arg}}"
+    },
+    "icvec[]{}": {
+      "snippet": "icvec[${2:end index}]{${1:arg}}"
+    },
+    "rvec{}{}{}": {
+      "snippet": "rvec{${1:arg}}{${2:start index}}{${3:end index}}"
+    },
+    "cvec{}{}{}": {
+      "snippet": "cvec{${1:arg}}{${2:start index}}{${3:end index}}"
+    },
+    "undertilde{}": {
+      "snippet": "undertilde{${1:arg}}",
+      "option": "wavy"
+    }
+  },
+  "envs": {},
+  "options": [
+    "wavy"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/verbatim.json b/dev/packages/verbatim.json
new file mode 100644
index 000000000..f66095467
--- /dev/null
+++ b/dev/packages/verbatim.json
@@ -0,0 +1,16 @@
+{
+  "includes": {},
+  "macros": {
+    "verbatiminput{}": {
+      "snippet": "verbatiminput{${1:file}}"
+    },
+    "verbatiminput*{}": {
+      "snippet": "verbatiminput*{${1:file}}"
+    }
+  },
+  "envs": {
+    "comment": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/verse.json b/dev/packages/verse.json
new file mode 100644
index 000000000..8fc15a5af
--- /dev/null
+++ b/dev/packages/verse.json
@@ -0,0 +1,104 @@
+{
+  "includes": {},
+  "macros": {
+    "indentpattern{}": {
+      "snippet": "indentpattern{${1:digits}}"
+    },
+    "versewidth": {},
+    "vin": {},
+    "vgap": {},
+    "vindent": {},
+    "leftmargini": {},
+    "stanzaskip": {},
+    "verselinebreak": {},
+    "verselinebreak[]": {
+      "snippet": "verselinebreak[${1:length}]"
+    },
+    "flagverse{}": {
+      "snippet": "flagverse{${1:flag}}"
+    },
+    "vleftskip": {},
+    "vrightskip": {},
+    "poemlines{}": {
+      "snippet": "poemlines{${1:nth}}"
+    },
+    "setverselinenums{}{}": {
+      "snippet": "setverselinenums{${1:first line num}}{${2:start nums at}}"
+    },
+    "thepoemline": {},
+    "verselinenumfont{}": {
+      "snippet": "verselinenumfont{${1:font-spec}}"
+    },
+    "verselinenumbersleft": {},
+    "verselinenumbersright": {},
+    "poemtitle{}{}": {
+      "snippet": "poemtitle{${1:short}}{${2:long}}"
+    },
+    "poemtitle*{}{}": {
+      "snippet": "poemtitle*{${1:short}}{${2:long}}"
+    },
+    "poemtoc": {},
+    "poemtitlefont": {},
+    "beforepoemtitleskip": {},
+    "afterpoemtitleskip": {},
+    "poemtitlemark{}": {
+      "snippet": "poemtitlemark{${1:title}}"
+    },
+    "newarray{}{}{}": {
+      "snippet": "newarray{${1:array name}}{${2:low}}{${3:high}}"
+    },
+    "setarrayelement{}{}{}": {
+      "snippet": "setarrayelement{${1:array name}}{${2:index}}{${3:text}}"
+    },
+    "getarrayelement{}{}{}": {
+      "snippet": "getarrayelement{${1:array name}}{${2:index}}{${3:result}}"
+    },
+    "checkarrayindex{}{}": {
+      "snippet": "checkarrayindex{${1:array name}}{${2:index}}"
+    },
+    "stringtoarray{}{}": {
+      "snippet": "stringtoarray{${1:array name}}{${2:string}}"
+    },
+    "arraytostring{}{}": {
+      "snippet": "arraytostring{${1:array name}}{${2:result}}"
+    },
+    "checkifinteger{}": {
+      "snippet": "checkifinteger{${1:number}}"
+    },
+    "altindentfalse": {},
+    "altindenttrue": {},
+    "bounderrorfalse": {},
+    "bounderrortrue": {},
+    "gobm{}": {
+      "snippet": "gobm{${1:number}}"
+    },
+    "ifaltindent": {},
+    "ifbounderror": {},
+    "ifinteger": {},
+    "ifpattern": {},
+    "ifstarpattern": {},
+    "integerfalse": {},
+    "integertrue": {},
+    "patternfalse": {},
+    "patterntrue": {},
+    "starpatternfalse": {},
+    "starpatterntrue": {},
+    "thechrsinstr": {},
+    "thefvsline": {},
+    "theHpoemline": {},
+    "thevslineno": {},
+    "vlnumfont": {}
+  },
+  "envs": {
+    "verse": {},
+    "verse[]": {
+      "name": "verse",
+      "snippet": "[${1:length of average line}]"
+    },
+    "altverse": {},
+    "patverse": {},
+    "patverse*": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/version.json b/dev/packages/version.json
new file mode 100644
index 000000000..dcf32ab4d
--- /dev/null
+++ b/dev/packages/version.json
@@ -0,0 +1,19 @@
+{
+  "includes": {},
+  "macros": {
+    "includeversion{}": {
+      "snippet": "includeversion{${1:envname}}"
+    },
+    "excludeversion{}": {
+      "snippet": "excludeversion{${1:envname}}"
+    },
+    "excludeversion[]{}": {
+      "snippet": "excludeversion[${2:text}]{${1:envname}}"
+    }
+  },
+  "envs": {
+    "comment": {}
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/vowel.json b/dev/packages/vowel.json
new file mode 100644
index 000000000..23d2144cc
--- /dev/null
+++ b/dev/packages/vowel.json
@@ -0,0 +1,62 @@
+{
+  "includes": {},
+  "macros": {
+    "putcvowel{}{}": {
+      "snippet": "putcvowel{${1:symbol}}{${2:num}}"
+    },
+    "putcvowel[]{}{}": {
+      "snippet": "putcvowel[${3:dot pos}]{${1:symbol}}{${2:num}}"
+    },
+    "putvowel{}{}{}": {
+      "snippet": "putvowel{${1:symbol}}{${2:x}}{${3:y}}"
+    },
+    "putvowel[]{}{}{}": {
+      "snippet": "putvowel[${4:dot pos}]{${1:symbol}}{${2:x}}{${3:y}}"
+    },
+    "super{}": {
+      "snippet": "super{${1:text}}"
+    },
+    "vowelhunit": {},
+    "vowelvunit": {},
+    "vowelsep": {},
+    "vowelline": {},
+    "vowelsymbol": {},
+    "diagrate": {},
+    "ifrectdgm": {},
+    "rectdgmtrue": {},
+    "rectdgmfalse": {},
+    "iftriangledgm": {},
+    "triangledgmtrue": {},
+    "triangledgmfalse": {},
+    "ifthreelevel": {},
+    "threeleveltrue": {},
+    "threelevelfalse": {},
+    "ifnoerase": {},
+    "noerasetrue": {},
+    "noerasefalse": {},
+    "diagline{}{}": {
+      "snippet": "diagline{${1:arg1}}{${2:arg2}}"
+    }
+  },
+  "envs": {
+    "vowel": {},
+    "vowel[]": {
+      "name": "vowel",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    }
+  },
+  "options": [],
+  "keyvals": [
+    [
+      "plain",
+      "simple",
+      "standard",
+      "ipanew",
+      "rectangle",
+      "triangle",
+      "three"
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/wargame.json b/dev/packages/wargame.json
index 5a548726f..4e4cb6cb8 100644
--- a/dev/packages/wargame.json
+++ b/dev/packages/wargame.json
@@ -19,12 +19,40 @@
     "amstext": []
   },
   "macros": {
+    "hex()": {
+      "snippet": "hex(${1:location})"
+    },
+    "hex()()": {
+      "snippet": "hex(${1:location})(${2:name})"
+    },
+    "hex[]()": {
+      "snippet": "hex[${1:options}](${2:location})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "hex[]()()": {
+      "snippet": "hex[${1:options}](${2:location})(${3:name})",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "boardframe()()": {
+      "snippet": "boardframe(${1:lower-left})(${2:upper-right})"
+    },
+    "boardframe[]()()": {
+      "snippet": "boardframe[${1:margin}](${2:lower-left})(${3:upper-right})"
+    },
+    "boardclip()(){}": {
+      "snippet": "boardclip(${2:lower-left})(${3:upper-right}){${1:options}}"
+    },
     "splitboard{}": {
       "snippet": "splitboard{${1:options}}",
-      "keyvalindex": 0,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "hexdbglvl": {},
+    "markpos{}()": {
+      "snippet": "markpos{${1:arg1}}(${2:arg2})"
+    },
     "init": {},
     "northedge": {},
     "southedge": {},
@@ -93,7 +121,19 @@
     "boardXmax": {},
     "boardYmax": {},
     "hexboardpath": {},
+    "boardpath()()": {
+      "snippet": "boardpath(${1:lower-left})(${2:upper-right})"
+    },
     "debuggrid": {},
+    "boardhexes()()": {
+      "snippet": "boardhexes(${1:arg1})(${2:arg2})"
+    },
+    "boardhexes[]()()": {
+      "snippet": "boardhexes[${1:options}](${2:arg1})(${3:arg2})"
+    },
+    "segment()(){}{}{}{}": {
+      "snippet": "segment(${5:arg1})(${6:arg2}){${1:arg3}}{${2:arg4}}{${3:arg5}}{${4:arg6}}"
+    },
     "wargamelogo": {},
     "wargamelogo[]": {
       "snippet": "wargamelogo[${1:options}]"
@@ -105,6 +145,22 @@
     "wglogbb{}": {
       "snippet": "wglogbb{${1:arg}}"
     },
+    "natoapp()": {
+      "snippet": "natoapp(${1:location})"
+    },
+    "natoapp()()": {
+      "snippet": "natoapp(${1:location})(${2:name})"
+    },
+    "natoapp[]()": {
+      "snippet": "natoapp[${1:options}](${2:location})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "natoapp[]()()": {
+      "snippet": "natoapp[${1:options}](${2:location})(${3:name})",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
     "natoappdbglvl": {},
     "octagon": {},
     "topline": {},
@@ -192,8 +248,33 @@
     "innernortheast": {},
     "linex": {},
     "liney": {},
+    "chit()": {
+      "snippet": "chit(${1:location})"
+    },
+    "chit()()": {
+      "snippet": "chit(${1:location})(${2:name})"
+    },
+    "chit[]()": {
+      "snippet": "chit[${1:options}](${2:location})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "chit[]()()": {
+      "snippet": "chit[${1:options}](${2:location})(${3:name})",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
     "chitdbglvl": {},
     "chitframeopt": {},
+    "shadechit()": {
+      "snippet": "shadechit(${1:arg})"
+    },
+    "eliminatechit()": {
+      "snippet": "eliminatechit(${1:arg})"
+    },
+    "stackchits()(){}": {
+      "snippet": "stackchits(${2:arg1})(${3:arg2}){${1:arg3}}"
+    },
     "oob": {},
     "hoob": {},
     "chits{}{}{}": {
@@ -244,6 +325,17 @@
     "terrainpic"
   ],
   "keyvals": [
+    [
+      "terrain={${1:terrain-keys}}",
+      "ridges={${1:ridges-keys}}",
+      "label={${1:label-keys}}",
+      "town={${1:town-keys}}",
+      "bevel={${1:bevel-keys}}",
+      "extra={${1:extra-keys}}",
+      "extra clipped={${1:extra-keys}}",
+      "row=${1:row}",
+      "column=${1:column}"
+    ],
     [
       "paper=",
       "landscape",
@@ -255,6 +347,27 @@
       "output=${1:file name}",
       "standalone",
       "scale=${1:factor}"
+    ],
+    [
+      "faction=${1:faction}",
+      "command=",
+      "main={${1:mains}}",
+      "left={${1:lefts}}",
+      "right={${1:rights}}",
+      "top={${1:tops}}",
+      "bottom={${1:bottoms}}",
+      "below={${1:belows}}",
+      "echelon=",
+      "frame={${1:frame-keys}}"
+    ],
+    [
+      "symbol={${1:nato app 6(c) spec}}",
+      "full={${1:spec}}",
+      "color=",
+      "fill=",
+      "text=",
+      "draw=",
+      "bevel={${1:bevel-keys}}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/watermark.json b/dev/packages/watermark.json
new file mode 100644
index 000000000..4bee777fb
--- /dev/null
+++ b/dev/packages/watermark.json
@@ -0,0 +1,23 @@
+{
+  "includes": {},
+  "macros": {
+    "watermark{}": {
+      "snippet": "watermark{${1:body}}"
+    },
+    "leftwatermark{}": {
+      "snippet": "leftwatermark{${1:body}}"
+    },
+    "rightwatermark{}": {
+      "snippet": "rightwatermark{${1:body}}"
+    },
+    "thiswatermark{}": {
+      "snippet": "thiswatermark{${1:body}}"
+    },
+    "thispageheading{}": {
+      "snippet": "thispageheading{${1:heading}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/web.json b/dev/packages/web.json
new file mode 100644
index 000000000..b09eb0d83
--- /dev/null
+++ b/dev/packages/web.json
@@ -0,0 +1,1013 @@
+{
+  "includes": {
+    "xkeyval": [],
+    "ifpdf": [],
+    "ifxetex": [],
+    "xcolor": [],
+    "calc": [],
+    "amssymb": [],
+    "hyperref": [],
+    "aeb-comment": [],
+    "eso-pic": [
+      "usetemplates",
+      "leftpanel",
+      "rightpanel",
+      "leftpanelprt",
+      "rightpanelprt"
+    ],
+    "graphicx": [
+      "usetemplates",
+      "leftpanel",
+      "rightpanel",
+      "leftpanelprt",
+      "rightpanelprt"
+    ],
+    "pifont": [
+      "pro",
+      "extended"
+    ],
+    "colortbl": [
+      "table"
+    ],
+    "pdfcolmk": [
+      "fixpdftex"
+    ]
+  },
+  "macros": {
+    "ui{}": {
+      "snippet": "ui{${1:keyvals}}",
+      "option": "useui",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "screensize{}{}": {
+      "snippet": "screensize{${1:height}}{${2:width}}"
+    },
+    "margins{}{}{}{}": {
+      "snippet": "margins{${1:left}}{${2:right}}{${3:top}}{${4:bottom}}"
+    },
+    "margins[]{}{}{}{}": {
+      "snippet": "margins[${5:panel width}]{${1:left}}{${2:right}}{${3:top}}{${4:bottom}}"
+    },
+    "setScreensizeFromGraphic{}": {
+      "snippet": "setScreensizeFromGraphic{${1:imagefile}}"
+    },
+    "setScreensizeFromGraphic[]{}": {
+      "snippet": "setScreensizeFromGraphic[${2:options}]{${1:imagefile}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "addtoWebHeight{}": {
+      "snippet": "addtoWebHeight{${1:length}}"
+    },
+    "addtoWebWidth{}": {
+      "snippet": "addtoWebWidth{${1:length}}"
+    },
+    "panelwidth{}": {
+      "snippet": "panelwidth{${1:width}}"
+    },
+    "lheader{}": {
+      "snippet": "lheader{${1:text}}"
+    },
+    "cheader{}": {
+      "snippet": "cheader{${1:text}}"
+    },
+    "rheader{}": {
+      "snippet": "rheader{${1:text}}"
+    },
+    "lfooter{}": {
+      "snippet": "lfooter{${1:text}}"
+    },
+    "cfooter{}": {
+      "snippet": "cfooter{${1:text}}"
+    },
+    "rfooter{}": {
+      "snippet": "rfooter{${1:text}}"
+    },
+    "headerformat{}": {
+      "snippet": "headerformat{${1:font commands}}"
+    },
+    "footerformat{}": {
+      "snippet": "footerformat{${1:font commands}}"
+    },
+    "webheadwrapper{}": {
+      "snippet": "webheadwrapper{${1:code}}"
+    },
+    "webfootwrapper{}": {
+      "snippet": "webfootwrapper{${1:code}}"
+    },
+    "clearHeaders": {},
+    "restoreHeaders": {},
+    "clearFooters": {},
+    "restoreFooters": {},
+    "headersOnSectionPage": {},
+    "noHeadersOnSectionPage": {},
+    "subject{}": {
+      "snippet": "subject{${1:subject}}"
+    },
+    "university{}": {
+      "snippet": "university{${1:university}}"
+    },
+    "email{}": {
+      "snippet": "email{${1:email}}"
+    },
+    "version{}": {
+      "snippet": "version{${1:version}}"
+    },
+    "copyrightyears{}": {
+      "snippet": "copyrightyears{${1:years}}"
+    },
+    "universityColor{}": {
+      "snippet": "universityColor{${1:color}}"
+    },
+    "titleColor{}": {
+      "snippet": "titleColor{${1:color}}"
+    },
+    "authorColor{}": {
+      "snippet": "authorColor{${1:color}}"
+    },
+    "keywords{}": {
+      "snippet": "keywords{${1:word1,${2:word2},...}}"
+    },
+    "topTitlePage": {},
+    "titlepageTrailer": {},
+    "optionalPageMatter{}": {
+      "snippet": "optionalPageMatter{${1:content}}"
+    },
+    "optionalPageMatter[]{}": {
+      "snippet": "optionalPageMatter[${2:vspace}]{${1:content}}"
+    },
+    "nocopyright": {},
+    "minimumskip": {},
+    "copyrightLabel{}": {
+      "snippet": "copyrightLabel{${1:text}}"
+    },
+    "revisionLabel{}": {
+      "snippet": "revisionLabel{${1:text}}"
+    },
+    "versionLabel{}": {
+      "snippet": "versionLabel{${1:text}}"
+    },
+    "webtitle": {},
+    "webauthor": {},
+    "websubject": {},
+    "webkeywords": {},
+    "webuniversity": {},
+    "webemail": {},
+    "webversion": {},
+    "webcopyrightyears": {},
+    "directoryName{}": {
+      "snippet": "directoryName{${1:name}}"
+    },
+    "tocName{}": {
+      "snippet": "tocName{${1:name}}"
+    },
+    "dirContentLink{}": {
+      "snippet": "dirContentLink{${1:text}}"
+    },
+    "formatWordDirectory{}": {
+      "snippet": "formatWordDirectory{${1:font commands}}"
+    },
+    "formatDirectoryItems{}": {
+      "snippet": "formatDirectoryItems{${1:font commands}}"
+    },
+    "removeDirTOC": {},
+    "removeDirArticle": {},
+    "addtoDirList{}": {
+      "snippet": "addtoDirList{${1:new item}}"
+    },
+    "dirTOCItem": {},
+    "dirArticleItem": {},
+    "priorDirMatter{}": {
+      "snippet": "priorDirMatter{${1:content}}"
+    },
+    "afterDirMatter{}": {
+      "snippet": "afterDirMatter{${1:content}}"
+    },
+    "priorDirList{}": {
+      "snippet": "priorDirList{${1:content}}"
+    },
+    "afterDirList{}": {
+      "snippet": "afterDirList{${1:content}}"
+    },
+    "directoryhook{}": {
+      "snippet": "directoryhook{${1:code}}"
+    },
+    "tocindent{}": {
+      "snippet": "tocindent{${1:indent}}"
+    },
+    "widestNumber{}": {
+      "snippet": "widestNumber{${1:number}}"
+    },
+    "tocColor{}": {
+      "snippet": "tocColor{${1:color}}"
+    },
+    "coverpagemargin": {},
+    "makeinlinetitle": {},
+    "NaviBarOn": {},
+    "NaviBarOff": {},
+    "navibarTextColor{}": {
+      "snippet": "navibarTextColor{${1:color}}"
+    },
+    "navibarBgColor{}": {
+      "snippet": "navibarBgColor{${1:color}}"
+    },
+    "navibariconHeight{}": {
+      "snippet": "navibariconHeight{${1:height}}"
+    },
+    "navibariconWidth{}": {
+      "snippet": "navibariconWidth{${1:width}}"
+    },
+    "newNaviIcon{}{}{}{}{}": {
+      "snippet": "newNaviIcon{${1:cmd}}{${2:width}}{${3:height}}{${4:text}}{${5:action}}"
+    },
+    "newNaviIcon[]{}{}{}{}{}": {
+      "snippet": "newNaviIcon[${6:m|j|l}]{${1:cmd}}{${2:width}}{${3:height}}{${4:text}}{${5:action}}"
+    },
+    "insertnaviiconhere{}": {
+      "snippet": "insertnaviiconhere{${1:code}}"
+    },
+    "insertnaviiconhereafter{}": {
+      "snippet": "insertnaviiconhereafter{${1:code}}"
+    },
+    "ArrowUp{}": {
+      "snippet": "ArrowUp{${1:code}}"
+    },
+    "ArrowDown{}": {
+      "snippet": "ArrowDown{${1:code}}"
+    },
+    "defaultpageheader": {},
+    "directionIconTextColor{}": {
+      "snippet": "directionIconTextColor{${1:color}}"
+    },
+    "directionIconBgColor{}": {
+      "snippet": "directionIconBgColor{${1:color}}"
+    },
+    "panelNaviGroup": {},
+    "ifeqforpaper": {},
+    "eqforpapertrue": {},
+    "eqforpaperfalse": {},
+    "useFullWidthForPaper": {},
+    "prtscr{}{}": {
+      "snippet": "prtscr{${1:print text}}{${2:screen text}}"
+    },
+    "NewPage": {},
+    "template{}": {
+      "snippet": "template{${1:imagefile}}"
+    },
+    "template[]{}": {
+      "snippet": "template[${2:options}]{${1:imagefile}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "textBgColor{}": {
+      "snippet": "textBgColor{${1:color}}"
+    },
+    "AddToTemplate{}": {
+      "snippet": "AddToTemplate{${1:template name}}"
+    },
+    "paneltemplate{}": {
+      "snippet": "paneltemplate{${1:imagefile}}"
+    },
+    "paneltemplate[]{}": {
+      "snippet": "paneltemplate[${2:options}]{${1:imagefile}}"
+    },
+    "panelBgColor{}": {
+      "snippet": "panelBgColor{${1:color}}"
+    },
+    "AddToPanelTemplate{}": {
+      "snippet": "AddToPanelTemplate{${1:template name}}"
+    },
+    "buildpanel{}": {
+      "snippet": "buildpanel{${1:content}}"
+    },
+    "minPanelWidth{}": {
+      "snippet": "minPanelWidth{${1:length}}"
+    },
+    "disableTemplate{}": {
+      "snippet": "disableTemplate{${1:template name}}"
+    },
+    "enableTemplate{}": {
+      "snippet": "enableTemplate{${1:template name}}"
+    },
+    "disablePanelTemplate{}": {
+      "snippet": "disablePanelTemplate{${1:template name}}"
+    },
+    "enablePanelTemplate{}": {
+      "snippet": "enablePanelTemplate{${1:template name}}"
+    },
+    "ClearTextTemplate": {},
+    "ClearPanelTemplate": {},
+    "ClearBuildPanel": {},
+    "ClearAllTemplates": {},
+    "ClearTextTemplateBuffer": {},
+    "ClearPanelTemplateBuffer": {},
+    "aboveTopTitleSkip{}": {
+      "snippet": "aboveTopTitleSkip{${1:skip}}"
+    },
+    "noFinalDot": {},
+    "tocPartTitle{}": {
+      "snippet": "tocPartTitle{${1:TeX code}}"
+    },
+    "formatPartTitle{}": {
+      "snippet": "formatPartTitle{${1:TeX code}}"
+    },
+    "restorePartTitleFormat": {},
+    "noPartNumbers": {},
+    "formatChapterNumber{}": {
+      "snippet": "formatChapterNumber{${1:TeX code}}"
+    },
+    "formatChapterTitle{}": {
+      "snippet": "formatChapterTitle{${1:TeX code}}"
+    },
+    "DeclareDocInfo{}": {
+      "snippet": "DeclareDocInfo{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "DeclarePageLayout{}": {
+      "snippet": "DeclarePageLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "universityLayout{}": {
+      "snippet": "universityLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "titleLayout{}": {
+      "snippet": "titleLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "authorLayout{}": {
+      "snippet": "authorLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 4,
+      "keyvalpos": 0
+    },
+    "topTitlePageProportion{}": {
+      "snippet": "topTitlePageProportion{${1:factor}}",
+      "option": "extended"
+    },
+    "DesignTitlePageTrailer{}": {
+      "snippet": "DesignTitlePageTrailer{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 5,
+      "keyvalpos": 0
+    },
+    "selectTocDings{}": {
+      "snippet": "selectTocDings{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 6,
+      "keyvalpos": 0
+    },
+    "selectColors{}": {
+      "snippet": "selectColors{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 7,
+      "keyvalpos": 0
+    },
+    "noSectionNumbers": {
+      "option": "extended"
+    },
+    "tocLayout{}": {
+      "snippet": "tocLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "sectionLayout{}": {
+      "snippet": "sectionLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "subsectionLayout{}": {
+      "snippet": "subsectionLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "subsubsectionLayout{}": {
+      "snippet": "subsubsectionLayout{${1:keyvals}}",
+      "option": "extended",
+      "keyvalindex": 8,
+      "keyvalpos": 0
+    },
+    "shadowhoffset{}": {
+      "snippet": "shadowhoffset{${1:length}}",
+      "option": "extended"
+    },
+    "shadowvoffset{}": {
+      "snippet": "shadowvoffset{${1:length}}",
+      "option": "extended"
+    },
+    "customSecHead{}": {
+      "snippet": "customSecHead{${1:TeX code}}",
+      "option": "extended"
+    },
+    "customSubsecHead{}": {
+      "snippet": "customSubsecHead{${1:TeX code}}",
+      "option": "extended"
+    },
+    "customSubsubsecHead{}": {
+      "snippet": "customSubsubsecHead{${1:TeX code}}",
+      "option": "extended"
+    },
+    "preparedLabel{}": {
+      "snippet": "preparedLabel{${1:text}}",
+      "option": "extended"
+    },
+    "prepared{}": {
+      "snippet": "prepared{${1:date}}",
+      "option": "extended"
+    },
+    "talkdate{}": {
+      "snippet": "talkdate{${1:date}}",
+      "option": "extended"
+    },
+    "webtalkdate": {
+      "option": "extended"
+    },
+    "talkdateLabel{}": {
+      "snippet": "talkdateLabel{${1:text}}",
+      "option": "extended"
+    },
+    "talksite{}": {
+      "snippet": "talksite{${1:site}}",
+      "option": "extended"
+    },
+    "customUniversity{}": {
+      "snippet": "customUniversity{${1:TeX code}}",
+      "option": "extended"
+    },
+    "customTitle{}": {
+      "snippet": "customTitle{${1:TeX code}}",
+      "option": "extended"
+    },
+    "customAuthor{}": {
+      "snippet": "customAuthor{${1:TeX code}}",
+      "option": "extended"
+    },
+    "customToc{}": {
+      "snippet": "customToc{${1:TeX code}}",
+      "option": "extended"
+    },
+    "halignuniversity": {
+      "option": "extended"
+    },
+    "haligntitle": {
+      "option": "extended"
+    },
+    "halignauthor": {
+      "option": "extended"
+    },
+    "halignsection": {
+      "option": "extended"
+    },
+    "halignsubsection": {
+      "option": "extended"
+    },
+    "halignsubsubsection": {
+      "option": "extended"
+    },
+    "haligntoc": {
+      "option": "extended"
+    },
+    "subsubDefaultDing{}": {
+      "snippet": "subsubDefaultDing{${1:symbol}}",
+      "option": "extended"
+    },
+    "sectionTitle": {
+      "option": "extended"
+    },
+    "sectionAuthor": {
+      "option": "extended"
+    },
+    "sectionUniversity": {
+      "option": "extended"
+    },
+    "sectionToc": {
+      "option": "extended"
+    },
+    "ifShadow": {
+      "option": "extended"
+    },
+    "Shadowtrue": {
+      "option": "extended"
+    },
+    "Shadowfalse": {
+      "option": "extended"
+    },
+    "useSectionNumbers": {
+      "option": "extended"
+    },
+    "dDingToc{}": {
+      "snippet": "dDingToc{${1:symbol}}",
+      "option": "extended"
+    },
+    "ddDingToc{}": {
+      "snippet": "ddDingToc{${1:symbol}}",
+      "option": "extended"
+    },
+    "dddDingToc{}": {
+      "snippet": "dddDingToc{${1:symbol}}",
+      "option": "extended"
+    },
+    "dDingTocColor{}": {
+      "snippet": "dDingTocColor{${1:color}}",
+      "option": "extended"
+    },
+    "ddDingTocColor{}": {
+      "snippet": "ddDingTocColor{${1:color}}",
+      "option": "extended"
+    },
+    "dddDingTocColor{}": {
+      "snippet": "dddDingTocColor{${1:color}}",
+      "option": "extended"
+    },
+    "BGColorAndGraphic": {},
+    "BGColorAndGraphicFullWidth": {},
+    "FALSEACTIONii": {},
+    "FALSEACTIONiia": {},
+    "InitLayout": {},
+    "SETTEMPBOXi": {},
+    "SETTEMPBOXii": {},
+    "SHOWTEMPBOXi": {},
+    "TRUEACTIONi": {},
+    "TRUEACTIONia": {},
+    "aboveOPMvspace": {},
+    "addToWebHWError": {},
+    "addtofullwidthtemplateArgs{}": {
+      "snippet": "addtofullwidthtemplateArgs{${1:arg}}"
+    },
+    "addtopaneltemplateArgs{}": {
+      "snippet": "addtopaneltemplateArgs{${1:arg}}"
+    },
+    "addtotemplateArgs{}": {
+      "snippet": "addtotemplateArgs{${1:arg}}"
+    },
+    "aebwritelastpage": {},
+    "allowTransparency": {},
+    "bWebCustomize": {},
+    "calculatefullwidth": {},
+    "centertextonpage": {},
+    "chkpanelgroup": {},
+    "clearfullwidthtemplateArgs": {},
+    "clearpaneltemplateArgs": {},
+    "cleartemplateArgs": {},
+    "currLeftMarg": {},
+    "currPanelWidth": {},
+    "currTopMarg": {},
+    "cyrCommand": {},
+    "disablePanels{}": {
+      "snippet": "disablePanels{${1:arg}}"
+    },
+    "disableScreens{}": {
+      "snippet": "disableScreens{${1:arg}}"
+    },
+    "eWebCustomize": {},
+    "forceSubSubNumbers": {},
+    "fullscreenwidth": {},
+    "fullscreenwidthadj": {},
+    "fullwidthtemplate{}{}": {
+      "snippet": "fullwidthtemplate{${1:arg1}}{${2:arg2}}"
+    },
+    "get": {},
+    "getDimsFromGraphic{}{}{}{}": {
+      "snippet": "getDimsFromGraphic{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "getargsii": {},
+    "getargs{}{}": {
+      "snippet": "getargs{${1:arg1}}{${2:arg2}}"
+    },
+    "hproportionwebauthor": {},
+    "hproportionwebtitle": {},
+    "hproportionwebuniversity": {},
+    "incby": {},
+    "inputWebCfg": {},
+    "insNaviBar": {},
+    "insertwebtoc": {},
+    "isChapter": {},
+    "listAddToPanelTemplates": {},
+    "listAddToTemplates": {},
+    "loadwebpro": {},
+    "makeFullwidthhead": {},
+    "maketitlepostamble": {},
+    "maketitlepreamble": {},
+    "marginsize": {},
+    "maxtextscreentext": {},
+    "newBottomMarg": {},
+    "newLeftMarg": {},
+    "newPanelWidth": {},
+    "newRightMarg": {},
+    "newTopMarg": {},
+    "nocopyrightNotice": {},
+    "nocopyrightsymbol": {},
+    "norevisionLabel": {},
+    "optionalpagematter": {},
+    "origpaperheight": {},
+    "origpaperwidth": {},
+    "panelIconGroup": {},
+    "panelNavigroupWidth": {},
+    "panelSep": {},
+    "panelgroupHeight{}": {
+      "snippet": "panelgroupHeight{${1:arg}}"
+    },
+    "panelgroupSep{}": {
+      "snippet": "panelgroupSep{${1:arg}}"
+    },
+    "panelgroupWidth{}": {
+      "snippet": "panelgroupWidth{${1:arg}}"
+    },
+    "panelrowsep": {},
+    "panelscreenwidth": {},
+    "panelsep{}": {
+      "snippet": "panelsep{${1:arg}}"
+    },
+    "pdfLang{}": {
+      "snippet": "pdfLang{${1:arg}}"
+    },
+    "placePanelTemplateInLayer[]{}": {
+      "snippet": "placePanelTemplateInLayer[${2:opt}]{${1:arg}}"
+    },
+    "placePanelTemplateInLayer{}": {
+      "snippet": "placePanelTemplateInLayer{${1:arg}}"
+    },
+    "placeScreenNavibar": {},
+    "placeTemplateInLayer[]{}": {
+      "snippet": "placeTemplateInLayer[${2:opt}]{${1:arg}}"
+    },
+    "placeTemplateInLayer{}": {
+      "snippet": "placeTemplateInLayer{${1:arg}}"
+    },
+    "popFromFullWidthPage": {},
+    "prtscrA{}{}": {
+      "snippet": "prtscrA{${1:arg1}}{${2:arg2}}"
+    },
+    "prtscrV": {},
+    "pushToFullWidthPage": {},
+    "removehereaftericon": {},
+    "resetmargins[]{}{}{}{}": {
+      "snippet": "resetmargins[${5:opt}]{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "resetmargins{}{}{}{}": {
+      "snippet": "resetmargins{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
+    },
+    "restoreElements{}": {
+      "snippet": "restoreElements{${1:arg}}"
+    },
+    "restorePanels{}": {
+      "snippet": "restorePanels{${1:arg}}"
+    },
+    "restoreSavedHead": {},
+    "restoreScreens{}": {
+      "snippet": "restoreScreens{${1:arg}}"
+    },
+    "restorenormalsettings": {},
+    "saveClearElements{}": {
+      "snippet": "saveClearElements{${1:arg}}"
+    },
+    "saveElements{}": {
+      "snippet": "saveElements{${1:arg}}"
+    },
+    "setPageDevice[]{}{}": {
+      "snippet": "setPageDevice[${3:opt}]{${1:arg1}}{${2:arg2}}"
+    },
+    "setPageDevice{}{}": {
+      "snippet": "setPageDevice{${1:arg1}}{${2:arg2}}"
+    },
+    "shortwebsubject": {},
+    "shortwebtitle": {},
+    "stdPanelBG": {},
+    "stdbldpanel": {},
+    "templatedefaults": {},
+    "textscreenwidth": {},
+    "thewebemail": {},
+    "tightsettings": {},
+    "titleauthorproportion": {},
+    "tocIndentByNumber{}": {
+      "snippet": "tocIndentByNumber{${1:arg}}"
+    },
+    "tocindentByNumber": {},
+    "trailerFontSize": {},
+    "useStandardPanel": {},
+    "vspaceAfterDirName": {},
+    "webArg": {},
+    "webNotPaneledWarning": {},
+    "webSaveMargDim": {},
+    "webSaveSSDim": {},
+    "webdirectory": {},
+    "websetheadheight": {},
+    "webtableofcontents": {}
+  },
+  "envs": {
+    "forscreen": {},
+    "forpaper": {},
+    "Fullwidthtext": {}
+  },
+  "options": [
+    "noxcolor",
+    "dutch",
+    "french",
+    "german",
+    "italian",
+    "norsk",
+    "russian",
+    "spanish",
+    "dansk",
+    "polish",
+    "finnish",
+    "czech",
+    "catalan",
+    "brazil",
+    "turkish",
+    "dvips",
+    "dvipsone",
+    "dviwindo",
+    "textures",
+    "pdftex",
+    "dvipdfm",
+    "dvipdfmx",
+    "xetex",
+    "luatex",
+    "forpaper",
+    "forcolorpaper",
+    "latexlayout",
+    "uselatexsectioning",
+    "weblikeclass",
+    "nodirectory",
+    "usedirectory",
+    "latextoc",
+    "nobullets",
+    "designi",
+    "designii",
+    "designiii",
+    "designiv",
+    "designv",
+    "designvi",
+    "designvii",
+    "designviii",
+    "designix",
+    "usesf",
+    "unicode",
+    "xhyperref",
+    "addtoHyOpts={${1:hyperref options}}",
+    "addtoHyOpts*={${1:hyperref options}}",
+    "useui",
+    "forceSubSubNumbers",
+    "centertitlepage",
+    "centertitlepagefull",
+    "pro",
+    "extended",
+    "draft",
+    "usetemplates",
+    "leftpanel",
+    "rightpanel",
+    "templatesforpaper",
+    "rightpanelprt",
+    "leftpanelprt",
+    "navibar",
+    "navibar*",
+    "tight",
+    "tight*",
+    "uselatexparts",
+    "uselatexchapters",
+    "natural",
+    "rgb",
+    "cmy",
+    "cmyk",
+    "hsb",
+    "gray",
+    "RGB",
+    "HTML",
+    "HSB",
+    "Gray",
+    "monochrome",
+    "dvipsnames",
+    "dvipsnames*",
+    "svgnames",
+    "svgnames*",
+    "x11names",
+    "x11names*",
+    "table",
+    "fixpdftex",
+    "hyperref",
+    "prologue",
+    "kernelfbox",
+    "xcdraw",
+    "noxcdraw",
+    "fixinclude",
+    "showerrors",
+    "hideerrors"
+  ],
+  "keyvals": [
+    [
+      "border=",
+      "linewidth=",
+      "highlight=",
+      "bordercolor={${1:R G B}}",
+      "linestyle=",
+      "dasharray=${1:number}",
+      "linktxtcolor=",
+      "annotflags=",
+      "fieldflags=",
+      "maxlength=${1:number}",
+      "tooltip={${1:text}}",
+      "default=${1:text}",
+      "value=${1:text}",
+      "rotate=",
+      "bgcolor={${1:R G B}}",
+      "uptxt={${1:text}}",
+      "downtxt={${1:text}}",
+      "rollovertxt={${1:text}}",
+      "normappr=${1:string}",
+      "rollappr=${1:string}",
+      "downappr=${1:string}",
+      "importicons=",
+      "layout=",
+      "scalewhen=",
+      "scale=",
+      "position={${1:x y}}",
+      "fitbounds",
+      "appr={${1:specs}}",
+      "align=",
+      "textfont=${1:font name}",
+      "textsize=${1:number}",
+      "textcolor=${1:number}",
+      "autocenter=",
+      "inline=",
+      "presets=${1:\\cmd}",
+      "symbolchoice=",
+      "rectW=",
+      "rectH=",
+      "width=",
+      "height=",
+      "scalefactor=${1:factor}",
+      "goto={${1:KV-pairs}}",
+      "js={${1:script}}",
+      "mouseup={${1:script}}",
+      "mousedown={${1:script}}",
+      "onenter={${1:script}}",
+      "onexit={${1:script}}",
+      "onfocus={${1:script}}",
+      "onblur={${1:script}}",
+      "format={${1:script}}",
+      "keystroke={${1:script}}",
+      "validate={${1:script}}",
+      "calculate={${1:script}}",
+      "pageopen={${1:script}}",
+      "pageclose={${1:script}}",
+      "pagevisible={${1:script}}",
+      "pageinvisible={${1:script}}",
+      "lock={${1:KV-pairs}}"
+    ],
+    [
+      "alt={${1:alt text}}",
+      "bb=${1:llx lly urx ury}",
+      "bbllx=",
+      "bblly=",
+      "bburx=",
+      "bbury=",
+      "natwidth=",
+      "natheight=",
+      "hiresbb",
+      "pagebox=",
+      "viewport=${1:llx lly urx ury}",
+      "trim=${1:llx lly urx ury}",
+      "angle=${1:degrees}",
+      "origin=",
+      "width=",
+      "height=",
+      "totalheight=",
+      "keepaspectratio",
+      "scale=${1:factor}",
+      "clip",
+      "draft",
+      "type=${1:file type}",
+      "ext=${1:file extension}",
+      "read=${1:read-file extension}",
+      "command=",
+      "quiet",
+      "page=${1:page number}",
+      "interpolate",
+      "decodearray={${1:color array}}"
+    ],
+    [
+      "title={${1:text}}",
+      "author={${1:name}}",
+      "university={${1:university}}",
+      "email=${1:email}",
+      "talksite={${1:site}}",
+      "talkdate=${1:date}",
+      "talkdateLabel={${1:text}}",
+      "version=${1:version}",
+      "versionLabel={${1:text}}",
+      "subject={${1:subject}}",
+      "keywords={${1:word1,word2,...}}",
+      "copyrightyears={${1:years}}",
+      "prepared=${1:date}",
+      "preparedLabel={${1:text}}",
+      "Title={${1:text}}",
+      "authors={${1:name1}}{${2:name2}}${3:...}",
+      "Subject={${1:subject}}",
+      "Keywords={${1:word1,word2,...}}",
+      "lang=${1:language}",
+      "copyrightStatus=",
+      "copyrightNotice={${1:text}}",
+      "copyrightInfoURL=${1:URL}",
+      "authortitle={${1:text}}",
+      "descriptionwriter={${1:text}}",
+      "customProperties={name=${1:name1},value=${2:value1}}${3:{name=name2,value=value2}...}"
+    ],
+    [
+      "design=",
+      "screensizeOf=",
+      "screensize={${1:height}}{${2:width}}",
+      "margins={${1:left}}{${2:right}}{${3:top}}{${4:bottom}}",
+      "headheight=",
+      "topmargin=",
+      "additionalheadsep=",
+      "marginparsep=",
+      "marginparwidth=",
+      "marginparpush=",
+      "footskip=",
+      "webfootskip=",
+      "panelwidth=",
+      "panelsep="
+    ],
+    [
+      "fontfamily=",
+      "fontseries=",
+      "fontshape=",
+      "fontsize=",
+      "halign=",
+      "color=",
+      "special=",
+      "framecolor=",
+      "bgcolor=",
+      "shadowcolor=",
+      "beforeskip=",
+      "afterskip=",
+      "usefont={${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}{${5:size}}",
+      "hproportion=${1:factor}",
+      "xhalign="
+    ],
+    [
+      "ul=${1:text}",
+      "ur=${1:text}",
+      "ll=${1:text}",
+      "lr=${1:text}",
+      "textColor=",
+      "bgColor=",
+      "borderColor=",
+      "fboxsep=",
+      "fboxrule=",
+      "graphic=${1:imagefile}",
+      "namedgraphic=${1:name}",
+      "raise=",
+      "fontSize=${1:fontsize cmd}",
+      "formatting=${1:font commands}"
+    ],
+    [
+      "dDing=${1:symbol}",
+      "ddDing=${1:symbol}",
+      "dddDing=${1:symbol}",
+      "dDingColor=",
+      "ddDingColor=",
+      "dddDingColor="
+    ],
+    [
+      "universityColor=",
+      "titleColor=",
+      "textBgColor=",
+      "panelBgColor=",
+      "urlColor=",
+      "linkColor=",
+      "fileColor="
+    ],
+    [
+      "fontfamily=",
+      "fontseries=",
+      "fontshape=",
+      "fontsize=",
+      "halign=",
+      "ding=${1:symbol}",
+      "color=",
+      "special=",
+      "framecolor=",
+      "bgcolor=",
+      "shadowcolor=",
+      "beforeskip=",
+      "afterskip=",
+      "usefont={${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}{${5:size}}",
+      "numdingcolor=",
+      "reset="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/wiley-authoringtemplate.json b/dev/packages/wiley-authoringtemplate.json
index b55eacf26..6139514ed 100644
--- a/dev/packages/wiley-authoringtemplate.json
+++ b/dev/packages/wiley-authoringtemplate.json
@@ -96,7 +96,7 @@
       "snippet": "hint{${1:text}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:keyword1,keyword2,...}}"
+      "snippet": "keywords{${1:keyword1,${2:keyword2},...}}"
     },
     "latexprintindex": {},
     "midrule": {},
diff --git a/dev/packages/witharrows.json b/dev/packages/witharrows.json
new file mode 100644
index 000000000..90f8de0aa
--- /dev/null
+++ b/dev/packages/witharrows.json
@@ -0,0 +1,212 @@
+{
+  "includes": {
+    "l3keys2e": [],
+    "varwidth": [],
+    "tikz": [],
+    "tikzlibrarybending": [],
+    "footnote": [
+      "footnote"
+    ],
+    "footnotehyper": [
+      "footnotehyper"
+    ]
+  },
+  "macros": {
+    "WithArrowsOptions{}": {
+      "snippet": "WithArrowsOptions{${1:options}}",
+      "keyvalindex": 0,
+      "keyvalpos": 0
+    },
+    "Arrow{}": {
+      "snippet": "Arrow{${1:label}}"
+    },
+    "Arrow[]{}": {
+      "snippet": "Arrow[${2:options}]{${1:label}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "MultiArrow{}{}": {
+      "snippet": "MultiArrow{${1:row1,${3:row2},...}}{${2:label}}"
+    },
+    "WithArrowsLastEnv": {},
+    "tag{}": {
+      "snippet": "tag{${1:label}}"
+    },
+    "tag*{}": {
+      "snippet": "tag*{${1:label}}"
+    },
+    "notag": {},
+    "tagnextline": {},
+    "WithArrowsRightX": {},
+    "WithArrowsNewStyle{}{}": {
+      "snippet": "WithArrowsNewStyle{${1:style name}}{${2:options}}"
+    },
+    "WithArrowsNbLines": {},
+    "WithArrows": {},
+    "endWithArrows": {},
+    "DispWithArrows": {},
+    "endDispWithArrows": {},
+    "myfileversion": {},
+    "myfiledate": {}
+  },
+  "envs": {
+    "WithArrows": {},
+    "WithArrows[]": {
+      "name": "WithArrows",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 2,
+      "keyvalpos": 0
+    },
+    "DispWithArrows": {},
+    "DispWithArrows[]": {
+      "name": "DispWithArrows",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    },
+    "DispWithArrows*": {},
+    "DispWithArrows*[]": {
+      "name": "DispWithArrows*",
+      "snippet": "[${1:options}]",
+      "keyvalindex": 3,
+      "keyvalpos": 0
+    }
+  },
+  "options": [
+    "footnote",
+    "footnotehyper"
+  ],
+  "keyvals": [
+    [
+      "c",
+      "b",
+      "right-overlap",
+      "tikz={${1:TikZ options}}",
+      "xoffset=",
+      "command-name=${1:csname}",
+      "code-before=${1:code}",
+      "code-after=${1:code}",
+      "format=${1:cols}",
+      "show-nodes",
+      "show-node-names",
+      "displaystyle",
+      "ll",
+      "lr",
+      "rl",
+      "rr",
+      "i",
+      "group",
+      "groups",
+      "up-and-down={${1:options}}",
+      "jot=",
+      "interline=",
+      "tikz-code={${1:code}}",
+      "start-adjust=",
+      "end-adjust=",
+      "adjust=",
+      "ygap=",
+      "ystart=",
+      "max-length-of-arrow=",
+      "%witharrowsstyle",
+      "wrap-lines",
+      "tagged-lines={${1:line1,line2,...}}",
+      "fleqn",
+      "mathindent=",
+      "subequations",
+      "standard-behaviour-with-items",
+      "xoffset-for-o-arrows=",
+      "up-and-down/width=",
+      "up-and-down/radius=",
+      "no-arrows"
+    ],
+    [
+      "jump=${1:integer}",
+      "xoffset=",
+      "tikz=",
+      "tikz-code={${1:code}}",
+      "ll",
+      "lr",
+      "rl",
+      "rr",
+      "i",
+      "new-group",
+      "o",
+      "up",
+      "up={${1:options}}",
+      "down",
+      "down={${1:options}}"
+    ],
+    [
+      "c",
+      "b",
+      "right-overlap",
+      "tikz={${1:TikZ options}}",
+      "xoffset=",
+      "command-name=${1:csname}",
+      "code-before=${1:code}",
+      "code-after=${1:code}",
+      "format=${1:cols}",
+      "show-nodes",
+      "show-node-names",
+      "displaystyle",
+      "ll",
+      "lr",
+      "rl",
+      "rr",
+      "i",
+      "group",
+      "groups",
+      "up-and-down={${1:options}}",
+      "jot=",
+      "interline=",
+      "tikz-code={${1:code}}",
+      "start-adjust=",
+      "end-adjust=",
+      "adjust=",
+      "ygap=",
+      "ystart=",
+      "max-length-of-arrow=",
+      "%witharrowsstyle",
+      "name=${1:node name}"
+    ],
+    [
+      "tikz={${1:TikZ options}}",
+      "xoffset=",
+      "command-name=${1:csname}",
+      "code-before=${1:code}",
+      "code-after=${1:code}",
+      "format=${1:cols}",
+      "show-nodes",
+      "show-node-names",
+      "displaystyle",
+      "ll",
+      "lr",
+      "rl",
+      "rr",
+      "i",
+      "group",
+      "groups",
+      "up-and-down={${1:options}}",
+      "jot=",
+      "interline=",
+      "tikz-code={${1:code}}",
+      "start-adjust=",
+      "end-adjust=",
+      "adjust=",
+      "ygap=",
+      "ystart=",
+      "max-length-of-arrow=",
+      "%witharrowsstyle",
+      "name=${1:node name}",
+      "wrap-lines",
+      "tagged-lines={${1:line1,line2,...}}",
+      "fleqn",
+      "mathindent=",
+      "subequations",
+      "standard-behaviour-with-items",
+      "left-brace",
+      "left-brace={${1:content}}",
+      "replace-left-brace-by="
+    ]
+  ]
+}
\ No newline at end of file
diff --git a/dev/packages/wordcloud.json b/dev/packages/wordcloud.json
index 8f4205ce8..e975206bc 100644
--- a/dev/packages/wordcloud.json
+++ b/dev/packages/wordcloud.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "wordcloud{}": {
-      "snippet": "wordcloud{${1:(${2:word1,weight1});(${3:word2,weight2});...}}"
+      "snippet": "wordcloud{${1:(${2:word1},${3:weight1});(${4:word2},${5:weight2});...}}"
     },
     "wordcloud[]{}": {
-      "snippet": "wordcloud[${2:options}]{${1:(${3:word1,weight1});(${4:word2,weight2});...}}",
+      "snippet": "wordcloud[${2:options}]{${1:(${3:word1},${4:weight1});(${5:word2},${6:weight2});...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
@@ -20,7 +20,7 @@
       "keyvalpos": 0
     },
     "wordcloudIgnoreWords{}": {
-      "snippet": "wordcloudIgnoreWords{${1:word1,word2,...}}"
+      "snippet": "wordcloudIgnoreWords{${1:word1,${2:word2},...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/wrapfig.json b/dev/packages/wrapfig.json
new file mode 100644
index 000000000..0850ff24a
--- /dev/null
+++ b/dev/packages/wrapfig.json
@@ -0,0 +1,31 @@
+{
+  "includes": {},
+  "macros": {
+    "wrapoverhang": {},
+    "WFclear": {}
+  },
+  "envs": {
+    "wrapfigure{}{}": {
+      "name": "wrapfigure",
+      "snippet": "{${1:position}}{${2:width}}"
+    },
+    "wrapfigure[]{}[]{}": {
+      "name": "wrapfigure",
+      "snippet": "[${3:lineheight}]{${1:position}}[${4:overhang}]{${2:width}}"
+    },
+    "wraptable{}{}": {
+      "name": "wraptable",
+      "snippet": "{${1:position}}{${2:width}}"
+    },
+    "wraptable[]{}[]{}": {
+      "name": "wraptable",
+      "snippet": "[${3:lineheight}]{${1:position}}[${4:overhang}]{${2:width}}"
+    },
+    "wrapfloat{}{}{}": {
+      "name": "wrapfloat",
+      "snippet": "{${1:floatname}}{${2:position}}{${3:width}}"
+    }
+  },
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xassoccnt.json b/dev/packages/xassoccnt.json
index f9e91f9b1..8d2c6c2da 100644
--- a/dev/packages/xassoccnt.json
+++ b/dev/packages/xassoccnt.json
@@ -12,34 +12,34 @@
       "keyvalpos": 2
     },
     "NewDocumentCounter{}": {
-      "snippet": "NewDocumentCounter{${1:counter1,counter2,...}}"
+      "snippet": "NewDocumentCounter{${1:counter1,${2:counter2},...}}"
     },
     "NewDocumentCounter{}[]": {
-      "snippet": "NewDocumentCounter{${1:counter1,counter2,...}}[${2:resetting counter}]"
+      "snippet": "NewDocumentCounter{${1:counter1,${3:counter2},...}}[${2:resetting counter}]"
     },
     "NewDocumentCounter[]{}": {
-      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,counter2,...}}",
+      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,${3:counter2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "NewDocumentCounter[]{}[]": {
-      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,counter2,...}}[${3:resetting counter}]",
+      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,${4:counter2},...}}[${3:resetting counter}]",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "DeclareDocumentCounter{}": {
-      "snippet": "DeclareDocumentCounter{${1:counter1,counter2,...}}"
+      "snippet": "DeclareDocumentCounter{${1:counter1,${2:counter2},...}}"
     },
     "DeclareDocumentCounter{}[]": {
-      "snippet": "DeclareDocumentCounter{${1:counter1,counter2,...}}[${2:resetting counter}]"
+      "snippet": "DeclareDocumentCounter{${1:counter1,${3:counter2},...}}[${2:resetting counter}]"
     },
     "DeclareDocumentCounter[]{}": {
-      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,counter2,...}}",
+      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,${3:counter2},...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "DeclareDocumentCounter[]{}[]": {
-      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,counter2,...}}[${3:resetting counter}]",
+      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,${4:counter2},...}}[${3:resetting counter}]",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -81,10 +81,10 @@
     "LastSetCounter": {},
     "LastCounterValue": {},
     "RemoveFromReset{}{}": {
-      "snippet": "RemoveFromReset{${1:counter1,counter2,...}}{${2:driver counter}}"
+      "snippet": "RemoveFromReset{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
     },
     "RemoveFromFullReset{}{}": {
-      "snippet": "RemoveFromFullReset{${1:counter1,counter2,...}}{${2:driver counter}}"
+      "snippet": "RemoveFromFullReset{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
     },
     "ClearCounterResetList{}": {
       "snippet": "ClearCounterResetList{${1:driver counter}}"
@@ -93,7 +93,7 @@
       "snippet": "ClearCounterResetList*{${1:driver counter}}"
     },
     "AddToReset{}{}": {
-      "snippet": "AddToReset{${1:counter1,counter2,...}}{${2:driver counter}}"
+      "snippet": "AddToReset{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
     },
     "countersresetlistcount{}": {
       "snippet": "countersresetlistcount{${1:counter}}"
@@ -125,22 +125,22 @@
       "snippet": "GetParentCounter{${1:counter}}"
     },
     "LoopAddtoCounters{}{}": {
-      "snippet": "LoopAddtoCounters{${1:counter1,counter2,...}}{${2:increment}}"
+      "snippet": "LoopAddtoCounters{${1:counter1,${3:counter2},...}}{${2:increment}}"
     },
     "LoopResetCounters{}": {
-      "snippet": "LoopResetCounters{${1:counter1,counter2,...}}"
+      "snippet": "LoopResetCounters{${1:counter1,${2:counter2},...}}"
     },
     "LoopRefstepCounters{}": {
-      "snippet": "LoopRefstepCounters{${1:counter1,counter2,...}}"
+      "snippet": "LoopRefstepCounters{${1:counter1,${2:counter2},...}}"
     },
     "LoopSetCounters{}{}": {
-      "snippet": "LoopSetCounters{${1:counter1,counter2,...}}{${2:value}}"
+      "snippet": "LoopSetCounters{${1:counter1,${3:counter2},...}}{${2:value}}"
     },
     "LoopStepCounters{}": {
-      "snippet": "LoopStepCounters{${1:counter1,counter2,...}}"
+      "snippet": "LoopStepCounters{${1:counter1,${2:counter2},...}}"
     },
     "LoopCountersFunction{}{}": {
-      "snippet": "LoopCountersFunction{${1:counter1,counter2,...}}{${2:macro}}"
+      "snippet": "LoopCountersFunction{${1:counter1,${3:counter2},...}}{${2:macro}}"
     },
     "LoopCounterResetList{}{}": {
       "snippet": "LoopCounterResetList{${1:counter}}{${2:macro}}"
@@ -149,16 +149,16 @@
       "snippet": "LoopFullCounterResetList{${1:counter}}{${2:macro}}"
     },
     "CounterWithin{}{}": {
-      "snippet": "CounterWithin{${1:counter1,counter2,...}}{${2:driver counter}}"
+      "snippet": "CounterWithin{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
     },
     "CounterWithin*{}{}": {
-      "snippet": "CounterWithin*{${1:counter1,counter2,...}}{${2:driver counter}}"
+      "snippet": "CounterWithin*{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
     },
     "CounterWithout{}{}": {
-      "snippet": "CounterWithout{${1:counter1,counter2,...}}{${2:driver counter}}"
+      "snippet": "CounterWithout{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
     },
     "CounterWithout*{}{}": {
-      "snippet": "CounterWithout*{${1:counter1,counter2,...}}{${2:driver counter}}"
+      "snippet": "CounterWithout*{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
     },
     "BinaryValue{}": {
       "snippet": "BinaryValue{${1:counter}}"
@@ -179,31 +179,31 @@
       "snippet": "xAlphAlph{${1:counter}}"
     },
     "CounterFormat{}": {
-      "snippet": "CounterFormat{${1:counter1!format1,counter2!format2,...}}"
+      "snippet": "CounterFormat{${1:counter1!format1,${2:counter2!format2},...}}"
     },
     "CounterFormat[]{}": {
-      "snippet": "CounterFormat[${2:options}]{${1:counter1!format1,counter2!format2,...}}",
+      "snippet": "CounterFormat[${2:options}]{${1:counter1!format1,${3:counter2!format2},...}}",
       "keyvalindex": 3,
       "keyvalpos": 0
     },
     "StoreCounterFormats{}": {
-      "snippet": "StoreCounterFormats{${1:shorthand1!macro1,shorthand2!macro2,...}}"
+      "snippet": "StoreCounterFormats{${1:shorthand1!macro1,${2:shorthand2!macro2},...}}"
     },
     "StoreCounterFormats[]{}": {
-      "snippet": "StoreCounterFormats[${2:options}]{${1:shorthand1!macro1,shorthand2!macro2,...}}",
+      "snippet": "StoreCounterFormats[${2:options}]{${1:shorthand1!macro1,${3:shorthand2!macro2},...}}",
       "keyvalindex": 4,
       "keyvalpos": 0
     },
     "AddCounterFormats{}": {
-      "snippet": "AddCounterFormats{${1:shorthand1!macro1,shorthand2!macro2,...}}"
+      "snippet": "AddCounterFormats{${1:shorthand1!macro1,${2:shorthand2!macro2},...}}"
     },
     "AddCounterFormats[]{}": {
-      "snippet": "AddCounterFormats[${2:options}]{${1:shorthand1!macro1,shorthand2!macro2,...}}",
+      "snippet": "AddCounterFormats[${2:options}]{${1:shorthand1!macro1,${3:shorthand2!macro2},...}}",
       "keyvalindex": 4,
       "keyvalpos": 0
     },
     "RemoveCounterFormats{}": {
-      "snippet": "RemoveCounterFormats{${1:shorthand1,shorthand2,...}}"
+      "snippet": "RemoveCounterFormats{${1:shorthand1,${2:shorthand2},...}}"
     },
     "DeclareAssociatedCounters{}{}": {
       "snippet": "DeclareAssociatedCounters{${1:driver counter}}{${2:assoc counter list}}"
@@ -253,10 +253,10 @@
       "snippet": "IsDriverCounter{${1:driver counter}}{${2:true}}{${3:false}}"
     },
     "DeclareCoupledCounters{}": {
-      "snippet": "DeclareCoupledCounters{${1:counter1,counter2,...}}"
+      "snippet": "DeclareCoupledCounters{${1:counter1,${2:counter2},...}}"
     },
     "DeclareCoupledCounters[]{}": {
-      "snippet": "DeclareCoupledCounters[${2:options}]{${1:counter1,counter2,...}}",
+      "snippet": "DeclareCoupledCounters[${2:options}]{${1:counter1,${3:counter2},...}}",
       "keyvalindex": 6,
       "keyvalpos": 0
     },
@@ -264,18 +264,18 @@
       "snippet": "DeclareCoupledCountersGroup{${1:group name}}"
     },
     "RemoveCoupledCounters{}": {
-      "snippet": "RemoveCoupledCounters{${1:counter1,counter2,...}}"
+      "snippet": "RemoveCoupledCounters{${1:counter1,${2:counter2},...}}"
     },
     "RemoveCoupledCounters[]{}": {
-      "snippet": "RemoveCoupledCounters[${2:options}]{${1:counter1,counter2,...}}",
+      "snippet": "RemoveCoupledCounters[${2:options}]{${1:counter1,${3:counter2},...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "AddCoupledCounters{}": {
-      "snippet": "AddCoupledCounters{${1:counter1,counter2,...}}"
+      "snippet": "AddCoupledCounters{${1:counter1,${2:counter2},...}}"
     },
     "AddCoupledCounters[]{}": {
-      "snippet": "AddCoupledCounters[${2:options}]{${1:counter1,counter2,...}}"
+      "snippet": "AddCoupledCounters[${2:options}]{${1:counter1,${3:counter2},...}}"
     },
     "ClearCoupledCounters{}": {
       "snippet": "ClearCoupledCounters{${1:options}}"
@@ -323,13 +323,13 @@
       "snippet": "IsPeriodicCounterF{${1:counter}}{${2:false}}"
     },
     "SuspendCounters{}": {
-      "snippet": "SuspendCounters{${1:counter1,counter2,...}}"
+      "snippet": "SuspendCounters{${1:counter1,${2:counter2},...}}"
     },
     "CascadeSuspendCounters{}": {
-      "snippet": "CascadeSuspendCounters{${1:counter1,counter2,...}}"
+      "snippet": "CascadeSuspendCounters{${1:counter1,${2:counter2},...}}"
     },
     "ResumeSuspendedCounters{}": {
-      "snippet": "ResumeSuspendedCounters{${1:counter1,counter2,...}}"
+      "snippet": "ResumeSuspendedCounters{${1:counter1,${2:counter2},...}}"
     },
     "ResumeAllSuspendedCounters": {},
     "IsSuspendedCounter{}{}{}": {
@@ -362,16 +362,16 @@
       "snippet": "IsTotalCounterF{${1:counter}}{${2:false}}"
     },
     "NewTotalDocumentCounter{}": {
-      "snippet": "NewTotalDocumentCounter{${1:total-counter1,total-counter2,...}}"
+      "snippet": "NewTotalDocumentCounter{${1:total-counter1,${2:total-counter2},...}}"
     },
     "NewTotalDocumentCounter[]{}": {
-      "snippet": "NewTotalDocumentCounter[${2:options}]{${1:total-counter1,total-counter2,...}}"
+      "snippet": "NewTotalDocumentCounter[${2:options}]{${1:total-counter1,${3:total-counter2},...}}"
     },
     "DeclareTotalDocumentCounter{}": {
-      "snippet": "DeclareTotalDocumentCounter{${1:total-counter1,total-counter2,...}}"
+      "snippet": "DeclareTotalDocumentCounter{${1:total-counter1,${2:total-counter2},...}}"
     },
     "DeclareTotalDocumentCounter[]{}": {
-      "snippet": "DeclareTotalDocumentCounter[${2:options}]{${1:total-counter1,total-counter2,...}}"
+      "snippet": "DeclareTotalDocumentCounter[${2:options}]{${1:total-counter1,${3:total-counter2},...}}"
     },
     "IsSuperTotalCounterTF{}{}{}": {
       "snippet": "IsSuperTotalCounterTF{${1:counter}}{${2:true}}{${3:false}}"
@@ -399,10 +399,10 @@
       "snippet": "LaTeXLabel[${2:cleveref overrule}]{${1:key}}"
     },
     "RegisterPreLabelHook{}": {
-      "snippet": "RegisterPreLabelHook{${1:cmd1,cmd2,...}}"
+      "snippet": "RegisterPreLabelHook{${1:cmd1,${2:cmd2},...}}"
     },
     "RegisterPostLabelHook{}": {
-      "snippet": "RegisterPostLabelHook{${1:cmd1,cmd2,...}}"
+      "snippet": "RegisterPostLabelHook{${1:cmd1,${2:cmd2},...}}"
     },
     "ClearPostLabelHook": {},
     "ClearPreLabelHook": {},
diff --git a/dev/packages/xcntperchap.json b/dev/packages/xcntperchap.json
index f09300ca1..1464e84d1 100644
--- a/dev/packages/xcntperchap.json
+++ b/dev/packages/xcntperchap.json
@@ -6,10 +6,10 @@
   },
   "macros": {
     "RegisterTrackCounter{}{}": {
-      "snippet": "RegisterTrackCounter{${1:track counter}}{${2:counter1,counter2,...}}"
+      "snippet": "RegisterTrackCounter{${1:track counter}}{${2:counter1,${3:counter2},...}}"
     },
     "RegisterMultipleTrackCounters{}{}": {
-      "snippet": "RegisterMultipleTrackCounters{${1:trackcounter1,trackcounter2,...}}{${2:counter1,counter2,...}}"
+      "snippet": "RegisterMultipleTrackCounters{${1:trackcounter1,${3:trackcounter2},${4:...}}{${2:counter1},${5:counter2},...}}"
     },
     "ObtainTrackedValue{}{}": {
       "snippet": "ObtainTrackedValue{${1:track level}}{${2:tracked counter}}"
@@ -42,10 +42,10 @@
       "snippet": "ObtainTrackedValueByLabel[${3:counter}]{${1:label}}{${2:tracked counter}}"
     },
     "AddToTrackedCounters{}{}": {
-      "snippet": "AddToTrackedCounters{${1:trackedcounter1,trackedcounter2,...}}{${2:counter value}}"
+      "snippet": "AddToTrackedCounters{${1:trackedcounter1,${3:trackedcounter2},...}}{${2:counter value}}"
     },
     "RegisterCounters{}{}": {
-      "snippet": "RegisterCounters{${1:track counter}}{${2:counter1,counter2,...}}"
+      "snippet": "RegisterCounters{${1:track counter}}{${2:counter1,${3:counter2},...}}"
     },
     "CloseTrackFileForWrite": {},
     "GetStoredValues": {},
diff --git a/dev/packages/xcolor.json b/dev/packages/xcolor.json
new file mode 100644
index 000000000..11316fbe6
--- /dev/null
+++ b/dev/packages/xcolor.json
@@ -0,0 +1,181 @@
+{
+  "includes": {
+    "color": [],
+    "colortbl": [
+      "table"
+    ]
+  },
+  "macros": {
+    "GetGinDriver": {},
+    "GinDriver": {},
+    "xcolorcmd": {},
+    "adjustUCRBG": {},
+    "rangeHsb": {},
+    "rangetHsb": {},
+    "rangeRGB": {},
+    "rangeHSB": {},
+    "rangeGray": {},
+    "substitutecolormodel{}{}": {
+      "snippet": "substitutecolormodel{${1:source model}}{${2:target model-list}}"
+    },
+    "selectcolormodel{}": {
+      "snippet": "selectcolormodel{${1:num model}}"
+    },
+    "ifconvertcolorsD": {},
+    "convertcolorsDtrue": {},
+    "convertcolorsDfalse": {},
+    "ifconvertcolorsU": {},
+    "convertcolorsUtrue": {},
+    "convertcolorsUfalse": {},
+    "definecolor{}{}{}": {
+      "snippet": "definecolor{${1:name}}{${2:model-list}}{${3:spec-list}}"
+    },
+    "definecolor[]{}{}{}": {
+      "snippet": "definecolor[${4:type}]{${1:name}}{${2:model-list}}{${3:spec-list}}"
+    },
+    "providecolor{}{}{}": {
+      "snippet": "providecolor{${1:name}}{${2:model-list}}{${3:spec-list}}"
+    },
+    "providecolor[]{}{}{}": {
+      "snippet": "providecolor[${4:type}]{${1:name}}{${2:model-list}}{${3:spec-list}}"
+    },
+    "colorlet{}{}": {
+      "snippet": "colorlet{${1:name}}{${2:color}}"
+    },
+    "colorlet{}[]{}": {
+      "snippet": "colorlet{${1:name}}[${2:num-model}]{${3:color}}"
+    },
+    "colorlet[]{}{}": {
+      "snippet": "colorlet[${3:type}]{${1:name}}{${2:color}}"
+    },
+    "colorlet[]{}[]{}": {
+      "snippet": "colorlet[${3:type}]{${1:name}}[${4:num-model}]{${2:color}}"
+    },
+    "definecolorset[]{}{}{}{}": {
+      "snippet": "definecolorset[${5:type}]{${1:model-list}}{${2:head}}{${3:tail}}{${4:set-spec}}"
+    },
+    "providecolorset[]{}{}{}{}": {
+      "snippet": "providecolorset[${5:type}]{${1:model-list}}{${2:head}}{${3:tail}}{${4:set-spec}}"
+    },
+    "preparecolor[]{}{}{}": {
+      "snippet": "preparecolor[${4:type}]{${1:name}}{${2:model-list}}{${3:spec-list}}"
+    },
+    "preparecolorset[]{}{}{}{}": {
+      "snippet": "preparecolorset[${5:type}]{${1:model-list}}{${2:head}}{${3:tail}}{${4:set-spec}}"
+    },
+    "ifdefinecolors": {},
+    "definecolorstrue": {},
+    "definecolorsfalse": {},
+    "definecolors{}": {
+      "snippet": "definecolors{${1:id-list}}"
+    },
+    "providecolors{}": {
+      "snippet": "providecolors{${1:id-list}}"
+    },
+    "ifglobalcolors": {},
+    "globalcolorstrue": {},
+    "globalcolorsfalse": {},
+    "xglobal": {},
+    "boxframe{}{}{}": {
+      "snippet": "boxframe{${1:width}}{${2:height}}{${3:depth}}"
+    },
+    "testcolor{}": {
+      "snippet": "testcolor{${1:color}}"
+    },
+    "testcolor[]{}": {
+      "snippet": "testcolor[${2:model-list}]{${1:spec-list}}"
+    },
+    "blendcolors{}": {
+      "snippet": "blendcolors{${1:mix-expr}}"
+    },
+    "blendcolors*{}": {
+      "snippet": "blendcolors*{${1:mix-expr}}"
+    },
+    "maskcolors{}": {
+      "snippet": "maskcolors{${1:color}}"
+    },
+    "maskcolors[]{}": {
+      "snippet": "maskcolors[${2:num-model}]{${1:color}}"
+    },
+    "ifmaskcolors": {},
+    "maskcolorstrue": {},
+    "maskcolorsfalse": {},
+    "colormask": {},
+    "definecolorseries{}{}{}{}{}": {
+      "snippet": "definecolorseries{${1:name}}{${2:core-model}}{${3:method}}{${4:b-spec}}{${5:s-spec}}"
+    },
+    "definecolorseries{}{}{}[]{}[]{}": {
+      "snippet": "definecolorseries{${1:name}}{${2:core-model}}{${3:method}}[${4:b-model}]{${5:b-spec}}[${6:s-model}]{${7:s-spec}}"
+    },
+    "resetcolorseries[]{}": {
+      "snippet": "resetcolorseries[${2:div}]{${1:name}}"
+    },
+    "colorseriescycle": {},
+    "extractcolorspec{}{}": {
+      "snippet": "extractcolorspec{${1:color}}{${2:cmd}}"
+    },
+    "extractcolorspecs{}{}{}": {
+      "snippet": "extractcolorspecs{${1:color}}{${2:model-cmd}}{${3:color-cmd}}"
+    },
+    "convertcolorspec{}{}{}{}": {
+      "snippet": "convertcolorspec{${1:model}}{${2:spec}}{${3:target-model}}{${4:cmd}}"
+    }
+  },
+  "envs": {
+    "testcolors": {},
+    "testcolors[]": {
+      "name": "testcolors",
+      "snippet": "[${1:model-list}]"
+    }
+  },
+  "options": [
+    "dvips",
+    "xdvi",
+    "dvipdf",
+    "dvipdfm",
+    "dvipdfmx",
+    "luatex",
+    "pdftex",
+    "dvipsone",
+    "dviwindo",
+    "emtex",
+    "dviwin",
+    "oztex",
+    "textures",
+    "pctexps",
+    "pctexwin",
+    "pctexhp",
+    "pctex32",
+    "truetex",
+    "tcidvi",
+    "vtex",
+    "xetex",
+    "dvisvgm",
+    "natural",
+    "rgb",
+    "cmy",
+    "cmyk",
+    "hsb",
+    "gray",
+    "RGB",
+    "HTML",
+    "HSB",
+    "Gray",
+    "monochrome",
+    "dvipsnames",
+    "dvipsnames*",
+    "svgnames",
+    "svgnames*",
+    "x11names",
+    "x11names*",
+    "table",
+    "prologue",
+    "kernelfbox",
+    "xcdraw",
+    "noxcdraw",
+    "fixinclude",
+    "showerrors",
+    "hideerrors"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xetex.json b/dev/packages/xetex.json
new file mode 100644
index 000000000..0914b10d2
--- /dev/null
+++ b/dev/packages/xetex.json
@@ -0,0 +1,131 @@
+{
+  "includes": {},
+  "macros": {
+    "XeTeXtracingfonts": {},
+    "XeTeXfonttype": {},
+    "XeTeXfirstfontchar": {},
+    "XeTeXlastfontchar": {},
+    "XeTeXglyph": {},
+    "XeTeXcountglyphs": {},
+    "XeTeXglyphname": {},
+    "XeTeXglyphindex": {},
+    "XeTeXcharglyph": {},
+    "XeTeXglyphbounds": {},
+    "XeTeXuseglyphmetrics": {},
+    "XeTeXgenerateactualtext": {},
+    "XeTeXOTcountscripts": {},
+    "XeTeXOTscripttag": {},
+    "XeTeXOTcountlanguages": {},
+    "XeTeXOTlanguagetag": {},
+    "XeTeXOTcountfeatures": {},
+    "XeTeXOTfeaturetag": {},
+    "XeTeXcountfeatures": {},
+    "XeTeXfeaturecode": {},
+    "XeTeXfeaturename": {},
+    "XeTeXisexclusivefeature": {},
+    "XeTeXfindfeaturebyname": {},
+    "XeTeXcountselectors": {},
+    "XeTeXselectorcode": {},
+    "XeTeXselectorname": {},
+    "XeTeXisdefaultselector": {},
+    "XeTeXfindselectorbyname": {},
+    "XeTeXcountvariations": {},
+    "XeTeXvariation": {},
+    "XeTeXvariationname": {},
+    "XeTeXvariationmin": {},
+    "XeTeXvariationmax": {},
+    "XeTeXvariationdefault": {},
+    "XeTeXfindvariationbyname": {},
+    "XeTeXinterwordspaceshaping": {},
+    "Umathcode": {},
+    "Umathcodenum": {},
+    "Umathchar": {},
+    "Umathcharnum": {},
+    "Umathchardef": {},
+    "Umathchardef{}": {
+      "snippet": "Umathchardef{${1:cmd}}"
+    },
+    "Umathcharnumdef": {},
+    "Umathcharnumdef{}": {
+      "snippet": "Umathcharnumdef{${1:cmd}}"
+    },
+    "Udelcode": {},
+    "Udelcodenum": {},
+    "Udelimiter": {},
+    "Umathaccent": {},
+    "Uradical": {},
+    "Uchar": {},
+    "Ucharcat": {},
+    "XeTeXinterchartokenstate": {},
+    "newXeTeXintercharclass": {},
+    "newXeTeXintercharclass{}": {
+      "snippet": "newXeTeXintercharclass{${1:cmd}}"
+    },
+    "XeTeXcharclass": {},
+    "XeTeXinterchartoks": {},
+    "XeTeXinputnormalization": {},
+    "XeTeXinputencoding": {},
+    "XeTeXdefaultencoding": {},
+    "XeTeXdashbreakstate": {},
+    "XeTeXlinebreaklocale": {},
+    "XeTeXlinebreakskip": {},
+    "XeTeXlinebreakpenalty": {},
+    "XeTeXupwardsmode": {},
+    "XeTeXhyphenatablelength": {},
+    "XeTeXpicfile": {},
+    "XeTeXpdffile": {},
+    "XeTeXpdfpagecount": {},
+    "XeTeXprotrudechars": {},
+    "pdfpageheight": {},
+    "pdfpagewidth": {},
+    "pdfsavepos": {},
+    "pdflastxpos": {},
+    "pdflastypos": {},
+    "expanded": {},
+    "ifincsname": {},
+    "ifprimitive": {},
+    "primitive": {},
+    "shellescape": {},
+    "strcmp{}{}": {
+      "snippet": "strcmp{${1:arg1}}{${2:arg2}}"
+    },
+    "normaldeviate": {},
+    "randomseed": {},
+    "setrandomseed": {},
+    "uniformdeviate": {},
+    "elapsedtime": {},
+    "resettimer": {},
+    "creationdate": {},
+    "filedump": {},
+    "filemoddate{}": {
+      "snippet": "filemoddate{${1:file}}"
+    },
+    "filesize{}": {
+      "snippet": "filesize{${1:file}}"
+    },
+    "mdfivesum": {},
+    "pdfmapfile{}": {
+      "snippet": "pdfmapfile{${1:file}}"
+    },
+    "pdfmapline{}": {
+      "snippet": "pdfmapline{${1:map spec}}"
+    },
+    "suppressfontnotfounderror": {},
+    "XeTeXversion": {},
+    "XeTeXrevision": {},
+    "XeTeXmathcode": {},
+    "XeTeXmathcodenum": {},
+    "XeTeXmathchar": {},
+    "XeTeXmathcharnum": {},
+    "XeTeXmathchardef": {},
+    "XeTeXmathcharnumdef": {},
+    "XeTeXdelcode": {},
+    "XeTeXdelcodenum": {},
+    "XeTeXdelimiter": {},
+    "XeTeXmathaccent": {},
+    "XeTeXradical": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xfp.json b/dev/packages/xfp.json
new file mode 100644
index 000000000..bd04b2481
--- /dev/null
+++ b/dev/packages/xfp.json
@@ -0,0 +1,7 @@
+{
+  "includes": {},
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xintcfrac.json b/dev/packages/xintcfrac.json
index cfd04684d..9ad007717 100644
--- a/dev/packages/xintcfrac.json
+++ b/dev/packages/xintcfrac.json
@@ -43,13 +43,13 @@
       "snippet": "xintFtoCC{${1:A/B}}"
     },
     "xintCstoF{}": {
-      "snippet": "xintCstoF{${1:num1,num2,...}}"
+      "snippet": "xintCstoF{${1:num1,${2:num2},...}}"
     },
     "xintGCtoF{}": {
       "snippet": "xintGCtoF{${1:expr}}"
     },
     "xintCstoCv{}": {
-      "snippet": "xintCstoCv{${1:num1,num2,...}}"
+      "snippet": "xintCstoCv{${1:num1,${2:num2},...}}"
     },
     "xintGCtoCv{}": {
       "snippet": "xintGCtoCv{${1:expr}}"
@@ -76,16 +76,16 @@
       "snippet": "xintGCntoGC{${1:integer}}{${2:macro1}}{${3:macro2}}"
     },
     "xintCstoGC{}": {
-      "snippet": "xintCstoGC{${1:num1,num2,...}}"
+      "snippet": "xintCstoGC{${1:num1,${2:num2},...}}"
     },
     "xintiCstoF{}": {
-      "snippet": "xintiCstoF{${1:integer1,integer2,...}}"
+      "snippet": "xintiCstoF{${1:integer1,${2:integer2},...}}"
     },
     "xintiGCtoF{}": {
       "snippet": "xintiGCtoF{${1:integer expr}}"
     },
     "xintiCstoCv{}": {
-      "snippet": "xintiCstoCv{${1:integer1,integer2,...}}"
+      "snippet": "xintiCstoCv{${1:integer1,${2:integer2},...}}"
     },
     "xintiGCtoCv{}": {
       "snippet": "xintiGCtoCv{${1:integer expr}}"
diff --git a/dev/packages/xlop.json b/dev/packages/xlop.json
index 76eca14a9..8b2efd72d 100644
--- a/dev/packages/xlop.json
+++ b/dev/packages/xlop.json
@@ -80,6 +80,18 @@
     "opdisplay[]{}{}": {
       "snippet": "opdisplay[${3:specs}]{${1:style}}{${2:number}}"
     },
+    "oplput(){}": {
+      "snippet": "oplput(${2:x},${3:y}){${1:text}}"
+    },
+    "oprput(){}": {
+      "snippet": "oprput(${2:x},${3:y}){${1:text}}"
+    },
+    "ophline(){}": {
+      "snippet": "ophline(${2:x},${3:y}){${1:length}}"
+    },
+    "opvline(){}": {
+      "snippet": "opvline(${2:x},${3:y}){${1:length}}"
+    },
     "opexport{}{}": {
       "snippet": "opexport{${1:number}}{${2:cmd}}"
     },
diff --git a/dev/packages/xob-font.json b/dev/packages/xob-font.json
index 7a76b021a..1960ead96 100644
--- a/dev/packages/xob-font.json
+++ b/dev/packages/xob-font.json
@@ -6,6 +6,114 @@
     "ob-unfontsdefault": []
   },
   "macros": {
+    "setkomainfont()": {
+      "snippet": "setkomainfont(${1:Regular})"
+    },
+    "setkomainfont()()": {
+      "snippet": "setkomainfont(${1:Regular})(${2:Bold})"
+    },
+    "setkomainfont()()()": {
+      "snippet": "setkomainfont(${1:Regular})(${2:Bold})(${3:Italic})"
+    },
+    "setkomainfont[]()": {
+      "snippet": "setkomainfont[${1:basename}](${2:Regular})"
+    },
+    "setkomainfont[]()()": {
+      "snippet": "setkomainfont[${1:basename}](${2:Regular})(${3:Bold})"
+    },
+    "setkomainfont[]()()()": {
+      "snippet": "setkomainfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
+    },
+    "setkosansfont()": {
+      "snippet": "setkosansfont(${1:Regular})"
+    },
+    "setkosansfont()()": {
+      "snippet": "setkosansfont(${1:Regular})(${2:Bold})"
+    },
+    "setkosansfont()()()": {
+      "snippet": "setkosansfont(${1:Regular})(${2:Bold})(${3:Italic})"
+    },
+    "setkosansfont[]()": {
+      "snippet": "setkosansfont[${1:basename}](${2:Regular})"
+    },
+    "setkosansfont[]()()": {
+      "snippet": "setkosansfont[${1:basename}](${2:Regular})(${3:Bold})"
+    },
+    "setkosansfont[]()()()": {
+      "snippet": "setkosansfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
+    },
+    "setkomonofont()": {
+      "snippet": "setkomonofont(${1:Regular})"
+    },
+    "setkomonofont()()": {
+      "snippet": "setkomonofont(${1:Regular})(${2:Bold})"
+    },
+    "setkomonofont()()()": {
+      "snippet": "setkomonofont(${1:Regular})(${2:Bold})(${3:Italic})"
+    },
+    "setkomonofont[]()": {
+      "snippet": "setkomonofont[${1:basename}](${2:Regular})"
+    },
+    "setkomonofont[]()()": {
+      "snippet": "setkomonofont[${1:basename}](${2:Regular})(${3:Bold})"
+    },
+    "setkomonofont[]()()()": {
+      "snippet": "setkomonofont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
+    },
+    "setobmainfont()": {
+      "snippet": "setobmainfont(${1:Regular})"
+    },
+    "setobmainfont()()": {
+      "snippet": "setobmainfont(${1:Regular})(${2:Bold})"
+    },
+    "setobmainfont()()()": {
+      "snippet": "setobmainfont(${1:Regular})(${2:Bold})(${3:Italic})"
+    },
+    "setobmainfont[]()": {
+      "snippet": "setobmainfont[${1:basename}](${2:Regular})"
+    },
+    "setobmainfont[]()()": {
+      "snippet": "setobmainfont[${1:basename}](${2:Regular})(${3:Bold})"
+    },
+    "setobmainfont[]()()()": {
+      "snippet": "setobmainfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
+    },
+    "setobsansfont()": {
+      "snippet": "setobsansfont(${1:Regular})"
+    },
+    "setobsansfont()()": {
+      "snippet": "setobsansfont(${1:Regular})(${2:Bold})"
+    },
+    "setobsansfont()()()": {
+      "snippet": "setobsansfont(${1:Regular})(${2:Bold})(${3:Italic})"
+    },
+    "setobsansfont[]()": {
+      "snippet": "setobsansfont[${1:basename}](${2:Regular})"
+    },
+    "setobsansfont[]()()": {
+      "snippet": "setobsansfont[${1:basename}](${2:Regular})(${3:Bold})"
+    },
+    "setobsansfont[]()()()": {
+      "snippet": "setobsansfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
+    },
+    "setobmonofont()": {
+      "snippet": "setobmonofont(${1:Regular})"
+    },
+    "setobmonofont()()": {
+      "snippet": "setobmonofont(${1:Regular})(${2:Bold})"
+    },
+    "setobmonofont()()()": {
+      "snippet": "setobmonofont(${1:Regular})(${2:Bold})(${3:Italic})"
+    },
+    "setobmonofont[]()": {
+      "snippet": "setobmonofont[${1:basename}](${2:Regular})"
+    },
+    "setobmonofont[]()()": {
+      "snippet": "setobmonofont[${1:basename}](${2:Regular})(${3:Bold})"
+    },
+    "setobmonofont[]()()()": {
+      "snippet": "setobmonofont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
+    },
     "compressbnms": {},
     "setmonoscale{}": {
       "snippet": "setmonoscale{${1:factor}}"
@@ -22,12 +130,21 @@
     "setkormainfont{}": {
       "snippet": "setkormainfont{${1:Regular}}"
     },
+    "setkormainfont()(){}": {
+      "snippet": "setkormainfont(${2:Bold})(${3:Italic}){${1:Regular}}"
+    },
     "setkorsansfont{}": {
       "snippet": "setkorsansfont{${1:Regular}}"
     },
+    "setkorsansfont()(){}": {
+      "snippet": "setkorsansfont(${2:Bold})(${3:Italic}){${1:Regular}}"
+    },
     "setkormonofont{}": {
       "snippet": "setkormonofont{${1:Regular}}"
     },
+    "setkormonofont()(){}": {
+      "snippet": "setkormonofont(${2:Bold})(${3:Italic}){${1:Regular}}"
+    },
     "setkorfontorigmethod{}{}": {
       "snippet": "setkorfontorigmethod{${1:arg1}}{${2:arg2}}"
     },
diff --git a/dev/packages/xpatch.json b/dev/packages/xpatch.json
new file mode 100644
index 000000000..9d146fed5
--- /dev/null
+++ b/dev/packages/xpatch.json
@@ -0,0 +1,10 @@
+{
+  "includes": {
+    "etoolbox": [],
+    "patch-common": []
+  },
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xpicture.json b/dev/packages/xpicture.json
index 6bcf012d2..20d22a4eb 100644
--- a/dev/packages/xpicture.json
+++ b/dev/packages/xpicture.json
@@ -14,6 +14,15 @@
     "pictcolor{}": {
       "snippet": "pictcolor{${1:color}}"
     },
+    "referencesystem()()()": {
+      "snippet": "referencesystem(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "changereferencesystem()()()": {
+      "snippet": "changereferencesystem(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
+    },
+    "translateorigin()": {
+      "snippet": "translateorigin(${1:x0},${2:y0})"
+    },
     "rotateaxes{}": {
       "snippet": "rotateaxes{${1:angle}}"
     },
@@ -26,6 +35,9 @@
     "cartesianreference": {},
     "polarreference": {},
     "draftPictures": {},
+    "cartesianaxes()()": {
+      "snippet": "cartesianaxes(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
     "axescolor": {},
     "axesthickness": {},
     "xunitdivisions": {},
@@ -99,6 +111,9 @@
     "printyticslabels[]{}{}{}": {
       "snippet": "printyticslabels[${4:digits}]{${1:firstcoor}}{${2:incr}}{${3:bound}}"
     },
+    "cartesiangrid()()": {
+      "snippet": "cartesiangrid(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
     "gridcolor": {},
     "secundarygridcolor": {},
     "gridthickness": {},
@@ -110,6 +125,27 @@
     "degreespolarlabels": {},
     "radianspolarlabels": {},
     "rlabelpos": {},
+    "Put(){}": {
+      "snippet": "Put(${2:x},${3:y}){${1:object}}"
+    },
+    "Put[](){}": {
+      "snippet": "Put[${2:position}](${3:x},${4:y}){${1:object}}"
+    },
+    "Put*(){}": {
+      "snippet": "Put*(${2:x},${3:y}){${1:object}}"
+    },
+    "Put*[](){}": {
+      "snippet": "Put*[${2:position}](${3:x},${4:y}){${1:object}}"
+    },
+    "cPut{}(){}": {
+      "snippet": "cPut{${1:position}}(${3:x},${4:y}){${2:object}}"
+    },
+    "rPut{}(){}": {
+      "snippet": "rPut{${1:position}}(${3:x},${4:y}){${2:object}}"
+    },
+    "rPut*{}(){}": {
+      "snippet": "rPut*{${1:position}}(${3:x},${4:y}){${2:object}}"
+    },
     "Pictlabelsep": {},
     "defaultPut{}": {
       "snippet": "defaultPut{${1:c|r}}"
@@ -117,9 +153,54 @@
     "highestlabel{}": {
       "snippet": "highestlabel{${1:text}}"
     },
+    "multiPut()(){}{}": {
+      "snippet": "multiPut(${3:x0},${4:y0})(${5:∆x},${6:∆y}){${1:n}}{${2:object}}"
+    },
+    "multiPut[]()(){}{}": {
+      "snippet": "multiPut[${3:position}](${4:x0},${5:y0})(${6:∆x},${7:∆y}){${1:n}}{${2:object}}"
+    },
+    "multiPut*()(){}{}": {
+      "snippet": "multiPut*(${3:x0},${4:y0})(${5:∆x},${6:∆y}){${1:n}}{${2:object}}"
+    },
+    "multiPut*[]()(){}{}": {
+      "snippet": "multiPut*[${3:position}](${4:x0},${5:y0})(${6:∆x},${7:∆y}){${1:n}}{${2:object}}"
+    },
+    "multicPut{}()(){}{}": {
+      "snippet": "multicPut{${1:position}}(${4:x0},${5:y0})(${6:∆x},${7:∆y}){${2:n}}{${3:object}}"
+    },
+    "multirPut{}()(){}{}": {
+      "snippet": "multirPut{${1:position}}(${4:x0},${5:y0})(${6:∆x},${7:∆y}){${2:n}}{${3:object}}"
+    },
+    "multirPut*{}()(){}{}": {
+      "snippet": "multirPut*{${1:position}}(${4:x0},${5:y0})(${6:∆x},${7:∆y}){${2:n}}{${3:object}}"
+    },
+    "xLINE()()": {
+      "snippet": "xLINE(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "xVECTOR()()": {
+      "snippet": "xVECTOR(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "xtrivVECTOR()()": {
+      "snippet": "xtrivVECTOR(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
     "arrowsize{}{}": {
       "snippet": "arrowsize{${1:xlen}}{${2:ylen}}"
     },
+    "xline(){}": {
+      "snippet": "xline(${2:x},${3:y}){${1:size}}"
+    },
+    "xvector(){}": {
+      "snippet": "xvector(${2:x},${3:y}){${1:size}}"
+    },
+    "xtrivvector(){}": {
+      "snippet": "xtrivvector(${2:x},${3:y}){${1:size}}"
+    },
+    "zerovector()": {
+      "snippet": "zerovector(${1:x},${2:y})"
+    },
+    "zerotrivvector()": {
+      "snippet": "zerotrivvector(${1:x},${2:y})"
+    },
     "regularPolygon{}{}": {
       "snippet": "regularPolygon{${1:radius}}{${2:sides}}"
     },
@@ -180,6 +261,9 @@
     },
     "pointmarkdiam": {},
     "pointmark": {},
+    "qCurve()()()()": {
+      "snippet": "qCurve(${1:x0},${2:y0})(${3:u0},${4:v0})(${5:x1},${6:y1})(${7:u1},${8:v1})"
+    },
     "bgfalse": {},
     "bgtrue": {},
     "degreesfalse": {},
@@ -208,6 +292,9 @@
     "labelstrue": {},
     "makegrid": {},
     "makenogrid": {},
+    "polarcoor()()": {
+      "snippet": "polarcoor(${1:a},${2:b})(${3:c},${4:d})"
+    },
     "polarfalse": {},
     "polartrue": {},
     "qCOS{}{}": {
@@ -216,8 +303,32 @@
     "qSIN{}{}": {
       "snippet": "qSIN{${1:angle}}{${2:cmd}}"
     },
+    "qUNITVECTOR()()": {
+      "snippet": "qUNITVECTOR(${1:a},${2:b})(${3:c},${4:d})"
+    },
+    "refsysPoint()()": {
+      "snippet": "refsysPoint(${1:a},${2:b})(${3:c},${4:d})"
+    },
+    "refsyspPoint()()": {
+      "snippet": "refsyspPoint(${1:a},${2:b})(${3:c},${4:d})"
+    },
+    "refsyspVector()()": {
+      "snippet": "refsyspVector(${1:a},${2:b})(${3:c},${4:d})"
+    },
+    "refsysVector()()": {
+      "snippet": "refsysVector(${1:a},${2:b})(${3:c},${4:d})"
+    },
+    "refsysxyPoint()()": {
+      "snippet": "refsysxyPoint(${1:a},${2:b})(${3:c},${4:d})"
+    },
+    "refsysxyVector()()": {
+      "snippet": "refsysxyVector(${1:a},${2:b})(${3:c},${4:d})"
+    },
     "rputstarfalse": {},
     "rputstartrue": {},
+    "strline()()": {
+      "snippet": "strline(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
     "themultiput": {},
     "ticsfalse": {},
     "ticslabelsgridfalse": {},
@@ -228,7 +339,24 @@
     "yone": {},
     "yzero": {}
   },
-  "envs": {},
+  "envs": {
+    "Picture(x0,y0)(x1,y1)": {
+      "name": "Picture",
+      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "Picture[](x0,y0)(x1,y1)": {
+      "name": "Picture",
+      "snippet": "[${1:color}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    },
+    "xpicture(x0,y0)(x1,y1)": {
+      "name": "xpicture",
+      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
+    },
+    "xpicture[](x0,y0)(x1,y1)": {
+      "name": "xpicture",
+      "snippet": "[${1:color}](${2:x0},${3:y0})(${4:x1},${5:y1})"
+    }
+  },
   "options": [
     "draft",
     "dvips",
diff --git a/dev/packages/xr-hyper.json b/dev/packages/xr-hyper.json
index 1d1deb818..fcd85a14a 100644
--- a/dev/packages/xr-hyper.json
+++ b/dev/packages/xr-hyper.json
@@ -1,25 +1,8 @@
 {
-  "includes": {},
-  "macros": {
-    "externaldocument{}": {
-      "snippet": "externaldocument{${1:file}}"
-    },
-    "externaldocument[]{}": {
-      "snippet": "externaldocument[${2:prefix}]{${1:file}}"
-    },
-    "externaldocument[][]{}": {
-      "snippet": "externaldocument[${2:prefix}][${3:nocite}]{${1:file}}"
-    },
-    "externaldocument{}[]": {
-      "snippet": "externaldocument{${1:file}}[${2:URL}]"
-    },
-    "externalcitedocument{}": {
-      "snippet": "externalcitedocument{${1:file}}"
-    },
-    "externalcitedocument[]{}": {
-      "snippet": "externalcitedocument[${2:prefix}]{${1:file}}"
-    }
+  "includes": {
+    "xr": []
   },
+  "macros": {},
   "envs": {},
   "options": [],
   "keyvals": []
diff --git a/dev/packages/xr.json b/dev/packages/xr.json
new file mode 100644
index 000000000..0c0a344a8
--- /dev/null
+++ b/dev/packages/xr.json
@@ -0,0 +1,32 @@
+{
+  "includes": {},
+  "macros": {
+    "externaldocument{}": {
+      "snippet": "externaldocument{${1:file}}"
+    },
+    "externaldocument[]{}": {
+      "snippet": "externaldocument[${2:prefix}]{${1:file}}"
+    },
+    "externaldocument[][]{}": {
+      "snippet": "externaldocument[${2:prefix}][${3:nocite}]{${1:file}}"
+    },
+    "externaldocument{}[]": {
+      "snippet": "externaldocument{${1:file}}[${2:URL}]"
+    },
+    "externalcitedocument{}": {
+      "snippet": "externalcitedocument{${1:file}}"
+    },
+    "externalcitedocument[]{}": {
+      "snippet": "externalcitedocument[${2:prefix}]{${1:file}}"
+    },
+    "externalcitedocument[][]{}": {
+      "snippet": "externalcitedocument[${2:prefix}][${3:nocite}]{${1:file}}"
+    },
+    "externalcitedocument{}[]": {
+      "snippet": "externalcitedocument{${1:file}}[${2:URL}]"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xskak.json b/dev/packages/xskak.json
index eccb954ce..24eb8bbe5 100644
--- a/dev/packages/xskak.json
+++ b/dev/packages/xskak.json
@@ -106,6 +106,9 @@
     "ifxskakboolpromotion": {},
     "ifxskakboolvar": {},
     "ifxskakpdfmatch": {},
+    "ParseCastlingAA()": {
+      "snippet": "ParseCastlingAA(${1:arg})"
+    },
     "skaklongmoves": {},
     "variationmovemode": {},
     "xskakboolcapturefalse": {},
diff --git a/dev/packages/xspace.json b/dev/packages/xspace.json
new file mode 100644
index 000000000..862583f6d
--- /dev/null
+++ b/dev/packages/xspace.json
@@ -0,0 +1,15 @@
+{
+  "includes": {},
+  "macros": {
+    "xspace": {},
+    "xspaceaddexceptions{}": {
+      "snippet": "xspaceaddexceptions{${1:arg}}"
+    },
+    "xspaceremoveexception{}": {
+      "snippet": "xspaceremoveexception{${1:arg}}"
+    }
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xtemplate.json b/dev/packages/xtemplate.json
index 214f6d181..f307a1a41 100644
--- a/dev/packages/xtemplate.json
+++ b/dev/packages/xtemplate.json
@@ -4,19 +4,6 @@
     "DeclareObjectType{}{}": {
       "snippet": "DeclareObjectType{${1:object type}}{${2:args}}"
     },
-    "DeclareTemplateInterface{}{}{}{}": {
-      "snippet": "DeclareTemplateInterface{${1:object type}}{${2:template}}{${3:args}}{${4:key list}}"
-    },
-    "KeyValue{}": {
-      "snippet": "KeyValue{${1:key name}}"
-    },
-    "DeclareTemplateCode{}{}{}{}{}": {
-      "snippet": "DeclareTemplateCode{${1:object type}}{${2:template}}{${3:args}}{${4:key bindings}}{${5:code}}"
-    },
-    "AssignTemplateKeys": {},
-    "DeclareInstance{}{}{}{}": {
-      "snippet": "DeclareInstance{${1:object type}}{${2:instance}}{${3:template}}{${4:parameters}}"
-    },
     "IfInstanceExistT{}{}{}{}": {
       "snippet": "IfInstanceExistT{${1:object type}}{${2:instance}}{${3:true}}{${4:false}}"
     },
@@ -26,41 +13,8 @@
     "IfInstanceExistTF{}{}{}{}": {
       "snippet": "IfInstanceExistTF{${1:object type}}{${2:instance}}{${3:true}}{${4:false}}"
     },
-    "DeclareInstanceCopy{}{}{}": {
-      "snippet": "DeclareInstanceCopy{${1:object type}}{${2:instance1}}{${3:instance2}}"
-    },
-    "UseInstance{}{}": {
-      "snippet": "UseInstance{${1:object type}}{${2:instance}}"
-    },
-    "UseTemplate{}{}{}": {
-      "snippet": "UseTemplate{${1:object type}}{${2:template}}{${3:settings}}"
-    },
-    "EditTemplateDefaults{}{}{}": {
-      "snippet": "EditTemplateDefaults{${1:object type}}{${2:template}}{${3:new defaults}}"
-    },
-    "EditInstance{}{}{}": {
-      "snippet": "EditInstance{${1:object type}}{${2:instance}}{${3:new values}}"
-    },
     "DeclareRestrictedTemplate{}{}{}{}": {
       "snippet": "DeclareRestrictedTemplate{${1:object type}}{${2:parent template}}{${3:new template}}{${4:parameters}}"
-    },
-    "SetTemplateKeys{}{}{}": {
-      "snippet": "SetTemplateKeys{${1:object type}}{${2:template}}{${3:keyvals}}"
-    },
-    "ShowInstanceValues{}{}": {
-      "snippet": "ShowInstanceValues{${1:object type}}{${2:instance}}"
-    },
-    "ShowTemplateCode{}{}": {
-      "snippet": "ShowTemplateCode{${1:object type}}{${2:template}}"
-    },
-    "ShowTemplateDefaults{}{}": {
-      "snippet": "ShowTemplateDefaults{${1:object type}}{${2:template}}"
-    },
-    "ShowTemplateInterface{}{}": {
-      "snippet": "ShowTemplateInterface{${1:object type}}{${2:template}}"
-    },
-    "ShowTemplateVariables{}{}": {
-      "snippet": "ShowTemplateVariables{${1:object type}}{${2:template}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/xy.json b/dev/packages/xy.json
new file mode 100644
index 000000000..e40a1f458
--- /dev/null
+++ b/dev/packages/xy.json
@@ -0,0 +1,370 @@
+{
+  "includes": {
+    "ifpdf": []
+  },
+  "macros": {
+    "xyoption{}": {
+      "snippet": "xyoption{${1:option}}"
+    },
+    "xyrequire{}": {
+      "snippet": "xyrequire{${1:option}}"
+    },
+    "xywithoption{}{}": {
+      "snippet": "xywithoption{${1:option}}{${2:code}}"
+    },
+    "xyeverywithoption{}{}": {
+      "snippet": "xyeverywithoption{${1:option}}{${2:code}}"
+    },
+    "xyeveryrequest{}{}": {
+      "snippet": "xyeveryrequest{${1:option}}{${2:code}}"
+    },
+    "afterPATH{}": {
+      "snippet": "afterPATH{${1:decor}}"
+    },
+    "afterPOS{}": {
+      "snippet": "afterPOS{${1:decor}}"
+    },
+    "AliasPattern{}{}{}": {
+      "snippet": "AliasPattern{${1:alias}}{${2:name}}{${3:file}}"
+    },
+    "ar[]": {
+      "snippet": "ar[${1:hop}]"
+    },
+    "arrowobject{}": {
+      "snippet": "arrowobject{${1:object}}"
+    },
+    "cir{}": {
+      "snippet": "cir{${1:spec}}"
+    },
+    "cir<>{}": {
+      "snippet": "cir<${2:radius}>{${1:spec}}"
+    },
+    "circleEdge": {},
+    "Col": {},
+    "CompileFixPoint{}": {
+      "snippet": "CompileFixPoint{${1:id}}"
+    },
+    "CompileMatrices": {},
+    "CompilePrefix{}": {
+      "snippet": "CompilePrefix{${1:prefix}}"
+    },
+    "composite{}": {
+      "snippet": "composite{${1:objects}}"
+    },
+    "connect": {},
+    "croplattice{}{}{}{}{}{}{}{}": {
+      "snippet": "croplattice{${1:pt1}}{${2:pt2}}{${3:pt3}}{${4:pt4}}{${5:pt5}}{${6:pt6}}{${7:pt7}}{${8:pt8}}"
+    },
+    "crv{}": {
+      "snippet": "crv{${1:poslist}}"
+    },
+    "crvs{}": {
+      "snippet": "crvs{${1:dir}}"
+    },
+    "curve{}": {
+      "snippet": "curve{${1:poslist}}"
+    },
+    "curveobject{}": {
+      "snippet": "curveobject{${1:object}}"
+    },
+    "ddtwocell": {},
+    "defaultlatticebody": {},
+    "dir{}": {
+      "snippet": "dir{${1:dir}}"
+    },
+    "Direction": {},
+    "dltwocell": {},
+    "drop": {},
+    "drtwocell": {},
+    "dtwocell": {},
+    "dumpPSdict{}": {
+      "snippet": "dumpPSdict{${1:filename}}"
+    },
+    "dutwocell": {},
+    "ellipse{}": {
+      "snippet": "ellipse{${1:style}}"
+    },
+    "ellipse<>{}": {
+      "snippet": "ellipse<${2:dimen}>{${1:style}}"
+    },
+    "endxy": {},
+    "frm{}": {
+      "snippet": "frm{${1:frame}}"
+    },
+    "halfrootthree": {},
+    "halfroottwo": {},
+    "knotstyle{}": {
+      "snippet": "knotstyle{${1:char}}"
+    },
+    "knotSTYLE{}": {
+      "snippet": "knotSTYLE{${1:code}}"
+    },
+    "knotstyles{}{}": {
+      "snippet": "knotstyles{${1:char1}}{${2:char2}}"
+    },
+    "labelbox": {},
+    "labelmargin": {},
+    "labelstyle": {},
+    "latticeA": {},
+    "latticeB": {},
+    "latticebody": {},
+    "latticeX": {},
+    "latticeY": {},
+    "ldtwocell": {},
+    "lltwocell": {},
+    "LoadAllPatterns{}": {
+      "snippet": "LoadAllPatterns{${1:file}}"
+    },
+    "LoadPattern{}{}": {
+      "snippet": "LoadPattern{${1:name}}{${2:file}}"
+    },
+    "lowercurveobject{}": {
+      "snippet": "lowercurveobject{${1:object}}"
+    },
+    "lrtwocell": {},
+    "ltwocell": {},
+    "lutwocell": {},
+    "MakeOutlines": {},
+    "maxTPICpoints{}": {
+      "snippet": "maxTPICpoints{${1:number}}"
+    },
+    "modmapobject{}": {
+      "snippet": "modmapobject{${1:object}}"
+    },
+    "MovieSetup{}": {
+      "snippet": "MovieSetup{${1:width=width,height=height}}"
+    },
+    "MultipleDrivers": {},
+    "newdir{}{}": {
+      "snippet": "newdir{${1:directional}}{${2:composite}}"
+    },
+    "newgraphescape{}{}": {
+      "snippet": "newgraphescape{${1:letter}}{${2:graph}}"
+    },
+    "newxycolor{}{}": {
+      "snippet": "newxycolor{${1:name}}{${2:code}}"
+    },
+    "newxypattern{}{}": {
+      "snippet": "newxypattern{${1:name}}{${2:data}}"
+    },
+    "NoCompileMatrices": {},
+    "NoEMspecials": {},
+    "NoOutlines": {},
+    "NoPScolor": {},
+    "NoPSframes": {},
+    "NoPSlines": {},
+    "NoPSrotate": {},
+    "NoPSspecials": {},
+    "NoPStiles": {},
+    "NoResizing": {},
+    "NoRules": {},
+    "NoTips": {},
+    "NoTPICframes": {},
+    "NoTPICspecials": {},
+    "object": {},
+    "objectbox{}": {
+      "snippet": "objectbox{${1:text}}"
+    },
+    "objectheight": {},
+    "objectmargin": {},
+    "objectstyle": {},
+    "objectwidth": {},
+    "OnlyOutlines": {},
+    "partroottwo": {},
+    "PATH": {},
+    "PATHafterPOS": {},
+    "POS": {},
+    "qspline{}": {
+      "snippet": "qspline{${1:style}}"
+    },
+    "rdtwocell": {},
+    "rectangleEdge": {},
+    "restore": {},
+    "rltwocell": {},
+    "Row": {},
+    "rrtwocell": {},
+    "rtwocell": {},
+    "rutwocell": {},
+    "save": {},
+    "scene": {},
+    "SelectTips{}{}": {
+      "snippet": "SelectTips{${1:family}}{${2:size}}"
+    },
+    "ShowOutlines": {},
+    "SilentMatrices": {},
+    "SloppyCurves": {},
+    "splinetolerance{}": {
+      "snippet": "splinetolerance{${1:dimen}}"
+    },
+    "turnradius": {},
+    "twocell": {},
+    "twocellhead{}": {
+      "snippet": "twocellhead{${1:object}}"
+    },
+    "twocellstyle": {},
+    "twocelltail{}": {
+      "snippet": "twocelltail{${1:object}}"
+    },
+    "txt{}": {
+      "snippet": "txt{${1:text}}"
+    },
+    "txt<>{}": {
+      "snippet": "txt<${2:width}>{${1:text}}"
+    },
+    "udtwocell": {},
+    "ultwocell": {},
+    "uppercurveobject{}": {
+      "snippet": "uppercurveobject{${1:object}}"
+    },
+    "urtwocell": {},
+    "UseAllTwocells": {},
+    "UseCompositeMaps": {},
+    "UseCrayolaColors": {},
+    "UseCurvedFrames": {},
+    "UseEMspecials": {},
+    "UseFontFrames": {},
+    "UseHalfTwocells": {},
+    "UsePatternFile{}": {
+      "snippet": "UsePatternFile{${1:file}}"
+    },
+    "UsePScolor": {},
+    "UsePSframes": {},
+    "UsePSheader{}": {
+      "snippet": "UsePSheader{${1:file}}"
+    },
+    "UsePSlines": {},
+    "UsePSrotate": {},
+    "UsePSspecials{}": {
+      "snippet": "UsePSspecials{${1:driver}}"
+    },
+    "UsePStiles": {},
+    "UseResizing": {},
+    "UseRules": {},
+    "UseSingleDriver": {},
+    "UseTips": {},
+    "UseTPICframes": {},
+    "UseTPICspecials": {},
+    "UseTwocells": {},
+    "utwocell": {},
+    "uutwocell": {},
+    "xtwocell[]{}": {
+      "snippet": "xtwocell[${2:hop}]{${1:displace}}"
+    },
+    "xtwocell{}": {
+      "snippet": "xtwocell{${1:displace}}"
+    },
+    "Xy": {},
+    "xy": {},
+    "xyatipfont": {},
+    "xybox{}": {
+      "snippet": "xybox{${1:<${2:pos}><${3:decor}>}}"
+    },
+    "xybsqlfont": {},
+    "xybtipfont": {},
+    "xycircfont": {},
+    "xycircle(){}": {
+      "snippet": "xycircle(${2:x},${3:y}){${1:style}}"
+    },
+    "xycircle<>{}": {
+      "snippet": "xycircle<${2:radius}>{${1:style}}"
+    },
+    "xycompile{}": {
+      "snippet": "xycompile{${1:<${2:pos}><${3:decor}>}}"
+    },
+    "xycompileto{}{}": {
+      "snippet": "xycompileto{${1:name}}{${2:<${3:pos}><${4:decor}>}}"
+    },
+    "xydashfont": {},
+    "xydate": {},
+    "xyecho": {},
+    "xygraph{}": {
+      "snippet": "xygraph{${1:graph}}"
+    },
+    "xyignore{}": {
+      "snippet": "xyignore{${1:<${2:pos}><${3:decor}>}}"
+    },
+    "xyimport()(){}": {
+      "snippet": "xyimport(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics code}}"
+    },
+    "xyimport(){}": {
+      "snippet": "xyimport(${2:width},${3:height}){${1:graphics code}}"
+    },
+    "xylattice{}{}{}{}": {
+      "snippet": "xylattice{${1:pt1}}{${2:pt2}}{${3:pt3}}{${4:pt4}}"
+    },
+    "xymatrix{}": {
+      "snippet": "xymatrix{${1:xy code}}"
+    },
+    "xymatrixcolsep": {},
+    "xymatrixcompile{}": {
+      "snippet": "xymatrixcompile{${1:xy code}}"
+    },
+    "xymatrixnocompile{}": {
+      "snippet": "xymatrixnocompile{${1:xy code}}"
+    },
+    "xymatrixrowsep": {},
+    "xypolygon": {},
+    "xypolyline{}": {
+      "snippet": "xypolyline{${1:toks}}"
+    },
+    "xypolyname": {},
+    "xypolynode": {},
+    "xypolynum": {},
+    "xyprovide{}{}{}{}{}{}": {
+      "snippet": "xyprovide{${1:option}}{${2:name}}{${3:version}}{${4:author}}{${5:email}}{${6:address}}"
+    },
+    "xyPSdefaultdict": {},
+    "xyquiet": {},
+    "xyReloadDrivers": {},
+    "xyresetcatcodes": {},
+    "xyShowDrivers": {},
+    "xytracing": {},
+    "xyverbose": {},
+    "xyversion": {},
+    "zeroDivideLimit{}": {
+      "snippet": "zeroDivideLimit{${1:number}}"
+    }
+  },
+  "envs": {
+    "xy": {}
+  },
+  "options": [
+    "curve",
+    "frame",
+    "tips",
+    "line",
+    "rotate",
+    "color",
+    "tile",
+    "import",
+    "movie",
+    "ps",
+    "tpic",
+    "emtex",
+    "necula",
+    "picture",
+    "all",
+    "dummy",
+    "arrow",
+    "2cell",
+    "matrix",
+    "graph",
+    "poly",
+    "web",
+    "arc",
+    "knot",
+    "smart",
+    "barr",
+    "dvidrv",
+    "dvips",
+    "dvitops",
+    "oztex",
+    "17oztex",
+    "textures",
+    "16textures",
+    "xdvi",
+    "pdf",
+    "v2"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/xymtx-pdf.json b/dev/packages/xymtx-pdf.json
index 4ca0e9924..c1c9caf08 100644
--- a/dev/packages/xymtx-pdf.json
+++ b/dev/packages/xymtx-pdf.json
@@ -15,19 +15,43 @@
     "cyan": {},
     "dashhasheddash": {},
     "green": {},
+    "HashWedgeAsSubst()(){}": {
+      "snippet": "HashWedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "HashWedgeAsSubstPDF()(){}": {
+      "snippet": "HashWedgeAsSubstPDF(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "HashWedgeAsSubstX()()": {
+      "snippet": "HashWedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "HashWedgeAsSubstX()()[]": {
+      "snippet": "HashWedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
+    },
+    "HashWedgeAsSubstXPDF()()": {
+      "snippet": "HashWedgeAsSubstXPDF(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "HashWedgeAsSubstXPDF()()[]": {
+      "snippet": "HashWedgeAsSubstXPDF(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
+    },
     "ifsizereduction": {},
     "magenta": {},
+    "PutBondLine()(){}": {
+      "snippet": "PutBondLine(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
+    },
+    "PutDashedBond()(){}": {
+      "snippet": "PutDashedBond(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
+    },
     "putRoundArrow[]{}": {
-      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
+      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
     },
     "putRoundArrow{}": {
-      "snippet": "putRoundArrow{${1:(${2:x1,y1})(${3:x2,y2})...}}"
+      "snippet": "putRoundArrow{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
     },
     "putRoundArrowPDF[]{}": {
-      "snippet": "putRoundArrowPDF[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
+      "snippet": "putRoundArrowPDF[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
     },
     "putRoundArrowPDF{}": {
-      "snippet": "putRoundArrowPDF{${1:(${2:x1,y1})(${3:x2,y2})...}}"
+      "snippet": "putRoundArrowPDF{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
     },
     "red": {},
     "setxymtxpdf": {},
@@ -38,6 +62,36 @@
     "sizereductiontrue": {},
     "thickLineWidth": {},
     "thinLineWidth": {},
+    "WavyAsSubst()(){}": {
+      "snippet": "WavyAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "WavyAsSubstPDF()(){}": {
+      "snippet": "WavyAsSubstPDF(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "WavyAsSubstX()()": {
+      "snippet": "WavyAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "WavyAsSubstXPDF()()": {
+      "snippet": "WavyAsSubstXPDF(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "WedgeAsSubst()(){}": {
+      "snippet": "WedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "WedgeAsSubstPDF()(){}": {
+      "snippet": "WedgeAsSubstPDF(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
+    },
+    "WedgeAsSubstX()()": {
+      "snippet": "WedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "WedgeAsSubstX()()[]": {
+      "snippet": "WedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
+    },
+    "WedgeAsSubstXPDF()()": {
+      "snippet": "WedgeAsSubstXPDF(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
+    },
+    "WedgeAsSubstXPDF()()[]": {
+      "snippet": "WedgeAsSubstXPDF(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
+    },
     "wedgehasheddash": {},
     "wedgehashedwedge": {},
     "white": {},
diff --git a/dev/packages/yagusylo.json b/dev/packages/yagusylo.json
index 6740e4afc..a6c8ed0bd 100644
--- a/dev/packages/yagusylo.json
+++ b/dev/packages/yagusylo.json
@@ -91,7 +91,7 @@
       "keyvalpos": 0
     },
     "setyagitemize{}": {
-      "snippet": "setyagitemize{${1:symfam1, number1, color1. symfam2, number2, color2. ...}}"
+      "snippet": "setyagitemize{${1:symfam1,${2: number1},${3: color1. symfam2},${4: number2}, color2. ...}}"
     },
     "setyagitemize*{}": {
       "snippet": "setyagitemize*{${1:dingname1. dingname2. ...}}"
diff --git a/dev/packages/ydoc.json b/dev/packages/ydoc.json
new file mode 100644
index 000000000..89157a70a
--- /dev/null
+++ b/dev/packages/ydoc.json
@@ -0,0 +1,49 @@
+{
+  "includes": {
+    "ydoc-code": [],
+    "ydoc-expl": [],
+    "ydoc-desc": [],
+    "ydoc-doc": [],
+    "newverbs": [],
+    "fontenc": [],
+    "fourier": [],
+    "ifpdf": [],
+    "microtype": [],
+    "array": [],
+    "booktabs": [],
+    "multicol": [],
+    "xcolor": [],
+    "listings": [],
+    "hyperref": []
+  },
+  "macros": {
+    "DH": {},
+    "dh": {},
+    "dj": {},
+    "DJ": {},
+    "guillemetleft": {},
+    "guillemetright": {},
+    "guillemotleft": {},
+    "guillemotright": {},
+    "guilsinglleft": {},
+    "guilsinglright": {},
+    "Hwithstroke": {},
+    "hwithstroke": {},
+    "k{}": {
+      "snippet": "k{${1:arg}}"
+    },
+    "NG": {},
+    "ng": {},
+    "quotedblbase": {},
+    "quotesinglbase": {},
+    "textogonekcentered{}": {
+      "snippet": "textogonekcentered{${1:arg}}"
+    },
+    "textquotedbl": {},
+    "th": {},
+    "TH": {}
+  },
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/youngtab.json b/dev/packages/youngtab.json
index 550ca338f..5af274436 100644
--- a/dev/packages/youngtab.json
+++ b/dev/packages/youngtab.json
@@ -16,6 +16,12 @@
     "Yinterspace{}": {
       "snippet": "Yinterspace{${1:skip}}"
     },
+    "yng()": {
+      "snippet": "yng(${1:r1},${2:r2},${3:...})"
+    },
+    "young()": {
+      "snippet": "young(${1:r11r12...},${2:r21r22...},${3:...})"
+    },
     "Ystdtext{}": {
       "snippet": "Ystdtext{${1:0|1}}"
     }
diff --git a/dev/packages/ytableau.json b/dev/packages/ytableau.json
index af46bf28e..a387611a3 100644
--- a/dev/packages/ytableau.json
+++ b/dev/packages/ytableau.json
@@ -12,15 +12,15 @@
     "endytableau": {},
     "none": {},
     "ytableaushort{}": {
-      "snippet": "ytableaushort{${1:line1,line2,...}}",
+      "snippet": "ytableaushort{${1:line1,${2:line2},...}}",
       "option": "textmode"
     },
     "ytableaushort[]{}": {
-      "snippet": "ytableaushort[${2:formatting}]{${1:line1,line2,...}}",
+      "snippet": "ytableaushort[${2:formatting}]{${1:line1,${3:line2},...}}",
       "option": "textmode"
     },
     "ydiagram{}": {
-      "snippet": "ydiagram{${1:offset+num1,num2,...}}"
+      "snippet": "ydiagram{${1:offset+num1,${2:num2},...}}"
     }
   },
   "envs": {
diff --git a/dev/packages/zhnumber.json b/dev/packages/zhnumber.json
index 28d29514b..d734873b1 100644
--- a/dev/packages/zhnumber.json
+++ b/dev/packages/zhnumber.json
@@ -68,10 +68,10 @@
       "snippet": "zhganzhinian{${1:year}}"
     },
     "zhnumExtendScaleMap{}": {
-      "snippet": "zhnumExtendScaleMap{${1:character1, character2, ..., charactern}}"
+      "snippet": "zhnumExtendScaleMap{${1:character1,${2: character2},${3: ...}, charactern}}"
     },
     "zhnumExtendScaleMap[]{}": {
-      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1, character2, ..., charactern}}"
+      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1,${3: character2},${4: ...}, charactern}}"
     },
     "zhnumsetup{}": {
       "snippet": "zhnumsetup{${1:options}}",
diff --git a/dev/packages/zref.json b/dev/packages/zref.json
new file mode 100644
index 000000000..0e6536dbc
--- /dev/null
+++ b/dev/packages/zref.json
@@ -0,0 +1,78 @@
+{
+  "includes": {
+    "zref-base": [],
+    "zref-abspage": [
+      "abspage"
+    ],
+    "zref-counter": [
+      "counter"
+    ],
+    "zref-dotfill": [
+      "dotfill"
+    ],
+    "zref-hyperref": [
+      "hyperref"
+    ],
+    "zref-lastpage": [
+      "lastpage"
+    ],
+    "zref-marks": [
+      "marks"
+    ],
+    "zref-nextpage": [
+      "nextpage"
+    ],
+    "zref-pageattr": [
+      "pageattr"
+    ],
+    "zref-pagelayout": [
+      "pagelayout"
+    ],
+    "zref-perpage": [
+      "perpage"
+    ],
+    "zref-runs": [
+      "runs"
+    ],
+    "zref-savepos": [
+      "savepos"
+    ],
+    "zref-thepage": [
+      "thepage"
+    ],
+    "zref-titleref": [
+      "titleref"
+    ],
+    "zref-totpages": [
+      "totpages"
+    ],
+    "zref-user": [
+      "user"
+    ],
+    "zref-xr": [
+      "xr"
+    ]
+  },
+  "macros": {},
+  "envs": {},
+  "options": [
+    "abspage",
+    "counter",
+    "dotfill",
+    "hyperref",
+    "lastpage",
+    "marks",
+    "nextpage",
+    "pageattr",
+    "pagelayout",
+    "perpage",
+    "runs",
+    "savepos",
+    "thepage",
+    "titleref",
+    "totpages",
+    "user",
+    "xr"
+  ],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/packages/zx-calculus.json b/dev/packages/zx-calculus.json
new file mode 100644
index 000000000..9b7779bcb
--- /dev/null
+++ b/dev/packages/zx-calculus.json
@@ -0,0 +1,11 @@
+{
+  "includes": {
+    "tikz": [],
+    "tikz-cd": [],
+    "tikzlibraryzx-calculus": []
+  },
+  "macros": {},
+  "envs": {},
+  "options": [],
+  "keyvals": []
+}
\ No newline at end of file
diff --git a/dev/pyintel/pkgcommand.py b/dev/pyintel/pkgcommand.py
index 731ba26ea..3d24f0a70 100644
--- a/dev/pyintel/pkgcommand.py
+++ b/dev/pyintel/pkgcommand.py
@@ -57,8 +57,12 @@ def create_snippet(line: str) -> str:
             snippet = re.sub(r'(\[)([^\[\$]*)(\])', p.sub, snippet)
         else:
             snippet = re.sub(r'(\{|\[)([^\{\[\$]*)(\}|\])', p.sub, snippet)
+
     snippet = re.sub(r'(?<![\{\s:\[])(\<)([a-zA-Z\s]*)(\>)', p.sub, snippet)
-    snippet = re.sub(r'(\()([^\{\}\[\]\(\)]*)(\))', p.sub, snippet)
+
+    # (x0,y0,z0)(x1,y1)
+    # snippet = re.sub(r'(\()([^\{\}\[\]\(\)]*)(\))', p.sub, snippet)
+    snippet = re.sub(r'(?<=\(|,)()([^,()]+)()(?=,|\))', p.sub, snippet)
     p.setKeepDelimiters(False)
     snippet = re.sub(r'(?<![\{:\[=-])(%\<)([a-zA-Z\s]*)(%\>)(?!})', p.sub, snippet)
 
@@ -69,6 +73,7 @@ def create_snippet(line: str) -> str:
     snippet = re.sub(r'%<([^%]*?)%:.*?%>', r'\1', snippet)
     snippet = re.sub(r'%<([^%]*?)%>', r'\1', snippet)
     snippet = re.sub(r'\$\{(\d+:.*?)%.*?\}', r'${\1}', snippet)
+    
     return snippet
 
 
@@ -247,7 +252,9 @@ def parse_cwl_file(self, file_path: Union[Path, str], remove_spaces: bool = Fals
                     name = name.strip()
                 # The name field can only contain letters, `{`, `}`, `[`, `]` and `*`.
                 # https://github.com/James-Yu/LaTeX-Workshop/issues/3264#issuecomment-1138733921
-                if re.search(r'[^A-Za-z0-9\[\]\{\}\<\>\*_^:\s]', name) is not None or '%' in name:
+                # Also include `(`, `)`, and `,`
+                # https://github.com/James-Yu/LaTeX-Workshop/issues/4313#issuecomment-2214209089
+                if re.search(r'[^A-Za-z0-9\[\]\{\}\<\>\*_^:\(\),\s]', name) is not None or '%' in name:
                     continue
                 snippet = create_snippet(match[2] if len(match.groups()) >= 2 and match[2] else '')
                 pkg.envs[name] = Env(
@@ -278,7 +285,9 @@ def parse_cwl_file(self, file_path: Union[Path, str], remove_spaces: bool = Fals
                     name = name.strip()
                 # The name field can only contain letters, `{`, `}`, `[`, `]` and `*`.
                 # https://github.com/James-Yu/LaTeX-Workshop/issues/3264#issuecomment-1138733921
-                if re.search(r'[^A-Za-z\[\]\{\}\<\>\*_^:\s]', name) is not None:
+                # Also include `(`, `)`, and `,`
+                # https://github.com/James-Yu/LaTeX-Workshop/issues/4313#issuecomment-2214209089
+                if re.search(r'[^A-Za-z\[\]\{\}\<\>\*_^:\(\),\s]', name) is not None:
                     continue
                 if name in self.commands:
                     continue
diff --git a/package.json b/package.json
index 49e3b9636..ae7e9a9fe 100644
--- a/package.json
+++ b/package.json
@@ -153,6 +153,13 @@
       {
         "id": "markdown_latex_combined",
         "configuration": "./syntax/markdown-latex-combined-language-configuration.json"
+      },
+      {
+        "id": "latex_workshop_log",
+        "aliases": [
+          "LaTeX Workshop Log"
+        ],
+        "configuration": "./syntax/latex-workshop-log-language-configuration.json"
       }
     ],
     "grammars": [
@@ -260,6 +267,11 @@
         "embeddedLanguages": {
           "source.r": "r"
         }
+      },
+      {
+        "language": "latex_workshop_log",
+        "scopeName": "text.latex_workshop.log",
+        "path": "./syntax/LaTeX-Workshop-Log.tmLanguage.json"
       }
     ],
     "snippets": [
diff --git a/src/compile/queue.ts b/src/compile/queue.ts
index 9d0d2a71d..368f5e8c5 100644
--- a/src/compile/queue.ts
+++ b/src/compile/queue.ts
@@ -136,5 +136,8 @@ export const queue = {
     clear,
     isLastStep,
     getStep,
-    getStepString
+    getStepString,
+    _test: {
+        getQueue: () => stepQueue
+    }
 }
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 410d25f83..9f5586cb0 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -109,7 +109,7 @@ function initialize(hostname?: string): http.Server {
                 logger.log(`BE AWARE: YOU ARE PUBLIC TO ${hostname} !`)
             }
             state.validOriginUri = await obtainValidOrigin(address.port, hostname ?? '127.0.0.1')
-            logger.log(`valdOrigin is ${getValidOrigin()}`)
+            logger.log(`validOrigin is ${getValidOrigin()}`)
             initializeWsServer(httpServer, getValidOrigin())
             // if (initializeResolve) {
             //     initializeResolve(undefined)
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index cea383b00..eb8f214b8 100644
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import { lw } from '../lw'
 
-const LOG_PANEL = vscode.window.createOutputChannel('LaTeX Workshop')
+const LOG_PANEL = vscode.window.createOutputChannel('LaTeX Workshop', 'latex_workshop_log')
 const COMPILER_PANEL = vscode.window.createOutputChannel('LaTeX Compiler')
 const STATUS_ITEM = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, -10000)
 const PLACEHOLDERS: {[placeholder: string]: string} = {}
diff --git a/syntax/DocTeX.tmLanguage.json b/syntax/DocTeX.tmLanguage.json
index 4dbdd5878..44e9faf3a 100644
--- a/syntax/DocTeX.tmLanguage.json
+++ b/syntax/DocTeX.tmLanguage.json
@@ -148,7 +148,7 @@
                         "4": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -1954,7 +1954,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -1964,7 +1964,7 @@
                         "5": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -2422,7 +2422,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -2458,7 +2458,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -2616,7 +2616,7 @@
                     "name": "meta.scope.item.latex"
                 },
                 {
-                    "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}:.]*\\})*)(?:([<\\[])[^\\]<>]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)",
+                    "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
                     "captures": {
                         "1": {
                             "name": "keyword.control.cite.latex"
@@ -2632,18 +2632,20 @@
                             ]
                         },
                         "4": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                            "patterns": [
+                                {
+                                    "include": "#optional-arg-angle-no-highlight"
+                                }
+                            ]
                         },
                         "5": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
+                            "patterns": [
+                                {
+                                    "include": "#optional-arg-bracket-no-highlight"
+                                }
+                            ]
                         },
                         "6": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "7": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        },
-                        "8": {
                             "name": "punctuation.definition.arguments.begin.latex"
                         }
                     },
@@ -2656,6 +2658,7 @@
                     "name": "meta.citation.latex",
                     "patterns": [
                         {
+                            "match": "((%).*)$",
                             "captures": {
                                 "1": {
                                     "name": "comment.line.percentage.tex"
@@ -2663,8 +2666,7 @@
                                 "2": {
                                     "name": "punctuation.definition.comment.tex"
                                 }
-                            },
-                            "match": "((%).*)$"
+                            }
                         },
                         {
                             "match": "[\\p{Alphabetic}\\p{Number}:.-]+",
@@ -2794,7 +2796,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -2837,7 +2839,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -2874,7 +2876,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -2921,7 +2923,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg"
+                                    "include": "#optional-arg-bracket"
                                 }
                             ]
                         },
@@ -3102,7 +3104,7 @@
                             "name": "punctuation.definition.variable.latex"
                         }
                     },
-                    "match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_[a-z]+",
+                    "match": "(\\\\)(?:[cgl]_+[_\\p{Alphabetic}@]+_[a-z]+|[qs]_[_\\p{Alphabetic}@]+[\\p{Alphabetic}@])",
                     "name": "variable.other.latex3.latex"
                 },
                 {
@@ -3127,27 +3129,29 @@
                 {
                     "captures": {
                         "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                            "patterns": [
+                                {
+                                    "include": "#optional-arg-parenthesis-no-highlight"
+                                }
+                            ]
                         },
                         "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
+                            "patterns": [
+                                {
+                                    "include": "#optional-arg-bracket-no-highlight"
+                                }
+                            ]
                         },
                         "3": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "4": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        },
-                        "5": {
                             "name": "punctuation.definition.arguments.begin.latex"
                         },
-                        "6": {
+                        "4": {
                             "name": "constant.other.reference.citation.latex"
                         },
-                        "7": {
+                        "5": {
                             "name": "punctuation.definition.arguments.end.latex"
                         },
-                        "8": {
+                        "6": {
                             "patterns": [
                                 {
                                     "include": "#autocites-arg"
@@ -3155,7 +3159,7 @@
                             ]
                         }
                     },
-                    "match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
+                    "match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
                 }
             ]
         },
@@ -3213,7 +3217,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -3276,7 +3280,7 @@
                 }
             ]
         },
-        "optional-arg": {
+        "optional-arg-bracket": {
             "patterns": [
                 {
                     "captures": {
@@ -3294,6 +3298,73 @@
                     "name": "meta.parameter.optional.latex"
                 }
             ]
+        },
+        "optional-arg-parenthesis": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "variable.parameter.function.latex"
+                        },
+                        "3": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(\\()([^\\(]*?)(\\))",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
+        },
+        "optional-arg-bracket-no-highlight": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(\\[)[^\\[]*?(\\])",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
+        },
+        "optional-arg-angle-no-highlight": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(<)[^<]*?(>)",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
+        },
+        "optional-arg-parenthesis-no-highlight": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(\\()[^\\(]*?(\\))",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
         }
     },
     "scopeName": "text.tex.doctex"
diff --git a/syntax/LaTeX-Workshop-Log.tmLanguage.json b/syntax/LaTeX-Workshop-Log.tmLanguage.json
new file mode 100644
index 000000000..cfeb46ed0
--- /dev/null
+++ b/syntax/LaTeX-Workshop-Log.tmLanguage.json
@@ -0,0 +1,85 @@
+{
+    "name": "LaTeX Workshop log",
+    "patterns": [
+        {
+            "begin": "^\\[([0-9\\.:]*)\\]\\[(\\w*)\\](?:\\[(\\w*)\\])?\\s?",
+            "end":"$",
+            "beginCaptures": {
+                "1": {
+                    "name": "constant.numeric.timestamp.latex_workshop.log"
+                },
+                "2": {
+                    "name": "constant.language.latex_workshop.log"
+                },
+                "3": {
+                    "name": "constant.language.latex_workshop.log"
+                }
+            },
+            "patterns": [
+                {
+                    "include": "#events"
+                },
+                {
+                    "include": "#variables"
+                },
+                {
+                    "include": "#message_with_brace_arguments"
+                },
+                {
+                    "include": "#message_with_bracket_arguments"
+                }
+            ]
+        }
+    ],
+    "repository": {
+        "events": {
+            "match": "\\G(BUILD_DONE|AUTO_BUILD_INITIATED|ROOT_FILE_CHANGED|ROOT_FILE_SEARCHED|FILE_PARSED|VIEWER_PAGE_LOADED|VIEWER_STATUS_CHANGED|FILE_WATCHED|FILE_CHANGED|FILE_REMOVED|DOCUMENT_CHANGED|STRUCTURE_UPDATED|AUTO_CLEANED)(?::\\s(.*))?",
+            "captures": {
+                "1": {
+                    "name": "support.function.latex_workshop.log"
+                },
+                "2": {
+                    "name": "string.latex_workshop.log"
+                }
+            },
+            "name": "meta.event.latex_workshop.log"
+        },
+         "variables": {
+            "match": "\\G(?:Set\\s)?(\\$?[\\w\\.-]+):\\s?(.*(?=\\s?\\.$)|.*(?=$))",
+            "captures": {
+                "1": {
+                    "name": "support.variable.latex_workshop.log"
+                },
+                "2": {
+                    "name": "string.latex_workshop.log"
+                }
+            },
+            "name": "meta.variable.latex_workshop.log"
+        },
+        "message_with_bracket_arguments": {
+            "match": "\\G([\\w\\s]+):\\s?\\[(.*)\\]",
+            "captures": {
+                "1": {
+                    "name": "entity.message.latex_workshop.log"
+                },
+                "2": {
+                    "name": "string.latex_workshop.log"
+                }
+            },
+            "name": "meta.message.latex_workshop.log"
+        },
+        "message_with_brace_arguments": {
+            "match": "\\G([\\w\\s]+):\\s?\\{(.*)\\}",
+            "captures": {
+                "1": {
+                    "name": "entity.message.latex_workshop.log"
+                },
+                "2": {
+                    "name": "string.latex_workshop.log"
+                }
+            },
+            "name": "meta.message.latex_workshop.log"
+        }
+    },
+    "scopeName": "text.latex_workshop.log"
+}
diff --git a/syntax/LaTeX.tmLanguage.json b/syntax/LaTeX.tmLanguage.json
index 191957c22..3e938d4fd 100644
--- a/syntax/LaTeX.tmLanguage.json
+++ b/syntax/LaTeX.tmLanguage.json
@@ -87,7 +87,7 @@
                 "4": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -1893,7 +1893,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -1903,7 +1903,7 @@
                 "5": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -2361,7 +2361,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -2397,7 +2397,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -2555,7 +2555,7 @@
             "name": "meta.scope.item.latex"
         },
         {
-            "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}:.]*\\})*)(?:([<\\[])[^\\]<>]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)",
+            "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
             "captures": {
                 "1": {
                     "name": "keyword.control.cite.latex"
@@ -2571,18 +2571,20 @@
                     ]
                 },
                 "4": {
-                    "name": "punctuation.definition.arguments.optional.begin.latex"
+                    "patterns": [
+                        {
+                            "include": "#optional-arg-angle-no-highlight"
+                        }
+                    ]
                 },
                 "5": {
-                    "name": "punctuation.definition.arguments.optional.end.latex"
+                    "patterns": [
+                        {
+                            "include": "#optional-arg-bracket-no-highlight"
+                        }
+                    ]
                 },
                 "6": {
-                    "name": "punctuation.definition.arguments.optional.begin.latex"
-                },
-                "7": {
-                    "name": "punctuation.definition.arguments.optional.end.latex"
-                },
-                "8": {
                     "name": "punctuation.definition.arguments.begin.latex"
                 }
             },
@@ -2595,6 +2597,7 @@
             "name": "meta.citation.latex",
             "patterns": [
                 {
+                    "match": "((%).*)$",
                     "captures": {
                         "1": {
                             "name": "comment.line.percentage.tex"
@@ -2602,8 +2605,7 @@
                         "2": {
                             "name": "punctuation.definition.comment.tex"
                         }
-                    },
-                    "match": "((%).*)$"
+                    }
                 },
                 {
                     "match": "[\\p{Alphabetic}\\p{Number}:.-]+",
@@ -2733,7 +2735,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -2776,7 +2778,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -2813,7 +2815,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -2860,7 +2862,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -3041,7 +3043,7 @@
                     "name": "punctuation.definition.variable.latex"
                 }
             },
-            "match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_[a-z]+",
+            "match": "(\\\\)(?:[cgl]_+[_\\p{Alphabetic}@]+_[a-z]+|[qs]_[_\\p{Alphabetic}@]+[\\p{Alphabetic}@])",
             "name": "variable.other.latex3.latex"
         },
         {
@@ -3066,27 +3068,29 @@
                 {
                     "captures": {
                         "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                            "patterns": [
+                                {
+                                    "include": "#optional-arg-parenthesis-no-highlight"
+                                }
+                            ]
                         },
                         "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
+                            "patterns": [
+                                {
+                                    "include": "#optional-arg-bracket-no-highlight"
+                                }
+                            ]
                         },
                         "3": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "4": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        },
-                        "5": {
                             "name": "punctuation.definition.arguments.begin.latex"
                         },
-                        "6": {
+                        "4": {
                             "name": "constant.other.reference.citation.latex"
                         },
-                        "7": {
+                        "5": {
                             "name": "punctuation.definition.arguments.end.latex"
                         },
-                        "8": {
+                        "6": {
                             "patterns": [
                                 {
                                     "include": "#autocites-arg"
@@ -3094,7 +3098,7 @@
                             ]
                         }
                     },
-                    "match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
+                    "match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
                 }
             ]
         },
@@ -3152,7 +3156,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg"
+                            "include": "#optional-arg-bracket"
                         }
                     ]
                 },
@@ -3215,7 +3219,7 @@
                 }
             ]
         },
-        "optional-arg": {
+        "optional-arg-bracket": {
             "patterns": [
                 {
                     "captures": {
@@ -3233,6 +3237,73 @@
                     "name": "meta.parameter.optional.latex"
                 }
             ]
+        },
+        "optional-arg-parenthesis": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "variable.parameter.function.latex"
+                        },
+                        "3": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(\\()([^\\(]*?)(\\))",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
+        },
+        "optional-arg-bracket-no-highlight": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(\\[)[^\\[]*?(\\])",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
+        },
+        "optional-arg-angle-no-highlight": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(<)[^<]*?(>)",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
+        },
+        "optional-arg-parenthesis-no-highlight": {
+            "patterns": [
+                {
+                    "captures": {
+                        "1": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "2": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        }
+                    },
+                    "match": "(\\()[^\\(]*?(\\))",
+                    "name": "meta.parameter.optional.latex"
+                }
+            ]
         }
     },
     "scopeName": "text.tex.latex"
diff --git a/syntax/latex-workshop-log-language-configuration.json b/syntax/latex-workshop-log-language-configuration.json
new file mode 100644
index 000000000..859032acf
--- /dev/null
+++ b/syntax/latex-workshop-log-language-configuration.json
@@ -0,0 +1,6 @@
+{
+	"brackets": [
+		["[", "]"]
+	],
+	"wordPattern": "(#-?\\d+|[A-Za-z_.][0-9A-Za-z_.]*\\$?)"
+}
diff --git a/test/fixtures/unittest/04_core_root/find_workspace/trap.tex b/test/fixtures/unittest/04_core_root/find_workspace/trap.tex
deleted file mode 100644
index fbc57a55f..000000000
--- a/test/fixtures/unittest/04_core_root/find_workspace/trap.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\documentclass{article}
-\begin{document}
diff --git a/test/units/05_compile.test.ts b/test/units/05_compile.test.ts
new file mode 100644
index 000000000..075645310
--- /dev/null
+++ b/test/units/05_compile.test.ts
@@ -0,0 +1,128 @@
+import * as path from 'path'
+import * as sinon from 'sinon'
+import { assert, mock } from './utils'
+import { lw } from '../../src/lw'
+import { queue } from '../../src/compile/queue'
+
+describe(path.basename(__filename).split('.')[0] + ':', () => {
+    // const fixture = path.basename(__filename).split('.')[0]
+
+    before(() => {
+        mock.object(lw, 'file', 'root')
+    })
+
+    after(() => {
+        sinon.restore()
+    })
+
+    describe.only('queue module', () => {
+        beforeEach(() => {
+            queue.clear()
+        })
+
+        it('should clear the queue', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
+            assert.strictEqual(queue._test.getQueue().steps.length, 1)
+
+            queue.clear()
+            assert.strictEqual(queue._test.getQueue().steps.length, 0)
+        })
+
+        it('should get the next step from the queue', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
+            queue.add({ name: 'bibtex', command: 'bibtex' }, 'main.tex', 'Recipe1', Date.now(), false)
+
+            const step1 = queue.getStep()
+            const step2 = queue.getStep()
+
+            assert.strictEqual(step1?.name, 'latex')
+            assert.strictEqual(step2?.name, 'bibtex')
+        })
+
+        it('should add a Tool as a RecipeStep to the queue', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now())
+
+            const step = queue.getStep()
+            assert.ok(step)
+            assert.strictEqual(step.rootFile, 'main.tex')
+            assert.strictEqual(step.recipeName, 'Recipe1')
+            assert.strictEqual(step.isExternal, false)
+        })
+
+        it('should add a Tool as an ExternalStep to the queue', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), true, '/usr/bin')
+
+            const step = queue.getStep()
+            assert.ok(step)
+            assert.strictEqual(step.recipeName, 'External')
+            assert.strictEqual(step.isExternal, true)
+            assert.strictEqual(step.cwd, '/usr/bin')
+        })
+
+        it('should prepend a Tool as a RecipeStep to the queue', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now())
+
+            let step = queue.getStep()
+            queue.clear()
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'alt.tex', 'Recipe1', Date.now())
+
+            assert.ok(step)
+            queue.prepend(step)
+
+            step = queue.getStep()
+            assert.ok(step)
+            assert.strictEqual(step.rootFile, 'main.tex')
+            assert.strictEqual(step.recipeName, 'Recipe1')
+            assert.strictEqual(step.isExternal, false)
+        })
+
+        it('should check if the last step in the queue', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
+
+            let step = queue.getStep()
+            assert.ok(step)
+            assert.ok(queue.isLastStep(step))
+
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now() + 1, false)
+
+            step = queue.getStep()
+            assert.ok(step)
+            assert.ok(queue.isLastStep(step))
+        })
+
+        it('should get the formatted string representation of a step', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
+
+            const step = queue.getStep()
+            assert.ok(step)
+            const stepString = queue.getStepString(step)
+            assert.strictEqual(stepString, 'Recipe1')
+        })
+
+        it('should get correct step repr with multiple recipes', () => {
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
+            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now() + 1, false)
+            const step = queue.getStep()
+            assert.ok(step)
+            const stepString = queue.getStepString(step)
+            assert.strictEqual(stepString, 'Recipe1')
+        })
+
+        it('should get correct step repr with multiple tools in one recipe', () => {
+            const recipeTime = Date.now()
+            queue.add({ name: 'latex1', command: 'pdflatex' }, 'main.tex', 'Recipe1', recipeTime, false)
+            queue.add({ name: 'latex2', command: 'pdflatex' }, 'main.tex', 'Recipe1', recipeTime, false)
+
+            let step = queue.getStep()
+            assert.ok(step)
+            let stepString = queue.getStepString(step)
+            assert.strictEqual(stepString, 'Recipe1: 1/2 (latex1)')
+
+            step = queue.getStep()
+            assert.ok(step)
+            stepString = queue.getStepString(step)
+            assert.strictEqual(stepString, 'Recipe1: 2/2 (latex2)')
+        })
+    })
+})
diff --git a/viewer/components/refresh.ts b/viewer/components/refresh.ts
index 5b28bd8fd..855e57249 100644
--- a/viewer/components/refresh.ts
+++ b/viewer/components/refresh.ts
@@ -1,6 +1,7 @@
 import * as utils from './utils.js'
 import { setTrimValue } from './trimming.js'
 import { sendLog } from './connection.js'
+import { viewerState, viewerStatePromise } from './state.js'
 import type { PDFViewerApplicationType, PDFViewerApplicationOptionsType } from './interface'
 import type { PdfViewerParams } from '../../types/latex-workshop-protocol-types/index.js'
 
@@ -112,6 +113,7 @@ export async function restoreState() {
 
 async function restoreDefault() {
     const params = await (await fetch('config.json')).json() as PdfViewerParams
+    await viewerStatePromise
 
     if (params.trim !== undefined) {
         setTrimValue(params.trim)
@@ -127,6 +129,14 @@ async function restoreDefault() {
     if (params.spreadMode !== undefined) {
         PDFViewerApplication.pdfViewer.spreadMode = params.spreadMode
     }
+
+    const viewerContainer = document.getElementById('viewerContainer')!
+    if (typeof viewerState.scrollTop === 'number' && viewerContainer.scrollTop !== viewerState.scrollTop) {
+        viewerContainer.scrollTop = viewerState.scrollTop
+    }
+    if (typeof viewerState.scrollLeft === 'number' && viewerContainer.scrollLeft !== viewerState.scrollLeft) {
+        viewerContainer.scrollLeft = viewerState.scrollLeft
+    }
 }
 
 let oldVisiblePages: number[]
diff --git a/viewer/components/state.ts b/viewer/components/state.ts
index 4c626ae19..01914c208 100644
--- a/viewer/components/state.ts
+++ b/viewer/components/state.ts
@@ -1,6 +1,6 @@
 import * as utils from './utils.js'
 import type { PDFViewerApplicationType } from './interface'
-import type { PdfViewerParams, PdfViewerState } from '../../types/latex-workshop-protocol-types/index.js'
+import type { PanelManagerResponse, PdfViewerParams, PdfViewerState } from '../../types/latex-workshop-protocol-types/index.js'
 import { getTrimValue } from './trimming.js'
 import { isSyncTeXEnabled, registerSyncTeX, setSyncTeXKey } from './synctex.js'
 import { IsAutoRefreshEnabled } from './refresh.js'
@@ -8,28 +8,32 @@ import { sendPanel } from './connection.js'
 
 declare const PDFViewerApplication: PDFViewerApplicationType
 
-// let viewerState: PdfViewerState | undefined
+export let viewerState: PdfViewerState
+let viewerStatePromiseResolve: () => void
+export const viewerStatePromise = new Promise<void>(resolve => viewerStatePromiseResolve = resolve)
 
 export function initUploadState() {
-//     window.addEventListener('message', (e) => {
-//         const data = e.data as PanelManagerResponse
-//         if (!data.type) {
-//             console.log('LateXWorkshopPdfViewer received a message of unknown type: ' + JSON.stringify(data))
-//             return
-//         }
-//         switch (data.type) {
-//             case 'restore_state': {
-//                 console.log(data.state)
-//                 // viewerState = data.state
-//                 break
-//             }
-//             default: {
-//                 break
-//             }
-//         }
-//     })
+    window.addEventListener('message', (e) => {
+        const data = e.data as PanelManagerResponse
+        if (!data.type) {
+            console.log('LateXWorkshopPdfViewer received a message of unknown type: ' + JSON.stringify(data))
+            return
+        }
+        switch (data.type) {
+            case 'restore_state': {
+                viewerState = data.state
+                viewerStatePromiseResolve()
+                break
+            }
+            default: {
+                break
+            }
+        }
+    })
 
     window.addEventListener('scrollend', () => { uploadState() }, true)
+
+    sendPanel({ type: 'initialized' })
 }
 
 export function uploadState() {
@@ -82,42 +86,3 @@ export async function setParams() {
         registerSyncTeX()
     }
 }
-
-// export async function setState(extension: LateXWorkshopPdfViewer) {
-//     const state = viewerState ?? await (await fetch('config.json')).json() as PdfViewerParams
-
-//     if (state.trim !== undefined) {
-//         setTrimValue(state.trim)
-//     }
-
-//     // By setting the scale, scaling will be invoked if necessary.
-//     // The scale can be a non-number one.
-//     if (state.scale !== undefined) {
-//         PDFViewerApplication.pdfViewer.currentScaleValue = state.scale
-//     }
-//     if (state.scrollMode !== undefined) {
-//         PDFViewerApplication.pdfViewer.scrollMode = state.scrollMode
-//     }
-//     if (state.spreadMode !== undefined) {
-//         PDFViewerApplication.pdfViewer.spreadMode = state.spreadMode
-//     }
-//     if (!('scrollTop' in state)) {
-//         return
-//     }
-
-//     if (state.scrollTop !== undefined) {
-//         document.getElementById('viewerContainer')!.scrollTop = state.scrollTop
-//     }
-//     if (state.scrollLeft !== undefined) {
-//         document.getElementById('viewerContainer')!.scrollLeft = state.scrollLeft
-//     }
-//     if (state.sidebarView !== undefined) {
-//         PDFViewerApplication.pdfSidebar.switchView(state.sidebarView)
-//     }
-//     if (state.synctexEnabled !== undefined) {
-//         extension.setSynctex(state.synctexEnabled)
-//     }
-//     if (state.autoReloadEnabled !== undefined) {
-//         extension.setAutoReload(state.autoReloadEnabled)
-//     }
-// }

From 87c98f8005d339a4c18eb9e1f009e88da29dd762 Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Sun, 11 Aug 2024 01:43:07 +0800
Subject: [PATCH 20/20] Revert "Squashed commit of the following:"

This reverts commit 5ae60c7a69b53b875ad5a313b76750d90374f586.
---
 data/packages/algorithm2e.json                |  102 -
 data/packages/babel.json                      |   31 +-
 data/packages/beamerbaseframesize.json        |   15 +-
 data/packages/biblatex.json                   |  590 +-
 data/packages/booktabs.json                   |    6 -
 data/packages/chemformula.json                |    3 -
 data/packages/circuitikz.json                 |    2 +-
 data/packages/class-altacv.json               |    2 +-
 data/packages/class-memoir.json               |    6 -
 data/packages/class-moderncv.json             |   35 -
 data/packages/class-scrlttr2.json             |    8 -
 data/packages/class-yathesis.json             |    1 -
 data/packages/coordsys.json                   |   90 -
 data/packages/fancybox.json                   |   27 -
 data/packages/fontspec.json                   |    3 -
 data/packages/glosstex.json                   |  114 -
 data/packages/hyperref.json                   |    2 +-
 data/packages/jurabib.json                    |   10 +-
 data/packages/latex-dev.json                  |  176 +-
 data/packages/latex-document.json             |   78 +-
 data/packages/listings.json                   |    2 +-
 data/packages/logsys.json                     |  108 -
 data/packages/paracol.json                    |    8 +-
 data/packages/pgfcore.json                    |    3 -
 data/packages/pgfplots.json                   |   50 +-
 data/packages/physics.json                    |  236 +-
 data/packages/physics2.json                   |   24 +-
 data/packages/pst-3d.json                     |    8 +-
 data/packages/pst-coil.json                   |   72 -
 data/packages/pst-node.json                   |  450 -
 data/packages/pst-plot.json                   |  113 +-
 data/packages/pst-text.json                   |   18 -
 data/packages/pstricks.json                   |  674 +-
 data/packages/subfigure.json                  |    3 -
 data/packages/tcolorbox.json                  |    4 +-
 data/packages/tex.json                        |   21 -
 data/packages/tkz-euclide.json                | 1804 +---
 data/packages/xy.json                         |    9 -
 data/packages/zhnumber.json                   |    4 +-
 dev/packages/CJK.json                         |  112 -
 dev/packages/CJKfntef.json                    |   75 -
 dev/packages/PapierGurvan.json                |    6 -
 dev/packages/ProfCollege.json                 |   52 +-
 dev/packages/ProfLycee.json                   |  173 +-
 dev/packages/ProfSio.json                     |   13 +-
 dev/packages/ResolSysteme.json                |  370 +-
 dev/packages/TangramTikz.json                 |   16 -
 dev/packages/WriteOnGrid.json                 |   30 -
 dev/packages/abspos.json                      |   36 -
 dev/packages/abstract.json                    |   34 -
 dev/packages/accsupp.json                     |   49 -
 dev/packages/achemso.json                     |   46 -
 dev/packages/acro.json                        |  934 --
 dev/packages/acronym.json                     |  383 -
 dev/packages/addrset.json                     |    2 +-
 dev/packages/addtoluatexpath.json             |    2 +-
 dev/packages/aeb_pro.json                     |    6 -
 dev/packages/aebxmp.json                      |    6 +-
 dev/packages/ajmacros.json                    |  254 -
 dev/packages/algorithm2e.json                 |  102 -
 dev/packages/alterqcm.json                    |    5 +-
 dev/packages/amsmath.json                     |  348 -
 dev/packages/answers.json                     |   57 -
 dev/packages/ar.json                          |   30 -
 dev/packages/argumentation.json               |   37 +-
 dev/packages/array.json                       |   20 -
 dev/packages/arrayjobx.json                   |    9 -
 dev/packages/arsclassica.json                 |   22 -
 dev/packages/ascmac.json                      |    9 -
 dev/packages/assoccnt.json                    |   96 -
 dev/packages/assurelatexmode.json             |   53 +-
 dev/packages/asyalign.json                    |    9 -
 dev/packages/asyfig.json                      |   31 -
 dev/packages/at.json                          |   19 -
 dev/packages/atbegshi.json                    |   40 -
 dev/packages/autoaligne.json                  |    3 -
 dev/packages/axodraw2.json                    | 1053 +-
 dev/packages/babel.json                       | 4651 ---------
 dev/packages/backref.json                     |   59 -
 dev/packages/balance.json                     |   11 -
 dev/packages/bangla.json                      |   72 -
 dev/packages/bargraph-js.json                 |    3 -
 dev/packages/beamerbaseframesize.json         |   15 +-
 dev/packages/beamerprosper.json               |    3 -
 dev/packages/beamerthemeAmurmaple.json        |    2 +-
 dev/packages/beamerthemeArguelles.json        |    1 -
 dev/packages/beamerthememoloch.json           |    1 -
 dev/packages/bewerbung.json                   |  163 -
 dev/packages/bez123.json                      |   18 -
 dev/packages/bibentry.json                    |   22 -
 dev/packages/biblatex-archaeology.json        |  156 -
 dev/packages/biblatex-chicago.json            |  184 +-
 dev/packages/biblatex-ext-oa.json             |    2 +-
 dev/packages/biblatex-ms.json                 |  194 +-
 dev/packages/biblatex.json                    | 8530 -----------------
 dev/packages/bibleref.json                    |   27 -
 dev/packages/bibpes.json                      |   29 -
 dev/packages/bidi.json                        |  341 -
 dev/packages/bidishadowtext.json              |    2 +-
 dev/packages/bm.json                          |   39 -
 dev/packages/bondcolor.json                   |    6 -
 dev/packages/booktabs.json                    |   47 -
 dev/packages/bxeepic.json                     |   27 -
 dev/packages/bxorigcapt.json                  |    2 +-
 dev/packages/calc.json                        |   47 -
 dev/packages/callouts.json                    |   42 -
 dev/packages/caption.json                     |  153 -
 dev/packages/catppuccinpalette.json           |   15 -
 dev/packages/censor.json                      |   60 -
 dev/packages/cesenaexam.json                  |   74 -
 dev/packages/cgloss4e.json                    |    3 -
 dev/packages/chapterbib.json                  |   38 -
 dev/packages/chemcompounds.json               |    4 +-
 dev/packages/chemfig.json                     |  243 -
 dev/packages/chemformula-ru.json              |    4 +-
 dev/packages/chemformula.json                 |    3 -
 dev/packages/chemist.json                     |  470 -
 dev/packages/chemmacros.json                  |   92 -
 dev/packages/chemplants.json                  |    4 +-
 dev/packages/chemstr.json                     |   12 -
 dev/packages/chet.json                        |  243 -
 dev/packages/chextras.json                    |    3 -
 dev/packages/chmst-pdf.json                   |   54 -
 dev/packages/circuitikz.json                  |    2 +-
 dev/packages/citation-style-language.json     |    8 -
 dev/packages/cite.json                        |   44 -
 dev/packages/class-abntex2.json               |   10 +-
 dev/packages/class-acmart.json                |    3 -
 dev/packages/class-altacv.json                |    2 +-
 dev/packages/class-aomart.json                |    1 -
 dev/packages/class-apa6.json                  |   18 +-
 dev/packages/class-asmeconf.json              |    5 +-
 dev/packages/class-asmejour.json              |    3 -
 dev/packages/class-bfhpub.json                |    4 +-
 dev/packages/class-bitart.json                |   32 -
 dev/packages/class-bitbook.json               |   24 -
 dev/packages/class-bjfuthesis.json            |   28 +-
 dev/packages/class-bookcover.json             |    8 +-
 dev/packages/class-cquthesis.json             |    6 +-
 dev/packages/class-droit-fr.json              |    3 -
 dev/packages/class-elegantbook.json           |    3 -
 dev/packages/class-elteikthesis.json          |    6 -
 dev/packages/class-fei.json                   |   12 -
 dev/packages/class-gztarticle.json            |    1 -
 dev/packages/class-hecthese.json              |    3 -
 dev/packages/class-hgbarticle.json            |   16 -
 dev/packages/class-hgbreport.json             |   16 -
 dev/packages/class-hgbthesis.json             |   16 -
 dev/packages/class-iopart.json                |    3 -
 dev/packages/class-l3doc.json                 |   21 +-
 dev/packages/class-langscibook.json           |    3 -
 dev/packages/class-letgut.json                |    1 -
 dev/packages/class-lni.json                   |    5 +-
 dev/packages/class-ltugboat.json              |    3 -
 dev/packages/class-matapli.json               |    1 -
 dev/packages/class-meetingmins.json           |    8 +-
 dev/packages/class-memoir.json                |    6 -
 dev/packages/class-mitthesis.json             |    6 -
 dev/packages/class-moderncv.json              |   35 -
 dev/packages/class-msu-thesis.json            |    1 -
 dev/packages/class-mucproc.json               |   12 -
 dev/packages/class-newlfm.json                |    2 +-
 dev/packages/class-njuthesis.json             |   32 -
 dev/packages/class-novel.json                 |   12 +-
 dev/packages/class-nwafuthesis.json           |   36 -
 dev/packages/class-nwejmart.json              |    3 -
 .../class-oup-authoring-template.json         |    2 +-
 dev/packages/class-philosophersimprint.json   |    2 +-
 dev/packages/class-prtec.json                 |   19 +-
 dev/packages/class-randexam.json              |   12 -
 dev/packages/class-resphilosophica.json       |   14 +-
 dev/packages/class-sagej.json                 |    2 +-
 dev/packages/class-sapthesis.json             |    4 +-
 dev/packages/class-schulma-klausur.json       |   18 -
 dev/packages/class-scrlttr2.json              |    8 -
 dev/packages/class-se2thesis.json             |    3 -
 dev/packages/class-skdoc.json                 |    4 +-
 dev/packages/class-sn-jnl.json                |    2 +-
 dev/packages/class-standalone.json            |    2 +-
 dev/packages/class-thuthesis.json             |    1 -
 dev/packages/class-tkz-doc.json               |    3 -
 dev/packages/class-tudapub.json               |    2 +-
 dev/packages/class-udes-genie-these.json      |    1 -
 dev/packages/class-ulthese.json               |   13 +-
 dev/packages/class-univie-ling-expose.json    |   29 -
 dev/packages/class-univie-ling-handout.json   |   28 -
 dev/packages/class-univie-ling-paper.json     |   29 -
 dev/packages/class-univie-ling-poster.json    |   32 -
 dev/packages/class-univie-ling-thesis.json    |   29 -
 dev/packages/class-univie-ling-wlg.json       |   17 +-
 dev/packages/class-utexasthesis.json          |    2 +-
 dev/packages/class-xdupgthesis.json           |   24 -
 dev/packages/class-xduugthesis.json           |   24 -
 dev/packages/class-xduugtp.json               |   24 -
 dev/packages/class-yathesis.json              |    1 -
 dev/packages/clock.json                       |   22 -
 dev/packages/cmdtrack.json                    |    2 +-
 dev/packages/codeanatomy.json                 |    5 +-
 dev/packages/codelisting.json                 |   76 -
 dev/packages/color.json                       |   79 -
 dev/packages/colorblind.json                  |   27 -
 dev/packages/colortbl.json                    |   88 -
 dev/packages/comma.json                       |   15 -
 dev/packages/comment.json                     |   69 -
 dev/packages/commutative-diagrams.json        |   49 -
 dev/packages/competences.json                 |    2 +-
 dev/packages/contour.json                     |   34 -
 dev/packages/contracard.json                  |  538 --
 dev/packages/conv-xkv.json                    |    9 -
 dev/packages/coordsys.json                    |   90 -
 dev/packages/cquthesis.json                   |   53 -
 dev/packages/cropmark.json                    |   21 -
 dev/packages/cursor.json                      |   29 -
 dev/packages/curve2e.json                     |  120 -
 dev/packages/curves.json                      |   27 -
 dev/packages/cyber.json                       |    2 +-
 dev/packages/dad.json                         |   25 -
 dev/packages/dbshow.json                      |   10 +-
 dev/packages/delim.json                       |   20 -
 dev/packages/delimset.json                    |   35 +-
 dev/packages/democodetools.json               |   20 +-
 dev/packages/diagbox.json                     |   60 -
 dev/packages/diagram.json                     |  278 -
 dev/packages/dichokey.json                    |   39 -
 dev/packages/diffcoeff.json                   |  136 +-
 dev/packages/digicap-pro.json                 |    2 +-
 dev/packages/dline.json                       |   51 -
 dev/packages/dljslib.json                     |    9 -
 dev/packages/doc.json                         |  269 -
 dev/packages/drawstack.json                   |    2 +-
 dev/packages/dsptricks.json                   |    7 +-
 dev/packages/dtk-url.json                     |    3 -
 dev/packages/dynkin-diagrams.json             |    4 -
 dev/packages/easybase.json                    |   35 +-
 dev/packages/easylist.json                    |   85 -
 dev/packages/easyvector.json                  |    3 -
 dev/packages/ebook.json                       |   18 -
 dev/packages/ed.json                          |  157 -
 dev/packages/eepic.json                       |   46 -
 dev/packages/egpeirce.json                    |    4 +-
 dev/packages/elements.json                    |   83 -
 dev/packages/ellipsis.json                    |   19 -
 dev/packages/emarks.json                      |   55 -
 dev/packages/embrac.json                      |    6 +-
 dev/packages/emo.json                         |   32 -
 dev/packages/emoji.json                       |   20 -
 dev/packages/emp.json                         |   44 +-
 dev/packages/endiagram.json                   |    4 +-
 dev/packages/endnotes.json                    |   36 -
 dev/packages/enumerate.json                   |   12 -
 dev/packages/epic.json                        |   80 -
 dev/packages/esami.json                       |    2 +-
 dev/packages/esk.json                         |    6 -
 dev/packages/eso-pic.json                     |   85 -
 dev/packages/etaremune.json                   |    3 +-
 dev/packages/etoc.json                        |  366 -
 dev/packages/euclideangeometry.json           |   99 -
 dev/packages/euler.json                       |   32 -
 dev/packages/example.json                     |   13 -
 dev/packages/exercise.json                    |  280 -
 dev/packages/exerquiz.json                    |   18 +-
 dev/packages/exesheet.json                    |  370 -
 dev/packages/expex-acro.json                  |    4 +-
 dev/packages/expex.json                       |    2 +-
 dev/packages/export.json                      |   53 -
 dev/packages/extract.json                     |   47 -
 dev/packages/fancybox.json                    |   27 -
 dev/packages/fancyhdr.json                    |  132 -
 dev/packages/fancyvrb-ex.json                 |   16 -
 dev/packages/fapapersize.json                 |    2 +-
 dev/packages/fbox.json                        |   50 -
 dev/packages/fdsymbol.json                    |    2 -
 dev/packages/fetchbibpes.json                 |    3 -
 dev/packages/feyn.json                        |   70 -
 dev/packages/feynmf.json                      |   63 +-
 dev/packages/feynmp.json                      |   63 +-
 dev/packages/filehook.json                    |   81 -
 dev/packages/fitch.json                       |  141 -
 dev/packages/float.json                       |   29 -
 dev/packages/floatrow.json                    |    4 +-
 dev/packages/fltrace.json                     |   11 -
 dev/packages/fontspec.json                    |  351 -
 dev/packages/fonttable.json                   |   77 -
 dev/packages/fontwrap.json                    |    4 +-
 dev/packages/footnote.json                    |   36 -
 dev/packages/forest-index.json                |    9 -
 dev/packages/forest.json                      |   12 -
 dev/packages/forloop.json                     |   22 -
 dev/packages/forms16be.json                   |    6 -
 dev/packages/fp.json                          |   22 -
 dev/packages/framed.json                      |   38 -
 dev/packages/fullpict.json                    |   87 +-
 dev/packages/functional.json                  | 1186 ---
 dev/packages/fusering.json                    |  156 -
 dev/packages/fvextra.json                     |    6 -
 dev/packages/gastex.json                      |  192 -
 dev/packages/gb4e.json                        |  180 -
 dev/packages/gchords.json                     |    2 +-
 dev/packages/gelasiomath.json                 |   35 -
 dev/packages/geometry.json                    |  269 -
 dev/packages/german.json                      |    7 -
 dev/packages/glossaries.json                  | 4118 --------
 dev/packages/glosstex.json                    |  114 -
 dev/packages/gradient-text.json               |    2 +-
 dev/packages/grafcet.json                     |   18 +-
 dev/packages/graphics.json                    |   84 -
 dev/packages/graphicsonthefly.json            |    2 +-
 dev/packages/graphpap.json                    |    9 +-
 dev/packages/greektonoi.json                  |    4 -
 dev/packages/gregoriosyms.json                |    4 +-
 dev/packages/gregoriotex.json                 |    4 +-
 dev/packages/grid.json                        |   30 -
 dev/packages/gridslides.json                  |   84 -
 dev/packages/grmath.json                      |   16 -
 dev/packages/guit.json                        |  197 -
 dev/packages/hamnosys.json                    |    2 +-
 dev/packages/handout.json                     |   42 -
 dev/packages/hcycle.json                      |   72 -
 dev/packages/hep-math.json                    |    4 +-
 dev/packages/hetarom.json                     |  168 -
 dev/packages/hetaromh.json                    |  120 -
 dev/packages/hf-tikz.json                     |    3 -
 dev/packages/hgbbib.json                      |   28 -
 dev/packages/hlist.json                       |    3 -
 dev/packages/hsetup.json                      |  367 -
 dev/packages/hvlogos.json                     |    4 +-
 dev/packages/hvpygmentex.json                 |    3 -
 dev/packages/hvqrurl.json                     |    3 +-
 dev/packages/hypbmsec.json                    |   42 -
 dev/packages/hyperref.json                    |  479 -
 dev/packages/icite.json                       |   36 -
 dev/packages/iffont.json                      |    2 +-
 dev/packages/ifoption.json                    |    2 +-
 dev/packages/ifthen.json                      |   41 -
 dev/packages/igo.json                         |  125 -
 dev/packages/imsart.json                      |  576 --
 dev/packages/index.json                       |   44 -
 dev/packages/inputenc.json                    |   58 -
 dev/packages/intcalc.json                     |   65 -
 dev/packages/interactiveanimation.json        |    4 +-
 dev/packages/interval.json                    |   60 -
 dev/packages/invoice.json                     |  116 -
 dev/packages/ipa.json                         |  153 -
 dev/packages/ipsum.json                       |   31 -
 dev/packages/isomath.json                     |   51 -
 dev/packages/joinbox.json                     |   16 +-
 dev/packages/junicode.json                    |    1 +
 dev/packages/jurabib.json                     |   10 +-
 dev/packages/kanbun.json                      |   54 -
 dev/packages/keyval.json                      |   14 -
 dev/packages/keyvaltable.json                 |    6 -
 dev/packages/knowledge.json                   |   23 +-
 dev/packages/knufakelogo.json                 |   15 -
 dev/packages/l3sys-query.json                 |   37 -
 dev/packages/la.json                          |   27 -
 dev/packages/labels.json                      |   90 -
 dev/packages/labyrinth.json                   |   19 -
 dev/packages/ladder.json                      |   50 -
 dev/packages/lapdf.json                       |  316 -
 dev/packages/latex-dev.json                   |  178 +-
 dev/packages/latex-document.json              |   78 +-
 dev/packages/latex2pydata.json                |    6 -
 dev/packages/latexscreenshooter.json          |   14 -
 dev/packages/layout.json                      |   74 -
 dev/packages/lazylist.json                    |    2 +-
 dev/packages/lcd.json                         |   29 -
 dev/packages/leading.json                     |   13 -
 dev/packages/lhelp.json                       |   18 -
 dev/packages/lie-hasse.json                   |   26 +-
 dev/packages/liftarm.json                     |  108 +-
 dev/packages/limap.json                       |   78 -
 dev/packages/linearregression.json            |   19 -
 dev/packages/lineno.json                      |  212 -
 dev/packages/lipsum.json                      |  171 -
 dev/packages/listing.json                     |   19 -
 dev/packages/listings.json                    |  344 -
 dev/packages/listingsutf8.json                |   30 -
 dev/packages/lltjext.json                     |   17 -
 dev/packages/lmodern.json                     |   11 -
 dev/packages/logicpuzzle.json                 |   16 +-
 dev/packages/logpap.json                      |   36 -
 dev/packages/logsys.json                      |  108 -
 dev/packages/longtable.json                   |   38 -
 dev/packages/lpic.json                        |    4 +-
 dev/packages/lscape.json                      |   13 -
 dev/packages/lstdoc.json                      |    2 +-
 dev/packages/ltugcomn.json                    |    3 -
 dev/packages/ltxdockit.json                   |  348 -
 dev/packages/luagcd.json                      |    2 +-
 dev/packages/luahttp.json                     |    8 +-
 dev/packages/luamaths.json                    |    4 +-
 dev/packages/luamplib.json                    |   40 +-
 dev/packages/luatex.json                      |  314 -
 dev/packages/luatexja-fontspec.json           |   24 -
 dev/packages/luatexko.json                    |   12 +-
 dev/packages/luatruthtable.json               |    4 +-
 dev/packages/lutabulartools.json              |   14 +-
 dev/packages/luwiantype.json                  |  780 --
 dev/packages/lwarp.json                       |    6 -
 dev/packages/mafr.json                        |    1 -
 dev/packages/mailmerge.json                   |    4 +-
 dev/packages/makecell.json                    |    3 -
 dev/packages/makeidx.json                     |   17 -
 dev/packages/makeplot.json                    |    6 -
 dev/packages/mandi.json                       |  488 +-
 dev/packages/mandistudent.json                |   30 +-
 dev/packages/mathsemantics-manifolds.json     |   90 -
 dev/packages/mathsemantics-semantic.json      |   12 -
 dev/packages/mathspec.json                    |   18 -
 dev/packages/mathtools.json                   |  521 -
 dev/packages/memhangul-common.json            |    2 +-
 dev/packages/memoize.json                     |  242 -
 dev/packages/memory.json                      |   14 -
 dev/packages/menu.json                        |   94 -
 dev/packages/merge.json                       |   12 -
 dev/packages/mfpic.json                       |  227 +-
 dev/packages/mfpic4ode.json                   |   12 +-
 dev/packages/miller.json                      |    3 -
 dev/packages/milsymb.json                     |   72 -
 dev/packages/minted.json                      |  297 -
 dev/packages/minutes.json                     |   34 +-
 dev/packages/mismath.json                     |    7 -
 dev/packages/mkstmp_pro.json                  |    2 +-
 dev/packages/mlist.json                       |  151 -
 dev/packages/modiagram.json                   |   36 +-
 dev/packages/msc.json                         |   61 -
 dev/packages/multibib.json                    |    2 +-
 dev/packages/multicol.json                    |   63 -
 dev/packages/multienv.json                    |   22 +-
 dev/packages/multilang.json                   |   49 -
 dev/packages/na-position.json                 |    4 +-
 dev/packages/nameauth.json                    |    6 +-
 dev/packages/nameref.json                     |   26 -
 dev/packages/nccfloats.json                   |   72 -
 dev/packages/nccpic.json                      |   14 +-
 dev/packages/newtx.json                       |    1 -
 dev/packages/newtxmath.json                   |    1 -
 dev/packages/nextpage.json                    |   24 -
 dev/packages/nicematrix.json                  |   28 +-
 dev/packages/nlctuserguide.json               |    2 +-
 dev/packages/nth.json                         |   27 -
 dev/packages/ntheorem.json                    |    2 +-
 dev/packages/numerica.json                    |   16 +-
 dev/packages/numprint.json                    |  149 -
 dev/packages/ocgx.json                        |   23 -
 dev/packages/ocgx2.json                       |   44 +-
 dev/packages/onedown.json                     |   24 -
 dev/packages/optex.json                       |   15 +-
 dev/packages/optional.json                    |   16 -
 dev/packages/options.json                     |  157 -
 dev/packages/orcidlink.json                   |   13 -
 dev/packages/otf.json                         |  142 -
 dev/packages/overarrows.json                  |   31 +-
 dev/packages/pagegrid.json                    |   47 -
 dev/packages/paracol.json                     |    8 +-
 dev/packages/parallel.json                    |   76 -
 dev/packages/parcolumns.json                  |   37 -
 dev/packages/parskip.json                     |   16 -
 dev/packages/pas-crosswords.json              |    8 +-
 dev/packages/pas-tableur.json                 |    4 +-
 dev/packages/passopt.json                     |   26 -
 dev/packages/path.json                        |   18 -
 dev/packages/pbox.json                        |   31 -
 dev/packages/pdfx.json                        |    1 -
 dev/packages/perpage.json                     |   28 -
 dev/packages/pgf-PeriodicTable.json           |   23 +-
 dev/packages/pgf-pie.json                     |    4 +-
 dev/packages/pgf-spectra.json                 |   23 -
 dev/packages/pgfcore.json                     |    3 -
 dev/packages/pgfmanual.json                   |   21 +-
 dev/packages/pgfmath.json                     |  491 -
 dev/packages/pgfplots.json                    |   50 +-
 dev/packages/phfparen.json                    |    6 -
 dev/packages/phfqit.json                      |   30 -
 dev/packages/physics.json                     |  236 +-
 dev/packages/physics2.json                    |   24 +-
 dev/packages/piano.json                       |   11 -
 dev/packages/picinpar.json                    |    6 +-
 dev/packages/picins.json                      |   53 +-
 dev/packages/pict2e.json                      |  119 -
 dev/packages/picture.json                     |   15 -
 dev/packages/pinoutikz.json                   |   27 -
 dev/packages/pinyin.json                      |  892 --
 dev/packages/piton.json                       |    7 +-
 dev/packages/placeat.json                     |   72 -
 dev/packages/plaintex.json                    |   21 -
 dev/packages/platex.json                      |  150 -
 dev/packages/plext.json                       |   12 -
 dev/packages/pm-isomath.json                  |  120 -
 dev/packages/pmdraw.json                      |   46 +-
 dev/packages/pmhanguljamo-frkim.json          |    6 -
 dev/packages/pmhanguljamo.json                |   10 +-
 dev/packages/polyglossia.json                 |   61 +-
 dev/packages/polyhedra.json                   |    2 +-
 dev/packages/polynomial.json                  |    4 +-
 dev/packages/popupmenu.json                   |    6 -
 dev/packages/poster.json                      |   57 -
 dev/packages/printlen.json                    |   18 -
 dev/packages/probsoln.json                    |   12 +-
 dev/packages/projlib-language.json            |    1 -
 dev/packages/proof.json                       |   26 -
 dev/packages/pseudo.json                      |   18 -
 dev/packages/pseudocode.json                  |   85 -
 dev/packages/psfragx.json                     |   15 -
 dev/packages/psgo.json                        |    8 +-
 dev/packages/pst-2dplot.json                  |   13 +-
 dev/packages/pst-3d.json                      |    8 +-
 dev/packages/pst-3dplot.json                  |  229 +-
 dev/packages/pst-abspos.json                  |    9 -
 dev/packages/pst-arrow.json                   |    6 -
 dev/packages/pst-bar.json                     |    3 -
 dev/packages/pst-bezier.json                  |   19 +-
 dev/packages/pst-circ.json                    |  513 -
 dev/packages/pst-coil.json                    |   72 -
 dev/packages/pst-contourplot.json             |   23 +-
 dev/packages/pst-dart.json                    |   21 -
 dev/packages/pst-dbicons.json                 |   30 -
 dev/packages/pst-electricfield.json           |   18 -
 dev/packages/pst-eucl.json                    | 1219 +--
 dev/packages/pst-feyn.json                    |  129 -
 dev/packages/pst-fractal.json                 |   81 -
 dev/packages/pst-fun.json                     |    6 -
 dev/packages/pst-func.json                    |  129 +-
 dev/packages/pst-geo.json                     |   39 -
 dev/packages/pst-geometrictools.json          |   39 -
 dev/packages/pst-gr3d.json                    |    6 -
 dev/packages/pst-hsb.json                     |    6 -
 dev/packages/pst-jtree.json                   |   12 -
 dev/packages/pst-knot.json                    |   12 -
 dev/packages/pst-labo.json                    |    6 -
 dev/packages/pst-lens.json                    |    8 -
 dev/packages/pst-lsystem.json                 |   23 +-
 dev/packages/pst-magneticfield.json           |   46 +-
 dev/packages/pst-marble.json                  |   39 +-
 dev/packages/pst-math.json                    |    3 -
 dev/packages/pst-mirror.json                  |   27 -
 dev/packages/pst-moire.json                   |   46 +-
 dev/packages/pst-node.json                    |  450 -
 dev/packages/pst-optexp.json                  |  594 --
 dev/packages/pst-optic.json                   |   75 -
 dev/packages/pst-pad.json                     |   48 -
 dev/packages/pst-pdf.json                     |  101 -
 dev/packages/pst-perspective.json             |   24 -
 dev/packages/pst-plot.json                    |  113 +-
 dev/packages/pst-rputover.json                |   61 +-
 dev/packages/pst-rubans.json                  |   15 -
 dev/packages/pst-shell.json                   |    5 -
 dev/packages/pst-sigsys.json                  |  204 -
 dev/packages/pst-slpe.json                    |    6 -
 dev/packages/pst-solides3d.json               |  245 +-
 dev/packages/pst-spinner.json                 |    8 -
 dev/packages/pst-stru.json                    |   12 -
 dev/packages/pst-text.json                    |   18 -
 dev/packages/pst-turtle.json                  |    9 +-
 dev/packages/pst-venn.json                    |   21 +-
 dev/packages/pstricks-add.json                |  214 +-
 dev/packages/pstricks.json                    |  674 +-
 dev/packages/ptex.json                        |   76 -
 dev/packages/puyotikz.json                    |    2 +-
 dev/packages/pxbabel.json                     |    2 +-
 dev/packages/pygmentex.json                   |  124 -
 dev/packages/pylatex.json                     |   29 -
 dev/packages/pythontex.json                   |    2 +-
 dev/packages/qcm.json                         |   58 -
 dev/packages/qrcode.json                      |   56 -
 dev/packages/qtree.json                       |   48 -
 dev/packages/quantikz.json                    |   10 -
 dev/packages/ran_toks.json                    |    4 +-
 dev/packages/randbild.json                    |   36 -
 dev/packages/rangen.json                      |    4 +-
 dev/packages/readarray.json                   |   12 +-
 dev/packages/rec-thy.json                     |   42 -
 dev/packages/rgltxdoc.json                    |    2 +-
 dev/packages/ribbonproofs.json                |    8 +-
 dev/packages/rigidnotation.json               |   21 -
 dev/packages/rterface.json                    |    2 +-
 dev/packages/ruby.json                        |   24 -
 dev/packages/sankey.json                      |    4 +-
 dev/packages/scanpages.json                   |   15 -
 dev/packages/schule.json                      |    4 -
 dev/packages/schwalbe.json                    |   29 -
 dev/packages/scontents.json                   |    7 +-
 dev/packages/scrbase.json                     |  351 -
 dev/packages/scrletter.json                   |    6 -
 dev/packages/se2packages.json                 |   16 -
 dev/packages/semantex.json                    |  630 --
 dev/packages/semantic.json                    |   95 -
 dev/packages/semesterplannerlua.json          |   99 -
 dev/packages/sepfootnotes.json                |    3 +-
 dev/packages/sets.json                        |   35 -
 dev/packages/setspace.json                    |   35 -
 dev/packages/sf298.json                       |    2 +-
 dev/packages/shadow.json                      |   14 -
 dev/packages/shadowtext.json                  |   28 -
 dev/packages/shapepar.json                    |    3 -
 dev/packages/sidebars.json                    |   10 +-
 dev/packages/sidenotesplus.json               |    6 -
 dev/packages/simplekv.json                    |    6 +-
 dev/packages/simplenodes.json                 |    2 +-
 dev/packages/simpleoptics.json                |    2 +-
 dev/packages/simples-matrices.json            |   66 -
 dev/packages/siunitx.json                     | 2747 ------
 dev/packages/skak.json                        |  584 --
 dev/packages/skillicons.json                  |   16 -
 dev/packages/skmath.json                      |    6 +-
 dev/packages/snotez.json                      |    6 -
 dev/packages/sparklines.json                  |   25 -
 dev/packages/spbmark.json                     |    9 +-
 dev/packages/spectralsequences.json           |  231 +-
 dev/packages/spelatex.json                    |   91 -
 dev/packages/spot.json                        |   24 -
 dev/packages/spotcolor.json                   |   43 -
 dev/packages/spreadtab.json                   |    6 -
 dev/packages/sseq.json                        |  410 -
 dev/packages/stack.json                       |   23 -
 dev/packages/stackengine.json                 |  204 -
 dev/packages/standalone.json                  |   89 -
 dev/packages/standardsectioning.json          |   11 -
 dev/packages/statistics.json                  |  527 -
 dev/packages/stex.json                        |  985 --
 dev/packages/structmech.json                  |   60 +-
 dev/packages/struktex.json                    |    8 -
 dev/packages/styledcmd.json                   |    2 +-
 dev/packages/subfigure.json                   |    3 -
 dev/packages/sudoku.json                      |   14 -
 dev/packages/suffix.json                      |    7 -
 dev/packages/sverb.json                       |   35 -
 dev/packages/svg.json                         |  102 -
 dev/packages/swfigure.json                    |   33 +-
 dev/packages/synthslant.json                  |    1 -
 dev/packages/systeme.json                     |    4 +-
 dev/packages/tableof.json                     |   59 -
 dev/packages/tablvar.json                     |    2 +-
 dev/packages/tabstackengine.json              |    2 +-
 dev/packages/tabto.json                       |    2 +-
 dev/packages/tabu.json                        |   87 -
 dev/packages/tabularcalc.json                 |    4 +-
 dev/packages/tagpdf.json                      |    3 +
 dev/packages/tasks.json                       |   32 -
 dev/packages/tcolorbox.json                   |    4 +-
 .../tcolorboxlibrarydocumentation.json        |    8 +-
 dev/packages/tcolorboxlibraryskins.json       |    1 +
 dev/packages/ted.json                         |   28 -
 dev/packages/tensor.json                      |   45 -
 dev/packages/tex.json                         | 1425 ---
 dev/packages/tex4ht.json                      |    8 +-
 dev/packages/texdraw.json                     |   39 -
 dev/packages/texshade.json                    |   22 +-
 dev/packages/textopo.json                     |   20 +-
 dev/packages/textpos.json                     |   19 +-
 dev/packages/theorem.json                     |   19 -
 dev/packages/thm-listof.json                  |    6 +-
 dev/packages/tikz-3dplot.json                 |    6 -
 dev/packages/tikz-inet.json                   |   21 -
 dev/packages/tikz-lake-fig.json               |    3 -
 dev/packages/tikz-network.json                |   45 +-
 dev/packages/tikz-truchet.json                |   18 +-
 dev/packages/tikz.json                        | 1508 ---
 dev/packages/tikz3d-fr.json                   |    6 -
 dev/packages/tikzdotncross.json               |   18 -
 dev/packages/tikzinput.json                   |   63 -
 .../tikzlibrarycommutative-diagrams.json      |    6 -
 .../tikzlibrarydatavisualization.json         |    3 -
 dev/packages/tikzlings.json                   |  163 -
 dev/packages/tikzpingus.json                  |    4 +-
 dev/packages/tikzquests.json                  |    6 -
 dev/packages/tikzrput.json                    |   12 -
 dev/packages/time.json                        |   11 -
 dev/packages/titlefoot.json                   |    2 +-
 dev/packages/titleps.json                     |    4 +-
 dev/packages/titleref.json                    |   15 -
 dev/packages/tkz-base.json                    |  190 +-
 dev/packages/tkz-berge.json                   |   14 +-
 dev/packages/tkz-elements.json                |    6 -
 dev/packages/tkz-euclide.json                 | 1804 +---
 dev/packages/tkz-fct.json                     |   39 +-
 dev/packages/tkz-graph.json                   |  146 +-
 dev/packages/tkz-kiviat.json                  |   19 +-
 dev/packages/tkz-tab.json                     |   14 +-
 dev/packages/tocbasic.json                    |  288 -
 dev/packages/todo.json                        |   62 -
 dev/packages/todonotes.json                   |  148 -
 dev/packages/tokcycle.json                    |    2 +-
 dev/packages/tone.json                        |   19 -
 dev/packages/toolbox.json                     |  120 -
 dev/packages/toptesi.json                     |  256 -
 dev/packages/totpages.json                    |   25 -
 dev/packages/trace.json                       |   13 -
 dev/packages/translations.json                |  143 -
 dev/packages/translator.json                  |   77 -
 dev/packages/trees.json                       |   15 -
 dev/packages/trig.json                        |   26 -
 dev/packages/truncate.json                    |   20 -
 dev/packages/truthtable.json                  |   16 -
 dev/packages/tsvtemplate.json                 |    4 +-
 dev/packages/twemojis.json                    |   58 -
 dev/packages/typog.json                       |   37 +-
 dev/packages/ucs.json                         |  276 -
 dev/packages/ucshyper.json                    |   21 -
 dev/packages/uni.json                         |  111 -
 dev/packages/units.json                       |   28 -
 dev/packages/upmethodology-document.json      |  699 --
 dev/packages/upmethodology-extension.json     |    3 -
 dev/packages/uptex.json                       |   21 -
 dev/packages/uri.json                         |   97 -
 dev/packages/url.json                         |   41 -
 dev/packages/va.json                          |   21 -
 dev/packages/varioref.json                    |  151 -
 dev/packages/varwidth.json                    |   14 -
 dev/packages/vector.json                      |   56 -
 dev/packages/verbatim.json                    |   16 -
 dev/packages/verse.json                       |  104 -
 dev/packages/version.json                     |   19 -
 dev/packages/vowel.json                       |   62 -
 dev/packages/wargame.json                     |  115 +-
 dev/packages/watermark.json                   |   23 -
 dev/packages/web.json                         | 1013 --
 dev/packages/wiley-authoringtemplate.json     |    2 +-
 dev/packages/witharrows.json                  |  212 -
 dev/packages/wordcloud.json                   |    6 +-
 dev/packages/wrapfig.json                     |   31 -
 dev/packages/xassoccnt.json                   |   86 +-
 dev/packages/xcntperchap.json                 |    8 +-
 dev/packages/xcolor.json                      |  181 -
 dev/packages/xetex.json                       |  131 -
 dev/packages/xfp.json                         |    7 -
 dev/packages/xintcfrac.json                   |   10 +-
 dev/packages/xlop.json                        |   12 -
 dev/packages/xob-font.json                    |  117 -
 dev/packages/xpatch.json                      |   10 -
 dev/packages/xpicture.json                    |  130 +-
 dev/packages/xr-hyper.json                    |   23 +-
 dev/packages/xr.json                          |   32 -
 dev/packages/xskak.json                       |    3 -
 dev/packages/xspace.json                      |   15 -
 dev/packages/xtemplate.json                   |   46 +
 dev/packages/xy.json                          |  370 -
 dev/packages/xymtx-pdf.json                   |   62 +-
 dev/packages/yagusylo.json                    |    2 +-
 dev/packages/ydoc.json                        |   49 -
 dev/packages/youngtab.json                    |    6 -
 dev/packages/ytableau.json                    |    6 +-
 dev/packages/zhnumber.json                    |    4 +-
 dev/packages/zref.json                        |   78 -
 dev/packages/zx-calculus.json                 |   11 -
 dev/pyintel/pkgcommand.py                     |   15 +-
 package.json                                  |   12 -
 src/compile/queue.ts                          |    5 +-
 src/preview/server.ts                         |    2 +-
 src/utils/logger.ts                           |    2 +-
 syntax/DocTeX.tmLanguage.json                 |  141 +-
 syntax/LaTeX-Workshop-Log.tmLanguage.json     |   85 -
 syntax/LaTeX.tmLanguage.json                  |  141 +-
 ...x-workshop-log-language-configuration.json |    6 -
 .../04_core_root/find_workspace/trap.tex      |    2 +
 test/units/05_compile.test.ts                 |  128 -
 viewer/components/refresh.ts                  |   10 -
 viewer/components/state.ts                    |   81 +-
 758 files changed, 1730 insertions(+), 76912 deletions(-)
 delete mode 100644 dev/packages/CJK.json
 delete mode 100644 dev/packages/CJKfntef.json
 delete mode 100644 dev/packages/abspos.json
 delete mode 100644 dev/packages/abstract.json
 delete mode 100644 dev/packages/accsupp.json
 delete mode 100644 dev/packages/achemso.json
 delete mode 100644 dev/packages/acro.json
 delete mode 100644 dev/packages/acronym.json
 delete mode 100644 dev/packages/ajmacros.json
 delete mode 100644 dev/packages/amsmath.json
 delete mode 100644 dev/packages/answers.json
 delete mode 100644 dev/packages/ar.json
 delete mode 100644 dev/packages/array.json
 delete mode 100644 dev/packages/arsclassica.json
 delete mode 100644 dev/packages/ascmac.json
 delete mode 100644 dev/packages/assoccnt.json
 delete mode 100644 dev/packages/asyfig.json
 delete mode 100644 dev/packages/at.json
 delete mode 100644 dev/packages/atbegshi.json
 delete mode 100644 dev/packages/babel.json
 delete mode 100644 dev/packages/backref.json
 delete mode 100644 dev/packages/balance.json
 delete mode 100644 dev/packages/bangla.json
 delete mode 100644 dev/packages/bewerbung.json
 delete mode 100644 dev/packages/bibentry.json
 delete mode 100644 dev/packages/biblatex.json
 delete mode 100644 dev/packages/bibpes.json
 delete mode 100644 dev/packages/bidi.json
 delete mode 100644 dev/packages/bm.json
 delete mode 100644 dev/packages/booktabs.json
 delete mode 100644 dev/packages/calc.json
 delete mode 100644 dev/packages/callouts.json
 delete mode 100644 dev/packages/caption.json
 delete mode 100644 dev/packages/catppuccinpalette.json
 delete mode 100644 dev/packages/censor.json
 delete mode 100644 dev/packages/cesenaexam.json
 delete mode 100644 dev/packages/chapterbib.json
 delete mode 100644 dev/packages/chemfig.json
 delete mode 100644 dev/packages/chemist.json
 delete mode 100644 dev/packages/chet.json
 delete mode 100644 dev/packages/cite.json
 delete mode 100644 dev/packages/clock.json
 delete mode 100644 dev/packages/codelisting.json
 delete mode 100644 dev/packages/color.json
 delete mode 100644 dev/packages/colorblind.json
 delete mode 100644 dev/packages/colortbl.json
 delete mode 100644 dev/packages/comma.json
 delete mode 100644 dev/packages/comment.json
 delete mode 100644 dev/packages/commutative-diagrams.json
 delete mode 100644 dev/packages/contour.json
 delete mode 100644 dev/packages/contracard.json
 delete mode 100644 dev/packages/cquthesis.json
 delete mode 100644 dev/packages/cropmark.json
 delete mode 100644 dev/packages/cursor.json
 delete mode 100644 dev/packages/dad.json
 delete mode 100644 dev/packages/delim.json
 delete mode 100644 dev/packages/diagbox.json
 delete mode 100644 dev/packages/diagram.json
 delete mode 100644 dev/packages/dichokey.json
 delete mode 100644 dev/packages/dline.json
 delete mode 100644 dev/packages/doc.json
 delete mode 100644 dev/packages/easylist.json
 delete mode 100644 dev/packages/ebook.json
 delete mode 100644 dev/packages/ed.json
 delete mode 100644 dev/packages/eepic.json
 delete mode 100644 dev/packages/elements.json
 delete mode 100644 dev/packages/ellipsis.json
 delete mode 100644 dev/packages/emarks.json
 delete mode 100644 dev/packages/emo.json
 delete mode 100644 dev/packages/emoji.json
 delete mode 100644 dev/packages/endnotes.json
 delete mode 100644 dev/packages/enumerate.json
 delete mode 100644 dev/packages/epic.json
 delete mode 100644 dev/packages/eso-pic.json
 delete mode 100644 dev/packages/etoc.json
 delete mode 100644 dev/packages/euler.json
 delete mode 100644 dev/packages/example.json
 delete mode 100644 dev/packages/exercise.json
 delete mode 100644 dev/packages/exesheet.json
 delete mode 100644 dev/packages/export.json
 delete mode 100644 dev/packages/extract.json
 delete mode 100644 dev/packages/fancyhdr.json
 delete mode 100644 dev/packages/fbox.json
 delete mode 100644 dev/packages/feyn.json
 delete mode 100644 dev/packages/filehook.json
 delete mode 100644 dev/packages/fitch.json
 delete mode 100644 dev/packages/float.json
 delete mode 100644 dev/packages/fltrace.json
 delete mode 100644 dev/packages/fontspec.json
 delete mode 100644 dev/packages/fonttable.json
 delete mode 100644 dev/packages/footnote.json
 delete mode 100644 dev/packages/forloop.json
 delete mode 100644 dev/packages/fp.json
 delete mode 100644 dev/packages/framed.json
 delete mode 100644 dev/packages/functional.json
 delete mode 100644 dev/packages/gb4e.json
 delete mode 100644 dev/packages/gelasiomath.json
 delete mode 100644 dev/packages/geometry.json
 delete mode 100644 dev/packages/german.json
 delete mode 100644 dev/packages/glossaries.json
 delete mode 100644 dev/packages/graphics.json
 delete mode 100644 dev/packages/grid.json
 delete mode 100644 dev/packages/gridslides.json
 delete mode 100644 dev/packages/grmath.json
 delete mode 100644 dev/packages/guit.json
 delete mode 100644 dev/packages/handout.json
 delete mode 100644 dev/packages/hsetup.json
 delete mode 100644 dev/packages/hyperref.json
 delete mode 100644 dev/packages/icite.json
 delete mode 100644 dev/packages/ifthen.json
 delete mode 100644 dev/packages/igo.json
 delete mode 100644 dev/packages/imsart.json
 delete mode 100644 dev/packages/index.json
 delete mode 100644 dev/packages/inputenc.json
 delete mode 100644 dev/packages/intcalc.json
 delete mode 100644 dev/packages/interval.json
 delete mode 100644 dev/packages/invoice.json
 delete mode 100644 dev/packages/ipa.json
 delete mode 100644 dev/packages/ipsum.json
 delete mode 100644 dev/packages/isomath.json
 delete mode 100644 dev/packages/kanbun.json
 delete mode 100644 dev/packages/keyval.json
 delete mode 100644 dev/packages/l3sys-query.json
 delete mode 100644 dev/packages/la.json
 delete mode 100644 dev/packages/labels.json
 delete mode 100644 dev/packages/ladder.json
 delete mode 100644 dev/packages/latexscreenshooter.json
 delete mode 100644 dev/packages/layout.json
 delete mode 100644 dev/packages/lcd.json
 delete mode 100644 dev/packages/leading.json
 delete mode 100644 dev/packages/limap.json
 delete mode 100644 dev/packages/linearregression.json
 delete mode 100644 dev/packages/lineno.json
 delete mode 100644 dev/packages/lipsum.json
 delete mode 100644 dev/packages/listing.json
 delete mode 100644 dev/packages/listings.json
 delete mode 100644 dev/packages/listingsutf8.json
 delete mode 100644 dev/packages/lmodern.json
 delete mode 100644 dev/packages/longtable.json
 delete mode 100644 dev/packages/lscape.json
 delete mode 100644 dev/packages/ltxdockit.json
 delete mode 100644 dev/packages/luatex.json
 delete mode 100644 dev/packages/luwiantype.json
 delete mode 100644 dev/packages/makeidx.json
 delete mode 100644 dev/packages/mathtools.json
 delete mode 100644 dev/packages/memoize.json
 delete mode 100644 dev/packages/memory.json
 delete mode 100644 dev/packages/menu.json
 delete mode 100644 dev/packages/merge.json
 delete mode 100644 dev/packages/minted.json
 delete mode 100644 dev/packages/mlist.json
 delete mode 100644 dev/packages/multicol.json
 delete mode 100644 dev/packages/multilang.json
 delete mode 100644 dev/packages/nameref.json
 delete mode 100644 dev/packages/nextpage.json
 delete mode 100644 dev/packages/nth.json
 delete mode 100644 dev/packages/numprint.json
 delete mode 100644 dev/packages/ocgx.json
 delete mode 100644 dev/packages/optional.json
 delete mode 100644 dev/packages/options.json
 delete mode 100644 dev/packages/otf.json
 delete mode 100644 dev/packages/pagegrid.json
 delete mode 100644 dev/packages/parallel.json
 delete mode 100644 dev/packages/parcolumns.json
 delete mode 100644 dev/packages/parskip.json
 delete mode 100644 dev/packages/passopt.json
 delete mode 100644 dev/packages/path.json
 delete mode 100644 dev/packages/pbox.json
 delete mode 100644 dev/packages/perpage.json
 delete mode 100644 dev/packages/pgfmath.json
 delete mode 100644 dev/packages/piano.json
 delete mode 100644 dev/packages/pict2e.json
 delete mode 100644 dev/packages/picture.json
 delete mode 100644 dev/packages/pinyin.json
 delete mode 100644 dev/packages/platex.json
 delete mode 100644 dev/packages/poster.json
 delete mode 100644 dev/packages/printlen.json
 delete mode 100644 dev/packages/proof.json
 delete mode 100644 dev/packages/pseudocode.json
 delete mode 100644 dev/packages/pst-pdf.json
 delete mode 100644 dev/packages/ptex.json
 delete mode 100644 dev/packages/pygmentex.json
 delete mode 100644 dev/packages/pylatex.json
 delete mode 100644 dev/packages/qcm.json
 delete mode 100644 dev/packages/qrcode.json
 delete mode 100644 dev/packages/qtree.json
 delete mode 100644 dev/packages/quantikz.json
 delete mode 100644 dev/packages/randbild.json
 delete mode 100644 dev/packages/rigidnotation.json
 delete mode 100644 dev/packages/ruby.json
 delete mode 100644 dev/packages/schwalbe.json
 delete mode 100644 dev/packages/scrbase.json
 delete mode 100644 dev/packages/semantex.json
 delete mode 100644 dev/packages/semantic.json
 delete mode 100644 dev/packages/semesterplannerlua.json
 delete mode 100644 dev/packages/sets.json
 delete mode 100644 dev/packages/setspace.json
 delete mode 100644 dev/packages/shadow.json
 delete mode 100644 dev/packages/shadowtext.json
 delete mode 100644 dev/packages/siunitx.json
 delete mode 100644 dev/packages/skak.json
 delete mode 100644 dev/packages/skillicons.json
 delete mode 100644 dev/packages/sparklines.json
 delete mode 100644 dev/packages/spelatex.json
 delete mode 100644 dev/packages/spotcolor.json
 delete mode 100644 dev/packages/sseq.json
 delete mode 100644 dev/packages/stack.json
 delete mode 100644 dev/packages/stackengine.json
 delete mode 100644 dev/packages/standalone.json
 delete mode 100644 dev/packages/standardsectioning.json
 delete mode 100644 dev/packages/statistics.json
 delete mode 100644 dev/packages/stex.json
 delete mode 100644 dev/packages/sudoku.json
 delete mode 100644 dev/packages/suffix.json
 delete mode 100644 dev/packages/sverb.json
 delete mode 100644 dev/packages/svg.json
 delete mode 100644 dev/packages/tableof.json
 delete mode 100644 dev/packages/tabu.json
 delete mode 100644 dev/packages/ted.json
 delete mode 100644 dev/packages/tensor.json
 delete mode 100644 dev/packages/tex.json
 delete mode 100644 dev/packages/theorem.json
 delete mode 100644 dev/packages/tikz.json
 delete mode 100644 dev/packages/tikzinput.json
 delete mode 100644 dev/packages/tikzlings.json
 delete mode 100644 dev/packages/time.json
 delete mode 100644 dev/packages/titleref.json
 delete mode 100644 dev/packages/tocbasic.json
 delete mode 100644 dev/packages/todo.json
 delete mode 100644 dev/packages/todonotes.json
 delete mode 100644 dev/packages/tone.json
 delete mode 100644 dev/packages/toolbox.json
 delete mode 100644 dev/packages/toptesi.json
 delete mode 100644 dev/packages/totpages.json
 delete mode 100644 dev/packages/trace.json
 delete mode 100644 dev/packages/translations.json
 delete mode 100644 dev/packages/translator.json
 delete mode 100644 dev/packages/trees.json
 delete mode 100644 dev/packages/trig.json
 delete mode 100644 dev/packages/truncate.json
 delete mode 100644 dev/packages/truthtable.json
 delete mode 100644 dev/packages/twemojis.json
 delete mode 100644 dev/packages/ucs.json
 delete mode 100644 dev/packages/ucshyper.json
 delete mode 100644 dev/packages/uni.json
 delete mode 100644 dev/packages/units.json
 delete mode 100644 dev/packages/upmethodology-document.json
 delete mode 100644 dev/packages/uptex.json
 delete mode 100644 dev/packages/uri.json
 delete mode 100644 dev/packages/url.json
 delete mode 100644 dev/packages/va.json
 delete mode 100644 dev/packages/varioref.json
 delete mode 100644 dev/packages/varwidth.json
 delete mode 100644 dev/packages/vector.json
 delete mode 100644 dev/packages/verbatim.json
 delete mode 100644 dev/packages/verse.json
 delete mode 100644 dev/packages/version.json
 delete mode 100644 dev/packages/vowel.json
 delete mode 100644 dev/packages/watermark.json
 delete mode 100644 dev/packages/web.json
 delete mode 100644 dev/packages/witharrows.json
 delete mode 100644 dev/packages/wrapfig.json
 delete mode 100644 dev/packages/xcolor.json
 delete mode 100644 dev/packages/xetex.json
 delete mode 100644 dev/packages/xfp.json
 delete mode 100644 dev/packages/xpatch.json
 delete mode 100644 dev/packages/xr.json
 delete mode 100644 dev/packages/xspace.json
 delete mode 100644 dev/packages/xy.json
 delete mode 100644 dev/packages/ydoc.json
 delete mode 100644 dev/packages/zref.json
 delete mode 100644 dev/packages/zx-calculus.json
 delete mode 100644 syntax/LaTeX-Workshop-Log.tmLanguage.json
 delete mode 100644 syntax/latex-workshop-log-language-configuration.json
 create mode 100644 test/fixtures/unittest/04_core_root/find_workspace/trap.tex
 delete mode 100644 test/units/05_compile.test.ts

diff --git a/data/packages/algorithm2e.json b/data/packages/algorithm2e.json
index 567c2875f..638aba744 100644
--- a/data/packages/algorithm2e.json
+++ b/data/packages/algorithm2e.json
@@ -428,9 +428,6 @@
     "Begin{}": {
       "snippet": "Begin{${1:block inside}}"
     },
-    "Begin(){}": {
-      "snippet": "Begin(${2:begin comment}){${1:block inside}}"
-    },
     "tcc{}": {
       "snippet": "tcc{${1:comments}}"
     },
@@ -452,189 +449,90 @@
     "If{}{}": {
       "snippet": "If{${1:condition}}{${2:then block}}"
     },
-    "If(){}{}": {
-      "snippet": "If(${3:then comment}){${1:condition}}{${2:then block}}"
-    },
     "uIf{}{}": {
       "snippet": "uIf{${1:condition}}{${2:then block without end}}"
     },
-    "uIf(){}{}": {
-      "snippet": "uIf(${3:then comment}){${1:condition}}{${2:then block without end}}"
-    },
     "lIf{}{}": {
       "snippet": "lIf{${1:condition}}{${2:then line}}"
     },
-    "lIf(){}{}": {
-      "snippet": "lIf(${3:if comment}){${1:condition}}{${2:then line}}"
-    },
     "ElseIf{}": {
       "snippet": "ElseIf{${1:elseif block}}"
     },
-    "ElseIf(){}": {
-      "snippet": "ElseIf(${2:elseif comment}){${1:elseif block}}"
-    },
     "uElseIf{}": {
       "snippet": "uElseIf{${1:elseif block without end}}"
     },
-    "uElseIf(){}": {
-      "snippet": "uElseIf(${2:elseif comment}){${1:elseif block without end}}"
-    },
     "lElseIf{}": {
       "snippet": "lElseIf{${1:elseif line}}"
     },
-    "lElseif(){}": {
-      "snippet": "lElseif(${2:elseif line}){${1:elseif block}}"
-    },
     "Else{}": {
       "snippet": "Else{${1:else block}}"
     },
-    "Else(){}": {
-      "snippet": "Else(${2:else comment}){${1:else block}}"
-    },
     "uElse{}": {
       "snippet": "uElse{${1:else block without end}}"
     },
-    "uElse(){}": {
-      "snippet": "uElse(${2:else block comment}){${1:else block without end}}"
-    },
     "lElse{}": {
       "snippet": "lElse{${1:else line}}"
     },
-    "lElse(){}": {
-      "snippet": "lElse(${2:else comment}){${1:else line}}"
-    },
     "eIf{}{}{}": {
       "snippet": "eIf{${1:condition}}{${2:then block}}{${3:else block}}"
     },
-    "eIf(){}{}(){}": {
-      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}(${5:else comment}){${3:else block}}"
-    },
-    "eIf(){}{}{}": {
-      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}{${3:else block}}"
-    },
-    "eIf{}{}(){}": {
-      "snippet": "eIf{${1:condition}}{${2:then block}}(${4:else comment}){${3:else block}}"
-    },
     "leIf{}{}{}": {
       "snippet": "leIf{${1:condition}}{${2:then line}}{${3:else line}}"
     },
-    "leIf(){}{}{}": {
-      "snippet": "leIf(${4:comment}){${1:condition}}{${2:then line}}{${3:else line}}"
-    },
-    "Switch(){}{}": {
-      "snippet": "Switch(${3:switch comment}){${1:condition}}{${2:switch block}}"
-    },
     "Switch{}{}": {
       "snippet": "Switch{${1:condition}}{${2:switch block}}"
     },
     "Case{}{}": {
       "snippet": "Case{${1:case}}{${2:case block}}"
     },
-    "Case(){}{}": {
-      "snippet": "Case(${3:case comment}){${1:case}}{${2:case block}}"
-    },
     "uCase{}{}": {
       "snippet": "uCase{${1:case}}{${2:case block without end}}"
     },
-    "uCase(){}{}": {
-      "snippet": "uCase(${3:case comment}){${1:case}}{${2:case block without end}}"
-    },
     "lCase{}{}": {
       "snippet": "lCase{${1:case}}{${2:case line}}"
     },
-    "lCase(){}{}": {
-      "snippet": "lCase(${3:case comment}){${1:case}}{${2:case line}}"
-    },
     "Other{}": {
       "snippet": "Other{${1:otherwise block}}"
     },
-    "Other(){}": {
-      "snippet": "Other(${2:other comment}){${1:otherwise block}}"
-    },
     "uOther{}": {
       "snippet": "uOther{${1:otherwise text}}"
     },
-    "uOther(){}": {
-      "snippet": "uOther(${2:other comment}){${1:otherwise text}}"
-    },
     "lOther{}": {
       "snippet": "lOther{${1:otherwise line}}"
     },
-    "lOther(){}": {
-      "snippet": "lOther(${2:other comment}){${1:otherwise line}}"
-    },
     "For{}{}": {
       "snippet": "For{${1:condition}}{${2:for block}}"
     },
-    "For(){}{}": {
-      "snippet": "For(${3:for comment}){${1:condition}}{${2:for block}}"
-    },
     "lFor{}{}": {
       "snippet": "lFor{${1:condition}}{${2:for line}}"
     },
-    "lFor(){}{}": {
-      "snippet": "lFor(${3:for comment}){${1:condition}}{${2:for line}}"
-    },
     "While{}{}": {
       "snippet": "While{${1:condition}}{${2:while block}}"
     },
-    "While(){}{}": {
-      "snippet": "While(${3:while comment}){${1:condition}}{${2:while block}}"
-    },
     "lWhile{}{}": {
       "snippet": "lWhile{${1:condition}}{${2:while line}}"
     },
-    "lWhile(){}{}": {
-      "snippet": "lWhile(${3:while comment}){${1:condition}}{${2:while line}}"
-    },
     "ForPar{}{}": {
       "snippet": "ForPar{${1:condition}}{${2:foreach block}}"
     },
-    "ForPar(){}{}": {
-      "snippet": "ForPar(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
-    },
     "ForEach{}{}": {
       "snippet": "ForEach{${1:condition}}{${2:foreach block}}"
     },
-    "ForEach(){}{}": {
-      "snippet": "ForEach(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
-    },
     "lForEach{}{}": {
       "snippet": "lForEach{${1:condition}}{${2:foreach line}}"
     },
-    "lForEach(){}{}": {
-      "snippet": "lForEach(${3:foreach comment}){${1:condition}}{${2:foreach line}}"
-    },
     "ForAll{}{}": {
       "snippet": "ForAll{${1:condition}}{${2:forall block}}"
     },
-    "ForAll(){}{}": {
-      "snippet": "ForAll(${3:forall comment}){${1:condition}}{${2:forall block}}"
-    },
     "lForAll{}{}": {
       "snippet": "lForAll{${1:condition}}{${2:forall line}}"
     },
-    "lForAll(){}{}": {
-      "snippet": "lForAll(${3:forall comment}){${1:condition}}{${2:forall line}}"
-    },
     "Repeat{}{}": {
       "snippet": "Repeat{${1:end condition}}{${2:repeat block}}"
     },
-    "Repeat(){}{}()": {
-      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}(${4:until comment})"
-    },
-    "Repeat(){}{}": {
-      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}"
-    },
-    "Repeat{}{}()": {
-      "snippet": "Repeat{${1:end condition}}{${2:repeat block}}(${3:until comment})"
-    },
     "lRepeat{}{}": {
       "snippet": "lRepeat{${1:end condition}}{${2:repeat line}}"
     },
-    "lRepeat(){}{}": {
-      "snippet": "lRepeat(${3:repeat comment}){${1:end condition}}{${2:repeat line}}"
-    },
     "SetKwInput{}{}": {
       "snippet": "SetKwInput{${1:csname}}{${2:name}}"
     },
diff --git a/data/packages/babel.json b/data/packages/babel.json
index 4c9160cc6..144f86b60 100644
--- a/data/packages/babel.json
+++ b/data/packages/babel.json
@@ -25,7 +25,7 @@
       "keyvalpos": 0
     },
     "babeltags{}": {
-      "snippet": "babeltags{${1:tag1=lang1,${2:tag2=lang2},...}}"
+      "snippet": "babeltags{${1:tag1=lang1,tag2=lang2,...}}"
     },
     "babelensure{}": {
       "snippet": "babelensure{${1:language}}"
@@ -54,7 +54,7 @@
       "snippet": "defineshorthand{${1:shorthand}}{${2:code}}"
     },
     "defineshorthand[]{}{}": {
-      "snippet": "defineshorthand[${3:lang1,${4:lang2},...}]{${1:shorthand}}{${2:code}}"
+      "snippet": "defineshorthand[${3:lang1,lang2,...}]{${1:shorthand}}{${2:code}}"
     },
     "languageshorthands{}": {
       "snippet": "languageshorthands{${1:language}}"
@@ -79,10 +79,10 @@
       "snippet": "babelfont{${1:font_family}}[${2:font_options}]{${3:font_name}}"
     },
     "babelfont[]{}{}": {
-      "snippet": "babelfont[${3:lang1,${4:lang2},...}]{${1:font_family}}{${2:font_name}}"
+      "snippet": "babelfont[${3:lang1,lang2,...}]{${1:font_family}}{${2:font_name}}"
     },
     "babelfont[]{}[]{}": {
-      "snippet": "babelfont[${3:lang1,${5:lang2},...}]{${1:font_family}}[${4:font_options}]{${2:font_name}}"
+      "snippet": "babelfont[${3:lang1,lang2,...}]{${1:font_family}}[${4:font_options}]{${2:font_name}}"
     },
     "setlocalecaption{}{}{}": {
       "snippet": "setlocalecaption{${1:language}}{${2:caption_name}}{${3:string}}"
@@ -153,13 +153,13 @@
       "snippet": "babelhyphenation{${1:exceptions}}"
     },
     "babelhyphenation[]{}": {
-      "snippet": "babelhyphenation[${2:lang1,${3:lang2},...}]{${1:exceptions}}"
+      "snippet": "babelhyphenation[${2:lang1,lang2,...}]{${1:exceptions}}"
     },
     "babelpatterns{}": {
       "snippet": "babelpatterns{${1:patterns}}"
     },
     "babelpatterns[]{}": {
-      "snippet": "babelpatterns[${2:lang1,${3:lang2},...}]{${1:patterns}}"
+      "snippet": "babelpatterns[${2:lang1,lang2,...}]{${1:patterns}}"
     },
     "babelposthyphenation{}{}{}": {
       "snippet": "babelposthyphenation{${1:hypenrules-name}}{${2:lua-pattern}}{${3:replacement}}"
@@ -308,8 +308,6 @@
       "snippet": "AfterBabelCommands{${1:code}}"
     },
     "allowhyphens": {},
-    "BabelCJKGlue": {},
-    "BabelCJKSpace": {},
     "BabelDated{}": {
       "snippet": "BabelDated{${1:arg}}"
     },
@@ -1333,9 +1331,6 @@
     "FBfnindent": {
       "option": "acadian"
     },
-    "FBfnmarkspace": {
-      "option": "acadian"
-    },
     "FBFrenchFootnotesfalse": {
       "option": "acadian"
     },
@@ -1438,9 +1433,6 @@
     "fgii": {
       "option": "acadian"
     },
-    "fprimo)": {
-      "option": "acadian"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "acadian"
@@ -1554,6 +1546,9 @@
     "ifFBPartNameFull": {
       "option": "acadian"
     },
+    "ifFBReduceListSpacing": {
+      "option": "acadian"
+    },
     "ifFBShowOptions": {
       "option": "acadian"
     },
@@ -2931,14 +2926,6 @@
       "snippet": "Apageref{${1:label}}",
       "option": "hungarian"
     },
-    "aref({})": {
-      "snippet": "aref(${2:{${1:label}}})",
-      "option": "hungarian"
-    },
-    "Aref({})": {
-      "snippet": "Aref(${2:{${1:label}}})",
-      "option": "hungarian"
-    },
     "aref*{}": {
       "snippet": "aref*{${1:label}}",
       "option": "hungarian"
diff --git a/data/packages/beamerbaseframesize.json b/data/packages/beamerbaseframesize.json
index 349c7ecb2..967a6e8c0 100644
--- a/data/packages/beamerbaseframesize.json
+++ b/data/packages/beamerbaseframesize.json
@@ -1,24 +1,11 @@
 {
   "includes": {},
   "macros": {
-    "framezoom<><>()()": {
-      "snippet": "framezoom<${1:button overlay specification}><${2:zoomed overlay specification}>(${3:upper left x},${4:upper left y})(${5:zoom area width},${6:zoom area depth})"
-    },
-    "framezoom<><>[]()()": {
-      "snippet": "framezoom<${2:button overlay specification}><${3:zoomed overlay specification}>[${1:options}](${4:upper left x},${5:upper left y})(${6:zoom area width},${7:zoom area depth})",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
     "insertcontinuationcount": {},
     "insertcontinuationcountroman": {},
     "insertcontinuationtext": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": [
-    [
-      "border",
-      "border=${1:width in pixels}"
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/data/packages/biblatex.json b/data/packages/biblatex.json
index 19557d681..78057dfd3 100644
--- a/data/packages/biblatex.json
+++ b/data/packages/biblatex.json
@@ -377,32 +377,32 @@
     },
     "endrefcontext": {},
     "assignrefcontextkeyws[]{}": {
-      "snippet": "assignrefcontextkeyws[${2:options}]{${1:keyword1,${3:keyword2},...}}",
+      "snippet": "assignrefcontextkeyws[${2:options}]{${1:keyword1,keyword2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextkeyws*[]{}": {
-      "snippet": "assignrefcontextkeyws*[${2:options}]{${1:keyword1,${3:keyword2},...}}",
+      "snippet": "assignrefcontextkeyws*[${2:options}]{${1:keyword1,keyword2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextcats[]{}": {
-      "snippet": "assignrefcontextcats[${2:options}]{${1:category1,${3:category2},...}}",
+      "snippet": "assignrefcontextcats[${2:options}]{${1:category1,category2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextcats*[]{}": {
-      "snippet": "assignrefcontextcats*[${2:options}]{${1:category1,${3:category2},...}}",
+      "snippet": "assignrefcontextcats*[${2:options}]{${1:category1,category2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextentries[]{}": {
-      "snippet": "assignrefcontextentries[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
+      "snippet": "assignrefcontextentries[${2:options}]{${1:entrykey1,entrykey2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "assignrefcontextentries*[]{}": {
-      "snippet": "assignrefcontextentries*[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
+      "snippet": "assignrefcontextentries*[${2:options}]{${1:entrykey1,entrykey2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
@@ -412,7 +412,7 @@
       "keyvalpos": 0
     },
     "defbibentryset{}{}": {
-      "snippet": "defbibentryset{${1:bibid}}{${2:key1,${3:key2},...}}"
+      "snippet": "defbibentryset{${1:bibid}}{${2:key1,key2,...}}"
     },
     "cite[][]{}": {
       "snippet": "cite[${2:prenote}][${3:postnote}]{${1:bibid}}"
@@ -517,234 +517,102 @@
     "cites{}{}": {
       "snippet": "cites{${1:bibid}}{${2:bibid}}"
     },
-    "cites(){}{}": {
-      "snippet": "cites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "cites()(){}{}": {
-      "snippet": "cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "cites()()[]{}[]{}": {
-      "snippet": "cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "cites[]{}[]{}": {
       "snippet": "cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "cites[][]{}[][]{}": {
       "snippet": "cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "cites()()[][]{}[][]{}": {
-      "snippet": "cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Cites{}{}": {
       "snippet": "Cites{${1:bibid}}{${2:bibid}}"
     },
-    "Cites(){}{}": {
-      "snippet": "Cites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Cites()(){}{}": {
-      "snippet": "Cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Cites()()[]{}[]{}": {
-      "snippet": "Cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "Cites[]{}[]{}": {
       "snippet": "Cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Cites[][]{}[][]{}": {
       "snippet": "Cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Cites()()[][]{}[][]{}": {
-      "snippet": "Cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "parencites{}{}": {
       "snippet": "parencites{${1:bibid}}{${2:bibid}}"
     },
-    "parencites(){}{}": {
-      "snippet": "parencites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "parencites()(){}{}": {
-      "snippet": "parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "parencites()()[]{}[]{}": {
-      "snippet": "parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "parencites[]{}[]{}": {
       "snippet": "parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "parencites[][]{}[][]{}": {
       "snippet": "parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "parencites()()[][]{}[][]{}": {
-      "snippet": "parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Parencites{}{}": {
       "snippet": "Parencites{${1:bibid}}{${2:bibid}}"
     },
-    "Parencites(){}{}": {
-      "snippet": "Parencites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Parencites()(){}{}": {
-      "snippet": "Parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Parencites()()[]{}[]{}": {
-      "snippet": "Parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "Parencites[]{}[]{}": {
       "snippet": "Parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Parencites[][]{}[][]{}": {
       "snippet": "Parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Parencites()()[][]{}[][]{}": {
-      "snippet": "Parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "footcites{}{}": {
       "snippet": "footcites{${1:bibid}}{${2:bibid}}"
     },
-    "footcites(){}{}": {
-      "snippet": "footcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcites()(){}{}": {
-      "snippet": "footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcites()()[]{}[]{}": {
-      "snippet": "footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "footcites[]{}[]{}": {
       "snippet": "footcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "footcites[][]{}[][]{}": {
       "snippet": "footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "footcites()()[][]{}[][]{}": {
-      "snippet": "footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "footcitetexts{}{}": {
       "snippet": "footcitetexts{${1:bibid}}{${2:bibid}}"
     },
-    "footcitetexts(){}{}": {
-      "snippet": "footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcitetexts()(){}{}": {
-      "snippet": "footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcitetexts()()[]{}[]{}": {
-      "snippet": "footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "footcitetexts[]{}[]{}": {
       "snippet": "footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "footcitetexts[][]{}[][]{}": {
       "snippet": "footcitetexts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "footcitetexts()()[][]{}[][]{}": {
-      "snippet": "footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "smartcites{}{}": {
       "snippet": "smartcites{${1:bibid}}{${2:bibid}}"
     },
-    "smartcites(){}{}": {
-      "snippet": "smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "smartcites()(){}{}": {
-      "snippet": "smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "smartcites()()[]{}[]{}": {
-      "snippet": "smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "smartcites[]{}[]{}": {
       "snippet": "smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "smartcites[][]{}[][]{}": {
       "snippet": "smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "smartcites()()[][]{}[][]{}": {
-      "snippet": "smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Smartcites{}{}": {
       "snippet": "Smartcites{${1:bibid}}{${2:bibid}}"
     },
-    "Smartcites(){}{}": {
-      "snippet": "Smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Smartcites()(){}{}": {
-      "snippet": "Smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Smartcites()()[]{}[]{}": {
-      "snippet": "Smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "Smartcites[]{}[]{}": {
       "snippet": "Smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Smartcites[][]{}[][]{}": {
       "snippet": "Smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Smartcites()()[][]{}[][]{}": {
-      "snippet": "Smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "textcites{}{}": {
       "snippet": "textcites{${1:bibid}}{${2:bibid}}"
     },
-    "textcites(){}{}": {
-      "snippet": "textcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "textcites()(){}{}": {
-      "snippet": "textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "textcites()()[]{}[]{}": {
-      "snippet": "textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "textcites[]{}[]{}": {
       "snippet": "textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "textcites[][]{}[][]{}": {
       "snippet": "textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "textcites()()[][]{}[][]{}": {
-      "snippet": "textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Textcites{}{}": {
       "snippet": "Textcites{${1:bibid}}{${2:bibid}}"
     },
-    "Textcites(){}{}": {
-      "snippet": "Textcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Textcites()(){}{}": {
-      "snippet": "Textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Textcites()()[]{}[]{}": {
-      "snippet": "Textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "Textcites[]{}[]{}": {
       "snippet": "Textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Textcites[][]{}[][]{}": {
       "snippet": "Textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Textcites()()[][]{}[][]{}": {
-      "snippet": "Textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "supercites{}{}": {
       "snippet": "supercites{${1:bibid}}{${2:bibid}}"
     },
-    "supercites(){}{}": {
-      "snippet": "supercites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "supercites()(){}{}": {
-      "snippet": "supercites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "supercites()()[]{}[]{}": {
-      "snippet": "supercites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "supercites[]{}[]{}": {
       "snippet": "supercites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "supercites[][]{}[][]{}": {
       "snippet": "supercites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "supercites()()[][]{}[][]{}": {
-      "snippet": "supercites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "autocite[][]{}": {
       "snippet": "autocite[${2:prenote}][${3:postnote}]{${1:bibid}}"
     },
@@ -784,45 +652,21 @@
     "autocites{}{}": {
       "snippet": "autocites{${1:bibid}}{${2:bibid}}"
     },
-    "autocites(){}{}": {
-      "snippet": "autocites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "autocites()(){}{}": {
-      "snippet": "autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "autocites()()[]{}[]{}": {
-      "snippet": "autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "autocites[]{}[]{}": {
       "snippet": "autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "autocites[][]{}[][]{}": {
       "snippet": "autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "autocites()()[][]{}[][]{}": {
-      "snippet": "autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Autocites{}{}": {
       "snippet": "Autocites{${1:bibid}}{${2:bibid}}"
     },
-    "Autocites(){}{}": {
-      "snippet": "Autocites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Autocites()(){}{}": {
-      "snippet": "Autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Autocites()()[]{}[]{}": {
-      "snippet": "Autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "Autocites[]{}[]{}": {
       "snippet": "Autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "Autocites[][]{}[][]{}": {
       "snippet": "Autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Autocites()()[][]{}[][]{}": {
-      "snippet": "Autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "citeauthor[][]{}": {
       "snippet": "citeauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "natbib=true"
@@ -994,45 +838,21 @@
     "volcites{}{}{}{}": {
       "snippet": "volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "volcites(){}{}{}{}": {
-      "snippet": "volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "volcites()(){}{}{}{}": {
-      "snippet": "volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "volcites()()[]{}{}[]{}{}": {
-      "snippet": "volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "volcites[]{}{}[]{}{}": {
       "snippet": "volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "volcites[][]{}{}[][]{}{}": {
       "snippet": "volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "volcites()()[][]{}{}[][]{}{}": {
-      "snippet": "volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "Volcites{}{}{}{}": {
       "snippet": "Volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "Volcites(){}{}{}{}": {
-      "snippet": "Volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites()(){}{}{}{}": {
-      "snippet": "Volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites()()[]{}{}[]{}{}": {
-      "snippet": "Volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "Volcites[]{}{}[]{}{}": {
       "snippet": "Volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Volcites[][]{}{}[][]{}{}": {
       "snippet": "Volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "Volcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "pvolcite{}{}": {
       "snippet": "pvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1060,45 +880,21 @@
     "pvolcites{}{}{}{}": {
       "snippet": "pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "pvolcites(){}{}{}{}": {
-      "snippet": "pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites()(){}{}{}{}": {
-      "snippet": "pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites()()[]{}{}[]{}{}": {
-      "snippet": "pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "pvolcites[]{}{}[]{}{}": {
       "snippet": "pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "pvolcites[][]{}{}[][]{}{}": {
       "snippet": "pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "pvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "Pvolcites{}{}{}{}": {
       "snippet": "Pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "Pvolcites(){}{}{}{}": {
-      "snippet": "Pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites()(){}{}{}{}": {
-      "snippet": "Pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "Pvolcites[]{}{}[]{}{}": {
       "snippet": "Pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Pvolcites[][]{}{}[][]{}{}": {
       "snippet": "Pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "Pvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "fvolcite{}{}": {
       "snippet": "fvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1126,45 +922,21 @@
     "fvolcites{}{}{}{}": {
       "snippet": "fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "fvolcites(){}{}{}{}": {
-      "snippet": "fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites()(){}{}{}{}": {
-      "snippet": "fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites()()[]{}{}[]{}{}": {
-      "snippet": "fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "fvolcites[]{}{}[]{}{}": {
       "snippet": "fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "fvolcites[][]{}{}[][]{}{}": {
       "snippet": "fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "fvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "Fvolcites{}{}{}{}": {
       "snippet": "Fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "Fvolcites(){}{}{}{}": {
-      "snippet": "Fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites()(){}{}{}{}": {
-      "snippet": "Fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "Fvolcites[]{}{}[]{}{}": {
       "snippet": "Fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Fvolcites[][]{}{}[][]{}{}": {
       "snippet": "Fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "Fvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "ftvolcite{}{}": {
       "snippet": "ftvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1192,45 +964,21 @@
     "ftvolcites{}{}{}{}": {
       "snippet": "ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "ftvolcites(){}{}{}{}": {
-      "snippet": "ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites()(){}{}{}{}": {
-      "snippet": "ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites()()[]{}{}[]{}{}": {
-      "snippet": "ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "ftvolcites[]{}{}[]{}{}": {
       "snippet": "ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "ftvolcites[][]{}{}[][]{}{}": {
       "snippet": "ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "ftvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "Ftvolcites{}{}{}{}": {
       "snippet": "Ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "Ftvolcites(){}{}{}{}": {
-      "snippet": "Ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites()(){}{}{}{}": {
-      "snippet": "Ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "Ftvolcites[]{}{}[]{}{}": {
       "snippet": "Ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Ftvolcites[][]{}{}[][]{}{}": {
       "snippet": "Ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "Ftvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "svolcite{}{}": {
       "snippet": "svolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1258,45 +1006,21 @@
     "svolcites{}{}{}{}": {
       "snippet": "svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "svolcites(){}{}{}{}": {
-      "snippet": "svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites()(){}{}{}{}": {
-      "snippet": "svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites()()[]{}{}[]{}{}": {
-      "snippet": "svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "svolcites[]{}{}[]{}{}": {
       "snippet": "svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "svolcites[][]{}{}[][]{}{}": {
       "snippet": "svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "svolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "Svolcites{}{}{}{}": {
       "snippet": "Svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "Svolcites(){}{}{}{}": {
-      "snippet": "Svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites()(){}{}{}{}": {
-      "snippet": "Svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites()()[]{}{}[]{}{}": {
-      "snippet": "Svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "Svolcites[]{}{}[]{}{}": {
       "snippet": "Svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Svolcites[][]{}{}[][]{}{}": {
       "snippet": "Svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "Svolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "tvolcite{}{}": {
       "snippet": "tvolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1324,45 +1048,21 @@
     "tvolcites{}{}{}{}": {
       "snippet": "tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "tvolcites(){}{}{}{}": {
-      "snippet": "tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites()(){}{}{}{}": {
-      "snippet": "tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites()()[]{}{}[]{}{}": {
-      "snippet": "tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "tvolcites[]{}{}[]{}{}": {
       "snippet": "tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "tvolcites[][]{}{}[][]{}{}": {
       "snippet": "tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "tvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "Tvolcites{}{}{}{}": {
       "snippet": "Tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "Tvolcites(){}{}{}{}": {
-      "snippet": "Tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites()(){}{}{}{}": {
-      "snippet": "Tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "Tvolcites[]{}{}[]{}{}": {
       "snippet": "Tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Tvolcites[][]{}{}[][]{}{}": {
       "snippet": "Tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "Tvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "avolcite{}{}": {
       "snippet": "avolcite{${1:volume}}{${2:bibid}}"
     },
@@ -1390,45 +1090,21 @@
     "avolcites{}{}{}{}": {
       "snippet": "avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "avolcites(){}{}{}{}": {
-      "snippet": "avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites()(){}{}{}{}": {
-      "snippet": "avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites()()[]{}{}[]{}{}": {
-      "snippet": "avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "avolcites[]{}{}[]{}{}": {
       "snippet": "avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "avolcites[][]{}{}[][]{}{}": {
       "snippet": "avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "avolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "Avolcites{}{}{}{}": {
       "snippet": "Avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
     },
-    "Avolcites(){}{}{}{}": {
-      "snippet": "Avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites()(){}{}{}{}": {
-      "snippet": "Avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites()()[]{}{}[]{}{}": {
-      "snippet": "Avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
     "Avolcites[]{}{}[]{}{}": {
       "snippet": "Avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
     },
     "Avolcites[][]{}{}[][]{}{}": {
       "snippet": "Avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
     },
-    "Avolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
     "notecite[][]{}": {
       "snippet": "notecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
     },
@@ -3806,7 +3482,7 @@
       "snippet": "texouterlang{${1:text}}"
     },
     "DeclareBibstringSet{}{}": {
-      "snippet": "DeclareBibstringSet{${1:name}}{${2:key1,${3:key2},...}}"
+      "snippet": "DeclareBibstringSet{${1:name}}{${2:key1,key2,...}}"
     },
     "UndeclareBibstringSet{}": {
       "snippet": "UndeclareBibstringSet{${1:name}}"
@@ -4136,18 +3812,6 @@
     "Footcite{}": {
       "snippet": "Footcite{${1:bibid}}"
     },
-    "Footcites()()[][]{}[][]{}": {
-      "snippet": "Footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Footcites()()[]{}[]{}": {
-      "snippet": "Footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Footcites()(){}{}": {
-      "snippet": "Footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Footcites(){}{}": {
-      "snippet": "Footcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
     "Footcites[][]{}[][]{}": {
       "snippet": "Footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
@@ -4166,18 +3830,6 @@
     "Footcitetext{}": {
       "snippet": "Footcitetext{${1:bibid}}"
     },
-    "Footcitetexts(){}{}": {
-      "snippet": "Footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Footcitetexts()()[]{}[]{}": {
-      "snippet": "Footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Footcitetexts()()[][]{}[][]{}": {
-      "snippet": "Footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Footcitetexts()(){}{}": {
-      "snippet": "Footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
     "Footcitetexts[]{}[]{}": {
       "snippet": "Footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
@@ -4316,18 +3968,6 @@
       "snippet": "apud{${1:bibid}}{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
-    "apud(){}{}": {
-      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud()(){}{}": {
-      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud()()[]{}[]{}": {
-      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
     "apud[]{}[]{}": {
       "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
@@ -4336,10 +3976,6 @@
       "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
-    "apud()()[][]{}[][]{}": {
-      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
     "plaincite[][]{}": {
       "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "style=abnt"
@@ -4592,18 +4228,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "style=apa6"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=apa6"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=apa6"
@@ -4612,10 +4236,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=apa6"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=apa6"
-    },
     "arthistoryversion": {
       "option": "style=arthistory-bonn"
     },
@@ -5033,18 +4653,6 @@
       "snippet": "citets{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
-    "citets(){}{}": {
-      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets()(){}{}": {
-      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets()()[]{}[]{}": {
-      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
     "citets[]{}[]{}": {
       "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
@@ -5053,26 +4661,10 @@
       "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
-    "citets()()[][]{}[][]{}": {
-      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
     "Citets{}{}": {
       "snippet": "Citets{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citets(){}{}": {
-      "snippet": "Citets(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets()(){}{}": {
-      "snippet": "Citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets()()[]{}[]{}": {
-      "snippet": "Citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "Citets[]{}[]{}": {
       "snippet": "Citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -5081,26 +4673,10 @@
       "snippet": "Citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citets()()[][]{}[][]{}": {
-      "snippet": "Citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "citealts{}{}": {
       "snippet": "citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "citealts(){}{}": {
-      "snippet": "citealts(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts()(){}{}": {
-      "snippet": "citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts()()[]{}[]{}": {
-      "snippet": "citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "citealts[]{}[]{}": {
       "snippet": "citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -5109,26 +4685,10 @@
       "snippet": "citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "citealts()()[][]{}[][]{}": {
-      "snippet": "citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "Citealts{}{}": {
       "snippet": "Citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citealts(){}{}": {
-      "snippet": "Citealts(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts()(){}{}": {
-      "snippet": "Citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts()()[]{}[]{}": {
-      "snippet": "Citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "Citealts[]{}[]{}": {
       "snippet": "Citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -5137,10 +4697,6 @@
       "snippet": "Citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citealts()()[][]{}[][]{}": {
-      "snippet": "Citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "mkbibindextruename{}{}{}{}": {
       "snippet": "mkbibindextruename{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}",
       "option": "style=fiwi2"
@@ -5499,18 +5055,6 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -5519,26 +5063,10 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -5547,10 +5075,6 @@
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "dealnoathor": {
       "option": "style=thuthesis-author-year"
     },
@@ -5771,18 +5295,6 @@
       "snippet": "detailscites{${1:bibid}}{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
-    "detailscites(){}{}": {
-      "snippet": "detailscites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites()(){}{}": {
-      "snippet": "detailscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites()()[]{}[]{}": {
-      "snippet": "detailscites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
     "detailscites[]{}[]{}": {
       "snippet": "detailscites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
@@ -5791,10 +5303,6 @@
       "snippet": "detailscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
-    "detailscites()()[][]{}[][]{}": {
-      "snippet": "detailscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
     "collectionshelfmarkpunct": {
       "option": "style=oxnum"
     },
@@ -6550,37 +6058,6 @@
       "snippet": "citeitem{${1:bibid}}",
       "option": "style=publist"
     },
-    "citesecitem[][]{}": {
-      "snippet": "citesecitem[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitem[]{}": {
-      "snippet": "citesecitem[${2:postnote}]{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitem{}": {
-      "snippet": "citesecitem{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitem*{}": {
-      "snippet": "citesecitem*{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citeitemrange{}{}": {
-      "snippet": "citeitemrange{${1:bibid}}{${2:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitemrange{}{}": {
-      "snippet": "citesecitemrange{${1:bibid}}{${2:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitemrange*{}{}": {
-      "snippet": "citesecitemrange*{${1:bibid}}{${2:bibid}}",
-      "option": "style=publist"
-    },
-    "itemrangesep": {
-      "option": "style=publist"
-    },
     "shiftciteitem{}": {
       "snippet": "shiftciteitem{${1:integer}}",
       "option": "style=publist"
@@ -6589,9 +6066,6 @@
       "snippet": "mkrefdesc{${1:number}}",
       "option": "style=publist"
     },
-    "secitemsecref": {
-      "option": "style=publist"
-    },
     "theprevcrefsection": {
       "option": "style=publist"
     },
@@ -6859,18 +6333,6 @@
       "snippet": "idemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
-    "idemcites(){}{}": {
-      "snippet": "idemcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites()(){}{}": {
-      "snippet": "idemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites()()[]{}[]{}": {
-      "snippet": "idemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "idemcites[]{}[]{}": {
       "snippet": "idemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -6879,10 +6341,6 @@
       "snippet": "idemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
-    "idemcites()()[][]{}[][]{}": {
-      "snippet": "idemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "footidemcite{}": {
       "snippet": "footidemcite{${1:bibid}}",
       "option": "style=windycity"
@@ -6899,18 +6357,6 @@
       "snippet": "footidemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
-    "footidemcites(){}{}": {
-      "snippet": "footidemcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites()(){}{}": {
-      "snippet": "footidemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites()()[]{}[]{}": {
-      "snippet": "footidemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "footidemcites[]{}[]{}": {
       "snippet": "footidemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -6919,10 +6365,6 @@
       "snippet": "footidemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
-    "footidemcites()()[][]{}[][]{}": {
-      "snippet": "footidemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "parenauth{}": {
       "snippet": "parenauth{${1:bibid}}",
       "option": "style=windycity"
@@ -6939,18 +6381,6 @@
       "snippet": "parenauths{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
-    "parenauths(){}{}": {
-      "snippet": "parenauths(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths()(){}{}": {
-      "snippet": "parenauths(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths()()[]{}[]{}": {
-      "snippet": "parenauths(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "parenauths[]{}[]{}": {
       "snippet": "parenauths[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -6959,10 +6389,6 @@
       "snippet": "parenauths[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
-    "parenauths()()[][]{}[][]{}": {
-      "snippet": "parenauths(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "mkmonthrange{}{}": {
       "snippet": "mkmonthrange{${1:arg1}}{${2:arg2}}",
       "option": "style=windycity"
diff --git a/data/packages/booktabs.json b/data/packages/booktabs.json
index e315bafad..7962a0fa4 100644
--- a/data/packages/booktabs.json
+++ b/data/packages/booktabs.json
@@ -16,12 +16,6 @@
     "cmidrule{}": {
       "snippet": "cmidrule{${1:a-b}}"
     },
-    "cmidrule(){}": {
-      "snippet": "cmidrule(${2:trim}){${1:a-b}}"
-    },
-    "cmidrule[](){}": {
-      "snippet": "cmidrule[${2:line width}](${3:trim}){${1:a-b}}"
-    },
     "morecmidrules": {},
     "specialrule{}{}{}": {
       "snippet": "specialrule{${1:line width}}{${2:above space}}{${3:below space}}"
diff --git a/data/packages/chemformula.json b/data/packages/chemformula.json
index 38486ecd5..26d290ca6 100644
--- a/data/packages/chemformula.json
+++ b/data/packages/chemformula.json
@@ -115,9 +115,6 @@
     "charrow{}[][]": {
       "snippet": "charrow{${1:type}}[${2:above}][${3:below}]"
     },
-    "chname()()": {
-      "snippet": "chname(${1:text 1})(${2:text 2})"
-    },
     "chlewis{}{}": {
       "snippet": "chlewis{${1:electron spec}}{${2:atom}}"
     },
diff --git a/data/packages/circuitikz.json b/data/packages/circuitikz.json
index b9d0a4c89..10d7aa748 100644
--- a/data/packages/circuitikz.json
+++ b/data/packages/circuitikz.json
@@ -69,7 +69,7 @@
       "snippet": "ctikztextnot{${1:text}}"
     },
     "ctikzsubcircuitdef{}{}{}": {
-      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,${4:anchor2},...}}{${3:definition}}"
+      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,anchor2,...}}{${3:definition}}"
     },
     "ctikzsubcircuitactivate{}": {
       "snippet": "ctikzsubcircuitactivate{${1:name}}"
diff --git a/data/packages/class-altacv.json b/data/packages/class-altacv.json
index bbd266cda..b69421c99 100644
--- a/data/packages/class-altacv.json
+++ b/data/packages/class-altacv.json
@@ -145,7 +145,7 @@
     "xetexorluatextrue": {},
     "xetexorluatexfalse": {},
     "mynames{}": {
-      "snippet": "mynames{${1:name1,${2:name2},...}}"
+      "snippet": "mynames{${1:name1,name2,...}}"
     },
     "utffriendlydetokenize{}": {
       "snippet": "utffriendlydetokenize{${1:arg}}"
diff --git a/data/packages/class-memoir.json b/data/packages/class-memoir.json
index 86844323f..b82ea65b8 100644
--- a/data/packages/class-memoir.json
+++ b/data/packages/class-memoir.json
@@ -835,9 +835,6 @@
     "glossary[]{}{}": {
       "snippet": "glossary[${3:file}]{${1:term}}{${2:description}}"
     },
-    "glossary[](){}{}": {
-      "snippet": "glossary[${3:file}](${4:key}){${1:term}}{${2:description}}"
-    },
     "glossarycolsep": {},
     "glossaryintoc": {},
     "glossarymark": {},
@@ -1051,9 +1048,6 @@
     "justlastraggedleft": {},
     "keepthetitle": {},
     "killtitle": {},
-    "label(){}": {
-      "snippet": "label(${2:bookmark}){${1:label}}"
-    },
     "LastFrameCommand": {},
     "lastlineparrule": {},
     "lastlinerulefill": {},
diff --git a/data/packages/class-moderncv.json b/data/packages/class-moderncv.json
index ad8fc51b6..f95c8cb4d 100644
--- a/data/packages/class-moderncv.json
+++ b/data/packages/class-moderncv.json
@@ -37,9 +37,6 @@
     "homepage{}": {
       "snippet": "homepage{${1:URL}}"
     },
-    "homepage[]{}": {
-      "snippet": "homepage[${2:protocol}]{${1:URL}}"
-    },
     "phone{}": {
       "snippet": "phone{${1:number}}"
     },
@@ -86,17 +83,6 @@
     "signalsocialsymbol": {},
     "codebergsocialsymbol": {},
     "discordsocialsymbol": {},
-    "twitchsocialsymbol": {},
-    "youtubesocialsymbol": {},
-    "tiktoksocialsymbol": {},
-    "instagramsocialsymbol": {},
-    "soundcloudsocialsymbol": {},
-    "steamsocialsymbol": {},
-    "xboxsocialsymbol": {},
-    "playstationsocialsymbol": {},
-    "battlenetsocialsymbol": {},
-    "arxivsocialsymbol": {},
-    "inspiresocialsymbol": {},
     "enclname": {},
     "makefooter": {},
     "moderncvstyle{}": {
@@ -158,12 +144,6 @@
     "namestyle{}": {
       "snippet": "namestyle{${1:text}}"
     },
-    "firstnamestyle{}": {
-      "snippet": "firstnamestyle{${1:text}}"
-    },
-    "lastnamestyle{}": {
-      "snippet": "lastnamestyle{${1:text}}"
-    },
     "titlestyle{}": {
       "snippet": "titlestyle{${1:text}}"
     },
@@ -205,12 +185,6 @@
     "cvdoubleitem[]{}{}{}{}": {
       "snippet": "cvdoubleitem[${5:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}"
     },
-    "cvtripleitem{}{}{}{}{}{}": {
-      "snippet": "cvtripleitem{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
-    },
-    "cvtripleitem[]{}{}{}{}{}{}": {
-      "snippet": "cvtripleitem[${7:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
-    },
     "cvlistitem{}": {
       "snippet": "cvlistitem{${1:item}}"
     },
@@ -288,18 +262,12 @@
     "recipient{}{}": {
       "snippet": "recipient{${1:recipient}}{${2:recipient address}}"
     },
-    "subject{}": {
-      "snippet": "subject{${1:subject}}"
-    },
     "opening{}": {
       "snippet": "opening{${1:opening}}"
     },
     "closing{}": {
       "snippet": "closing{${1:closing}}"
     },
-    "signature{}{}": {
-      "snippet": "signature{${1:scale}}{${2:imagefile}}"
-    },
     "enclosure{}": {
       "snippet": "enclosure{${1:enclosure}}"
     },
@@ -314,16 +282,13 @@
     "makeletterhead": {},
     "makeletterfoot": {},
     "makeletterclosing": {},
-    "hintscolumnwidth": {},
     "separatorcolumnwidth": {},
     "maincolumnwidth": {},
     "doubleitemcolumnwidth": {},
-    "tripleitemcolumnwidth": {},
     "separatorrulewidth": {},
     "listitemsymbolwidth": {},
     "listitemcolumnwidth": {},
     "listdoubleitemcolumnwidth": {},
-    "listitemsymbolspace": {},
     "cventryyearbox": {},
     "cventrytitleboxwidth": {},
     "cvskill{}": {
diff --git a/data/packages/class-scrlttr2.json b/data/packages/class-scrlttr2.json
index 7a15b64dc..b8030dca6 100644
--- a/data/packages/class-scrlttr2.json
+++ b/data/packages/class-scrlttr2.json
@@ -268,14 +268,6 @@
     "edgesize": {
       "option": "visualize"
     },
-    "showenvelope()()": {
-      "snippet": "showenvelope(${1:width},${2:height})(${3:h-offset},${4:v-offset})",
-      "option": "visualize"
-    },
-    "showenvelope()()[]": {
-      "snippet": "showenvelope(${2:width},${3:height})(${4:h-offset},${5:v-offset})[${1:instructions}]",
-      "option": "visualize"
-    },
     "showISOenvelope{}": {
       "snippet": "showISOenvelope{${1:format}}",
       "option": "visualize"
diff --git a/data/packages/class-yathesis.json b/data/packages/class-yathesis.json
index 339b43305..1596d19ba 100644
--- a/data/packages/class-yathesis.json
+++ b/data/packages/class-yathesis.json
@@ -337,7 +337,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/data/packages/coordsys.json b/data/packages/coordsys.json
index 20a7802c7..487bf54a7 100644
--- a/data/packages/coordsys.json
+++ b/data/packages/coordsys.json
@@ -25,96 +25,6 @@
     "vnumbline*[]{}{}": {
       "snippet": "vnumbline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
-    "coordsys()()": {
-      "snippet": "coordsys(${1:lower-left})(${2:upper-right})"
-    },
-    "coordsys[]()()": {
-      "snippet": "coordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordsys[][]()()": {
-      "snippet": "coordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "coordsys*()()": {
-      "snippet": "coordsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "coordsys*[]()()": {
-      "snippet": "coordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordsys*[][]()()": {
-      "snippet": "coordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "fcoordsys()()": {
-      "snippet": "fcoordsys(${1:lower-left})(${2:upper-right})"
-    },
-    "fcoordsys[]()()": {
-      "snippet": "fcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "fcoordsys[][]()()": {
-      "snippet": "fcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "fcoordsys*()()": {
-      "snippet": "fcoordsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "fcoordsys*[]()()": {
-      "snippet": "fcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "fcoordsys*[][]()()": {
-      "snippet": "fcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "bcoordsys()()": {
-      "snippet": "bcoordsys(${1:lower-left})(${2:upper-right})"
-    },
-    "bcoordsys[]()()": {
-      "snippet": "bcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "bcoordsys[][]()()": {
-      "snippet": "bcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "bcoordsys*()()": {
-      "snippet": "bcoordsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "bcoordsys*[]()()": {
-      "snippet": "bcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "bcoordsys*[][]()()": {
-      "snippet": "bcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "window()()": {
-      "snippet": "window(${1:lower-left})(${2:upper-right})"
-    },
-    "window[]()()": {
-      "snippet": "window[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "window[][]()()": {
-      "snippet": "window[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "window*()()": {
-      "snippet": "window*(${1:lower-left})(${2:upper-right})"
-    },
-    "window*[]()()": {
-      "snippet": "window*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "window*[][]()()": {
-      "snippet": "window*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "coordgrid()()": {
-      "snippet": "coordgrid(${1:lower-left})(${2:upper-right})"
-    },
-    "coordgrid[]()()": {
-      "snippet": "coordgrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordgrid[][]()()": {
-      "snippet": "coordgrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "coordgrid*()()": {
-      "snippet": "coordgrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "coordgrid*[]()()": {
-      "snippet": "coordgrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordgrid*[][]()()": {
-      "snippet": "coordgrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
     "gridstyle{}{}": {
       "snippet": "gridstyle{${1:thin-declaration}}{${2:thick-declaration}}"
     },
diff --git a/data/packages/fancybox.json b/data/packages/fancybox.json
index 416d7a604..b89e35d42 100644
--- a/data/packages/fancybox.json
+++ b/data/packages/fancybox.json
@@ -22,37 +22,10 @@
     "cornersize*{}": {
       "snippet": "cornersize*{${1:dimen}}"
     },
-    "fancyoval()": {
-      "snippet": "fancyoval(${1:width},${2:height})"
-    },
-    "fancyoval()[]": {
-      "snippet": "fancyoval(${2:width},${3:height})[${1:portion}]"
-    },
     "TheSbox": {},
     "GenericCaption{}": {
       "snippet": "GenericCaption{${1:text}}"
     },
-    "item()": {
-      "snippet": "item(${1:vspace})"
-    },
-    "item()[]": {
-      "snippet": "item(${2:vspace})[${1:label}]"
-    },
-    "boxput(){}{}": {
-      "snippet": "boxput(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
-    },
-    "boxput*(){}{}": {
-      "snippet": "boxput*(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
-    },
-    "fancyput(){}": {
-      "snippet": "fancyput(${2:x},${3:y}){${1:contents}}"
-    },
-    "fancyput*(){}": {
-      "snippet": "fancyput*(${2:x},${3:y}){${1:contents}}"
-    },
-    "thisfancyput*(){}": {
-      "snippet": "thisfancyput*(${2:x},${3:y}){${1:contents}}"
-    },
     "fancypage{}{}": {
       "snippet": "fancypage{${1:cmds1}}{${2:cmds2}}"
     },
diff --git a/data/packages/fontspec.json b/data/packages/fontspec.json
index 848549b92..073bcfd0b 100644
--- a/data/packages/fontspec.json
+++ b/data/packages/fontspec.json
@@ -245,9 +245,6 @@
     "EncodingComposite{}{}{}": {
       "snippet": "EncodingComposite{${1:cmd}}{${2:letter}}{${3:slot}}"
     },
-    "EncodingCompositeCommand(){}{}": {
-      "snippet": "EncodingCompositeCommand(${3:cmd}){${1:letter}}{${2:code}}"
-    },
     "UndeclareSymbol{}": {
       "snippet": "UndeclareSymbol{${1:cmd}}"
     },
diff --git a/data/packages/glosstex.json b/data/packages/glosstex.json
index e79578345..9e96fc2fb 100644
--- a/data/packages/glosstex.json
+++ b/data/packages/glosstex.json
@@ -7,198 +7,84 @@
     "glosstex[]{}": {
       "snippet": "glosstex[${2:pageref-mode}]{${1:label}}"
     },
-    "glosstex(){}": {
-      "snippet": "glosstex(${2:list}){${1:label}}"
-    },
-    "glosstex()[]{}": {
-      "snippet": "glosstex(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "glosstex*{}": {
       "snippet": "glosstex*{${1:label}}"
     },
     "glosstex*[]{}": {
       "snippet": "glosstex*[${2:pageref-mode}]{${1:label}}"
     },
-    "glosstex*(){}": {
-      "snippet": "glosstex*(${2:list}){${1:label}}"
-    },
-    "glosstex*()[]{}": {
-      "snippet": "glosstex*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "acronym{}": {
       "snippet": "acronym{${1:label}}"
     },
     "acronym[]{}": {
       "snippet": "acronym[${2:pageref-mode}]{${1:label}}"
     },
-    "acronym(){}": {
-      "snippet": "acronym(${2:list}){${1:label}}"
-    },
-    "acronym()[]{}": {
-      "snippet": "acronym(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "acronym*{}": {
       "snippet": "acronym*{${1:label}}"
     },
     "acronym*[]{}": {
       "snippet": "acronym*[${2:pageref-mode}]{${1:label}}"
     },
-    "acronym*(){}": {
-      "snippet": "acronym*(${2:list}){${1:label}}"
-    },
-    "acronym*()[]{}": {
-      "snippet": "acronym*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "gls{}": {
       "snippet": "gls{${1:label}}"
     },
     "gls[]{}": {
       "snippet": "gls[${2:pageref-mode}]{${1:label}}"
     },
-    "gls(){}": {
-      "snippet": "gls(${2:list}){${1:label}}"
-    },
-    "gls()[]{}": {
-      "snippet": "gls(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "gls*{}": {
       "snippet": "gls*{${1:label}}"
     },
     "gls*[]{}": {
       "snippet": "gls*[${2:pageref-mode}]{${1:label}}"
     },
-    "gls*(){}": {
-      "snippet": "gls*(${2:list}){${1:label}}"
-    },
-    "gls*()[]{}": {
-      "snippet": "gls*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "ac{}": {
       "snippet": "ac{${1:label}}"
     },
     "ac[]{}": {
       "snippet": "ac[${2:pageref-mode}]{${1:label}}"
     },
-    "ac()[]{}": {
-      "snippet": "ac(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac<>()[]{}": {
-      "snippet": "ac<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac[]<>()[]{}": {
-      "snippet": "ac[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "ac*{}": {
       "snippet": "ac*{${1:label}}"
     },
     "ac*[]{}": {
       "snippet": "ac*[${2:pageref-mode}]{${1:label}}"
     },
-    "ac*()[]{}": {
-      "snippet": "ac*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac*<>()[]{}": {
-      "snippet": "ac*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac*[]<>()[]{}": {
-      "snippet": "ac*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acs{}": {
       "snippet": "acs{${1:label}}"
     },
     "acs[]{}": {
       "snippet": "acs[${2:pageref-mode}]{${1:label}}"
     },
-    "acs()[]{}": {
-      "snippet": "acs(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs<>()[]{}": {
-      "snippet": "acs<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs[]<>()[]{}": {
-      "snippet": "acs[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acs*{}": {
       "snippet": "acs*{${1:label}}"
     },
     "acs*[]{}": {
       "snippet": "acs*[${2:pageref-mode}]{${1:label}}"
     },
-    "acs*()[]{}": {
-      "snippet": "acs*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs*<>()[]{}": {
-      "snippet": "acs*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs*[]<>()[]{}": {
-      "snippet": "acs*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acl{}": {
       "snippet": "acl{${1:label}}"
     },
     "acl[]{}": {
       "snippet": "acl[${2:pageref-mode}]{${1:label}}"
     },
-    "acl()[]{}": {
-      "snippet": "acl(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl<>()[]{}": {
-      "snippet": "acl<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl[]<>()[]{}": {
-      "snippet": "acl[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acl*{}": {
       "snippet": "acl*{${1:label}}"
     },
     "acl*[]{}": {
       "snippet": "acl*[${2:pageref-mode}]{${1:label}}"
     },
-    "acl*()[]{}": {
-      "snippet": "acl*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl*<>()[]{}": {
-      "snippet": "acl*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl*[]<>()[]{}": {
-      "snippet": "acl*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acf{}": {
       "snippet": "acf{${1:label}}"
     },
     "acf[]{}": {
       "snippet": "acf[${2:pageref-mode}]{${1:label}}"
     },
-    "acf()[]{}": {
-      "snippet": "acf(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf<>()[]{}": {
-      "snippet": "acf<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf[]<>()[]{}": {
-      "snippet": "acf[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acf*{}": {
       "snippet": "acf*{${1:label}}"
     },
     "acf*[]{}": {
       "snippet": "acf*[${2:pageref-mode}]{${1:label}}"
     },
-    "acf*()[]{}": {
-      "snippet": "acf*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf*<>()[]{}": {
-      "snippet": "acf*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf*[]<>()[]{}": {
-      "snippet": "acf*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
-    "printglosstex()": {
-      "snippet": "printglosstex(${1:list})"
-    },
-    "printglosstex()[]": {
-      "snippet": "printglosstex(${2:list})[${1:pageref-mode}]"
-    },
     "glxitemorderdefault{}{}": {
       "snippet": "glxitemorderdefault{${1:list}}{${2:item-order i/l/\"\"}}"
     },
diff --git a/data/packages/hyperref.json b/data/packages/hyperref.json
index fe966b0a7..2ba1809cd 100644
--- a/data/packages/hyperref.json
+++ b/data/packages/hyperref.json
@@ -6,6 +6,7 @@
     "kvdefinekeys": [],
     "pdfescape": [],
     "hycolor": [],
+    "auxhook": [],
     "kvoptions": [],
     "intcalc": [],
     "url": [],
@@ -16,7 +17,6 @@
     "rerunfilecheck": [],
     "nameref": [],
     "etoolbox": [],
-    "stringenc": [],
     "backref": [
       "backref",
       "backref=section",
diff --git a/data/packages/jurabib.json b/data/packages/jurabib.json
index f844586c0..2ac6aeb22 100644
--- a/data/packages/jurabib.json
+++ b/data/packages/jurabib.json
@@ -25,7 +25,7 @@
       "snippet": "citefield[${3:page-range}]{${1:field}}{${2:bibid}}"
     },
     "citenotitlefortype{}": {
-      "snippet": "citenotitlefortype{${1:article,${2:book},…}}"
+      "snippet": "citenotitlefortype{${1:article,book,…}}"
     },
     "citeswithoutentry{}": {
       "snippet": "citeswithoutentry{${1:keylist}}"
@@ -37,7 +37,7 @@
       "snippet": "citetitle[${2:Annotator/See}][${3:page-range}]{${1:bibid}}"
     },
     "citetitlefortype{}": {
-      "snippet": "citetitlefortype{${1:article,${2:book},…}}"
+      "snippet": "citetitlefortype{${1:article,book,…}}"
     },
     "footcite[]{}": {
       "snippet": "footcite[${2:page-range}]{${1:bibid}}"
@@ -99,13 +99,13 @@
       "snippet": "pageadd{${1:text}}"
     },
     "formatpages{}{}{}": {
-      "snippet": "formatpages{${1:article,${4:book},…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}]{${1:article,${5:book},…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[][]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,${6:book},…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "citealp[]{}": {
       "snippet": "citealp[${2:postfix}]{${1:keylist}}"
diff --git a/data/packages/latex-dev.json b/data/packages/latex-dev.json
index 915177450..f4d99e4a4 100644
--- a/data/packages/latex-dev.json
+++ b/data/packages/latex-dev.json
@@ -34,7 +34,6 @@
     "AssignSocketPlug{}{}": {
       "snippet": "AssignSocketPlug{${1:socket}}{${2:socket plug}}"
     },
-    "AssignTemplateKeys": {},
     "AtBeginDocument[]{}": {
       "snippet": "AtBeginDocument[${2:label}]{${1:code}}"
     },
@@ -143,8 +142,6 @@
     "DebugShipoutsOn": {},
     "DebugSocketsOff": {},
     "DebugSocketsOn": {},
-    "DebugTablesOff": {},
-    "DebugTablesOn": {},
     "DeclareCaseChangeEquivalent{}{}": {
       "snippet": "DeclareCaseChangeEquivalent{${1:cmd}}{${2:replacement text}}"
     },
@@ -214,12 +211,6 @@
     "DeclareHookRule{}{}{}{}": {
       "snippet": "DeclareHookRule{${1:hook}}{${2:label1}}{${3:relation}}{${4:label2}}"
     },
-    "DeclareInstance{}{}{}{}": {
-      "snippet": "DeclareInstance{${1:type}}{${2:instance}}{${3:template}}{${4:parameters}}"
-    },
-    "DeclareInstanceCopy{}{}{}": {
-      "snippet": "DeclareInstanceCopy{${1:type}}{${2:instance2}}{${3:instance1}}"
-    },
     "DeclareKeys[]{}": {
       "snippet": "DeclareKeys[${2:family}]{${1:declarations}}"
     },
@@ -298,15 +289,6 @@
     "DeclareSymbolFontAlphabet{}{}": {
       "snippet": "DeclareSymbolFontAlphabet{${1:math-alph}}{${2:sym-font}}"
     },
-    "DeclareTemplateCode{}{}{}{}{}": {
-      "snippet": "DeclareTemplateCode{${1:type}}{${2:template}}{${3:no. of args}}{${4:key bindings}}{${5:code}}"
-    },
-    "DeclareTemplateCopy{}{}{}": {
-      "snippet": "DeclareTemplateCopy{${1:type}}{${2:template2}}{${3:template1}}"
-    },
-    "DeclareTemplateInterface{}{}{}{}": {
-      "snippet": "DeclareTemplateInterface{${1:type}}{${2:template}}{${3:no. of args}}{${4:key list}}"
-    },
     "DeclareTextAccent{}{}{}": {
       "snippet": "DeclareTextAccent{${1:cmd}}{${2:encoding}}{${3:slot}}"
     },
@@ -368,12 +350,6 @@
       "snippet": "DisableHook{${1:hook}}"
     },
     "DiscardShipoutBox": {},
-    "EditInstance{}{}{}": {
-      "snippet": "EditInstance{${1:type}}{${2:instance}}{${3:new values}}"
-    },
-    "EditTemplateDefaults{}{}{}": {
-      "snippet": "EditTemplateDefaults{${1:type}}{${2:template}}{${3:new defaults}}"
-    },
     "EndIncludeInRelease": {},
     "EndModuleRelease": {},
     "ExecuteOptions{}": {
@@ -417,89 +393,35 @@
     "IfBooleanTF{}{}{}": {
       "snippet": "IfBooleanTF{${1:arg}}{${2:true code}}{${3:false code}}"
     },
-    "IfClassAtLeastF{}{}{}": {
-      "snippet": "IfClassAtLeastF{${1:class}}{${2:date}}{${3:false code}}"
-    },
-    "IfClassAtLeastT{}{}{}": {
-      "snippet": "IfClassAtLeastT{${1:class}}{${2:date}}{${3:true code}}"
-    },
     "IfClassAtLeastTF{}{}{}{}": {
       "snippet": "IfClassAtLeastTF{${1:class}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
-    "IfClassLoadedF{}{}": {
-      "snippet": "IfClassLoadedF{${1:class}}{${2:false code}}"
-    },
-    "IfClassLoadedT{}{}": {
-      "snippet": "IfClassLoadedT{${1:class}}{${2:true code}}"
-    },
     "IfClassLoadedTF{}{}{}": {
       "snippet": "IfClassLoadedTF{${1:class}}{${2:true code}}{${3:false code}}"
     },
-    "IfClassLoadedWithOptionsF{}{}{}": {
-      "snippet": "IfClassLoadedWithOptionsF{${1:class}}{${2:options}}{${3:false code}}"
-    },
-    "IfClassLoadedWithOptionsT{}{}{}": {
-      "snippet": "IfClassLoadedWithOptionsT{${1:class}}{${2:options}}{${3:true code}}"
-    },
     "IfClassLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfClassLoadedWithOptionsTF{${1:class}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfExplAtLeastTF{}{}{}": {
       "snippet": "IfExplAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
-    "IfFileAtLeastF{}{}{}": {
-      "snippet": "IfFileAtLeastF{${1:file}}{${2:date}}{${3:false code}}"
-    },
-    "IfFileAtLeastT{}{}{}": {
-      "snippet": "IfFileAtLeastT{${1:file}}{${2:date}}{${3:true code}}"
-    },
     "IfFileAtLeastTF{}{}{}{}": {
       "snippet": "IfFileAtLeastTF{${1:file}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
     "IfFileExists{}{}{}": {
       "snippet": "IfFileExists{${1:file}}{${2:true code}}{${3:false code}}"
     },
-    "IfFileLoadedF{}{}": {
-      "snippet": "IfFileLoadedF{${1:file}}{${2:false code}}"
-    },
-    "IfFileLoadedT{}{}": {
-      "snippet": "IfFileLoadedT{${1:file}}{${2:true code}}"
-    },
-    "IfFileLoadedTF{}{}{}": {
-      "snippet": "IfFileLoadedTF{${1:file}}{${2:true code}}{${3:false code}}"
-    },
     "IfFontSeriesContextTF{}{}{}": {
       "snippet": "IfFontSeriesContextTF{${1:face}}{${2:true code}}{${3:false code}}"
     },
-    "IfFormatAtLeastF{}{}": {
-      "snippet": "IfFormatAtLeastF{${1:date}}{${2:false code}}"
-    },
-    "IfFormatAtLeastT{}{}": {
-      "snippet": "IfFormatAtLeastT{${1:date}}{${2:true code}}"
-    },
     "IfFormatAtLeastTF{}{}{}": {
       "snippet": "IfFormatAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
     "IfHookEmptyTF{}{}{}": {
       "snippet": "IfHookEmptyTF{${1:hook}}{${2:true code}}{${3:false code}}"
     },
-    "IfInstanceExistsF{}{}{}{}": {
-      "snippet": "IfInstanceExistsF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
-    },
-    "IfInstanceExistsT{}{}{}{}": {
-      "snippet": "IfInstanceExistsT{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
-    },
-    "IfInstanceExistsTF{}{}{}{}": {
-      "snippet": "IfInstanceExistsTF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
-    },
-    "IfLabelExistsF{}{}": {
-      "snippet": "IfLabelExistsF{${1:label}}{${2:false code}}"
-    },
-    "IfLabelExistsT{}{}": {
-      "snippet": "IfLabelExistsT{${1:label}}{${2:true code}}"
-    },
-    "IfLabelExistsTF{}{}{}": {
-      "snippet": "IfLabelExistsTF{${1:label}}{${2:true code}}{${3:false code}}"
+    "IfLabelExistTF{}{}{}": {
+      "snippet": "IfLabelExistTF{${1:label}}{${2:true code}}{${3:false code}}"
     },
     "IfMarksEqualTF[]{}{}{}{}{}": {
       "snippet": "IfMarksEqualTF[${6:region}]{${1:class}}{${2:pos1}}{${3:pos2}}{${4:true code}}{${5:false code}}"
@@ -516,44 +438,20 @@
     "IfNoValueTF{}{}{}": {
       "snippet": "IfNoValueTF{${1:arg}}{${2:-NoValue-Code}}{${3:ValueCode}}"
     },
-    "IfPackageAtLeastF{}{}{}": {
-      "snippet": "IfPackageAtLeastF{${1:package}}{${2:date}}{${3:false code}}"
-    },
-    "IfPackageAtLeastT{}{}{}": {
-      "snippet": "IfPackageAtLeastT{${1:package}}{${2:date}}{${3:true code}}"
-    },
     "IfPackageAtLeastTF{}{}{}{}": {
       "snippet": "IfPackageAtLeastTF{${1:package}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
-    "IfPackageLoadedF{}{}": {
-      "snippet": "IfPackageLoadedF{${1:package}}{${2:false code}}"
-    },
-    "IfPackageLoadedT{}{}": {
-      "snippet": "IfPackageLoadedT{${1:package}}{${2:true code}}"
-    },
     "IfPackageLoadedTF{}{}{}": {
       "snippet": "IfPackageLoadedTF{${1:package}}{${2:true code}}{${3:false code}}"
     },
-    "IfPackageLoadedWithOptionsF{}{}{}": {
-      "snippet": "IfPackageLoadedWithOptionsF{${1:package}}{${2:options}}{${3:false code}}"
-    },
-    "IfPackageLoadedWithOptionsT{}{}{}": {
-      "snippet": "IfPackageLoadedWithOptionsT{${1:package}}{${2:options}}{${3:true code}}"
-    },
     "IfPackageLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfPackageLoadedWithOptionsTF{${1:package}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfPDFManagementActiveTF{}{}": {
       "snippet": "IfPDFManagementActiveTF{${1:true code}}{${2:false code}}"
     },
-    "IfPropertyExistsF{}{}": {
-      "snippet": "IfPropertyExistsF{${1:property}}{${2:false code}}"
-    },
-    "IfPropertyExistsT{}{}": {
-      "snippet": "IfPropertyExistsT{${1:property}}{${2:true code}}"
-    },
-    "IfPropertyExistsTF{}{}{}": {
-      "snippet": "IfPropertyExistsTF{${1:property}}{${2:true code}}{${3:false code}}"
+    "IfPropertyExistTF{}{}{}": {
+      "snippet": "IfPropertyExistTF{${1:property}}{${2:true code}}{${3:false code}}"
     },
     "IfPropertyRecordedTF{}{}{}{}": {
       "snippet": "IfPropertyRecordedTF{${1:label}}{${2:property}}{${3:true code}}{${4:false code}}"
@@ -580,9 +478,6 @@
     "InsertMark{}{}": {
       "snippet": "InsertMark{${1:class}}{${2:text}}"
     },
-    "KeyValue{}": {
-      "snippet": "KeyValue{${1:key name}}"
-    },
     "LastDeclaredEncoding": {},
     "LastMark[]{}": {
       "snippet": "LastMark[${2:region}]{${1:class}}"
@@ -687,9 +582,6 @@
     "NewSocketPlug{}{}{}": {
       "snippet": "NewSocketPlug{${1:socket}}{${2:socket plug}}{${3:code}}"
     },
-    "NewTemplateType{}{}": {
-      "snippet": "NewTemplateType{${1:template type}}{${2:no. of args}}"
-    },
     "NextLinkTarget{}": {
       "snippet": "NextLinkTarget{${1:target name}}"
     },
@@ -838,9 +730,6 @@
     "RequirePackageWithOptions{}[]": {
       "snippet": "RequirePackageWithOptions{${1:package}}[${2:release}]"
     },
-    "ResumeTagging{}": {
-      "snippet": "ResumeTagging{${1:string}}"
-    },
     "ReverseBoolean": {},
     "SetDefaultHookLabel{}": {
       "snippet": "SetDefaultHookLabel{${1:default label}}"
@@ -860,9 +749,6 @@
     "SetSymbolFont{}{}{}{}{}{}": {
       "snippet": "SetSymbolFont{${1:sym-font}}{${2:version}}{${3:encoding}}{${4:family}}{${5:series}}{${6:shape}}"
     },
-    "SetTemplateKeys{}{}{}": {
-      "snippet": "SetTemplateKeys{${1:type}}{${2:template}}{${3:keyvals}}"
-    },
     "ShipoutBox": {},
     "ShipoutBoxDepth": {},
     "ShipoutBoxHeight": {},
@@ -879,36 +765,15 @@
     "ShowHook{}": {
       "snippet": "ShowHook{${1:hook}}"
     },
-    "ShowInstanceValues{}{}": {
-      "snippet": "ShowInstanceValues{${1:type}}{${2:instance}}"
-    },
-    "ShowMarksAt{}": {
-      "snippet": "ShowMarksAt{${1:text}}"
-    },
     "ShowSocket{}": {
       "snippet": "ShowSocket{${1:socket}}"
     },
-    "ShowTemplateCode{}{}": {
-      "snippet": "ShowTemplateCode{${1:type}}{${2:template}}"
-    },
-    "ShowTemplateDefaults{}{}": {
-      "snippet": "ShowTemplateDefaults{${1:type}}{${2:template}}"
-    },
-    "ShowTemplateInterface{}{}": {
-      "snippet": "ShowTemplateInterface{${1:type}}{${2:template}}"
-    },
-    "ShowTemplateVariables{}{}": {
-      "snippet": "ShowTemplateVariables{${1:type}}{${2:template}}"
-    },
     "SplitArgument{}{}": {
       "snippet": "SplitArgument{${1:number}}{${2:tokens}}"
     },
     "SplitList{}": {
       "snippet": "SplitList{${1:tokens}}"
     },
-    "SuspendTagging{}": {
-      "snippet": "SuspendTagging{${1:string}}"
-    },
     "TextSymbolUnavailable{}": {
       "snippet": "TextSymbolUnavailable{${1:arg}}"
     },
@@ -925,9 +790,6 @@
     "UseHook{}": {
       "snippet": "UseHook{${1:hook}}"
     },
-    "UseInstance{}{}": {
-      "snippet": "UseInstance{${1:type}}{${2:instance}}"
-    },
     "UseLegacyTextSymbols": {},
     "UseName{}": {
       "snippet": "UseName{${1:csname}}"
@@ -937,13 +799,7 @@
     },
     "UseRawInputEncoding": {},
     "UseSocket{}": {
-      "snippet": "UseSocket{${1:socket name}}"
-    },
-    "UseTaggingSocket{}": {
-      "snippet": "UseTaggingSocket{${1:socket}}"
-    },
-    "UseTemplate{}{}{}": {
-      "snippet": "UseTemplate{${1:type}}{${2:template}}{${3:settings}}"
+      "snippet": "UseSocket{${1:socket}}"
     },
     "UseTextAccent{}{}{}": {
       "snippet": "UseTextAccent{${1:encoding}}{${2:cmd}}{${3:text}}"
@@ -1387,6 +1243,26 @@
     "itdefault": {},
     "loggingall": {},
     "loggingoutput": {},
+    "ltcmddate": {},
+    "ltcmdhooksdate": {},
+    "ltcmdhooksversion": {},
+    "ltcmdversion": {},
+    "ltfilehookdate": {},
+    "ltfilehookversion": {},
+    "lthooksdate": {},
+    "lthooksversion": {},
+    "ltmarksdate": {},
+    "ltmarksversion": {},
+    "ltmetadate": {},
+    "ltmetaversion": {},
+    "ltparadate": {},
+    "ltparaversion": {},
+    "ltpropertiesdate": {},
+    "ltpropertiesversion": {},
+    "ltshipoutdate": {},
+    "ltshipoutversion": {},
+    "ltsocketsdate": {},
+    "ltsocketsversion": {},
     "mathalpha": {},
     "mathgroup": {},
     "mathhexbox": {},
@@ -1397,8 +1273,6 @@
     "numberline{}": {
       "snippet": "numberline{${1:number}}"
     },
-    "obeyedline": {},
-    "obeyedspace": {},
     "poptabs": {},
     "pushtabs": {},
     "requestedLaTeXdate": {},
diff --git a/data/packages/latex-document.json b/data/packages/latex-document.json
index 696a6c964..be4a24017 100644
--- a/data/packages/latex-document.json
+++ b/data/packages/latex-document.json
@@ -13,22 +13,13 @@
     },
     "and": {},
     "asciispace": {},
-    "bezier{}()()()": {
-      "snippet": "bezier{${1:n}}(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
-    },
     "bfseries": {},
     "bibindent": {},
     "Bigg": {},
-    "Bigg(": {
-      "snippet": "Bigg(${2:${1}\\Bigg})"
-    },
     "Bigg[": {
       "snippet": "Bigg[${1}\\Bigg]"
     },
     "bigg": {},
-    "bigg(": {
-      "snippet": "bigg(${2:${1}\\bigg})"
-    },
     "bigg[": {
       "snippet": "bigg[${1}\\bigg]"
     },
@@ -49,12 +40,6 @@
       "snippet": "contentsline{${1:type}}{${2:text}}{${3:page}}{${4:Href}}"
     },
     "contentsname": {},
-    "dashbox{}()[]{}": {
-      "snippet": "dashbox{${1:dashlength}}(${4:width},${5:height})[${2:position}]{${3:text}}"
-    },
-    "dashbox{}(){}": {
-      "snippet": "dashbox{${1:dashlength}}(${3:width},${4:height}){${2:text}}"
-    },
     "date{}": {
       "snippet": "date{${1:text}}"
     },
@@ -106,12 +91,6 @@
     "fpeval{}": {
       "snippet": "fpeval{${1:fp expression}}"
     },
-    "framebox()[]{}": {
-      "snippet": "framebox(${3:xdimen},${4:ydimen})[${2:position}]{${1:text}}"
-    },
-    "framebox(){}": {
-      "snippet": "framebox(${2:xdimen},${3:ydimen}){${1:text}}"
-    },
     "frame{}": {
       "snippet": "frame{${1:text}}"
     },
@@ -157,35 +136,21 @@
       "snippet": "legacyoldstylenums{${1:text}}"
     },
     "lhook": {},
-    "line(){}": {
-      "snippet": "line(${2:xslope},${3:yslope}){${1:length}}"
-    },
     "linethickness{}": {
       "snippet": "linethickness{${1:dimension}}"
     },
     "linewidth": {},
     "listfigurename": {},
     "listfiles": {},
-    "listfiles[]": {
-      "snippet": "listfiles[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "listparindent": {},
     "listtablename": {},
-    "makebox()[]{}": {
-      "snippet": "makebox(${3:width},${4:height})[${2:position}]{${1:text}}"
-    },
-    "makebox(){}": {
-      "snippet": "makebox(${2:width},${3:height}){${1:text}}"
-    },
     "makelabel": {},
     "MakeLowercase{}": {
       "snippet": "MakeLowercase{${1:text}}"
     },
     "MakeLowercase[]{}": {
       "snippet": "MakeLowercase[${2:options}]{${1:text}}",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "MakeTitlecase{}": {
@@ -193,7 +158,7 @@
     },
     "MakeTitlecase[]{}": {
       "snippet": "MakeTitlecase[${2:options}]{${1:text}}",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "MakeUppercase{}": {
@@ -201,7 +166,7 @@
     },
     "MakeUppercase[]{}": {
       "snippet": "MakeUppercase[${2:options}]{${1:text}}",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "mapstochar": {},
@@ -230,9 +195,6 @@
       "documentation": "MEDIUM MATHEMATICAL SPACE, four-eighteenths of an em"
     },
     "mdseries": {},
-    "multiput()(){}{}": {
-      "snippet": "multiput(${3:xcoord},${4:ycoord})(${5:xdelta},${6:ydelta}){${1:copies}}{${2:object}}"
-    },
     "negmedspace": {},
     "negthickspace": {},
     "newblock": {},
@@ -264,12 +226,6 @@
       "snippet": "oldstylenums{${1:text}}"
     },
     "onecolumn": {},
-    "oval()": {
-      "snippet": "oval(${1:width},${2:height})"
-    },
-    "oval()[]": {
-      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
-    },
     "pageref*{}": {
       "snippet": "pageref*{${1:label}}"
     },
@@ -290,15 +246,6 @@
     },
     "protect": {},
     "pushtabs": {},
-    "put(){}": {
-      "snippet": "put(${2:xcoord},${3:ycoord}){${1:text}}"
-    },
-    "qbezier()()()": {
-      "snippet": "qbezier(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
-    "qbezier[]()()()": {
-      "snippet": "qbezier[${1:n}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
-    },
     "qbeziermax": {},
     "r{}": {
       "snippet": "r{${1:letter}}"
@@ -475,9 +422,6 @@
       "detail": "⋮",
       "documentation": "VERTICAL ELLIPSIS"
     },
-    "vector(){}": {
-      "snippet": "vector(${2:xslope},${3:yslope}){${1:length}}"
-    },
     "verb": {
       "snippet": "verb|${1:text}|"
     },
@@ -573,7 +517,7 @@
     "filecontents[]{}": {
       "name": "filecontents",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "filecontents*{}": {
@@ -583,7 +527,7 @@
     "filecontents*[]{}": {
       "name": "filecontents*",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "flushleft": {},
@@ -622,14 +566,6 @@
       "snippet": "{${1:width}}"
     },
     "normalsize": {},
-    "picture(width,height)": {
-      "name": "picture",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "picture(width,height)(xoffset,yoffset)": {
-      "name": "picture",
-      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
-    },
     "pmatrix": {},
     "quotation": {},
     "quote": {},
@@ -699,10 +635,6 @@
     "openbib"
   ],
   "keyvals": [
-    [
-      "hashes",
-      "sizes"
-    ],
     [
       "locale=${1:BCP-47 tag}",
       "lang=${1:BCP-47 tag}"
diff --git a/data/packages/listings.json b/data/packages/listings.json
index a41539139..24c2b4ab8 100644
--- a/data/packages/listings.json
+++ b/data/packages/listings.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "lstloadlanguages{}": {
-      "snippet": "lstloadlanguages{${1:lang1,${2:lang2},...}}"
+      "snippet": "lstloadlanguages{${1:lang1,lang2,...}}"
     },
     "lstset{}": {
       "snippet": "lstset{${1:keyvals}}",
diff --git a/data/packages/logsys.json b/data/packages/logsys.json
index c82c7867b..e109b42f8 100644
--- a/data/packages/logsys.json
+++ b/data/packages/logsys.json
@@ -27,114 +27,6 @@
     "vlogline*[]{}{}": {
       "snippet": "vlogline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
-    "logsys()()": {
-      "snippet": "logsys(${1:lower-left})(${2:upper-right})"
-    },
-    "logsys[]()()": {
-      "snippet": "logsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logsys[][]()()": {
-      "snippet": "logsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "logsys*()()": {
-      "snippet": "logsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "logsys*[]()()": {
-      "snippet": "logsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logsys*[][]()()": {
-      "snippet": "logsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semilogsys()()": {
-      "snippet": "semilogsys(${1:lower-left})(${2:upper-right})"
-    },
-    "semilogsys[]()()": {
-      "snippet": "semilogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semilogsys[][]()()": {
-      "snippet": "semilogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semilogsys*()()": {
-      "snippet": "semilogsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "semilogsys*[]()()": {
-      "snippet": "semilogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semilogsys*[][]()()": {
-      "snippet": "semilogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loglogsys()()": {
-      "snippet": "loglogsys(${1:lower-left})(${2:upper-right})"
-    },
-    "loglogsys[]()()": {
-      "snippet": "loglogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loglogsys[][]()()": {
-      "snippet": "loglogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loglogsys*()()": {
-      "snippet": "loglogsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "loglogsys*[]()()": {
-      "snippet": "loglogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loglogsys*[][]()()": {
-      "snippet": "loglogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loggrid()()": {
-      "snippet": "loggrid(${1:lower-left})(${2:upper-right})"
-    },
-    "loggrid[]()()": {
-      "snippet": "loggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loggrid[][]()()": {
-      "snippet": "loggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loggrid*()()": {
-      "snippet": "loggrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "loggrid*[]()()": {
-      "snippet": "loggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loggrid*[][]()()": {
-      "snippet": "loggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semiloggrid()()": {
-      "snippet": "semiloggrid(${1:lower-left})(${2:upper-right})"
-    },
-    "semiloggrid[]()()": {
-      "snippet": "semiloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semiloggrid[][]()()": {
-      "snippet": "semiloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semiloggrid*()()": {
-      "snippet": "semiloggrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "semiloggrid*[]()()": {
-      "snippet": "semiloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semiloggrid*[][]()()": {
-      "snippet": "semiloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "logloggrid()()": {
-      "snippet": "logloggrid(${1:lower-left})(${2:upper-right})"
-    },
-    "logloggrid[]()()": {
-      "snippet": "logloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logloggrid[][]()()": {
-      "snippet": "logloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "logloggrid*()()": {
-      "snippet": "logloggrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "logloggrid*[]()()": {
-      "snippet": "logloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logloggrid*[][]()()": {
-      "snippet": "logloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
     "interval": {},
     "intervalthickness{}": {
       "snippet": "intervalthickness{${1:width}}"
diff --git a/data/packages/paracol.json b/data/packages/paracol.json
index 0ded80be5..85b063636 100644
--- a/data/packages/paracol.json
+++ b/data/packages/paracol.json
@@ -19,16 +19,16 @@
       "snippet": "ensurevspace{${1:length}}"
     },
     "columnratio{}": {
-      "snippet": "columnratio{${1:ratio 0,${2:...},ratio k}}"
+      "snippet": "columnratio{${1:ratio 0,...,ratio k}}"
     },
     "columnratio{}[]": {
-      "snippet": "columnratio{${1:ratio 0,${3:...},${4:ratio k}}[${2:ratio' 0},${5:...},ratio' k}]"
+      "snippet": "columnratio{${1:ratio 0,...,ratio k}}[${2:ratio' 0,...,ratio' k}]"
     },
     "setcolumnwidth{}": {
-      "snippet": "setcolumnwidth{${1:gap 0,${2:...},gap k}}"
+      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}"
     },
     "setcolumnwidth{}[]": {
-      "snippet": "setcolumnwidth{${1:gap 0,${3:...},${4:gap k}}[${2:gap' 0},${5:...},gap' k}]"
+      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}[${2:gap' 0,...,gap' k}]"
     },
     "twosided": {},
     "twosided[]": {
diff --git a/data/packages/pgfcore.json b/data/packages/pgfcore.json
index 8634f1142..602c3d2be 100644
--- a/data/packages/pgfcore.json
+++ b/data/packages/pgfcore.json
@@ -2157,9 +2157,6 @@
     "pgfooclass{}{}": {
       "snippet": "pgfooclass{${1:class}}{${2:body}}"
     },
-    "pgfooclass(){}{}": {
-      "snippet": "pgfooclass(${3:list of superclasses}){${1:class}}{${2:body}}"
-    },
     "attribute": {},
     "method": {},
     "pgfoovalueof{}": {
diff --git a/data/packages/pgfplots.json b/data/packages/pgfplots.json
index e27c2719b..d4093d1a3 100644
--- a/data/packages/pgfplots.json
+++ b/data/packages/pgfplots.json
@@ -365,46 +365,46 @@
       "snippet": "pgfplotsutilsortfour{${1:macro1}}{${2:macro2}}{${3:macro3}}{${4:macro4}}"
     },
     "pgfplotsmathvectortostring{}{}": {
-      "snippet": "pgfplotsmathvectortostring{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectortostring{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorfromstring{}{}": {
-      "snippet": "pgfplotsmathvectorfromstring{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorfromstring{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorsubtract{}{}{}": {
-      "snippet": "pgfplotsmathvectorsubtract{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorsubtract{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectoradd{}{}{}": {
-      "snippet": "pgfplotsmathvectoradd{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectoradd{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorcompwise{}{}{}{}": {
-      "snippet": "pgfplotsmathvectorcompwise{${1:x1,${5:y1},${6:z1}}{${2:x2},${7:y2},z2}}{${3:operation}}{${4:arg}}"
+      "snippet": "pgfplotsmathvectorcompwise{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:operation}}{${4:arg}}"
     },
     "pgfplotsmathvectorsum{}{}": {
-      "snippet": "pgfplotsmathvectorsum{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorsum{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscalarproduct{}{}{}": {
-      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectortocomponents{}{}{}": {
-      "snippet": "pgfplotsmathvectortocomponents{${1:x,${4:y},z}}{${2:string}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectortocomponents{${1:x,y,z}}{${2:string}}{${3:arg}}"
     },
     "pgfplotsmathvectorcrossprod{}{}{}": {
-      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorscaleindividually{}{}{}": {
-      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotspointfromcsvvector{}{}": {
-      "snippet": "pgfplotspointfromcsvvector{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotspointfromcsvvector{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorlength{}{}": {
-      "snippet": "pgfplotsmathvectorlength{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorlength{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscale{}{}{}": {
-      "snippet": "pgfplotsmathvectorscale{${1:x,${4:y},z}}{${2:scale}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscale{${1:x,y,z}}{${2:scale}}{${3:arg}}"
     },
     "pgfplotsmathvectordatascaletrafoinverse{}{}": {
-      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsDQ": {},
     "pgfplotsVERTBAR": {},
@@ -980,9 +980,6 @@
     "rangea": {},
     "rangeb": {},
     "factor": {},
-    "simplecoordinate()": {
-      "snippet": "simplecoordinate(${1:x},${2:y},${3:z})"
-    },
     "curelem": {},
     "pgfplotssetaxesfromazel{}{}{}": {
       "snippet": "pgfplotssetaxesfromazel{${1:azimuth}}{${2:elevation}}{${3:macro}}"
@@ -1193,7 +1190,7 @@
     },
     "pgfplotsaxisvisphasepreparedatapoint": {},
     "pgfplotsaxisvisphasetransformcoordinateentry{}{}": {
-      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x,${3: y}, or z}}{${2:input}}"
+      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x, y, or z}}{${2:input}}"
     },
     "pgfplotstransformplotattime{}": {
       "snippet": "pgfplotstransformplotattime{${1:fraction}}"
@@ -1209,16 +1206,13 @@
       "snippet": "pgfplotspointplotattime{${1:fraction}}"
     },
     "pgfplotsplothandlergraphics": {},
-    "pgfplotsplothandlergraphicspointmappoint()()": {
-      "snippet": "pgfplotsplothandlergraphicspointmappoint(${1:x},${2:y},${3:z})(${4:a},${5:b})"
-    },
     "pgfplotsplothandlergraphicspointmapcomputerequiredview": {},
     "pgfplotsE": {},
     "pgfplotsmathfloatviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathfloatviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
     },
     "pgfplotsmathvectorviewdepth{}": {
-      "snippet": "pgfplotsmathvectorviewdepth{${1:x,${2:y},z}}"
+      "snippet": "pgfplotsmathvectorviewdepth{${1:x,y,z}}"
     },
     "pgfplotsmathviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
@@ -1233,22 +1227,22 @@
     "tick": {},
     "nexttick": {},
     "pgfplotsvalueoflargesttickdimen{}": {
-      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x,${2: y}, or z}}"
+      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x, y, or z}}"
     },
     "pgfplotsqpointoutsideofticklabelaxis{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxisrel{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxistransformed{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsticklabelaxisspec{}": {
-      "snippet": "pgfplotsticklabelaxisspec{${1:x,${2: y}, or z}}"
+      "snippet": "pgfplotsticklabelaxisspec{${1:x, y, or z}}"
     },
     "pgfplotspointouternormalvectorofticklabelaxis{}": {
-      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x,${2: y}, or z}}"
+      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x, y, or z}}"
     },
     "Hmacro": {},
     "Hmacrobaseten": {},
diff --git a/data/packages/physics.json b/data/packages/physics.json
index bb72bca82..6dfcaa9e3 100644
--- a/data/packages/physics.json
+++ b/data/packages/physics.json
@@ -15,9 +15,6 @@
     "Pmqty{}": {
       "snippet": "Pmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
-    "Pr()": {
-      "snippet": "Pr(${1:expression})"
-    },
     "Probability": {},
     "Res[]": {
       "snippet": "Res[${1:expression}]"
@@ -46,102 +43,30 @@
     "acommutator{}{}": {
       "snippet": "acommutator{${1:expression1}}{${2:expression2}}"
     },
-    "acos()": {
-      "snippet": "acos(${1:expression})"
-    },
-    "acos[]()": {
-      "snippet": "acos[${1:power}](${2:expression})"
-    },
     "acosecant": {},
     "acosine": {},
-    "acot()": {
-      "snippet": "acot(${1:expression})"
-    },
-    "acot[]()": {
-      "snippet": "acot[${1:power}](${2:expression})"
-    },
     "acotangent": {},
-    "acsc()": {
-      "snippet": "acsc(${1:expression})"
-    },
-    "acsc[]()": {
-      "snippet": "acsc[${1:power}](${2:expression})"
-    },
     "admat{}": {
-      "snippet": "admat{${1:matrix element 1,${2:matrix element 2},...}}"
+      "snippet": "admat{${1:matrix element 1,matrix element 2,...}}"
     },
     "anticommutator{}{}": {
       "snippet": "anticommutator{${1:expression1}}{${2:expression2}}"
     },
     "antidiagonalmatrix{}": {
-      "snippet": "antidiagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
-    },
-    "arccos()": {
-      "snippet": "arccos(${1:expression})"
-    },
-    "arccos[]()": {
-      "snippet": "arccos[${1:power}](${2:expression})"
+      "snippet": "antidiagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
     },
     "arccosecant": {},
     "arccosine": {},
-    "arccot()": {
-      "snippet": "arccot(${1:expression})"
-    },
-    "arccot[]()": {
-      "snippet": "arccot[${1:power}](${2:expression})"
-    },
     "arccotangent": {},
-    "arccsc()": {
-      "snippet": "arccsc(${1:expression})"
-    },
-    "arccsc[]()": {
-      "snippet": "arccsc[${1:power}](${2:expression})"
-    },
-    "arcsec()": {
-      "snippet": "arcsec(${1:expression})"
-    },
-    "arcsec[]()": {
-      "snippet": "arcsec[${1:power}](${2:expression})"
-    },
     "arcsecant": {},
-    "arcsin()": {
-      "snippet": "arcsin(${1:expression})"
-    },
-    "arcsin[]()": {
-      "snippet": "arcsin[${1:power}](${2:expression})"
-    },
     "arcsine": {},
-    "arctan()": {
-      "snippet": "arctan(${1:expression})"
-    },
-    "arctan[]()": {
-      "snippet": "arctan[${1:power}](${2:expression})"
-    },
     "arctangent": {},
     "argclose": {},
     "argclose*": {},
     "argopen": {},
     "argopen*": {},
-    "asec()": {
-      "snippet": "asec(${1:expression})"
-    },
-    "asec[]()": {
-      "snippet": "asec[${1:power}](${2:expression})"
-    },
     "asecant": {},
-    "asin()": {
-      "snippet": "asin(${1:expression})"
-    },
-    "asin[]()": {
-      "snippet": "asin[${1:power}](${2:expression})"
-    },
     "asine": {},
-    "atan()": {
-      "snippet": "atan(${1:expression})"
-    },
-    "atan[]()": {
-      "snippet": "atan[${1:power}](${2:expression})"
-    },
     "atangent": {},
     "bmqty{}": {
       "snippet": "bmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
@@ -177,55 +102,13 @@
     "commutator{}{}": {
       "snippet": "commutator{${1:expression1}}{${2:expression2}}"
     },
-    "cos()": {
-      "snippet": "cos(${1:expression})"
-    },
-    "cos[]()": {
-      "snippet": "cos[${1:power}](${2:expression})"
-    },
     "cosecant": {},
-    "cosh()": {
-      "snippet": "cosh(${1:expression})"
-    },
-    "cosh[]()": {
-      "snippet": "cosh[${1:power}](${2:expression})"
-    },
     "cosine": {},
-    "cot()": {
-      "snippet": "cot(${1:expression})"
-    },
-    "cot[]()": {
-      "snippet": "cot[${1:power}](${2:expression})"
-    },
     "cotangent": {},
-    "coth()": {
-      "snippet": "coth(${1:expression})"
-    },
-    "coth[]()": {
-      "snippet": "coth[${1:power}](${2:expression})"
-    },
     "cp": {},
     "cross": {},
     "crossproduct": {},
-    "csc()": {
-      "snippet": "csc(${1:expression})"
-    },
-    "csc[]()": {
-      "snippet": "csc[${1:power}](${2:expression})"
-    },
-    "csch()": {
-      "snippet": "csch(${1:expression})"
-    },
-    "csch[]()": {
-      "snippet": "csch[${1:power}](${2:expression})"
-    },
     "curl": {},
-    "curl()": {
-      "snippet": "curl(${1:expression})"
-    },
-    "curl*()": {
-      "snippet": "curl*(${1:expression})"
-    },
     "curl*[]": {
       "snippet": "curl*[${1:expression}]"
     },
@@ -239,9 +122,6 @@
       "detail": "ⅆ",
       "documentation": "DOUBLE-STRUCK ITALIC SMALL D"
     },
-    "dd()": {
-      "snippet": "dd(${1:expression})"
-    },
     "dd[]{}": {
       "snippet": "dd[${2:power}]{${1:expression}}"
     },
@@ -251,20 +131,11 @@
     "derivative{}{}": {
       "snippet": "derivative{${1:function}}{${2:expression}}"
     },
-    "det()": {
-      "snippet": "det(${1:expression})"
-    },
     "determinant": {},
     "diagonalmatrix{}": {
-      "snippet": "diagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
+      "snippet": "diagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
     },
     "differential": {},
-    "div()": {
-      "snippet": "div(${1:expression})"
-    },
-    "div*()": {
-      "snippet": "div*(${1:expression})"
-    },
     "div*[]": {
       "snippet": "div*[${1:expression}]"
     },
@@ -280,7 +151,7 @@
     },
     "divisionsymbol": {},
     "dmat{}": {
-      "snippet": "dmat{${1:matrix element 1,${2:matrix element 2},...}}"
+      "snippet": "dmat{${1:matrix element 1,matrix element 2,...}}"
     },
     "dotproduct": {},
     "dv*{}{}": {
@@ -292,9 +163,6 @@
     "dv{}": {
       "snippet": "dv{${1:expression}}"
     },
-    "dv{}()": {
-      "snippet": "dv{${1:expression1}}(${2:expression2})"
-    },
     "dv{}{}": {
       "snippet": "dv{${1:function}}{${2:expression}}"
     },
@@ -307,9 +175,6 @@
     "dyad{}{}": {
       "snippet": "dyad{${1:expression1}}{${2:expression2}}"
     },
-    "erf()": {
-      "snippet": "erf(${1:expression})"
-    },
     "ev**{}{}": {
       "snippet": "ev**{${1:expression1}}{${2:expression2}}"
     },
@@ -331,9 +196,6 @@
     "evaluated{}_{}^{}": {
       "snippet": "evaluated{${1:expression}}_{${2:limit1}}^{${3:limit2}}"
     },
-    "exp()": {
-      "snippet": "exp(${1:expression})"
-    },
     "expectationvalue{}{}": {
       "snippet": "expectationvalue{${1:expression1}}{${2:expression2}}"
     },
@@ -359,25 +221,13 @@
     "fdv{}": {
       "snippet": "fdv{${1:expression}}"
     },
-    "fdv{}()": {
-      "snippet": "fdv{${1:expression}}(${2:function})"
-    },
     "fdv{}{}": {
       "snippet": "fdv{${1:function}}{${2:expression}}"
     },
-    "flatfrac{}()": {
-      "snippet": "flatfrac{${1:expression1}}(${2:expression2})"
-    },
     "functionalderivative{}{}": {
       "snippet": "functionalderivative{${1:function}}{${2:expression}}"
     },
     "grad": {},
-    "grad()": {
-      "snippet": "grad(${1:expression})"
-    },
-    "grad*()": {
-      "snippet": "grad*(${1:expression})"
-    },
     "grad*[]": {
       "snippet": "grad*[${1:expression}]"
     },
@@ -427,12 +277,6 @@
       "snippet": "ketbra{${1:expression1}}{${2:expression2}}"
     },
     "laplacian": {},
-    "laplacian()": {
-      "snippet": "laplacian(${1:expression})"
-    },
-    "laplacian*()": {
-      "snippet": "laplacian*(${1:expression})"
-    },
     "laplacian*[]": {
       "snippet": "laplacian*[${1:expression}]"
     },
@@ -442,12 +286,6 @@
     "laplacian{}": {
       "snippet": "laplacian{${1:expression}}"
     },
-    "ln()": {
-      "snippet": "ln(${1:expression})"
-    },
-    "log()": {
-      "snippet": "log(${1:expression})"
-    },
     "logarithm": {},
     "lparen": {
       "detail": "(",
@@ -468,9 +306,6 @@
     "matrixelement{}{}{}": {
       "snippet": "matrixelement{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
-    "matrixquantity()": {
-      "snippet": "matrixquantity(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
-    },
     "matrixquantity{}": {
       "snippet": "matrixquantity{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -487,12 +322,6 @@
     "mel{}{}{}": {
       "snippet": "mel{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
-    "mqty()": {
-      "snippet": "mqty(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
-    },
-    "mqty*()": {
-      "snippet": "mqty*(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
-    },
     "mqty[]": {
       "snippet": "mqty[${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}]"
     },
@@ -515,9 +344,6 @@
     "op{}{}": {
       "snippet": "op{${1:expression1}}{${2:expression2}}"
     },
-    "opbraces{}()": {
-      "snippet": "opbraces{${1:operator}}(${2:expression})"
-    },
     "order*{}": {
       "snippet": "order*{${1:expression}}"
     },
@@ -634,9 +460,6 @@
     "qsince*": {},
     "qthen": {},
     "qthen*": {},
-    "qty()": {
-      "snippet": "qty(${1:expression})"
-    },
     "qty[]": {
       "snippet": "qty[${1:expression}]"
     },
@@ -661,32 +484,8 @@
     "sbmqty{}": {
       "snippet": "sbmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
-    "sec()": {
-      "snippet": "sec(${1:expression})"
-    },
-    "sec[]()": {
-      "snippet": "sec[${1:power}](${2:expression})"
-    },
     "secant": {},
-    "sech()": {
-      "snippet": "sech(${1:expression})"
-    },
-    "sech[]()": {
-      "snippet": "sech[${1:power}](${2:expression})"
-    },
-    "sin()": {
-      "snippet": "sin(${1:expression})"
-    },
-    "sin[]()": {
-      "snippet": "sin[${1:power}](${2:expression})"
-    },
     "sine": {},
-    "sinh()": {
-      "snippet": "sinh(${1:expression})"
-    },
-    "sinh[]()": {
-      "snippet": "sinh[${1:power}](${2:expression})"
-    },
     "smallmatrixdeterminant{}": {
       "snippet": "smallmatrixdeterminant{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -696,12 +495,6 @@
     "smdet{}": {
       "snippet": "smdet{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element}}"
     },
-    "smqty({})": {
-      "snippet": "smqty(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
-    },
-    "smqty*({})": {
-      "snippet": "smqty*(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
-    },
     "smqty[{]": {
       "snippet": "smqty[{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}]"
     },
@@ -720,27 +513,9 @@
     "svmqty{}": {
       "snippet": "svmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
-    "tan()": {
-      "snippet": "tan(${1:expression})"
-    },
-    "tan[]()": {
-      "snippet": "tan[${1:power}](${2:expression})"
-    },
     "tangent": {},
-    "tanh()": {
-      "snippet": "tanh(${1:expression})"
-    },
-    "tanh[]()": {
-      "snippet": "tanh[${1:power}](${2:expression})"
-    },
     "tr": {},
-    "tr()": {
-      "snippet": "tr(${1:expression})"
-    },
     "trace": {},
-    "trigbraces{}()": {
-      "snippet": "trigbraces{${1:operator}}(${2:expression})"
-    },
     "trigopt": {},
     "va*{}": {
       "snippet": "va*{${1:expression}}"
@@ -748,9 +523,6 @@
     "va{}": {
       "snippet": "va{${1:expression}}"
     },
-    "var()": {
-      "snippet": "var(${1:expression})"
-    },
     "var{}": {
       "snippet": "var{${1:expression}}"
     },
diff --git a/data/packages/physics2.json b/data/packages/physics2.json
index 05a055b1a..36533ab9b 100644
--- a/data/packages/physics2.json
+++ b/data/packages/physics2.json
@@ -73,40 +73,40 @@
       "snippet": "ketbra*|subformula1>${1:optional}<subformula2|"
     },
     "diagmat{}": {
-      "snippet": "diagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "diagmat{${1:entry1,entry2,...}}"
     },
     "diagmat[]{}": {
-      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "pdiagmat{}": {
-      "snippet": "pdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "pdiagmat{${1:entry1,entry2,...}}"
     },
     "pdiagmat[]{}": {
-      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "bdiagmat{}": {
-      "snippet": "bdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "bdiagmat{${1:entry1,entry2,...}}"
     },
     "bdiagmat[]{}": {
-      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "Bdiagmat{}": {
-      "snippet": "Bdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "Bdiagmat{${1:entry1,entry2,...}}"
     },
     "Bdiagmat[]{}": {
-      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "vdiagmat{}": {
-      "snippet": "vdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "vdiagmat{${1:entry1,entry2,...}}"
     },
     "vdiagmat[]{}": {
-      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "Vdiagmat{}": {
-      "snippet": "Vdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "Vdiagmat{${1:entry1,entry2,...}}"
     },
     "Vdiagmat[]{}": {
-      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "doublecross": {},
     "doubledot": {},
diff --git a/data/packages/pst-3d.json b/data/packages/pst-3d.json
index 7d72b7c56..3e4399531 100644
--- a/data/packages/pst-3d.json
+++ b/data/packages/pst-3d.json
@@ -31,13 +31,7 @@
     "psTilt{}{}": {
       "snippet": "psTilt{${1:angle}}{${2:stuff}}"
     },
-    "PSTthreeDLoaded": {},
-    "ThreeDput(){}": {
-      "snippet": "ThreeDput(${2:x},${3:y},${4:z}){${1:stuff}}"
-    },
-    "ThreeDput[](){}": {
-      "snippet": "ThreeDput[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
-    }
+    "PSTthreeDLoaded": {}
   },
   "envs": {},
   "options": [],
diff --git a/data/packages/pst-coil.json b/data/packages/pst-coil.json
index 63e6a59e3..202fee6f9 100644
--- a/data/packages/pst-coil.json
+++ b/data/packages/pst-coil.json
@@ -5,30 +5,6 @@
     "pst-xkey": []
   },
   "macros": {
-    "pscoil()()": {
-      "snippet": "pscoil(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pscoil{}()()": {
-      "snippet": "pscoil{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil[]()()": {
-      "snippet": "pscoil[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil[]{}()()": {
-      "snippet": "pscoil[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pscoil*()()": {
-      "snippet": "pscoil*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pscoil*{}()()": {
-      "snippet": "pscoil*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil*[]()()": {
-      "snippet": "pscoil*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil*[]{}()()": {
-      "snippet": "pscoil*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
     "psCoil{}{}": {
       "snippet": "psCoil{${1:angle1}}{${2:angle2}}"
     },
@@ -41,54 +17,6 @@
     "psCoil*[]{}{}": {
       "snippet": "psCoil*[${3:options}]{${1:angle1}}{${2:angle2}}"
     },
-    "pszigzag()()": {
-      "snippet": "pszigzag(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pszigzag{}()()": {
-      "snippet": "pszigzag{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag[]()()": {
-      "snippet": "pszigzag[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag[]{}()()": {
-      "snippet": "pszigzag[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pszigzag*()()": {
-      "snippet": "pszigzag*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pszigzag*{}()()": {
-      "snippet": "pszigzag*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag*[]()()": {
-      "snippet": "pszigzag*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag*[]{}()()": {
-      "snippet": "pszigzag*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pssin()()": {
-      "snippet": "pssin(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pssin{}()()": {
-      "snippet": "pssin{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin[]()()": {
-      "snippet": "pssin[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin[]{}()()": {
-      "snippet": "pssin[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pssin*()()": {
-      "snippet": "pssin*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pssin*{}()()": {
-      "snippet": "pssin*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin*[]()()": {
-      "snippet": "pssin*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin*[]{}()()": {
-      "snippet": "pssin*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
     "nccoil{}{}": {
       "snippet": "nccoil{${1:nodeA}}{${2:nodeB}}"
     },
diff --git a/data/packages/pst-node.json b/data/packages/pst-node.json
index 4f4be32c9..942ece71b 100644
--- a/data/packages/pst-node.json
+++ b/data/packages/pst-node.json
@@ -10,15 +10,9 @@
     "algparnode{}{}{}": {
       "snippet": "algparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
-    "AplusB()(){}": {
-      "snippet": "AplusB(${2:A})(${3:B}){${1:C}}"
-    },
     "ArrowNotch{}{}{}{}": {
       "snippet": "ArrowNotch{${1:node name}}{${2:node index}}{${3:direction}}{${4:notch}}"
     },
-    "AtoB()(){}": {
-      "snippet": "AtoB(${2:A})(${3:B}){${1:C}}"
-    },
     "Circlenode*[]{}{}": {
       "snippet": "Circlenode*[${3:options}]{${1:name}}{${2:stuff}}"
     },
@@ -43,78 +37,6 @@
     "circlenode{}{}": {
       "snippet": "circlenode{${1:name}}{${2:stuff}}"
     },
-    "Cnode(){}": {
-      "snippet": "Cnode(${2:x},${3:y}){${1:name}}"
-    },
-    "cnode(){}{}": {
-      "snippet": "cnode(${3:x},${4:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnode*(){}": {
-      "snippet": "Cnode*(${2:x},${3:y}){${1:name}}"
-    },
-    "cnode*(){}{}": {
-      "snippet": "cnode*(${3:x},${4:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnode*[](){}": {
-      "snippet": "Cnode*[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "cnode*[](){}{}": {
-      "snippet": "cnode*[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnode[](){}": {
-      "snippet": "Cnode[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "cnode[](){}{}": {
-      "snippet": "cnode[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnodeput(){}{}{}": {
-      "snippet": "Cnodeput(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput(){}{}": {
-      "snippet": "cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput(){}{}": {
-      "snippet": "Cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*(){}{}{}": {
-      "snippet": "Cnodeput*(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput*(){}{}": {
-      "snippet": "cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*(){}{}": {
-      "snippet": "Cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*[](){}{}{}": {
-      "snippet": "Cnodeput*[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput*[](){}{}": {
-      "snippet": "cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*[](){}{}": {
-      "snippet": "Cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "cnodeput*[]{}(){}{}": {
-      "snippet": "cnodeput*[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
-    },
-    "cnodeput*{}(){}{}": {
-      "snippet": "cnodeput*{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
-    },
-    "Cnodeput[](){}{}{}": {
-      "snippet": "Cnodeput[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput[](){}{}": {
-      "snippet": "cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput[](){}{}": {
-      "snippet": "Cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "cnodeput[]{}(){}{}": {
-      "snippet": "cnodeput[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
-    },
-    "cnodeput{}(){}{}": {
-      "snippet": "cnodeput{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
-    },
     "curvepnode{}{}{}": {
       "snippet": "curvepnode{${1:tval}}{${2:expr in t}}{${3:node name}}"
     },
@@ -136,32 +58,8 @@
     "dianode{}{}": {
       "snippet": "dianode{${1:name}}{${2:stuff}}"
     },
-    "dotnode(){}": {
-      "snippet": "dotnode(${2:x},${3:y}){${1:name}}"
-    },
-    "dotnode*(){}": {
-      "snippet": "dotnode*(${2:x},${3:y}){${1:name}}"
-    },
-    "dotnode*[](){}": {
-      "snippet": "dotnode*[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "dotnode[](){}": {
-      "snippet": "dotnode[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
     "endpsmatrix": {},
     "equalwhat": {},
-    "fnode(){}": {
-      "snippet": "fnode(${2:x},${3:y}){${1:name}}"
-    },
-    "fnode*(){}": {
-      "snippet": "fnode*(${2:x},${3:y}){${1:name}}"
-    },
-    "fnode*[](){}": {
-      "snippet": "fnode*[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "fnode[](){}": {
-      "snippet": "fnode[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
     "fnpnode{}{}{}": {
       "snippet": "fnpnode{${1:xval}}{${2:expr in x}}{${3:node name}}"
     },
@@ -183,9 +81,6 @@
     "MakeShortTablr{}{}{}{}": {
       "snippet": "MakeShortTablr{${1:char1}}{${2:char2}}{${3:char3}}{${4:char4}}"
     },
-    "midAB()(){}": {
-      "snippet": "midAB(${2:A})(${3:B}){${1:C}}"
-    },
     "naput*[]{}": {
       "snippet": "naput*[${2:options}]{${1:stuff}}"
     },
@@ -576,12 +471,6 @@
     "nczigzag{}{}": {
       "snippet": "nczigzag{${1:nodeA}}{${2:nodeB}}"
     },
-    "nlput()(){}{}": {
-      "snippet": "nlput(${3:A})(${4:B}){${1:distance}}{${2:text}}"
-    },
-    "nlput[]()(){}{}": {
-      "snippet": "nlput[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:text}}"
-    },
     "nodenameA": {},
     "nodenameB": {},
     "nodex{}": {
@@ -590,9 +479,6 @@
     "nodexn{}{}": {
       "snippet": "nodexn{${1:expr}}{${2:node name}}"
     },
-    "normalvec(){}": {
-      "snippet": "normalvec(${2:coords}){${1:node name}}"
-    },
     "nput*[]{}{}{}": {
       "snippet": "nput*[${4:options}]{${1:refangle}}{${2:name}}{${3:stuff}}"
     },
@@ -617,237 +503,6 @@
     "ovalnode{}{}": {
       "snippet": "ovalnode{${1:name}}{${2:stuff}}"
     },
-    "parsenodexn{}(){}": {
-      "snippet": "parsenodexn{${1:arg1}}(${3:arg2}){${2:arg3}}"
-    },
-    "pcangle()()": {
-      "snippet": "pcangle(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcangle*()()": {
-      "snippet": "pcangle*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcangle*[]()()": {
-      "snippet": "pcangle*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangle*[]{}()()": {
-      "snippet": "pcangle*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangle*{}()()": {
-      "snippet": "pcangle*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangle[]()()": {
-      "snippet": "pcangle[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangle[]{}()()": {
-      "snippet": "pcangle[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangle{}()()": {
-      "snippet": "pcangle{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles*()()": {
-      "snippet": "pcangles*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcangles*[]()()": {
-      "snippet": "pcangles*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles*[]{}()()": {
-      "snippet": "pcangles*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangles*{}()()": {
-      "snippet": "pcangles*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles[]()()": {
-      "snippet": "pcangles[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles[]{}()()": {
-      "snippet": "pcangles[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangles{}()()": {
-      "snippet": "pcangles{${1:nodeA}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc()()": {
-      "snippet": "pcarc(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarc*()()": {
-      "snippet": "pcarc*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarc*[]()()": {
-      "snippet": "pcarc*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc*[]{}()()": {
-      "snippet": "pcarc*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcarc*{}()()": {
-      "snippet": "pcarc*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc[]()()": {
-      "snippet": "pcarc[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc[]{}()()": {
-      "snippet": "pcarc[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcarc{}()()": {
-      "snippet": "pcarc{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarcbox()()": {
-      "snippet": "pcarcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarcbox*()()": {
-      "snippet": "pcarcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarcbox*[]()()": {
-      "snippet": "pcarcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarcbox[]()()": {
-      "snippet": "pcarcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar()()": {
-      "snippet": "pcbar(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbar*()()": {
-      "snippet": "pcbar*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbar*[]()()": {
-      "snippet": "pcbar*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar*[]{}()()": {
-      "snippet": "pcbar*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcbar*{}()()": {
-      "snippet": "pcbar*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar[]()()": {
-      "snippet": "pcbar[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar[]{}()()": {
-      "snippet": "pcbar[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcbar{}()()": {
-      "snippet": "pcbar{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbox()()": {
-      "snippet": "pcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbox*()()": {
-      "snippet": "pcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbox*[]()()": {
-      "snippet": "pcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbox[]()()": {
-      "snippet": "pcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve()()": {
-      "snippet": "pccurve(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pccurve*()()": {
-      "snippet": "pccurve*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pccurve*[]()()": {
-      "snippet": "pccurve*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve*[]{}()()": {
-      "snippet": "pccurve*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pccurve*{}()()": {
-      "snippet": "pccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve[]()()": {
-      "snippet": "pccurve[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve[]{}()()": {
-      "snippet": "pccurve[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pccurve{}()()": {
-      "snippet": "pccurve{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag()()": {
-      "snippet": "pcdiag(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcdiag*()()": {
-      "snippet": "pcdiag*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcdiag*[]()()": {
-      "snippet": "pcdiag*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag*[]{}()()": {
-      "snippet": "pcdiag*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcdiag*{}()()": {
-      "snippet": "pcdiag*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag[]()()": {
-      "snippet": "pcdiag[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag[]{}()()": {
-      "snippet": "pcdiag[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcdiag{}()()": {
-      "snippet": "pcdiag{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiagg()()": {
-      "snippet": "pcdiagg(${1:nodeA})(${2:nodeB})"
-    },
-    "pcdiagg[]()()": {
-      "snippet": "pcdiagg[${1:options}](${2:nodeA})(${3:nodeB})"
-    },
-    "pcline()()": {
-      "snippet": "pcline(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcline*()()": {
-      "snippet": "pcline*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcline*[]()()": {
-      "snippet": "pcline*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcline*[]{}()()": {
-      "snippet": "pcline*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcline*{}()()": {
-      "snippet": "pcline*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcline[]()()": {
-      "snippet": "pcline[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcline[]{}()()": {
-      "snippet": "pcline[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcline{}()()": {
-      "snippet": "pcline{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop()()": {
-      "snippet": "pcloop(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcloop*()()": {
-      "snippet": "pcloop*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcloop*[]()()": {
-      "snippet": "pcloop*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop*[]{}()()": {
-      "snippet": "pcloop*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcloop*{}()()": {
-      "snippet": "pcloop*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop[]()()": {
-      "snippet": "pcloop[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop[]{}()()": {
-      "snippet": "pcloop[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcloop{}()()": {
-      "snippet": "pcloop{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pnode(){}": {
-      "snippet": "pnode(${2:x},${3:y}){${1:name}}"
-    },
-    "pnode[](){}": {
-      "snippet": "pnode[${2:offset}](${3:x},${4:y}){${1:name}}"
-    },
-    "polyIntersections{}{}()(){}{}": {
-      "snippet": "polyIntersections{${1:name1}}{${2:name2}}(${5:A})(${6:B}){${3:P}}{${4:number}}"
-    },
     "pscloseNodeFile": {},
     "pscolhooki": {},
     "pscolhookii": {},
@@ -887,15 +542,6 @@
     "psLCNode{}{}{}": {
       "snippet": "psLCNode{${1:val1}}{${2:val2}}{${3:node name}}"
     },
-    "psLCNodeVar()()(){}": {
-      "snippet": "psLCNodeVar(${2:nodeA})(${3:nodeB})(${4:factorA},${5:factorB}){${1:node name}}"
-    },
-    "psLDNode()(){}{}": {
-      "snippet": "psLDNode(${3:A})(${4:B}){${1:distance}}{${2:node name}}"
-    },
-    "psLDNode[]()(){}{}": {
-      "snippet": "psLDNode[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:node name}}"
-    },
     "psLNode[][]{}{}": {
       "snippet": "psLNode[${3:P1}][${4:P2}]{${1:value}}{${2:node name}}"
     },
@@ -909,67 +555,10 @@
     "psmatrix[]": {
       "snippet": "psmatrix[${1:options}]"
     },
-    "psncurve(){}": {
-      "snippet": "psncurve(${2:x},${3:y}){${1:name}}"
-    },
-    "psncurve[](){}": {
-      "snippet": "psncurve[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psncurve[]{}(){}": {
-      "snippet": "psncurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psncurve{}(){}": {
-      "snippet": "psncurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
-    "psnccurve(){}": {
-      "snippet": "psnccurve(${2:x},${3:y}){${1:name}}"
-    },
-    "psnccurve[](){}": {
-      "snippet": "psnccurve[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psnccurve[]{}(){}": {
-      "snippet": "psnccurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psnccurve{}(){}": {
-      "snippet": "psnccurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
-    "psnline(){}": {
-      "snippet": "psnline(${2:x},${3:y}){${1:name}}"
-    },
-    "psnline[](){}": {
-      "snippet": "psnline[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psnline[]{}(){}": {
-      "snippet": "psnline[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psnline{}(){}": {
-      "snippet": "psnline{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
-    "psnode(){}{}": {
-      "snippet": "psnode(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "psnode[](){}{}": {
-      "snippet": "psnode[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "psnpolygon(){}": {
-      "snippet": "psnpolygon(${2:x},${3:y}){${1:name}}"
-    },
-    "psnpolygon[](){}": {
-      "snippet": "psnpolygon[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psnpolygon[]{}(){}": {
-      "snippet": "psnpolygon[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psnpolygon{}(){}": {
-      "snippet": "psnpolygon{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
     "psopenNodeFile": {},
     "psparnode{}{}{}": {
       "snippet": "psparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
-    "psRelLineVar()()(){}": {
-      "snippet": "psRelLineVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
-    },
     "psRelNode[][]{}{}": {
       "snippet": "psRelNode[${3:P0}][${4:P1}]{${1:length factor}}{${2:end node name}}"
     },
@@ -979,9 +568,6 @@
     "psRelNode{}{}": {
       "snippet": "psRelNode{${1:length factor}}{${2:end node name}}"
     },
-    "psRelNodeVar()()(){}": {
-      "snippet": "psRelNodeVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
-    },
     "psrowhooki": {},
     "psrowhookii": {},
     "psrowhookiii": {},
@@ -1000,21 +586,6 @@
       "snippet": "pstloop{${1:arg}}"
     },
     "PSTnodesLoaded": {},
-    "psxline(){}{}": {
-      "snippet": "psxline(${3:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
-    },
-    "psxline[](){}{}": {
-      "snippet": "psxline[${3:options}](${4:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
-    },
-    "psxline[]{}(){}{}": {
-      "snippet": "psxline[${4:options}]{${1:arrows}}(${5:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
-    },
-    "psxline{}(){}{}": {
-      "snippet": "psxline{${1:arrows}}(${4:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
-    },
-    "rhombus{}()(){}{}": {
-      "snippet": "rhombus{${1:edge length}}(${4:A})(${5:B}){${2:C}}{${3:D}}"
-    },
     "rnode[]{}{}": {
       "snippet": "rnode[${3:refpoint}]{${1:name}}{${2:stuff}}"
     },
@@ -1027,9 +598,6 @@
     "saveDataAsNodes{}{}": {
       "snippet": "saveDataAsNodes{${1:data}}{${2:node prefix}}"
     },
-    "shownode()": {
-      "snippet": "shownode(${1:P})"
-    },
     "taput*[]{}": {
       "snippet": "taput*[${2:options}]{${1:stuff}}"
     },
@@ -1155,24 +723,6 @@
     "bput*[]{}{}": {
       "snippet": "bput*[${3:labelsep}]{${1:angle}}{${2:stuff}}"
     },
-    "Lput{}{}(){}": {
-      "snippet": "Lput{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
-    },
-    "Lput{}[]{}(){}": {
-      "snippet": "Lput{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
-    },
-    "Lput*{}{}(){}": {
-      "snippet": "Lput*{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
-    },
-    "Lput*{}[]{}(){}": {
-      "snippet": "Lput*{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
-    },
-    "lput(){}": {
-      "snippet": "lput(${2:pos}){${1:stuff}}"
-    },
-    "lput*(){}": {
-      "snippet": "lput*(${2:pos}){${1:stuff}}"
-    },
     "lput{}{}": {
       "snippet": "lput{${1:angle}}{${2:stuff}}"
     },
diff --git a/data/packages/pst-plot.json b/data/packages/pst-plot.json
index edc5301fa..ad9811114 100644
--- a/data/packages/pst-plot.json
+++ b/data/packages/pst-plot.json
@@ -39,42 +39,12 @@
     "parametricplot{}{}{}": {
       "snippet": "parametricplot{${1:tmin}}{${2:tmax}}{${3:function}}"
     },
-    "psaxes()()()": {
-      "snippet": "psaxes(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "psaxes()()()[][]": {
-      "snippet": "psaxes(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})[${1:Xlabel,${9:Xangle}][${2:Ylabel},Yangle}]"
-    },
-    "psaxes[]()()()": {
-      "snippet": "psaxes[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
-    "psaxes[]()()()[][]": {
-      "snippet": "psaxes[${1:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
-    },
-    "psaxes[]{}()()()": {
-      "snippet": "psaxes[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})"
-    },
-    "psaxes[]{}()()()[][]": {
-      "snippet": "psaxes[${2:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2})[${3:Xlabel,${11:Xangle}][${4:Ylabel},Yangle}]"
-    },
-    "psaxes{}()()()": {
-      "snippet": "psaxes{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
-    "psaxes{}()()()[][]": {
-      "snippet": "psaxes{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
-    },
     "psBoxplot[]{}": {
       "snippet": "psBoxplot[${2:options}]{${1:macro}}"
     },
     "psBoxplot{}": {
       "snippet": "psBoxplot{${1:macro}}"
     },
-    "psCoordinates()": {
-      "snippet": "psCoordinates(${1:x},${2:y})"
-    },
-    "psCoordinates[]()": {
-      "snippet": "psCoordinates[${1:options}](${2:x},${3:y})"
-    },
     "psdataplot[]{}": {
       "snippet": "psdataplot[${2:options}]{${1:macro}}"
     },
@@ -93,26 +63,11 @@
     "psFixpoint{}{}{}": {
       "snippet": "psFixpoint{${1:x0}}{${2:f(${4:x})}}{${3:n}}"
     },
-    "psgraph()()(){}{}": {
-      "snippet": "psgraph(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[]()()(){}{}": {
-      "snippet": "psgraph[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[]{}()()(){}{}": {
-      "snippet": "psgraph[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph{}()()(){}{}": {
-      "snippet": "psgraph{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
-    },
     "psgraphLLx": {},
     "psgraphLLy": {},
     "psgraphURx": {},
     "psgraphURy": {},
     "pshlabel": {},
-    "pslegend[](){}": {
-      "snippet": "pslegend[${2:reference}](${3:xoffset},${4:yoffset}){${1:text}}"
-    },
     "pslegend[]{}": {
       "snippet": "pslegend[${2:reference}]{${1:text}}"
     },
@@ -188,49 +143,16 @@
     "PSTplotLoaded": {},
     "pstRadUnit": {},
     "pstRadUnitInv": {},
-    "pstScalePoints(){}{}": {
-      "snippet": "pstScalePoints(${3:xscale},${4:yscale}){${1:xPS}}{${2:yPS}}"
-    },
     "pstXPSScale": {},
     "pstXScale": {},
     "pstYPSScale": {},
     "pstYScale": {},
-    "psVectorfield()(){}": {
-      "snippet": "psVectorfield(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:f'(${6:x},${7:y})}}"
-    },
-    "psVectorfield[]()(){}": {
-      "snippet": "psVectorfield[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:f'(${7:x},${8:y})}}"
-    },
     "psvlabel": {},
     "psxlabelsep": {},
     "psxsubticklinestyle": {},
-    "psxTick(){}": {
-      "snippet": "psxTick(${2:x value}){${1:label}}"
-    },
-    "psxTick[](){}": {
-      "snippet": "psxTick[${2:options}](${3:x value}){${1:label}}"
-    },
-    "psxTick[]{}(){}": {
-      "snippet": "psxTick[${3:options}]{${1:rotation}}(${4:x value}){${2:label}}"
-    },
-    "psxTick{}(){}": {
-      "snippet": "psxTick{${1:rotation}}(${3:x value}){${2:label}}"
-    },
     "psxticklinestyle": {},
     "psylabelsep": {},
     "psysubticklinestyle": {},
-    "psyTick(){}": {
-      "snippet": "psyTick(${2:y value}){${1:label}}"
-    },
-    "psyTick[](){}": {
-      "snippet": "psyTick[${2:options}](${3:y value}){${1:label}}"
-    },
-    "psyTick[]{}(){}": {
-      "snippet": "psyTick[${3:options}]{${1:rotation}}(${4:y value}){${2:label}}"
-    },
-    "psyTick{}(){}": {
-      "snippet": "psyTick{${1:rotation}}(${3:y value}){${2:label}}"
-    },
     "psyticklinestyle": {},
     "readdata{}{}": {
       "snippet": "readdata{${1:macro}}{${2:file}}"
@@ -253,40 +175,7 @@
     "SpecialLabelsDonetrue": {},
     "stripDecimals": {}
   },
-  "envs": {
-    "psgraph(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[](x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph*(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph*[](x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph*[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph*{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
-    }
-  },
+  "envs": {},
   "options": [
     "97"
   ],
diff --git a/data/packages/pst-text.json b/data/packages/pst-text.json
index a85cb983e..d4e2f18ad 100644
--- a/data/packages/pst-text.json
+++ b/data/packages/pst-text.json
@@ -3,12 +3,6 @@
     "pstricks": []
   },
   "macros": {
-    "pstextpath[](){}{}": {
-      "snippet": "pstextpath[${3:pos}](${4:x},${5:y}){${1:graphics object}}{${2:text}}"
-    },
-    "pstextpath(){}{}": {
-      "snippet": "pstextpath(${3:x},${4:y}){${1:graphics object}}{${2:text}}"
-    },
     "pscharpath{}": {
       "snippet": "pscharpath{${1:text}}"
     },
@@ -40,24 +34,12 @@
     "psCircleText[]{}": {
       "snippet": "psCircleText[${2:options}]{${1:text}}"
     },
-    "psCircleText(){}": {
-      "snippet": "psCircleText(${2:x},${3:y}){${1:text}}"
-    },
-    "psCircleText[](){}": {
-      "snippet": "psCircleText[${2:options}](${3:x},${4:y}){${1:text}}"
-    },
     "psWarp{}": {
       "snippet": "psWarp{${1:text}}"
     },
     "psWarp[]{}": {
       "snippet": "psWarp[${2:options}]{${1:text}}"
     },
-    "psWarp(){}": {
-      "snippet": "psWarp(${2:x},${3:y}){${1:text}}"
-    },
-    "psWarp[](){}": {
-      "snippet": "psWarp[${2:options}](${3:x},${4:y}){${1:text}}"
-    },
     "TPoffset": {},
     "PSTextPathLoaded": {}
   },
diff --git a/data/packages/pstricks.json b/data/packages/pstricks.json
index 07a894c18..65c804130 100644
--- a/data/packages/pstricks.json
+++ b/data/packages/pstricks.json
@@ -31,8 +31,11 @@
     "black": {},
     "blue": {},
     "Cartesian": {},
-    "Cartesian()": {
-      "snippet": "Cartesian(${1:x},${2:y})"
+    "clipbox[]{}": {
+      "snippet": "clipbox[${2:dim}]{${1:stuff}}"
+    },
+    "clipbox{}": {
+      "snippet": "clipbox{${1:stuff}}"
     },
     "closedshadow": {},
     "closedshadow[]": {
@@ -42,33 +45,6 @@
     "code{}": {
       "snippet": "code{${1:code}}"
     },
-    "cput*[]{}(){}": {
-      "snippet": "cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "Cput*[]{}(){}": {
-      "snippet": "Cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "cput*{}(){}": {
-      "snippet": "cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "Cput*{}(){}": {
-      "snippet": "Cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "cput[]{}(){}": {
-      "snippet": "cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "Cput[]{}(){}": {
-      "snippet": "Cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "cput{}(){}": {
-      "snippet": "cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "Cput{}(){}": {
-      "snippet": "Cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "curveto()()()": {
-      "snippet": "curveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
     "cyan": {},
     "darkgray": {},
     "degrees": {},
@@ -103,48 +79,9 @@
     "ifshowgrid": {},
     "KillGlue": {},
     "lightgray": {},
-    "lineto()": {
-      "snippet": "lineto(${1:coor})"
-    },
     "magenta": {},
-    "movepath()": {
-      "snippet": "movepath(${1:coor})"
-    },
-    "moveto()": {
-      "snippet": "moveto(${1:coor})"
-    },
     "mrestore": {},
     "msave": {},
-    "multips()(){}{}": {
-      "snippet": "multips(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:graphics}}"
-    },
-    "multips{}()(){}{}": {
-      "snippet": "multips{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:graphics}}"
-    },
-    "multirput()(){}{}": {
-      "snippet": "multirput(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput*()(){}{}": {
-      "snippet": "multirput*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput*[]()(){}{}": {
-      "snippet": "multirput*[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput*[]{}()(){}{}": {
-      "snippet": "multirput*[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
-    },
-    "multirput*{}()(){}{}": {
-      "snippet": "multirput*{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
-    },
-    "multirput[]()(){}{}": {
-      "snippet": "multirput[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput[]{}()(){}{}": {
-      "snippet": "multirput[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
-    },
-    "multirput{}()(){}{}": {
-      "snippet": "multirput{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
-    },
     "newcmykcolor{}{}": {
       "snippet": "newcmykcolor{${1:color}}{${2:num1 num2 num3 num4}}"
     },
@@ -185,30 +122,6 @@
       "snippet": "openshadow[${1:keyvals}]"
     },
     "overlaybox": {},
-    "parabola()()": {
-      "snippet": "parabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "parabola*()()": {
-      "snippet": "parabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "parabola*[]()()": {
-      "snippet": "parabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "parabola*[]{}()()": {
-      "snippet": "parabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "parabola*{}()()": {
-      "snippet": "parabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "parabola[]()()": {
-      "snippet": "parabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "parabola[]{}()()": {
-      "snippet": "parabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "parabola{}()()": {
-      "snippet": "parabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pgfforeach": {},
     "pgfforeach{}": {
       "snippet": "pgfforeach{${1:cmd}}"
@@ -217,176 +130,8 @@
     "psaddtolength{}{}": {
       "snippet": "psaddtolength{${1:cmd}}{${2:dim}}"
     },
-    "psarc(){}{}{}": {
-      "snippet": "psarc(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc*(){}{}{}": {
-      "snippet": "psarc*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc*[](){}{}{}": {
-      "snippet": "psarc*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc*[]{}(){}{}{}": {
-      "snippet": "psarc*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarc*{}(){}{}{}": {
-      "snippet": "psarc*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarc[](){}{}{}": {
-      "snippet": "psarc[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc[]{}(){}{}{}": {
-      "snippet": "psarc[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarc{}(){}{}{}": {
-      "snippet": "psarc{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcAB()()()": {
-      "snippet": "psarcAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
-    },
-    "psarcAB[]()()()": {
-      "snippet": "psarcAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
-    "psarcAB[]{}()()()": {
-      "snippet": "psarcAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
-    },
-    "psarcAB{}()()()": {
-      "snippet": "psarcAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
-    "psarcn(){}{}{}": {
-      "snippet": "psarcn(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn*(){}{}{}": {
-      "snippet": "psarcn*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn*[](){}{}{}": {
-      "snippet": "psarcn*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn*[]{}(){}{}{}": {
-      "snippet": "psarcn*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcn*{}(){}{}{}": {
-      "snippet": "psarcn*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcn[](){}{}{}": {
-      "snippet": "psarcn[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn[]{}(){}{}{}": {
-      "snippet": "psarcn[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcn{}(){}{}{}": {
-      "snippet": "psarcn{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcnAB()()()": {
-      "snippet": "psarcnAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
-    },
-    "psarcnAB[]()()()": {
-      "snippet": "psarcnAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
-    "psarcnAB[]{}()()()": {
-      "snippet": "psarcnAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
-    },
-    "psarcnAB{}()()()": {
-      "snippet": "psarcnAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
     "psarrowlinestyle": {},
-    "psbezier()()()()": {
-      "snippet": "psbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "psbezier*()()()()": {
-      "snippet": "psbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "psbezier*[]()()()()": {
-      "snippet": "psbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psbezier*[]{}()()()()": {
-      "snippet": "psbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "psbezier*{}()()()()": {
-      "snippet": "psbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psbezier[]()()()()": {
-      "snippet": "psbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psbezier[]{}()()()()": {
-      "snippet": "psbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "psbezier{}()()()()": {
-      "snippet": "psbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
     "psbordercolor": {},
-    "pscbezier()()()()": {
-      "snippet": "pscbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "pscbezier*()()()()": {
-      "snippet": "pscbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "pscbezier*[]()()()()": {
-      "snippet": "pscbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "pscbezier*[]{}()()()()": {
-      "snippet": "pscbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "pscbezier*{}()()()()": {
-      "snippet": "pscbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "pscbezier[]()()()()": {
-      "snippet": "pscbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "pscbezier[]{}()()()()": {
-      "snippet": "pscbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "pscbezier{}()()()()": {
-      "snippet": "pscbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psccurve()()": {
-      "snippet": "psccurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psccurve*()()": {
-      "snippet": "psccurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psccurve*[]()()": {
-      "snippet": "psccurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psccurve*[]{}()()": {
-      "snippet": "psccurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psccurve*{}()()": {
-      "snippet": "psccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psccurve[]()()": {
-      "snippet": "psccurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psccurve[]{}()()": {
-      "snippet": "psccurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psccurve{}()()": {
-      "snippet": "psccurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscircle(){}": {
-      "snippet": "pscircle(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "psCircle(){}": {
-      "snippet": "psCircle(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "pscircle*(){}": {
-      "snippet": "pscircle*(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "psCircle*(){}": {
-      "snippet": "psCircle*(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "pscircle*[](){}": {
-      "snippet": "pscircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
-    "psCircle*[](){}": {
-      "snippet": "psCircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
-    "pscircle[](){}": {
-      "snippet": "pscircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
-    "psCircle[](){}": {
-      "snippet": "psCircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
     "pscirclebox*[]{}": {
       "snippet": "pscirclebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -411,46 +156,10 @@
     "psCirclebox{}": {
       "snippet": "psCirclebox{${1:stuff}}"
     },
-    "pscircleOA()()": {
-      "snippet": "pscircleOA(${1:xO},${2:yO})(${3:xA},${4:yA})"
-    },
-    "pscircleOA[]()()": {
-      "snippet": "pscircleOA[${1:keyvals}](${2:xO},${3:yO})(${4:xA},${5:yA})"
-    },
     "psclip{}": {
       "snippet": "psclip{${1:graphics}}"
     },
-    "psclipbox[]{}": {
-      "snippet": "psclipbox[${2:dim}]{${1:stuff}}"
-    },
-    "psclipbox{}": {
-      "snippet": "psclipbox{${1:stuff}}"
-    },
     "pscoor": {},
-    "pscurve()()": {
-      "snippet": "pscurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "pscurve*()()": {
-      "snippet": "pscurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "pscurve*[]()()": {
-      "snippet": "pscurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscurve*[]{}()()": {
-      "snippet": "pscurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "pscurve*{}()()": {
-      "snippet": "pscurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscurve[]()()": {
-      "snippet": "pscurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscurve[]{}()()": {
-      "snippet": "pscurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "pscurve{}()()": {
-      "snippet": "pscurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
     "pscustom*[]{}": {
       "snippet": "pscustom*[${2:keyvals}]{${1:commands}}"
     },
@@ -494,128 +203,8 @@
     "psdiabox{}": {
       "snippet": "psdiabox{${1:stuff}}"
     },
-    "psdiamond()()": {
-      "snippet": "psdiamond(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psdiamond*()()": {
-      "snippet": "psdiamond*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psdiamond*[]()()": {
-      "snippet": "psdiamond*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psdiamond[]()()": {
-      "snippet": "psdiamond[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psdot()": {
-      "snippet": "psdot(${1:x1},${2:y1})"
-    },
-    "psdot*()": {
-      "snippet": "psdot*(${1:x1},${2:y1})"
-    },
-    "psdot*[]()": {
-      "snippet": "psdot*[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psdot[]()": {
-      "snippet": "psdot[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psdots()()": {
-      "snippet": "psdots(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psdots*()()": {
-      "snippet": "psdots*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psdots*[]()()": {
-      "snippet": "psdots*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psdots[]()()": {
-      "snippet": "psdots[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
     "psdoublecolor": {},
     "psdoublesep": {},
-    "psecurve()()": {
-      "snippet": "psecurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psecurve*()()": {
-      "snippet": "psecurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psecurve*[]()()": {
-      "snippet": "psecurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psecurve*[]{}()()": {
-      "snippet": "psecurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psecurve*{}()()": {
-      "snippet": "psecurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psecurve[]()()": {
-      "snippet": "psecurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psecurve[]{}()()": {
-      "snippet": "psecurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psecurve{}()()": {
-      "snippet": "psecurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psellipse()()": {
-      "snippet": "psellipse(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psellipse*()()": {
-      "snippet": "psellipse*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psellipse*[]()()": {
-      "snippet": "psellipse*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psellipse[]()()": {
-      "snippet": "psellipse[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psellipseAB(){}": {
-      "snippet": "psellipseAB(${2:x},${3:y}){${1:half radius}}"
-    },
-    "psellipseAB*(){}": {
-      "snippet": "psellipseAB*(${2:x},${3:y}){${1:half radius}}"
-    },
-    "psellipseAB*[](){}": {
-      "snippet": "psellipseAB*[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
-    },
-    "psellipseAB[](){}": {
-      "snippet": "psellipseAB[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
-    },
-    "psellipticarc()(){}{}": {
-      "snippet": "psellipticarc(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarc*()(){}{}": {
-      "snippet": "psellipticarc*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarc*[]()(){}{}": {
-      "snippet": "psellipticarc*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarc[]()(){}{}": {
-      "snippet": "psellipticarc[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn()(){}{}": {
-      "snippet": "psellipticarcn(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn*()(){}{}": {
-      "snippet": "psellipticarcn*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn*[]()(){}{}": {
-      "snippet": "psellipticarcn*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn[]()(){}{}": {
-      "snippet": "psellipticarcn[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge()(){}{}": {
-      "snippet": "psellipticwedge(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge*()(){}{}": {
-      "snippet": "psellipticwedge*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge*[]()(){}{}": {
-      "snippet": "psellipticwedge*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge[]()(){}{}": {
-      "snippet": "psellipticwedge[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
     "psfillcolor": {},
     "psforeach{}{}{}": {
       "snippet": "psforeach{${1:variable}}{${2:value list}}{${3:action}}"
@@ -623,18 +212,6 @@
     "psForeach{}{}{}": {
       "snippet": "psForeach{${1:variable}}{${2:value list}}{${3:action}}"
     },
-    "psframe()()": {
-      "snippet": "psframe(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psframe*()()": {
-      "snippet": "psframe*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psframe*[]()()": {
-      "snippet": "psframe*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psframe[]()()": {
-      "snippet": "psframe[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "psframebox*[]{}": {
       "snippet": "psframebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -657,9 +234,6 @@
     "psgetRGBColorValues{}": {
       "snippet": "psgetRGBColorValues{${1:color macro}}"
     },
-    "psgrid()()()": {
-      "snippet": "psgrid(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
     "psgridcolor": {},
     "psgridlabelcolor": {},
     "pshatchcolor": {},
@@ -670,54 +244,6 @@
     },
     "pslabelsep": {},
     "pslbrace": {},
-    "psline()()": {
-      "snippet": "psline(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine()()": {
-      "snippet": "psLine(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine()": {
-      "snippet": "psLine(${1:x1},${2:y1})"
-    },
-    "psline*()()": {
-      "snippet": "psline*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine*()()": {
-      "snippet": "psLine*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine*()": {
-      "snippet": "psLine*(${1:x1},${2:y1})"
-    },
-    "psline*[]()()": {
-      "snippet": "psline*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine*[]()()": {
-      "snippet": "psLine*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine*[]()": {
-      "snippet": "psLine*[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psline*[]{}()()": {
-      "snippet": "psline*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psline*{}()()": {
-      "snippet": "psline*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psline[]()()": {
-      "snippet": "psline[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine[]()()": {
-      "snippet": "psLine[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine[]()": {
-      "snippet": "psLine[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psline[]{}()()": {
-      "snippet": "psline[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psline{}()()": {
-      "snippet": "psline{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pslinearc": {},
     "pslinecolor": {},
     "pslinestyle": {},
@@ -747,77 +273,11 @@
     "psoverlay{}": {
       "snippet": "psoverlay{${1:string}}"
     },
-    "psparabola()()": {
-      "snippet": "psparabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psparabola*()()": {
-      "snippet": "psparabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psparabola*[]()()": {
-      "snippet": "psparabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psparabola*[]{}()()": {
-      "snippet": "psparabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psparabola*{}()()": {
-      "snippet": "psparabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psparabola[]()()": {
-      "snippet": "psparabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psparabola[]{}()()": {
-      "snippet": "psparabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psparabola{}()()": {
-      "snippet": "psparabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pspicture[]": {
       "snippet": "pspicture[${1:keyvals}]"
     },
-    "psPline()()()": {
-      "snippet": "psPline(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
-    "psPline[]()()()": {
-      "snippet": "psPline[${1:keyvals}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
-    },
-    "pspolygon()()()": {
-      "snippet": "pspolygon(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pspolygon*()()()": {
-      "snippet": "pspolygon*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pspolygon*[]()()()": {
-      "snippet": "pspolygon*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
-    "pspolygon[]()()()": {
-      "snippet": "pspolygon[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
     "psrbrace": {},
     "psresetColor": {},
-    "psRing()[]{}{}": {
-      "snippet": "psRing(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing(){}{}": {
-      "snippet": "psRing(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*()[]{}{}": {
-      "snippet": "psRing*(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*(){}{}": {
-      "snippet": "psRing*(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*[]()[]{}{}": {
-      "snippet": "psRing*[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*[](){}{}": {
-      "snippet": "psRing*[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing[]()[]{}{}": {
-      "snippet": "psRing[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing[](){}{}": {
-      "snippet": "psRing[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
-    },
     "psrotatedown{}": {
       "snippet": "psrotatedown{${1:stuff}}"
     },
@@ -831,9 +291,6 @@
     "psscalebox{}{}": {
       "snippet": "psscalebox{${1:num1 num2}}{${2:stuff}}"
     },
-    "psscaleboxto(){}": {
-      "snippet": "psscaleboxto(${2:x},${3:y}){${1:stuff}}"
-    },
     "pssetGrayscale": {},
     "pssetlength{}{}": {
       "snippet": "pssetlength{${1:cmd}}{${2:dim}}"
@@ -865,36 +322,12 @@
     },
     "pstcustomize": {},
     "pstdriver": {},
-    "psTextFrame()(){}": {
-      "snippet": "psTextFrame(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
-    },
-    "psTextFrame*()(){}": {
-      "snippet": "psTextFrame*(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
-    },
-    "psTextFrame*[]()(){}": {
-      "snippet": "psTextFrame*[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
-    },
-    "psTextFrame[]()(){}": {
-      "snippet": "psTextFrame[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
-    },
     "pstheader{}": {
       "snippet": "pstheader{${1:arg}}"
     },
     "PSTlualatexfalse": {},
     "PSTlualatextrue": {},
     "pstnodescale": {},
-    "pstriangle()()": {
-      "snippet": "pstriangle(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pstriangle*()()": {
-      "snippet": "pstriangle*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pstriangle*[]()()": {
-      "snippet": "pstriangle*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pstriangle[]()()": {
-      "snippet": "pstriangle[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pstribox*[]{}": {
       "snippet": "pstribox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -923,42 +356,15 @@
     "psunit": {},
     "psverbboxfalse": {},
     "psverbboxtrue": {},
-    "pswedge(){}{}{}": {
-      "snippet": "pswedge(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
-    "pswedge*(){}{}{}": {
-      "snippet": "pswedge*(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
-    "pswedge*[](){}{}{}": {
-      "snippet": "pswedge*[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
-    "pswedge[](){}{}{}": {
-      "snippet": "pswedge[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
     "psxunit": {},
     "psyunit": {},
     "putoverlaybox{}": {
       "snippet": "putoverlaybox{${1:string}}"
     },
-    "qdisk(){}": {
-      "snippet": "qdisk(${2:coor}){${1:radius}}"
-    },
-    "qline()()": {
-      "snippet": "qline(${1:coor0})(${2:coor1})"
-    },
     "radians": {},
-    "rcurveto()()()": {
-      "snippet": "rcurveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
     "red": {},
     "resetArrowOptions": {},
     "reversepath": {},
-    "rlineto()": {
-      "snippet": "rlineto(${1:coor})"
-    },
-    "rmoveto()": {
-      "snippet": "rmoveto(${1:coor})"
-    },
     "rotate{}": {
       "snippet": "rotate{${1:angle}}"
     },
@@ -971,33 +377,6 @@
     "rotateright{}": {
       "snippet": "rotateright{${1:stuff}}"
     },
-    "rput(){}": {
-      "snippet": "rput(${2:x},${3:y}){${1:stuff}}"
-    },
-    "rput*(){}": {
-      "snippet": "rput*(${2:x},${3:y}){${1:stuff}}"
-    },
-    "rput*[](){}": {
-      "snippet": "rput*[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "rput*[]{}(){}": {
-      "snippet": "rput*[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "rput*{}(){}": {
-      "snippet": "rput*{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "rput[](){}": {
-      "snippet": "rput[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "rput[]{}(){}": {
-      "snippet": "rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "Rput[]{}(){}": {
-      "snippet": "Rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "rput{}(){}": {
-      "snippet": "rput{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
-    },
     "scale{}": {
       "snippet": "scale{${1:num1 num2}}"
     },
@@ -1012,33 +391,6 @@
       "snippet": "stroke[${1:keyvals}]"
     },
     "swapaxes": {},
-    "translate()": {
-      "snippet": "translate(${1:coor})"
-    },
-    "uput*[](){}": {
-      "snippet": "uput*[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "uput*[]{}(){}": {
-      "snippet": "uput*[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "uput*{}[](){}": {
-      "snippet": "uput*{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
-    },
-    "uput*{}[]{}(){}": {
-      "snippet": "uput*{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
-    },
-    "uput[](){}": {
-      "snippet": "uput[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "uput[]{}(){}": {
-      "snippet": "uput[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "uput{}[](){}": {
-      "snippet": "uput{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
-    },
-    "uput{}[]{}(){}": {
-      "snippet": "uput{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
-    },
     "white": {},
     "yellow": {},
     "psarcOA": {},
@@ -1076,22 +428,6 @@
     "psclip{}": {
       "name": "psclip",
       "snippet": "{${1:graphics}}"
-    },
-    "pspicture*(x0,y0)(x1,y1)": {
-      "name": "pspicture*",
-      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pspicture*[](x0,y0)(x1,y1)": {
-      "name": "pspicture*",
-      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pspicture(x0,y0)(x1,y1)": {
-      "name": "pspicture",
-      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pspicture[](x0,y0)(x1,y1)": {
-      "name": "pspicture",
-      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
     }
   },
   "options": [
diff --git a/data/packages/subfigure.json b/data/packages/subfigure.json
index 1b0c33e68..f1f87bac9 100644
--- a/data/packages/subfigure.json
+++ b/data/packages/subfigure.json
@@ -49,9 +49,6 @@
     "iftabletopcap": {},
     "tabletopcaptrue": {},
     "tabletopcapfalse": {},
-    "label(){}": {
-      "snippet": "label(${2:bookmark}){${1:key}}"
-    },
     "subcapfont": {},
     "subcaplabelfont": {},
     "subcapsize": {},
diff --git a/data/packages/tcolorbox.json b/data/packages/tcolorbox.json
index d9199d4b2..d5522ce87 100644
--- a/data/packages/tcolorbox.json
+++ b/data/packages/tcolorbox.json
@@ -2,7 +2,7 @@
   "includes": {
     "environ": [],
     "etoolbox": [],
-    "tikz": [],
+    "pgf": [],
     "verbatim": [],
     "tcolorboxlibraryskins": [
       "skins"
@@ -815,6 +815,7 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
+      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
@@ -1164,6 +1165,7 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
+      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
diff --git a/data/packages/tex.json b/data/packages/tex.json
index 984786914..ae6e35fdc 100644
--- a/data/packages/tex.json
+++ b/data/packages/tex.json
@@ -1299,45 +1299,24 @@
       "detail": "⋮",
       "documentation": "VERTICAL ELLIPSIS"
     },
-    "big(": {
-      "snippet": "big(${2:${1}\\big})"
-    },
     "big[": {
       "snippet": "big[${1}\\big]"
     },
-    "Big(": {
-      "snippet": "Big(${2:${1}\\Big})"
-    },
     "Big[": {
       "snippet": "Big[${1}\\Big]"
     },
-    "bigl(": {
-      "snippet": "bigl(${2:${1}\\bigr})"
-    },
     "bigl[": {
       "snippet": "bigl[${1}\\bigr]"
     },
-    "Bigl(": {
-      "snippet": "Bigl(${2:${1}\\Bigr})"
-    },
     "Bigl[": {
       "snippet": "Bigl[${1}\\Bigr]"
     },
-    "biggl(": {
-      "snippet": "biggl(${2:${1}\\biggr})"
-    },
     "biggl[": {
       "snippet": "biggl[${1}\\biggr]"
     },
-    "Biggl(": {
-      "snippet": "Biggl(${2:${1}\\Biggr})"
-    },
     "Biggl[": {
       "snippet": "Biggl[${1}\\Biggr]"
     },
-    "left(": {
-      "snippet": "left(${2:${1}\\right})"
-    },
     "left[": {
       "snippet": "left[${1}\\right]"
     },
diff --git a/data/packages/tkz-euclide.json b/data/packages/tkz-euclide.json
index 8da3dd027..14bfda990 100644
--- a/data/packages/tkz-euclide.json
+++ b/data/packages/tkz-euclide.json
@@ -47,25 +47,11 @@
       "snippet": "tkzCos{${1:arg}}",
       "option": "lua"
     },
-    "tkzDefPoint(){}": {
-      "snippet": "tkzDefPoint(${2:angle:radius}){${1:ref}}"
-    },
-    "tkzDefPoint[](){}": {
-      "snippet": "tkzDefPoint[${2:options}](${3:angle:radius}){${1:ref}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "tkzDefShiftPoint[](){}": {
-      "snippet": "tkzDefShiftPoint[${2:point}](${3:angle:radius}){${1:ref}}"
-    },
-    "tkzDefShiftPointCoord[](){}": {
-      "snippet": "tkzDefShiftPointCoord[${2:point1}](${3:angle:radius}){${1:point2}}"
-    },
     "tkzDefPoints{}": {
-      "snippet": "tkzDefPoints{${1:x1/y1/name1,${2:x2/y2/name2},...}}"
+      "snippet": "tkzDefPoints{${1:x1/y1/name1,x2/y2/name2,...}}"
     },
     "tkzDefPoints[]{}": {
-      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,${3:x2/y2/name2},...}}"
+      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,x2/y2/name2,...}}"
     },
     "tkzGetPoint{}": {
       "snippet": "tkzGetPoint{${1:ref}}"
@@ -85,639 +71,64 @@
     "tkzGetLength{}": {
       "snippet": "tkzGetLength{${1:csname}}"
     },
-    "tkzDefMidPoint()": {
-      "snippet": "tkzDefMidPoint(${1:point1},${2:point2})"
-    },
-    "tkzDefBarycentricPoint()": {
-      "snippet": "tkzDefBarycentricPoint(${1:point1=num1},${2:point2=num2},${3:...})"
-    },
-    "tkzDefSimilitudeCenter()()": {
-      "snippet": "tkzDefSimilitudeCenter(${1:O},${2:A})(${3:O'},${4:B})"
-    },
-    "tkzDefSimilitudeCenter[]()()": {
-      "snippet": "tkzDefSimilitudeCenter[${1:options}](${2:O},${3:A})(${4:O'},${5:B})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "tkzDefHarmonic()": {
-      "snippet": "tkzDefHarmonic(${1:A},${2:B},${3:C})"
-    },
-    "tkzDefHarmonic[]()": {
-      "snippet": "tkzDefHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "tkzDefGoldenRatio()": {
-      "snippet": "tkzDefGoldenRatio(${1:point1},${2:point2})"
-    },
-    "tkzDefEquiPoints()": {
-      "snippet": "tkzDefEquiPoints(${1:point1},${2:point2})"
-    },
-    "tkzDefEquiPoints[]()": {
-      "snippet": "tkzDefEquiPoints[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "tkzDefMidArc()": {
-      "snippet": "tkzDefMidArc(${1:A},${2:B},${3:C})"
-    },
-    "tkzDefTriangleCenter()": {
-      "snippet": "tkzDefTriangleCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefTriangleCenter[]()": {
-      "snippet": "tkzDefTriangleCenter[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "tkzDefProjExcenter()(){}": {
-      "snippet": "tkzDefProjExcenter(${2:A},${3:B},${4:C})(${5:a},${6:b},${7:c}){${1:X,${8:Y},Z}}"
-    },
-    "tkzDefProjExcenter[]()(){}": {
-      "snippet": "tkzDefProjExcenter[${2:options}](${3:A},${4:B},${5:C})(${6:a},${7:b},${8:c}){${1:X,${9:Y},Z}}",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "tkzDefPointOnLine()": {
-      "snippet": "tkzDefPointOnLine(${1:point1},${2:point2})"
-    },
-    "tkzDefPointOnLine[]()": {
-      "snippet": "tkzDefPointOnLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
     "tkzDefPointOnCircle[]": {
       "snippet": "tkzDefPointOnCircle[${1:options}]",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "tkzDefPointBy()": {
-      "snippet": "tkzDefPointBy(${1:point})"
-    },
-    "tkzDefPointBy[]()": {
-      "snippet": "tkzDefPointBy[${1:options}](${2:point})",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "tkzDefPointsBy(){}": {
-      "snippet": "tkzDefPointsBy(${2:point1},${3:point2},${4:...}){${1:point1,${5:point2},...}}"
-    },
-    "tkzDefPointsBy[](){}": {
-      "snippet": "tkzDefPointsBy[${2:options}](${3:point1},${4:point2},${5:...}){${1:point1,${6:point2},...}}",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "tkzDefPointWith()": {
-      "snippet": "tkzDefPointWith(${1:point1},${2:point2})"
-    },
-    "tkzDefPointWith[]()": {
-      "snippet": "tkzDefPointWith[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "tkzGetVectxy(){}": {
-      "snippet": "tkzGetVectxy(${2:point1},${3:point2}){${1:text}}"
-    },
-    "tkzDefLine()": {
-      "snippet": "tkzDefLine(${1:point1},${2:point2})"
-    },
-    "tkzDefLine[]()": {
-      "snippet": "tkzDefLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "tkzDefTangent()": {
-      "snippet": "tkzDefTangent(${1:point1},${2:point2})"
-    },
-    "tkzDefTangent[]()": {
-      "snippet": "tkzDefTangent[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "tkzDefTriangle[]()": {
-      "snippet": "tkzDefTriangle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "tkzDefSpcTriangle[](){}": {
-      "snippet": "tkzDefSpcTriangle[${2:options}](${3:point1},${4:point2},${5:point3}){${1:ref1,${6:ref2},ref3}}",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "tkzPermute()": {
-      "snippet": "tkzPermute(${1:A},${2:B},${3:C})"
-    },
-    "tkzDefSquare()": {
-      "snippet": "tkzDefSquare(${1:point1},${2:point2})"
-    },
-    "tkzDefRectangle()": {
-      "snippet": "tkzDefRectangle(${1:point1},${2:point2})"
-    },
-    "tkzDefParallelogram()": {
-      "snippet": "tkzDefParallelogram(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefGoldenRectangle()": {
-      "snippet": "tkzDefGoldenRectangle(${1:point1},${2:point2})"
-    },
-    "tkzDefGoldRectangle()": {
-      "snippet": "tkzDefGoldRectangle(${1:point1},${2:point2})"
-    },
-    "tkzDefRegPolygon()": {
-      "snippet": "tkzDefRegPolygon(${1:point1},${2:point2})"
-    },
-    "tkzDefRegPolygon[]()": {
-      "snippet": "tkzDefRegPolygon[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "tkzDefCircle()": {
-      "snippet": "tkzDefCircle(${1:point1},${2:point2})"
-    },
-    "tkzDefCircle[]()": {
-      "snippet": "tkzDefCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 15,
-      "keyvalpos": 0
-    },
-    "tkzDefCircleBy()": {
-      "snippet": "tkzDefCircleBy(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleBy[]()": {
-      "snippet": "tkzDefCircleBy[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 16,
-      "keyvalpos": 0
-    },
-    "tkzInterLL()()": {
-      "snippet": "tkzInterLL(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterLC()()": {
-      "snippet": "tkzInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterLC[]()()": {
-      "snippet": "tkzInterLC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
-      "keyvalindex": 17,
-      "keyvalpos": 0
-    },
-    "tkzInterCC()()": {
-      "snippet": "tkzInterCC(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterCC[]()()": {
-      "snippet": "tkzInterCC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
-      "keyvalindex": 17,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "tkzTestInterCC()()": {
-      "snippet": "tkzTestInterCC(${1:O},${2:A})(${3:O'},${4:B})"
-    },
     "iftkzFlagCC": {},
     "tkzFlagCCtrue": {},
     "tkzFlagCCfalse": {},
-    "tkzInterCCN()()": {
-      "snippet": "tkzInterCCN(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterCCR()()": {
-      "snippet": "tkzInterCCR(${1:point1},${2:radius1})(${3:point2},${4:radius2})"
-    },
-    "tkzGetAngle()": {
-      "snippet": "tkzGetAngle(${1:csname})"
-    },
     "tkzAngleResult": {},
-    "tkzFindAngle()": {
-      "snippet": "tkzFindAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFindSlopeAngle()": {
-      "snippet": "tkzFindSlopeAngle(${1:point1},${2:point2})"
-    },
     "tkzDefRandPointOn[]": {
       "snippet": "tkzDefRandPointOn[${1:options}]",
-      "keyvalindex": 18,
-      "keyvalpos": 0
-    },
-    "tkzDrawPoint()": {
-      "snippet": "tkzDrawPoint(${1:name})"
-    },
-    "tkzDrawPoint[]()": {
-      "snippet": "tkzDrawPoint[${1:options}](${2:name})",
-      "keyvalindex": 19,
-      "keyvalpos": 0
-    },
-    "tkzDrawPoints()": {
-      "snippet": "tkzDrawPoints(${1:name1},${2:name2},${3:...})"
-    },
-    "tkzDrawPoints[]()": {
-      "snippet": "tkzDrawPoints[${1:options}](${2:name1},${3:name2},${4:...})",
-      "keyvalindex": 19,
-      "keyvalpos": 0
-    },
-    "tkzDrawLine()": {
-      "snippet": "tkzDrawLine(${1:point1},${2:point2})"
-    },
-    "tkzDrawLine[]()": {
-      "snippet": "tkzDrawLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 20,
-      "keyvalpos": 0
-    },
-    "tkzDrawLines()": {
-      "snippet": "tkzDrawLines(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawLines[]()": {
-      "snippet": "tkzDrawLines[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 20,
-      "keyvalpos": 0
-    },
-    "tkzDrawSegment()": {
-      "snippet": "tkzDrawSegment(${1:point1},${2:point2})"
-    },
-    "tkzDrawSegment[]()": {
-      "snippet": "tkzDrawSegment[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 21,
-      "keyvalpos": 0
-    },
-    "tkzDrawSegments()": {
-      "snippet": "tkzDrawSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzDrawSegments[]()": {
-      "snippet": "tkzDrawSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 21,
-      "keyvalpos": 0
-    },
-    "tkzDrawPolygon()": {
-      "snippet": "tkzDrawPolygon(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawPolygon[]()": {
-      "snippet": "tkzDrawPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 22,
-      "keyvalpos": 0
-    },
-    "tkzDrawPolySeg()": {
-      "snippet": "tkzDrawPolySeg(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawPolySeg[]()": {
-      "snippet": "tkzDrawPolySeg[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 22,
-      "keyvalpos": 0
-    },
-    "tkzDrawCircle()": {
-      "snippet": "tkzDrawCircle(${1:point1},${2:point2})"
-    },
-    "tkzDrawCircle[]()": {
-      "snippet": "tkzDrawCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 23,
-      "keyvalpos": 0
-    },
-    "tkzDrawCircles()": {
-      "snippet": "tkzDrawCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzDrawCircles[]()": {
-      "snippet": "tkzDrawCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 23,
-      "keyvalpos": 0
-    },
-    "tkzDrawSemiCircle()": {
-      "snippet": "tkzDrawSemiCircle(${1:point1},${2:point2})"
-    },
-    "tkzDrawSemiCircle[]()": {
-      "snippet": "tkzDrawSemiCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 24,
-      "keyvalpos": 0
-    },
-    "tkzDrawSemiCircles()": {
-      "snippet": "tkzDrawSemiCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzDrawSemiCircles[]()": {
-      "snippet": "tkzDrawSemiCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 24,
-      "keyvalpos": 0
-    },
-    "tkzDrawArc()()": {
-      "snippet": "tkzDrawArc(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzDrawArc[]()()": {
-      "snippet": "tkzDrawArc[${1:options}](${2:point1},${3:point2})(${4:point3})",
-      "keyvalindex": 25,
-      "keyvalpos": 0
-    },
-    "tkzDrawSector()()": {
-      "snippet": "tkzDrawSector(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzDrawSector[]()()": {
-      "snippet": "tkzDrawSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
-      "keyvalindex": 26,
-      "keyvalpos": 0
-    },
-    "tkzFillCircle()": {
-      "snippet": "tkzFillCircle(${1:point1},${2:point2})"
-    },
-    "tkzFillCircle[]()": {
-      "snippet": "tkzFillCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 27,
-      "keyvalpos": 0
-    },
-    "tkzFillCircles()": {
-      "snippet": "tkzFillCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzFillCircles[]()": {
-      "snippet": "tkzFillCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 27,
-      "keyvalpos": 0
-    },
-    "tkzFillPolygon()": {
-      "snippet": "tkzFillPolygon(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzFillPolygon[]()": {
-      "snippet": "tkzFillPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 28,
-      "keyvalpos": 0
-    },
-    "tkzFillSector()()": {
-      "snippet": "tkzFillSector(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzFillSector[]()()": {
-      "snippet": "tkzFillSector[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillAngle()": {
-      "snippet": "tkzFillAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFillAngle[]()": {
-      "snippet": "tkzFillAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 29,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "tkzInit[]": {
       "snippet": "tkzInit[${1:options}]",
-      "keyvalindex": 30,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "tkzClip": {},
     "tkzClip[]": {
       "snippet": "tkzClip[${1:options}]",
-      "keyvalindex": 31,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "tkzShowBB": {},
     "tkzShowBB[]": {
       "snippet": "tkzShowBB[${1:options}]",
-      "keyvalindex": 32,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "tkzClipBB": {},
-    "tkzClipPolygon()": {
-      "snippet": "tkzClipPolygon(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzClipPolygon[]()": {
-      "snippet": "tkzClipPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 33,
-      "keyvalpos": 0
-    },
-    "tkzClipCircle()": {
-      "snippet": "tkzClipCircle(${1:point1},${2:point2})"
-    },
-    "tkzClipCircle[]()": {
-      "snippet": "tkzClipCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 33,
-      "keyvalpos": 0
-    },
-    "tkzClipSector[]()()": {
-      "snippet": "tkzClipSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
-      "keyvalindex": 34,
-      "keyvalpos": 0
-    },
-    "tkzClipSector()()": {
-      "snippet": "tkzClipSector(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzMarkSegment()": {
-      "snippet": "tkzMarkSegment(${1:point1},${2:point2})"
-    },
-    "tkzMarkSegment[]()": {
-      "snippet": "tkzMarkSegment[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "tkzMarkSegments()": {
-      "snippet": "tkzMarkSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzMarkSegments[]()": {
-      "snippet": "tkzMarkSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "tkzMarkArc()": {
-      "snippet": "tkzMarkArc(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMarkArc[]()": {
-      "snippet": "tkzMarkArc[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "tkzMarkAngle()": {
-      "snippet": "tkzMarkAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMarkAngle[]()": {
-      "snippet": "tkzMarkAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 36,
-      "keyvalpos": 0
-    },
-    "tkzMarkRightAngle()": {
-      "snippet": "tkzMarkRightAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMarkRightAngle[]()": {
-      "snippet": "tkzMarkRightAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 37,
-      "keyvalpos": 0
-    },
-    "tkzPicAngle()": {
-      "snippet": "tkzPicAngle(${1:A},${2:O},${3:B})"
-    },
-    "tkzPicAngle[]()": {
-      "snippet": "tkzPicAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
-    },
-    "tkzPicRightAngle()": {
-      "snippet": "tkzPicRightAngle(${1:A},${2:O},${3:B})"
-    },
-    "tkzPicRightAngle[]()": {
-      "snippet": "tkzPicRightAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
-    },
-    "tkzLabelPoint(){}": {
-      "snippet": "tkzLabelPoint(${2:point}){${1:label}}"
-    },
-    "tkzLabelPoint[](){}": {
-      "snippet": "tkzLabelPoint[${2:options}](${3:point}){${1:label}}",
-      "keyvalindex": 38,
-      "keyvalpos": 0
-    },
-    "tkzLabelPoints()": {
-      "snippet": "tkzLabelPoints(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzLabelPoints[]()": {
-      "snippet": "tkzLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 38,
-      "keyvalpos": 0
-    },
-    "tkzAutoLabelPoints()": {
-      "snippet": "tkzAutoLabelPoints(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzAutoLabelPoints[]()": {
-      "snippet": "tkzAutoLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 39,
-      "keyvalpos": 0
-    },
-    "tkzLabelSegment(){}": {
-      "snippet": "tkzLabelSegment(${2:point1},${3:point2}){${1:label}}"
-    },
-    "tkzLabelSegment[](){}": {
-      "snippet": "tkzLabelSegment[${2:options}](${3:point1},${4:point2}){${1:label}}",
-      "keyvalindex": 40,
-      "keyvalpos": 0
-    },
-    "tkzLabelSegments(){}": {
-      "snippet": "tkzLabelSegments(${2:pt1},${3:pt2 pt3},${4:pt4 ...}){${1:label}}"
-    },
-    "tkzLabelSegments[](){}": {
-      "snippet": "tkzLabelSegments[${2:options}](${3:pt1},${4:pt2 pt3},${5:pt4 ...}){${1:label}}",
-      "keyvalindex": 40,
-      "keyvalpos": 0
-    },
-    "tkzLabelLine(){}": {
-      "snippet": "tkzLabelLine(${2:point1},${3:point2}){${1:label}}"
-    },
-    "tkzLabelLine[](){}": {
-      "snippet": "tkzLabelLine[${2:options}](${3:point1},${4:point2}){${1:label}}"
-    },
-    "tkzLabelAngle()": {
-      "snippet": "tkzLabelAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzLabelAngle[]()": {
-      "snippet": "tkzLabelAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 41,
-      "keyvalpos": 0
-    },
-    "tkzLabelCircle()(){}": {
-      "snippet": "tkzLabelCircle(${2:point1},${3:point2})(${4:angle}){${1:label}}"
-    },
-    "tkzLabelCircle[]()(){}": {
-      "snippet": "tkzLabelCircle[${2:options}](${3:point1},${4:point2})(${5:angle}){${1:label}}",
-      "keyvalindex": 42,
-      "keyvalpos": 0
-    },
-    "tkzLabelArc(){}": {
-      "snippet": "tkzLabelArc(${2:point1},${3:point2},${4:point3}){${1:label}}"
-    },
-    "tkzLabelArc[](){}": {
-      "snippet": "tkzLabelArc[${2:options}](${3:point1},${4:point2},${5:point3}){${1:label}}",
-      "keyvalindex": 43,
-      "keyvalpos": 0
-    },
-    "tkzCompass()": {
-      "snippet": "tkzCompass(${1:point1},${2:point2})"
-    },
-    "tkzCompass[]()": {
-      "snippet": "tkzCompass[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 44,
-      "keyvalpos": 0
-    },
-    "tkzCompasss()": {
-      "snippet": "tkzCompasss(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzCompasss[]()": {
-      "snippet": "tkzCompasss[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 44,
-      "keyvalpos": 0
-    },
-    "tkzShowLine()": {
-      "snippet": "tkzShowLine(${1:point1},${2:point2})"
-    },
-    "tkzShowLine[]()": {
-      "snippet": "tkzShowLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 45,
-      "keyvalpos": 0
-    },
-    "tkzShowTransformation()": {
-      "snippet": "tkzShowTransformation(${1:point1},${2:point2})"
-    },
-    "tkzShowTransformation[]()": {
-      "snippet": "tkzShowTransformation[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 46,
-      "keyvalpos": 0
-    },
-    "tkzProtractor()": {
-      "snippet": "tkzProtractor(${1:point1},${2:point2})"
-    },
-    "tkzProtractor[]()": {
-      "snippet": "tkzProtractor[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 47,
-      "keyvalpos": 0
-    },
-    "tkzDuplicateSegment()()": {
-      "snippet": "tkzDuplicateSegment(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzDuplicateSegment()(){}": {
-      "snippet": "tkzDuplicateSegment(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
-    },
-    "tkzDuplicateLength()()": {
-      "snippet": "tkzDuplicateLength(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzDuplicateLength()(){}": {
-      "snippet": "tkzDuplicateLength(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
-    },
-    "tkzCalcLength()": {
-      "snippet": "tkzCalcLength(${1:point1},${2:point2})"
-    },
-    "tkzCalcLength[]()": {
-      "snippet": "tkzCalcLength[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 48,
-      "keyvalpos": 0
-    },
-    "tkzpttocm(){}": {
-      "snippet": "tkzpttocm(${2:number}){${1:csname}}"
-    },
-    "tkzcmtopt(){}": {
-      "snippet": "tkzcmtopt(${2:number}){${1:csname}}"
-    },
-    "tkzGetPointCoord(){}": {
-      "snippet": "tkzGetPointCoord(${2:point}){${1:csname}}"
-    },
-    "tkzSwapPoints()": {
-      "snippet": "tkzSwapPoints(${1:A},${2:B})"
-    },
-    "tkzDotProduct()": {
-      "snippet": "tkzDotProduct(${1:A},${2:B},${3:C})"
-    },
-    "tkzPowerCircle()()": {
-      "snippet": "tkzPowerCircle(${1:A})(${2:O},${3:M})"
-    },
-    "tkzDefRadicalAxis()()": {
-      "snippet": "tkzDefRadicalAxis(${1:A},${2:B})(${3:C},${4:D})"
-    },
-    "tkzIsLinear()": {
-      "snippet": "tkzIsLinear(${1:A},${2:B},${3:C})"
-    },
-    "tkzIsOrtho()": {
-      "snippet": "tkzIsOrtho(${1:A},${2:B},${3:C})"
-    },
     "tkzGetResult{}": {
       "snippet": "tkzGetResult{${1:csname}}"
     },
     "tkzSetUpColors[]": {
       "snippet": "tkzSetUpColors[${1:options}]",
-      "keyvalindex": 49,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "tkzSetUpPoint[]": {
       "snippet": "tkzSetUpPoint[${1:options}]",
-      "keyvalindex": 50,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "tkzSetUpLine[]": {
       "snippet": "tkzSetUpLine[${1:options}]",
-      "keyvalindex": 51,
+      "keyvalindex": 7,
       "keyvalpos": 0
     },
     "tkzSetUpArc[]": {
       "snippet": "tkzSetUpArc[${1:options}]",
-      "keyvalindex": 52,
+      "keyvalindex": 8,
       "keyvalpos": 0
     },
     "tkzSetUpCompass[]": {
       "snippet": "tkzSetUpCompass[${1:options}]",
-      "keyvalindex": 52,
+      "keyvalindex": 8,
       "keyvalpos": 0
     },
     "tkzSetUpLabel[]": {
@@ -729,21 +140,6 @@
     "tkzLengthResult": {},
     "fileversion": {},
     "filedate": {},
-    "tkzDrawBisector()": {
-      "snippet": "tkzDrawBisector(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefIntSimilitudeCenter()()": {
-      "snippet": "tkzDefIntSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
-    "tkzDefExtSimilitudeCenter()()": {
-      "snippet": "tkzDefExtSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
-    "tkzDefIntHomotheticCenter()()": {
-      "snippet": "tkzDefIntHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
-    "tkzDefExtHomotheticCenter()()": {
-      "snippet": "tkzDefExtHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
     "tkzDrawMedian": {},
     "tkzDrawBisector": {},
     "tkzDrawAltitude": {},
@@ -767,9 +163,6 @@
     "tkzSetUpAllColors[]": {
       "snippet": "tkzSetUpAllColors[${1:options}]"
     },
-    "tkzNormalizeAngle()": {
-      "snippet": "tkzNormalizeAngle(${1:arg})"
-    },
     "tkzpointnormalised{}": {
       "snippet": "tkzpointnormalised{${1:arg}}"
     },
@@ -800,20 +193,12 @@
     "EnabledNumprint": {},
     "tkzMathResult": {},
     "tkzHelpGrid": {},
-    "tkzText(){}": {
-      "snippet": "tkzText(${2:x},${3:y}){${1:text}}"
-    },
-    "tkzText[](){}": {
-      "snippet": "tkzText[${2:options}](${3:x},${4:y}){${1:text}}",
-      "keyvalindex": 53,
-      "keyvalpos": 0
-    },
     "tkzLegend{}": {
       "snippet": "tkzLegend{${1:style/size/color/text}}"
     },
     "tkzLegend[]{}": {
       "snippet": "tkzLegend[${2:options}]{${1:style/size/color/text}}",
-      "keyvalindex": 54,
+      "keyvalindex": 9,
       "keyvalpos": 0
     },
     "ifinteger": {},
@@ -826,27 +211,15 @@
     "tkzDrawX": {},
     "tkzDrawX[]": {
       "snippet": "tkzDrawX[${1:options}]",
-      "keyvalindex": 55,
+      "keyvalindex": 10,
       "keyvalpos": 0
     },
     "tkzDrawY": {},
     "tkzDrawY[]": {
       "snippet": "tkzDrawY[${1:options}]",
-      "keyvalindex": 56,
+      "keyvalindex": 11,
       "keyvalpos": 0
     },
-    "tkzDrawPolygons()": {
-      "snippet": "tkzDrawPolygons(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawPolygons[]()": {
-      "snippet": "tkzDrawPolygons[${1:options}](${2:point1},${3:point2},${4:...})"
-    },
-    "tkzLabelRegPolygon(){}": {
-      "snippet": "tkzLabelRegPolygon(${2:point}){${1:label1,${3:label2},...}}"
-    },
-    "tkzLabelRegPolygon[](){}": {
-      "snippet": "tkzLabelRegPolygon[${2:options}](${3:point}){${1:label1,${4:label2},...}}"
-    },
     "iftkzClipOutPoly": {},
     "tkzClipOutPolytrue": {},
     "tkzClipOutPolyfalse": {},
@@ -861,505 +234,25 @@
     },
     "tkzGrid[]": {
       "snippet": "tkzGrid[${1:options}]",
-      "keyvalindex": 57,
-      "keyvalpos": 0
-    },
-    "tkzGrid[]()()": {
-      "snippet": "tkzGrid[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 57,
+      "keyvalindex": 12,
       "keyvalpos": 0
     },
-    "tkzDefCircleTranslation()": {
-      "snippet": "tkzDefCircleTranslation(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleHomothety()": {
-      "snippet": "tkzDefCircleHomothety(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleReflection()": {
-      "snippet": "tkzDefCircleReflection(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleSymmetry()": {
-      "snippet": "tkzDefCircleSymmetry(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleRotation()": {
-      "snippet": "tkzDefCircleRotation(${1:point1},${2:point2})"
-    },
-    "tkzDefOrthogonalCircle()": {
-      "snippet": "tkzDefOrthogonalCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefOrthoThroughCircle()": {
-      "snippet": "tkzDefOrthoThroughCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
-    },
-    "tkzDefInversionCircle()": {
-      "snippet": "tkzDefInversionCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
-    },
-    "tkzDefEquilateral()": {
-      "snippet": "tkzDefEquilateral(${1:point1},${2:point2})"
-    },
-    "tkzDefIsoscelesRightTriangle()": {
-      "snippet": "tkzDefIsoscelesRightTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDrawEquilateral[]()": {
-      "snippet": "tkzDrawEquilateral[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzDefIsoscelesRightTriangle[]()": {
-      "snippet": "tkzDefIsoscelesRightTriangle[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzDefTwoOne()": {
-      "snippet": "tkzDefTwoOne(${1:point1},${2:point2})"
-    },
-    "tkzDefPythagore()": {
-      "snippet": "tkzDefPythagore(${1:point1},${2:point2})"
-    },
-    "tkzDefSchoolTriangle()": {
-      "snippet": "tkzDefSchoolTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefGoldTriangle()": {
-      "snippet": "tkzDefGoldTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefEuclideTriangle()": {
-      "snippet": "tkzDefEuclideTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefGoldenTriangle()": {
-      "snippet": "tkzDefGoldenTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefCheopsTriangle()": {
-      "snippet": "tkzDefCheopsTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefTwoAnglesTriangle()": {
-      "snippet": "tkzDefTwoAnglesTriangle(${1:point1},${2:point2})"
-    },
     "SetUpPTTR{}": {
       "snippet": "SetUpPTTR{${1:options}}"
     },
-    "tkzDefIncentralTriangle[]()()": {
-      "snippet": "tkzDefIncentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefExcentralTriangle[]()()": {
-      "snippet": "tkzDefExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzExcentralTriangle[]()()": {
-      "snippet": "tkzExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefIntouchTriangle[]()()": {
-      "snippet": "tkzDefIntouchTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefContactTriangle[]()()": {
-      "snippet": "tkzDefContactTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefFeuerbachTriangle[]()()": {
-      "snippet": "tkzDefFeuerbachTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefCentroidTriangle[]()()": {
-      "snippet": "tkzDefCentroidTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefMedialTriangle[]()()": {
-      "snippet": "tkzDefMedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefMidpointTriangle[]()()": {
-      "snippet": "tkzDefMidpointTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefOrthicTriangle[]()()": {
-      "snippet": "tkzDefOrthicTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefAltitudeTriangle[]()()": {
-      "snippet": "tkzDefAltitudeTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefEulerTriangle[]()()": {
-      "snippet": "tkzDefEulerTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefTangentialTriangle[]()()": {
-      "snippet": "tkzDefTangentialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefSymmedialTriangle[]()()": {
-      "snippet": "tkzDefSymmedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzPointShowCoord()": {
-      "snippet": "tkzPointShowCoord(${1:point})"
-    },
-    "tkzPointShowCoord[]()": {
-      "snippet": "tkzPointShowCoord[${1:options}](${2:point})",
-      "keyvalindex": 58,
-      "keyvalpos": 0
-    },
-    "tkzShowPointCoord()": {
-      "snippet": "tkzShowPointCoord(${1:point})"
-    },
-    "tkzShowPointCoord[]()": {
-      "snippet": "tkzShowPointCoord[${1:options}](${2:point})",
-      "keyvalindex": 58,
-      "keyvalpos": 0
-    },
-    "tkzDefCircleR()": {
-      "snippet": "tkzDefCircleR(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleD()": {
-      "snippet": "tkzDefCircleD(${1:point1},${2:point2})"
-    },
-    "tkzDefCircumCircle()": {
-      "snippet": "tkzDefCircumCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefInCircle()": {
-      "snippet": "tkzDefInCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefExCircle()": {
-      "snippet": "tkzDefExCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefExRadius()": {
-      "snippet": "tkzDefExRadius(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerCircle()": {
-      "snippet": "tkzDefEulerCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefNinePointsCircle()": {
-      "snippet": "tkzDefNinePointsCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFeuerBachCircle()": {
-      "snippet": "tkzFeuerBachCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerRadius()": {
-      "snippet": "tkzDefEulerRadius(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefApolloniusCircle()": {
-      "snippet": "tkzDefApolloniusCircle(${1:point1},${2:point2})"
-    },
-    "tkzDefSpiekerCircle()": {
-      "snippet": "tkzDefSpiekerCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDrawSectorRAngles[]()()": {
-      "snippet": "tkzDrawSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorN[]()()": {
-      "snippet": "tkzDrawSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorRotate[]()()": {
-      "snippet": "tkzDrawSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorAngles[]()()": {
-      "snippet": "tkzDrawSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorRwithNodesAngles[]()()": {
-      "snippet": "tkzDrawSectorRwithNodesAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorR[]()()": {
-      "snippet": "tkzDrawSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorRAngles[]()()": {
-      "snippet": "tkzFillSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorN[]()()": {
-      "snippet": "tkzFillSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorRotate[]()()": {
-      "snippet": "tkzFillSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorAngles[]()()": {
-      "snippet": "tkzFillSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorR[]()()": {
-      "snippet": "tkzFillSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDefLineLL[]()": {
-      "snippet": "tkzDefLineLL[${1:options}](${2:point1},${3:point2},${4:point3})"
-    },
-    "tkzDefOrthLine[]()": {
-      "snippet": "tkzDefOrthLine[${1:options}](${2:point1},${3:point2},${4:point3})"
-    },
-    "tkzDefMediatorLine[]()": {
-      "snippet": "tkzDefMediatorLine[${1:options}](${2:point1},${3:point2},${4:point3})"
-    },
-    "tkzDefBisectorLine()": {
-      "snippet": "tkzDefBisectorLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefBisectorOutLine()": {
-      "snippet": "tkzDefBisectorOutLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefSymmedianLine()": {
-      "snippet": "tkzDefSymmedianLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefAltitudeLine()": {
-      "snippet": "tkzDefAltitudeLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerLine()": {
-      "snippet": "tkzDefEulerLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzTgtAt()()": {
-      "snippet": "tkzTgtAt(${1:point1})(${2:point2})"
-    },
-    "tkzTgtFromP()()": {
-      "snippet": "tkzTgtFromP(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzTgtFromPR()()": {
-      "snippet": "tkzTgtFromPR(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzRegPolygonCenter()": {
-      "snippet": "tkzRegPolygonCenter(${1:point1},${2:point2})"
-    },
-    "tkzRegPolygonSide()": {
-      "snippet": "tkzRegPolygonSide(${1:point1},${2:point2})"
-    },
-    "tkzRenamePoint(){}": {
-      "snippet": "tkzRenamePoint(${2:arg1}){${1:arg2}}"
-    },
-    "tkzGetPointxy(){}": {
-      "snippet": "tkzGetPointxy(${2:arg1}){${1:arg2}}"
-    },
-    "tkzDrawArcTowards[]()()": {
-      "snippet": "tkzDrawArcTowards[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRotate[]()()": {
-      "snippet": "tkzDrawArcRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcAngles[]()()": {
-      "snippet": "tkzDrawArcAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRwithNodes[]()()": {
-      "snippet": "tkzDrawArcRwithNodes[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcR[]()()": {
-      "snippet": "tkzDrawArcR[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRAngles[]()()": {
-      "snippet": "tkzDrawArcRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRAN[]()()": {
-      "snippet": "tkzDrawArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzPathArcRAN[]()()": {
-      "snippet": "tkzPathArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzRandPointOnRect()": {
-      "snippet": "tkzRandPointOnRect(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnSegment()": {
-      "snippet": "tkzRandPointOnSegment(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnLine()": {
-      "snippet": "tkzRandPointOnLine(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnCircle()": {
-      "snippet": "tkzRandPointOnCircle(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnCircleThrough()": {
-      "snippet": "tkzRandPointOnCircleThrough(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnDisk()": {
-      "snippet": "tkzRandPointOnDisk(${1:point1},${2:point2})"
-    },
-    "tkzVecKOrth[]()": {
-      "snippet": "tkzVecKOrth[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzVecK[]()": {
-      "snippet": "tkzVecK[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzVecKOrthNorm[]()": {
-      "snippet": "tkzVecKOrthNorm[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzVecKNorm[]()": {
-      "snippet": "tkzVecKNorm[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzShowMediatorLine[]()": {
-      "snippet": "tkzShowMediatorLine[${1:opts}](${2:arg})"
-    },
-    "tkzShowLLLine[]()()": {
-      "snippet": "tkzShowLLLine[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowOrthLine[]()()": {
-      "snippet": "tkzShowOrthLine[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowBisectorLine[]()()": {
-      "snippet": "tkzShowBisectorLine[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowTranslation[]()()": {
-      "snippet": "tkzShowTranslation[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowSymOrth[]()()": {
-      "snippet": "tkzShowSymOrth[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowCSym[]()()": {
-      "snippet": "tkzShowCSym[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowProjection[]()()": {
-      "snippet": "tkzShowProjection[${1:opts}](${2:arg1})(${3:arg2})"
-    },
     "ExtractPoint": {},
     "FirstPointInList{}": {
       "snippet": "FirstPointInList{${1:arg}}"
     },
-    "tkzTranslation()(){}": {
-      "snippet": "tkzTranslation(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUTranslation()()": {
-      "snippet": "tkzUTranslation(${1:arg1})(${2:arg2})"
-    },
-    "tkzCSym()(){}": {
-      "snippet": "tkzCSym(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUCSym()()": {
-      "snippet": "tkzUCSym(${1:arg1})(${2:arg2})"
-    },
-    "tkzSymOrth()(){}": {
-      "snippet": "tkzSymOrth(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUSymOrth()()": {
-      "snippet": "tkzUSymOrth(${1:arg1})(${2:arg2})"
-    },
-    "tkzProjection()(){}": {
-      "snippet": "tkzProjection(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUProjection()()": {
-      "snippet": "tkzUProjection(${1:arg1})(${2:arg2})"
-    },
-    "tkzHomo()(){}": {
-      "snippet": "tkzHomo(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUHomo()()": {
-      "snippet": "tkzUHomo(${1:arg1})(${2:arg2})"
-    },
-    "tkzRotateAngle()(){}": {
-      "snippet": "tkzRotateAngle(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzURotateAngle()()": {
-      "snippet": "tkzURotateAngle(${1:arg1})(${2:arg2})"
-    },
-    "tkzRotateInRad()(){}": {
-      "snippet": "tkzRotateInRad(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzURotateInRad()()": {
-      "snippet": "tkzURotateInRad(${1:arg1})(${2:arg2})"
-    },
-    "tkzInversePoint()(){}": {
-      "snippet": "tkzInversePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUInversePoint()()": {
-      "snippet": "tkzUInversePoint(${1:arg1})(${2:arg2})"
-    },
-    "tkzInverseNegativePoint()(){}": {
-      "snippet": "tkzInverseNegativePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUInverseNegativePoint()()": {
-      "snippet": "tkzUInverseNegativePoint(${1:arg1})(${2:arg2})"
-    },
-    "tkzDefBCPoint()": {
-      "snippet": "tkzDefBCPoint(${1:point1=num1},${2:point2=num2},${3:...})"
-    },
-    "tkzDivHarmonic()": {
-      "snippet": "tkzDivHarmonic(${1:pt1},${2:pt2},${3:pt3})"
-    },
-    "tkzDivHarmonic[]()": {
-      "snippet": "tkzDivHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})"
-    },
-    "tkzOrthoCenter()": {
-      "snippet": "tkzOrthoCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefOrthoCenter()": {
-      "snippet": "tkzDefOrthoCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzCentroid()": {
-      "snippet": "tkzCentroid(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzBaryCenter()": {
-      "snippet": "tkzBaryCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzCircumCenter()": {
-      "snippet": "tkzCircumCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefCircumCenter()": {
-      "snippet": "tkzDefCircumCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzInCenter()": {
-      "snippet": "tkzInCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefInCenter()": {
-      "snippet": "tkzDefInCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzExCenter()": {
-      "snippet": "tkzExCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefExCenter()": {
-      "snippet": "tkzDefExCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzEulerCenter()": {
-      "snippet": "tkzEulerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzNinePointCenter()": {
-      "snippet": "tkzNinePointCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerCenter()": {
-      "snippet": "tkzDefEulerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzSymmedianCenter()": {
-      "snippet": "tkzSymmedianCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzLemoinePoint()": {
-      "snippet": "tkzLemoinePoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzGrebePoint()": {
-      "snippet": "tkzGrebePoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefLemoinePoint()": {
-      "snippet": "tkzDefLemoinePoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzSpiekerCenter()": {
-      "snippet": "tkzSpiekerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefSpiekerCenter()": {
-      "snippet": "tkzDefSpiekerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzGergonneCenter()": {
-      "snippet": "tkzGergonneCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefGergonneCenter()": {
-      "snippet": "tkzDefGergonneCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzNagelCenter()": {
-      "snippet": "tkzNagelCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefNagelCenter()": {
-      "snippet": "tkzDefNagelCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMittenpunktCenter()": {
-      "snippet": "tkzMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefMittenpunktCenter()": {
-      "snippet": "tkzDefMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefMiddlespoint()": {
-      "snippet": "tkzDefMiddlespoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFeuerbachCenter()": {
-      "snippet": "tkzFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefFeuerbachCenter()": {
-      "snippet": "tkzDefFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzOrthogonalCenter()": {
-      "snippet": "tkzOrthogonalCenter(${1:point1},${2:point2})"
-    },
     "usetkzobj{}": {
       "snippet": "usetkzobj{${1:list of objects}}"
     },
     "usetkztool{}": {
       "snippet": "usetkztool{${1:list of tools}}"
     },
-    "tkzInterLLxy()()": {
-      "snippet": "tkzInterLLxy(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzTestInterLC()()": {
-      "snippet": "tkzTestInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
     "iftkzFlagLC": {},
     "tkzFlagLCtrue": {},
     "tkzFlagLCfalse": {},
-    "tkzInterLCR()(){}{}": {
-      "snippet": "tkzInterLCR(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
-    },
-    "tkzInterLCWithNodes()(){}{}": {
-      "snippet": "tkzInterLCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
-    },
-    "tkzInterCCWithNodes()(){}{}": {
-      "snippet": "tkzInterCCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
-    },
     "tkzAddName[]{}": {
       "snippet": "tkzAddName[${2:options}]{${1:name}}"
     },
@@ -1384,162 +277,12 @@
     "lua"
   ],
   "keyvals": [
-    [
-      "label=${1:text}",
-      "shift=(${1:x},${2:y})",
-      "shift=(${1:angle}:${2:radius})"
-    ],
-    [
-      "ext",
-      "int"
-    ],
-    [
-      "both",
-      "ext",
-      "int"
-    ],
-    [
-      "dist=",
-      "from=${1:point}",
-      "show",
-      "/tkzcompass/delta=${1:number}"
-    ],
-    [
-      "ortho",
-      "orthic",
-      "centroid",
-      "median",
-      "circum",
-      "in",
-      "ex",
-      "euler",
-      "gergonne",
-      "symmedian",
-      "lemoine",
-      "grebe",
-      "spieker",
-      "nagel",
-      "mittenpunkt",
-      "feuerbach"
-    ],
-    [
-      "name=${1:name}"
-    ],
-    [
-      "pos=${1:number}"
-    ],
     [
       "through=center ${1:point1} angle ${2:degrees} point ${3:point2}",
       "R=center ${1:point} angle ${2:degrees} radius ${3:radius}",
       "through in rad=center ${1:point1} angle ${2:radians} point ${3:point2}",
       "R in rad=center ${1:point} angle ${2:radians} radius ${3:radius}"
     ],
-    [
-      "translation=from ${1:point1} to ${2:point2}",
-      "homothety=center ${1:point} ratio ${2:number}",
-      "reflection=over ${1:point1}--${2:point2}",
-      "symmetry=center ${1:point}",
-      "projection=onto ${1:point1}--${2:point2}",
-      "rotation=center ${1:point} angle ${2:degrees}",
-      "rotation in rad=center ${1:point} angle ${2:radians}",
-      "inversion=center ${1:point1} through ${2:point2}",
-      "inversion negative=center ${1:point1} through ${2:point2}"
-    ],
-    [
-      "orthogonal",
-      "orthogonal normed",
-      "linear",
-      "linear normed",
-      "colinear=at ${1:point}",
-      "colinear normed=at ${1:point}",
-      "K=${1:number}"
-    ],
-    [
-      "mediator",
-      "perpendicular=through ${1:point}",
-      "orthogonal=through ${1:point}",
-      "parallel=through ${1:point}",
-      "bisector",
-      "bisector out",
-      "symmedian",
-      "altitude",
-      "euler",
-      "tangent at=${1:point}",
-      "tangent from=${1:point}",
-      "K=${1:number}",
-      "normed"
-    ],
-    [
-      "at=${1:point}",
-      "from=${1:point}",
-      "from with R=${1:point}"
-    ],
-    [
-      "two angles=${1:angle1} and ${2:angle2}",
-      "equilateral",
-      "isosceles right",
-      "pythagore",
-      "pythagoras",
-      "egyptian",
-      "school",
-      "gold",
-      "euclid",
-      "golden",
-      "cheops",
-      "swap"
-    ],
-    [
-      "orthic",
-      "centroid",
-      "medial",
-      "in",
-      "incentral",
-      "ex",
-      "excentral",
-      "extouch",
-      "intouch",
-      "contact",
-      "euler",
-      "symmedial",
-      "tangential",
-      "feuerbach",
-      "name=${1:name}",
-      "ortho"
-    ],
-    [
-      "name=${1:name}",
-      "sides=${1:integer}",
-      "center",
-      "side"
-    ],
-    [
-      "R",
-      "diameter",
-      "circum",
-      "in",
-      "ex",
-      "euler",
-      "nine",
-      "spieker",
-      "apollonius",
-      "orthogonal from=${1:point}",
-      "orthogonal through=${1:point1} and ${2:point2}",
-      "K=${1:number}"
-    ],
-    [
-      "translation=from ${1:point1} to ${2:point2}",
-      "homothety=center ${1:point} ratio ${2:number}",
-      "reflection=over ${1:point1}--${2:point2}",
-      "symmetry=center ${1:point}",
-      "projection=onto ${1:point1}--${2:point2}",
-      "rotation=center ${1:point} angle ${2:degrees}",
-      "inversion=center ${1:point1} through ${2:point2}"
-    ],
-    [
-      "N",
-      "R",
-      "with nodes"
-    ],
     [
       "rectangle=${1:point1} and ${2:point2}",
       "segment=${1:point1}--${2:point2}",
@@ -1548,279 +291,6 @@
       "circle through=center ${1:point1} through ${2:point2}",
       "disk through=center ${1:point1} through ${2:point2}"
     ],
-    [
-      "shape=",
-      "size=${1:number}",
-      "color=",
-      "%color",
-      "fill=",
-      "draw=",
-      "opacity=${1:factor}",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "add=${1:num1} and ${2:num2}",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "style={${1:TikZ options}}",
-      "->",
-      "<-",
-      "<->",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line width=",
-      "double",
-      "double distance="
-    ],
-    [
-      "add=${1:num1} and ${2:num2}",
-      "dim={${1:label},${2:dim},${3:option}}",
-      "color=",
-      "%color",
-      "opacity=${1:factor}",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "style={${1:TikZ options}}",
-      "->",
-      "<-",
-      "<->",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line width=",
-      "double",
-      "double distance="
-    ],
-    [
-      "color=",
-      "%color",
-      "fill=",
-      "draw=",
-      "opacity=${1:factor}",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "style={${1:TikZ options}}",
-      "->",
-      "<-",
-      "<->",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line width=",
-      "line join=",
-      "double",
-      "double distance="
-    ],
-    [
-      "through",
-      "R",
-      "color=",
-      "%color",
-      "fill=",
-      "opacity=${1:factor}",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "through",
-      "diameter",
-      "color=",
-      "%color",
-      "fill=",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "towards",
-      "rotate",
-      "R",
-      "R with nodes",
-      "angles",
-      "delta=${1:number}",
-      "reverse",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "towards",
-      "rotate",
-      "R",
-      "R with nodes",
-      "fill=",
-      "opacity=${1:factor}",
-      "color=",
-      "%color",
-      "draw=",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "radius",
-      "R",
-      "color=",
-      "%color",
-      "fill=",
-      "opacity=${1:factor}"
-    ],
-    [
-      "color=",
-      "%color",
-      "opacity=${1:factor}",
-      "fill="
-    ],
-    [
-      "size=${1:number}",
-      "color=",
-      "%color",
-      "opacity=${1:factor}",
-      "fill=",
-      "left color=",
-      "right color="
-    ],
     [
       "xmin=${1:number}",
       "xmax=${1:number}",
@@ -1839,229 +309,6 @@
       "color=",
       "%color"
     ],
-    [
-      "out"
-    ],
-    [
-      "towards",
-      "rotate",
-      "R"
-    ],
-    [
-      "pos=${1:number}",
-      "color=",
-      "%color",
-      "mark=${1:mark}",
-      "size=",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "arc=",
-      "size=",
-      "mark=${1:mark}",
-      "mksize=",
-      "mkcolor=",
-      "color=",
-      "mkpos=${1:number}"
-    ],
-    [
-      "german",
-      "size=${1:number}",
-      "fill=",
-      "opacity=${1:factor}",
-      "draw=",
-      "color=",
-      "%color",
-      "line width="
-    ],
-    [
-      "left",
-      "right",
-      "above",
-      "below",
-      "above right",
-      "above left",
-      "below right",
-      "below left",
-      "color=",
-      "%color",
-      "font=${1:font commands}",
-      "label=${1:text}",
-      "centered"
-    ],
-    [
-      "left",
-      "right",
-      "above",
-      "below",
-      "above right",
-      "above left",
-      "below right",
-      "below left",
-      "color=",
-      "%color",
-      "font=${1:font commands}",
-      "label=${1:text}",
-      "centered",
-      "center=${1:point}",
-      "dist=${1:number}"
-    ],
-    [
-      "pos=${1:number}",
-      "swap",
-      "auto",
-      "below=",
-      "above=",
-      "left=",
-      "right=",
-      "below left=",
-      "below right=",
-      "above left=",
-      "above right=",
-      "sloped",
-      "midway",
-      "near start",
-      "near end",
-      "very near start",
-      "very near end",
-      "at start",
-      "at end",
-      "color=",
-      "%color"
-    ],
-    [
-      "pos=${1:number}",
-      "circle",
-      "draw",
-      "fill=",
-      "font=${1:font commands}"
-    ],
-    [
-      "radius",
-      "R",
-      "below=",
-      "above=",
-      "left=",
-      "right=",
-      "below left=",
-      "below right=",
-      "above left=",
-      "above right=",
-      "color=",
-      "%color",
-      "fill=",
-      "font=${1:font commands}",
-      "draw",
-      "text width=",
-      "text centered"
-    ],
-    [
-      "pos=${1:number}",
-      "below=",
-      "above=",
-      "left=",
-      "right=",
-      "below left=",
-      "below right=",
-      "above left=",
-      "above right=",
-      "color=",
-      "%color"
-    ],
-    [
-      "delta=${1:degrees}",
-      "length=${1:number}",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "mediator",
-      "parallel=through ${1:point}",
-      "perpendicular=through ${1:point}",
-      "orthogonal",
-      "bisector",
-      "K=${1:number}",
-      "length=${1:number}",
-      "ratio=${1:number}",
-      "gap=${1:number}",
-      "size=${1:number}",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "reflection=over ${1:point1}--${2:point2}",
-      "symmetry=center ${1:point}",
-      "projection=onto ${1:point1}--${2:point2}",
-      "translation=from ${1:point1} to ${2:point2}",
-      "K=${1:number}",
-      "length=${1:number}",
-      "ratio=${1:number}",
-      "gap=${1:number}",
-      "size=${1:number}",
-      "color=",
-      "%color"
-    ],
-    [
-      "lw=",
-      "scale=${1:factor}",
-      "return"
-    ],
-    [
-      "cm"
-    ],
     [
       "background=",
       "text="
@@ -2086,17 +333,6 @@
       "add=${1:num1} and ${2:num2}",
       "delta=${1:number}"
     ],
-    [
-      "draw",
-      "color=",
-      "text=",
-      "fill=",
-      "opacity=${1:factor}",
-      "line width=",
-      "rotate=${1:degrees}",
-      "inner sep=",
-      "text width="
-    ],
     [
       "line"
     ],
@@ -2130,14 +366,6 @@
       "subxstep=${1:number}",
       "subystep=${1:number}",
       "line width="
-    ],
-    [
-      "xlabel=${1:text}",
-      "xstyle=",
-      "noxdraw",
-      "ylabel=${1:text}",
-      "ystyle=",
-      "noydraw"
     ]
   ]
 }
\ No newline at end of file
diff --git a/data/packages/xy.json b/data/packages/xy.json
index e40a1f458..5002491d4 100644
--- a/data/packages/xy.json
+++ b/data/packages/xy.json
@@ -262,9 +262,6 @@
     "xybsqlfont": {},
     "xybtipfont": {},
     "xycircfont": {},
-    "xycircle(){}": {
-      "snippet": "xycircle(${2:x},${3:y}){${1:style}}"
-    },
     "xycircle<>{}": {
       "snippet": "xycircle<${2:radius}>{${1:style}}"
     },
@@ -283,12 +280,6 @@
     "xyignore{}": {
       "snippet": "xyignore{${1:<${2:pos}><${3:decor}>}}"
     },
-    "xyimport()(){}": {
-      "snippet": "xyimport(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics code}}"
-    },
-    "xyimport(){}": {
-      "snippet": "xyimport(${2:width},${3:height}){${1:graphics code}}"
-    },
     "xylattice{}{}{}{}": {
       "snippet": "xylattice{${1:pt1}}{${2:pt2}}{${3:pt3}}{${4:pt4}}"
     },
diff --git a/data/packages/zhnumber.json b/data/packages/zhnumber.json
index d734873b1..28d29514b 100644
--- a/data/packages/zhnumber.json
+++ b/data/packages/zhnumber.json
@@ -68,10 +68,10 @@
       "snippet": "zhganzhinian{${1:year}}"
     },
     "zhnumExtendScaleMap{}": {
-      "snippet": "zhnumExtendScaleMap{${1:character1,${2: character2},${3: ...}, charactern}}"
+      "snippet": "zhnumExtendScaleMap{${1:character1, character2, ..., charactern}}"
     },
     "zhnumExtendScaleMap[]{}": {
-      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1,${3: character2},${4: ...}, charactern}}"
+      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1, character2, ..., charactern}}"
     },
     "zhnumsetup{}": {
       "snippet": "zhnumsetup{${1:options}}",
diff --git a/dev/packages/CJK.json b/dev/packages/CJK.json
deleted file mode 100644
index 9dd0c23e8..000000000
--- a/dev/packages/CJK.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "includes": {
-    "MULEenc": []
-  },
-  "macros": {
-    "CJKbold": {},
-    "CJKnormal": {},
-    "CJKboldshift": {},
-    "CJKsymbol{}": {
-      "snippet": "CJKsymbol{${1:n}}"
-    },
-    "CJKpunctsymbol{}": {
-      "snippet": "CJKpunctsymbol{${1:n}}"
-    },
-    "CJKsymbols{}{}": {
-      "snippet": "CJKsymbols{${1:codepoint1}}{${2:codepoint2}}"
-    },
-    "CJKchar{}{}": {
-      "snippet": "CJKchar{${1:byte1}}{${2:byte2}}"
-    },
-    "CJKchar[]{}{}": {
-      "snippet": "CJKchar[${3:UTF8}]{${1:byte1}}{${2:byte2}}"
-    },
-    "Unicode{}{}": {
-      "snippet": "Unicode{${1:byte1}}{${2:byte2}}"
-    },
-    "CJKCJKchar": {},
-    "CJKhangulchar": {},
-    "CJKlatinchar": {},
-    "CJKhwkatakana": {},
-    "CJKnohwkatakana": {},
-    "CJKenc{}": {
-      "snippet": "CJKenc{${1:encoding}}"
-    },
-    "CJKfontenc{}{}": {
-      "snippet": "CJKfontenc{${1:encoding}}{${2:font encoding}}"
-    },
-    "CJKfamily{}": {
-      "snippet": "CJKfamily{${1:family}}"
-    },
-    "CJKencfamily{}{}": {
-      "snippet": "CJKencfamily{${1:encoding}}{${2:family}}"
-    },
-    "CJKencfamily[]{}{}": {
-      "snippet": "CJKencfamily[${3:font encoding}]{${1:encoding}}{${2:family}}"
-    },
-    "CJKshape{}": {
-      "snippet": "CJKshape{${1:family}}"
-    },
-    "CJKencshape{}{}": {
-      "snippet": "CJKencshape{${1:encoding}}{${2:family}}"
-    },
-    "CJKencshape[]{}{}": {
-      "snippet": "CJKencshape[${3:font encoding}]{${1:encoding}}{${2:family}}"
-    },
-    "CJKaddEncHook{}{}": {
-      "snippet": "CJKaddEncHook{${1:encoding}}{${2:code}}"
-    },
-    "CJKhanja": {},
-    "CJKhangul": {},
-    "CJKkern": {},
-    "CJKglue": {},
-    "CJKtolerance": {},
-    "nbs": {},
-    "CJKtilde": {},
-    "standardtilde": {},
-    "CJKspace": {},
-    "CJKnospace": {},
-    "CJKindent": {},
-    "CJKcaption{}": {
-      "snippet": "CJKcaption{${1:caption}}"
-    },
-    "CJKhdef{}{}": {
-      "snippet": "CJKhdef{${1:arg1}}{${2:arg2}}"
-    },
-    "CJKhlet{}{}": {
-      "snippet": "CJKhlet{${1:arg1}}{${2:arg2}}"
-    },
-    "CJKvdef{}{}": {
-      "snippet": "CJKvdef{${1:arg1}}{${2:arg2}}"
-    },
-    "CJKvlet{}{}": {
-      "snippet": "CJKvlet{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {
-    "CJK{}{}": {
-      "name": "CJK",
-      "snippet": "{${1:encoding}}{${2:family}}"
-    },
-    "CJK[]{}{}": {
-      "name": "CJK",
-      "snippet": "[${3:font encoding}]{${1:encoding}}{${2:family}}"
-    },
-    "CJK*{}{}": {
-      "name": "CJK*",
-      "snippet": "{${1:encoding}}{${2:family}}"
-    },
-    "CJK*[]{}{}": {
-      "name": "CJK*",
-      "snippet": "[${3:font encoding}]{${1:encoding}}{${2:family}}"
-    }
-  },
-  "options": [
-    "lowercase",
-    "global",
-    "local",
-    "active",
-    "encapsulated"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/CJKfntef.json b/dev/packages/CJKfntef.json
deleted file mode 100644
index db79c91bc..000000000
--- a/dev/packages/CJKfntef.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "includes": {
-    "CJK": [],
-    "CJKulem": []
-  },
-  "macros": {
-    "CJKunderdot{}": {
-      "snippet": "CJKunderdot{${1:contents}}"
-    },
-    "CJKunderline{}": {
-      "snippet": "CJKunderline{${1:contents}}"
-    },
-    "CJKunderline*{}": {
-      "snippet": "CJKunderline*{${1:contents}}"
-    },
-    "CJKunderdblline{}": {
-      "snippet": "CJKunderdblline{${1:contents}}"
-    },
-    "CJKunderdblline*{}": {
-      "snippet": "CJKunderdblline*{${1:contents}}"
-    },
-    "CJKunderwave{}": {
-      "snippet": "CJKunderwave{${1:contents}}"
-    },
-    "CJKunderwave*{}": {
-      "snippet": "CJKunderwave*{${1:contents}}"
-    },
-    "CJKsout{}": {
-      "snippet": "CJKsout{${1:contents}}"
-    },
-    "CJKsout*{}": {
-      "snippet": "CJKsout*{${1:contents}}"
-    },
-    "CJKxout{}": {
-      "snippet": "CJKxout{${1:contents}}"
-    },
-    "CJKxout*{}": {
-      "snippet": "CJKxout*{${1:contents}}"
-    },
-    "varCJKunderline{}": {
-      "snippet": "varCJKunderline{${1:contents}}"
-    },
-    "CJKunderanyline{}{}{}": {
-      "snippet": "CJKunderanyline{${1:depth}}{${2:underline code}}{${3:contents}}"
-    },
-    "CJKunderanysymbol{}{}{}": {
-      "snippet": "CJKunderanysymbol{${1:depth}}{${2:under-symbol code}}{${3:contents}}"
-    },
-    "CJKsoutcolor": {},
-    "CJKsoutheight": {},
-    "CJKulineleftskip": {},
-    "CJKulinerightskip": {},
-    "CJKunderdbllinebasesep": {},
-    "CJKunderdbllinecolor": {},
-    "CJKunderdbllinesep": {},
-    "CJKunderdotbasesep": {},
-    "CJKunderdotcolor": {},
-    "CJKunderdotsep": {},
-    "CJKunderlinebasesep": {},
-    "CJKunderlinecolor": {},
-    "CJKunderlinesep": {},
-    "CJKunderwavebasesep": {},
-    "CJKunderwavecolor": {},
-    "CJKunderwavesep": {},
-    "CJKxoutcolor": {}
-  },
-  "envs": {
-    "CJKfilltwosides{}": {
-      "name": "CJKfilltwosides",
-      "snippet": "{${1:width}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/PapierGurvan.json b/dev/packages/PapierGurvan.json
index ff2008c82..59cd6feec 100644
--- a/dev/packages/PapierGurvan.json
+++ b/dev/packages/PapierGurvan.json
@@ -40,9 +40,6 @@
     "LigneGurvan[]<>{}": {
       "snippet": "LigneGurvan[${2:clés}]<${3:alignement}>{${1:texte}}"
     },
-    "LigneGurvan[]<>(){}": {
-      "snippet": "LigneGurvan[${2:clés}]<${3:alignement}>(${4:ajustement}){${1:texte}}"
-    },
     "ParagrapheGurvan{}": {
       "snippet": "ParagrapheGurvan{${1:texte}}"
     },
@@ -55,9 +52,6 @@
     "ParagrapheGurvan[]<>{}": {
       "snippet": "ParagrapheGurvan[${2:clés}]<${3:alignement}>{${1:texte}}"
     },
-    "ParagrapheGurvan[]<>(){}": {
-      "snippet": "ParagrapheGurvan[${2:clés}]<${3:alignement}>(${4:ajustement}){${1:texte}}"
-    },
     "thelggurvan": {}
   },
   "envs": {
diff --git a/dev/packages/ProfCollege.json b/dev/packages/ProfCollege.json
index 52e29b967..e3074f562 100644
--- a/dev/packages/ProfCollege.json
+++ b/dev/packages/ProfCollege.json
@@ -179,10 +179,10 @@
       "snippet": "Ecriture[${2:clés}]{${1:nombre}}"
     },
     "Frise{}": {
-      "snippet": "Frise{${1:1/A/a,${2:2/B/b},${3:3/C/c},...}}"
+      "snippet": "Frise{${1:1/A/a,2/B/b,3/C/c,...}}"
     },
     "Frise[]{}": {
-      "snippet": "Frise[${2:clés}]{${1:1/A/a,${3:2/B/b},${4:3/C/c},...}}"
+      "snippet": "Frise[${2:clés}]{${1:1/A/a,2/B/b,3/C/c,...}}"
     },
     "Tables{}": {
       "snippet": "Tables{${1:nombre}}"
@@ -255,22 +255,22 @@
       "snippet": "BoiteRapido{${1:texte}}"
     },
     "Cible{}": {
-      "snippet": "Cible{${1:n1,${2:n2},...}}"
+      "snippet": "Cible{${1:n1,n2,...}}"
     },
     "Cible[]{}": {
-      "snippet": "Cible[${2:clés}]{${1:n1,${3:n2},...}}"
+      "snippet": "Cible[${2:clés}]{${1:n1,n2,...}}"
     },
     "Mentalo{}": {
-      "snippet": "Mentalo{${1:o1,${2:o2},...}}"
+      "snippet": "Mentalo{${1:o1,o2,...}}"
     },
     "Mentalo[]{}": {
-      "snippet": "Mentalo[${2:clés}]{${1:o1,${3:o2},...}}"
+      "snippet": "Mentalo[${2:clés}]{${1:o1,o2,...}}"
     },
     "Automatismes{}": {
-      "snippet": "Automatismes{${1:o1,${2:o2},...}}"
+      "snippet": "Automatismes{${1:o1,o2,...}}"
     },
     "Automatismes[]{}": {
-      "snippet": "Automatismes[${2:clés}]{${1:o1,${3:o2},...}}"
+      "snippet": "Automatismes[${2:clés}]{${1:o1,o2,...}}"
     },
     "PyraVoca{}": {
       "snippet": "PyraVoca{${1:définition1/mot1/couleur1,...}}"
@@ -446,16 +446,16 @@
       "snippet": "DivisionD[${3:clés}]{${1:n1}}{${2:n2}}"
     },
     "PyramideNombre{}": {
-      "snippet": "PyramideNombre{${1:c1,${2:c2},...}}"
+      "snippet": "PyramideNombre{${1:c1,c2,...}}"
     },
     "PyramideNombre[]{}": {
-      "snippet": "PyramideNombre[${2:clés}]{${1:c1,${3:c2},...}}"
+      "snippet": "PyramideNombre[${2:clés}]{${1:c1,c2,...}}"
     },
     "ProgCalcul{}": {
-      "snippet": "ProgCalcul{${1:i1,${2:i2},...}}"
+      "snippet": "ProgCalcul{${1:i1,i2,...}}"
     },
     "ProgCalcul[]{}": {
-      "snippet": "ProgCalcul[${2:clés}]{${1:i1,${3:i2},...}}"
+      "snippet": "ProgCalcul[${2:clés}]{${1:i1,i2,...}}"
     },
     "Decomposition{}": {
       "snippet": "Decomposition{${1:integer}}"
@@ -468,10 +468,10 @@
       "snippet": "Erathostene[${1:clés}]"
     },
     "Engrenages{}": {
-      "snippet": "Engrenages{${1:m1/z1,${2:m2/z2},...}}"
+      "snippet": "Engrenages{${1:m1/z1,m2/z2,...}}"
     },
     "Engrenages[]{}": {
-      "snippet": "Engrenages[${2:clés}]{${1:m1/z1,${3:m2/z2},...}}"
+      "snippet": "Engrenages[${2:clés}]{${1:m1/z1,m2/z2,...}}"
     },
     "Fraction{}": {
       "snippet": "Fraction{${1:a/b}}"
@@ -718,10 +718,10 @@
       "snippet": "Billard[${2:clés}]{${1:\"mot\"}}"
     },
     "Labyrinthe{}{}": {
-      "snippet": "Labyrinthe{${1:Contenu1/Couleur1,${3:Contenu2/Couleur2},...}}{${2:P1/P2/...}}"
+      "snippet": "Labyrinthe{${1:Contenu1/Couleur1,Contenu2/Couleur2,...}}{${2:P1/P2/...}}"
     },
     "Labyrinthe[]{}{}": {
-      "snippet": "Labyrinthe[${3:clés}]{${1:Contenu1/Couleur1,${4:Contenu2/Couleur2},...}}{${2:P1/P2/...}}"
+      "snippet": "Labyrinthe[${3:clés}]{${1:Contenu1/Couleur1,Contenu2/Couleur2,...}}{${2:P1/P2/...}}"
     },
     "LabyNombre": {},
     "LabyNombre[]": {
@@ -734,10 +734,10 @@
       "snippet": "Triomino[${2:clés}]{${1:v1§v2§v3...}}"
     },
     "DessinGradue{}{}{}": {
-      "snippet": "DessinGradue{${1:a1/a2/a3,${4:...}}{${2:b1/b2/b3},...}}{${3:c1§c2§...}}"
+      "snippet": "DessinGradue{${1:a1/a2/a3,...}}{${2:b1/b2/b3,...}}{${3:c1§c2§...}}"
     },
     "DessinGradue[]{}{}{}": {
-      "snippet": "DessinGradue[${4:clés}]{${1:a1/a2/a3,${5:...}}{${2:b1/b2/b3},...}}{${3:c1§c2§...}}"
+      "snippet": "DessinGradue[${4:clés}]{${1:a1/a2/a3,...}}{${2:b1/b2/b3,...}}{${3:c1§c2§...}}"
     },
     "Colorilude{}": {
       "snippet": "Colorilude{${1:a11 b11 a12 b12\\\\a21 b21...}}"
@@ -781,16 +781,16 @@
       "snippet": "QuisuisjeCodePerso[${3:Solution}]{${1:n1 n2...}}{${2:l1 l2...}}"
     },
     "MotsEmpiles{}": {
-      "snippet": "MotsEmpiles{${1:c1/mot1,${2:c2/mot2},...}}"
+      "snippet": "MotsEmpiles{${1:c1/mot1,c2/mot2,...}}"
     },
     "MotsEmpiles[]{}": {
-      "snippet": "MotsEmpiles[${2:clés}]{${1:c1/mot1,${3:c2/mot2},...}}"
+      "snippet": "MotsEmpiles[${2:clés}]{${1:c1/mot1,c2/mot2,...}}"
     },
     "MotsCroises{}": {
-      "snippet": "MotsCroises{${1:m11/q11,${2:m12/q12...§m21/q21},m22/q22...}}"
+      "snippet": "MotsCroises{${1:m11/q11,m12/q12...§m21/q21,m22/q22...}}"
     },
     "MotsCroises[]{}": {
-      "snippet": "MotsCroises[${2:clés}]{${1:m11/q11,${3:m12/q12...§m21/q21},m22/q22...}}"
+      "snippet": "MotsCroises[${2:clés}]{${1:m11/q11,m12/q12...§m21/q21,m22/q22...}}"
     },
     "MotsCodes{}": {
       "snippet": "MotsCodes{${1:énoncé1/lettre1§énoncé2/lettre2§...}}"
@@ -805,10 +805,10 @@
       "snippet": "MotsCodesTableau[${3:clés}]{${1:r11/r12...,r21/r22...}}{${2:texte à trouver}}"
     },
     "Mosaique{}": {
-      "snippet": "Mosaique{${1:mosa1/rep1,${2:mosa2/rep2},...}}"
+      "snippet": "Mosaique{${1:mosa1/rep1,mosa2/rep2,...}}"
     },
     "Mosaique[]{}": {
-      "snippet": "Mosaique[${2:clés}]{${1:mosa1/rep1,${3:mosa2/rep2},...}}"
+      "snippet": "Mosaique[${2:clés}]{${1:mosa1/rep1,mosa2/rep2,...}}"
     },
     "DessineMosaique{}": {
       "snippet": "DessineMosaique{${1:type}}"
@@ -947,10 +947,10 @@
       "snippet": "Futoshiki[${2:clés}]{${1:description de jeu}}"
     },
     "Garam{}": {
-      "snippet": "Garam{${1:c11/o11/O11,${2:c12/o12/O12},...}}"
+      "snippet": "Garam{${1:c11/o11/O11,c12/o12/O12,...}}"
     },
     "Garam[]{}": {
-      "snippet": "Garam[${2:clés}]{${1:c11/o11/O11,${3:c12/o12/O12},...}}"
+      "snippet": "Garam[${2:clés}]{${1:c11/o11/O11,c12/o12/O12,...}}"
     },
     "SquarO": {},
     "SquarO[]": {
diff --git a/dev/packages/ProfLycee.json b/dev/packages/ProfLycee.json
index db0aaae99..158e7d771 100644
--- a/dev/packages/ProfLycee.json
+++ b/dev/packages/ProfLycee.json
@@ -258,12 +258,6 @@
     "FenetreSimpleTikz<>{}<>{}": {
       "snippet": "FenetreSimpleTikz<${3:opt axe Ox}>{${1:liste valx}}<${4:opt axe Oy}>{${2:liste valy}}"
     },
-    "FenetreSimpleTikz()<>{}<>{}": {
-      "snippet": "FenetreSimpleTikz(${5:opt axes})<${3:opt axe Ox}>{${1:liste valx}}<${4:opt axe Oy}>{${2:liste valy}}"
-    },
-    "FenetreSimpleTikz[]()<>{}<>{}": {
-      "snippet": "FenetreSimpleTikz[${3:opt}](${6:opt axes})<${4:opt axe Ox}>{${1:liste valx}}<${5:opt axe Oy}>{${2:liste valy}}"
-    },
     "OrigineTikz": {},
     "OrigineTikz[]": {
       "snippet": "OrigineTikz[${1:options}]",
@@ -591,10 +585,10 @@
       "snippet": "CalculCnp{${1:p}}{${2:n}}"
     },
     "FonctionRepartTikz{}": {
-      "snippet": "FonctionRepartTikz{${1:liste des probas,${2:borneinf},bornesup}}"
+      "snippet": "FonctionRepartTikz{${1:liste des probas,borneinf,bornesup}}"
     },
     "FonctionRepartTikz[]{}": {
-      "snippet": "FonctionRepartTikz[${2:option}]{${1:liste des probas,${3:borneinf},bornesup}}"
+      "snippet": "FonctionRepartTikz[${2:option}]{${1:liste des probas,borneinf,bornesup}}"
     },
     "ConversionDecBin{}": {
       "snippet": "ConversionDecBin{${1:nombre}}"
@@ -787,74 +781,12 @@
       "keyvalindex": 34,
       "keyvalpos": 0
     },
-    "AffPoint()": {
-      "snippet": "AffPoint(${1:liste de coordonnées})"
-    },
-    "AffPoint[]()": {
-      "snippet": "AffPoint[${1:options}](${2:liste de coordonnées})"
-    },
-    "AffVecteur()": {
-      "snippet": "AffVecteur(${1:liste de coordonnées})"
-    },
-    "AffVecteur<>()": {
-      "snippet": "AffVecteur<${1:options nicematrix}>(${2:liste de coordonnées})"
-    },
-    "AffVecteur[]()": {
-      "snippet": "AffVecteur[${1:options}](${2:liste de coordonnées})"
-    },
-    "AffVecteur[]<>()": {
-      "snippet": "AffVecteur[${1:options}]<${2:options nicematrix}>(${3:liste de coordonnées})"
-    },
-    "TrouveEqCartPlan()()": {
-      "snippet": "TrouveEqCartPlan(${1:vecteur normal})(${2:point})"
-    },
-    "TrouveEqCartPlan()()()": {
-      "snippet": "TrouveEqCartPlan(${1:vecteur dir1})(${2:vecteur dir2})(${3:point})"
-    },
-    "TrouveEqCartPlan[]()()": {
-      "snippet": "TrouveEqCartPlan[${1:options}](${2:vecteur normal})(${3:point})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "TrouveEqCartPlan[]()()()": {
-      "snippet": "TrouveEqCartPlan[${1:options}](${2:vecteur dir1})(${3:vecteur dir2})(${4:point})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "TrouveEqParamDroite()()": {
-      "snippet": "TrouveEqParamDroite(${1:vecteur directeur})(${2:point})"
-    },
-    "TrouveEqParamDroite[]()()": {
-      "snippet": "TrouveEqParamDroite[${1:options}](${2:vecteur directeur})(${3:point})",
-      "keyvalindex": 36,
-      "keyvalpos": 0
-    },
-    "TrouveEqCartDroite()()": {
-      "snippet": "TrouveEqCartDroite(${1:vecteur})(${2:point})"
-    },
-    "TrouveEqCartDroite[]()()": {
-      "snippet": "TrouveEqCartDroite[${1:options}](${2:vecteur})(${3:point})",
-      "keyvalindex": 37,
-      "keyvalpos": 0
-    },
-    "TrouveNorme()": {
-      "snippet": "TrouveNorme(${1:vecteur})"
-    },
-    "TrouveNorme()()": {
-      "snippet": "TrouveNorme(${1:point1})(${2:point2})"
-    },
-    "TrouveDistancePtPlan()()()": {
-      "snippet": "TrouveDistancePtPlan(${1:point})(${2:vec normal du plan})(${3:point du plan})"
-    },
-    "TrouveDistancePtPlan()()": {
-      "snippet": "TrouveDistancePtPlan(${1:point})(${2:équation cartésienne})"
-    },
     "EcritureTrinome{}{}{}": {
       "snippet": "EcritureTrinome{${1:a}}{${2:b}}{${3:c}}"
     },
     "EcritureTrinome[]{}{}{}": {
       "snippet": "EcritureTrinome[${4:options}]{${1:a}}{${2:b}}{${3:c}}",
-      "keyvalindex": 38,
+      "keyvalindex": 35,
       "keyvalpos": 0
     },
     "SimplificationRacine{}": {
@@ -865,23 +797,7 @@
     },
     "MesurePrincipale[]{}": {
       "snippet": "MesurePrincipale[${2:options}]{${1:angle}}",
-      "keyvalindex": 39,
-      "keyvalpos": 0
-    },
-    "LigneTrigo{}()": {
-      "snippet": "LigneTrigo{${1:cos|sin|tan}}(${2:angle})"
-    },
-    "LigneTrigo[]{}()": {
-      "snippet": "LigneTrigo[${2:options}]{${1:cos|sin|tan}}(${3:angle})",
-      "keyvalindex": 40,
-      "keyvalpos": 0
-    },
-    "LigneTrigo*{}()": {
-      "snippet": "LigneTrigo*{${1:cos|sin|tan}}(${2:angle})"
-    },
-    "LigneTrigo*[]{}()": {
-      "snippet": "LigneTrigo*[${2:options}]{${1:cos|sin|tan}}(${3:angle})",
-      "keyvalindex": 40,
+      "keyvalindex": 36,
       "keyvalpos": 0
     },
     "SudoMaths{}": {
@@ -889,13 +805,13 @@
     },
     "SudoMaths[]{}": {
       "snippet": "SudoMaths[${2:options}]{${1:liste}}",
-      "keyvalindex": 41,
+      "keyvalindex": 37,
       "keyvalpos": 0
     },
     "FractaleTikz": {},
     "FractaleTikz[]": {
       "snippet": "FractaleTikz[${1:options}]",
-      "keyvalindex": 42,
+      "keyvalindex": 38,
       "keyvalpos": 0
     },
     "FractaleTikz<>": {
@@ -903,13 +819,13 @@
     },
     "FractaleTikz[]<>": {
       "snippet": "FractaleTikz[${1:options}]<${2:TikZ options}>",
-      "keyvalindex": 42,
+      "keyvalindex": 38,
       "keyvalpos": 0
     },
     "FractaleTikz*": {},
     "FractaleTikz*[]": {
       "snippet": "FractaleTikz*[${1:options}]",
-      "keyvalindex": 42,
+      "keyvalindex": 38,
       "keyvalpos": 0
     },
     "FractaleTikz*<>": {
@@ -917,7 +833,7 @@
     },
     "FractaleTikz*[]<>": {
       "snippet": "FractaleTikz*[${1:options}]<${2:TikZ options}>",
-      "keyvalindex": 42,
+      "keyvalindex": 38,
       "keyvalpos": 0
     },
     "EtapesFloconKoch{}": {
@@ -925,7 +841,7 @@
     },
     "EtapesFloconKoch[]{}": {
       "snippet": "EtapesFloconKoch[${2:options}]{${1:étapes}}",
-      "keyvalindex": 42,
+      "keyvalindex": 38,
       "keyvalpos": 0
     },
     "Arrondi{}": {
@@ -972,7 +888,7 @@
     },
     "IntervalleFF[]{}{}": {
       "snippet": "IntervalleFF[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 43,
+      "keyvalindex": 39,
       "keyvalpos": 0
     },
     "IntervalleOF{}{}": {
@@ -980,7 +896,7 @@
     },
     "IntervalleOF[]{}{}": {
       "snippet": "IntervalleOF[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 43,
+      "keyvalindex": 39,
       "keyvalpos": 0
     },
     "IntervalleFO{}{}": {
@@ -988,7 +904,7 @@
     },
     "IntervalleFO[]{}{}": {
       "snippet": "IntervalleFO[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 43,
+      "keyvalindex": 39,
       "keyvalpos": 0
     },
     "IntervalleOO{}{}": {
@@ -996,7 +912,7 @@
     },
     "IntervalleOO[]{}{}": {
       "snippet": "IntervalleOO[${3:options}]{${1:arg1}}{${2:arg2}}",
-      "keyvalindex": 43,
+      "keyvalindex": 39,
       "keyvalpos": 0
     },
     "Vecteur{}": {
@@ -1059,7 +975,7 @@
     },
     "Modulo[]{}": {
       "snippet": "Modulo[${2:options}]{${1:arg}}",
-      "keyvalindex": 44,
+      "keyvalindex": 40,
       "keyvalpos": 0
     },
     "Modulo*{}": {
@@ -1067,7 +983,7 @@
     },
     "Modulo*[]{}": {
       "snippet": "Modulo*[${2:options}]{${1:arg}}",
-      "keyvalindex": 44,
+      "keyvalindex": 40,
       "keyvalpos": 0
     },
     "Suite{}": {
@@ -1657,7 +1573,7 @@
     "CodePythonLst[]{}": {
       "name": "CodePythonLst",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePythonLst*{}": {
@@ -1667,7 +1583,7 @@
     "CodePythonLst*[]{}": {
       "name": "CodePythonLst",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePythonLstAlt{}": {
@@ -1677,7 +1593,7 @@
     "CodePythonLstAlt[]{}": {
       "name": "CodePythonLstAlt",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePythonLstAlt*{}": {
@@ -1687,7 +1603,7 @@
     "CodePythonLstAlt*[]{}": {
       "name": "CodePythonLstAlt",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePiton{}": {
@@ -1701,13 +1617,13 @@
     "CodePiton[]{}": {
       "name": "CodePiton",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 46,
+      "keyvalindex": 42,
       "keyvalpos": 0
     },
     "CodePiton[]{}<>": {
       "name": "CodePiton",
       "snippet": "[${2:options}]{${1:tcolorbox options}}<${3:line options}>",
-      "keyvalindex": 46,
+      "keyvalindex": 42,
       "keyvalpos": 0
     },
     "ConsolePiton{}": {
@@ -1725,7 +1641,7 @@
     "CodePythonMinted[]{}": {
       "name": "CodePythonMinted",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePythonMinted*{}": {
@@ -1735,7 +1651,7 @@
     "CodePythonMinted*[]{}": {
       "name": "CodePythonMinted",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePythonMintedAlt{}": {
@@ -1745,7 +1661,7 @@
     "CodePythonMintedAlt[]{}": {
       "name": "CodePythonMintedAlt",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "CodePythonMintedAlt*{}": {
@@ -1755,7 +1671,7 @@
     "CodePythonMintedAlt*[]{}": {
       "name": "CodePythonMintedAlt",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 45,
+      "keyvalindex": 41,
       "keyvalpos": 0
     },
     "PseudoCode{}": {
@@ -1765,7 +1681,7 @@
     "PseudoCode[]{}": {
       "name": "PseudoCode",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 47,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "PseudoCode*{}": {
@@ -1775,7 +1691,7 @@
     "PseudoCode*[]{}": {
       "name": "PseudoCode",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 47,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "PseudoCodeAlt{}": {
@@ -1785,7 +1701,7 @@
     "PseudoCodeAlt[]{}": {
       "name": "PseudoCodeAlt",
       "snippet": "[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 47,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "PseudoCodeAlt*{}": {
@@ -1795,7 +1711,7 @@
     "PseudoCodeAlt*[]{}": {
       "name": "PseudoCodeAlt",
       "snippet": "*[${2:options}]{${1:tcolorbox options}}",
-      "keyvalindex": 47,
+      "keyvalindex": 43,
       "keyvalpos": 0
     },
     "TerminalWin{}": {
@@ -1847,7 +1763,7 @@
     "EnvSudoMaths[]{}": {
       "name": "EnvSudoMaths",
       "snippet": "[${2:options}]{${1:grille}}",
-      "keyvalindex": 41,
+      "keyvalindex": 37,
       "keyvalpos": 0
     },
     "CodePythontex{}": {
@@ -1857,7 +1773,7 @@
     "CodePythontex[]{}": {
       "name": "CodePythontex",
       "snippet": "[${2:options}]{${1:}}",
-      "keyvalindex": 48,
+      "keyvalindex": 44,
       "keyvalpos": 0
     },
     "CodePythontexAlt{}": {
@@ -1867,7 +1783,7 @@
     "CodePythontexAlt[]{}": {
       "name": "CodePythontexAlt",
       "snippet": "[${2:options}]{${1:}}",
-      "keyvalindex": 48,
+      "keyvalindex": 44,
       "keyvalpos": 0
     },
     "ConsolePythontex{}": {
@@ -1877,7 +1793,7 @@
     "ConsolePythontex[]{}": {
       "name": "ConsolePythontex",
       "snippet": "[${2:options}]{${1:}}",
-      "keyvalindex": 49,
+      "keyvalindex": 45,
       "keyvalpos": 0
     },
     "pythont": {},
@@ -2240,23 +2156,6 @@
       "Methode=",
       "NbSubDiv=${1:nombre}"
     ],
-    [
-      "OptionCoeffs=${1:option}",
-      "SimplifCoeffs",
-      "Facteur=${1:facteur}"
-    ],
-    [
-      "OptionCoeffs=${1:option}",
-      "Reel=${1:symbole}",
-      "Oppose",
-      "Rgras"
-    ],
-    [
-      "OptionCoeffs=${1:option}",
-      "SimplifCoeffs",
-      "Facteur=${1:facteur}",
-      "VectDirecteur"
-    ],
     [
       "Alea",
       "Anegatif"
@@ -2266,10 +2165,6 @@
       "Crochets",
       "Brut"
     ],
-    [
-      "d",
-      "Etapes"
-    ],
     [
       "Epaisseurg=",
       "Epaisseur=",
diff --git a/dev/packages/ProfSio.json b/dev/packages/ProfSio.json
index 031be3dff..8603a945a 100644
--- a/dev/packages/ProfSio.json
+++ b/dev/packages/ProfSio.json
@@ -20,15 +20,6 @@
     "nicematrix": []
   },
   "macros": {
-    "MPMPlaceNotice()": {
-      "snippet": "MPMPlaceNotice(${1:coordonnées})"
-    },
-    "MPMPlaceNotice*()": {
-      "snippet": "MPMPlaceNotice*(${1:coordonnées})"
-    },
-    "MPMPlaceTache()()()": {
-      "snippet": "MPMPlaceTache(${1:coordonnées})(${2:Tâche})(${3:Dates})"
-    },
     "MPMPlaceTaches{}": {
       "snippet": "MPMPlaceTaches{${1:(${2:coordA})(${3:TâcheA})(${4:DatesA}) / (${5:coordB})(${6:TâcheB})(${7:DatesB}) / ...}}"
     },
@@ -41,10 +32,10 @@
       "keyvalpos": 0
     },
     "MPMPlaceDurees{}": {
-      "snippet": "MPMPlaceDurees{${1:TâcheA>TâcheB,${2:durée / TâcheC>TâcheD},durée}}"
+      "snippet": "MPMPlaceDurees{${1:TâcheA>TâcheB,durée / TâcheC>TâcheD,durée}}"
     },
     "MPMPlaceDurees[]{}": {
-      "snippet": "MPMPlaceDurees[${2:options}]{${1:TâcheA>TâcheB,${3:durée / TâcheC>TâcheD},durée}}",
+      "snippet": "MPMPlaceDurees[${2:options}]{${1:TâcheA>TâcheB,durée / TâcheC>TâcheD,durée}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/ResolSysteme.json b/dev/packages/ResolSysteme.json
index 48310f188..645a85388 100644
--- a/dev/packages/ResolSysteme.json
+++ b/dev/packages/ResolSysteme.json
@@ -10,202 +10,6 @@
     "xstring": []
   },
   "macros": {
-    "ProduitMatricesPY()()": {
-      "snippet": "ProduitMatricesPY(${1:matriceA})(${2:matriceB})",
-      "option": "pyluatex"
-    },
-    "ProduitMatricesPY<>()()": {
-      "snippet": "ProduitMatricesPY<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "ProduitMatricesPY[]()()": {
-      "snippet": "ProduitMatricesPY[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "ProduitMatricesPY[]<>()()": {
-      "snippet": "ProduitMatricesPY[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
-      "option": "pyluatex"
-    },
-    "ProduitMatricesPY*()()": {
-      "snippet": "ProduitMatricesPY*(${1:matriceA})(${2:matriceB})",
-      "option": "pyluatex"
-    },
-    "ProduitMatricesPY*<>()()": {
-      "snippet": "ProduitMatricesPY*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "ProduitMatricesPY*[]()()": {
-      "snippet": "ProduitMatricesPY*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "ProduitMatricesPY*[]<>()()": {
-      "snippet": "ProduitMatricesPY*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
-      "option": "pyluatex"
-    },
-    "MatricePuissancePY()()": {
-      "snippet": "MatricePuissancePY(${1:matrice})(${2:puissance})",
-      "option": "pyluatex"
-    },
-    "MatricePuissancePY<>()()": {
-      "snippet": "MatricePuissancePY<${1:options nicematrix}>(${2:matrice})(${3:puissance})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "MatricePuissancePY[]()()": {
-      "snippet": "MatricePuissancePY[${1:option de formatage}](${2:matrice})(${3:puissance})",
-      "option": "pyluatex"
-    },
-    "MatricePuissancePY[]<>()()": {
-      "snippet": "MatricePuissancePY[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})(${4:puissance})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "MatricePuissancePY*()()": {
-      "snippet": "MatricePuissancePY*(${1:matrice})(${2:puissance})",
-      "option": "pyluatex"
-    },
-    "MatricePuissancePY*<>()()": {
-      "snippet": "MatricePuissancePY*<${1:options nicematrix}>(${2:matrice})(${3:puissance})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "MatricePuissancePY*[]()()": {
-      "snippet": "MatricePuissancePY*[${1:option de formatage}](${2:matrice})(${3:puissance})",
-      "option": "pyluatex"
-    },
-    "MatricePuissancePY*[]<>()()": {
-      "snippet": "MatricePuissancePY*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})(${4:puissance})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "DetMatricePY()": {
-      "snippet": "DetMatricePY(${1:matrice})",
-      "option": "pyluatex"
-    },
-    "DetMatricePY[]()": {
-      "snippet": "DetMatricePY[${1:option de formatage}](${2:matrice})",
-      "option": "pyluatex"
-    },
-    "DetMatricePY*()": {
-      "snippet": "DetMatricePY*(${1:matrice})",
-      "option": "pyluatex"
-    },
-    "DetMatricePY*[]()": {
-      "snippet": "DetMatricePY*[${1:option de formatage}](${2:matrice})",
-      "option": "pyluatex"
-    },
-    "MatriceInversePY()": {
-      "snippet": "MatriceInversePY(${1:matrice})",
-      "option": "pyluatex"
-    },
-    "MatriceInversePY<>()": {
-      "snippet": "MatriceInversePY<${1:options nicematrix}>(${2:matrice})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "MatriceInversePY[]()": {
-      "snippet": "MatriceInversePY[${1:option de formatage}](${2:matrice})",
-      "option": "pyluatex"
-    },
-    "MatriceInversePY[]<>()": {
-      "snippet": "MatriceInversePY[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "MatriceInversePY*()": {
-      "snippet": "MatriceInversePY*(${1:matrice})",
-      "option": "pyluatex"
-    },
-    "MatriceInversePY*<>()": {
-      "snippet": "MatriceInversePY*<${1:options nicematrix}>(${2:matrice})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "MatriceInversePY*[]()": {
-      "snippet": "MatriceInversePY*[${1:option de formatage}](${2:matrice})",
-      "option": "pyluatex"
-    },
-    "MatriceInversePY*[]<>()": {
-      "snippet": "MatriceInversePY*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "EtatProbPY()()()": {
-      "snippet": "EtatProbPY(${1:état init})(${2:mat de trans})(${3:étape})",
-      "option": "pyluatex"
-    },
-    "EtatProbPY<>()()()": {
-      "snippet": "EtatProbPY<${1:options nicematrix}>(${2:état init})(${3:mat de trans})(${4:étape})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "EtatProbPY[]()()()": {
-      "snippet": "EtatProbPY[${1:option de formatage}](${2:état init})(${3:mat de trans})(${4:étape})",
-      "option": "pyluatex"
-    },
-    "EtatProbPY[]<>()()()": {
-      "snippet": "EtatProbPY[${1:option de formatage}]<${2:options nicematrix}>(${3:état init})(${4:mat de trans})(${5:étape})",
-      "option": "pyluatex",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "SolutionSystemePY()()": {
-      "snippet": "SolutionSystemePY(${1:matriceA})(${2:matriceB})",
-      "option": "pyluatex"
-    },
-    "SolutionSystemePY<>()()": {
-      "snippet": "SolutionSystemePY<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "SolutionSystemePY[]()()": {
-      "snippet": "SolutionSystemePY[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "SolutionSystemePY[]<>()()": {
-      "snippet": "SolutionSystemePY[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
-      "option": "pyluatex"
-    },
-    "SolutionSystemePY*()()": {
-      "snippet": "SolutionSystemePY*(${1:matriceA})(${2:matriceB})",
-      "option": "pyluatex"
-    },
-    "SolutionSystemePY*<>()()": {
-      "snippet": "SolutionSystemePY*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "SolutionSystemePY*[]()()": {
-      "snippet": "SolutionSystemePY*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})",
-      "option": "pyluatex"
-    },
-    "SolutionSystemePY*[]<>()()": {
-      "snippet": "SolutionSystemePY*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})",
-      "option": "pyluatex"
-    },
-    "EtatStablePY()": {
-      "snippet": "EtatStablePY(${1:matrice})",
-      "option": "pyluatex"
-    },
-    "EtatStablePY<>()": {
-      "snippet": "EtatStablePY<${1:opts nicematrix}>(${2:matrice})",
-      "option": "pyluatex"
-    },
-    "EtatStablePY[]()": {
-      "snippet": "EtatStablePY[${1:opt de formatage}](${2:matrice})",
-      "option": "pyluatex"
-    },
-    "EtatStablePY[]<>()": {
-      "snippet": "EtatStablePY[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matrice})",
-      "option": "pyluatex"
-    },
     "ConvVersFrac{}": {
       "snippet": "ConvVersFrac{${1:calcul}}"
     },
@@ -217,183 +21,11 @@
     },
     "ConvVersFrac*[]{}": {
       "snippet": "ConvVersFrac*[${2:option de formatage}]{${1:calcul}}"
-    },
-    "AffMatrice()": {
-      "snippet": "AffMatrice(${1:matrice})"
-    },
-    "AffMatrice[]()": {
-      "snippet": "AffMatrice[${1:option de formatage}](${2:matrice})"
-    },
-    "AffMatrice*()": {
-      "snippet": "AffMatrice*(${1:matrice})"
-    },
-    "AffMatrice*[]()": {
-      "snippet": "AffMatrice*[${1:option de formatage}](${2:matrice})"
-    },
-    "ProduitMatrices()()": {
-      "snippet": "ProduitMatrices(${1:matriceA})(${2:matriceB})"
-    },
-    "ProduitMatrices<>()()": {
-      "snippet": "ProduitMatrices<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
-    },
-    "ProduitMatrices[]()()": {
-      "snippet": "ProduitMatrices[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
-    },
-    "ProduitMatrices[]<>()()": {
-      "snippet": "ProduitMatrices[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
-    },
-    "ProduitMatrices*()()": {
-      "snippet": "ProduitMatrices*(${1:matriceA})(${2:matriceB})"
-    },
-    "ProduitMatrices*<>()()": {
-      "snippet": "ProduitMatrices*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
-    },
-    "ProduitMatrices*[]()()": {
-      "snippet": "ProduitMatrices*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
-    },
-    "ProduitMatrices*[]<>()()": {
-      "snippet": "ProduitMatrices*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
-    },
-    "CarreMatrice()": {
-      "snippet": "CarreMatrice(${1:matrice})"
-    },
-    "CarreMatrice<>()": {
-      "snippet": "CarreMatrice<${1:options nicematrix}>(${2:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "CarreMatrice[]()": {
-      "snippet": "CarreMatrice[${1:option de formatage}](${2:matrice})"
-    },
-    "CarreMatrice[]<>()": {
-      "snippet": "CarreMatrice[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "CarreMatrice*()": {
-      "snippet": "CarreMatrice*(${1:matrice})"
-    },
-    "CarreMatrice*<>()": {
-      "snippet": "CarreMatrice*<${1:options nicematrix}>(${2:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "CarreMatrice*[]()": {
-      "snippet": "CarreMatrice*[${1:option de formatage}](${2:matrice})"
-    },
-    "CarreMatrice*[]<>()": {
-      "snippet": "CarreMatrice*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "DetMatrice()": {
-      "snippet": "DetMatrice(${1:matrice})"
-    },
-    "DetMatrice[]()": {
-      "snippet": "DetMatrice[${1:option de formatage}](${2:matrice})"
-    },
-    "DetMatrice*()": {
-      "snippet": "DetMatrice*(${1:matrice})"
-    },
-    "DetMatrice*[]()": {
-      "snippet": "DetMatrice*[${1:option de formatage}](${2:matrice})"
-    },
-    "MatriceInverse()": {
-      "snippet": "MatriceInverse(${1:matrice})"
-    },
-    "MatriceInverse<>()": {
-      "snippet": "MatriceInverse<${1:options nicematrix}>(${2:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "MatriceInverse[]()": {
-      "snippet": "MatriceInverse[${1:option de formatage}](${2:matrice})"
-    },
-    "MatriceInverse[]<>()": {
-      "snippet": "MatriceInverse[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "MatriceInverse*()": {
-      "snippet": "MatriceInverse*(${1:matrice})"
-    },
-    "MatriceInverse*<>()": {
-      "snippet": "MatriceInverse*<${1:options nicematrix}>(${2:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "MatriceInverse*[]()": {
-      "snippet": "MatriceInverse*[${1:option de formatage}](${2:matrice})"
-    },
-    "MatriceInverse*[]<>()": {
-      "snippet": "MatriceInverse*[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice})",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "AffEtatProb()": {
-      "snippet": "AffEtatProb(${1:matrice ligne})"
-    },
-    "AffEtatProb<>()": {
-      "snippet": "AffEtatProb<${1:options nicematrix}>(${2:matrice ligne})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "AffEtatProb[]()": {
-      "snippet": "AffEtatProb[${1:option de formatage}](${2:matrice ligne})"
-    },
-    "AffEtatProb[]<>()": {
-      "snippet": "AffEtatProb[${1:option de formatage}]<${2:options nicematrix}>(${3:matrice ligne})",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "SolutionSysteme()()": {
-      "snippet": "SolutionSysteme(${1:matriceA})(${2:matriceB})"
-    },
-    "SolutionSysteme<>()()": {
-      "snippet": "SolutionSysteme<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
-    },
-    "SolutionSysteme[]()()": {
-      "snippet": "SolutionSysteme[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
-    },
-    "SolutionSysteme[]<>()()": {
-      "snippet": "SolutionSysteme[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
-    },
-    "SolutionSysteme*()()": {
-      "snippet": "SolutionSysteme*(${1:matriceA})(${2:matriceB})"
-    },
-    "SolutionSysteme*<>()()": {
-      "snippet": "SolutionSysteme*<${1:opts nicematrix}>(${2:matriceA})(${3:matriceB})"
-    },
-    "SolutionSysteme*[]()()": {
-      "snippet": "SolutionSysteme*[${1:opt de formatage}](${2:matriceA})(${3:matriceB})"
-    },
-    "SolutionSysteme*[]<>()()": {
-      "snippet": "SolutionSysteme*[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matriceA})(${4:matriceB})"
-    },
-    "EtatStable()": {
-      "snippet": "EtatStable(${1:matrice})"
-    },
-    "EtatStable<>()": {
-      "snippet": "EtatStable<${1:opts nicematrix}>(${2:matrice})"
-    },
-    "EtatStable[]()": {
-      "snippet": "EtatStable[${1:opt de formatage}](${2:matrice})"
-    },
-    "EtatStable[]<>()": {
-      "snippet": "EtatStable[${1:opt de formatage}]<${2:opts nicematrix}>(${3:matrice})"
     }
   },
   "envs": {},
   "options": [
     "pyluatex"
   ],
-  "keyvals": [
-    [
-      "t",
-      "d",
-      "n",
-      "dec",
-      "dec=${1:k}"
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/TangramTikz.json b/dev/packages/TangramTikz.json
index a8f66d158..c728939f0 100644
--- a/dev/packages/TangramTikz.json
+++ b/dev/packages/TangramTikz.json
@@ -24,16 +24,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "PieceTangram[](){}": {
-      "snippet": "PieceTangram[${2:options}](${3:x},${4:y}){${1:piece name}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "PieceTangram[]<>(){}": {
-      "snippet": "PieceTangram[${2:options}]<${3:TikZ options}>(${4:x},${5:y}){${1:piece name}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "TangramSquare": {},
     "TangramSquare[]": {
       "snippet": "TangramSquare[${1:TikZ options}]"
@@ -361,12 +351,6 @@
       "ColorList={${1:color1,color2,...}}",
       "ListeCouleurs={${1:couleur1,couleur2,...}}",
       "Sep="
-    ],
-    [
-      "TangPuzz",
-      "TangPuzz={${1:color}}",
-      "TangSol",
-      "TangSol={${1:color}}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/WriteOnGrid.json b/dev/packages/WriteOnGrid.json
index 9665cf629..f1003d8ce 100644
--- a/dev/packages/WriteOnGrid.json
+++ b/dev/packages/WriteOnGrid.json
@@ -66,11 +66,6 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
-    "LignePapierSeyes[]<>(){}": {
-      "snippet": "LignePapierSeyes[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "CadreNoteSeyes{}": {
       "snippet": "CadreNoteSeyes{${1:numligne}}"
     },
@@ -85,11 +80,6 @@
       "keyvalindex": 3,
       "keyvalpos": 0
     },
-    "ParagraphePapierSeyes[]<>(){}": {
-      "snippet": "ParagraphePapierSeyes[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
     "LignePapierCinqCinq{}": {
       "snippet": "LignePapierCinqCinq{${1:text}}"
     },
@@ -98,11 +88,6 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
-    "LignePapierCinqCinq[]<>(){}": {
-      "snippet": "LignePapierCinqCinq[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "CadreNoteCinqCinq{}": {
       "snippet": "CadreNoteCinqCinq{${1:numligne}}"
     },
@@ -117,11 +102,6 @@
       "keyvalindex": 3,
       "keyvalpos": 0
     },
-    "ParagraphePapierCinqCinq[]<>(){}": {
-      "snippet": "ParagraphePapierCinqCinq[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
     "LignePapierRuled{}": {
       "snippet": "LignePapierRuled{${1:text}}"
     },
@@ -130,11 +110,6 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
-    "LignePapierRuled[]<>(){}": {
-      "snippet": "LignePapierRuled[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "CadreNoteRuled{}": {
       "snippet": "CadreNoteRuled{${1:numligne}}"
     },
@@ -149,11 +124,6 @@
       "keyvalindex": 3,
       "keyvalpos": 0
     },
-    "ParagraphePapierRuled[]<>(){}": {
-      "snippet": "ParagraphePapierRuled[${2:options}]<${3:alignement}>(${4:ajustement}){${1:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
     "CCFullCoul": {},
     "CCFullCoulM": {},
     "CCLigne": {},
diff --git a/dev/packages/abspos.json b/dev/packages/abspos.json
deleted file mode 100644
index b89e1992d..000000000
--- a/dev/packages/abspos.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "includes": {
-    "atbegshi": []
-  },
-  "macros": {
-    "absposset{}": {
-      "snippet": "absposset{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "absput{}": {
-      "snippet": "absput{${1:contents}}"
-    },
-    "absput[]{}": {
-      "snippet": "absput[${2:options}]{${1:contents}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "angle=${1:degrees}",
-      "h=",
-      "pg=${1:page-coffin}",
-      "pg-h=",
-      "pg-v=",
-      "scale=${1:factor}",
-      "v=",
-      "width=",
-      "x=",
-      "y="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/abstract.json b/dev/packages/abstract.json
deleted file mode 100644
index e69e15a81..000000000
--- a/dev/packages/abstract.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "saythanks": {},
-    "abstractnamefont": {},
-    "abstracttextfont": {},
-    "abstitlestyle": {},
-    "absleftindent": {},
-    "absrightindent": {},
-    "absparindent": {},
-    "absparsep": {},
-    "abslabeldelim{}": {
-      "snippet": "abslabeldelim{${1:text}}"
-    },
-    "absnamepos": {},
-    "abstitleskip": {
-      "snippet": "abstitleskip "
-    },
-    "appendiargdef{}{}": {
-      "snippet": "appendiargdef{${1:macro}}{${2:code}}"
-    }
-  },
-  "envs": {
-    "onecolabstract": {}
-  },
-  "options": [
-    "original",
-    "addtotoc",
-    "number",
-    "runin",
-    "style"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/accsupp.json b/dev/packages/accsupp.json
deleted file mode 100644
index e1ad71456..000000000
--- a/dev/packages/accsupp.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "includes": {
-    "pdfescape": [],
-    "iftex": [],
-    "kvoptions": []
-  },
-  "macros": {
-    "BeginAccSupp{}": {
-      "snippet": "BeginAccSupp{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "AccSuppSetup{}": {
-      "snippet": "AccSuppSetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "EndAccSupp{}": {
-      "snippet": "EndAccSupp{${1:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "ActualTextDriverDefault": {}
-  },
-  "envs": {},
-  "options": [
-    "pdftex",
-    "luatex",
-    "dvips",
-    "dvipdfm"
-  ],
-  "keyvals": [
-    [
-      "ActualText=${1:text}",
-      "Alt=${1:text}",
-      "E=${1:text}",
-      "Lang=${1:language}",
-      "method=",
-      "unicode",
-      "space",
-      "spacefont=${1:font name}",
-      "spacechar=${1:slot}",
-      "pdfliteral=${1:keyword}"
-    ],
-    [
-      "pdfliteral=${1:keyword}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/achemso.json b/dev/packages/achemso.json
deleted file mode 100644
index 2d1efea52..000000000
--- a/dev/packages/achemso.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "includes": {
-    "xkeyval": [],
-    "natbib": [],
-    "mciteplus": [],
-    "natmove": [],
-    "xcolor": [
-      "journal=orlef7"
-    ]
-  },
-  "macros": {
-    "latin{}": {
-      "snippet": "latin{${1:text}}"
-    },
-    "bibnote{}": {
-      "snippet": "bibnote{${1:text}}"
-    },
-    "bibnotemark": {},
-    "bibnotetext{}": {
-      "snippet": "bibnotetext{${1:text}}"
-    },
-    "printbibnotes": {},
-    "thebibnote": {}
-  },
-  "envs": {},
-  "options": [
-    "abbreviations",
-    "articletitle",
-    "biblabel=",
-    "biochem",
-    "biochemistry",
-    "chaptertitle",
-    "doi",
-    "email",
-    "etalmode=",
-    "hyperref",
-    "journal=",
-    "keywords",
-    "layout=",
-    "manuscript=",
-    "maxauthors=${1:number}",
-    "super",
-    "usetitle"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/acro.json b/dev/packages/acro.json
deleted file mode 100644
index 91d96cb2f..000000000
--- a/dev/packages/acro.json
+++ /dev/null
@@ -1,934 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": [],
-    "translations": [],
-    "etoolbox": []
-  },
-  "macros": {
-    "DeclareAcronym{}{}": {
-      "snippet": "DeclareAcronym{${1:id}}{${2:properties}}"
-    },
-    "NewAcroPreset{}{}": {
-      "snippet": "NewAcroPreset{${1:set name}}{${2:properties}}"
-    },
-    "RenewAcroPreset{}{}": {
-      "snippet": "RenewAcroPreset{${1:set name}}{${2:properties}}"
-    },
-    "DeclareAcroPreset{}{}": {
-      "snippet": "DeclareAcroPreset{${1:set name}}{${2:properties}}"
-    },
-    "ac{}": {
-      "snippet": "ac{${1:id}}"
-    },
-    "ac[]{}": {
-      "snippet": "ac[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ac*{}": {
-      "snippet": "ac*{${1:id}}"
-    },
-    "ac*[]{}": {
-      "snippet": "ac*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Ac{}": {
-      "snippet": "Ac{${1:id}}"
-    },
-    "Ac[]{}": {
-      "snippet": "Ac[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Ac*{}": {
-      "snippet": "Ac*{${1:id}}"
-    },
-    "Ac*[]{}": {
-      "snippet": "Ac*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acp{}": {
-      "snippet": "acp{${1:id}}"
-    },
-    "acp[]{}": {
-      "snippet": "acp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acp*{}": {
-      "snippet": "acp*{${1:id}}"
-    },
-    "acp*[]{}": {
-      "snippet": "acp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acp{}": {
-      "snippet": "Acp{${1:id}}"
-    },
-    "Acp[]{}": {
-      "snippet": "Acp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acp*{}": {
-      "snippet": "Acp*{${1:id}}"
-    },
-    "Acp*[]{}": {
-      "snippet": "Acp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iac{}": {
-      "snippet": "iac{${1:id}}"
-    },
-    "iac[]{}": {
-      "snippet": "iac[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iac*{}": {
-      "snippet": "iac*{${1:id}}"
-    },
-    "iac*[]{}": {
-      "snippet": "iac*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iac{}": {
-      "snippet": "Iac{${1:id}}"
-    },
-    "Iac[]{}": {
-      "snippet": "Iac[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iac*{}": {
-      "snippet": "Iac*{${1:id}}"
-    },
-    "Iac*[]{}": {
-      "snippet": "Iac*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acs{}": {
-      "snippet": "acs{${1:id}}"
-    },
-    "acs[]{}": {
-      "snippet": "acs[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acs*{}": {
-      "snippet": "acs*{${1:id}}"
-    },
-    "acs*[]{}": {
-      "snippet": "acs*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acs{}": {
-      "snippet": "Acs{${1:id}}"
-    },
-    "Acs[]{}": {
-      "snippet": "Acs[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acs*{}": {
-      "snippet": "Acs*{${1:id}}"
-    },
-    "Acs*[]{}": {
-      "snippet": "Acs*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acsp{}": {
-      "snippet": "acsp{${1:id}}"
-    },
-    "acsp[]{}": {
-      "snippet": "acsp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acsp*{}": {
-      "snippet": "acsp*{${1:id}}"
-    },
-    "acsp*[]{}": {
-      "snippet": "acsp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acsp{}": {
-      "snippet": "Acsp{${1:id}}"
-    },
-    "Acsp[]{}": {
-      "snippet": "Acsp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acsp*{}": {
-      "snippet": "Acsp*{${1:id}}"
-    },
-    "Acsp*[]{}": {
-      "snippet": "Acsp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iacs{}": {
-      "snippet": "iacs{${1:id}}"
-    },
-    "iacs[]{}": {
-      "snippet": "iacs[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iacs*{}": {
-      "snippet": "iacs*{${1:id}}"
-    },
-    "iacs*[]{}": {
-      "snippet": "iacs*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iacs{}": {
-      "snippet": "Iacs{${1:id}}"
-    },
-    "Iacs[]{}": {
-      "snippet": "Iacs[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iacs*{}": {
-      "snippet": "Iacs*{${1:id}}"
-    },
-    "Iacs*[]{}": {
-      "snippet": "Iacs*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acl{}": {
-      "snippet": "acl{${1:id}}"
-    },
-    "acl[]{}": {
-      "snippet": "acl[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acl*{}": {
-      "snippet": "acl*{${1:id}}"
-    },
-    "acl*[]{}": {
-      "snippet": "acl*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acl{}": {
-      "snippet": "Acl{${1:id}}"
-    },
-    "Acl[]{}": {
-      "snippet": "Acl[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acl*{}": {
-      "snippet": "Acl*{${1:id}}"
-    },
-    "Acl*[]{}": {
-      "snippet": "Acl*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "aclp{}": {
-      "snippet": "aclp{${1:id}}"
-    },
-    "aclp[]{}": {
-      "snippet": "aclp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "aclp*{}": {
-      "snippet": "aclp*{${1:id}}"
-    },
-    "aclp*[]{}": {
-      "snippet": "aclp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Aclp{}": {
-      "snippet": "Aclp{${1:id}}"
-    },
-    "Aclp[]{}": {
-      "snippet": "Aclp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Aclp*{}": {
-      "snippet": "Aclp*{${1:id}}"
-    },
-    "Aclp*[]{}": {
-      "snippet": "Aclp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iacl{}": {
-      "snippet": "iacl{${1:id}}"
-    },
-    "iacl[]{}": {
-      "snippet": "iacl[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iacl*{}": {
-      "snippet": "iacl*{${1:id}}"
-    },
-    "iacl*[]{}": {
-      "snippet": "iacl*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iacl{}": {
-      "snippet": "Iacl{${1:id}}"
-    },
-    "Iacl[]{}": {
-      "snippet": "Iacl[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iacl*{}": {
-      "snippet": "Iacl*{${1:id}}"
-    },
-    "Iacl*[]{}": {
-      "snippet": "Iacl*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "aca{}": {
-      "snippet": "aca{${1:id}}"
-    },
-    "aca[]{}": {
-      "snippet": "aca[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "aca*{}": {
-      "snippet": "aca*{${1:id}}"
-    },
-    "aca*[]{}": {
-      "snippet": "aca*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Aca{}": {
-      "snippet": "Aca{${1:id}}"
-    },
-    "Aca[]{}": {
-      "snippet": "Aca[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Aca*{}": {
-      "snippet": "Aca*{${1:id}}"
-    },
-    "Aca*[]{}": {
-      "snippet": "Aca*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acap{}": {
-      "snippet": "acap{${1:id}}"
-    },
-    "acap[]{}": {
-      "snippet": "acap[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acap*{}": {
-      "snippet": "acap*{${1:id}}"
-    },
-    "acap*[]{}": {
-      "snippet": "acap*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acap{}": {
-      "snippet": "Acap{${1:id}}"
-    },
-    "Acap[]{}": {
-      "snippet": "Acap[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acap*{}": {
-      "snippet": "Acap*{${1:id}}"
-    },
-    "Acap*[]{}": {
-      "snippet": "Acap*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iaca{}": {
-      "snippet": "iaca{${1:id}}"
-    },
-    "iaca[]{}": {
-      "snippet": "iaca[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iaca*{}": {
-      "snippet": "iaca*{${1:id}}"
-    },
-    "iaca*[]{}": {
-      "snippet": "iaca*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iaca{}": {
-      "snippet": "Iaca{${1:id}}"
-    },
-    "Iaca[]{}": {
-      "snippet": "Iaca[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iaca*{}": {
-      "snippet": "Iaca*{${1:id}}"
-    },
-    "Iaca*[]{}": {
-      "snippet": "Iaca*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acf{}": {
-      "snippet": "acf{${1:id}}"
-    },
-    "acf[]{}": {
-      "snippet": "acf[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acf*{}": {
-      "snippet": "acf*{${1:id}}"
-    },
-    "acf*[]{}": {
-      "snippet": "acf*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acf{}": {
-      "snippet": "Acf{${1:id}}"
-    },
-    "Acf[]{}": {
-      "snippet": "Acf[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acf*{}": {
-      "snippet": "Acf*{${1:id}}"
-    },
-    "Acf*[]{}": {
-      "snippet": "Acf*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acfp{}": {
-      "snippet": "acfp{${1:id}}"
-    },
-    "acfp[]{}": {
-      "snippet": "acfp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "acfp*{}": {
-      "snippet": "acfp*{${1:id}}"
-    },
-    "acfp*[]{}": {
-      "snippet": "acfp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acfp{}": {
-      "snippet": "Acfp{${1:id}}"
-    },
-    "Acfp[]{}": {
-      "snippet": "Acfp[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Acfp*{}": {
-      "snippet": "Acfp*{${1:id}}"
-    },
-    "Acfp*[]{}": {
-      "snippet": "Acfp*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iacf{}": {
-      "snippet": "iacf{${1:id}}"
-    },
-    "iacf[]{}": {
-      "snippet": "iacf[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "iacf*{}": {
-      "snippet": "iacf*{${1:id}}"
-    },
-    "iacf*[]{}": {
-      "snippet": "iacf*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iacf{}": {
-      "snippet": "Iacf{${1:id}}"
-    },
-    "Iacf[]{}": {
-      "snippet": "Iacf[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Iacf*{}": {
-      "snippet": "Iacf*{${1:id}}"
-    },
-    "Iacf*[]{}": {
-      "snippet": "Iacf*[${2:options}]{${1:id}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "printacronyms[]": {
-      "snippet": "printacronyms[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "acsetup{}": {
-      "snippet": "acsetup{${1:options}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "acrodotfill": {},
-    "acbarrier": {},
-    "acdot": {},
-    "acspace": {},
-    "abbrdot": {},
-    "aciftrailing{}{}{}": {
-      "snippet": "aciftrailing{${1:list of token names}}{${2:true}}{${3:false}}"
-    },
-    "acuse{}": {
-      "snippet": "acuse{${1:list of ids}}"
-    },
-    "acuseall": {},
-    "acreset{}": {
-      "snippet": "acreset{${1:list of ids}}"
-    },
-    "acresetall": {},
-    "acrotranslate{}": {
-      "snippet": "acrotranslate{${1:key}}"
-    },
-    "acswitchoff": {},
-    "acswitchon": {},
-    "NewAcroTemplate{}{}": {
-      "snippet": "NewAcroTemplate{${1:name}}{${2:code}}"
-    },
-    "NewAcroTemplate[]{}{}": {
-      "snippet": "NewAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
-    },
-    "RenewAcroTemplate{}{}": {
-      "snippet": "RenewAcroTemplate{${1:name}}{${2:code}}"
-    },
-    "RenewAcroTemplate[]{}{}": {
-      "snippet": "RenewAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
-    },
-    "SetupAcroTemplate{}{}": {
-      "snippet": "SetupAcroTemplate{${1:name}}{${2:code}}"
-    },
-    "SetupAcroTemplate[]{}{}": {
-      "snippet": "SetupAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
-    },
-    "SetupNextAcroTemplate{}{}": {
-      "snippet": "SetupNextAcroTemplate{${1:name}}{${2:code}}"
-    },
-    "SetupNextAcroTemplate[]{}{}": {
-      "snippet": "SetupNextAcroTemplate[${3:type}]{${1:name}}{${2:code}}"
-    },
-    "AcroTemplateType": {},
-    "AcroTemplateName": {},
-    "acrolistname": {},
-    "acrowrite{}": {
-      "snippet": "acrowrite{${1:property}}"
-    },
-    "acroformat{}{}": {
-      "snippet": "acroformat{${1:type}}{${2:text}}"
-    },
-    "acroshow{}": {
-      "snippet": "acroshow{${1:property}}"
-    },
-    "acroifTF{}{}{}": {
-      "snippet": "acroifTF{${1:property}}{${2:true}}{${3:false}}"
-    },
-    "acroifT{}{}{}": {
-      "snippet": "acroifT{${1:property}}{${2:true}}{${3:false}}"
-    },
-    "acroifF{}{}{}": {
-      "snippet": "acroifF{${1:property}}{${2:true}}{${3:false}}"
-    },
-    "acroifbooleanTF{}{}{}": {
-      "snippet": "acroifbooleanTF{${1:property}}{${2:true}}{${3:false}}"
-    },
-    "acroifbooleanT{}{}{}": {
-      "snippet": "acroifbooleanT{${1:property}}{${2:true}}{${3:false}}"
-    },
-    "acroifbooleanF{}{}{}": {
-      "snippet": "acroifbooleanF{${1:property}}{${2:true}}{${3:false}}"
-    },
-    "acroifallTF{}{}{}": {
-      "snippet": "acroifallTF{${1:properties}}{${2:true}}{${3:false}}"
-    },
-    "acroifallT{}{}{}": {
-      "snippet": "acroifallT{${1:properties}}{${2:true}}{${3:false}}"
-    },
-    "acroifallF{}{}{}": {
-      "snippet": "acroifallF{${1:properties}}{${2:true}}{${3:false}}"
-    },
-    "acroifanyTF{}{}{}": {
-      "snippet": "acroifanyTF{${1:properties}}{${2:true}}{${3:false}}"
-    },
-    "acroifanyT{}{}{}": {
-      "snippet": "acroifanyT{${1:properties}}{${2:true}}{${3:false}}"
-    },
-    "acroifanyF{}{}{}": {
-      "snippet": "acroifanyF{${1:properties}}{${2:true}}{${3:false}}"
-    },
-    "acroiftagTF{}{}{}": {
-      "snippet": "acroiftagTF{${1:tag}}{${2:true}}{${3:false}}"
-    },
-    "acroiftagT{}{}{}": {
-      "snippet": "acroiftagT{${1:tag}}{${2:true}}{${3:false}}"
-    },
-    "acroiftagF{}{}{}": {
-      "snippet": "acroiftagF{${1:tag}}{${2:true}}{${3:false}}"
-    },
-    "acroifstarredTF{}{}": {
-      "snippet": "acroifstarredTF{${1:true}}{${2:false}}"
-    },
-    "acroifstarredT{}{}": {
-      "snippet": "acroifstarredT{${1:true}}{${2:false}}"
-    },
-    "acroifstarredF{}{}": {
-      "snippet": "acroifstarredF{${1:true}}{${2:false}}"
-    },
-    "AcroPropertiesMap{}": {
-      "snippet": "AcroPropertiesMap{${1:code}}"
-    },
-    "AcroAcronymsMap{}": {
-      "snippet": "AcroAcronymsMap{${1:code}}"
-    },
-    "AcronymID": {},
-    "AcroMapBreak": {},
-    "AcroPropertiesSet{}{}": {
-      "snippet": "AcroPropertiesSet{${1:id}}{${2:list of properties}}"
-    },
-    "acroifusedTF{}{}": {
-      "snippet": "acroifusedTF{${1:true}}{${2:false}}"
-    },
-    "acroifusedT{}{}": {
-      "snippet": "acroifusedT{${1:true}}{${2:false}}"
-    },
-    "acroifusedF{}{}": {
-      "snippet": "acroifusedF{${1:true}}{${2:false}}"
-    },
-    "acroiffirstTF{}{}": {
-      "snippet": "acroiffirstTF{${1:true}}{${2:false}}"
-    },
-    "acroiffirstT{}{}": {
-      "snippet": "acroiffirstT{${1:true}}{${2:false}}"
-    },
-    "acroiffirstF{}{}": {
-      "snippet": "acroiffirstF{${1:true}}{${2:false}}"
-    },
-    "acroifsingleTF{}{}": {
-      "snippet": "acroifsingleTF{${1:true}}{${2:false}}"
-    },
-    "acroifsingleT{}{}": {
-      "snippet": "acroifsingleT{${1:true}}{${2:false}}"
-    },
-    "acroifsingleF{}{}": {
-      "snippet": "acroifsingleF{${1:true}}{${2:false}}"
-    },
-    "acrogroupcite": {},
-    "acroifchapterTF{}{}": {
-      "snippet": "acroifchapterTF{${1:true}}{${2:false}}"
-    },
-    "acroifchapterT{}{}": {
-      "snippet": "acroifchapterT{${1:true}}{${2:false}}"
-    },
-    "acroifchapterF{}{}": {
-      "snippet": "acroifchapterF{${1:true}}{${2:false}}"
-    },
-    "acroifpagesTF{}{}": {
-      "snippet": "acroifpagesTF{${1:true}}{${2:false}}"
-    },
-    "acroifpagesT{}{}": {
-      "snippet": "acroifpagesT{${1:true}}{${2:false}}"
-    },
-    "acroifpagesF{}{}": {
-      "snippet": "acroifpagesF{${1:true}}{${2:false}}"
-    },
-    "acropages{}{}": {
-      "snippet": "acropages{${1:first}}{${2:range}}"
-    },
-    "acronopagerange": {},
-    "acroneedpages": {},
-    "acropagefill": {},
-    "acronymsmap{}": {
-      "snippet": "acronymsmap{${1:code}}"
-    },
-    "acronymsmapTF{}{}{}": {
-      "snippet": "acronymsmapTF{${1:code}}{${2:true}}{${3:false}}"
-    },
-    "acronymsmapT{}{}{}": {
-      "snippet": "acronymsmapT{${1:code}}{${2:true}}{${3:false}}"
-    },
-    "acronymsmapF{}{}{}": {
-      "snippet": "acronymsmapF{${1:code}}{${2:true}}{${3:false}}"
-    },
-    "AcronymTable": {},
-    "AcroAddRow{}": {
-      "snippet": "AcroAddRow{${1:code}}"
-    },
-    "AcroNeedPackage{}": {
-      "snippet": "AcroNeedPackage{${1:package}}"
-    },
-    "AcroRerun": {},
-    "DeclareAcroEnding{}{}{}": {
-      "snippet": "DeclareAcroEnding{${1:name}}{${2:short default}}{${3:long default}}"
-    },
-    "DeclareAcroArticle{}{}": {
-      "snippet": "DeclareAcroArticle{${1:name}}{${2:default}}"
-    },
-    "DeclareAcroTranslation{}{}": {
-      "snippet": "DeclareAcroTranslation{${1:key}}{${2:language-translation list}}"
-    },
-    "AddAcroTranslations{}{}": {
-      "snippet": "AddAcroTranslations{${1:key}}{${2:language-translation list}}"
-    },
-    "DeclareAcroProperty{}": {
-      "snippet": "DeclareAcroProperty{${1:name}}"
-    },
-    "DeclareAcroProperty*{}": {
-      "snippet": "DeclareAcroProperty*{${1:name}}"
-    },
-    "DeclareAcroPropertyAlias{}{}": {
-      "snippet": "DeclareAcroPropertyAlias{${1:name1}}{${2:name2}}"
-    },
-    "MakeAcroPropertyAlias{}{}": {
-      "snippet": "MakeAcroPropertyAlias{${1:name1}}{${2:name2}}"
-    },
-    "NewAcroCommand{}{}{}": {
-      "snippet": "NewAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
-    },
-    "RenewAcroCommand{}{}{}": {
-      "snippet": "RenewAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
-    },
-    "DeclareAcroCommand{}{}{}": {
-      "snippet": "DeclareAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
-    },
-    "ProvideAcroCommand{}{}{}": {
-      "snippet": "ProvideAcroCommand{${1:cmd}}{${2:xargs}}{${3:definition}}"
-    },
-    "UseAcroTemplate{}": {
-      "snippet": "UseAcroTemplate{${1:name}}"
-    },
-    "UseAcroTemplate[]{}[]": {
-      "snippet": "UseAcroTemplate[${2:type}]{${1:name}}[${3:argument number}]"
-    },
-    "acrocite": {},
-    "acrodonotuse": {},
-    "acroplural": {},
-    "acroindefinite": {},
-    "acroupper": {},
-    "acrofull": {},
-    "nospace": {},
-    "AcroModule{}{}": {
-      "snippet": "AcroModule{${1:name}}{${2:description}}"
-    },
-    "AcroModuleEnd": {},
-    "AcroStyle{}": {
-      "snippet": "AcroStyle{${1:name}}"
-    },
-    "AcroMap{}{}": {
-      "snippet": "AcroMap{${1:arg1}}{${2:arg2}}"
-    },
-    "acroloadstyle{}": {
-      "snippet": "acroloadstyle{${1:style}}"
-    },
-    "acsimple{}{}": {
-      "snippet": "acsimple{${1:arg1}}{${2:arg2}}"
-    },
-    "acfootnote{}": {
-      "snippet": "acfootnote{${1:arg}}"
-    },
-    "acgobbletrail": {},
-    "acroheading": {},
-    "acropreamble": {},
-    "acropostamble": {},
-    "acrofield{}{}": {
-      "snippet": "acrofield{${1:arg1}}{${2:arg2}}"
-    },
-    "acroprintfield{}{}": {
-      "snippet": "acroprintfield{${1:arg1}}{${2:arg2}}"
-    },
-    "acroiffieldTF{}{}{}{}": {
-      "snippet": "acroiffieldTF{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
-    },
-    "acroifanyfieldTF{}{}{}{}": {
-      "snippet": "acroifanyfieldTF{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
-    },
-    "acroifallfieldsTF{}{}{}{}": {
-      "snippet": "acroifallfieldsTF{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
-    },
-    "acroifpagefieldTF{}": {
-      "snippet": "acroifpagefieldTF{${1:arg}}"
-    },
-    "acroifpropertyTF{}": {
-      "snippet": "acroifpropertyTF{${1:arg}}"
-    },
-    "acroifpropertyT{}": {
-      "snippet": "acroifpropertyT{${1:arg}}"
-    },
-    "acroifpropertyF{}": {
-      "snippet": "acroifpropertyF{${1:arg}}"
-    },
-    "acshow{}": {
-      "snippet": "acshow{${1:id}}"
-    },
-    "acshow[]{}": {
-      "snippet": "acshow[${2:options}]{${1:id}}"
-    },
-    "acroendfootnote": {}
-  },
-  "envs": {},
-  "options": [
-    "upgrade"
-  ],
-  "keyvals": [
-    [
-      "case-sensitive",
-      "case-insensitive",
-      "first-style=",
-      "subsequent-style=",
-      "single-style=",
-      "single={${1:text}}",
-      "use-id-as-short",
-      "cite=[${1:prenote}][${2:postnote}]{${3:citation keys}}",
-      "index={${1:text}}",
-      "index-sort={${1:text}}",
-      "no-index",
-      "format={${1:code}}",
-      "short-format={${1:code}}",
-      "long-format={${1:code}}",
-      "first-long-format={${1:code}}",
-      "alt-format={${1:code}}",
-      "extra-format={${1:code}}",
-      "foreign-format={${1:code}}",
-      "single-format={${1:code}}",
-      "list-format={${1:code}}",
-      "%acroproperty"
-    ],
-    [
-      "template=",
-      "sort",
-      "display=",
-      "exclude={${1:csv list of tags}}",
-      "include={${1:csv list of tags}}",
-      "add",
-      "heading=",
-      "name={${1:text}}",
-      "preamble={${1:text}}",
-      "locale/display",
-      "local",
-      "pages={${1:keyvals}}"
-    ],
-    [
-      "case-sensitive",
-      "case-insensitive",
-      "use-id-as-short",
-      "first-style=",
-      "subsequent-style=",
-      "single",
-      "single-style=",
-      "list/template=",
-      "list/sort",
-      "list/display=",
-      "list/exclude={${1:csv list of tags}}",
-      "list/include={${1:csv list of tags}}",
-      "list/add",
-      "list/heading=",
-      "list/name={${1:text}}",
-      "list/preamble={${1:text}}",
-      "list/locale/display",
-      "list/local",
-      "list/foreign/display",
-      "pages/display=",
-      "pages/seq/use=",
-      "pages/seq/pre={${1:code}}",
-      "pages/seq/threshold=${1:number}",
-      "pages/fill={${1:code}}",
-      "pages/name",
-      "format={${1:code}}",
-      "format/short={${1:code}}",
-      "format/long={${1:code}}",
-      "format/first-long={${1:code}}",
-      "format/alt={${1:code}}",
-      "format/extra={${1:code}}",
-      "format/foreign={${1:code}}",
-      "format/list={${1:code}}",
-      "format/replace",
-      "short-plural-ending={${1:text}}",
-      "long-plural-ending={${1:text}}",
-      "foreign/display",
-      "locale/display",
-      "locale/format={${1:code}}",
-      "uppercase/first",
-      "uppercase/title",
-      "uppercase/all",
-      "uppercase/none",
-      "uppercase/cmd={${1:commands}}",
-      "uppercase/short",
-      "cite/cmd={${1:citation command}}",
-      "cite/group",
-      "cite/display=",
-      "cite/pre={${1:text}}",
-      "cite/group/cmd={${1:citation command}}",
-      "cite/group/pre={${1:text}}",
-      "index/use=",
-      "index/cmd={${1:index command}}",
-      "index/disable={${1:code}}",
-      "index/clear",
-      "barriers/use",
-      "barriers/reset",
-      "barriers/single",
-      "trailing/define=${1:token}{${2:name}}",
-      "trailing/activate={${1:list of token names}}",
-      "trailing/deactivate={${1:list of token names}}",
-      "make-links",
-      "link-only-first",
-      "pdfcomments/use",
-      "pdfcomments/cmd={${1:code}}",
-      "accsupp/use",
-      "accsupp/options={${1:accsupp options}}",
-      "accsupp/method={${1:method}}",
-      "language=",
-      "patch/floats",
-      "patch/list",
-      "patch/tabularx",
-      "patch/ltxtable",
-      "patch/tabu",
-      "patch/caption",
-      "patch/maketitle",
-      "load-style=${1:name}",
-      "templates/colspec={${1:value}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/acronym.json b/dev/packages/acronym.json
deleted file mode 100644
index 6730074ea..000000000
--- a/dev/packages/acronym.json
+++ /dev/null
@@ -1,383 +0,0 @@
-{
-  "includes": {
-    "suffix": [],
-    "xstring": [],
-    "relsize": [
-      "smaller"
-    ]
-  },
-  "macros": {
-    "ac*[]{}": {
-      "snippet": "ac*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Ac*[]{}": {
-      "snippet": "Ac*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "ac*{}": {
-      "snippet": "ac*{${1:acronym}}"
-    },
-    "Ac*{}": {
-      "snippet": "Ac*{${1:acronym}}"
-    },
-    "ac[]{}": {
-      "snippet": "ac[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Ac[]{}": {
-      "snippet": "Ac[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "ac{}": {
-      "snippet": "ac{${1:acronym}}"
-    },
-    "Ac{}": {
-      "snippet": "Ac{${1:acronym}}"
-    },
-    "acf*[]{}": {
-      "snippet": "acf*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acf*[]{}": {
-      "snippet": "Acf*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acf*{}": {
-      "snippet": "acf*{${1:acronym}}"
-    },
-    "Acf*{}": {
-      "snippet": "Acf*{${1:acronym}}"
-    },
-    "acf[]{}": {
-      "snippet": "acf[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acf[]{}": {
-      "snippet": "Acf[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acf{}": {
-      "snippet": "acf{${1:acronym}}"
-    },
-    "Acf{}": {
-      "snippet": "Acf{${1:acronym}}"
-    },
-    "acfa[]{}": {
-      "snippet": "acfa[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acfa[]{}": {
-      "snippet": "Acfa[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acfa{}": {
-      "snippet": "acfa{${1:acronym}}"
-    },
-    "Acfa{}": {
-      "snippet": "Acfa{${1:acronym}}"
-    },
-    "acffont{}": {
-      "snippet": "acffont{${1:text}}"
-    },
-    "acfi*[]{}": {
-      "snippet": "acfi*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acfi*[]{}": {
-      "snippet": "Acfi*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acfi*{}": {
-      "snippet": "acfi*{${1:acronym}}"
-    },
-    "Acfi*{}": {
-      "snippet": "Acfi*{${1:acronym}}"
-    },
-    "acfi[]{}": {
-      "snippet": "acfi[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acfi[]{}": {
-      "snippet": "Acfi[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acfi{}": {
-      "snippet": "acfi{${1:acronym}}"
-    },
-    "Acfi{}": {
-      "snippet": "Acfi{${1:acronym}}"
-    },
-    "acfia[]{}": {
-      "snippet": "acfia[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acfia[]{}": {
-      "snippet": "Acfia[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acfia{}": {
-      "snippet": "acfia{${1:acronym}}"
-    },
-    "Acfia{}": {
-      "snippet": "Acfia{${1:acronym}}"
-    },
-    "acfp*[]{}": {
-      "snippet": "acfp*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acfp*{}": {
-      "snippet": "acfp*{${1:acronym}}"
-    },
-    "acfp[]{}": {
-      "snippet": "acfp[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acfp[]{}": {
-      "snippet": "Acfp[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acfp{}": {
-      "snippet": "acfp{${1:acronym}}"
-    },
-    "Acfp{}": {
-      "snippet": "Acfp{${1:acronym}}"
-    },
-    "acfpa[]{}": {
-      "snippet": "acfpa[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acfpa[]{}": {
-      "snippet": "Acfpa[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acfpa{}": {
-      "snippet": "acfpa{${1:acronym}}"
-    },
-    "Acfpa{}": {
-      "snippet": "Acfpa{${1:acronym}}"
-    },
-    "acfsfont{}": {
-      "snippet": "acfsfont{${1:text}}"
-    },
-    "acl*[]{}": {
-      "snippet": "acl*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acl*[]{}": {
-      "snippet": "Acl*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acl*{}": {
-      "snippet": "acl*{${1:acronym}}"
-    },
-    "Acl*{}": {
-      "snippet": "Acl*{${1:acronym}}"
-    },
-    "acl[]{}": {
-      "snippet": "acl[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acl[]{}": {
-      "snippet": "Acl[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acl{}": {
-      "snippet": "acl{${1:acronym}}"
-    },
-    "Acl{}": {
-      "snippet": "Acl{${1:acronym}}"
-    },
-    "aclabelfont{}": {
-      "snippet": "aclabelfont{${1:text}}"
-    },
-    "aclp*[]{}": {
-      "snippet": "aclp*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Aclp*[]{}": {
-      "snippet": "Aclp*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "aclp*{}": {
-      "snippet": "aclp*{${1:acronym}}"
-    },
-    "Aclp*{}": {
-      "snippet": "Aclp*{${1:acronym}}"
-    },
-    "aclp[]{}": {
-      "snippet": "aclp[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Aclp[]{}": {
-      "snippet": "Aclp[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "aclp{}": {
-      "snippet": "aclp{${1:acronym}}"
-    },
-    "Aclp{}": {
-      "snippet": "Aclp{${1:acronym}}"
-    },
-    "aclu*[]{}": {
-      "snippet": "aclu*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Aclu*[]{}": {
-      "snippet": "Aclu*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "aclu*{}": {
-      "snippet": "aclu*{${1:acronym}}"
-    },
-    "Aclu*{}": {
-      "snippet": "Aclu*{${1:acronym}}"
-    },
-    "aclu[]{}": {
-      "snippet": "aclu[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Aclu[]{}": {
-      "snippet": "Aclu[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "aclu{}": {
-      "snippet": "aclu{${1:acronym}}"
-    },
-    "Aclu{}": {
-      "snippet": "Aclu{${1:acronym}}"
-    },
-    "aclua[]{}": {
-      "snippet": "aclua[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Aclua[]{}": {
-      "snippet": "Aclua[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "aclua{}": {
-      "snippet": "aclua{${1:acronym}}"
-    },
-    "Aclua{}": {
-      "snippet": "Aclua{${1:acronym}}"
-    },
-    "acp*[]{}": {
-      "snippet": "acp*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acp*[]{}": {
-      "snippet": "Acp*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acp*{}": {
-      "snippet": "acp*{${1:acronym}}"
-    },
-    "Acp*{}": {
-      "snippet": "Acp*{${1:acronym}}"
-    },
-    "acp[]{}": {
-      "snippet": "acp[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "Acp[]{}": {
-      "snippet": "Acp[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acp{}": {
-      "snippet": "acp{${1:acronym}}"
-    },
-    "Acp{}": {
-      "snippet": "Acp{${1:acronym}}"
-    },
-    "acresetall": {},
-    "acro{}[]{}": {
-      "snippet": "acro{${1:acronym}}[${2:short name}]{${3:full name}}"
-    },
-    "acro{}{}": {
-      "snippet": "acro{${1:acronym}}{${2:full name}}"
-    },
-    "acrodef{}[]{}": {
-      "snippet": "acrodef{${1:acronym}}[${2:short name}]{${3:full name}}"
-    },
-    "acrodef{}{}": {
-      "snippet": "acrodef{${1:acronym}}{${2:full name}}"
-    },
-    "acrodefindefinite{}{}{}": {
-      "snippet": "acrodefindefinite{${1:acronym}}{${2:short indefinite article}}{${3:long indefinite article}}"
-    },
-    "acrodefplural{}[]{}": {
-      "snippet": "acrodefplural{${1:acronym}}[${2:short plural name}]{${3:full plural name}}"
-    },
-    "acrodefplural{}{}": {
-      "snippet": "acrodefplural{${1:acronym}}{${2:full plural name}}"
-    },
-    "acroextra{}": {
-      "snippet": "acroextra{${1:additional info}}"
-    },
-    "acroindefinite{}{}{}": {
-      "snippet": "acroindefinite{${1:acronym}}{${2:short indefinite article}}{${3:long indefinite article}}"
-    },
-    "acroplural{}[]{}": {
-      "snippet": "acroplural{${1:acronym}}[${2:short plural name}]{${3:full plural name}}"
-    },
-    "acroplural{}{}": {
-      "snippet": "acroplural{${1:acronym}}{${2:full plural name}}"
-    },
-    "acs*[]{}": {
-      "snippet": "acs*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acs*{}": {
-      "snippet": "acs*{${1:acronym}}"
-    },
-    "acs[]{}": {
-      "snippet": "acs[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acs{}": {
-      "snippet": "acs{${1:acronym}}"
-    },
-    "acsfont{}": {
-      "snippet": "acsfont{${1:text}}"
-    },
-    "acsp*[]{}": {
-      "snippet": "acsp*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acsp*{}": {
-      "snippet": "acsp*{${1:acronym}}"
-    },
-    "acsp[]{}": {
-      "snippet": "acsp[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acsp{}": {
-      "snippet": "acsp{${1:acronym}}"
-    },
-    "acspa[]{}": {
-      "snippet": "acspa[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acspa{}": {
-      "snippet": "acspa{${1:acronym}}"
-    },
-    "acsu*[]{}": {
-      "snippet": "acsu*[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acsu*{}": {
-      "snippet": "acsu*{${1:acronym}}"
-    },
-    "acsu[]{}": {
-      "snippet": "acsu[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acsu{}": {
-      "snippet": "acsu{${1:acronym}}"
-    },
-    "acsua[]{}": {
-      "snippet": "acsua[${2:linebreak penalty}]{${1:acronym}}"
-    },
-    "acsua{}": {
-      "snippet": "acsua{${1:acronym}}"
-    },
-    "acused{}": {
-      "snippet": "acused{${1:acronym}}"
-    },
-    "iac{}": {
-      "snippet": "iac{${1:acronym}}"
-    },
-    "Iac{}": {
-      "snippet": "Iac{${1:acronym}}"
-    },
-    "newacro{}[]{}": {
-      "snippet": "newacro{${1:acronym}}[${2:short name}]{${3:full name}}"
-    },
-    "newacro{}{}": {
-      "snippet": "newacro{${1:acronym}}{${2:full name}}"
-    },
-    "newacroindefinite{}{}{}": {
-      "snippet": "newacroindefinite{${1:acronym}}{${2:short indefinite article}}{${3:long indefinite article}}"
-    },
-    "newacroplural{}[]{}": {
-      "snippet": "newacroplural{${1:acronym}}[${2:short plural name}]{${3:full plural name}}"
-    },
-    "newacroplural{}{}": {
-      "snippet": "newacroplural{${1:acronym}}{${2:full plural name}}"
-    }
-  },
-  "envs": {
-    "acronym": {},
-    "acronym[]": {
-      "name": "acronym",
-      "snippet": "[${1:longest}]"
-    }
-  },
-  "options": [
-    "footnote",
-    "nohyperlinks",
-    "noacroprefix",
-    "printonlyused",
-    "printonlyreused",
-    "withpage",
-    "smaller",
-    "dua",
-    "nolist",
-    "nolinebreak"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/addrset.json b/dev/packages/addrset.json
index 2ea476204..7281d7415 100644
--- a/dev/packages/addrset.json
+++ b/dev/packages/addrset.json
@@ -336,7 +336,7 @@
       "snippet": "sigacross{${1:number}}"
     },
     "siglist{}": {
-      "snippet": "siglist{${1:sig1,${2:sig2},...}}"
+      "snippet": "siglist{${1:sig1,sig2,...}}"
     },
     "signame{}": {
       "snippet": "signame{${1:name}}"
diff --git a/dev/packages/addtoluatexpath.json b/dev/packages/addtoluatexpath.json
index 1a3c530a5..b925f27a6 100644
--- a/dev/packages/addtoluatexpath.json
+++ b/dev/packages/addtoluatexpath.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "addtoluatexpath{}": {
-      "snippet": "addtoluatexpath{${1:path1,${2:path2},...}}"
+      "snippet": "addtoluatexpath{${1:path1,path2,...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/aeb_pro.json b/dev/packages/aeb_pro.json
index 7db80267e..63db6d73e 100644
--- a/dev/packages/aeb_pro.json
+++ b/dev/packages/aeb_pro.json
@@ -453,9 +453,6 @@
     },
     "signatureSign": {},
     "certifyInvisibleSign": {},
-    "signatureSetSeedValue()": {
-      "snippet": "signatureSetSeedValue(${1:oSeedValue})"
-    },
     "declareImageAndPlacement{}": {
       "snippet": "declareImageAndPlacement{${1:keyvals}}",
       "keyvalindex": 6,
@@ -528,9 +525,6 @@
     "requiredVersionResult{}{}{}": {
       "snippet": "requiredVersionResult{${1:arg1}}{${2:arg2}}{${3:arg3}}"
     },
-    "retnAbsPathAs()": {
-      "snippet": "retnAbsPathAs(${1:arg})"
-    },
     "setLayoutMag{}": {
       "snippet": "setLayoutMag{${1:arg}}"
     },
diff --git a/dev/packages/aebxmp.json b/dev/packages/aebxmp.json
index b7bf3fa12..7743e8879 100644
--- a/dev/packages/aebxmp.json
+++ b/dev/packages/aebxmp.json
@@ -8,7 +8,7 @@
       "snippet": "Authors{{${1:name1}}{${2:name2}...}}"
     },
     "Keywords{}": {
-      "snippet": "Keywords{${1:word1,${2:word2},...}}"
+      "snippet": "Keywords{${1:word1,word2,...}}"
     },
     "xmpDoNotInsKWScript": {},
     "copyrightStatus{}": {
@@ -45,10 +45,10 @@
       "snippet": "Subject{{[${1:lang1] text1}}{[${2:lang2] text2}...}}"
     },
     "metaLang{}": {
-      "snippet": "metaLang{${1:lang1,${2:lang2},...}}"
+      "snippet": "metaLang{${1:lang1,lang2,...}}"
     },
     "customProperties{{}{}": {
-      "snippet": "customProperties{{${1:name=name1,${3:value=value1}}{${2:name=name2},value=value2}...}}"
+      "snippet": "customProperties{{${1:name=name1,value=value1}}{${2:name=name2,value=value2}...}}"
     },
     "aKeywords": {},
     "arrayOfAuthors": {},
diff --git a/dev/packages/ajmacros.json b/dev/packages/ajmacros.json
deleted file mode 100644
index 3e595ac64..000000000
--- a/dev/packages/ajmacros.json
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-  "includes": {
-    "otf": []
-  },
-  "macros": {
-    "ajTsumesuji{}": {
-      "snippet": "ajTsumesuji{${1:number}}"
-    },
-    "ajTsumesuji*{}": {
-      "snippet": "ajTsumesuji*{${1:number}}"
-    },
-    "ajTumesuji{}": {
-      "snippet": "ajTumesuji{${1:number}}"
-    },
-    "ajTumesuji*{}": {
-      "snippet": "ajTumesuji*{${1:number}}"
-    },
-    "ajMaru{}": {
-      "snippet": "ajMaru{${1:number}}"
-    },
-    "ajMaru*{}": {
-      "snippet": "ajMaru*{${1:number}}"
-    },
-    "ajKuroMaru{}": {
-      "snippet": "ajKuroMaru{${1:number}}"
-    },
-    "ajKuroMaru*{}": {
-      "snippet": "ajKuroMaru*{${1:number}}"
-    },
-    "ajKaku{}": {
-      "snippet": "ajKaku{${1:number}}"
-    },
-    "ajKaku*{}": {
-      "snippet": "ajKaku*{${1:number}}"
-    },
-    "ajKuroKaku{}": {
-      "snippet": "ajKuroKaku{${1:number}}"
-    },
-    "ajKuroKaku*{}": {
-      "snippet": "ajKuroKaku*{${1:number}}"
-    },
-    "ajMaruKaku{}": {
-      "snippet": "ajMaruKaku{${1:number}}"
-    },
-    "ajMaruKaku*{}": {
-      "snippet": "ajMaruKaku*{${1:number}}"
-    },
-    "ajKuroMaruKaku{}": {
-      "snippet": "ajKuroMaruKaku{${1:number}}"
-    },
-    "ajKuroMaruKaku*{}": {
-      "snippet": "ajKuroMaruKaku*{${1:number}}"
-    },
-    "ajKakko{}": {
-      "snippet": "ajKakko{${1:number}}"
-    },
-    "ajKakko*{}": {
-      "snippet": "ajKakko*{${1:number}}"
-    },
-    "ajRoman{}": {
-      "snippet": "ajRoman{${1:number}}"
-    },
-    "ajRoman*{}": {
-      "snippet": "ajRoman*{${1:number}}"
-    },
-    "ajroman{}": {
-      "snippet": "ajroman{${1:number}}"
-    },
-    "ajroman*{}": {
-      "snippet": "ajroman*{${1:number}}"
-    },
-    "ajPeriod{}": {
-      "snippet": "ajPeriod{${1:number}}"
-    },
-    "ajKakkoalph{}": {
-      "snippet": "ajKakkoalph{${1:number}}"
-    },
-    "ajKakkoYobi{}": {
-      "snippet": "ajKakkoYobi{${1:number}}"
-    },
-    "ajKakkoroman{}": {
-      "snippet": "ajKakkoroman{${1:number}}"
-    },
-    "ajKakkoRoman{}": {
-      "snippet": "ajKakkoRoman{${1:number}}"
-    },
-    "ajKakkoAlph{}": {
-      "snippet": "ajKakkoAlph{${1:number}}"
-    },
-    "ajKakkoHira{}": {
-      "snippet": "ajKakkoHira{${1:number}}"
-    },
-    "ajKakkoKata{}": {
-      "snippet": "ajKakkoKata{${1:number}}"
-    },
-    "ajKakkoKansuji{}": {
-      "snippet": "ajKakkoKansuji{${1:number}}"
-    },
-    "ajMaruKansuji{}": {
-      "snippet": "ajMaruKansuji{${1:number}}"
-    },
-    "ajNijuMaru{}": {
-      "snippet": "ajNijuMaru{${1:number}}"
-    },
-    "ajRecycle{}": {
-      "snippet": "ajRecycle{${1:number}}"
-    },
-    "ajHasenKakuAlph{}": {
-      "snippet": "ajHasenKakuAlph{${1:number}}"
-    },
-    "ajCross{}": {
-      "snippet": "ajCross{${1:number}}"
-    },
-    "ajSlanted{}": {
-      "snippet": "ajSlanted{${1:number}}"
-    },
-    "ajSlanted*{}": {
-      "snippet": "ajSlanted*{${1:number}}"
-    },
-    "ajApostrophe{}": {
-      "snippet": "ajApostrophe{${1:number}}"
-    },
-    "ajYear{}": {
-      "snippet": "ajYear{${1:number}}"
-    },
-    "ajSquareMark{}": {
-      "snippet": "ajSquareMark{${1:number}}"
-    },
-    "ajSquareMark*{}": {
-      "snippet": "ajSquareMark*{${1:number}}"
-    },
-    "ajHishi{}": {
-      "snippet": "ajHishi{${1:number}}"
-    },
-    "offsetalph": {},
-    "offsetAlph": {},
-    "offsetHira": {},
-    "offsetKata": {},
-    "offsetYobi": {},
-    "offsetMaru": {},
-    "offsetKuroMaru": {},
-    "offsetKaku": {},
-    "offsetKuroKaku": {},
-    "offsetMaruKaku": {},
-    "offsetKuroMaruKaku": {},
-    "ajMaruYobi{}": {
-      "snippet": "ajMaruYobi{${1:number}}"
-    },
-    "ajTsumekakko{}": {
-      "snippet": "ajTsumekakko{${1:number}}"
-    },
-    "ajTumekakko{}": {
-      "snippet": "ajTumekakko{${1:number}}"
-    },
-    "ajKosu{}": {
-      "snippet": "ajKosu{${1:number}}"
-    },
-    "ajFrac{}{}": {
-      "snippet": "ajFrac{${1:num}}{${2:denom}}"
-    },
-    "ajLig{}": {
-      "snippet": "ajLig{${1:characters}}"
-    },
-    "ajPICT{}": {
-      "snippet": "ajPICT{${1:name}}"
-    },
-    "ajPICTClub": {},
-    "ajPICTHeart": {},
-    "ajPICTSpade": {},
-    "ajPICTDiamond": {},
-    "ajArrow{}": {
-      "snippet": "ajArrow{${1:name}}"
-    },
-    "ajArrowLeftTriangle": {},
-    "ajArrowRightTriangle": {},
-    "ajArrowDOWN": {},
-    "ajArrowUP": {},
-    "ajArrowLEFT": {},
-    "ajArrowRIGHT": {},
-    "ajArrowRightHand": {},
-    "ajArrowLeftHand": {},
-    "ajArrowUpHand": {},
-    "ajArrowDownHand": {},
-    "ajArrowLeftScissors": {},
-    "ajArrowRightScissors": {},
-    "ajArrowUpScissors": {},
-    "ajArrowDownScissors": {},
-    "ajArrowLeft": {},
-    "ajArrowRight": {},
-    "ajArrowUp": {},
-    "ajArrowDown": {},
-    "ajArrowLeftDouble": {},
-    "ajArrowRightDown": {},
-    "ajArrowLeftDown": {},
-    "ajArrowLeftUp": {},
-    "ajArrowRightUp": {},
-    "ajArrowLeftAngle": {},
-    "ajArrowRightAngle": {},
-    "ajArrowUpAngle": {},
-    "ajArrowDownAngle": {},
-    "ajArrowRightDouble": {},
-    "ajArrowLeftRightDouble": {},
-    "ajKunten{}": {
-      "snippet": "ajKunten{${1:characters}}"
-    },
-    "DeclareOriginalKundokuStyle": {},
-    "DeclareOriginalKundokuStyle[]": {
-      "snippet": "DeclareOriginalKundokuStyle[${1:size commands}]"
-    },
-    "kokana{}{}": {
-      "snippet": "kokana{${1:arg1}}{${2:arg2}}"
-    },
-    "retenform": {},
-    "reten": {},
-    "retenkana{}": {
-      "snippet": "retenkana{${1:arg}}"
-    },
-    "kaeriten{}": {
-      "snippet": "kaeriten{${1:arg}}"
-    },
-    "kundokusize": {},
-    "DeclareAJKundokuStyle": {},
-    "DeclareAJKundokuStyle[]": {
-      "snippet": "DeclareAJKundokuStyle[${1:size commands}]"
-    },
-    "ajCIDVarDef{}{}": {
-      "snippet": "ajCIDVarDef{${1:char}}{${2:number}}"
-    },
-    "ajUTFVarDef{}{}": {
-      "snippet": "ajUTFVarDef{${1:char}}{${2:hex number}}"
-    },
-    "ajVar{}": {
-      "snippet": "ajVar{${1:char}}"
-    },
-    "ajHashigoTaka": {},
-    "ajTsuchiYoshi": {},
-    "ajTatsuSaki": {},
-    "ajMayuHama": {},
-    "ajLeader": {},
-    "ajLeader{}": {
-      "snippet": "ajLeader{${1:arg}}"
-    },
-    "ajLeader[]{}": {
-      "snippet": "ajLeader[${2:opt}]{${1:arg}}"
-    },
-    "ajQuotedef": {},
-    "ajQuote{}{}": {
-      "snippet": "ajQuote{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/algorithm2e.json b/dev/packages/algorithm2e.json
index 567c2875f..638aba744 100644
--- a/dev/packages/algorithm2e.json
+++ b/dev/packages/algorithm2e.json
@@ -428,9 +428,6 @@
     "Begin{}": {
       "snippet": "Begin{${1:block inside}}"
     },
-    "Begin(){}": {
-      "snippet": "Begin(${2:begin comment}){${1:block inside}}"
-    },
     "tcc{}": {
       "snippet": "tcc{${1:comments}}"
     },
@@ -452,189 +449,90 @@
     "If{}{}": {
       "snippet": "If{${1:condition}}{${2:then block}}"
     },
-    "If(){}{}": {
-      "snippet": "If(${3:then comment}){${1:condition}}{${2:then block}}"
-    },
     "uIf{}{}": {
       "snippet": "uIf{${1:condition}}{${2:then block without end}}"
     },
-    "uIf(){}{}": {
-      "snippet": "uIf(${3:then comment}){${1:condition}}{${2:then block without end}}"
-    },
     "lIf{}{}": {
       "snippet": "lIf{${1:condition}}{${2:then line}}"
     },
-    "lIf(){}{}": {
-      "snippet": "lIf(${3:if comment}){${1:condition}}{${2:then line}}"
-    },
     "ElseIf{}": {
       "snippet": "ElseIf{${1:elseif block}}"
     },
-    "ElseIf(){}": {
-      "snippet": "ElseIf(${2:elseif comment}){${1:elseif block}}"
-    },
     "uElseIf{}": {
       "snippet": "uElseIf{${1:elseif block without end}}"
     },
-    "uElseIf(){}": {
-      "snippet": "uElseIf(${2:elseif comment}){${1:elseif block without end}}"
-    },
     "lElseIf{}": {
       "snippet": "lElseIf{${1:elseif line}}"
     },
-    "lElseif(){}": {
-      "snippet": "lElseif(${2:elseif line}){${1:elseif block}}"
-    },
     "Else{}": {
       "snippet": "Else{${1:else block}}"
     },
-    "Else(){}": {
-      "snippet": "Else(${2:else comment}){${1:else block}}"
-    },
     "uElse{}": {
       "snippet": "uElse{${1:else block without end}}"
     },
-    "uElse(){}": {
-      "snippet": "uElse(${2:else block comment}){${1:else block without end}}"
-    },
     "lElse{}": {
       "snippet": "lElse{${1:else line}}"
     },
-    "lElse(){}": {
-      "snippet": "lElse(${2:else comment}){${1:else line}}"
-    },
     "eIf{}{}{}": {
       "snippet": "eIf{${1:condition}}{${2:then block}}{${3:else block}}"
     },
-    "eIf(){}{}(){}": {
-      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}(${5:else comment}){${3:else block}}"
-    },
-    "eIf(){}{}{}": {
-      "snippet": "eIf(${4:then comment}){${1:condition}}{${2:then block}}{${3:else block}}"
-    },
-    "eIf{}{}(){}": {
-      "snippet": "eIf{${1:condition}}{${2:then block}}(${4:else comment}){${3:else block}}"
-    },
     "leIf{}{}{}": {
       "snippet": "leIf{${1:condition}}{${2:then line}}{${3:else line}}"
     },
-    "leIf(){}{}{}": {
-      "snippet": "leIf(${4:comment}){${1:condition}}{${2:then line}}{${3:else line}}"
-    },
-    "Switch(){}{}": {
-      "snippet": "Switch(${3:switch comment}){${1:condition}}{${2:switch block}}"
-    },
     "Switch{}{}": {
       "snippet": "Switch{${1:condition}}{${2:switch block}}"
     },
     "Case{}{}": {
       "snippet": "Case{${1:case}}{${2:case block}}"
     },
-    "Case(){}{}": {
-      "snippet": "Case(${3:case comment}){${1:case}}{${2:case block}}"
-    },
     "uCase{}{}": {
       "snippet": "uCase{${1:case}}{${2:case block without end}}"
     },
-    "uCase(){}{}": {
-      "snippet": "uCase(${3:case comment}){${1:case}}{${2:case block without end}}"
-    },
     "lCase{}{}": {
       "snippet": "lCase{${1:case}}{${2:case line}}"
     },
-    "lCase(){}{}": {
-      "snippet": "lCase(${3:case comment}){${1:case}}{${2:case line}}"
-    },
     "Other{}": {
       "snippet": "Other{${1:otherwise block}}"
     },
-    "Other(){}": {
-      "snippet": "Other(${2:other comment}){${1:otherwise block}}"
-    },
     "uOther{}": {
       "snippet": "uOther{${1:otherwise text}}"
     },
-    "uOther(){}": {
-      "snippet": "uOther(${2:other comment}){${1:otherwise text}}"
-    },
     "lOther{}": {
       "snippet": "lOther{${1:otherwise line}}"
     },
-    "lOther(){}": {
-      "snippet": "lOther(${2:other comment}){${1:otherwise line}}"
-    },
     "For{}{}": {
       "snippet": "For{${1:condition}}{${2:for block}}"
     },
-    "For(){}{}": {
-      "snippet": "For(${3:for comment}){${1:condition}}{${2:for block}}"
-    },
     "lFor{}{}": {
       "snippet": "lFor{${1:condition}}{${2:for line}}"
     },
-    "lFor(){}{}": {
-      "snippet": "lFor(${3:for comment}){${1:condition}}{${2:for line}}"
-    },
     "While{}{}": {
       "snippet": "While{${1:condition}}{${2:while block}}"
     },
-    "While(){}{}": {
-      "snippet": "While(${3:while comment}){${1:condition}}{${2:while block}}"
-    },
     "lWhile{}{}": {
       "snippet": "lWhile{${1:condition}}{${2:while line}}"
     },
-    "lWhile(){}{}": {
-      "snippet": "lWhile(${3:while comment}){${1:condition}}{${2:while line}}"
-    },
     "ForPar{}{}": {
       "snippet": "ForPar{${1:condition}}{${2:foreach block}}"
     },
-    "ForPar(){}{}": {
-      "snippet": "ForPar(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
-    },
     "ForEach{}{}": {
       "snippet": "ForEach{${1:condition}}{${2:foreach block}}"
     },
-    "ForEach(){}{}": {
-      "snippet": "ForEach(${3:foreach comment}){${1:condition}}{${2:foreach block}}"
-    },
     "lForEach{}{}": {
       "snippet": "lForEach{${1:condition}}{${2:foreach line}}"
     },
-    "lForEach(){}{}": {
-      "snippet": "lForEach(${3:foreach comment}){${1:condition}}{${2:foreach line}}"
-    },
     "ForAll{}{}": {
       "snippet": "ForAll{${1:condition}}{${2:forall block}}"
     },
-    "ForAll(){}{}": {
-      "snippet": "ForAll(${3:forall comment}){${1:condition}}{${2:forall block}}"
-    },
     "lForAll{}{}": {
       "snippet": "lForAll{${1:condition}}{${2:forall line}}"
     },
-    "lForAll(){}{}": {
-      "snippet": "lForAll(${3:forall comment}){${1:condition}}{${2:forall line}}"
-    },
     "Repeat{}{}": {
       "snippet": "Repeat{${1:end condition}}{${2:repeat block}}"
     },
-    "Repeat(){}{}()": {
-      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}(${4:until comment})"
-    },
-    "Repeat(){}{}": {
-      "snippet": "Repeat(${3:repeat comment}){${1:end condition}}{${2:repeat block}}"
-    },
-    "Repeat{}{}()": {
-      "snippet": "Repeat{${1:end condition}}{${2:repeat block}}(${3:until comment})"
-    },
     "lRepeat{}{}": {
       "snippet": "lRepeat{${1:end condition}}{${2:repeat line}}"
     },
-    "lRepeat(){}{}": {
-      "snippet": "lRepeat(${3:repeat comment}){${1:end condition}}{${2:repeat line}}"
-    },
     "SetKwInput{}{}": {
       "snippet": "SetKwInput{${1:csname}}{${2:name}}"
     },
diff --git a/dev/packages/alterqcm.json b/dev/packages/alterqcm.json
index 9fcf230cc..39dd92894 100644
--- a/dev/packages/alterqcm.json
+++ b/dev/packages/alterqcm.json
@@ -11,11 +11,8 @@
     "AQmessage{}": {
       "snippet": "AQmessage{${1:text}}"
     },
-    "AQms()": {
-      "snippet": "AQms(${1:height},${2:depth})"
-    },
     "InputQuestionList{}{}{}": {
-      "snippet": "InputQuestionList{${1:filepath}}{${2:prefix}}{${3:num1,${4:num2},...}}"
+      "snippet": "InputQuestionList{${1:filepath}}{${2:prefix}}{${3:num1,num2,...}}"
     },
     "AQannexe{}{}{}": {
       "snippet": "AQannexe{${1:start}}{${2:end}}{${3:number of props}}"
diff --git a/dev/packages/amsmath.json b/dev/packages/amsmath.json
deleted file mode 100644
index b34849271..000000000
--- a/dev/packages/amsmath.json
+++ /dev/null
@@ -1,348 +0,0 @@
-{
-  "includes": {
-    "amstext": [],
-    "amsbsy": [],
-    "amsopn": []
-  },
-  "macros": {
-    "allowdisplaybreaks": {},
-    "allowdisplaybreaks[]": {
-      "snippet": "allowdisplaybreaks[${1:value}]"
-    },
-    "AmS": {},
-    "AmSfont": {},
-    "And": {},
-    "binom{}{}": {
-      "snippet": "binom{${1:above}}{${2:below}}"
-    },
-    "boxed{}": {
-      "snippet": "boxed{${1:formula}}"
-    },
-    "cfrac[]{}{}": {
-      "snippet": "cfrac[${3:align}]{${1:num}}{${2:den}}"
-    },
-    "cfrac{}{}": {
-      "snippet": "cfrac{${1:num}}{${2:den}}"
-    },
-    "dbinom{}{}": {
-      "snippet": "dbinom{${1:above}}{${2:below}}"
-    },
-    "ddddot{}": {
-      "snippet": "ddddot{${1:arg}}"
-    },
-    "dddot{}": {
-      "snippet": "dddot{${1:arg}}"
-    },
-    "dfrac{}{}": {
-      "snippet": "dfrac{${1:num}}{${2:den}}"
-    },
-    "displaybreak": {},
-    "displaybreak[]": {
-      "snippet": "displaybreak[${1:value}]"
-    },
-    "DOTSB": {},
-    "DOTSI": {},
-    "DOTSX": {},
-    "dotsb": {},
-    "dotsc": {},
-    "dotsi": {},
-    "dotsm": {},
-    "dotso": {},
-    "endmathdisplay{}": {
-      "snippet": "endmathdisplay{${1:envname}}"
-    },
-    "eqref{}": {
-      "snippet": "eqref{${1:label}}"
-    },
-    "genfrac{}{}{}{}{}{}": {
-      "snippet": "genfrac{${1:left-delim}}{${2:right-delim}}{${3:thickness}}{${4:mathstyle}}{${5:numerator}}{${6:denominator}}"
-    },
-    "hdots": {},
-    "hdotsfor{}": {
-      "snippet": "hdotsfor{${1:columns}}"
-    },
-    "hdotsfor[]{}": {
-      "snippet": "hdotsfor[${2:multiplier}]{${1:columns}}"
-    },
-    "idotsint": {},
-    "iiiint": {
-      "detail": "⨌",
-      "documentation": "QUADRUPLE INTEGRAL OPERATOR"
-    },
-    "iiint": {
-      "detail": "∭",
-      "documentation": "TRIPLE INTEGRAL operator"
-    },
-    "iint": {
-      "detail": "∬",
-      "documentation": "DOUBLE INTEGRAL operator"
-    },
-    "impliedby": {
-      "detail": "⟸",
-      "documentation": "LONG LEFTWARDS DOUBLE ARROW"
-    },
-    "implies": {
-      "detail": "⟹",
-      "documentation": "LONG RIGHTWARDS DOUBLE ARROW"
-    },
-    "intertext{}": {
-      "snippet": "intertext{${1:word or phrase}}"
-    },
-    "leftroot{}": {
-      "snippet": "leftroot{${1:argument}}"
-    },
-    "lvert": {},
-    "lVert": {},
-    "mathaccentV": {},
-    "mathdisplay{}": {
-      "snippet": "mathdisplay{${1:envname}}"
-    },
-    "mintagsep": {},
-    "minalignsep": {},
-    "mod": {},
-    "mspace{}": {
-      "snippet": "mspace{${1:dimen}}"
-    },
-    "MultiIntegral{}": {
-      "snippet": "MultiIntegral{${1:integer}}"
-    },
-    "multlinegap": {},
-    "multlinetaggap": {},
-    "nobreakdash": {},
-    "notag": {},
-    "numberwithin{}{}": {
-      "snippet": "numberwithin{${1:counter}}{${2:within-counter}}"
-    },
-    "numberwithin[]{}{}": {
-      "snippet": "numberwithin[${3:format}]{${1:counter}}{${2:within-counter}}"
-    },
-    "overleftrightarrow{}": {
-      "snippet": "overleftrightarrow{${1:argument}}"
-    },
-    "overset{}{}": {
-      "snippet": "overset{${1:superscript}}{${2:argument}}"
-    },
-    "overunderset{}{}{}": {
-      "snippet": "overunderset{${1:superscript}}{${2:subscript}}{${3:argument}}"
-    },
-    "pod": {},
-    "raisetag{}": {
-      "snippet": "raisetag{${1:dimen}}"
-    },
-    "rvert": {},
-    "rVert": {},
-    "shoveright{}": {
-      "snippet": "shoveright{${1:arg}}"
-    },
-    "shoveleft{}": {
-      "snippet": "shoveleft{${1:arg}}"
-    },
-    "sideset{}{}{}": {
-      "snippet": "sideset{${1:left}}{${2:right}}{${3:symbol}}"
-    },
-    "smash{}": {
-      "snippet": "smash{${1:argument}}"
-    },
-    "smash[]{}": {
-      "snippet": "smash[${2:valign}]{${1:argument}}"
-    },
-    "substack{}": {
-      "snippet": "substack{${1:argument}}"
-    },
-    "tag{}": {
-      "snippet": "tag{${1:label}}"
-    },
-    "tag*{}": {
-      "snippet": "tag*{${1:label}}"
-    },
-    "tbinom{}{}": {
-      "snippet": "tbinom{${1:above}}{${2:below}}"
-    },
-    "tfrac{}{}": {
-      "snippet": "tfrac{${1:num}}{${2:den}}"
-    },
-    "theparentequation": {},
-    "thetag": {},
-    "underleftarrow{}": {
-      "snippet": "underleftarrow{${1:argument}}"
-    },
-    "underleftrightarrow{}": {
-      "snippet": "underleftrightarrow{${1:argument}}"
-    },
-    "underrightarrow{}": {
-      "snippet": "underrightarrow{${1:argument}}"
-    },
-    "underset{}{}": {
-      "snippet": "underset{${1:subscript}}{${2:argument}}"
-    },
-    "uproot{}": {
-      "snippet": "uproot{${1:argument}}"
-    },
-    "varDelta": {
-      "detail": "𝛥",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL DELTA"
-    },
-    "varGamma": {
-      "detail": "𝛤",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL GAMMA"
-    },
-    "varLambda": {
-      "detail": "𝛬",
-      "documentation": "mathematical italic capital lambda"
-    },
-    "varOmega": {
-      "detail": "𝛺",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL OMEGA"
-    },
-    "varPhi": {
-      "detail": "𝛷",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL PHI"
-    },
-    "varPi": {
-      "detail": "𝛱",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL PI"
-    },
-    "varPsi": {
-      "detail": "𝛹",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL PSI"
-    },
-    "varSigma": {
-      "detail": "𝛴",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL SIGMA"
-    },
-    "varTheta": {
-      "detail": "𝛩",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL THETA"
-    },
-    "varUpsilon": {
-      "detail": "𝛶",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL UPSILON"
-    },
-    "varXi": {
-      "detail": "𝛯",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL XI"
-    },
-    "veqno{}": {
-      "snippet": "veqno{${1:eqn num}}"
-    },
-    "xleftarrow[]{}": {
-      "snippet": "xleftarrow[${2:subscript}]{${1:superscript}}"
-    },
-    "xleftarrow{}": {
-      "snippet": "xleftarrow{${1:superscript}}"
-    },
-    "xrightarrow[]{}": {
-      "snippet": "xrightarrow[${2:subscript}]{${1:superscript}}"
-    },
-    "xrightarrow{}": {
-      "snippet": "xrightarrow{${1:superscript}}"
-    },
-    "Hat{}": {
-      "snippet": "Hat{${1:arg}}"
-    },
-    "Check{}": {
-      "snippet": "Check{${1:arg}}"
-    },
-    "Tilde{}": {
-      "snippet": "Tilde{${1:arg}}"
-    },
-    "Acute{}": {
-      "snippet": "Acute{${1:arg}}"
-    },
-    "Grave{}": {
-      "snippet": "Grave{${1:arg}}"
-    },
-    "Dot{}": {
-      "snippet": "Dot{${1:arg}}"
-    },
-    "Ddot{}": {
-      "snippet": "Ddot{${1:arg}}"
-    },
-    "Breve{}": {
-      "snippet": "Breve{${1:arg}}"
-    },
-    "Bar{}": {
-      "snippet": "Bar{${1:arg}}"
-    },
-    "Vec{}": {
-      "snippet": "Vec{${1:arg}}"
-    }
-  },
-  "envs": {
-    "align": {},
-    "align*": {},
-    "alignat[]{}": {
-      "name": "alignat",
-      "snippet": "[${2:alignment}]{${1:ncols}}"
-    },
-    "alignat*[]{}": {
-      "name": "alignat*",
-      "snippet": "[${2:alignment}]{${1:ncols}}"
-    },
-    "alignat{}": {
-      "name": "alignat",
-      "snippet": "{${1:ncols}}"
-    },
-    "alignat*{}": {
-      "name": "alignat*",
-      "snippet": "{${1:ncols}}"
-    },
-    "aligned": {},
-    "aligned[]": {
-      "name": "aligned",
-      "snippet": "[${1:alignment}]"
-    },
-    "alignedat{}": {
-      "name": "alignedat",
-      "snippet": "{${1:ncols}}"
-    },
-    "bmatrix": {},
-    "Bmatrix": {},
-    "cases": {},
-    "equation*": {},
-    "flalign": {},
-    "flalign*": {},
-    "gather": {},
-    "gather*": {},
-    "gathered": {},
-    "gathered[]": {
-      "name": "gathered",
-      "snippet": "[${1:alignment}]"
-    },
-    "matrix": {},
-    "multline": {},
-    "multline*": {},
-    "pmatrix": {},
-    "smallmatrix": {},
-    "split": {},
-    "subarray": {},
-    "subarray{}": {
-      "name": "subarray",
-      "snippet": "{${1:align}}"
-    },
-    "subequations": {},
-    "vmatrix": {},
-    "Vmatrix": {},
-    "xalignat": {},
-    "xalignat*": {},
-    "xxalignat": {}
-  },
-  "options": [
-    "intlimits",
-    "nointlimits",
-    "sumlimits",
-    "nosumlimits",
-    "namelimits",
-    "nonamelimits",
-    "leqno",
-    "reqno",
-    "centertags",
-    "tbtags",
-    "cmex10",
-    "fleqn",
-    "alignedleftspaceyes",
-    "alignedleftspaceno",
-    "alignedleftspaceyesifneg"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/answers.json b/dev/packages/answers.json
deleted file mode 100644
index 5e358c943..000000000
--- a/dev/packages/answers.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "includes": {
-    "verbatim": []
-  },
-  "macros": {
-    "Newassociation{}{}{}": {
-      "snippet": "Newassociation{${1:envname}}{${2:name}}{${3:file}}"
-    },
-    "solutionextension": {},
-    "Opensolutionfile{}": {
-      "snippet": "Opensolutionfile{${1:file}}"
-    },
-    "Opensolutionfile{}[]": {
-      "snippet": "Opensolutionfile{${1:file}}[${2:prefix}]"
-    },
-    "Closesolutionfile{}": {
-      "snippet": "Closesolutionfile{${1:file}}"
-    },
-    "Writetofile{}{}": {
-      "snippet": "Writetofile{${1:file}}{${2:text}}"
-    },
-    "Readsolutionfile{}": {
-      "snippet": "Readsolutionfile{${1:file}}"
-    },
-    "Currentlabel": {},
-    "Ifanswerfiles{}{}": {
-      "snippet": "Ifanswerfiles{${1:true}}{${2:false}}"
-    },
-    "Iffileundefined{}{}{}": {
-      "snippet": "Iffileundefined{${1:file}}{${2:true}}{${3:false}}"
-    },
-    "Ifopen{}{}{}": {
-      "snippet": "Ifopen{${1:file}}{${2:true}}{${3:false}}"
-    },
-    "Tmp": {},
-    "newsolution{}": {
-      "snippet": "newsolution{${1:name}}"
-    },
-    "solutionpoint": {},
-    "solutionstyle{}": {
-      "snippet": "solutionstyle{${1:text}}"
-    },
-    "ifanswerfiles": {},
-    "answerfilestrue": {},
-    "answerfilesfalse": {}
-  },
-  "envs": {
-    "Filesave{}": {
-      "name": "Filesave",
-      "snippet": "{${1:file}}"
-    }
-  },
-  "options": [
-    "nosolutionfiles"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ar.json b/dev/packages/ar.json
deleted file mode 100644
index 19ee2c610..000000000
--- a/dev/packages/ar.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "ifCM": {},
-    "CMtrue": {},
-    "CMfalse": {},
-    "ifTM": {},
-    "TMtrue": {},
-    "TMfalse": {},
-    "ifPA": {},
-    "PAtrue": {},
-    "PAfalse": {},
-    "AR": {},
-    "ARb": {},
-    "ARss": {},
-    "ARssb": {},
-    "ARtt": {},
-    "ARm": {},
-    "ARmb": {}
-  },
-  "envs": {},
-  "options": [
-    "CM",
-    "TM",
-    "TC",
-    "PA",
-    "PX"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/argumentation.json b/dev/packages/argumentation.json
index e9c56b8c0..c739557da 100644
--- a/dev/packages/argumentation.json
+++ b/dev/packages/argumentation.json
@@ -1,7 +1,5 @@
 {
   "includes": {
-    "amsbsy": [],
-    "amsmath": [],
     "pgfopts": [],
     "tikz": [],
     "tikzlibrarypositioning": [],
@@ -17,20 +15,11 @@
     "setsupportstyle{}": {
       "snippet": "setsupportstyle{${1:style}}"
     },
-    "setannotationstyle{}": {
-      "snippet": "setannotationstyle{${1:style}}"
+    "argument{}{}": {
+      "snippet": "argument{${1:id}}{${2:name}}"
     },
-    "argument{}": {
-      "snippet": "argument{${1:name}}"
-    },
-    "argument(){}": {
-      "snippet": "argument(${2:id}){${1:name}}"
-    },
-    "argument[](){}": {
-      "snippet": "argument[${2:options}](${3:id}){${1:name}}"
-    },
-    "argument[]{}": {
-      "snippet": "argument[${2:options}]{${1:name}}"
+    "argument[]{}{}": {
+      "snippet": "argument[${3:options}]{${1:id}}{${2:name}}"
     },
     "attack{}{}": {
       "snippet": "attack{${1:id1}}{${2:id2}}"
@@ -62,17 +51,11 @@
     "annotatedattack[]{}{}{}": {
       "snippet": "annotatedattack[${4:options}]{${1:id1}}{${2:id2}}{${3:value}}"
     },
-    "afname{}": {
-      "snippet": "afname{${1:name}}"
-    },
-    "afname(){}": {
-      "snippet": "afname(${2:id}){${1:name}}"
+    "afname{}{}": {
+      "snippet": "afname{${1:id}}{${2:name}}"
     },
-    "afname[](){}": {
-      "snippet": "afname[${2:options}](${3:id}){${1:name}}"
-    },
-    "afname[]{}": {
-      "snippet": "afname[${2:options}]{${1:name}}"
+    "afname[]{}{}": {
+      "snippet": "afname[${3:options}]{${1:id}}{${2:name}}"
     },
     "annotation{}{}": {
       "snippet": "annotation{${1:id}}{${2:text}}"
@@ -82,9 +65,7 @@
     },
     "argstyle{}": {
       "snippet": "argstyle{${1:text}}"
-    },
-    "theaf": {},
-    "theargument": {}
+    }
   },
   "envs": {
     "af": {},
diff --git a/dev/packages/array.json b/dev/packages/array.json
deleted file mode 100644
index c65eebabc..000000000
--- a/dev/packages/array.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "arraybackslash": {},
-    "extrarowheight": {},
-    "extratabsurround": {},
-    "firsthline": {},
-    "lasthline": {},
-    "newcolumntype{}{}": {
-      "snippet": "newcolumntype{${1:name}}{${2:definition}}"
-    },
-    "newcolumntype{}[]{}": {
-      "snippet": "newcolumntype{${1:name}}[${2:args}]{${3:definition}}"
-    },
-    "showcols": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/arrayjobx.json b/dev/packages/arrayjobx.json
index db0d42d45..a66590e76 100644
--- a/dev/packages/arrayjobx.json
+++ b/dev/packages/arrayjobx.json
@@ -19,15 +19,6 @@
     "ifexpandarrayelement": {},
     "expandarrayelementtrue": {},
     "expandarrayelementfalse": {},
-    "arrayx{}()": {
-      "snippet": "arrayx{${1:array name}}(${2:index})"
-    },
-    "clrarray{}()": {
-      "snippet": "clrarray{${1:array name}}(${2:index})"
-    },
-    "testarray{}()": {
-      "snippet": "testarray{${1:array name}}(${2:index})"
-    },
     "EntryArrayJob": {}
   },
   "envs": {},
diff --git a/dev/packages/arsclassica.json b/dev/packages/arsclassica.json
deleted file mode 100644
index b4a779a13..000000000
--- a/dev/packages/arsclassica.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "includes": {
-    "classicthesis": [],
-    "caption": [],
-    "soul": [],
-    "titlesec": []
-  },
-  "macros": {
-    "formatchapter{}": {
-      "snippet": "formatchapter{${1:text}}"
-    },
-    "allcapsspacing{}": {
-      "snippet": "allcapsspacing{${1:text}}"
-    },
-    "lowsmallcapsspacing{}": {
-      "snippet": "lowsmallcapsspacing{${1:text}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ascmac.json b/dev/packages/ascmac.json
deleted file mode 100644
index bd25c1427..000000000
--- a/dev/packages/ascmac.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "includes": {
-    "tascmac": []
-  },
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/assoccnt.json b/dev/packages/assoccnt.json
deleted file mode 100644
index 215ed8875..000000000
--- a/dev/packages/assoccnt.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "includes": {
-    "xcolor": [],
-    "etoolbox": [],
-    "xkeyval": [],
-    "xstring": []
-  },
-  "macros": {
-    "setcounter{}{}": {
-      "snippet": "setcounter{${1:counter}}{${2:value}}"
-    },
-    "setcounter[]{}{}": {
-      "snippet": "setcounter[${3:options}]{${1:counter}}{${2:value}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "DeclareAssociatedCounters{}{}": {
-      "snippet": "DeclareAssociatedCounters{${1:driver counter}}{${2:associated counters list}}"
-    },
-    "AddAssociatedCounters{}{}": {
-      "snippet": "AddAssociatedCounters{${1:driver counter}}{${2:associated counters list}}"
-    },
-    "RemoveAssociatedCounter{}{}": {
-      "snippet": "RemoveAssociatedCounter{${1:driver counter}}{${2:associated counter}}"
-    },
-    "RemoveAssociatedCounters{}{}": {
-      "snippet": "RemoveAssociatedCounters{${1:driver counter}}{${2:associated counters list}}"
-    },
-    "ClearAssociatedCounters{}": {
-      "snippet": "ClearAssociatedCounters{${1:driver counter}}"
-    },
-    "AddDriverCounter{}": {
-      "snippet": "AddDriverCounter{${1:driver counter name}}"
-    },
-    "ClearDriverCounter": {},
-    "IsAssociatedToCounter{}{}{}{}": {
-      "snippet": "IsAssociatedToCounter{${1:driver counter}}{${2:associated counter}}{${3:true}}{${4:false}}"
-    },
-    "GetDriverCounter{}": {
-      "snippet": "GetDriverCounter{${1:counter}}"
-    },
-    "IsAssociatedCounter{}{}{}": {
-      "snippet": "IsAssociatedCounter{${1:counter}}{${2:true}}{${3:false}}"
-    },
-    "IsDriverCounter{}{}{}": {
-      "snippet": "IsDriverCounter{${1:driver counter}}{${2:true}}{${3:false}}"
-    },
-    "IsSuspendedCounter{}{}{}": {
-      "snippet": "IsSuspendedCounter{${1:counter}}{${2:true}}{${3:false}}"
-    },
-    "AssociatedDriverCounterInfo{}": {
-      "snippet": "AssociatedDriverCounterInfo{${1:counter}}"
-    },
-    "LastAddedToCounter": {},
-    "LastSteppedCounter": {},
-    "LastRefSteppedCounter": {},
-    "LastSetCounter": {},
-    "PrettyPrintCounterName{}": {
-      "snippet": "PrettyPrintCounterName{${1:counter}}"
-    },
-    "PrettyPrintCounterName[]{}": {
-      "snippet": "PrettyPrintCounterName[${2:options}]{${1:counter}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "GeneralCounterInfoColor": {},
-    "DriverCounterInfoColor": {},
-    "AssociatedCounterInfoColor": {},
-    "SuspendCounters{}": {
-      "snippet": "SuspendCounters{${1:counters list}}"
-    },
-    "ResumeSuspendedCounters": {},
-    "AssociationStatistics": {},
-    "ClearAssociatedCountersList{}": {
-      "snippet": "ClearAssociatedCountersList{${1:associated counters list}}"
-    },
-    "ClearDriverCountersList": {},
-    "IsInResetList{}{}{}{}": {
-      "snippet": "IsInResetList{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}"
-    },
-    "assoccntpackageversion": {}
-  },
-  "envs": {},
-  "options": [
-    "globalsuspend"
-  ],
-  "keyvals": [
-    [
-      "AssociatedToo",
-      "AssociatedCounters={${1:list of counters}}"
-    ],
-    [
-      "countertype="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/assurelatexmode.json b/dev/packages/assurelatexmode.json
index 1f10601c2..2e9cd37b7 100644
--- a/dev/packages/assurelatexmode.json
+++ b/dev/packages/assurelatexmode.json
@@ -3,63 +3,18 @@
     "chemstr": []
   },
   "macros": {
-    "HashWedgeAsSubst()(){}": {
-      "snippet": "HashWedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "HashWedgeAsSubstTeXLaTeX()(){}": {
-      "snippet": "HashWedgeAsSubstTeXLaTeX(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "HashWedgeAsSubstX()()": {
-      "snippet": "HashWedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "HashWedgeAsSubstX()()[]": {
-      "snippet": "HashWedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
-    },
-    "HashWedgeAsSubstXTeXLaTeX()()": {
-      "snippet": "HashWedgeAsSubstXTeXLaTeX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "HashWedgeAsSubstXTeXLaTeX()()[]": {
-      "snippet": "HashWedgeAsSubstXTeXLaTeX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
-    },
-    "PutBondLine()(){}": {
-      "snippet": "PutBondLine(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
-    },
-    "PutDashedBond()(){}": {
-      "snippet": "PutDashedBond(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
-    },
-    "PutTeXLaTeXLine()(){}": {
-      "snippet": "PutTeXLaTeXLine(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
-    },
-    "PutTeXLaTeXdashed()(){}": {
-      "snippet": "PutTeXLaTeXdashed(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
-    },
-    "WedgeAsSubst()(){}": {
-      "snippet": "WedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "WedgeAsSubstTeXLaTeX()(){}": {
-      "snippet": "WedgeAsSubstTeXLaTeX(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "WedgeAsSubstX()()": {
-      "snippet": "WedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "WedgeAsSubstX()()[]": {
-      "snippet": "WedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
-    },
-    "WedgeAsSubstXTeXLaTeX()()": {
-      "snippet": "WedgeAsSubstXTeXLaTeX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
     "dashhasheddash": {},
     "putRoundArrow{}": {
-      "snippet": "putRoundArrow{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
+      "snippet": "putRoundArrow{${1:(${2:x1,y1})(${3:x2,y2})...}}"
     },
     "putRoundArrow[]{}": {
-      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
+      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
     },
     "putRoundArrowTeXLaTeX{}": {
-      "snippet": "putRoundArrowTeXLaTeX{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
+      "snippet": "putRoundArrowTeXLaTeX{${1:(${2:x1,y1})(${3:x2,y2})...}}"
     },
     "putRoundArrowTeXLaTeX[]{}": {
-      "snippet": "putRoundArrowTeXLaTeX[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
+      "snippet": "putRoundArrowTeXLaTeX[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
     },
     "thickLineWidth": {},
     "thicklines": {},
diff --git a/dev/packages/asyalign.json b/dev/packages/asyalign.json
index c6420442e..8eeb1f9b1 100644
--- a/dev/packages/asyalign.json
+++ b/dev/packages/asyalign.json
@@ -8,15 +8,6 @@
     "ASYbase{}{}": {
       "snippet": "ASYbase{${1:arg1}}{${2:arg2}}"
     },
-    "ASYaligned()(){}{}{}": {
-      "snippet": "ASYaligned(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "ASYalignT()(){}{}": {
-      "snippet": "ASYalignT(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:arg1}}{${2:arg2}}"
-    },
-    "ASYalign()(){}": {
-      "snippet": "ASYalign(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:arg}}"
-    },
     "ASYraw{}": {
       "snippet": "ASYraw{${1:arg}}"
     }
diff --git a/dev/packages/asyfig.json b/dev/packages/asyfig.json
deleted file mode 100644
index b9248ed92..000000000
--- a/dev/packages/asyfig.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "includes": {
-    "asyalign": [],
-    "color": [],
-    "ifmtarg": [],
-    "ifpdf": [],
-    "ifplatform": [],
-    "import": [],
-    "graphicx": [],
-    "pdftexcmds": [],
-    "suffix": [],
-    "xkeyval": [],
-    "asyprocess": []
-  },
-  "macros": {
-    "asyfig{}": {
-      "snippet": "asyfig{${1:file}}"
-    },
-    "asyfig*{}": {
-      "snippet": "asyfig*{${1:file}}"
-    },
-    "asypath{}": {
-      "snippet": "asypath{${1:path}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "process="
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/at.json b/dev/packages/at.json
deleted file mode 100644
index 54c8a4877..000000000
--- a/dev/packages/at.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "atallowdigits": {},
-    "atdisallowdigits": {},
-    "atdef": {},
-    "atshow": {},
-    "atlet": {},
-    "at": {},
-    "atoff": {},
-    "aton": {}
-  },
-  "envs": {},
-  "options": [
-    "digits",
-    "nodigits"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/atbegshi.json b/dev/packages/atbegshi.json
deleted file mode 100644
index 946f5aa0d..000000000
--- a/dev/packages/atbegshi.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "includes": {
-    "infwarerr": [],
-    "ltxcmds": [],
-    "iftex": []
-  },
-  "macros": {
-    "AtBeginShipout{}": {
-      "snippet": "AtBeginShipout{${1:code}}"
-    },
-    "AtBeginShipoutAddToBox{}": {
-      "snippet": "AtBeginShipoutAddToBox{${1:code}}"
-    },
-    "AtBeginShipoutAddToBoxForeground{}": {
-      "snippet": "AtBeginShipoutAddToBoxForeground{${1:code}}"
-    },
-    "AtBeginShipoutBox": {},
-    "AtBeginShipoutBoxDepth": {},
-    "AtBeginShipoutBoxHeight": {},
-    "AtBeginShipoutBoxWidth": {},
-    "AtBeginShipoutDiscard": {},
-    "AtBeginShipoutFirst{}": {
-      "snippet": "AtBeginShipoutFirst{${1:code}}"
-    },
-    "AtBeginShipoutInit": {},
-    "AtBeginShipoutNext{}": {
-      "snippet": "AtBeginShipoutNext{${1:code}}"
-    },
-    "AtBeginShipoutOriginalShipout": {},
-    "AtBeginShipoutUpperLeft{}": {
-      "snippet": "AtBeginShipoutUpperLeft{${1:code}}"
-    },
-    "AtBeginShipoutUpperLeftForeground{}": {
-      "snippet": "AtBeginShipoutUpperLeftForeground{${1:code}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/autoaligne.json b/dev/packages/autoaligne.json
index 3c8e2d834..a17ac20f7 100644
--- a/dev/packages/autoaligne.json
+++ b/dev/packages/autoaligne.json
@@ -9,9 +9,6 @@
     "autoaligne[]{}": {
       "snippet": "autoaligne[${2:hor_align}]{${1:eq1\\\\eq2\\\\...}}"
     },
-    "autoaligne[](){}": {
-      "snippet": "autoaligne[${2:hor_align}](${3:vert_align}){${1:eq1\\\\eq2\\\\...}}"
-    },
     "egaldevantmembrevide": {},
     "aavcoeff{}": {
       "snippet": "aavcoeff{${1:value}}"
diff --git a/dev/packages/axodraw2.json b/dev/packages/axodraw2.json
index 2aa159fc1..7c28db0bc 100644
--- a/dev/packages/axodraw2.json
+++ b/dev/packages/axodraw2.json
@@ -22,773 +22,21 @@
       "detail": "𝐶",
       "documentation": "MATHEMATICAL ITALIC CAPITAL C"
     },
-    "AxoGrid()()(){}{}": {
-      "snippet": "AxoGrid(${3:x},${4:y})(${5:xsize},${6:ysize})(${7:xdivs},${8:ydivs}){${1:color}}{${2:linewidth}}"
-    },
-    "Line()()": {
-      "snippet": "Line(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "Line[]()()": {
-      "snippet": "Line[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "DoubleLine()(){}": {
-      "snippet": "DoubleLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:linesep}}"
-    },
-    "DoubleLine[]()(){}": {
-      "snippet": "DoubleLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "DashLine()(){}": {
-      "snippet": "DashLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "DashLine[]()(){}": {
-      "snippet": "DashLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "DashDoubleLine()(){}{}": {
-      "snippet": "DashDoubleLine(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashDoubleLine[]()(){}{}": {
-      "snippet": "DashDoubleLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:linesep}}{${2:dashsize}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Arc()()": {
-      "snippet": "Arc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "Arc[]()()": {
-      "snippet": "Arc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "CArc()()": {
-      "snippet": "CArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "CArc[]()()": {
-      "snippet": "CArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
-    },
-    "DoubleArc()(){}": {
-      "snippet": "DoubleArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
-    },
-    "DoubleArc[]()(){}": {
-      "snippet": "DoubleArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "DoubleCArc()(){}": {
-      "snippet": "DoubleCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
-    },
-    "DoubleCArc[]()(){}": {
-      "snippet": "DoubleCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}"
-    },
-    "DashArc()(){}": {
-      "snippet": "DashArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "DashArc[]()(){}": {
-      "snippet": "DashArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "DashCArc()(){}": {
-      "snippet": "DashCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "DashCArc[]()(){}": {
-      "snippet": "DashCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "DashDoubleArc()(){}{}": {
-      "snippet": "DashDoubleArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashDoubleArc[]()(){}{}": {
-      "snippet": "DashDoubleArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "DashDoubleCArc()(){}{}": {
-      "snippet": "DashDoubleCArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashDoubleCArc[]()(){}{}": {
-      "snippet": "DashDoubleCArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "Bezier()()()()": {
-      "snippet": "Bezier(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})(${7:x4},${8:y4})"
-    },
-    "Bezier[]()()()()": {
-      "snippet": "Bezier[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "DoubleBezier()()()(){}": {
-      "snippet": "DoubleBezier(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4}){${1:linesep}}"
-    },
-    "DoubleBezier[]()()()(){}": {
-      "snippet": "DoubleBezier[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})(${9:x4},${10:y4}){${1:linesep}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "DashBezier()()()(){}": {
-      "snippet": "DashBezier(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4}){${1:dashsize}}"
-    },
-    "DashBezier[]()()()(){}": {
-      "snippet": "DashBezier[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})(${9:x4},${10:y4}){${1:dashsize}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "DashDoubleBezier()()()(){}{}": {
-      "snippet": "DashDoubleBezier(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})(${9:x4},${10:y4}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashDoubleBezier[]()()()(){}{}": {
-      "snippet": "DashDoubleBezier[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})(${10:x4},${11:y4}){${1:linesep}}{${2:dashsize}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
     "Curve{}": {
-      "snippet": "Curve{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
+      "snippet": "Curve{${1:(${2:x1,y1})(${3:x2,y2})...}}"
     },
     "DashCurve{}{}": {
-      "snippet": "DashCurve{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}{${2:dashsize}}"
-    },
-    "Gluon()(){}{}": {
-      "snippet": "Gluon(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:amplitude}}{${2:number}}"
-    },
-    "Gluon[]()(){}{}": {
-      "snippet": "Gluon[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "DoubleGluon()(){}{}{}": {
-      "snippet": "DoubleGluon(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGluon[]()(){}{}{}": {
-      "snippet": "DoubleGluon[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "DashGluon()(){}{}{}": {
-      "snippet": "DashGluon(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGluon[]()(){}{}{}": {
-      "snippet": "DashGluon[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "DashDoubleGluon()(){}{}{}{}": {
-      "snippet": "DashDoubleGluon(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGluon[]()(){}{}{}{}": {
-      "snippet": "DashDoubleGluon[${5:options}](${6:x1},${7:y1})(${8:x2},${9:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "GluonArc()(){}{}": {
-      "snippet": "GluonArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "GluonArc[]()(){}{}": {
-      "snippet": "GluonArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "GlueArc()(){}{}": {
-      "snippet": "GlueArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "GlueArc[]()(){}{}": {
-      "snippet": "GlueArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "GluonArcn()(){}{}": {
-      "snippet": "GluonArcn(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "GluonArcn[]()(){}{}": {
-      "snippet": "GluonArcn[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "GlueArcn()(){}{}": {
-      "snippet": "GlueArcn(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "GlueArcn[]()(){}{}": {
-      "snippet": "GlueArcn[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "DoubleGluonArc()(){}{}{}": {
-      "snippet": "DoubleGluonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGluonArc[]()(){}{}{}": {
-      "snippet": "DoubleGluonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "DoubleGlueArc()(){}{}{}": {
-      "snippet": "DoubleGlueArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGlueArc[]()(){}{}{}": {
-      "snippet": "DoubleGlueArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGluonArcn()(){}{}{}": {
-      "snippet": "DoubleGluonArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGluonArcn[]()(){}{}{}": {
-      "snippet": "DoubleGluonArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGlueArcn()(){}{}{}": {
-      "snippet": "DoubleGlueArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGlueArcn[]()(){}{}{}": {
-      "snippet": "DoubleGlueArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DashGluonArc()(){}{}{}": {
-      "snippet": "DashGluonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGluonArc[]()(){}{}{}": {
-      "snippet": "DashGluonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "DashGlueArc()(){}{}{}": {
-      "snippet": "DashGlueArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGlueArc[]()(){}{}{}": {
-      "snippet": "DashGlueArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGluonArcn()(){}{}{}": {
-      "snippet": "DashGluonArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGluonArcn[]()(){}{}{}": {
-      "snippet": "DashGluonArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGlueArcn()(){}{}{}": {
-      "snippet": "DashGlueArcn(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGlueArcn[]()(){}{}{}": {
-      "snippet": "DashGlueArcn[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashDoubleGluonArc()(){}{}{}{}": {
-      "snippet": "DashDoubleGluonArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGluonArc[]()(){}{}{}{}": {
-      "snippet": "DashDoubleGluonArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
-      "keyvalindex": 15,
-      "keyvalpos": 0
-    },
-    "DashDoubleGlueArc()(){}{}{}{}": {
-      "snippet": "DashDoubleGlueArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGlueArc[]()(){}{}{}{}": {
-      "snippet": "DashDoubleGlueArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGluonArcn()(){}{}{}{}": {
-      "snippet": "DashDoubleGluonArcn(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGluonArcn[]()(){}{}{}{}": {
-      "snippet": "DashDoubleGluonArcn[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGlueArcn()(){}{}{}{}": {
-      "snippet": "DashDoubleGlueArcn(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGlueArcn[]()(){}{}{}{}": {
-      "snippet": "DashDoubleGlueArcn[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "GluonCirc()(){}{}": {
-      "snippet": "GluonCirc(${3:x},${4:y})(${5:radius},${6:phase}){${1:amplitude}}{${2:number}}"
-    },
-    "GluonCirc[]()(){}{}": {
-      "snippet": "GluonCirc[${3:options}](${4:x},${5:y})(${6:radius},${7:phase}){${1:amplitude}}{${2:number}}",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "DoubleGluonCirc()(){}{}{}": {
-      "snippet": "DoubleGluonCirc(${4:x},${5:y})(${6:radius},${7:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleGluonCirc[]()(){}{}{}": {
-      "snippet": "DoubleGluonCirc[${4:options}](${5:x},${6:y})(${7:radius},${8:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "DashGluonCirc()(){}{}{}": {
-      "snippet": "DashGluonCirc(${4:x},${5:y})(${6:radius},${7:phase}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashGluonCirc[]()(){}{}{}": {
-      "snippet": "DashGluonCirc[${4:options}](${5:x},${6:y})(${7:radius},${8:phase}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "DashDoubleGluonCirc()(){}{}{}{}": {
-      "snippet": "DashDoubleGluonCirc(${5:x},${6:y})(${7:radius},${8:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleGluonCirc[]()(){}{}{}{}": {
-      "snippet": "DashDoubleGluonCirc[${5:options}](${6:x},${7:y})(${8:radius},${9:phase}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "Photon()(){}{}": {
-      "snippet": "Photon(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:amplitude}}{${2:number}}"
-    },
-    "Photon[]()(){}{}": {
-      "snippet": "Photon[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "DoublePhoton()(){}{}{}": {
-      "snippet": "DoublePhoton(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoublePhoton[]()(){}{}{}": {
-      "snippet": "DoublePhoton[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "DashPhoton()(){}{}{}": {
-      "snippet": "DashPhoton(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashPhoton[]()(){}{}{}": {
-      "snippet": "DashPhoton[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "DashDoublePhoton()(){}{}{}{}": {
-      "snippet": "DashDoublePhoton(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoublePhoton[]()(){}{}{}{}": {
-      "snippet": "DashDoublePhoton[${5:options}](${6:x1},${7:y1})(${8:x2},${9:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "PhotonArc()(){}{}": {
-      "snippet": "PhotonArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "PhotonArc[]()(){}{}": {
-      "snippet": "PhotonArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "DoublePhotonArc()(){}{}{}": {
-      "snippet": "DoublePhotonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoublePhotonArc[]()(){}{}{}": {
-      "snippet": "DoublePhotonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "DashPhotonArc()(){}{}{}": {
-      "snippet": "DashPhotonArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashPhotonArc[]()(){}{}{}": {
-      "snippet": "DashPhotonArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "DashDoublePhotonArc()(){}{}{}{}": {
-      "snippet": "DashDoublePhotonArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoublePhotonArc[]()(){}{}{}{}": {
-      "snippet": "DashDoublePhotonArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
-      "keyvalindex": 15,
-      "keyvalpos": 0
-    },
-    "ZigZag()(){}{}": {
-      "snippet": "ZigZag(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:amplitude}}{${2:number}}"
-    },
-    "ZigZag[]()(){}{}": {
-      "snippet": "ZigZag[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "DoubleZigZag()(){}{}{}": {
-      "snippet": "DoubleZigZag(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleZigZag[]()(){}{}{}": {
-      "snippet": "DoubleZigZag[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "DashZigZag()(){}{}{}": {
-      "snippet": "DashZigZag(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashZigZag[]()(){}{}{}": {
-      "snippet": "DashZigZag[${4:options}](${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "DashDoubleZigZag()(){}{}{}{}": {
-      "snippet": "DashDoubleZigZag(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleZigZag[]()(){}{}{}{}": {
-      "snippet": "DashDoubleZigZag[${5:options}](${6:x1},${7:y1})(${8:x2},${9:y2}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "ZigZagArc()(){}{}": {
-      "snippet": "ZigZagArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:amplitude}}{${2:number}}"
-    },
-    "ZigZagArc[]()(){}{}": {
-      "snippet": "ZigZagArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "DoubleZigZagArc()(){}{}{}": {
-      "snippet": "DoubleZigZagArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}"
-    },
-    "DoubleZigZagArc[]()(){}{}{}": {
-      "snippet": "DoubleZigZagArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "DashZigZagArc()(){}{}{}": {
-      "snippet": "DashZigZagArc(${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}"
-    },
-    "DashZigZagArc[]()(){}{}{}": {
-      "snippet": "DashZigZagArc[${4:options}](${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:dashsize}}",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "DashDoubleZigZagArc()(){}{}{}{}": {
-      "snippet": "DashDoubleZigZagArc(${5:x},${6:y})(${7:radius},${8:start-angle},${9:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}"
-    },
-    "DashDoubleZigZagArc[]()(){}{}{}{}": {
-      "snippet": "DashDoubleZigZagArc[${5:options}](${6:x},${7:y})(${8:radius},${9:start-angle},${10:end-angle}){${1:amplitude}}{${2:number}}{${3:linesep}}{${4:dashsize}}",
-      "keyvalindex": 15,
-      "keyvalpos": 0
-    },
-    "Vertex(){}": {
-      "snippet": "Vertex(${2:x},${3:y}){${1:radius}}"
-    },
-    "FCirc(){}": {
-      "snippet": "FCirc(${2:x},${3:y}){${1:radius}}"
-    },
-    "ECirc(){}": {
-      "snippet": "ECirc(${2:x},${3:y}){${1:radius}}"
-    },
-    "BCirc(){}": {
-      "snippet": "BCirc(${2:x},${3:y}){${1:radius}}"
-    },
-    "GCirc(){}{}": {
-      "snippet": "GCirc(${3:x},${4:y}){${1:radius}}{${2:grayscale}}"
-    },
-    "CCirc(){}{}{}": {
-      "snippet": "CCirc(${4:x},${5:y}){${1:radius}}{${2:bound color}}{${3:fill color}}"
-    },
-    "Oval()()()": {
-      "snippet": "Oval(${1:x},${2:y})(${3:half-height},${4:half-width})(${5:angle})"
-    },
-    "FOval()()()": {
-      "snippet": "FOval(${1:x},${2:y})(${3:half-height},${4:half-width})(${5:angle})"
-    },
-    "GOval()()(){}": {
-      "snippet": "GOval(${2:x},${3:y})(${4:half-height},${5:half-width})(${6:angle}){${1:grayscale}}"
-    },
-    "COval()()(){}{}": {
-      "snippet": "COval(${3:x},${4:y})(${5:half-height},${6:half-width})(${7:angle}){${1:bound color}}{${2:fill color}}"
-    },
-    "EBox()()": {
-      "snippet": "EBox(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "FBox()()": {
-      "snippet": "FBox(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "BBox()()": {
-      "snippet": "BBox(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "GBox()(){}": {
-      "snippet": "GBox(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:grayscale}}"
-    },
-    "CBox()(){}{}": {
-      "snippet": "CBox(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:bound color}}{${2:fill color}}"
-    },
-    "EBoxc()()": {
-      "snippet": "EBoxc(${1:x},${2:y})(${3:width},${4:height})"
-    },
-    "Boxc()()": {
-      "snippet": "Boxc(${1:x},${2:y})(${3:width},${4:height})"
-    },
-    "FBoxc()()": {
-      "snippet": "FBoxc(${1:x},${2:y})(${3:width},${4:height})"
-    },
-    "BBoxc()()": {
-      "snippet": "BBoxc(${1:x},${2:y})(${3:width},${4:height})"
-    },
-    "GBoxc()(){}": {
-      "snippet": "GBoxc(${2:x},${3:y})(${4:width},${5:height}){${1:grayscale}}"
-    },
-    "CBoxc()(){}{}": {
-      "snippet": "CBoxc(${3:x},${4:y})(${5:width},${6:height}){${1:bound color}}{${2:fill color}}"
-    },
-    "RotatedBox()(){}{}": {
-      "snippet": "RotatedBox(${3:x},${4:y})(${5:width},${6:height}){${1:angle}}{${2:color}}"
-    },
-    "FilledRotatedBox()(){}{}": {
-      "snippet": "FilledRotatedBox(${3:x},${4:y})(${5:width},${6:height}){${1:angle}}{${2:color}}"
-    },
-    "ETri()()()": {
-      "snippet": "ETri(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
-    "FTri()()()": {
-      "snippet": "FTri(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
-    "BTri()()()": {
-      "snippet": "BTri(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
-    "GTri()()(){}": {
-      "snippet": "GTri(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3}){${1:grayscale}}"
-    },
-    "CTri()()(){}{}": {
-      "snippet": "CTri(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:bound color}}{${2:fill color}}"
+      "snippet": "DashCurve{${1:(${3:x1,y1})(${4:x2,y2})...}}{${2:dashsize}}"
     },
     "Polygon{}{}": {
-      "snippet": "Polygon{${1:(${3:x1},${4:y1}),(${5:x2},${6:y2}),...}}{${2:color}}"
+      "snippet": "Polygon{${1:(${3:x1,y1}),(${4:x2,y2}),...}}{${2:color}}"
     },
     "FilledPolygon{}{}": {
-      "snippet": "FilledPolygon{${1:(${3:x1},${4:y1}),(${5:x2},${6:y2}),...}}{${2:color}}"
-    },
-    "LinAxis()()()": {
-      "snippet": "LinAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:divs},${6:subdivs},${7:hashsize},${8:offset},${9:width})"
-    },
-    "LogAxis()()()": {
-      "snippet": "LogAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:divs},${6:hashsize},${7:offset},${8:width})"
-    },
-    "Text(){}": {
-      "snippet": "Text(${2:x},${3:y}){${1:text}}"
-    },
-    "Text()[]{}": {
-      "snippet": "Text(${3:x},${4:y})[${2:pos}]{${1:text}}"
-    },
-    "Text()(){}": {
-      "snippet": "Text(${2:x},${3:y})(${4:angle}){${1:text}}"
-    },
-    "Text()()[]{}": {
-      "snippet": "Text(${3:x},${4:y})(${5:angle})[${2:pos}]{${1:text}}"
-    },
-    "rText(){}": {
-      "snippet": "rText(${2:x},${3:y}){${1:text}}"
-    },
-    "rText()[]{}": {
-      "snippet": "rText(${3:x},${4:y})[${2:mode}]{${1:text}}"
-    },
-    "rText()[][]{}": {
-      "snippet": "rText(${4:x},${5:y})[${2:mode}][${3:rotation}]{${1:text}}"
-    },
-    "RText()(){}": {
-      "snippet": "RText(${2:x},${3:y})(${4:angle}){${1:text}}"
-    },
-    "RText()[](){}": {
-      "snippet": "RText(${3:x},${4:y})[${2:pos}](${5:angle}){${1:text}}"
+      "snippet": "FilledPolygon{${1:(${3:x1,y1}),(${4:x2,y2}),...}}{${2:color}}"
     },
     "SetPFont{}{}": {
       "snippet": "SetPFont{${1:postscript font}}{${2:size}}"
     },
-    "PText()(){}": {
-      "snippet": "PText(${2:x},${3:y})(${4:angle}){${1:text}}"
-    },
-    "PText()()[]{}": {
-      "snippet": "PText(${3:x},${4:y})(${5:angle})[${2:pos}]{${1:text}}"
-    },
-    "BText(){}": {
-      "snippet": "BText(${2:x},${3:y}){${1:text}}"
-    },
-    "GText(){}{}": {
-      "snippet": "GText(${3:x},${4:y}){${1:grayscale}}{${2:text}}"
-    },
-    "CText(){}{}{}": {
-      "snippet": "CText(${4:x},${5:y}){${1:bound color}}{${2:fill color}}{${3:text}}"
-    },
-    "BTwoText(){}{}": {
-      "snippet": "BTwoText(${3:x},${4:y}){${1:text1}}{${2:text2}}"
-    },
-    "GTwoText(){}{}{}": {
-      "snippet": "GTwoText(${4:x},${5:y}){${1:grayscale}}{${2:text1}}{${3:text2}}"
-    },
-    "CTwoText(){}{}{}{}": {
-      "snippet": "CTwoText(${5:x},${6:y}){${1:bound color}}{${2:fill color}}{${3:text1}}{${4:text2}}"
-    },
-    "ArrowLine()()": {
-      "snippet": "ArrowLine(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "ArrowLine[]()()": {
-      "snippet": "ArrowLine[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "LongArrow()()": {
-      "snippet": "LongArrow(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "LongArrow[]()()": {
-      "snippet": "LongArrow[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "ArrowDoubleLine()(){}": {
-      "snippet": "ArrowDoubleLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:linesep}}"
-    },
-    "ArrowDoubleLine[]()(){}": {
-      "snippet": "ArrowDoubleLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}"
-    },
-    "DashArrowLine()(){}": {
-      "snippet": "DashArrowLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "DashArrowLine[]()(){}": {
-      "snippet": "DashArrowLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
-    },
-    "ArrowDashLine()(){}": {
-      "snippet": "ArrowDashLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "ArrowDashLine[]()(){}": {
-      "snippet": "ArrowDashLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
-    },
-    "DashArrowDoubleLine()(){}{}": {
-      "snippet": "DashArrowDoubleLine(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashArrowDoubleLine[]()(){}{}": {
-      "snippet": "DashArrowDoubleLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:linesep}}{${2:dashsize}}"
-    },
-    "ArrowDashDoubleLine()(){}{}": {
-      "snippet": "ArrowDashDoubleLine(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:linesep}}{${2:dashsize}}"
-    },
-    "ArrowDashDoubleLine[]()(){}{}": {
-      "snippet": "ArrowDashDoubleLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashLongArrowLine()(){}": {
-      "snippet": "DashLongArrowLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "DashLongArrowLine[]()(){}": {
-      "snippet": "DashLongArrowLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
-    },
-    "LongArrowDashLine()(){}": {
-      "snippet": "LongArrowDashLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "LongArrowDashLine[]()(){}": {
-      "snippet": "LongArrowDashLine[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
-    },
-    "LongArrowDash()(){}": {
-      "snippet": "LongArrowDash(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "LongArrowDash[]()(){}": {
-      "snippet": "LongArrowDash[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
-    },
-    "DashLongArrow()(){}": {
-      "snippet": "DashLongArrow(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "DashLongArrow[]()(){}": {
-      "snippet": "DashLongArrow[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dashsize}}"
-    },
-    "LongArrowArcn()()": {
-      "snippet": "LongArrowArcn(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "LongArrowArcn[]()()": {
-      "snippet": "LongArrowArcn[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
-    },
-    "ArrowArcn()()": {
-      "snippet": "ArrowArcn(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "ArrowArcn[]()()": {
-      "snippet": "ArrowArcn[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
-    },
-    "LongArrowArc()()": {
-      "snippet": "LongArrowArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "LongArrowArc[]()()": {
-      "snippet": "LongArrowArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
-    },
-    "ArrowArc()()": {
-      "snippet": "ArrowArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "ArrowArc[]()()": {
-      "snippet": "ArrowArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
-    },
-    "ArrowCArc()()": {
-      "snippet": "ArrowCArc(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "ArrowCArc[]()()": {
-      "snippet": "ArrowCArc[${1:options}](${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle})"
-    },
-    "DashArrowArcn()(){}": {
-      "snippet": "DashArrowArcn(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "DashArrowArcn[]()(){}": {
-      "snippet": "DashArrowArcn[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "ArrowDashArcn()(){}": {
-      "snippet": "ArrowDashArcn(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "ArrowDashArcn[]()(){}": {
-      "snippet": "ArrowDashArcn[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "DashArrowArc()(){}": {
-      "snippet": "DashArrowArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "DashArrowArc[]()(){}": {
-      "snippet": "DashArrowArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "DashArrowCArc()(){}": {
-      "snippet": "DashArrowCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "DashArrowCArc[]()(){}": {
-      "snippet": "DashArrowCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "ArrowDashArc()(){}": {
-      "snippet": "ArrowDashArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "ArrowDashArc[]()(){}": {
-      "snippet": "ArrowDashArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "ArrowDashCArc()(){}": {
-      "snippet": "ArrowDashCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "ArrowDashCArc[]()(){}": {
-      "snippet": "ArrowDashCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "LongDashArrowArc()(){}": {
-      "snippet": "LongDashArrowArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "LongDashArrowArc[]()(){}": {
-      "snippet": "LongDashArrowArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "LongDashArrowCArc()(){}": {
-      "snippet": "LongDashArrowCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "LongDashArrowCArc[]()(){}": {
-      "snippet": "LongDashArrowCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "LongArrowDashArc()(){}": {
-      "snippet": "LongArrowDashArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "LongArrowDashArc[]()(){}": {
-      "snippet": "LongArrowDashArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "LongArrowDashCArc()(){}": {
-      "snippet": "LongArrowDashCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "LongArrowDashCArc[]()(){}": {
-      "snippet": "LongArrowDashCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:dashsize}}"
-    },
-    "ArrowDoubleArc()(){}": {
-      "snippet": "ArrowDoubleArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
-    },
-    "ArrowDoubleArc[]()(){}": {
-      "snippet": "ArrowDoubleArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}"
-    },
-    "ArrowDoubleCArc()(){}": {
-      "snippet": "ArrowDoubleCArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:linesep}}"
-    },
-    "ArrowDoubleCArc[]()(){}": {
-      "snippet": "ArrowDoubleCArc[${2:options}](${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}"
-    },
-    "ArrowDashDoubleArc()(){}{}": {
-      "snippet": "ArrowDashDoubleArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "ArrowDashDoubleArc[]()(){}{}": {
-      "snippet": "ArrowDashDoubleArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "ArrowDashDoubleCArc()(){}{}": {
-      "snippet": "ArrowDashDoubleCArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "ArrowDashDoubleCArc[]()(){}{}": {
-      "snippet": "ArrowDashDoubleCArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashArrowDoubleArc()(){}{}": {
-      "snippet": "DashArrowDoubleArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashArrowDoubleArc[]()(){}{}": {
-      "snippet": "DashArrowDoubleArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashArrowDoubleCArc()(){}{}": {
-      "snippet": "DashArrowDoubleCArc(${3:x},${4:y})(${5:radius},${6:start-angle},${7:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
-    "DashArrowDoubleCArc[]()(){}{}": {
-      "snippet": "DashArrowDoubleCArc[${3:options}](${4:x},${5:y})(${6:radius},${7:start-angle},${8:end-angle}){${1:linesep}}{${2:dashsize}}"
-    },
     "SetDashSize{}": {
       "snippet": "SetDashSize{${1:number}}"
     },
@@ -837,12 +85,6 @@
     "ifPSTextScalesLikeGraphics": {},
     "PSTextScalesLikeGraphicsfalse": {},
     "PSTextScalesLikeGraphicstrue": {},
-    "SetOffset()": {
-      "snippet": "SetOffset(${1:x},${2:y})"
-    },
-    "SetScaledOffset()": {
-      "snippet": "SetScaledOffset(${1:x},${2:y})"
-    },
     "SetColor{}": {
       "snippet": "SetColor{${1:color}}"
     },
@@ -1153,15 +395,9 @@
     "AssignDecDiv{}{}{}": {
       "snippet": "AssignDecDiv{${1:variable}}{${2:integer1}}{${3:integer2}}"
     },
-    "AxoPut(){}": {
-      "snippet": "AxoPut(${2:x},${3:y}){${1:text}}"
-    },
     "IfColor{}{}": {
       "snippet": "IfColor{${1:arg1}}{${2:arg2}}"
     },
-    "SetPoint{}()": {
-      "snippet": "SetPoint{${1:name}}(${2:x},${3:y})"
-    },
     "SetTmpBoxTwo{}{}": {
       "snippet": "SetTmpBoxTwo{${1:contents1}}{${2:contents2}}"
     },
@@ -1175,9 +411,6 @@
     "axohelp": {},
     "axominusone": {},
     "axoone": {},
-    "axoparray(){}": {
-      "snippet": "axoparray(${2:x},${3:y}){${1:arg}}"
-    },
     "axoscale": {},
     "axoscalePT": {},
     "axoscaleTT": {},
@@ -1209,9 +442,6 @@
     },
     "pfontC": {},
     "pfontN": {},
-    "putLen(){}": {
-      "snippet": "putLen(${2:x},${3:y}){${1:text}}"
-    },
     "tmpfh": {},
     "useX{}": {
       "snippet": "useX{${1:point name}}"
@@ -1228,14 +458,6 @@
     "ptinsp": {}
   },
   "envs": {
-    "axopicture(x,y)": {
-      "name": "axopicture",
-      "snippet": "(${1:x},${2:y})"
-    },
-    "axopicture(x,y)(xoffset,yoffset)": {
-      "name": "axopicture",
-      "snippet": "(${1:x},${2:y})(${3:xoffset},${4:yoffset})"
-    },
     "OLDpicture": {}
   },
   "options": [
@@ -1246,270 +468,5 @@
     "PSTextScalesIndependently",
     "PSTextScalesLikeGraphics"
   ],
-  "keyvals": [
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash",
-      "double",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "double",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash",
-      "double",
-      "clock",
-      "clockwise",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash",
-      "clock",
-      "clockwise",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "double",
-      "clock",
-      "clockwise",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "clock",
-      "clockwise",
-      "arrow",
-      "flip",
-      "arrowpos=${1:number}",
-      "arrowaspect=${1:number}",
-      "arrowlength=${1:number}",
-      "arrowheight=${1:number}",
-      "arrowinset=${1:number}",
-      "arrowscale=${1:number}",
-      "arrowstroke=${1:number}",
-      "arrowwidth=${1:number}",
-      "inset=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash",
-      "double"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "double"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash",
-      "double",
-      "clock",
-      "clockwise"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "dash",
-      "clock",
-      "clockwise"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "double",
-      "clock",
-      "clockwise"
-    ],
-    [
-      "color=",
-      "colour=",
-      "dsize=${1:number}",
-      "dashsize=${1:number}",
-      "sep=${1:number}",
-      "linesep=${1:number}",
-      "width=${1:number}",
-      "clock",
-      "clockwise"
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/babel.json b/dev/packages/babel.json
deleted file mode 100644
index 4c9160cc6..000000000
--- a/dev/packages/babel.json
+++ /dev/null
@@ -1,4651 +0,0 @@
-{
-  "includes": {
-    "fontspec": [
-      "bidi=default",
-      "bidi=basic",
-      "bidi=basic-r",
-      "bidi=bidi-l",
-      "bidi=bidi-r"
-    ],
-    "bidi": [
-      "bidi=bidi-l",
-      "bidi=bidi-r"
-    ]
-  },
-  "macros": {
-    "selectlanguage{}": {
-      "snippet": "selectlanguage{${1:language}}"
-    },
-    "foreignlanguage{}{}": {
-      "snippet": "foreignlanguage{${1:language}}{${2:text}}"
-    },
-    "foreignlanguage[]{}{}": {
-      "snippet": "foreignlanguage[${3:options}]{${1:language}}{${2:text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "babeltags{}": {
-      "snippet": "babeltags{${1:tag1=lang1,${2:tag2=lang2},...}}"
-    },
-    "babelensure{}": {
-      "snippet": "babelensure{${1:language}}"
-    },
-    "babelensure[]{}": {
-      "snippet": "babelensure[${2:options}]{${1:language}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "shorthandon{}": {
-      "snippet": "shorthandon{${1:characters}}"
-    },
-    "shorthandoff{}": {
-      "snippet": "shorthandoff{${1:characters}}"
-    },
-    "shorthandoff*{}": {
-      "snippet": "shorthandoff*{${1:characters}}"
-    },
-    "useshorthands{}": {
-      "snippet": "useshorthands{${1:char}}"
-    },
-    "useshorthands*{}": {
-      "snippet": "useshorthands*{${1:char}}"
-    },
-    "defineshorthand{}{}": {
-      "snippet": "defineshorthand{${1:shorthand}}{${2:code}}"
-    },
-    "defineshorthand[]{}{}": {
-      "snippet": "defineshorthand[${3:lang1,${4:lang2},...}]{${1:shorthand}}{${2:code}}"
-    },
-    "languageshorthands{}": {
-      "snippet": "languageshorthands{${1:language}}"
-    },
-    "babelshorthand{}": {
-      "snippet": "babelshorthand{${1:shorthand}}"
-    },
-    "ifbabelshorthand{}{}{}": {
-      "snippet": "ifbabelshorthand{${1:character}}{${2:true}}{${3:false}}"
-    },
-    "textormath{}{}": {
-      "snippet": "textormath{${1:text code}}{${2:math code}}"
-    },
-    "AfterBabelLanguage{}{}": {
-      "snippet": "AfterBabelLanguage{${1:option_name}}{${2:code}}",
-      "option": "base"
-    },
-    "babelfont{}{}": {
-      "snippet": "babelfont{${1:font_family}}{${2:font_name}}"
-    },
-    "babelfont{}[]{}": {
-      "snippet": "babelfont{${1:font_family}}[${2:font_options}]{${3:font_name}}"
-    },
-    "babelfont[]{}{}": {
-      "snippet": "babelfont[${3:lang1,${4:lang2},...}]{${1:font_family}}{${2:font_name}}"
-    },
-    "babelfont[]{}[]{}": {
-      "snippet": "babelfont[${3:lang1,${5:lang2},...}]{${1:font_family}}[${4:font_options}]{${2:font_name}}"
-    },
-    "setlocalecaption{}{}{}": {
-      "snippet": "setlocalecaption{${1:language}}{${2:caption_name}}{${3:string}}"
-    },
-    "BabelUppercaseMapping{}{}{}": {
-      "snippet": "BabelUppercaseMapping{${1:locale-name}}{${2:codepoint}}{${3:output}}"
-    },
-    "BabelLowercaseMapping{}{}{}": {
-      "snippet": "BabelLowercaseMapping{${1:locale-name}}{${2:codepoint}}{${3:output}}"
-    },
-    "babelprovide[]{}": {
-      "snippet": "babelprovide[${2:options}]{${1:language}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "localenumeral{}{}": {
-      "snippet": "localenumeral{${1:style}}{${2:number}}"
-    },
-    "localecounter{}{}": {
-      "snippet": "localecounter{${1:style}}{${2:counter}}"
-    },
-    "localedate{}{}{}": {
-      "snippet": "localedate{${1:year}}{${2:month}}{${3:day}}"
-    },
-    "localedate[]{}{}{}": {
-      "snippet": "localedate[${4:options}]{${1:year}}{${2:month}}{${3:day}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "babelcalendar{}{}{}{}": {
-      "snippet": "babelcalendar{${1:calendar}}{${2:year-macro}}{${3:month-macro}}{${4:day-macro}}"
-    },
-    "babelcalendar[]{}{}{}{}": {
-      "snippet": "babelcalendar[${5:YYYY-MM-DD}]{${1:calendar}}{${2:year-macro}}{${3:month-macro}}{${4:day-macro}}"
-    },
-    "languagename": {},
-    "iflanguage{}{}{}": {
-      "snippet": "iflanguage{${1:language}}{${2:true}}{${3:false}}"
-    },
-    "localeinfo{}": {
-      "snippet": "localeinfo{${1:field}}"
-    },
-    "localeinfo*{}": {
-      "snippet": "localeinfo*{${1:field}}"
-    },
-    "getlocaleproperty{}{}{}": {
-      "snippet": "getlocaleproperty{${1:cmd}}{${2:locale}}{${3:property}}"
-    },
-    "getlocaleproperty*{}{}{}": {
-      "snippet": "getlocaleproperty*{${1:cmd}}{${2:locale}}{${3:property}}"
-    },
-    "ShowLocaleProperties{}": {
-      "snippet": "ShowLocaleProperties{${1:language}}"
-    },
-    "LocaleForEach{}": {
-      "snippet": "LocaleForEach{${1:code}}"
-    },
-    "BabelEnsureInfo": {},
-    "localeid": {},
-    "babelhyphen{}": {
-      "snippet": "babelhyphen{${1:text}}"
-    },
-    "babelhyphen*{}": {
-      "snippet": "babelhyphen*{${1:text}}"
-    },
-    "babelnullhyphen": {},
-    "babelhyphenation{}": {
-      "snippet": "babelhyphenation{${1:exceptions}}"
-    },
-    "babelhyphenation[]{}": {
-      "snippet": "babelhyphenation[${2:lang1,${3:lang2},...}]{${1:exceptions}}"
-    },
-    "babelpatterns{}": {
-      "snippet": "babelpatterns{${1:patterns}}"
-    },
-    "babelpatterns[]{}": {
-      "snippet": "babelpatterns[${2:lang1,${3:lang2},...}]{${1:patterns}}"
-    },
-    "babelposthyphenation{}{}{}": {
-      "snippet": "babelposthyphenation{${1:hypenrules-name}}{${2:lua-pattern}}{${3:replacement}}"
-    },
-    "babelposthyphenation[]{}{}{}": {
-      "snippet": "babelposthyphenation[${4:options}]{${1:hypenrules-name}}{${2:lua-pattern}}{${3:replacement}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "babelprehyphenation{}{}{}": {
-      "snippet": "babelprehyphenation{${1:locale-name}}{${2:lua-pattern}}{${3:replacement}}"
-    },
-    "babelprehyphenation[]{}{}{}": {
-      "snippet": "babelprehyphenation[${4:options}]{${1:locale-name}}{${2:lua-pattern}}{${3:replacement}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "enablelocaletransform{}": {
-      "snippet": "enablelocaletransform{${1:transform}}"
-    },
-    "disablelocaletransform{}": {
-      "snippet": "disablelocaletransform{${1:transform}}"
-    },
-    "localeprehyphenation{}": {
-      "snippet": "localeprehyphenation{${1:string}}"
-    },
-    "babelcharclass{}{}{}": {
-      "snippet": "babelcharclass{${1:locale}}{${2:name}}{${3:char-list}}"
-    },
-    "babelinterchar{}{}{}{}": {
-      "snippet": "babelinterchar{${1:locale}}{${2:class-first}}{${3:class-second}}{${4:code}}"
-    },
-    "babelinterchar[]{}{}{}{}": {
-      "snippet": "babelinterchar[${5:options}]{${1:locale}}{${2:class-first}}{${3:class-second}}{${4:code}}",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "enablelocaleinterchar{}": {
-      "snippet": "enablelocaleinterchar{${1:label}}"
-    },
-    "disablelocaleinterchar{}": {
-      "snippet": "disablelocaleinterchar{${1:label}}"
-    },
-    "IfBabelIntercharT{}{}": {
-      "snippet": "IfBabelIntercharT{${1:interchar-list}}{${2:code}}"
-    },
-    "ensureascii{}": {
-      "snippet": "ensureascii{${1:text}}"
-    },
-    "asciiencoding": {},
-    "localfootnote{}": {
-      "snippet": "localfootnote{${1:text}}",
-      "option": "layout=footnotes"
-    },
-    "mainfootnote{}": {
-      "snippet": "mainfootnote{${1:text}}",
-      "option": "layout=footnotes"
-    },
-    "localfootnotetext": {
-      "option": "layout=footnotes"
-    },
-    "mainfootnotetext": {
-      "option": "layout=footnotes"
-    },
-    "babelsublr{}": {
-      "snippet": "babelsublr{${1:text}}"
-    },
-    "localerestoredirs": {},
-    "BabelPatchSection{}": {
-      "snippet": "BabelPatchSection{${1:section-name}}"
-    },
-    "BabelFootnote{}{}{}{}": {
-      "snippet": "BabelFootnote{${1:cmd}}{${2:language}}{${3:before}}{${4:after}}"
-    },
-    "languageattribute{}{}": {
-      "snippet": "languageattribute{${1:language}}{${2:list of attributes}}"
-    },
-    "AddBabelHook{}{}{}": {
-      "snippet": "AddBabelHook{${1:name}}{${2:event}}{${3:code}}"
-    },
-    "AddBabelHook[]{}{}{}": {
-      "snippet": "AddBabelHook[${4:language}]{${1:name}}{${2:event}}{${3:code}}"
-    },
-    "EnableBabelHook{}": {
-      "snippet": "EnableBabelHook{${1:name}}"
-    },
-    "DisableBabelHook{}": {
-      "snippet": "DisableBabelHook{${1:name}}"
-    },
-    "BabelContentsFiles": {},
-    "babelcharproperty{}{}{}": {
-      "snippet": "babelcharproperty{${1:char-code}}{${2:property}}{${3:value}}"
-    },
-    "babelcharproperty{}[]{}{}": {
-      "snippet": "babelcharproperty{${1:char-code}}[${2:to-char-code}]{${3:property}}{${4:value}}"
-    },
-    "babeladjust{}": {
-      "snippet": "babeladjust{${1:keyvals}}",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "localebox{}": {
-      "snippet": "localebox{${1:text}}"
-    },
-    "fmtname": {},
-    "glqq": {},
-    "grqq": {},
-    "glq": {},
-    "grq": {},
-    "flqq": {},
-    "frqq": {},
-    "flq": {},
-    "frq": {},
-    "quotedblbase": {
-      "option": "mongolian"
-    },
-    "quotesinglbase": {},
-    "guillemetleft": {},
-    "guillemetright": {},
-    "guillemotleft": {
-      "option": "mongolian"
-    },
-    "guillemotright": {
-      "option": "mongolian"
-    },
-    "guilsinglleft": {},
-    "guilsinglright": {},
-    "dj": {},
-    "DJ": {},
-    "umlauthigh": {},
-    "umlautlow": {},
-    "umlautelow": {},
-    "latinencoding": {
-      "option": "mongolian"
-    },
-    "latintext": {},
-    "textlatin{}": {
-      "snippet": "textlatin{${1:text}}"
-    },
-    "adddialect": {},
-    "addlanguage": {},
-    "addto{}{}": {
-      "snippet": "addto{${1:cmd}}{${2:code}}"
-    },
-    "AfterBabelCommands{}": {
-      "snippet": "AfterBabelCommands{${1:code}}"
-    },
-    "allowhyphens": {},
-    "BabelCJKGlue": {},
-    "BabelCJKSpace": {},
-    "BabelDated{}": {
-      "snippet": "BabelDated{${1:arg}}"
-    },
-    "BabelDatedd{}": {
-      "snippet": "BabelDatedd{${1:arg}}"
-    },
-    "BabelDateDot": {},
-    "BabelDateM{}": {
-      "snippet": "BabelDateM{${1:arg}}"
-    },
-    "BabelDateMM{}": {
-      "snippet": "BabelDateMM{${1:arg}}"
-    },
-    "BabelDateMMMM{}": {
-      "snippet": "BabelDateMMMM{${1:arg}}"
-    },
-    "BabelDateSpace": {},
-    "BabelDatey{}": {
-      "snippet": "BabelDatey{${1:arg}}"
-    },
-    "BabelDateyy{}": {
-      "snippet": "BabelDateyy{${1:arg}}"
-    },
-    "BabelDateyyyy{}": {
-      "snippet": "BabelDateyyyy{${1:arg}}"
-    },
-    "BabelLanguages": {},
-    "BabelLower{}{}": {
-      "snippet": "BabelLower{${1:uccode}}{${2:lccode}}"
-    },
-    "BabelLowerMM{}{}{}{}": {
-      "snippet": "BabelLowerMM{${1:uccode-from}}{${2:uccode-to}}{${3:step}}{${4:lccode}}"
-    },
-    "BabelLowerMO{}{}{}{}": {
-      "snippet": "BabelLowerMO{${1:uccode-from}}{${2:uccode-to}}{${3:step}}{${4:lccode}}"
-    },
-    "BabelModifiers": {},
-    "BabelNonASCII": {},
-    "BabelNonText": {},
-    "BabelString": {},
-    "BabelStringsDefault": {},
-    "BabelText{}": {
-      "snippet": "BabelText{${1:arg}}"
-    },
-    "EndBabelCommands": {},
-    "IfBabelLayout{}{}{}": {
-      "snippet": "IfBabelLayout{${1:layout}}{${2:true}}{${3:false}}"
-    },
-    "IfBabelSelectorTF{}{}{}": {
-      "snippet": "IfBabelSelectorTF{${1:selectors}}{${2:true}}{${3:false}}"
-    },
-    "LdfInit{}{}": {
-      "snippet": "LdfInit{${1:language}}{${2:captionslanguage}}"
-    },
-    "loadlocalcfg{}": {
-      "snippet": "loadlocalcfg{${1:file}}"
-    },
-    "localename": {},
-    "ProvidesLanguage{}": {
-      "snippet": "ProvidesLanguage{${1:language}}"
-    },
-    "ProvidesLanguage{}[]": {
-      "snippet": "ProvidesLanguage{${1:language}}[${2:release info}]"
-    },
-    "SetHyphenMap{}": {
-      "snippet": "SetHyphenMap{${1:to-lower-macros}}"
-    },
-    "SetString{}{}": {
-      "snippet": "SetString{${1:macro-name}}{${2:string}}"
-    },
-    "SetStringLoop{}{}": {
-      "snippet": "SetStringLoop{${1:macro-name}}{${2:string-list}}"
-    },
-    "StartBabelCommands*{}{}": {
-      "snippet": "StartBabelCommands*{${1:language-list}}{${2:category}}"
-    },
-    "StartBabelCommands*{}{}[]": {
-      "snippet": "StartBabelCommands*{${1:language-list}}{${2:category}}[${3:selector}]"
-    },
-    "StartBabelCommands{}{}": {
-      "snippet": "StartBabelCommands{${1:language-list}}{${2:category}}"
-    },
-    "StartBabelCommands{}{}[]": {
-      "snippet": "StartBabelCommands{${1:language-list}}{${2:category}}[${3:selector}]"
-    },
-    "captionsalbanian": {
-      "option": "albanian"
-    },
-    "datealbanian": {
-      "option": "albanian"
-    },
-    "extrasalbanian": {
-      "option": "albanian"
-    },
-    "noextrasalbanian": {
-      "option": "albanian"
-    },
-    "prefacename": {
-      "option": "welsh"
-    },
-    "bibname": {
-      "option": "welsh"
-    },
-    "chaptername": {
-      "option": "welsh"
-    },
-    "enclname": {
-      "option": "welsh"
-    },
-    "ccname": {
-      "option": "welsh"
-    },
-    "headtoname": {
-      "option": "welsh"
-    },
-    "seename": {
-      "option": "welsh"
-    },
-    "alsoname": {
-      "option": "welsh"
-    },
-    "proofname": {
-      "option": "welsh"
-    },
-    "glossaryname": {
-      "option": "welsh"
-    },
-    "sh": {
-      "option": "ukrainian"
-    },
-    "ch": {
-      "option": "ukrainian"
-    },
-    "th": {
-      "option": "ukrainian"
-    },
-    "cth": {
-      "option": "ukrainian"
-    },
-    "arsh": {
-      "option": "serbianc"
-    },
-    "arch": {
-      "option": "serbianc"
-    },
-    "arth": {
-      "option": "serbianc"
-    },
-    "arcth": {
-      "option": "serbianc"
-    },
-    "tg": {
-      "option": "ukrainian"
-    },
-    "ctg": {
-      "option": "ukrainian"
-    },
-    "arctg": {
-      "option": "ukrainian"
-    },
-    "arcctg": {
-      "option": "ukrainian"
-    },
-    "Prob": {
-      "option": "serbianc"
-    },
-    "Expect": {
-      "option": "serbianc"
-    },
-    "Variance": {
-      "option": "serbianc"
-    },
-    "captionsazerbaijani": {
-      "option": "azerbaijani"
-    },
-    "dateazerbaijani": {
-      "option": "azerbaijani"
-    },
-    "extrasazerbaijani": {
-      "option": "azerbaijani"
-    },
-    "noextrasazerbaijani": {
-      "option": "azerbaijani"
-    },
-    "azerbaijanischwa": {
-      "option": "azerbaijani"
-    },
-    "Azerbaijanischwa": {
-      "option": "azerbaijani"
-    },
-    "captionsbasque": {
-      "option": "basque"
-    },
-    "datebasque": {
-      "option": "basque"
-    },
-    "extrasbasque": {
-      "option": "basque"
-    },
-    "noextrasbasque": {
-      "option": "basque"
-    },
-    "basquehyphenmins": {
-      "option": "basque"
-    },
-    "dieresia{}": {
-      "snippet": "dieresia{${1:arg}}",
-      "option": "basque"
-    },
-    "texttilde{}": {
-      "snippet": "texttilde{${1:arg}}",
-      "option": "basque"
-    },
-    "captionsbelarusian": {
-      "option": "belarusian"
-    },
-    "datebelarusian": {
-      "option": "belarusian"
-    },
-    "extrasbelarusian": {
-      "option": "belarusian"
-    },
-    "noextrasbelarusian": {
-      "option": "belarusian"
-    },
-    "cyrdash": {
-      "option": "ukrainian"
-    },
-    "asbuk{}": {
-      "snippet": "asbuk{${1:counter}}",
-      "option": "russian.ancient"
-    },
-    "Asbuk{}": {
-      "snippet": "Asbuk{${1:counter}}",
-      "option": "russian.ancient"
-    },
-    "Belarusian": {
-      "option": "belarusian"
-    },
-    "cosec": {
-      "option": "ukrainian"
-    },
-    "NOD": {
-      "option": "russian.ancient"
-    },
-    "nod": {
-      "option": "russian.ancient"
-    },
-    "NOK": {
-      "option": "russian.ancient"
-    },
-    "nok": {
-      "option": "russian.ancient"
-    },
-    "Proj": {
-      "option": "russian.ancient"
-    },
-    "NAD": {
-      "option": "belarusian"
-    },
-    "nad": {
-      "option": "belarusian"
-    },
-    "NAK": {
-      "option": "belarusian"
-    },
-    "nak": {
-      "option": "belarusian"
-    },
-    "cyrillicencoding": {
-      "option": "ukrainian"
-    },
-    "cyrillictext": {
-      "option": "ukrainian"
-    },
-    "cyr": {
-      "option": "ukrainian"
-    },
-    "textcyrillic{}": {
-      "snippet": "textcyrillic{${1:text}}",
-      "option": "ukrainian"
-    },
-    "dq": {
-      "option": "ukrainian"
-    },
-    "CYRA": {
-      "option": "ukrainian"
-    },
-    "CYRB": {
-      "option": "ukrainian"
-    },
-    "CYRV": {
-      "option": "ukrainian"
-    },
-    "CYRG": {
-      "option": "ukrainian"
-    },
-    "CYRGUP": {
-      "option": "ukrainian"
-    },
-    "CYRD": {
-      "option": "ukrainian"
-    },
-    "CYRE": {
-      "option": "ukrainian"
-    },
-    "CYRIE": {
-      "option": "ukrainian"
-    },
-    "CYRZH": {
-      "option": "ukrainian"
-    },
-    "CYRZ": {
-      "option": "ukrainian"
-    },
-    "CYRI": {
-      "option": "ukrainian"
-    },
-    "CYRII": {
-      "option": "ukrainian"
-    },
-    "CYRYI": {
-      "option": "ukrainian"
-    },
-    "CYRISHRT": {
-      "option": "ukrainian"
-    },
-    "CYRK": {
-      "option": "ukrainian"
-    },
-    "CYRL": {
-      "option": "ukrainian"
-    },
-    "CYRM": {
-      "option": "ukrainian"
-    },
-    "CYRN": {
-      "option": "ukrainian"
-    },
-    "CYRO": {
-      "option": "ukrainian"
-    },
-    "CYRP": {
-      "option": "ukrainian"
-    },
-    "CYRR": {
-      "option": "ukrainian"
-    },
-    "CYRS": {
-      "option": "ukrainian"
-    },
-    "CYRT": {
-      "option": "ukrainian"
-    },
-    "CYRU": {
-      "option": "ukrainian"
-    },
-    "CYRF": {
-      "option": "ukrainian"
-    },
-    "CYRH": {
-      "option": "ukrainian"
-    },
-    "CYRC": {
-      "option": "ukrainian"
-    },
-    "CYRCH": {
-      "option": "ukrainian"
-    },
-    "CYRSH": {
-      "option": "ukrainian"
-    },
-    "CYRSHCH": {
-      "option": "ukrainian"
-    },
-    "CYRYU": {
-      "option": "ukrainian"
-    },
-    "CYRYA": {
-      "option": "ukrainian"
-    },
-    "CYRSFTSN": {
-      "option": "ukrainian"
-    },
-    "CYRERY": {
-      "option": "ukrainian"
-    },
-    "cyra": {
-      "option": "ukrainian"
-    },
-    "cyrb": {
-      "option": "ukrainian"
-    },
-    "cyrv": {
-      "option": "ukrainian"
-    },
-    "cyrg": {
-      "option": "ukrainian"
-    },
-    "cyrgup": {
-      "option": "ukrainian"
-    },
-    "cyrd": {
-      "option": "ukrainian"
-    },
-    "cyre": {
-      "option": "ukrainian"
-    },
-    "cyrie": {
-      "option": "ukrainian"
-    },
-    "cyrzh": {
-      "option": "ukrainian"
-    },
-    "cyrz": {
-      "option": "ukrainian"
-    },
-    "cyri": {
-      "option": "ukrainian"
-    },
-    "cyrii": {
-      "option": "ukrainian"
-    },
-    "cyryi": {
-      "option": "ukrainian"
-    },
-    "cyrishrt": {
-      "option": "ukrainian"
-    },
-    "cyrk": {
-      "option": "ukrainian"
-    },
-    "cyrl": {
-      "option": "ukrainian"
-    },
-    "cyrm": {
-      "option": "ukrainian"
-    },
-    "cyrn": {
-      "option": "ukrainian"
-    },
-    "cyro": {
-      "option": "ukrainian"
-    },
-    "cyrp": {
-      "option": "ukrainian"
-    },
-    "cyrr": {
-      "option": "ukrainian"
-    },
-    "cyrs": {
-      "option": "ukrainian"
-    },
-    "cyrt": {
-      "option": "ukrainian"
-    },
-    "cyru": {
-      "option": "ukrainian"
-    },
-    "cyrf": {
-      "option": "ukrainian"
-    },
-    "cyrh": {
-      "option": "ukrainian"
-    },
-    "cyrc": {
-      "option": "ukrainian"
-    },
-    "cyrch": {
-      "option": "ukrainian"
-    },
-    "cyrsh": {
-      "option": "ukrainian"
-    },
-    "cyrshch": {
-      "option": "ukrainian"
-    },
-    "cyryu": {
-      "option": "ukrainian"
-    },
-    "cyrya": {
-      "option": "ukrainian"
-    },
-    "cyrsftsn": {
-      "option": "ukrainian"
-    },
-    "cyrery": {
-      "option": "ukrainian"
-    },
-    "cdash": {
-      "option": "ukrainian"
-    },
-    "tocname": {
-      "option": "ukrainian"
-    },
-    "authorname": {
-      "option": "ukrainian"
-    },
-    "acronymname": {
-      "option": "ukrainian"
-    },
-    "lstlistingname": {
-      "option": "ukrainian"
-    },
-    "lstlistlistingname": {
-      "option": "ukrainian"
-    },
-    "notesname": {
-      "option": "ukrainian"
-    },
-    "nomname": {
-      "option": "ukrainian"
-    },
-    "captionsbosnian": {
-      "option": "bosnian"
-    },
-    "datebosnian": {
-      "option": "bosnian"
-    },
-    "extrasbosnian": {
-      "option": "bosnian"
-    },
-    "noextrasbosnian": {
-      "option": "bosnian"
-    },
-    "atcctg": {
-      "option": "bosnian"
-    },
-    "captionsbreton": {
-      "option": "breton"
-    },
-    "datebreton": {
-      "option": "breton"
-    },
-    "extrasbreton": {
-      "option": "breton"
-    },
-    "noextrasbreton": {
-      "option": "breton"
-    },
-    "at": {
-      "option": "acadian"
-    },
-    "boi": {
-      "option": "acadian"
-    },
-    "circonflexe": {
-      "option": "acadian"
-    },
-    "tild": {
-      "option": "acadian"
-    },
-    "degre": {
-      "option": "acadian"
-    },
-    "kentan": {
-      "option": "breton"
-    },
-    "eil": {
-      "option": "breton"
-    },
-    "re": {
-      "option": "breton"
-    },
-    "trede": {
-      "option": "breton"
-    },
-    "pevare": {
-      "option": "breton"
-    },
-    "vet": {
-      "option": "breton"
-    },
-    "pempvet": {
-      "option": "breton"
-    },
-    "captionsbulgarian": {
-      "option": "bulgarian"
-    },
-    "datebulgarian": {
-      "option": "bulgarian"
-    },
-    "extrasbulgarian": {
-      "option": "bulgarian"
-    },
-    "noextrasbulgarian": {
-      "option": "bulgarian"
-    },
-    "Bulgarian": {
-      "option": "bulgarian"
-    },
-    "English": {
-      "option": "mongolian"
-    },
-    "Bul": {
-      "option": "bulgarian"
-    },
-    "Bg": {
-      "option": "bulgarian"
-    },
-    "selectbglanguage": {
-      "option": "bulgarian"
-    },
-    "Eng": {
-      "option": "mongolian"
-    },
-    "selectenglanguage": {
-      "option": "bulgarian"
-    },
-    "lat": {
-      "option": "mongolian",
-      "detail": "⪫",
-      "documentation": "LARGER THAN"
-    },
-    "todayRoman": {
-      "option": "serbianc"
-    },
-    "weekdaynamebulgarian{}": {
-      "snippet": "weekdaynamebulgarian{${1:number}}",
-      "option": "bulgarian"
-    },
-    "abvon": {
-      "option": "bulgarian"
-    },
-    "abvoff": {
-      "option": "bulgarian"
-    },
-    "cyrxtounicode": {
-      "option": "bulgarian"
-    },
-    "Romannumeral{}": {
-      "snippet": "Romannumeral{${1:number}}",
-      "option": "macedonian"
-    },
-    "lastJulianDatebulgarian{}": {
-      "snippet": "lastJulianDatebulgarian{${1:number}}",
-      "option": "bulgarian"
-    },
-    "firstGregorianDatebulgarian{}": {
-      "snippet": "firstGregorianDatebulgarian{${1:number}}",
-      "option": "bulgarian"
-    },
-    "abbgyear": {
-      "option": "ukrainian"
-    },
-    "No": {
-      "option": "ukrainian"
-    },
-    "captionscatalan": {
-      "option": "catalan"
-    },
-    "datecatalan": {
-      "option": "catalan"
-    },
-    "extrascatalan": {
-      "option": "catalan"
-    },
-    "noextrascatalan": {
-      "option": "catalan"
-    },
-    "catalanhyphenmins": {
-      "option": "catalan"
-    },
-    "lgem": {
-      "option": "catalan"
-    },
-    "Lgem": {
-      "option": "catalan"
-    },
-    "up{}": {
-      "snippet": "up{${1:text}}",
-      "option": "acadian"
-    },
-    "dieresis{}": {
-      "snippet": "dieresis{${1:arg}}",
-      "option": "catalan"
-    },
-    "captionscroatian": {
-      "option": "croatian"
-    },
-    "datecroatian": {
-      "option": "croatian"
-    },
-    "extrascroatian": {
-      "option": "croatian"
-    },
-    "noextrascroatian": {
-      "option": "croatian"
-    },
-    "captionsczech": {
-      "option": "czech"
-    },
-    "dateczech": {
-      "option": "czech"
-    },
-    "extrasczech": {
-      "option": "czech"
-    },
-    "noextrasczech": {
-      "option": "czech"
-    },
-    "q{}": {
-      "snippet": "q{${1:arg}}",
-      "option": "slovak"
-    },
-    "w{}": {
-      "snippet": "w{${1:arg}}",
-      "option": "czech"
-    },
-    "uv{}": {
-      "snippet": "uv{${1:arg}}",
-      "option": "slovak"
-    },
-    "csprimeson": {
-      "option": "czech"
-    },
-    "csprimesoff": {
-      "option": "czech"
-    },
-    "sq": {
-      "option": "slovak"
-    },
-    "lcaron": {
-      "option": "slovak"
-    },
-    "Lcaron": {
-      "option": "slovak"
-    },
-    "clqq": {
-      "option": "slovak"
-    },
-    "crqq": {
-      "option": "slovak"
-    },
-    "clq": {
-      "option": "slovak"
-    },
-    "crq": {
-      "option": "slovak"
-    },
-    "captionsdanish": {
-      "option": "danish"
-    },
-    "datedanish": {
-      "option": "danish"
-    },
-    "extrasdanish": {
-      "option": "danish"
-    },
-    "noextrasdanish": {
-      "option": "danish"
-    },
-    "captionsdutch": {
-      "option": "dutch"
-    },
-    "datedutch": {
-      "option": "dutch"
-    },
-    "extrasdutch": {
-      "option": "dutch"
-    },
-    "noextrasdutch": {
-      "option": "dutch"
-    },
-    "dutchhyphenmins": {
-      "option": "dutch"
-    },
-    "captionsafrikaans": {
-      "option": "afrikaans"
-    },
-    "dateafrikaans": {
-      "option": "afrikaans"
-    },
-    "extrasafrikaans": {
-      "option": "afrikaans"
-    },
-    "noextrasafrikaans": {
-      "option": "afrikaans"
-    },
-    "afrikaanshyphenmins": {
-      "option": "afrikaans"
-    },
-    "captionsenglish": {
-      "option": "english"
-    },
-    "dateenglish": {
-      "option": "english"
-    },
-    "extrasenglish": {
-      "option": "english"
-    },
-    "noextrasenglish": {
-      "option": "english"
-    },
-    "englishhyphenmins": {
-      "option": "mongolian"
-    },
-    "britishhyphenmins": {
-      "option": "USenglish"
-    },
-    "americanhyphenmins": {
-      "option": "USenglish"
-    },
-    "captionsamerican": {
-      "option": "american"
-    },
-    "dateamerican": {
-      "option": "american"
-    },
-    "extrasamerican": {
-      "option": "american"
-    },
-    "noextrasamerican": {
-      "option": "american"
-    },
-    "captionsaustralian": {
-      "option": "australian"
-    },
-    "dateaustralian": {
-      "option": "australian"
-    },
-    "extrasaustralian": {
-      "option": "australian"
-    },
-    "noextrasaustralian": {
-      "option": "australian"
-    },
-    "australianhyphenmins": {
-      "option": "australian"
-    },
-    "captionsbritish": {
-      "option": "british"
-    },
-    "datebritish": {
-      "option": "british"
-    },
-    "extrasbritish": {
-      "option": "british"
-    },
-    "noextrasbritish": {
-      "option": "british"
-    },
-    "captionscanadian": {
-      "option": "canadian"
-    },
-    "datecanadian": {
-      "option": "canadian"
-    },
-    "extrascanadian": {
-      "option": "canadian"
-    },
-    "noextrascanadian": {
-      "option": "canadian"
-    },
-    "canadianhyphenmins": {
-      "option": "canadian"
-    },
-    "captionsnewzealand": {
-      "option": "newzealand"
-    },
-    "datenewzealand": {
-      "option": "newzealand"
-    },
-    "extrasnewzealand": {
-      "option": "newzealand"
-    },
-    "noextrasnewzealand": {
-      "option": "newzealand"
-    },
-    "newzealandhyphenmins": {
-      "option": "newzealand"
-    },
-    "captionsUKenglish": {
-      "option": "UKenglish"
-    },
-    "dateUKenglish": {
-      "option": "UKenglish"
-    },
-    "extrasUKenglish": {
-      "option": "UKenglish"
-    },
-    "noextrasUKenglish": {
-      "option": "UKenglish"
-    },
-    "captionsUSenglish": {
-      "option": "USenglish"
-    },
-    "dateUSenglish": {
-      "option": "USenglish"
-    },
-    "extrasUSenglish": {
-      "option": "USenglish"
-    },
-    "noextrasUSenglish": {
-      "option": "USenglish"
-    },
-    "captionsesperanto": {
-      "option": "esperanto"
-    },
-    "dateesperanto": {
-      "option": "esperanto"
-    },
-    "extrasesperanto": {
-      "option": "esperanto"
-    },
-    "noextrasesperanto": {
-      "option": "esperanto"
-    },
-    "Esper{}": {
-      "snippet": "Esper{${1:counter}}",
-      "option": "esperanto"
-    },
-    "esper{}": {
-      "snippet": "esper{${1:counter}}",
-      "option": "esperanto"
-    },
-    "hodiau": {
-      "option": "esperanto"
-    },
-    "hodiaun": {
-      "option": "esperanto"
-    },
-    "captionsestonian": {
-      "option": "estonian"
-    },
-    "dateestonian": {
-      "option": "estonian"
-    },
-    "extrasestonian": {
-      "option": "estonian"
-    },
-    "noextrasestonian": {
-      "option": "estonian"
-    },
-    "estonianhyphenmins": {
-      "option": "estonian"
-    },
-    "captionsfinnish": {
-      "option": "finnish"
-    },
-    "datefinnish": {
-      "option": "finnish"
-    },
-    "extrasfinnish": {
-      "option": "finnish"
-    },
-    "noextrasfinnish": {
-      "option": "finnish"
-    },
-    "finnishhyphenmins": {
-      "option": "finnish"
-    },
-    "frenchsetup{}": {
-      "snippet": "frenchsetup{${1:options}}",
-      "option": "acadian",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "frenchbsetup{}": {
-      "snippet": "frenchbsetup{${1:options}}",
-      "option": "acadian",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "AddThinSpaceBeforeFootnotes": {
-      "option": "acadian"
-    },
-    "AutoSpaceBeforeFDP": {
-      "option": "acadian"
-    },
-    "bname{}": {
-      "snippet": "bname{${1:text}}",
-      "option": "acadian"
-    },
-    "bsc{}": {
-      "snippet": "bsc{${1:text}}",
-      "option": "acadian"
-    },
-    "CaptionSeparator": {
-      "option": "acadian"
-    },
-    "captionsfrench": {
-      "option": "acadian"
-    },
-    "dateacadian": {
-      "option": "acadian"
-    },
-    "datefrench": {
-      "option": "acadian"
-    },
-    "DecimalMathComma": {
-      "option": "acadian"
-    },
-    "degres": {
-      "option": "acadian"
-    },
-    "descindentFB": {
-      "option": "acadian"
-    },
-    "dotFFN": {
-      "option": "acadian"
-    },
-    "extrasfrench": {
-      "option": "acadian"
-    },
-    "FBcolonspace": {
-      "option": "acadian"
-    },
-    "FBdatebox": {
-      "option": "acadian"
-    },
-    "FBdatespace": {
-      "option": "acadian"
-    },
-    "FBeverylineguill": {
-      "option": "acadian"
-    },
-    "FBfigtabshape": {
-      "option": "acadian"
-    },
-    "FBfnindent": {
-      "option": "acadian"
-    },
-    "FBfnmarkspace": {
-      "option": "acadian"
-    },
-    "FBFrenchFootnotesfalse": {
-      "option": "acadian"
-    },
-    "FBFrenchFootnotestrue": {
-      "option": "acadian"
-    },
-    "FBFrenchSuperscriptstrue": {
-      "option": "acadian"
-    },
-    "FBGlobalLayoutFrenchtrue": {
-      "option": "acadian"
-    },
-    "FBgspchar": {
-      "option": "acadian"
-    },
-    "FBguillopen": {
-      "option": "acadian"
-    },
-    "FBguillspace": {
-      "option": "acadian"
-    },
-    "FBInnerGuillSinglefalse": {
-      "option": "acadian"
-    },
-    "FBInnerGuillSingletrue": {
-      "option": "acadian"
-    },
-    "FBListItemsAsParfalse": {
-      "option": "acadian"
-    },
-    "FBListItemsAsPartrue": {
-      "option": "acadian"
-    },
-    "FBLowercaseSuperscriptstrue": {
-      "option": "acadian"
-    },
-    "FBmedkern": {
-      "option": "acadian"
-    },
-    "FBPartNameFulltrue": {
-      "option": "acadian"
-    },
-    "FBsetspaces[]{}{}{}{}": {
-      "snippet": "FBsetspaces[${5:language}]{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
-      "option": "acadian"
-    },
-    "FBsetspaces{}{}{}{}": {
-      "snippet": "FBsetspaces{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
-      "option": "acadian"
-    },
-    "FBSmallCapsFigTabCaptionstrue": {
-      "option": "acadian"
-    },
-    "FBStandardEnumerateEnvtrue": {
-      "option": "acadian"
-    },
-    "FBStandardItemizeEnvtrue": {
-      "option": "acadian"
-    },
-    "FBStandardItemLabelstrue": {
-      "option": "acadian"
-    },
-    "FBStandardLayouttrue": {
-      "option": "acadian"
-    },
-    "FBStandardListSpacingtrue": {
-      "option": "acadian"
-    },
-    "FBStandardListstrue": {
-      "option": "acadian"
-    },
-    "FBsupR": {
-      "option": "acadian"
-    },
-    "FBsupS": {
-      "option": "acadian"
-    },
-    "FBtextellipsis": {
-      "option": "acadian"
-    },
-    "FBthickkern": {
-      "option": "acadian"
-    },
-    "FBthinspace": {
-      "option": "acadian"
-    },
-    "FBthousandsep": {
-      "option": "acadian"
-    },
-    "FBWarning{}": {
-      "snippet": "FBWarning{${1:message}}",
-      "option": "acadian"
-    },
-    "fg": {
-      "option": "acadian"
-    },
-    "fgi": {
-      "option": "acadian"
-    },
-    "fgii": {
-      "option": "acadian"
-    },
-    "fprimo)": {
-      "option": "acadian"
-    },
-    "frenchdate{}{}{}": {
-      "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
-      "option": "acadian"
-    },
-    "FrenchEnumerate{}": {
-      "snippet": "FrenchEnumerate{${1:arg}}",
-      "option": "acadian"
-    },
-    "FrenchFootnotes": {
-      "option": "acadian"
-    },
-    "FrenchLabelItem": {
-      "option": "acadian"
-    },
-    "frenchpartfirst": {
-      "option": "acadian"
-    },
-    "frenchpartsecond": {
-      "option": "acadian"
-    },
-    "FrenchPopularEnumerate{}": {
-      "snippet": "FrenchPopularEnumerate{${1:arg}}",
-      "option": "acadian"
-    },
-    "frenchtoday": {
-      "option": "acadian"
-    },
-    "Frlabelitemi": {
-      "option": "acadian"
-    },
-    "Frlabelitemii": {
-      "option": "acadian"
-    },
-    "Frlabelitemiii": {
-      "option": "acadian"
-    },
-    "Frlabelitemiv": {
-      "option": "acadian"
-    },
-    "frquote{}": {
-      "snippet": "frquote{${1:text}}",
-      "option": "acadian"
-    },
-    "fup{}": {
-      "snippet": "fup{${1:text}}",
-      "option": "acadian"
-    },
-    "ieme": {
-      "option": "acadian"
-    },
-    "iemes": {
-      "option": "acadian"
-    },
-    "ier": {
-      "option": "acadian"
-    },
-    "iere": {
-      "option": "acadian"
-    },
-    "ieres": {
-      "option": "acadian"
-    },
-    "iers": {
-      "option": "acadian"
-    },
-    "ifFBAutoSpaceFootnotes": {
-      "option": "acadian"
-    },
-    "ifFBCompactItemize": {
-      "option": "acadian"
-    },
-    "ifFBCustomiseFigTabCaptions": {
-      "option": "acadian"
-    },
-    "ifFBfrench": {
-      "option": "acadian"
-    },
-    "ifFBFrenchFootnotes": {
-      "option": "acadian"
-    },
-    "ifFBFrenchSuperscripts": {
-      "option": "acadian"
-    },
-    "ifFBGlobalLayoutFrench": {
-      "option": "acadian"
-    },
-    "ifFBIndentFirst": {
-      "option": "acadian"
-    },
-    "ifFBINGuillSpace": {
-      "option": "acadian"
-    },
-    "ifFBListItemsAsPar": {
-      "option": "acadian"
-    },
-    "ifFBListOldLayout": {
-      "option": "acadian"
-    },
-    "ifFBLowercaseSuperscripts": {
-      "option": "acadian"
-    },
-    "ifFBLuaTeX": {
-      "option": "acadian"
-    },
-    "ifFBOldFigTabCaptions": {
-      "option": "acadian"
-    },
-    "ifFBOriginalTypewriter": {
-      "option": "acadian"
-    },
-    "ifFBPartNameFull": {
-      "option": "acadian"
-    },
-    "ifFBShowOptions": {
-      "option": "acadian"
-    },
-    "ifFBSmallCapsFigTabCaptions": {
-      "option": "acadian"
-    },
-    "ifFBStandardEnumerateEnv": {
-      "option": "acadian"
-    },
-    "ifFBStandardItemizeEnv": {
-      "option": "acadian"
-    },
-    "ifFBStandardItemLabels": {
-      "option": "acadian"
-    },
-    "ifFBStandardLayout": {
-      "option": "acadian"
-    },
-    "ifFBStandardLists": {
-      "option": "acadian"
-    },
-    "ifFBStandardListSpacing": {
-      "option": "acadian"
-    },
-    "ifFBSuppressWarning": {
-      "option": "acadian"
-    },
-    "ifFBThinColonSpace": {
-      "option": "acadian"
-    },
-    "ifFBThinSpaceInFrenchNumbers": {
-      "option": "acadian"
-    },
-    "ifFBunicode": {
-      "option": "acadian"
-    },
-    "ifFBXeTeX": {
-      "option": "acadian"
-    },
-    "ifLaTeXe": {
-      "option": "acadian"
-    },
-    "kernFFN": {
-      "option": "acadian"
-    },
-    "labelindentFB": {
-      "option": "acadian"
-    },
-    "labelwidthFB": {
-      "option": "acadian"
-    },
-    "leftmarginFB": {
-      "option": "acadian"
-    },
-    "listfigurename": {
-      "option": "acadian"
-    },
-    "listindentFB": {
-      "option": "acadian"
-    },
-    "no": {
-      "option": "acadian"
-    },
-    "NoAutoSpaceBeforeFDP": {
-      "option": "acadian"
-    },
-    "NoAutoSpacing": {
-      "option": "acadian"
-    },
-    "NoEveryParQuote": {
-      "option": "acadian"
-    },
-    "noextrasfrench": {
-      "option": "acadian"
-    },
-    "nombre{}": {
-      "snippet": "nombre{${1:arg}}",
-      "option": "acadian"
-    },
-    "nos": {
-      "option": "acadian"
-    },
-    "Nos": {
-      "option": "acadian"
-    },
-    "og": {
-      "option": "acadian"
-    },
-    "ogi": {
-      "option": "acadian"
-    },
-    "ogii": {
-      "option": "acadian"
-    },
-    "parindentFFN": {
-      "option": "acadian"
-    },
-    "partfirst": {
-      "option": "acadian"
-    },
-    "partnameord": {
-      "option": "acadian"
-    },
-    "partsecond": {
-      "option": "acadian"
-    },
-    "primo": {
-      "option": "acadian"
-    },
-    "quarto": {
-      "option": "acadian"
-    },
-    "rmfamilyFB": {
-      "option": "acadian"
-    },
-    "secundo": {
-      "option": "acadian"
-    },
-    "sffamilyFB": {
-      "option": "acadian"
-    },
-    "StandardFootnotes": {
-      "option": "acadian"
-    },
-    "StandardMathComma": {
-      "option": "acadian"
-    },
-    "tertio": {
-      "option": "acadian"
-    },
-    "ttfamilyFB": {
-      "option": "acadian"
-    },
-    "xspace": {
-      "option": "acadian"
-    },
-    "acadiandate{}{}{}": {
-      "snippet": "acadiandate{${1:day}}{${2:month}}{${3:year}}",
-      "option": "acadian"
-    },
-    "acadiantoday": {
-      "option": "acadian"
-    },
-    "captionsacadian": {
-      "option": "acadian"
-    },
-    "extrasacadian": {
-      "option": "acadian"
-    },
-    "noextrasacadian": {
-      "option": "acadian"
-    },
-    "captionsfriulan": {
-      "option": "friulan"
-    },
-    "datefriulan": {
-      "option": "friulan"
-    },
-    "extrasfriulan": {
-      "option": "friulan"
-    },
-    "noextrasfriulan": {
-      "option": "friulan"
-    },
-    "friulanhyphenmins": {
-      "option": "friulan"
-    },
-    "captionsgalician": {
-      "option": "galician"
-    },
-    "dategalician": {
-      "option": "galician"
-    },
-    "extrasgalician": {
-      "option": "galician"
-    },
-    "noextrasgalician": {
-      "option": "galician"
-    },
-    "selectgalician": {
-      "option": "galician"
-    },
-    "selectgalician*": {
-      "option": "galician"
-    },
-    "layoutgalician": {
-      "option": "galician"
-    },
-    "textgalician": {
-      "option": "galician"
-    },
-    "shorthandsgalician": {
-      "option": "galician"
-    },
-    "mathgalician": {
-      "option": "galician"
-    },
-    "galiciandatedo": {
-      "option": "galician"
-    },
-    "galiciandatede": {
-      "option": "galician"
-    },
-    "deactivatetilden": {
-      "option": "galician"
-    },
-    "galiciandeactivate{}": {
-      "snippet": "galiciandeactivate{${1:characters}}",
-      "option": "galician"
-    },
-    "decimalcomma": {
-      "option": "spanish"
-    },
-    "decimalpoint": {
-      "option": "spanish"
-    },
-    "galiciandecimal{}": {
-      "snippet": "galiciandecimal{${1:math}}",
-      "option": "galician"
-    },
-    "sptext{}": {
-      "snippet": "sptext{${1:text}}",
-      "option": "spanish"
-    },
-    "sptextfont": {
-      "option": "galician"
-    },
-    "accentedoperators": {
-      "option": "spanish"
-    },
-    "unaccentedoperators": {
-      "option": "spanish"
-    },
-    "spacedoperators": {
-      "option": "spanish"
-    },
-    "unspacedoperators": {
-      "option": "spanish"
-    },
-    "lquoti": {
-      "option": "spanish"
-    },
-    "rquoti": {
-      "option": "spanish"
-    },
-    "lquotii": {
-      "option": "spanish"
-    },
-    "rquotii": {
-      "option": "spanish"
-    },
-    "lquotiii": {
-      "option": "spanish"
-    },
-    "rquotiii": {
-      "option": "spanish"
-    },
-    "activatequoting": {
-      "option": "spanish"
-    },
-    "deactivatequoting": {
-      "option": "spanish"
-    },
-    "lsc{}": {
-      "snippet": "lsc{${1:text}}",
-      "option": "spanish"
-    },
-    "msc{}": {
-      "snippet": "msc{${1:text}}",
-      "option": "galician"
-    },
-    "captionsgerman": {
-      "option": "german"
-    },
-    "dategerman": {
-      "option": "german"
-    },
-    "extrasgerman": {
-      "option": "german"
-    },
-    "noextrasgerman": {
-      "option": "german"
-    },
-    "tosstrue": {
-      "option": "swissgerman"
-    },
-    "tossfalse": {
-      "option": "swissgerman"
-    },
-    "mdqon": {
-      "option": "uppersorbian"
-    },
-    "mdqoff": {
-      "option": "uppersorbian"
-    },
-    "ck": {
-      "option": "uppersorbian"
-    },
-    "ifcapsz": {
-      "option": "swissgerman"
-    },
-    "capsztrue": {
-      "option": "swissgerman"
-    },
-    "capszfalse": {
-      "option": "swissgerman"
-    },
-    "mkngender": {
-      "option": "swissgerman"
-    },
-    "captionsaustrian": {
-      "option": "austrian"
-    },
-    "dateaustrian": {
-      "option": "austrian"
-    },
-    "extrasaustrian": {
-      "option": "austrian"
-    },
-    "noextrasaustrian": {
-      "option": "austrian"
-    },
-    "captionsswissgerman": {
-      "option": "swissgerman"
-    },
-    "dateswissgerman": {
-      "option": "swissgerman"
-    },
-    "extrasswissgerman": {
-      "option": "swissgerman"
-    },
-    "noextrasswissgerman": {
-      "option": "swissgerman"
-    },
-    "captionsngerman": {
-      "option": "ngerman"
-    },
-    "datengerman": {
-      "option": "ngerman"
-    },
-    "extrasngerman": {
-      "option": "ngerman"
-    },
-    "noextrasngerman": {
-      "option": "ngerman"
-    },
-    "ntosstrue": {
-      "option": "nswissgerman"
-    },
-    "ntossfalse": {
-      "option": "nswissgerman"
-    },
-    "captionsnaustrian": {
-      "option": "naustrian"
-    },
-    "datenaustrian": {
-      "option": "naustrian"
-    },
-    "extrasnaustrian": {
-      "option": "naustrian"
-    },
-    "noextrasnaustrian": {
-      "option": "naustrian"
-    },
-    "captionsnswissgerman": {
-      "option": "nswissgerman"
-    },
-    "datenswissgerman": {
-      "option": "nswissgerman"
-    },
-    "extrasnswissgerman": {
-      "option": "nswissgerman"
-    },
-    "noextrasnswissgerman": {
-      "option": "nswissgerman"
-    },
-    "captionsgreek": {
-      "option": "greek.ancient"
-    },
-    "dategreek": {
-      "option": "greek.ancient"
-    },
-    "extrasgreek": {
-      "option": "greek.ancient"
-    },
-    "noextrasgreek": {
-      "option": "greek.ancient"
-    },
-    "greekscript": {
-      "option": "greek.ancient"
-    },
-    "greektext": {
-      "option": "greek.ancient"
-    },
-    "ensuregreek{}": {
-      "snippet": "ensuregreek{${1:text}}",
-      "option": "greek.ancient"
-    },
-    "lgrfont{}": {
-      "snippet": "lgrfont{${1:text}}",
-      "option": "greek"
-    },
-    "textgreek{}": {
-      "snippet": "textgreek{${1:text}}",
-      "option": "greek.ancient"
-    },
-    "greeknumeral{}": {
-      "snippet": "greeknumeral{${1:number}}",
-      "option": "greek.ancient"
-    },
-    "Greeknumeral{}": {
-      "snippet": "Greeknumeral{${1:number}}",
-      "option": "greek.ancient"
-    },
-    "greeknumeralsix": {
-      "option": "greek"
-    },
-    "greeknumeralSix": {
-      "option": "greek"
-    },
-    "greeknumeralninety": {
-      "option": "greek"
-    },
-    "greeknumeralNinety": {
-      "option": "greek"
-    },
-    "greekfontencoding": {
-      "option": "greek.ancient"
-    },
-    "BabelGreekRestoreFontEncoding": {
-      "option": "greek"
-    },
-    "BabelGreekPreviousFontEncoding": {
-      "option": "greek"
-    },
-    "EnsureStandardFontEncoding": {
-      "option": "greek"
-    },
-    "textol{}": {
-      "snippet": "textol{${1:text}}",
-      "option": "greek.ancient"
-    },
-    "outlfamily": {
-      "option": "greek.ancient"
-    },
-    "greekhyphenmins": {
-      "option": "greek.ancient"
-    },
-    "Grtoday": {
-      "option": "greek.ancient"
-    },
-    "anwtonos": {
-      "option": "greek.ancient"
-    },
-    "katwtonos": {
-      "option": "greek.ancient"
-    },
-    "qoppa": {
-      "option": "greek.ancient",
-      "detail": "ϙ",
-      "documentation": "GREEK SMALL LETTER ARCHAIC KOPPA"
-    },
-    "varqoppa": {
-      "option": "greek.ancient"
-    },
-    "stigma": {
-      "option": "greek.ancient",
-      "detail": "ϛ",
-      "documentation": "GREEK SMALL LETTER STIGMA"
-    },
-    "sampi": {
-      "option": "greek.ancient",
-      "detail": "ϡ",
-      "documentation": "GREEK SMALL LETTER SAMPI"
-    },
-    "Digamma": {
-      "option": "greek.ancient",
-      "detail": "Ϝ",
-      "documentation": "capital digamma"
-    },
-    "ddigamma": {
-      "option": "greek.ancient"
-    },
-    "euro": {
-      "option": "greek.ancient",
-      "detail": "€",
-      "documentation": "EURO SIGN"
-    },
-    "permill": {
-      "option": "greek.ancient"
-    },
-    "textAlpha": {
-      "option": "greek.ancient"
-    },
-    "textBeta": {
-      "option": "greek.ancient"
-    },
-    "textGamma": {
-      "option": "greek.ancient"
-    },
-    "textDelta": {
-      "option": "greek.ancient"
-    },
-    "textEpsilon": {
-      "option": "greek.ancient"
-    },
-    "textZeta": {
-      "option": "greek.ancient"
-    },
-    "textEta": {
-      "option": "greek.ancient"
-    },
-    "textTheta": {
-      "option": "greek.ancient"
-    },
-    "textIota": {
-      "option": "greek.ancient"
-    },
-    "textKappa": {
-      "option": "greek.ancient"
-    },
-    "textLambda": {
-      "option": "greek.ancient"
-    },
-    "textMu": {
-      "option": "greek.ancient"
-    },
-    "textNu": {
-      "option": "greek.ancient"
-    },
-    "textXi": {
-      "option": "greek.ancient"
-    },
-    "textOmicron": {
-      "option": "greek.ancient"
-    },
-    "textPi": {
-      "option": "greek.ancient"
-    },
-    "textRho": {
-      "option": "greek.ancient"
-    },
-    "textSigma": {
-      "option": "greek.ancient"
-    },
-    "textTau": {
-      "option": "greek.ancient"
-    },
-    "textUpsilon": {
-      "option": "greek.ancient"
-    },
-    "textPhi": {
-      "option": "greek.ancient"
-    },
-    "textChi": {
-      "option": "greek.ancient"
-    },
-    "textPsi": {
-      "option": "greek.ancient"
-    },
-    "textOmega": {
-      "option": "greek.ancient"
-    },
-    "textalpha": {
-      "option": "greek.ancient"
-    },
-    "textbeta": {
-      "option": "greek.ancient"
-    },
-    "textgamma": {
-      "option": "greek.ancient"
-    },
-    "textdelta": {
-      "option": "greek.ancient"
-    },
-    "textepsilon": {
-      "option": "greek.ancient"
-    },
-    "textzeta": {
-      "option": "greek.ancient"
-    },
-    "texteta": {
-      "option": "greek.ancient"
-    },
-    "texttheta": {
-      "option": "greek.ancient"
-    },
-    "textiota": {
-      "option": "greek.ancient"
-    },
-    "textkappa": {
-      "option": "greek.ancient"
-    },
-    "textlambda": {
-      "option": "greek.ancient"
-    },
-    "textmu": {
-      "option": "greek.ancient"
-    },
-    "textnu": {
-      "option": "greek.ancient"
-    },
-    "textxi": {
-      "option": "greek.ancient"
-    },
-    "textomicron": {
-      "option": "greek.ancient"
-    },
-    "textpi": {
-      "option": "greek.ancient"
-    },
-    "textrho": {
-      "option": "greek.ancient"
-    },
-    "textsigma": {
-      "option": "greek.ancient"
-    },
-    "textfinalsigma": {
-      "option": "greek.ancient"
-    },
-    "textautosigma": {
-      "option": "greek.ancient"
-    },
-    "texttau": {
-      "option": "greek.ancient"
-    },
-    "textupsilon": {
-      "option": "greek.ancient"
-    },
-    "textphi": {
-      "option": "greek.ancient"
-    },
-    "textchi": {
-      "option": "greek.ancient"
-    },
-    "textpsi": {
-      "option": "greek.ancient"
-    },
-    "textomega": {
-      "option": "greek.ancient"
-    },
-    "textpentedeka": {
-      "option": "greek.ancient"
-    },
-    "textpentehekaton": {
-      "option": "greek.ancient"
-    },
-    "textpenteqilioi": {
-      "option": "greek.ancient"
-    },
-    "textstigma": {
-      "option": "greek.ancient"
-    },
-    "textvarstigma": {
-      "option": "greek.ancient"
-    },
-    "textKoppa": {
-      "option": "greek.ancient"
-    },
-    "textkoppa": {
-      "option": "greek.ancient"
-    },
-    "textqoppa": {
-      "option": "greek.ancient"
-    },
-    "textQoppa": {
-      "option": "greek.ancient"
-    },
-    "textStigma": {
-      "option": "greek.ancient"
-    },
-    "textSampi": {
-      "option": "greek.ancient"
-    },
-    "textsampi": {
-      "option": "greek.ancient"
-    },
-    "textanoteleia": {
-      "option": "greek.ancient"
-    },
-    "texterotimatiko": {
-      "option": "greek.ancient"
-    },
-    "textdigamma": {
-      "option": "greek.ancient"
-    },
-    "textDigamma": {
-      "option": "greek.ancient"
-    },
-    "textdexiakeraia": {
-      "option": "greek.ancient"
-    },
-    "textaristerikeraia": {
-      "option": "greek.ancient"
-    },
-    "textvarsigma": {
-      "option": "greek.ancient"
-    },
-    "textstigmagreek": {
-      "option": "greek.ancient"
-    },
-    "textkoppagreek": {
-      "option": "greek.ancient"
-    },
-    "textStigmagreek": {
-      "option": "greek.ancient"
-    },
-    "textSampigreek": {
-      "option": "greek.ancient"
-    },
-    "textsampigreek": {
-      "option": "greek.ancient"
-    },
-    "textdigammagreek": {
-      "option": "greek.ancient"
-    },
-    "textDigammagreek": {
-      "option": "greek.ancient"
-    },
-    "textnumeralsigngreek": {
-      "option": "greek.ancient"
-    },
-    "textnumeralsignlowergreek": {
-      "option": "greek.ancient"
-    },
-    "textpentemuria": {
-      "option": "greek.ancient"
-    },
-    "textpercent": {
-      "option": "greek.ancient"
-    },
-    "textmicro": {
-      "option": "greek.ancient"
-    },
-    "textschwa": {
-      "option": "greek.ancient"
-    },
-    "textampersand": {
-      "option": "greek.ancient"
-    },
-    "textvarbeta": {
-      "option": "greek.ancient"
-    },
-    "textvarkappa": {
-      "option": "greek.ancient"
-    },
-    "textvarTheta": {
-      "option": "greek.ancient"
-    },
-    "textvartheta": {
-      "option": "greek.ancient"
-    },
-    "textvarpi": {
-      "option": "greek.ancient"
-    },
-    "textvarrho": {
-      "option": "greek.ancient"
-    },
-    "textvarepsilon": {
-      "option": "greek.ancient"
-    },
-    "textvarphi": {
-      "option": "greek.ancient"
-    },
-    "accdialytika{}": {
-      "snippet": "accdialytika{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "acctonos{}": {
-      "snippet": "acctonos{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accdasia{}": {
-      "snippet": "accdasia{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accpsili{}": {
-      "snippet": "accpsili{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accvaria{}": {
-      "snippet": "accvaria{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accperispomeni{}": {
-      "snippet": "accperispomeni{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "prosgegrammeni": {
-      "option": "greek.ancient"
-    },
-    "ypogegrammeni": {
-      "option": "greek.ancient"
-    },
-    "accdialytikaperispomeni{}": {
-      "snippet": "accdialytikaperispomeni{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accdialytikatonos{}": {
-      "snippet": "accdialytikatonos{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accdialytikavaria{}": {
-      "snippet": "accdialytikavaria{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accdasiaperispomeni{}": {
-      "snippet": "accdasiaperispomeni{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accdasiavaria{}": {
-      "snippet": "accdasiavaria{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accdasiaoxia{}": {
-      "snippet": "accdasiaoxia{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accpsiliperispomeni{}": {
-      "snippet": "accpsiliperispomeni{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accpsilioxia{}": {
-      "snippet": "accpsilioxia{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accpsilivaria{}": {
-      "snippet": "accpsilivaria{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accinvertedbrevebelow{}": {
-      "snippet": "accinvertedbrevebelow{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "textsubarch{}": {
-      "snippet": "textsubarch{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "accbrevebelow{}": {
-      "snippet": "accbrevebelow{${1:arg}}",
-      "option": "greek.ancient"
-    },
-    "captionspolutonikogreek": {
-      "option": "greek.polutoniko"
-    },
-    "datepolutonikogreek": {
-      "option": "greek.polutoniko"
-    },
-    "extraspolutonikogreek": {
-      "option": "greek.polutoniko"
-    },
-    "noextraspolutonikogreek": {
-      "option": "greek.polutoniko"
-    },
-    "captionsancientgreek": {
-      "option": "greek.ancient"
-    },
-    "extrasancientgreek": {
-      "option": "greek.ancient"
-    },
-    "captionsicelandic": {
-      "option": "icelandic"
-    },
-    "dateicelandic": {
-      "option": "icelandic"
-    },
-    "extrasicelandic": {
-      "option": "icelandic"
-    },
-    "noextrasicelandic": {
-      "option": "icelandic"
-    },
-    "tala{}": {
-      "snippet": "tala{${1:arg}}",
-      "option": "icelandic"
-    },
-    "grada{}": {
-      "snippet": "grada{${1:arg}}",
-      "option": "icelandic"
-    },
-    "gradur{}": {
-      "snippet": "gradur{${1:arg}}",
-      "option": "icelandic"
-    },
-    "upp{}": {
-      "snippet": "upp{${1:arg}}",
-      "option": "icelandic"
-    },
-    "ilqq": {
-      "option": "icelandic"
-    },
-    "irqq": {
-      "option": "icelandic"
-    },
-    "ilq": {
-      "option": "icelandic"
-    },
-    "irq": {
-      "option": "icelandic"
-    },
-    "iflqq": {
-      "option": "icelandic"
-    },
-    "ifrqq": {
-      "option": "icelandic"
-    },
-    "ifrq": {
-      "option": "icelandic"
-    },
-    "iflq": {
-      "option": "icelandic"
-    },
-    "oob": {
-      "option": "icelandic"
-    },
-    "Oob": {
-      "option": "icelandic"
-    },
-    "ooob": {
-      "option": "icelandic"
-    },
-    "OOob": {
-      "option": "icelandic"
-    },
-    "eob": {
-      "option": "polish"
-    },
-    "Eob": {
-      "option": "polish"
-    },
-    "eeob": {
-      "option": "icelandic"
-    },
-    "EEob": {
-      "option": "icelandic"
-    },
-    "captionsindonesian": {
-      "option": "indonesian"
-    },
-    "dateindonesian": {
-      "option": "indonesian"
-    },
-    "extrasindonesian": {
-      "option": "indonesian"
-    },
-    "noextrasindonesian": {
-      "option": "indonesian"
-    },
-    "indonesianhyphenmins": {
-      "option": "indonesian"
-    },
-    "captionsbahasa": {
-      "option": "bahasa"
-    },
-    "datebahasa": {
-      "option": "bahasa"
-    },
-    "extrasbahasa": {
-      "option": "bahasa"
-    },
-    "noextrasbahasa": {
-      "option": "bahasa"
-    },
-    "bahasahyphenmins": {
-      "option": "bahasa"
-    },
-    "captionsindon": {
-      "option": "indon"
-    },
-    "dateindon": {
-      "option": "indon"
-    },
-    "extrasindon": {
-      "option": "indon"
-    },
-    "noextrasindon": {
-      "option": "indon"
-    },
-    "indonhyphenmins": {
-      "option": "indon"
-    },
-    "captionsbahasai": {
-      "option": "bahasai"
-    },
-    "datebahasai": {
-      "option": "bahasai"
-    },
-    "extrasbahasai": {
-      "option": "bahasai"
-    },
-    "noextrasbahasai": {
-      "option": "bahasai"
-    },
-    "bahasaihyphenmins": {
-      "option": "bahasai"
-    },
-    "captionsinterlingua": {
-      "option": "interlingua"
-    },
-    "dateinterlingua": {
-      "option": "interlingua"
-    },
-    "extrasinterlingua": {
-      "option": "interlingua"
-    },
-    "noextrasinterlingua": {
-      "option": "interlingua"
-    },
-    "interlinguahyphenmins": {
-      "option": "interlingua"
-    },
-    "captionsirish": {
-      "option": "irish"
-    },
-    "dateirish": {
-      "option": "irish"
-    },
-    "extrasirish": {
-      "option": "irish"
-    },
-    "noextrasirish": {
-      "option": "irish"
-    },
-    "irishhyphenmins": {
-      "option": "irish"
-    },
-    "captionsitalian": {
-      "option": "italian"
-    },
-    "dateitalian": {
-      "option": "italian"
-    },
-    "extrasitalian": {
-      "option": "italian"
-    },
-    "noextrasitalian": {
-      "option": "italian"
-    },
-    "italianhyphenmins": {
-      "option": "italian"
-    },
-    "setactivedoublequote": {
-      "option": "italian"
-    },
-    "setISOcompliance": {
-      "option": "italian"
-    },
-    "IntelligentComma": {
-      "option": "italian"
-    },
-    "NoIntelligentComma": {
-      "option": "italian"
-    },
-    "XXIletters": {
-      "option": "italian"
-    },
-    "XXVIletters": {
-      "option": "italian"
-    },
-    "ap{}": {
-      "snippet": "ap{${1:text}}",
-      "option": "italian"
-    },
-    "ped{}": {
-      "snippet": "ped{${1:text}}",
-      "option": "italian"
-    },
-    "unit{}": {
-      "snippet": "unit{${1:unit}}",
-      "option": "italian"
-    },
-    "virgola": {
-      "option": "italian"
-    },
-    "virgoladecimale": {
-      "option": "italian"
-    },
-    "LtxSymbCaporali": {
-      "option": "italian"
-    },
-    "CaporaliFrom{}{}{}{}": {
-      "snippet": "CaporaliFrom{${1:encoding}}{${2:family}}{${3:open guill slot}}{${4:close guill slot}}",
-      "option": "italian"
-    },
-    "captionsjapanese": {
-      "option": "japanese"
-    },
-    "datejapanese": {
-      "option": "japanese"
-    },
-    "extrasjapanese": {
-      "option": "japanese"
-    },
-    "noextrasjapanese": {
-      "option": "japanese"
-    },
-    "prechaptername": {
-      "option": "japanese"
-    },
-    "postchaptername": {
-      "option": "japanese"
-    },
-    "presectionname": {
-      "option": "japanese"
-    },
-    "postsectionname": {
-      "option": "japanese"
-    },
-    "prepartname": {
-      "option": "japanese"
-    },
-    "postpartname": {
-      "option": "japanese"
-    },
-    "captionskurmanji": {
-      "option": "kurmanji"
-    },
-    "datekurmanji": {
-      "option": "kurmanji"
-    },
-    "extraskurmanji": {
-      "option": "kurmanji"
-    },
-    "noextraskurmanji": {
-      "option": "kurmanji"
-    },
-    "datekurmanjialternate": {
-      "option": "kurmanji"
-    },
-    "kurmanjihyphenmins": {
-      "option": "kurmanji"
-    },
-    "ontoday": {
-      "option": "hungarian"
-    },
-    "datesymd": {
-      "option": "swedish"
-    },
-    "datesdmy": {
-      "option": "swedish"
-    },
-    "dategdmy": {
-      "option": "kurmanji"
-    },
-    "januaryname": {
-      "option": "kurmanji"
-    },
-    "februaryname": {
-      "option": "kurmanji"
-    },
-    "marchname": {
-      "option": "kurmanji"
-    },
-    "aprilname": {
-      "option": "kurmanji"
-    },
-    "mayname": {
-      "option": "kurmanji"
-    },
-    "junename": {
-      "option": "kurmanji"
-    },
-    "julyname": {
-      "option": "kurmanji"
-    },
-    "augustname": {
-      "option": "kurmanji"
-    },
-    "septembername": {
-      "option": "kurmanji"
-    },
-    "octobername": {
-      "option": "kurmanji"
-    },
-    "novembername": {
-      "option": "kurmanji"
-    },
-    "decembername": {
-      "option": "kurmanji"
-    },
-    "captionslatin": {
-      "option": "latin"
-    },
-    "datelatin": {
-      "option": "latin"
-    },
-    "extraslatin": {
-      "option": "latin"
-    },
-    "noextraslatin": {
-      "option": "latin"
-    },
-    "ProsodicMarksOn": {
-      "option": "latin"
-    },
-    "ProsodicMarksOff": {
-      "option": "latin"
-    },
-    "captionsclassiclatin": {
-      "option": "classiclatin"
-    },
-    "dateclassiclatin": {
-      "option": "classiclatin"
-    },
-    "extrasclassiclatin": {
-      "option": "classiclatin"
-    },
-    "noextrasclassiclatin": {
-      "option": "classiclatin"
-    },
-    "captionsecclesiasticlatin": {
-      "option": "ecclesiasticlatin"
-    },
-    "dateecclesiasticlatin": {
-      "option": "ecclesiasticlatin"
-    },
-    "extrasecclesiasticlatin": {
-      "option": "ecclesiasticlatin"
-    },
-    "noextrasecclesiasticlatin": {
-      "option": "ecclesiasticlatin"
-    },
-    "captionsmedievallatin": {
-      "option": "medievallatin"
-    },
-    "datemedievallatin": {
-      "option": "medievallatin"
-    },
-    "extrasmedievallatin": {
-      "option": "medievallatin"
-    },
-    "noextrasmedievallatin": {
-      "option": "medievallatin"
-    },
-    "captionslatvian": {
-      "option": "latvian"
-    },
-    "datelatvian": {
-      "option": "latvian"
-    },
-    "extraslatvian": {
-      "option": "latvian"
-    },
-    "noextraslatvian": {
-      "option": "latvian"
-    },
-    "latvianhyphenmins": {
-      "option": "latvian"
-    },
-    "datumaa": {
-      "option": "latvian"
-    },
-    "datums": {
-      "option": "latvian"
-    },
-    "latviangada": {
-      "option": "latvian"
-    },
-    "latviantoday": {
-      "option": "latvian"
-    },
-    "captionslithuanian": {
-      "option": "lithuanian"
-    },
-    "datelithuanian": {
-      "option": "lithuanian"
-    },
-    "extraslithuanian": {
-      "option": "lithuanian"
-    },
-    "noextraslithuanian": {
-      "option": "lithuanian"
-    },
-    "lithuanianhyphenmins": {
-      "option": "lithuanian"
-    },
-    "captionsmacedonian": {
-      "option": "macedonian"
-    },
-    "datemacedonian": {
-      "option": "macedonian"
-    },
-    "extrasmacedonian": {
-      "option": "macedonian"
-    },
-    "noextrasmacedonian": {
-      "option": "macedonian"
-    },
-    "Macedonian": {
-      "option": "macedonian"
-    },
-    "Mkd": {
-      "option": "macedonian"
-    },
-    "Mk": {
-      "option": "macedonian"
-    },
-    "theoremname": {
-      "option": "macedonian"
-    },
-    "corollaryname": {
-      "option": "macedonian"
-    },
-    "lemmaname": {
-      "option": "macedonian"
-    },
-    "overbar{}": {
-      "snippet": "overbar{${1:arg}}",
-      "option": "macedonian"
-    },
-    "textoverline{}": {
-      "snippet": "textoverline{${1:arg}}",
-      "option": "macedonian"
-    },
-    "overbarshort{}": {
-      "snippet": "overbarshort{${1:arg}}",
-      "option": "macedonian"
-    },
-    "textoverlineshort{}": {
-      "snippet": "textoverlineshort{${1:arg}}",
-      "option": "macedonian"
-    },
-    "IfItalic{}{}": {
-      "snippet": "IfItalic{${1:arg1}}{${2:arg2}}",
-      "option": "macedonian"
-    },
-    "tbar{}": {
-      "snippet": "tbar{${1:arg}}",
-      "option": "macedonian"
-    },
-    "captionsmagyar": {
-      "option": "magyar"
-    },
-    "datemagyar": {
-      "option": "magyar"
-    },
-    "extrasmagyar": {
-      "option": "magyar"
-    },
-    "noextrasmagyar": {
-      "option": "magyar"
-    },
-    "ondatemagyar": {
-      "option": "magyar"
-    },
-    "acite*{}": {
-      "snippet": "acite*{${1:keylist}}",
-      "option": "hungarian"
-    },
-    "Acite*{}": {
-      "snippet": "Acite*{${1:keylist}}",
-      "option": "hungarian"
-    },
-    "acite{}": {
-      "snippet": "acite{${1:keylist}}",
-      "option": "hungarian"
-    },
-    "Acite{}": {
-      "snippet": "Acite{${1:keylist}}",
-      "option": "hungarian"
-    },
-    "apageref*{}": {
-      "snippet": "apageref*{${1:label}}",
-      "option": "hungarian"
-    },
-    "Apageref*{}": {
-      "snippet": "Apageref*{${1:label}}",
-      "option": "hungarian"
-    },
-    "apageref{}": {
-      "snippet": "apageref{${1:label}}",
-      "option": "hungarian"
-    },
-    "Apageref{}": {
-      "snippet": "Apageref{${1:label}}",
-      "option": "hungarian"
-    },
-    "aref({})": {
-      "snippet": "aref(${2:{${1:label}}})",
-      "option": "hungarian"
-    },
-    "Aref({})": {
-      "snippet": "Aref(${2:{${1:label}}})",
-      "option": "hungarian"
-    },
-    "aref*{}": {
-      "snippet": "aref*{${1:label}}",
-      "option": "hungarian"
-    },
-    "Aref*{}": {
-      "snippet": "Aref*{${1:label}}",
-      "option": "hungarian"
-    },
-    "aref{}": {
-      "snippet": "aref{${1:label}}",
-      "option": "hungarian"
-    },
-    "Aref{}": {
-      "snippet": "Aref{${1:label}}",
-      "option": "hungarian"
-    },
-    "az*{}": {
-      "snippet": "az*{${1:szó}}",
-      "option": "hungarian"
-    },
-    "Az*{}": {
-      "snippet": "Az*{${1:szó}}",
-      "option": "hungarian"
-    },
-    "az{}": {
-      "snippet": "az{${1:szó}}",
-      "option": "hungarian"
-    },
-    "Az{}": {
-      "snippet": "Az{${1:szó}}",
-      "option": "hungarian"
-    },
-    "azc{}": {
-      "snippet": "azc{${1:keylist}}",
-      "option": "hungarian"
-    },
-    "Azc{}": {
-      "snippet": "Azc{${1:keylist}}",
-      "option": "hungarian"
-    },
-    "azp{}": {
-      "snippet": "azp{${1:label}}",
-      "option": "hungarian"
-    },
-    "Azp{}": {
-      "snippet": "Azp{${1:label}}",
-      "option": "hungarian"
-    },
-    "azr{}": {
-      "snippet": "azr{${1:label}}",
-      "option": "hungarian"
-    },
-    "Azr{}": {
-      "snippet": "Azr{${1:label}}",
-      "option": "hungarian"
-    },
-    "captionlabeldelim": {
-      "option": "hungarian"
-    },
-    "dMf": {
-      "option": "hungarian"
-    },
-    "editorfootnote{}": {
-      "snippet": "editorfootnote{${1:lábjegyzet-szöveg}}",
-      "option": "hungarian"
-    },
-    "emitdate[]{}{}": {
-      "snippet": "emitdate[${3:toldalék}]{${1:formátum}}{${2:dátum}}",
-      "option": "hungarian"
-    },
-    "emitdate{}{}": {
-      "snippet": "emitdate{${1:formátum}}{${2:dátum}}",
-      "option": "hungarian"
-    },
-    "factorial": {
-      "option": "hungarian"
-    },
-    "footnotestyle{}": {
-      "snippet": "footnotestyle{${1:előírás}}",
-      "option": "hungarian"
-    },
-    "hang{}": {
-      "snippet": "hang{${1:bekezdéskezdő jel}}",
-      "option": "hungarian"
-    },
-    "headingfootnote[]{}": {
-      "snippet": "headingfootnote[${2:szám}]{${1:lábjegyzet-szöveg}}",
-      "option": "hungarian"
-    },
-    "headingfootnote{}": {
-      "snippet": "headingfootnote{${1:lábjegyzet-szöveg}}",
-      "option": "hungarian"
-    },
-    "HuComma": {
-      "option": "hungarian"
-    },
-    "hunnewlabel": {
-      "option": "hungarian"
-    },
-    "Hunumeral{}": {
-      "snippet": "Hunumeral{${1:counter}}",
-      "option": "hungarian"
-    },
-    "hunumeral{}": {
-      "snippet": "hunumeral{${1:counter}}",
-      "option": "hungarian"
-    },
-    "huordinal{}": {
-      "snippet": "huordinal{${1:counter}}",
-      "option": "hungarian"
-    },
-    "Huordinal{}": {
-      "snippet": "Huordinal{${1:counter}}",
-      "option": "hungarian"
-    },
-    "magyarDumpHuMin": {
-      "option": "hungarian"
-    },
-    "makeFootnotable{}": {
-      "snippet": "makeFootnotable{${1:környezet-név}}",
-      "option": "hungarian"
-    },
-    "MathBrk{}": {
-      "snippet": "MathBrk{${1:szimbólum}}",
-      "option": "hungarian"
-    },
-    "MathBrkAll{}": {
-      "snippet": "MathBrkAll{${1:szimbólum}}",
-      "option": "hungarian"
-    },
-    "MathReal{}": {
-      "snippet": "MathReal{${1:képlet tizedestörtekkel}}",
-      "option": "hungarian"
-    },
-    "refstruc{}": {
-      "snippet": "refstruc{${1:label}}",
-      "option": "hungarian"
-    },
-    "refstrucparen{}": {
-      "snippet": "refstrucparen{${1:label}}",
-      "option": "hungarian"
-    },
-    "SafeToday": {
-      "option": "hungarian"
-    },
-    "textqq{}": {
-      "snippet": "textqq{${1:szövegközti idézet}}",
-      "option": "hungarian"
-    },
-    "captionshungarian": {
-      "option": "hungarian"
-    },
-    "datehungarian": {
-      "option": "hungarian"
-    },
-    "extrashungarian": {
-      "option": "hungarian"
-    },
-    "noextrashungarian": {
-      "option": "hungarian"
-    },
-    "ondatehungarian": {
-      "option": "hungarian"
-    },
-    "captionsmalay": {
-      "option": "malay"
-    },
-    "datemalay": {
-      "option": "malay"
-    },
-    "extrasmalay": {
-      "option": "malay"
-    },
-    "noextrasmalay": {
-      "option": "malay"
-    },
-    "malayhyphenmins": {
-      "option": "malay"
-    },
-    "captionsbahasam": {
-      "option": "bahasam"
-    },
-    "datebahasam": {
-      "option": "bahasam"
-    },
-    "extrasbahasam": {
-      "option": "bahasam"
-    },
-    "noextrasbahasam": {
-      "option": "bahasam"
-    },
-    "bahasamhyphenmins": {
-      "option": "bahasam"
-    },
-    "captionsmelayu": {
-      "option": "melayu"
-    },
-    "datemelayu": {
-      "option": "melayu"
-    },
-    "extrasmelayu": {
-      "option": "melayu"
-    },
-    "noextrasmelayu": {
-      "option": "melayu"
-    },
-    "melayuhyphenmins": {
-      "option": "melayu"
-    },
-    "captionsmeyalu": {
-      "option": "meyalu"
-    },
-    "datemeyalu": {
-      "option": "meyalu"
-    },
-    "extrasmeyalu": {
-      "option": "meyalu"
-    },
-    "noextrasmeyalu": {
-      "option": "meyalu"
-    },
-    "meyaluhyphenmins": {
-      "option": "meyalu"
-    },
-    "captionsmongolian": {
-      "option": "mongolian"
-    },
-    "datemongolian": {
-      "option": "mongolian"
-    },
-    "extrasmongolian": {
-      "option": "mongolian"
-    },
-    "noextrasmongolian": {
-      "option": "mongolian"
-    },
-    "Mongolian": {
-      "option": "mongolian"
-    },
-    "Mon": {
-      "option": "mongolian"
-    },
-    "Useg{}": {
-      "snippet": "Useg{${1:counter}}",
-      "option": "mongolian"
-    },
-    "useg{}": {
-      "snippet": "useg{${1:counter}}",
-      "option": "mongolian"
-    },
-    "nsd": {
-      "option": "mongolian"
-    },
-    "nsk": {
-      "option": "mongolian"
-    },
-    "NSD": {
-      "option": "mongolian"
-    },
-    "NSK": {
-      "option": "mongolian"
-    },
-    "C{}": {
-      "snippet": "C{${1:arg}}",
-      "option": "mongolian"
-    },
-    "CYRAE": {
-      "option": "mongolian"
-    },
-    "cyrae": {
-      "option": "mongolian"
-    },
-    "CYRCHRDSC": {
-      "option": "mongolian"
-    },
-    "cyrchrdsc": {
-      "option": "mongolian"
-    },
-    "CYRCHVCRS": {
-      "option": "mongolian"
-    },
-    "cyrchvcrs": {
-      "option": "mongolian"
-    },
-    "CYRDJE": {
-      "option": "mongolian"
-    },
-    "cyrdje": {
-      "option": "mongolian"
-    },
-    "CYRDZE": {
-      "option": "mongolian"
-    },
-    "cyrdze": {
-      "option": "mongolian"
-    },
-    "CYRDZHE": {
-      "option": "mongolian"
-    },
-    "cyrdzhe": {
-      "option": "mongolian"
-    },
-    "CYREREV": {
-      "option": "mongolian"
-    },
-    "cyrerev": {
-      "option": "mongolian"
-    },
-    "CYRGHCRS": {
-      "option": "mongolian"
-    },
-    "cyrghcrs": {
-      "option": "mongolian"
-    },
-    "CYRHDSC": {
-      "option": "mongolian"
-    },
-    "cyrhdsc": {
-      "option": "mongolian"
-    },
-    "CYRHRDSN": {
-      "option": "mongolian"
-    },
-    "cyrhrdsn": {
-      "option": "mongolian"
-    },
-    "CYRJE": {
-      "option": "mongolian"
-    },
-    "cyrje": {
-      "option": "mongolian"
-    },
-    "CYRKBEAK": {
-      "option": "mongolian"
-    },
-    "cyrkbeak": {
-      "option": "mongolian"
-    },
-    "CYRKDSC": {
-      "option": "mongolian"
-    },
-    "cyrkdsc": {
-      "option": "mongolian"
-    },
-    "CYRKVCRS": {
-      "option": "mongolian"
-    },
-    "cyrkvcrs": {
-      "option": "mongolian"
-    },
-    "cyrlangle": {
-      "option": "mongolian"
-    },
-    "CYRLJE": {
-      "option": "mongolian"
-    },
-    "cyrlje": {
-      "option": "mongolian"
-    },
-    "CYRNDSC": {
-      "option": "mongolian"
-    },
-    "cyrndsc": {
-      "option": "mongolian"
-    },
-    "CYRNG": {
-      "option": "mongolian"
-    },
-    "cyrng": {
-      "option": "mongolian"
-    },
-    "CYRNJE": {
-      "option": "mongolian"
-    },
-    "cyrnje": {
-      "option": "mongolian"
-    },
-    "CYROTLD": {
-      "option": "mongolian"
-    },
-    "cyrotld": {
-      "option": "mongolian"
-    },
-    "CYRpalochka": {
-      "option": "mongolian"
-    },
-    "CYRQ": {
-      "option": "mongolian"
-    },
-    "cyrq": {
-      "option": "mongolian"
-    },
-    "cyrrangle": {
-      "option": "mongolian"
-    },
-    "CYRSCHWA": {
-      "option": "mongolian"
-    },
-    "cyrschwa": {
-      "option": "mongolian"
-    },
-    "CYRSDSC": {
-      "option": "mongolian"
-    },
-    "cyrsdsc": {
-      "option": "mongolian"
-    },
-    "CYRSHHA": {
-      "option": "mongolian"
-    },
-    "cyrshha": {
-      "option": "mongolian"
-    },
-    "CYRTSHE": {
-      "option": "mongolian"
-    },
-    "cyrtshe": {
-      "option": "mongolian"
-    },
-    "CYRUSHRT": {
-      "option": "mongolian"
-    },
-    "cyrushrt": {
-      "option": "mongolian"
-    },
-    "CYRW": {
-      "option": "mongolian"
-    },
-    "cyrw": {
-      "option": "mongolian"
-    },
-    "CYRY": {
-      "option": "mongolian"
-    },
-    "cyry": {
-      "option": "mongolian"
-    },
-    "CYRYHCRS": {
-      "option": "mongolian"
-    },
-    "cyryhcrs": {
-      "option": "mongolian"
-    },
-    "CYRYO": {
-      "option": "mongolian"
-    },
-    "cyryo": {
-      "option": "mongolian"
-    },
-    "CYRZDSC": {
-      "option": "mongolian"
-    },
-    "cyrzdsc": {
-      "option": "mongolian"
-    },
-    "CYRZHDSC": {
-      "option": "mongolian"
-    },
-    "cyrzhdsc": {
-      "option": "mongolian"
-    },
-    "f{}": {
-      "snippet": "f{${1:arg}}",
-      "option": "mongolian"
-    },
-    "k{}": {
-      "snippet": "k{${1:arg}}",
-      "option": "mongolian"
-    },
-    "textquotedbl": {
-      "option": "vietnamese"
-    },
-    "U{}": {
-      "snippet": "U{${1:arg}}",
-      "option": "mongolian"
-    },
-    "captionsnorsk": {
-      "option": "norsk"
-    },
-    "datenorsk": {
-      "option": "norsk"
-    },
-    "extrasnorsk": {
-      "option": "norsk"
-    },
-    "noextrasnorsk": {
-      "option": "norsk"
-    },
-    "captionspiedmontese": {
-      "option": "piedmontese"
-    },
-    "datepiedmontese": {
-      "option": "piedmontese"
-    },
-    "extraspiedmontese": {
-      "option": "piedmontese"
-    },
-    "noextraspiedmontese": {
-      "option": "piedmontese"
-    },
-    "piedmontesehyphenmins": {
-      "option": "piedmontese"
-    },
-    "captionspinyin": {
-      "option": "pinyin"
-    },
-    "datepinyin": {
-      "option": "pinyin"
-    },
-    "extraspinyin": {
-      "option": "pinyin"
-    },
-    "noextraspinyin": {
-      "option": "pinyin"
-    },
-    "captionspolish": {
-      "option": "polish"
-    },
-    "datepolish": {
-      "option": "polish"
-    },
-    "extraspolish": {
-      "option": "polish"
-    },
-    "noextraspolish": {
-      "option": "polish"
-    },
-    "aob": {
-      "option": "polish"
-    },
-    "Aob": {
-      "option": "polish"
-    },
-    "lpb": {
-      "option": "polish"
-    },
-    "Lpb": {
-      "option": "polish"
-    },
-    "zkb": {
-      "option": "polish"
-    },
-    "Zkb": {
-      "option": "polish"
-    },
-    "sob": {
-      "option": "polish"
-    },
-    "spb": {
-      "option": "polish"
-    },
-    "skb": {
-      "option": "polish"
-    },
-    "textpl": {
-      "option": "polish"
-    },
-    "telepl": {
-      "option": "polish"
-    },
-    "polishrz": {
-      "option": "polish"
-    },
-    "polishzx": {
-      "option": "polish"
-    },
-    "captionsportuges": {
-      "option": "portuges"
-    },
-    "dateportuges": {
-      "option": "portuges"
-    },
-    "extrasportuges": {
-      "option": "portuges"
-    },
-    "noextrasportuges": {
-      "option": "portuges"
-    },
-    "ord": {
-      "option": "brazilian"
-    },
-    "orda": {
-      "option": "brazilian"
-    },
-    "ro": {
-      "option": "brazilian"
-    },
-    "ra": {
-      "option": "brazilian"
-    },
-    "captionsportuguese": {
-      "option": "portuguese"
-    },
-    "dateportuguese": {
-      "option": "portuguese"
-    },
-    "extrasportuguese": {
-      "option": "portuguese"
-    },
-    "noextrasportuguese": {
-      "option": "portuguese"
-    },
-    "captionsbrazil": {
-      "option": "brazil"
-    },
-    "datebrazil": {
-      "option": "brazil"
-    },
-    "extrasbrazil": {
-      "option": "brazil"
-    },
-    "noextrasbrazil": {
-      "option": "brazil"
-    },
-    "captionsbrazilian": {
-      "option": "brazilian"
-    },
-    "datebrazilian": {
-      "option": "brazilian"
-    },
-    "extrasbrazilian": {
-      "option": "brazilian"
-    },
-    "noextrasbrazilian": {
-      "option": "brazilian"
-    },
-    "captionsromanian": {
-      "option": "romanian"
-    },
-    "dateromanian": {
-      "option": "romanian"
-    },
-    "extrasromanian": {
-      "option": "romanian"
-    },
-    "noextrasromanian": {
-      "option": "romanian"
-    },
-    "captionsromansh": {
-      "option": "romansh"
-    },
-    "dateromansh": {
-      "option": "romansh"
-    },
-    "extrasromansh": {
-      "option": "romansh"
-    },
-    "noextrasromansh": {
-      "option": "romansh"
-    },
-    "romanshhyphenmins": {
-      "option": "romansh"
-    },
-    "Russian": {
-      "option": "russian.ancient"
-    },
-    "captionsrussian": {
-      "option": "russian.ancient"
-    },
-    "daterussian": {
-      "option": "russian.ancient"
-    },
-    "extrasrussian": {
-      "option": "russian.ancient"
-    },
-    "noextrasrussian": {
-      "option": "russian.ancient"
-    },
-    "captionsspanish": {
-      "option": "spanish"
-    },
-    "datespanish": {
-      "option": "spanish"
-    },
-    "extrasspanish": {
-      "option": "spanish"
-    },
-    "noextrasspanish": {
-      "option": "spanish"
-    },
-    "spanishrefname": {
-      "option": "spanish"
-    },
-    "spanishabstractname": {
-      "option": "spanish"
-    },
-    "spanishbibname": {
-      "option": "spanish"
-    },
-    "spanishchaptername": {
-      "option": "spanish"
-    },
-    "spanishappendixname": {
-      "option": "spanish"
-    },
-    "spanishcontentsname": {
-      "option": "spanish"
-    },
-    "spanishlistfigurename": {
-      "option": "spanish"
-    },
-    "spanishlisttablename": {
-      "option": "spanish"
-    },
-    "spanishindexname": {
-      "option": "spanish"
-    },
-    "spanishfigurename": {
-      "option": "spanish"
-    },
-    "spanishtablename": {
-      "option": "spanish"
-    },
-    "spanishpartname": {
-      "option": "spanish"
-    },
-    "spanishenclname": {
-      "option": "spanish"
-    },
-    "spanishccname": {
-      "option": "spanish"
-    },
-    "spanishheadtoname": {
-      "option": "spanish"
-    },
-    "spanishpagename": {
-      "option": "spanish"
-    },
-    "spanishseename": {
-      "option": "spanish"
-    },
-    "spanishalsoname": {
-      "option": "spanish"
-    },
-    "spanishproofname": {
-      "option": "spanish"
-    },
-    "spanishprefacename": {
-      "option": "spanish"
-    },
-    "spanishglossaryname": {
-      "option": "spanish"
-    },
-    "spanishdashitems": {
-      "option": "spanish"
-    },
-    "spanishsignitems": {
-      "option": "spanish"
-    },
-    "spanishsymbitems": {
-      "option": "spanish"
-    },
-    "spanishindexchars{}{}{}": {
-      "snippet": "spanishindexchars{${1:encap}}{${2:open}}{${3:close}}",
-      "option": "spanish"
-    },
-    "spanishscroman": {
-      "option": "spanish"
-    },
-    "spanishlcroman": {
-      "option": "spanish"
-    },
-    "spanishucroman": {
-      "option": "spanish"
-    },
-    "Today": {
-      "option": "spanish"
-    },
-    "spanishdate{}{}{}": {
-      "snippet": "spanishdate{${1:año}}{${2:mes}}{${3:día}}",
-      "option": "spanish"
-    },
-    "spanishDate{}{}{}": {
-      "snippet": "spanishDate{${1:año}}{${2:mes}}{${3:día}}",
-      "option": "spanish"
-    },
-    "spanishdatedel": {
-      "option": "spanish"
-    },
-    "spanishdatede": {
-      "option": "spanish"
-    },
-    "spanishreverseddate": {
-      "option": "spanish"
-    },
-    "spanishdatefirst{}": {
-      "snippet": "spanishdatefirst{${1:día-uno}}",
-      "option": "spanish"
-    },
-    "spanishdeactivate{}": {
-      "snippet": "spanishdeactivate{${1:caracteres}}",
-      "option": "spanish"
-    },
-    "spanishdecimal{}": {
-      "snippet": "spanishdecimal{${1:math}}",
-      "option": "spanish"
-    },
-    "spanishplainpercent": {
-      "option": "spanish"
-    },
-    "percentsign": {
-      "option": "spanish"
-    },
-    "sen": {
-      "option": "spanish"
-    },
-    "arcsen": {
-      "option": "spanish"
-    },
-    "spanishoperators": {
-      "option": "spanish"
-    },
-    "dotlessi": {
-      "option": "spanish"
-    },
-    "selectspanish": {
-      "option": "spanish"
-    },
-    "spanishoptions": {
-      "option": "spanish"
-    },
-    "textspanish": {
-      "option": "spanish"
-    },
-    "notextspanish": {
-      "option": "spanish"
-    },
-    "mathspanish": {
-      "option": "spanish"
-    },
-    "shorthandsspanish": {
-      "option": "spanish"
-    },
-    "captionssamin": {
-      "option": "samin"
-    },
-    "datesamin": {
-      "option": "samin"
-    },
-    "extrassamin": {
-      "option": "samin"
-    },
-    "noextrassamin": {
-      "option": "samin"
-    },
-    "saminhyphenmins": {
-      "option": "samin"
-    },
-    "captionsscottish": {
-      "option": "scottish"
-    },
-    "datescottish": {
-      "option": "scottish"
-    },
-    "extrasscottish": {
-      "option": "scottish"
-    },
-    "noextrasscottish": {
-      "option": "scottish"
-    },
-    "captionsserbian": {
-      "option": "serbian"
-    },
-    "dateserbian": {
-      "option": "serbian"
-    },
-    "extrasserbian": {
-      "option": "serbian"
-    },
-    "noextrasserbian": {
-      "option": "serbian"
-    },
-    "today*": {
-      "option": "serbian"
-    },
-    "todayRoman*": {
-      "option": "serbianc"
-    },
-    "enumCyr": {
-      "option": "serbianc"
-    },
-    "enumLat": {
-      "option": "serbianc"
-    },
-    "enumEng": {
-      "option": "serbianc"
-    },
-    "arcsec": {
-      "option": "serbianc"
-    },
-    "arccosec": {
-      "option": "serbianc"
-    },
-    "sech": {
-      "option": "serbianc"
-    },
-    "cosech": {
-      "option": "serbianc"
-    },
-    "arsech": {
-      "option": "serbianc"
-    },
-    "arcosech": {
-      "option": "serbianc"
-    },
-    "NZD": {
-      "option": "serbianc"
-    },
-    "nzd": {
-      "option": "serbianc"
-    },
-    "NZS": {
-      "option": "serbianc"
-    },
-    "nzs": {
-      "option": "serbianc"
-    },
-    "captionsserbianc": {
-      "option": "serbianc"
-    },
-    "dateserbianc": {
-      "option": "serbianc"
-    },
-    "extrasserbianc": {
-      "option": "serbianc"
-    },
-    "noextrasserbianc": {
-      "option": "serbianc"
-    },
-    "Serbianc": {
-      "option": "serbianc"
-    },
-    "captionsslovak": {
-      "option": "slovak"
-    },
-    "dateslovak": {
-      "option": "slovak"
-    },
-    "extrasslovak": {
-      "option": "slovak"
-    },
-    "noextrasslovak": {
-      "option": "slovak"
-    },
-    "standardhyphens": {
-      "option": "slovak"
-    },
-    "splithyphens": {
-      "option": "slovak"
-    },
-    "captionsslovene": {
-      "option": "slovene"
-    },
-    "dateslovene": {
-      "option": "slovene"
-    },
-    "extrasslovene": {
-      "option": "slovene"
-    },
-    "noextrasslovene": {
-      "option": "slovene"
-    },
-    "captionslsorbian": {
-      "option": "lsorbian"
-    },
-    "datelsorbian": {
-      "option": "lsorbian"
-    },
-    "extraslsorbian": {
-      "option": "lsorbian"
-    },
-    "noextraslsorbian": {
-      "option": "lsorbian"
-    },
-    "newdatelsorbian": {
-      "option": "lsorbian"
-    },
-    "olddatelsorbian": {
-      "option": "lsorbian"
-    },
-    "captionslowersorbian": {
-      "option": "lowersorbian"
-    },
-    "datelowersorbian": {
-      "option": "lowersorbian"
-    },
-    "extraslowersorbian": {
-      "option": "lowersorbian"
-    },
-    "noextraslowersorbian": {
-      "option": "lowersorbian"
-    },
-    "newdatelowersorbian": {
-      "option": "lowersorbian"
-    },
-    "olddatelowersorbian": {
-      "option": "lowersorbian"
-    },
-    "captionsusorbian": {
-      "option": "usorbian"
-    },
-    "dateusorbian": {
-      "option": "usorbian"
-    },
-    "extrasusorbian": {
-      "option": "usorbian"
-    },
-    "noextrasusorbian": {
-      "option": "usorbian"
-    },
-    "newdateusorbian": {
-      "option": "usorbian"
-    },
-    "olddateusorbian": {
-      "option": "usorbian"
-    },
-    "captionsuppersorbian": {
-      "option": "uppersorbian"
-    },
-    "dateuppersorbian": {
-      "option": "uppersorbian"
-    },
-    "extrasuppersorbian": {
-      "option": "uppersorbian"
-    },
-    "noextrasuppersorbian": {
-      "option": "uppersorbian"
-    },
-    "newdateuppersorbian": {
-      "option": "uppersorbian"
-    },
-    "olddateuppersorbian": {
-      "option": "uppersorbian"
-    },
-    "captionsswedish": {
-      "option": "swedish"
-    },
-    "dateswedish": {
-      "option": "swedish"
-    },
-    "extrasswedish": {
-      "option": "swedish"
-    },
-    "noextrasswedish": {
-      "option": "swedish"
-    },
-    "swedishhyphenmins": {
-      "option": "swedish"
-    },
-    "captionsthai": {
-      "option": "thai"
-    },
-    "datethai": {
-      "option": "thai"
-    },
-    "extrasthai": {
-      "option": "thai"
-    },
-    "noextrasthai": {
-      "option": "thai"
-    },
-    "thaihyphenmins": {
-      "option": "thai"
-    },
-    "thaitext": {
-      "option": "thai"
-    },
-    "textthai{}": {
-      "snippet": "textthai{${1:text}}",
-      "option": "thai"
-    },
-    "textpali{}": {
-      "snippet": "textpali{${1:text}}",
-      "option": "thai"
-    },
-    "wbr": {
-      "option": "thai"
-    },
-    "thainum{}": {
-      "snippet": "thainum{${1:counter}}",
-      "option": "thai"
-    },
-    "thaibracenum{}": {
-      "snippet": "thaibracenum{${1:counter}}",
-      "option": "thai"
-    },
-    "thaialph{}": {
-      "snippet": "thaialph{${1:counter}}",
-      "option": "thai"
-    },
-    "thaiAlph{}": {
-      "snippet": "thaiAlph{${1:counter}}",
-      "option": "thai"
-    },
-    "textyamakkan": {
-      "option": "thai"
-    },
-    "textfongmun": {
-      "option": "thai"
-    },
-    "textangkhankhu": {
-      "option": "thai"
-    },
-    "textkhomut": {
-      "option": "thai"
-    },
-    "textYoYingPali": {
-      "option": "thai"
-    },
-    "textThoThanPali": {
-      "option": "thai"
-    },
-    "thaiKoKai": {
-      "option": "thaicjk"
-    },
-    "thaiKhoKhai": {
-      "option": "thaicjk"
-    },
-    "thaiKhoKhuat": {
-      "option": "thaicjk"
-    },
-    "thaiKhoKhwai": {
-      "option": "thaicjk"
-    },
-    "thaiKhoKhon": {
-      "option": "thaicjk"
-    },
-    "thaiKhoRakhang": {
-      "option": "thaicjk"
-    },
-    "thaiNgoNgu": {
-      "option": "thaicjk"
-    },
-    "thaiChoChan": {
-      "option": "thaicjk"
-    },
-    "thaiChoChing": {
-      "option": "thaicjk"
-    },
-    "thaiChoChang": {
-      "option": "thaicjk"
-    },
-    "thaiSoSo": {
-      "option": "thaicjk"
-    },
-    "thaiChoChoe": {
-      "option": "thaicjk"
-    },
-    "thaiYoYing": {
-      "option": "thaicjk"
-    },
-    "thaiDoChada": {
-      "option": "thaicjk"
-    },
-    "thaiToPatak": {
-      "option": "thaicjk"
-    },
-    "thaiThoThan": {
-      "option": "thaicjk"
-    },
-    "thaiThoNangmontho": {
-      "option": "thaicjk"
-    },
-    "thaiThoPhuthao": {
-      "option": "thaicjk"
-    },
-    "thaiNoNen": {
-      "option": "thaicjk"
-    },
-    "thaiDoDek": {
-      "option": "thaicjk"
-    },
-    "thaiToTao": {
-      "option": "thaicjk"
-    },
-    "thaiThoThung": {
-      "option": "thaicjk"
-    },
-    "thaiThoThahan": {
-      "option": "thaicjk"
-    },
-    "thaiThoThong": {
-      "option": "thaicjk"
-    },
-    "thaiNoNu": {
-      "option": "thaicjk"
-    },
-    "thaiBoBaimai": {
-      "option": "thaicjk"
-    },
-    "thaiPoPla": {
-      "option": "thaicjk"
-    },
-    "thaiPhoPhung": {
-      "option": "thaicjk"
-    },
-    "thaiFoFa": {
-      "option": "thaicjk"
-    },
-    "thaiPhoPhan": {
-      "option": "thaicjk"
-    },
-    "thaiFoFan": {
-      "option": "thaicjk"
-    },
-    "thaiPhoSamphao": {
-      "option": "thaicjk"
-    },
-    "thaiMoMa": {
-      "option": "thaicjk"
-    },
-    "thaiYoYak": {
-      "option": "thaicjk"
-    },
-    "thaiRoRua": {
-      "option": "thaicjk"
-    },
-    "thaiRu": {
-      "option": "thaicjk"
-    },
-    "thaiLoLing": {
-      "option": "thaicjk"
-    },
-    "thaiLu": {
-      "option": "thaicjk"
-    },
-    "thaiWoWaen": {
-      "option": "thaicjk"
-    },
-    "thaiSoSala": {
-      "option": "thaicjk"
-    },
-    "thaiSoRusi": {
-      "option": "thaicjk"
-    },
-    "thaiSoSua": {
-      "option": "thaicjk"
-    },
-    "thaiHoHip": {
-      "option": "thaicjk"
-    },
-    "thaiLoChula": {
-      "option": "thaicjk"
-    },
-    "thaiOAng": {
-      "option": "thaicjk"
-    },
-    "thaiHoNokhuk": {
-      "option": "thaicjk"
-    },
-    "thaiPaiyannoi": {
-      "option": "thaicjk"
-    },
-    "thaiSaraA": {
-      "option": "thaicjk"
-    },
-    "thaiMaiHanakat": {
-      "option": "thaicjk"
-    },
-    "thaiSaraAa": {
-      "option": "thaicjk"
-    },
-    "thaiSaraAm": {
-      "option": "thaicjk"
-    },
-    "thaiSaraI": {
-      "option": "thaicjk"
-    },
-    "thaiSaraIi": {
-      "option": "thaicjk"
-    },
-    "thaiSaraUe": {
-      "option": "thaicjk"
-    },
-    "thaiSaraUee": {
-      "option": "thaicjk"
-    },
-    "thaiSaraU": {
-      "option": "thaicjk"
-    },
-    "thaiSaraUu": {
-      "option": "thaicjk"
-    },
-    "thaiPhinthu": {
-      "option": "thaicjk"
-    },
-    "thaiSaraE": {
-      "option": "thaicjk"
-    },
-    "thaiSaraAe": {
-      "option": "thaicjk"
-    },
-    "thaiSaraO": {
-      "option": "thaicjk"
-    },
-    "thaiSaraAiMaimuan": {
-      "option": "thaicjk"
-    },
-    "thaiSaraAiMaimalai": {
-      "option": "thaicjk"
-    },
-    "thaiLakkhangyao": {
-      "option": "thaicjk"
-    },
-    "thaiMaiyamok": {
-      "option": "thaicjk"
-    },
-    "thaiMaitaikhu": {
-      "option": "thaicjk"
-    },
-    "thaiMaiEk": {
-      "option": "thaicjk"
-    },
-    "thaiMaiTho": {
-      "option": "thaicjk"
-    },
-    "thaiMaiTri": {
-      "option": "thaicjk"
-    },
-    "thaiMaiChattawa": {
-      "option": "thaicjk"
-    },
-    "thaiThanthakhat": {
-      "option": "thaicjk"
-    },
-    "thaiNikhahit": {
-      "option": "thaicjk"
-    },
-    "thaiYamakkan": {
-      "option": "thaicjk"
-    },
-    "thaiFongman": {
-      "option": "thaicjk"
-    },
-    "thaizero": {
-      "option": "thaicjk"
-    },
-    "thaione": {
-      "option": "thaicjk"
-    },
-    "thaitwo": {
-      "option": "thaicjk"
-    },
-    "thaithree": {
-      "option": "thaicjk"
-    },
-    "thaifour": {
-      "option": "thaicjk"
-    },
-    "thaifive": {
-      "option": "thaicjk"
-    },
-    "thaisix": {
-      "option": "thaicjk"
-    },
-    "thaiseven": {
-      "option": "thaicjk"
-    },
-    "thaieight": {
-      "option": "thaicjk"
-    },
-    "thainine": {
-      "option": "thaicjk"
-    },
-    "thaiAngkhankhu": {
-      "option": "thaicjk"
-    },
-    "thaiKhomut": {
-      "option": "thaicjk"
-    },
-    "captionsthaicjk": {
-      "option": "thaicjk"
-    },
-    "datethaicjk": {
-      "option": "thaicjk"
-    },
-    "extrasthaicjk": {
-      "option": "thaicjk"
-    },
-    "noextrasthaicjk": {
-      "option": "thaicjk"
-    },
-    "textbaht": {
-      "option": "thaicjk"
-    },
-    "captionsturkish": {
-      "option": "turkish"
-    },
-    "dateturkish": {
-      "option": "turkish"
-    },
-    "extrasturkish": {
-      "option": "turkish"
-    },
-    "noextrasturkish": {
-      "option": "turkish"
-    },
-    "subjectname": {
-      "option": "turkish"
-    },
-    "Ukrainian": {
-      "option": "ukrainian"
-    },
-    "captionsukrainian": {
-      "option": "ukrainian"
-    },
-    "dateukrainian": {
-      "option": "ukrainian"
-    },
-    "extrasukrainian": {
-      "option": "ukrainian"
-    },
-    "noextrasukrainian": {
-      "option": "ukrainian"
-    },
-    "viettext": {
-      "option": "vietnamese"
-    },
-    "viet": {
-      "option": "vietnamese"
-    },
-    "textviet{}": {
-      "snippet": "textviet{${1:text}}",
-      "option": "vietnamese"
-    },
-    "captionsvietnamese": {
-      "option": "vietnamese"
-    },
-    "datevietnamese": {
-      "option": "vietnamese"
-    },
-    "extrasvietnamese": {
-      "option": "vietnamese"
-    },
-    "noextrasvietnamese": {
-      "option": "vietnamese"
-    },
-    "OHORN": {
-      "option": "vietnamese"
-    },
-    "ohorn": {
-      "option": "vietnamese"
-    },
-    "UHORN": {
-      "option": "vietnamese"
-    },
-    "uhorn": {
-      "option": "vietnamese"
-    },
-    "abreve": {
-      "option": "vietnamese"
-    },
-    "Abreve": {
-      "option": "vietnamese"
-    },
-    "acircumflex": {
-      "option": "vietnamese"
-    },
-    "Acircumflex": {
-      "option": "vietnamese"
-    },
-    "ecircumflex": {
-      "option": "vietnamese"
-    },
-    "Ecircumflex": {
-      "option": "vietnamese"
-    },
-    "ocircumflex": {
-      "option": "vietnamese"
-    },
-    "Ocircumflex": {
-      "option": "vietnamese"
-    },
-    "Ohorn": {
-      "option": "vietnamese"
-    },
-    "Uhorn": {
-      "option": "vietnamese"
-    },
-    "ABREVE": {
-      "option": "vietnamese"
-    },
-    "ACIRCUMFLEX": {
-      "option": "vietnamese"
-    },
-    "ECIRCUMFLEX": {
-      "option": "vietnamese"
-    },
-    "OCIRCUMFLEX": {
-      "option": "vietnamese"
-    },
-    "h{}": {
-      "snippet": "h{${1:arg}}",
-      "option": "vietnamese"
-    },
-    "headpagename": {
-      "option": "vietnamese"
-    },
-    "captionswelsh": {
-      "option": "welsh"
-    },
-    "datewelsh": {
-      "option": "welsh"
-    },
-    "extraswelsh": {
-      "option": "welsh"
-    },
-    "noextraswelsh": {
-      "option": "welsh"
-    },
-    "welshhyphenmins": {
-      "option": "welsh"
-    }
-  },
-  "envs": {
-    "selectlanguage{}": {
-      "name": "selectlanguage",
-      "snippet": "{${1:language}}"
-    },
-    "otherlanguage{}": {
-      "name": "otherlanguage",
-      "snippet": "{${1:language}}"
-    },
-    "otherlanguage*{}": {
-      "name": "otherlanguage*",
-      "snippet": "{${1:language}}"
-    },
-    "otherlanguage*[]{}": {
-      "name": "otherlanguage*",
-      "snippet": "[${2:options}]{${1:language}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "hyphenrules{}": {
-      "name": "hyphenrules",
-      "snippet": "{${1:language}}"
-    },
-    "descriptionFB": {
-      "option": "acadian"
-    },
-    "enumerateFB": {
-      "option": "acadian"
-    },
-    "itemizeFB": {
-      "option": "acadian"
-    },
-    "listFB{}": {
-      "name": "listFB",
-      "snippet": "{${1:symbol}}",
-      "option": "acadian"
-    },
-    "listORI{}": {
-      "name": "listORI",
-      "snippet": "{${1:symbol}}",
-      "option": "acadian"
-    },
-    "quoting": {
-      "option": "spanish"
-    }
-  },
-  "options": [
-    "${1:language}",
-    "modifiers.${1:language}=${2:modifiers}",
-    "KeepShorthandsActive",
-    "activeacute",
-    "activegrave",
-    "shorthands=",
-    "safe=",
-    "math=",
-    "config=${1:file}",
-    "main=${1:language}",
-    "headfoot=${1:language}",
-    "noconfigs",
-    "showlanguages",
-    "silent",
-    "hyphenmap=",
-    "bidi=",
-    "layout=",
-    "provide=*",
-    "provide+=*",
-    "provide*=*",
-    "base",
-    "ensureinfo=off",
-    "es-lcroman",
-    "es-minimal",
-    "es-nodecimaldot",
-    "es-noenumerate",
-    "es-noindentfirst",
-    "es-noitemize",
-    "es-nolayout",
-    "es-nolists",
-    "es-noquoting",
-    "es-nosectiondot",
-    "es-noshorthands",
-    "es-notilde",
-    "es-preindex",
-    "es-sloppy",
-    "es-tabla",
-    "es-tilden",
-    "es-ucroman",
-    "es-uppernames",
-    "mexico",
-    "mexico-com"
-  ],
-  "keyvals": [
-    [
-      "date",
-      "captions"
-    ],
-    [
-      "include=${1:commands}",
-      "exclude=${1:commands}",
-      "fontenc=${1:encoding}"
-    ],
-    [
-      "import",
-      "import=${1:language tag}",
-      "captions=${1:language tag}",
-      "hyphenrules=${1:language list}",
-      "main",
-      "script=${1:script name}",
-      "language=${1:language name}",
-      "alph=${1:counter}",
-      "Alph=${1:counter}",
-      "onchar=",
-      "intraspace=${1:base shrink stretch}",
-      "intrapenalty=${1:penalty}",
-      "transforms=",
-      "justification=",
-      "linebreaking=",
-      "mapfont=",
-      "maparabic",
-      "mapdigits",
-      "calendar=${1:calendar}",
-      "calendar=${1:calendar}.${2:variant}",
-      "casing=",
-      "interchar=${1:interchar-list}"
-    ],
-    [
-      "calendar=${1:calendar}",
-      "variant=${1:variant}",
-      "convert"
-    ],
-    [
-      "label=",
-      "fonts=${1:tag1 tag2 ...}",
-      "attribute=${1:attribute}"
-    ],
-    [
-      "label=${1:label}"
-    ],
-    [
-      "bidi.mapdigits=",
-      "bidi.mirroring=",
-      "bidi.text=",
-      "bidi.math=",
-      "linebreak.sea=",
-      "linebreak.cjk=",
-      "justify.arabic=",
-      "layout.tabular=",
-      "layout.lists=",
-      "autoload.bcp47=",
-      "bcp47.toname=",
-      "autoload.options=",
-      "autoload.bcp47.prefix=",
-      "autoload.bcp47.options=",
-      "prehyphenation.disable=",
-      "select.write=",
-      "select.encoding="
-    ],
-    [
-      "ShowOptions",
-      "StandardLayout",
-      "GlobalLayoutFrench",
-      "IndentFirst",
-      "PartNameFull",
-      "ListItemsAsPar",
-      "StandardListSpacing",
-      "StandardItemizeEnv",
-      "StandardEnumerateEnv",
-      "StandardItemLabels",
-      "ItemLabels=",
-      "ItemLabeli=",
-      "ItemLabelii=",
-      "ItemLabeliii=",
-      "ItemLabeliv=",
-      "StandardLists",
-      "ListOldLayout",
-      "FrenchFootnotes",
-      "AutoSpaceFootnotes",
-      "AutoSpacePunctuation",
-      "ThinColonSpace",
-      "OriginalTypewriter",
-      "UnicodeNoBreakSpaces",
-      "og=",
-      "fg=",
-      "INGuillSpace",
-      "EveryParGuill=",
-      "EveryLineGuill=",
-      "InnerGuillSingle",
-      "ThinSpaceInFrenchNumbers",
-      "SmallCapsFigTabCaptions",
-      "CustomiseFigTabCaptions",
-      "OldFigTabCaptions",
-      "FrenchSuperscripts",
-      "LowercaseSuperscripts",
-      "SuppressWarning"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/backref.json b/dev/packages/backref.json
deleted file mode 100644
index 4c1fc0f31..000000000
--- a/dev/packages/backref.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "includes": {
-    "kvoptions": [],
-    "kvsetkeys": [],
-    "rerunfilecheck": []
-  },
-  "macros": {
-    "backrefsetup{}": {
-      "snippet": "backrefsetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ifbackrefparscan": {},
-    "backrefparscanfalse": {},
-    "backrefparscantrue": {},
-    "backrefprint": {},
-    "backcite{}{{}{}{}": {
-      "snippet": "backcite{${1:label}}{{${2:page num}}{${3:current label}}{${4:current anchor}}}"
-    },
-    "backref{}": {
-      "snippet": "backref{${1:backref list}}"
-    },
-    "backrefalt{}{}{}{}": {
-      "snippet": "backrefalt{${1:num w/o dupes}}{${2:backref list w/o dupes}}{${3:num w/ dupes}}{${4:backref list w/ dupes}}"
-    },
-    "backrefpagesname": {},
-    "backrefsectionsname": {},
-    "backrefsep": {},
-    "backreftwosep": {},
-    "backreflastsep": {},
-    "backrefentrycount{}{}": {
-      "snippet": "backrefentrycount{${1:backref entry}}{${2:citation count}}"
-    },
-    "backrefenglish": {},
-    "backrefgerman": {},
-    "backreffrench": {},
-    "backrefspanish": {},
-    "backrefbrazil": {},
-    "backrefafrikaans": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "ref",
-      "pageref",
-      "hyperref",
-      "hyperpageref",
-      "english",
-      "german",
-      "french",
-      "spanish",
-      "brazil",
-      "verbose",
-      "enable",
-      "disable"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/balance.json b/dev/packages/balance.json
deleted file mode 100644
index f45006e6f..000000000
--- a/dev/packages/balance.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "balance": {},
-    "nobalance": {},
-    "oldvsize": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/bangla.json b/dev/packages/bangla.json
deleted file mode 100644
index 54aa06d1d..000000000
--- a/dev/packages/bangla.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "includes": {
-    "fontspec": [],
-    "etoolbox": [],
-    "polyglossia": [],
-    "CharisSIL": []
-  },
-  "macros": {
-    "banglatext{}": {
-      "snippet": "banglatext{${1:bangla text}}"
-    },
-    "banglabold{}": {
-      "snippet": "banglabold{${1:bangla text}}"
-    },
-    "banglaitalic{}": {
-      "snippet": "banglaitalic{${1:bangla text}}"
-    },
-    "banglatranslit{}": {
-      "snippet": "banglatranslit{${1:bangla text}}"
-    },
-    "banglaipa{}": {
-      "snippet": "banglaipa{${1:bangla text}}"
-    },
-    "banglapage": {},
-    "banglasection": {},
-    "banglaenumerate": {},
-    "banglaequation": {},
-    "banglatable": {},
-    "banglafigure": {},
-    "banglaallcounters": {},
-    "bengalinum{}": {
-      "snippet": "bengalinum{${1:counter}}"
-    },
-    "bengalialpha{}": {
-      "snippet": "bengalialpha{${1:counter}}"
-    },
-    "banglaipafont": {},
-    "bdnhbold": {},
-    "bdnhitalic": {},
-    "bdnhtext": {},
-    "bdnhtranslitfont": {},
-    "doindictrans": {},
-    "fooA": {},
-    "indictrans{}": {
-      "snippet": "indictrans{${1:text}}"
-    },
-    "translitfont{}": {
-      "snippet": "translitfont{${1:text}}"
-    },
-    "xgenerateTransliteration": {},
-    "xxgenerateTransliteration": {},
-    "xxxgenerateTransliteration{}": {
-      "snippet": "xxxgenerateTransliteration{${1:arg}}"
-    },
-    "zzrow{}{}": {
-      "snippet": "zzrow{${1:arg1}}{${2:arg2}}"
-    },
-    "zztable{}": {
-      "snippet": "zztable{${1:arg}}"
-    }
-  },
-  "envs": {
-    "isoindictranse": {}
-  },
-  "options": [
-    "kalpurush",
-    "shimanto",
-    "notosansbengali",
-    "notoserifbengali"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/bargraph-js.json b/dev/packages/bargraph-js.json
index 18863f8ba..a6294cabb 100644
--- a/dev/packages/bargraph-js.json
+++ b/dev/packages/bargraph-js.json
@@ -23,9 +23,6 @@
     "inputFor[]{}{}{}{}{}": {
       "snippet": "inputFor[${6:eforms parameters}]{${1:bgenv name}}{${2:bg name}}{${3:bar name}}{${4:width}}{${5:height}}"
     },
-    "populateCommaData()": {
-      "snippet": "populateCommaData(${1:\"${5:bgenv name}\"},${2:\"${6:bg name}\"},${3:str},${4:validate})"
-    },
     "hs{}": {
       "snippet": "hs{${1:skip}}"
     },
diff --git a/dev/packages/beamerbaseframesize.json b/dev/packages/beamerbaseframesize.json
index 349c7ecb2..967a6e8c0 100644
--- a/dev/packages/beamerbaseframesize.json
+++ b/dev/packages/beamerbaseframesize.json
@@ -1,24 +1,11 @@
 {
   "includes": {},
   "macros": {
-    "framezoom<><>()()": {
-      "snippet": "framezoom<${1:button overlay specification}><${2:zoomed overlay specification}>(${3:upper left x},${4:upper left y})(${5:zoom area width},${6:zoom area depth})"
-    },
-    "framezoom<><>[]()()": {
-      "snippet": "framezoom<${2:button overlay specification}><${3:zoomed overlay specification}>[${1:options}](${4:upper left x},${5:upper left y})(${6:zoom area width},${7:zoom area depth})",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
     "insertcontinuationcount": {},
     "insertcontinuationcountroman": {},
     "insertcontinuationtext": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": [
-    [
-      "border",
-      "border=${1:width in pixels}"
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/beamerprosper.json b/dev/packages/beamerprosper.json
index ec4c1d7d4..a0e0e51a2 100644
--- a/dev/packages/beamerprosper.json
+++ b/dev/packages/beamerprosper.json
@@ -10,9 +10,6 @@
     "Logo{}": {
       "snippet": "Logo{${1:logo text}}"
     },
-    "Logo(){}": {
-      "snippet": "Logo(${2:x},${3:y}){${1:logo text}}"
-    },
     "overlays{}{}": {
       "snippet": "overlays{${1:number}}{${2:slide environment}}"
     },
diff --git a/dev/packages/beamerthemeAmurmaple.json b/dev/packages/beamerthemeAmurmaple.json
index bb178a8bf..f09b0b915 100644
--- a/dev/packages/beamerthemeAmurmaple.json
+++ b/dev/packages/beamerthemeAmurmaple.json
@@ -56,7 +56,7 @@
     },
     "quotation[]": {
       "name": "quotation",
-      "snippet": "[${1:author(${2:s})}]"
+      "snippet": "[${1:author(s)}]"
     },
     "remark": {},
     "remark[]": {
diff --git a/dev/packages/beamerthemeArguelles.json b/dev/packages/beamerthemeArguelles.json
index 27aa5b4de..03bfe3d62 100644
--- a/dev/packages/beamerthemeArguelles.json
+++ b/dev/packages/beamerthemeArguelles.json
@@ -14,7 +14,6 @@
     "tikz": [],
     "tcolorbox": [],
     "tcolorboxlibraryskins": [],
-    "tikzlibrarycalc": [],
     "etoolbox": [
       "splitnav"
     ]
diff --git a/dev/packages/beamerthememoloch.json b/dev/packages/beamerthememoloch.json
index 0ea11ee06..6d4a83bc5 100644
--- a/dev/packages/beamerthememoloch.json
+++ b/dev/packages/beamerthememoloch.json
@@ -1,6 +1,5 @@
 {
   "includes": {
-    "etoolbox": [],
     "pgfopts": [],
     "calc": [],
     "tikz": []
diff --git a/dev/packages/bewerbung.json b/dev/packages/bewerbung.json
deleted file mode 100644
index 06d861048..000000000
--- a/dev/packages/bewerbung.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "includes": {
-    "datatool": []
-  },
-  "macros": {
-    "Vorname{}": {
-      "snippet": "Vorname{${1:Vorname}}"
-    },
-    "Name{}": {
-      "snippet": "Name{${1:Vorname}}"
-    },
-    "fullname": {},
-    "fullname[]": {
-      "snippet": "fullname[${1:Reihenfolge}]"
-    },
-    "Street{}": {
-      "snippet": "Street{${1:Straße Hnr.}}"
-    },
-    "Plz{}": {
-      "snippet": "Plz{${1:Postleitzahl}}"
-    },
-    "Stadt{}": {
-      "snippet": "Stadt{${1:Stadt}}"
-    },
-    "anschrift": {},
-    "anschrift[]": {
-      "snippet": "anschrift[${1:Umbruch}]"
-    },
-    "MeinBeruf{}": {
-      "snippet": "MeinBeruf{${1:Berufsbezeichnung}}"
-    },
-    "Tel{}": {
-      "snippet": "Tel{${1:Telefonnummer}}"
-    },
-    "Mobile{}": {
-      "snippet": "Mobile{${1:Mobiltelefonnummer}}"
-    },
-    "EMail{}": {
-      "snippet": "EMail{${1:E-Mail}}"
-    },
-    "Sta{}": {
-      "snippet": "Sta{${1:Staatsangehörigkeit}}"
-    },
-    "GebDatum{}": {
-      "snippet": "GebDatum{${1:Geburtsdatum}}"
-    },
-    "LebenslaufTitel{}": {
-      "snippet": "LebenslaufTitel{${1:Titel}}"
-    },
-    "ID{}": {
-      "snippet": "ID{${1:Identifikation}}"
-    },
-    "Anhang{}{}": {
-      "snippet": "Anhang{${1:Text}}{${2:Artikelliste}}"
-    },
-    "TodayOrt{}": {
-      "snippet": "TodayOrt{${1:Ort}}"
-    },
-    "TodayTime{}": {
-      "snippet": "TodayTime{${1:Time}}"
-    },
-    "makePerson": {},
-    "argetabelle": {},
-    "argetabelle[]": {
-      "snippet": "argetabelle[${1:Datei}]"
-    },
-    "anhang": {},
-    "anhangTmpFlat": {},
-    "anhangTmpList": {},
-    "beruf": {},
-    "bewerbungDatum": {},
-    "BewerbungDatum{}": {
-      "snippet": "BewerbungDatum{${1:arg}}"
-    },
-    "bewerbungFirma": {},
-    "BewerbungFirma": {},
-    "bewerbungFirmaAnrede": {},
-    "BewerbungFirmaAnrede": {},
-    "bewerbungFirmaName": {},
-    "BewerbungFirmaName{}": {
-      "snippet": "BewerbungFirmaName{${1:arg}}"
-    },
-    "bewerbungFirmaOrt": {},
-    "BewerbungFirmaOrt{}": {
-      "snippet": "BewerbungFirmaOrt{${1:arg}}"
-    },
-    "bewerbungFirmaPlz": {},
-    "BewerbungFirmaPlz{}": {
-      "snippet": "BewerbungFirmaPlz{${1:arg}}"
-    },
-    "bewerbungFirmaStr": {},
-    "BewerbungFirmaStr{}": {
-      "snippet": "BewerbungFirmaStr{${1:arg}}"
-    },
-    "bewerbungKW": {},
-    "BewerbungKW{}": {
-      "snippet": "BewerbungKW{${1:arg}}"
-    },
-    "bewerbungRueckmeldung": {},
-    "BewerbungRueckmeldung{}": {
-      "snippet": "BewerbungRueckmeldung{${1:arg}}"
-    },
-    "bewerbungSonstiges": {},
-    "BewerbungSonstiges{}": {
-      "snippet": "BewerbungSonstiges{${1:arg}}"
-    },
-    "bewerbungStelle": {},
-    "BewerbungStelle{}": {
-      "snippet": "BewerbungStelle{${1:arg}}"
-    },
-    "email": {},
-    "firma": {},
-    "firmaAnrede": {},
-    "firmaName": {},
-    "firmaPlz": {},
-    "firmaStadt": {},
-    "firmaStreet": {},
-    "gebDatum": {},
-    "geehrt": {},
-    "getBewerbung": {},
-    "getBewerbung[]": {
-      "snippet": "getBewerbung[${1:file}]"
-    },
-    "id": {},
-    "lebenslaufTitel": {},
-    "meinBeruf": {},
-    "meinberuf": {},
-    "mobile": {},
-    "name": {},
-    "plz": {},
-    "runKomaVar": {},
-    "setzekomma": {},
-    "sta": {},
-    "stadt": {},
-    "street": {},
-    "tel": {},
-    "todayOrt": {},
-    "todayTime": {},
-    "vorname": {}
-  },
-  "envs": {
-    "anschreiben": {},
-    "anschreiben[]": {
-      "name": "anschreiben",
-      "snippet": "[${1:Anrede}]"
-    },
-    "anschreiben[][]": {
-      "name": "anschreiben",
-      "snippet": "[${1:Anrede}][${2:Enlarge}]"
-    },
-    "lebenslauf": {},
-    "lebenslauf[]": {
-      "name": "lebenslauf",
-      "snippet": "[${1:Listensymbol}]"
-    },
-    "lebenslauf[][]": {
-      "name": "lebenslauf",
-      "snippet": "[${1:Listensymbol}][${2:Addendum}]"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/bez123.json b/dev/packages/bez123.json
index 007a82ed9..61929e7d0 100644
--- a/dev/packages/bez123.json
+++ b/dev/packages/bez123.json
@@ -3,24 +3,6 @@
     "multiply": []
   },
   "macros": {
-    "lbezier()()": {
-      "snippet": "lbezier(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "lbezier[]()()": {
-      "snippet": "lbezier[${1:n}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "cbezier()()()()": {
-      "snippet": "cbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "cbezier[]()()()()": {
-      "snippet": "cbezier[${1:n}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "rqbezier()()()()": {
-      "snippet": "rqbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:weight})"
-    },
-    "rqbezier[]()()()()": {
-      "snippet": "rqbezier[${1:n}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:weight})"
-    },
     "setweightscale{}": {
       "snippet": "setweightscale{${1:number}}"
     },
diff --git a/dev/packages/bibentry.json b/dev/packages/bibentry.json
deleted file mode 100644
index 94a20a58d..000000000
--- a/dev/packages/bibentry.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "nobibliography{}": {
-      "snippet": "nobibliography{${1:bib file}}"
-    },
-    "nobibliography*": {},
-    "bibentry{}": {
-      "snippet": "bibentry{${1:keylist}}"
-    },
-    "urlprefix": {},
-    "url{}": {
-      "snippet": "url{${1:URL}}"
-    },
-    "doi{}": {
-      "snippet": "doi{${1:DOI}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/biblatex-archaeology.json b/dev/packages/biblatex-archaeology.json
index 5ef782354..09f7bb06c 100644
--- a/dev/packages/biblatex-archaeology.json
+++ b/dev/packages/biblatex-archaeology.json
@@ -37,66 +37,30 @@
     "citeissues{}{}": {
       "snippet": "citeissues{${1:bibid}}{${2:bibid}}"
     },
-    "citeissues(){}{}": {
-      "snippet": "citeissues(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "citeissues()(){}{}": {
-      "snippet": "citeissues(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citeissues()()[]{}[]{}": {
-      "snippet": "citeissues(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "citeissues[]{}[]{}": {
       "snippet": "citeissues[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citeissues[][]{}[][]{}": {
       "snippet": "citeissues[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citeissues()()[][]{}[][]{}": {
-      "snippet": "citeissues(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "fciteissues{}{}": {
       "snippet": "fciteissues{${1:bibid}}{${2:bibid}}"
     },
-    "fciteissues(){}{}": {
-      "snippet": "fciteissues(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "fciteissues()(){}{}": {
-      "snippet": "fciteissues(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "fciteissues()()[]{}[]{}": {
-      "snippet": "fciteissues(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "fciteissues[]{}[]{}": {
       "snippet": "fciteissues[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "fciteissues[][]{}[][]{}": {
       "snippet": "fciteissues[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "fciteissues()()[][]{}[][]{}": {
-      "snippet": "fciteissues(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "pciteissues{}{}": {
       "snippet": "pciteissues{${1:bibid}}{${2:bibid}}"
     },
-    "pciteissues(){}{}": {
-      "snippet": "pciteissues(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "pciteissues()(){}{}": {
-      "snippet": "pciteissues(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "pciteissues()()[]{}[]{}": {
-      "snippet": "pciteissues(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "pciteissues[]{}[]{}": {
       "snippet": "pciteissues[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "pciteissues[][]{}[][]{}": {
       "snippet": "pciteissues[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "pciteissues()()[][]{}[][]{}": {
-      "snippet": "pciteissues(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "posscite{}": {
       "snippet": "posscite{${1:bibid}}"
     },
@@ -118,45 +82,21 @@
     "posscites{}{}": {
       "snippet": "posscites{${1:bibid}}{${2:bibid}}"
     },
-    "posscites(){}{}": {
-      "snippet": "posscites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "posscites()(){}{}": {
-      "snippet": "posscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "posscites()()[]{}[]{}": {
-      "snippet": "posscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "posscites[]{}[]{}": {
       "snippet": "posscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "posscites[][]{}[][]{}": {
       "snippet": "posscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "posscites()()[][]{}[][]{}": {
-      "snippet": "posscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Posscites{}{}": {
       "snippet": "Posscites{${1:bibid}}{${2:bibid}}"
     },
-    "Posscites(){}{}": {
-      "snippet": "Posscites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "Posscites()(){}{}": {
-      "snippet": "Posscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Posscites()()[]{}[]{}": {
-      "snippet": "Posscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "Posscites[]{}[]{}": {
       "snippet": "Posscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Posscites[][]{}[][]{}": {
       "snippet": "Posscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Posscites()()[][]{}[][]{}": {
-      "snippet": "Posscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "shortformcite{}": {
       "snippet": "shortformcite{${1:bibid}}"
     },
@@ -169,24 +109,12 @@
     "shortformcites{}{}": {
       "snippet": "shortformcites{${1:bibid}}{${2:bibid}}"
     },
-    "shortformcites(){}{}": {
-      "snippet": "shortformcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "shortformcites()(){}{}": {
-      "snippet": "shortformcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "shortformcites()()[]{}[]{}": {
-      "snippet": "shortformcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "shortformcites[]{}[]{}": {
       "snippet": "shortformcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "shortformcites[][]{}[][]{}": {
       "snippet": "shortformcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "shortformcites()()[][]{}[][]{}": {
-      "snippet": "shortformcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "sfcite{}": {
       "snippet": "sfcite{${1:bibid}}"
     },
@@ -199,24 +127,12 @@
     "sfcites{}{}": {
       "snippet": "sfcites{${1:bibid}}{${2:bibid}}"
     },
-    "sfcites(){}{}": {
-      "snippet": "sfcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "sfcites()(){}{}": {
-      "snippet": "sfcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "sfcites()()[]{}[]{}": {
-      "snippet": "sfcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "sfcites[]{}[]{}": {
       "snippet": "sfcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "sfcites[][]{}[][]{}": {
       "snippet": "sfcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "sfcites()()[][]{}[][]{}": {
-      "snippet": "sfcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "reviewcite{}": {
       "snippet": "reviewcite{${1:bibid}}"
     },
@@ -274,129 +190,57 @@
     "reviewcites{}{}": {
       "snippet": "reviewcites{${1:bibid}}{${2:bibid}}"
     },
-    "reviewcites(){}{}": {
-      "snippet": "reviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "reviewcites()(){}{}": {
-      "snippet": "reviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "reviewcites()()[]{}[]{}": {
-      "snippet": "reviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "reviewcites[]{}[]{}": {
       "snippet": "reviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "reviewcites[][]{}[][]{}": {
       "snippet": "reviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "reviewcites()()[][]{}[][]{}": {
-      "snippet": "reviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "previewcites{}{}": {
       "snippet": "previewcites{${1:bibid}}{${2:bibid}}"
     },
-    "previewcites(){}{}": {
-      "snippet": "previewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "previewcites()(){}{}": {
-      "snippet": "previewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "previewcites()()[]{}[]{}": {
-      "snippet": "previewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "previewcites[]{}[]{}": {
       "snippet": "previewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "previewcites[][]{}[][]{}": {
       "snippet": "previewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "previewcites()()[][]{}[][]{}": {
-      "snippet": "previewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "textreviewcites{}{}": {
       "snippet": "textreviewcites{${1:bibid}}{${2:bibid}}"
     },
-    "textreviewcites(){}{}": {
-      "snippet": "textreviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "textreviewcites()(){}{}": {
-      "snippet": "textreviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "textreviewcites()()[]{}[]{}": {
-      "snippet": "textreviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "textreviewcites[]{}[]{}": {
       "snippet": "textreviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "textreviewcites[][]{}[][]{}": {
       "snippet": "textreviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "textreviewcites()()[][]{}[][]{}": {
-      "snippet": "textreviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Reviewcites{}{}": {
       "snippet": "Reviewcites{${1:bibid}}{${2:bibid}}"
     },
-    "Reviewcites(){}{}": {
-      "snippet": "Reviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "Reviewcites()(){}{}": {
-      "snippet": "Reviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Reviewcites()()[]{}[]{}": {
-      "snippet": "Reviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "Reviewcites[]{}[]{}": {
       "snippet": "Reviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Reviewcites[][]{}[][]{}": {
       "snippet": "Reviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Reviewcites()()[][]{}[][]{}": {
-      "snippet": "Reviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Previewcites{}{}": {
       "snippet": "Previewcites{${1:bibid}}{${2:bibid}}"
     },
-    "Previewcites(){}{}": {
-      "snippet": "Previewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "Previewcites()(){}{}": {
-      "snippet": "Previewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Previewcites()()[]{}[]{}": {
-      "snippet": "Previewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "Previewcites[]{}[]{}": {
       "snippet": "Previewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Previewcites[][]{}[][]{}": {
       "snippet": "Previewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Previewcites()()[][]{}[][]{}": {
-      "snippet": "Previewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Textreviewcites{}{}": {
       "snippet": "Textreviewcites{${1:bibid}}{${2:bibid}}"
     },
-    "Textreviewcites(){}{}": {
-      "snippet": "Textreviewcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "Textreviewcites()(){}{}": {
-      "snippet": "Textreviewcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Textreviewcites()()[]{}[]{}": {
-      "snippet": "Textreviewcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "Textreviewcites[]{}[]{}": {
       "snippet": "Textreviewcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Textreviewcites[][]{}[][]{}": {
       "snippet": "Textreviewcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Textreviewcites()()[][]{}[][]{}": {
-      "snippet": "Textreviewcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "DefineGenitiveApostropheChars{}{}": {
       "snippet": "DefineGenitiveApostropheChars{${1:language}}{${2:csv}}"
     },
diff --git a/dev/packages/biblatex-chicago.json b/dev/packages/biblatex-chicago.json
index d395c3d87..956e2b9bb 100644
--- a/dev/packages/biblatex-chicago.json
+++ b/dev/packages/biblatex-chicago.json
@@ -7,10 +7,10 @@
   },
   "macros": {
     "suppressbibfield{}": {
-      "snippet": "suppressbibfield{${1:field1,${2:field2},...}}"
+      "snippet": "suppressbibfield{${1:field1,field2,...}}"
     },
     "suppressbibfield[]{}": {
-      "snippet": "suppressbibfield[${2:entrytype1,${3:entrytype2},${4:...}]{${1:field1},${5:field2},...}}"
+      "snippet": "suppressbibfield[${2:entrytype1,entrytype2,...}]{${1:field1,field2,...}}"
     },
     "lositemsep": {},
     "cmsunspecified{}{}": {
@@ -43,24 +43,12 @@
     "citeincites{}{}": {
       "snippet": "citeincites{${1:bibid}}{${2:bibid}}"
     },
-    "citeincites(){}{}": {
-      "snippet": "citeincites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "citeincites()(){}{}": {
-      "snippet": "citeincites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citeincites()()[]{}[]{}": {
-      "snippet": "citeincites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "citeincites[]{}[]{}": {
       "snippet": "citeincites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citeincites[][]{}[][]{}": {
       "snippet": "citeincites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citeincites()()[][]{}[][]{}": {
-      "snippet": "citeincites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "citejournal{}": {
       "snippet": "citejournal{${1:bibid}}"
     },
@@ -73,24 +61,12 @@
     "citetitles{}{}": {
       "snippet": "citetitles{${1:bibid}}{${2:bibid}}"
     },
-    "citetitles(){}{}": {
-      "snippet": "citetitles(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "citetitles()(){}{}": {
-      "snippet": "citetitles(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citetitles()()[]{}[]{}": {
-      "snippet": "citetitles(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "citetitles[]{}[]{}": {
       "snippet": "citetitles[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citetitles[][]{}[][]{}": {
       "snippet": "citetitles[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citetitles()()[][]{}[][]{}": {
-      "snippet": "citetitles(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "fullciteincite{}": {
       "snippet": "fullciteincite{${1:bibid}}"
     },
@@ -103,24 +79,12 @@
     "fullciteincites{}{}": {
       "snippet": "fullciteincites{${1:bibid}}{${2:bibid}}"
     },
-    "fullciteincites(){}{}": {
-      "snippet": "fullciteincites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "fullciteincites()(){}{}": {
-      "snippet": "fullciteincites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "fullciteincites()()[]{}[]{}": {
-      "snippet": "fullciteincites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "fullciteincites[]{}[]{}": {
       "snippet": "fullciteincites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "fullciteincites[][]{}[][]{}": {
       "snippet": "fullciteincites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "fullciteincites()()[][]{}[][]{}": {
-      "snippet": "fullciteincites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "gentextcite{}": {
       "snippet": "gentextcite{${1:bibid}}"
     },
@@ -136,36 +100,12 @@
     "gentextcites{}{}": {
       "snippet": "gentextcites{${1:bibid}}{${2:bibid}}"
     },
-    "gentextcites(){}{}": {
-      "snippet": "gentextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "gentextcites[](){}{}": {
-      "snippet": "gentextcites[${3:ending}](${4:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "gentextcites()(){}{}": {
-      "snippet": "gentextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "gentextcites[]()(){}{}": {
-      "snippet": "gentextcites[${3:ending}](${4:pre})(${5:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "gentextcites()()[]{}[]{}": {
-      "snippet": "gentextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
-    "gentextcites[]()()[]{}[]{}": {
-      "snippet": "gentextcites[${3:ending}](${6:pre})(${7:post})[${4:pre}]{${1:bibid}}[${5:pre}]{${2:bibid}}"
-    },
     "gentextcites[]{}[]{}": {
       "snippet": "gentextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "gentextcites[][]{}[][]{}": {
       "snippet": "gentextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "gentextcites()()[][]{}[][]{}": {
-      "snippet": "gentextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "gentextcites[]()()[][]{}[][]{}": {
-      "snippet": "gentextcites[${3:ending}](${8:pre})(${9:post})[${4:pre}][${5:post}]{${1:bibid}}[${6:pre}][${7:post}]{${2:bibid}}"
-    },
     "Gentextcite{}": {
       "snippet": "Gentextcite{${1:bibid}}"
     },
@@ -181,36 +121,12 @@
     "Gentextcites{}{}": {
       "snippet": "Gentextcites{${1:bibid}}{${2:bibid}}"
     },
-    "Gentextcites(){}{}": {
-      "snippet": "Gentextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "Gentextcites[](){}{}": {
-      "snippet": "Gentextcites[${3:ending}](${4:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "Gentextcites()(){}{}": {
-      "snippet": "Gentextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Gentextcites[]()(){}{}": {
-      "snippet": "Gentextcites[${3:ending}](${4:pre})(${5:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Gentextcites()()[]{}[]{}": {
-      "snippet": "Gentextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
-    "Gentextcites[]()()[]{}[]{}": {
-      "snippet": "Gentextcites[${3:ending}](${6:pre})(${7:post})[${4:pre}]{${1:bibid}}[${5:pre}]{${2:bibid}}"
-    },
     "Gentextcites[]{}[]{}": {
       "snippet": "Gentextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Gentextcites[][]{}[][]{}": {
       "snippet": "Gentextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Gentextcites()()[][]{}[][]{}": {
-      "snippet": "Gentextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Gentextcites[]()()[][]{}[][]{}": {
-      "snippet": "Gentextcites[${3:ending}](${8:pre})(${9:post})[${4:pre}][${5:post}]{${1:bibid}}[${6:pre}][${7:post}]{${2:bibid}}"
-    },
     "headlesscite{}": {
       "snippet": "headlesscite{${1:bibid}}"
     },
@@ -223,24 +139,12 @@
     "headlesscites{}{}": {
       "snippet": "headlesscites{${1:bibid}}{${2:bibid}}"
     },
-    "headlesscites(){}{}": {
-      "snippet": "headlesscites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlesscites()(){}{}": {
-      "snippet": "headlesscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlesscites()()[]{}[]{}": {
-      "snippet": "headlesscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "headlesscites[]{}[]{}": {
       "snippet": "headlesscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlesscites[][]{}[][]{}": {
       "snippet": "headlesscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "headlesscites()()[][]{}[][]{}": {
-      "snippet": "headlesscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "Headlesscite{}": {
       "snippet": "Headlesscite{${1:bibid}}"
     },
@@ -253,24 +157,12 @@
     "Headlesscites{}{}": {
       "snippet": "Headlesscites{${1:bibid}}{${2:bibid}}"
     },
-    "Headlesscites(){}{}": {
-      "snippet": "Headlesscites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "Headlesscites()(){}{}": {
-      "snippet": "Headlesscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Headlesscites()()[]{}[]{}": {
-      "snippet": "Headlesscites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "Headlesscites[]{}[]{}": {
       "snippet": "Headlesscites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "Headlesscites[][]{}[][]{}": {
       "snippet": "Headlesscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "Headlesscites()()[][]{}[][]{}": {
-      "snippet": "Headlesscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "headlessfullcite{}": {
       "snippet": "headlessfullcite{${1:bibid}}"
     },
@@ -283,24 +175,12 @@
     "headlessfullcites{}{}": {
       "snippet": "headlessfullcites{${1:bibid}}{${2:bibid}}"
     },
-    "headlessfullcites(){}{}": {
-      "snippet": "headlessfullcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlessfullcites()(){}{}": {
-      "snippet": "headlessfullcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlessfullcites()()[]{}[]{}": {
-      "snippet": "headlessfullcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "headlessfullcites[]{}[]{}": {
       "snippet": "headlessfullcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlessfullcites[][]{}[][]{}": {
       "snippet": "headlessfullcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "headlessfullcites()()[][]{}[][]{}": {
-      "snippet": "headlessfullcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "shortcite[]{}": {
       "snippet": "shortcite[${2:postnote}]{${1:bibid}}"
     },
@@ -391,24 +271,12 @@
     "surnamecites{}{}": {
       "snippet": "surnamecites{${1:bibid}}{${2:bibid}}"
     },
-    "surnamecites(){}{}": {
-      "snippet": "surnamecites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "surnamecites()(){}{}": {
-      "snippet": "surnamecites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "surnamecites()()[]{}[]{}": {
-      "snippet": "surnamecites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "surnamecites[]{}[]{}": {
       "snippet": "surnamecites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "surnamecites[][]{}[][]{}": {
       "snippet": "surnamecites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "surnamecites()()[][]{}[][]{}": {
-      "snippet": "surnamecites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "runcite{}": {
       "snippet": "runcite{${1:bibid}}"
     },
@@ -430,24 +298,12 @@
     "headlessparencites{}{}": {
       "snippet": "headlessparencites{${1:bibid}}{${2:bibid}}"
     },
-    "headlessparencites(){}{}": {
-      "snippet": "headlessparencites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlessparencites()(){}{}": {
-      "snippet": "headlessparencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlessparencites()()[]{}[]{}": {
-      "snippet": "headlessparencites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "headlessparencites[]{}[]{}": {
       "snippet": "headlessparencites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlessparencites[][]{}[][]{}": {
       "snippet": "headlessparencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "headlessparencites()()[][]{}[][]{}": {
-      "snippet": "headlessparencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "headlessparenshortcite{}": {
       "snippet": "headlessparenshortcite{${1:bibid}}"
     },
@@ -460,24 +316,12 @@
     "headlessparenshortcites{}{}": {
       "snippet": "headlessparenshortcites{${1:bibid}}{${2:bibid}}"
     },
-    "headlessparenshortcites(){}{}": {
-      "snippet": "headlessparenshortcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlessparenshortcites()(){}{}": {
-      "snippet": "headlessparenshortcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "headlessparenshortcites()()[]{}[]{}": {
-      "snippet": "headlessparenshortcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "headlessparenshortcites[]{}[]{}": {
       "snippet": "headlessparenshortcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "headlessparenshortcites[][]{}[][]{}": {
       "snippet": "headlessparenshortcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "headlessparenshortcites()()[][]{}[][]{}": {
-      "snippet": "headlessparenshortcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "foottextcite{}": {
       "snippet": "foottextcite{${1:bibid}}"
     },
@@ -490,24 +334,12 @@
     "foottextcites{}{}": {
       "snippet": "foottextcites{${1:bibid}}{${2:bibid}}"
     },
-    "foottextcites(){}{}": {
-      "snippet": "foottextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "foottextcites()(){}{}": {
-      "snippet": "foottextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "foottextcites()()[]{}[]{}": {
-      "snippet": "foottextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "foottextcites[]{}[]{}": {
       "snippet": "foottextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "foottextcites[][]{}[][]{}": {
       "snippet": "foottextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "foottextcites()()[][]{}[][]{}": {
-      "snippet": "foottextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "cmsnoopcite{}": {
       "snippet": "cmsnoopcite{${1:bibid}}"
     },
@@ -565,24 +397,12 @@
     "citeincitefs{}{}": {
       "snippet": "citeincitefs{${1:bibid}}{${2:bibid}}"
     },
-    "citeincitefs(){}{}": {
-      "snippet": "citeincitefs(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "citeincitefs()(){}{}": {
-      "snippet": "citeincitefs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citeincitefs()()[]{}[]{}": {
-      "snippet": "citeincitefs(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "citeincitefs[]{}[]{}": {
       "snippet": "citeincitefs[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "citeincitefs[][]{}[][]{}": {
       "snippet": "citeincitefs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citeincitefs()()[][]{}[][]{}": {
-      "snippet": "citeincitefs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "reprint": {},
     "partcomp": {},
     "partedit{}": {
diff --git a/dev/packages/biblatex-ext-oa.json b/dev/packages/biblatex-ext-oa.json
index 1611fcc68..4f6db16da 100644
--- a/dev/packages/biblatex-ext-oa.json
+++ b/dev/packages/biblatex-ext-oa.json
@@ -43,7 +43,7 @@
       "snippet": "UndeclareOpenAccessEprintUrl{${1:eprint type}}"
     },
     "DeclareOpenAccessUrlFieldPriority{}": {
-      "snippet": "DeclareOpenAccessUrlFieldPriority{${1:field1,${2:field2},...}}"
+      "snippet": "DeclareOpenAccessUrlFieldPriority{${1:field1,field2,...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/biblatex-ms.json b/dev/packages/biblatex-ms.json
index 654493dfd..ba4c1f3df 100644
--- a/dev/packages/biblatex-ms.json
+++ b/dev/packages/biblatex-ms.json
@@ -132,7 +132,7 @@
     "currentmslang": {},
     "currentmslangs": {},
     "DeclareExtradateContext[]{}": {
-      "snippet": "DeclareExtradateContext[${2:entrytype1,${3:entrytype2},...}]{${1:specification}}"
+      "snippet": "DeclareExtradateContext[${2:entrytype1,entrytype2,...}]{${1:specification}}"
     },
     "DeclareExtradateContext{}": {
       "snippet": "DeclareExtradateContext{${1:specification}}"
@@ -991,18 +991,6 @@
       "snippet": "apud{${1:bibid}}{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
-    "apud(){}{}": {
-      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud()(){}{}": {
-      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud()()[]{}[]{}": {
-      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
     "apud[]{}[]{}": {
       "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
@@ -1011,10 +999,6 @@
       "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=abnt-ibid"
     },
-    "apud()()[][]{}[][]{}": {
-      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
     "plaincite[][]{}": {
       "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "style=abnt"
@@ -1267,18 +1251,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "style=apa"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=apa"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=apa"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=apa"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=apa"
@@ -1287,10 +1259,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=apa"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=apa"
-    },
     "arthistoryversion": {
       "option": "style=arthistory-bonn"
     },
@@ -1708,18 +1676,6 @@
       "snippet": "citets{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
-    "citets(){}{}": {
-      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets()(){}{}": {
-      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets()()[]{}[]{}": {
-      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
     "citets[]{}[]{}": {
       "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
@@ -1728,26 +1684,10 @@
       "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-author-year"
     },
-    "citets()()[][]{}[][]{}": {
-      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
     "Citets{}{}": {
       "snippet": "Citets{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citets(){}{}": {
-      "snippet": "Citets(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets()(){}{}": {
-      "snippet": "Citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets()()[]{}[]{}": {
-      "snippet": "Citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "Citets[]{}[]{}": {
       "snippet": "Citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -1756,26 +1696,10 @@
       "snippet": "Citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citets()()[][]{}[][]{}": {
-      "snippet": "Citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "citealts{}{}": {
       "snippet": "citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "citealts(){}{}": {
-      "snippet": "citealts(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts()(){}{}": {
-      "snippet": "citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts()()[]{}[]{}": {
-      "snippet": "citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "citealts[]{}[]{}": {
       "snippet": "citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -1784,26 +1708,10 @@
       "snippet": "citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "citealts()()[][]{}[][]{}": {
-      "snippet": "citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "Citealts{}{}": {
       "snippet": "Citealts{${1:bibid}}{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citealts(){}{}": {
-      "snippet": "Citealts(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts()(){}{}": {
-      "snippet": "Citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts()()[]{}[]{}": {
-      "snippet": "Citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "Citealts[]{}[]{}": {
       "snippet": "Citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=fiwi2"
@@ -1812,10 +1720,6 @@
       "snippet": "Citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=fiwi2"
     },
-    "Citealts()()[][]{}[][]{}": {
-      "snippet": "Citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
     "mkbibindextruename{}{}{}{}": {
       "snippet": "mkbibindextruename{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}",
       "option": "style=fiwi2"
@@ -2170,18 +2074,6 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -2190,26 +2082,10 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
@@ -2218,10 +2094,6 @@
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=thuthesis-numeric"
     },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
     "dealnoathor": {
       "option": "style=thuthesis-author-year"
     },
@@ -2433,18 +2305,6 @@
       "snippet": "detailscites{${1:bibid}}{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
-    "detailscites(){}{}": {
-      "snippet": "detailscites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites()(){}{}": {
-      "snippet": "detailscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites()()[]{}[]{}": {
-      "snippet": "detailscites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
     "detailscites[]{}[]{}": {
       "snippet": "detailscites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
@@ -2453,10 +2313,6 @@
       "snippet": "detailscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "bibstyle=manuscripts-noautoshorthand"
     },
-    "detailscites()()[][]{}[][]{}": {
-      "snippet": "detailscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
     "collectionshelfmarkpunct": {
       "option": "style=oxnum"
     },
@@ -3423,18 +3279,6 @@
       "snippet": "idemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
-    "idemcites(){}{}": {
-      "snippet": "idemcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites()(){}{}": {
-      "snippet": "idemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites()()[]{}[]{}": {
-      "snippet": "idemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "idemcites[]{}[]{}": {
       "snippet": "idemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -3443,10 +3287,6 @@
       "snippet": "idemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
-    "idemcites()()[][]{}[][]{}": {
-      "snippet": "idemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "footidemcite{}": {
       "snippet": "footidemcite{${1:bibid}}",
       "option": "style=windycity"
@@ -3463,18 +3303,6 @@
       "snippet": "footidemcites{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
-    "footidemcites(){}{}": {
-      "snippet": "footidemcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites()(){}{}": {
-      "snippet": "footidemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites()()[]{}[]{}": {
-      "snippet": "footidemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "footidemcites[]{}[]{}": {
       "snippet": "footidemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -3483,10 +3311,6 @@
       "snippet": "footidemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
-    "footidemcites()()[][]{}[][]{}": {
-      "snippet": "footidemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "parenauth{}": {
       "snippet": "parenauth{${1:bibid}}",
       "option": "style=windycity"
@@ -3503,18 +3327,6 @@
       "snippet": "parenauths{${1:bibid}}{${2:bibid}}",
       "option": "style=windycity"
     },
-    "parenauths(){}{}": {
-      "snippet": "parenauths(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths()(){}{}": {
-      "snippet": "parenauths(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths()()[]{}[]{}": {
-      "snippet": "parenauths(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "parenauths[]{}[]{}": {
       "snippet": "parenauths[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=windycity"
@@ -3523,10 +3335,6 @@
       "snippet": "parenauths[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=windycity"
     },
-    "parenauths()()[][]{}[][]{}": {
-      "snippet": "parenauths(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
     "mkmonthrange{}{}": {
       "snippet": "mkmonthrange{${1:arg1}}{${2:arg2}}",
       "option": "style=windycity"
diff --git a/dev/packages/biblatex.json b/dev/packages/biblatex.json
deleted file mode 100644
index 19557d681..000000000
--- a/dev/packages/biblatex.json
+++ /dev/null
@@ -1,8530 +0,0 @@
-{
-  "includes": {
-    "pdftexcmds": [],
-    "etoolbox": [],
-    "keyval": [],
-    "kvoptions": [],
-    "logreq": [],
-    "ifthen": [],
-    "url": [],
-    "xpatch": [
-      "style=abnt",
-      "style=abnt-ibid",
-      "style=abnt-numeric",
-      "style=acmauthoryear",
-      "style=arthistory-bonn",
-      "style=bath",
-      "bibstyle=claves",
-      "style=german-legal-book",
-      "bibstyle=manuscripts",
-      "bibstyle=manuscripts-noautoshorthand",
-      "style=oxalph",
-      "style=oxyear",
-      "style=oxnotes",
-      "style=oxnum",
-      "bibstyle=realauthor",
-      "style=unified"
-    ],
-    "xurl": [
-      "style=acmauthoryear",
-      "style=acmnumeric",
-      "bibstyle=software"
-    ],
-    "ulem": [
-      "style=archaeologie"
-    ],
-    "biblatex-archaeology": [
-      "style=aefkw",
-      "style=afwl",
-      "style=amit",
-      "style=archa",
-      "style=dguf",
-      "style=dguf-alt",
-      "style=dguf-apa",
-      "style=eaz",
-      "style=eaz-alt",
-      "style=foe",
-      "style=jb-halle",
-      "style=jb-kreis-neuss",
-      "style=karl",
-      "style=kunde",
-      "style=maja",
-      "style=mpk",
-      "style=mpkoeaw",
-      "style=niedersachsen",
-      "style=nnu",
-      "style=offa",
-      "style=rgk-inline",
-      "style=rgk-numeric",
-      "style=rgk-verbose",
-      "style=rgk-inline-old",
-      "style=rgk-numeric-old",
-      "style=rgk-verbose-old",
-      "style=rgzm-inline",
-      "style=rgzm-inline",
-      "style=rgzm-verbose",
-      "style=ufg-muenster-inline",
-      "style=ufg-muenster-numeric",
-      "style=ufg-muenster-verbose",
-      "style=volkskunde",
-      "style=zaak",
-      "style=zaes"
-    ],
-    "csquotes": [
-      "style=arthistory-bonn"
-    ],
-    "xstring": [
-      "style=bath",
-      "style=gb7714-2015",
-      "style=gb7714-2015ay",
-      "style=gb7714-2015ms",
-      "style=gb7714-2015mx",
-      "style=gb7714-CCNU",
-      "style=gb7714-NWAFU",
-      "style=gb7714-SEU",
-      "style=chinese-erj",
-      "style=oxalph",
-      "style=oxyear",
-      "style=oxnotes",
-      "style=oxnum",
-      "style=thuthesis-author-year",
-      "style=thuthesis-bachelor",
-      "style=thuthesis-numeric"
-    ],
-    "ragged2e": [
-      "style=fiwi",
-      "style=fiwi2"
-    ],
-    "mfirstuc": [
-      "style=chinese-erj"
-    ],
-    "graphicx": [
-      "style=oxalph",
-      "style=oxyear",
-      "style=oxnotes",
-      "style=oxnum"
-    ],
-    "xcolor": [
-      "style=socialscienceshuberlin"
-    ]
-  },
-  "macros": {
-    "bibname": {},
-    "biblistname": {},
-    "BiblatexManualHyperrefOn": {},
-    "BiblatexManualHyperrefOff": {},
-    "ExecuteBibliographyOptions{}": {
-      "snippet": "ExecuteBibliographyOptions{${1:options}}"
-    },
-    "ExecuteBibliographyOptions[]{}": {
-      "snippet": "ExecuteBibliographyOptions[${2:entrytype list}]{${1:options}}"
-    },
-    "iffieldannotation{}{}{}": {
-      "snippet": "iffieldannotation{${1:annotation}}{${2:true}}{${3:false}}"
-    },
-    "iffieldannotation[]{}{}{}": {
-      "snippet": "iffieldannotation[${4:field}]{${1:annotation}}{${2:true}}{${3:false}}"
-    },
-    "iffieldannotation[][]{}{}{}": {
-      "snippet": "iffieldannotation[${4:field}][${5:annotation name}]{${1:annotation}}{${2:true}}{${3:false}}"
-    },
-    "ifitemannotation{}{}{}": {
-      "snippet": "ifitemannotation{${1:annotation}}{${2:true}}{${3:false}}"
-    },
-    "ifitemannotation[]{}{}{}": {
-      "snippet": "ifitemannotation[${4:field}]{${1:annotation}}{${2:true}}{${3:false}}"
-    },
-    "ifitemannotation[][]{}{}{}": {
-      "snippet": "ifitemannotation[${4:field}][${5:annotation name}]{${1:annotation}}{${2:true}}{${3:false}}"
-    },
-    "ifitemannotation[][][]{}{}{}": {
-      "snippet": "ifitemannotation[${4:field}][${5:annotation name}][${6:item}]{${1:annotation}}{${2:true}}{${3:false}}"
-    },
-    "ifpartannotation{}{}{}{}": {
-      "snippet": "ifpartannotation{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
-    },
-    "ifpartannotation[]{}{}{}{}": {
-      "snippet": "ifpartannotation[${5:field}]{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
-    },
-    "ifpartannotation[][]{}{}{}{}": {
-      "snippet": "ifpartannotation[${5:field}][${6:annotation name}]{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
-    },
-    "ifpartannotation[][][]{}{}{}{}": {
-      "snippet": "ifpartannotation[${5:field}][${6:annotation name}][${7:item}]{${1:part}}{${2:annotation}}{${3:true}}{${4:false}}"
-    },
-    "ifdateannotation{}{}{}{}": {
-      "snippet": "ifdateannotation{${1:datetype}}{${2:annotation}}{${3:true}}{${4:false}}"
-    },
-    "ifdateannotation[]{}{}{}{}": {
-      "snippet": "ifdateannotation[${5:annotation name}]{${1:datetype}}{${2:annotation}}{${3:true}}{${4:false}}"
-    },
-    "hasfieldannotation{}{}": {
-      "snippet": "hasfieldannotation{${1:true}}{${2:false}}"
-    },
-    "hasfieldannotation[]{}{}": {
-      "snippet": "hasfieldannotation[${3:field}]{${1:true}}{${2:false}}"
-    },
-    "hasfieldannotation[][]{}{}": {
-      "snippet": "hasfieldannotation[${3:field}][${4:annotation name}]{${1:true}}{${2:false}}"
-    },
-    "hasitemannotation{}{}": {
-      "snippet": "hasitemannotation{${1:true}}{${2:false}}"
-    },
-    "hasitemannotation[]{}{}": {
-      "snippet": "hasitemannotation[${3:field}]{${1:true}}{${2:false}}"
-    },
-    "hasitemannotation[][]{}{}": {
-      "snippet": "hasitemannotation[${3:field}][${4:annotation name}]{${1:true}}{${2:false}}"
-    },
-    "hasitemannotation[][][]{}{}": {
-      "snippet": "hasitemannotation[${3:field}][${4:annotation name}][${5:item}]{${1:true}}{${2:false}}"
-    },
-    "haspartannotation{}{}{}": {
-      "snippet": "haspartannotation{${1:part}}{${2:true}}{${3:false}}"
-    },
-    "haspartannotation[]{}{}{}": {
-      "snippet": "haspartannotation[${4:field}]{${1:part}}{${2:true}}{${3:false}}"
-    },
-    "haspartannotation[][]{}{}{}": {
-      "snippet": "haspartannotation[${4:field}][${5:annotation name}]{${1:part}}{${2:true}}{${3:false}}"
-    },
-    "haspartannotation[][][]{}{}{}": {
-      "snippet": "haspartannotation[${4:field}][${5:annotation name}][${6:item}]{${1:part}}{${2:true}}{${3:false}}"
-    },
-    "hasdateannotation{}{}{}": {
-      "snippet": "hasdateannotation{${1:datetype}}{${2:true}}{${3:false}}"
-    },
-    "hasdateannotation[]{}{}{}": {
-      "snippet": "hasdateannotation[${4:annotation name}]{${1:datetype}}{${2:true}}{${3:false}}"
-    },
-    "getfieldannotation": {},
-    "getfieldannotation[]": {
-      "snippet": "getfieldannotation[${1:field}]"
-    },
-    "getfieldannotation[][]": {
-      "snippet": "getfieldannotation[${1:field}][${2:annotation name}]"
-    },
-    "getitemannotation": {},
-    "getitemannotation[]": {
-      "snippet": "getitemannotation[${1:field}]"
-    },
-    "getitemannotation[][]": {
-      "snippet": "getitemannotation[${1:field}][${2:annotation name}]"
-    },
-    "getitemannotation[][][]": {
-      "snippet": "getitemannotation[${1:field}][${2:annotation name}][${3:item}]"
-    },
-    "getpartannotation{}": {
-      "snippet": "getpartannotation{${1:part}}"
-    },
-    "getpartannotation[]{}": {
-      "snippet": "getpartannotation[${2:field}]{${1:part}}"
-    },
-    "getpartannotation[][]{}": {
-      "snippet": "getpartannotation[${2:field}][${3:annotation name}]{${1:part}}"
-    },
-    "getpartannotation[][][]{}": {
-      "snippet": "getpartannotation[${2:field}][${3:annotation name}][${4:item}]{${1:part}}"
-    },
-    "getdateannotation{}": {
-      "snippet": "getdateannotation{${1:datetype}}"
-    },
-    "getdateannotation[]{}": {
-      "snippet": "getdateannotation[${2:annotation name}]{${1:datetype}}"
-    },
-    "addbibresource{}": {
-      "snippet": "addbibresource{${1:bibliographic resource}}"
-    },
-    "addbibresource[]{}": {
-      "snippet": "addbibresource[${2:options}]{${1:bibliographic resource}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "addglobalbib{}": {
-      "snippet": "addglobalbib{${1:bibliographic resource}}"
-    },
-    "addglobalbib[]{}": {
-      "snippet": "addglobalbib[${2:options}]{${1:bibliographic resource}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "addsectionbib{}": {
-      "snippet": "addsectionbib{${1:bibliographic resource}}"
-    },
-    "addsectionbib[]{}": {
-      "snippet": "addsectionbib[${2:options}]{${1:bibliographic resource}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "printbibliography": {},
-    "printbibliography[]": {
-      "snippet": "printbibliography[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "bibbysection": {},
-    "bibbysection[]": {
-      "snippet": "bibbysection[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "bibbysegment": {},
-    "bibbysegment[]": {
-      "snippet": "bibbysegment[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "bibbycategory": {},
-    "bibbycategory[]": {
-      "snippet": "bibbycategory[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "printbibheading": {},
-    "printbibheading[]": {
-      "snippet": "printbibheading[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "DeclarePrintbibliographyDefaults{}": {
-      "snippet": "DeclarePrintbibliographyDefaults{${1:options}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "printbiblist{}": {
-      "snippet": "printbiblist{${1:biblist}}"
-    },
-    "printbiblist[]{}": {
-      "snippet": "printbiblist[${2:options}]{${1:biblist}}",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "printshorthands": {},
-    "printshorthands[]": {
-      "snippet": "printshorthands[${1:options}]",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "newrefsection": {},
-    "newrefsection[]": {
-      "snippet": "newrefsection[${1:bib files}]"
-    },
-    "endrefsection": {},
-    "newrefsegment": {},
-    "endrefsegment": {},
-    "therefsection": {},
-    "therefsegment": {},
-    "DeclareBibliographyCategory{}": {
-      "snippet": "DeclareBibliographyCategory{${1:category}}"
-    },
-    "addtocategory{}{}": {
-      "snippet": "addtocategory{${1:category}}{${2:bibid}}"
-    },
-    "defbibenvironment{}{}{}{}": {
-      "snippet": "defbibenvironment{${1:envname}}{${2:begdef}}{${3:enddef}}{${4:itemcode}}"
-    },
-    "defbibheading{}{}": {
-      "snippet": "defbibheading{${1:name}}{${2:code}}"
-    },
-    "defbibheading{}[]{}": {
-      "snippet": "defbibheading{${1:name}}[${2:title}]{${3:code}}"
-    },
-    "defbibnote{}{}": {
-      "snippet": "defbibnote{${1:name}}{${2:text}}"
-    },
-    "defbibfilter{}{}": {
-      "snippet": "defbibfilter{${1:name}}{${2:expression}}"
-    },
-    "defbibcheck{}{}": {
-      "snippet": "defbibcheck{${1:name}}{${2:code}}"
-    },
-    "skipentry": {},
-    "segment{}": {
-      "snippet": "segment{${1:integer}}"
-    },
-    "type{}": {
-      "snippet": "type{${1:type}}"
-    },
-    "subtype{}": {
-      "snippet": "subtype{${1:subtype}}"
-    },
-    "keyword{}": {
-      "snippet": "keyword{${1:keyword}}"
-    },
-    "category{}": {
-      "snippet": "category{${1:category}}"
-    },
-    "DeclareRefcontext{}{}": {
-      "snippet": "DeclareRefcontext{${1:name}}{${2:options}}",
-      "keyvalindex": 6,
-      "keyvalpos": 1
-    },
-    "newrefcontext{}": {
-      "snippet": "newrefcontext{${1:name}}"
-    },
-    "newrefcontext[]{}": {
-      "snippet": "newrefcontext[${2:options}]{${1:name}}",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "localrefcontext{}": {
-      "snippet": "localrefcontext{${1:name}}"
-    },
-    "localrefcontext[]{}": {
-      "snippet": "localrefcontext[${2:options}]{${1:name}}",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "endrefcontext": {},
-    "assignrefcontextkeyws[]{}": {
-      "snippet": "assignrefcontextkeyws[${2:options}]{${1:keyword1,${3:keyword2},...}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "assignrefcontextkeyws*[]{}": {
-      "snippet": "assignrefcontextkeyws*[${2:options}]{${1:keyword1,${3:keyword2},...}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "assignrefcontextcats[]{}": {
-      "snippet": "assignrefcontextcats[${2:options}]{${1:category1,${3:category2},...}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "assignrefcontextcats*[]{}": {
-      "snippet": "assignrefcontextcats*[${2:options}]{${1:category1,${3:category2},...}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "assignrefcontextentries[]{}": {
-      "snippet": "assignrefcontextentries[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "assignrefcontextentries*[]{}": {
-      "snippet": "assignrefcontextentries*[${2:options}]{${1:entrykey1,${3:entrykey2},...}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "GenRefcontextData{}": {
-      "snippet": "GenRefcontextData{${1:keyvals}}",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "defbibentryset{}{}": {
-      "snippet": "defbibentryset{${1:bibid}}{${2:key1,${3:key2},...}}"
-    },
-    "cite[][]{}": {
-      "snippet": "cite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Cite[][]{}": {
-      "snippet": "Cite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Cite[]{}": {
-      "snippet": "Cite[${2:postnote}]{${1:bibid}}"
-    },
-    "Cite{}": {
-      "snippet": "Cite{${1:bibid}}"
-    },
-    "parencite[][]{}": {
-      "snippet": "parencite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "parencite[]{}": {
-      "snippet": "parencite[${2:postnote}]{${1:bibid}}"
-    },
-    "Parencite[][]{}": {
-      "snippet": "Parencite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Parencite[]{}": {
-      "snippet": "Parencite[${2:postnote}]{${1:bibid}}"
-    },
-    "Parencite{}": {
-      "snippet": "Parencite{${1:bibid}}"
-    },
-    "footcite[][]{}": {
-      "snippet": "footcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "footcite[]{}": {
-      "snippet": "footcite[${2:(${3:postnote:prefix})postnote:stem}]{${1:bibid}}",
-      "option": "style=jura2"
-    },
-    "footcite{}": {
-      "snippet": "footcite{${1:bibid}}"
-    },
-    "footcitetext[][]{}": {
-      "snippet": "footcitetext[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "footcitetext[]{}": {
-      "snippet": "footcitetext[${2:postnote}]{${1:bibid}}"
-    },
-    "footcitetext{}": {
-      "snippet": "footcitetext{${1:bibid}}"
-    },
-    "textcite[][]{}": {
-      "snippet": "textcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "textcite[]{}": {
-      "snippet": "textcite[${2:postnote}]{${1:bibid}}"
-    },
-    "Textcite[][]{}": {
-      "snippet": "Textcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Textcite[]{}": {
-      "snippet": "Textcite[${2:postnote}]{${1:bibid}}"
-    },
-    "Textcite{}": {
-      "snippet": "Textcite{${1:bibid}}"
-    },
-    "smartcite[][]{}": {
-      "snippet": "smartcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "smartcite[]{}": {
-      "snippet": "smartcite[${2:postnote}]{${1:bibid}}"
-    },
-    "smartcite{}": {
-      "snippet": "smartcite{${1:bibid}}"
-    },
-    "Smartcite[][]{}": {
-      "snippet": "Smartcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Smartcite[]{}": {
-      "snippet": "Smartcite[${2:postnote}]{${1:bibid}}"
-    },
-    "Smartcite{}": {
-      "snippet": "Smartcite{${1:bibid}}"
-    },
-    "cite*[][]{}": {
-      "snippet": "cite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "cite*[]{}": {
-      "snippet": "cite*[${2:postnote}]{${1:bibid}}"
-    },
-    "cite*{}": {
-      "snippet": "cite*{${1:bibid}}"
-    },
-    "parencite*[][]{}": {
-      "snippet": "parencite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "parencite*[]{}": {
-      "snippet": "parencite*[${2:postnote}]{${1:bibid}}"
-    },
-    "parencite*{}": {
-      "snippet": "parencite*{${1:bibid}}"
-    },
-    "supercite{}": {
-      "snippet": "supercite{${1:bibid}}"
-    },
-    "cites{}{}": {
-      "snippet": "cites{${1:bibid}}{${2:bibid}}"
-    },
-    "cites(){}{}": {
-      "snippet": "cites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "cites()(){}{}": {
-      "snippet": "cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "cites()()[]{}[]{}": {
-      "snippet": "cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "cites[]{}[]{}": {
-      "snippet": "cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "cites[][]{}[][]{}": {
-      "snippet": "cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "cites()()[][]{}[][]{}": {
-      "snippet": "cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Cites{}{}": {
-      "snippet": "Cites{${1:bibid}}{${2:bibid}}"
-    },
-    "Cites(){}{}": {
-      "snippet": "Cites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Cites()(){}{}": {
-      "snippet": "Cites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Cites()()[]{}[]{}": {
-      "snippet": "Cites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Cites[]{}[]{}": {
-      "snippet": "Cites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Cites[][]{}[][]{}": {
-      "snippet": "Cites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Cites()()[][]{}[][]{}": {
-      "snippet": "Cites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "parencites{}{}": {
-      "snippet": "parencites{${1:bibid}}{${2:bibid}}"
-    },
-    "parencites(){}{}": {
-      "snippet": "parencites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "parencites()(){}{}": {
-      "snippet": "parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "parencites()()[]{}[]{}": {
-      "snippet": "parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "parencites[]{}[]{}": {
-      "snippet": "parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "parencites[][]{}[][]{}": {
-      "snippet": "parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "parencites()()[][]{}[][]{}": {
-      "snippet": "parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Parencites{}{}": {
-      "snippet": "Parencites{${1:bibid}}{${2:bibid}}"
-    },
-    "Parencites(){}{}": {
-      "snippet": "Parencites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Parencites()(){}{}": {
-      "snippet": "Parencites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Parencites()()[]{}[]{}": {
-      "snippet": "Parencites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Parencites[]{}[]{}": {
-      "snippet": "Parencites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Parencites[][]{}[][]{}": {
-      "snippet": "Parencites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Parencites()()[][]{}[][]{}": {
-      "snippet": "Parencites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "footcites{}{}": {
-      "snippet": "footcites{${1:bibid}}{${2:bibid}}"
-    },
-    "footcites(){}{}": {
-      "snippet": "footcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcites()(){}{}": {
-      "snippet": "footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcites()()[]{}[]{}": {
-      "snippet": "footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "footcites[]{}[]{}": {
-      "snippet": "footcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "footcites[][]{}[][]{}": {
-      "snippet": "footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "footcites()()[][]{}[][]{}": {
-      "snippet": "footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "footcitetexts{}{}": {
-      "snippet": "footcitetexts{${1:bibid}}{${2:bibid}}"
-    },
-    "footcitetexts(){}{}": {
-      "snippet": "footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcitetexts()(){}{}": {
-      "snippet": "footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "footcitetexts()()[]{}[]{}": {
-      "snippet": "footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "footcitetexts[]{}[]{}": {
-      "snippet": "footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "footcitetexts[][]{}[][]{}": {
-      "snippet": "footcitetexts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "footcitetexts()()[][]{}[][]{}": {
-      "snippet": "footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "smartcites{}{}": {
-      "snippet": "smartcites{${1:bibid}}{${2:bibid}}"
-    },
-    "smartcites(){}{}": {
-      "snippet": "smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "smartcites()(){}{}": {
-      "snippet": "smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "smartcites()()[]{}[]{}": {
-      "snippet": "smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "smartcites[]{}[]{}": {
-      "snippet": "smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "smartcites[][]{}[][]{}": {
-      "snippet": "smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "smartcites()()[][]{}[][]{}": {
-      "snippet": "smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Smartcites{}{}": {
-      "snippet": "Smartcites{${1:bibid}}{${2:bibid}}"
-    },
-    "Smartcites(){}{}": {
-      "snippet": "Smartcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Smartcites()(){}{}": {
-      "snippet": "Smartcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Smartcites()()[]{}[]{}": {
-      "snippet": "Smartcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Smartcites[]{}[]{}": {
-      "snippet": "Smartcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Smartcites[][]{}[][]{}": {
-      "snippet": "Smartcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Smartcites()()[][]{}[][]{}": {
-      "snippet": "Smartcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "textcites{}{}": {
-      "snippet": "textcites{${1:bibid}}{${2:bibid}}"
-    },
-    "textcites(){}{}": {
-      "snippet": "textcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "textcites()(){}{}": {
-      "snippet": "textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "textcites()()[]{}[]{}": {
-      "snippet": "textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "textcites[]{}[]{}": {
-      "snippet": "textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "textcites[][]{}[][]{}": {
-      "snippet": "textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "textcites()()[][]{}[][]{}": {
-      "snippet": "textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Textcites{}{}": {
-      "snippet": "Textcites{${1:bibid}}{${2:bibid}}"
-    },
-    "Textcites(){}{}": {
-      "snippet": "Textcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Textcites()(){}{}": {
-      "snippet": "Textcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Textcites()()[]{}[]{}": {
-      "snippet": "Textcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Textcites[]{}[]{}": {
-      "snippet": "Textcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Textcites[][]{}[][]{}": {
-      "snippet": "Textcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Textcites()()[][]{}[][]{}": {
-      "snippet": "Textcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "supercites{}{}": {
-      "snippet": "supercites{${1:bibid}}{${2:bibid}}"
-    },
-    "supercites(){}{}": {
-      "snippet": "supercites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "supercites()(){}{}": {
-      "snippet": "supercites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "supercites()()[]{}[]{}": {
-      "snippet": "supercites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "supercites[]{}[]{}": {
-      "snippet": "supercites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "supercites[][]{}[][]{}": {
-      "snippet": "supercites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "supercites()()[][]{}[][]{}": {
-      "snippet": "supercites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "autocite[][]{}": {
-      "snippet": "autocite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "autocite[]{}": {
-      "snippet": "autocite[${2:postnote}]{${1:bibid}}"
-    },
-    "autocite{}": {
-      "snippet": "autocite{${1:bibid}}"
-    },
-    "Autocite[][]{}": {
-      "snippet": "Autocite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Autocite[]{}": {
-      "snippet": "Autocite[${2:postnote}]{${1:bibid}}"
-    },
-    "Autocite{}": {
-      "snippet": "Autocite{${1:bibid}}"
-    },
-    "autocite*[][]{}": {
-      "snippet": "autocite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "autocite*[]{}": {
-      "snippet": "autocite*[${2:postnote}]{${1:bibid}}"
-    },
-    "autocite*{}": {
-      "snippet": "autocite*{${1:bibid}}"
-    },
-    "Autocite*[][]{}": {
-      "snippet": "Autocite*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Autocite*[]{}": {
-      "snippet": "Autocite*[${2:postnote}]{${1:bibid}}"
-    },
-    "Autocite*{}": {
-      "snippet": "Autocite*{${1:bibid}}"
-    },
-    "autocites{}{}": {
-      "snippet": "autocites{${1:bibid}}{${2:bibid}}"
-    },
-    "autocites(){}{}": {
-      "snippet": "autocites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "autocites()(){}{}": {
-      "snippet": "autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "autocites()()[]{}[]{}": {
-      "snippet": "autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "autocites[]{}[]{}": {
-      "snippet": "autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "autocites[][]{}[][]{}": {
-      "snippet": "autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "autocites()()[][]{}[][]{}": {
-      "snippet": "autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Autocites{}{}": {
-      "snippet": "Autocites{${1:bibid}}{${2:bibid}}"
-    },
-    "Autocites(){}{}": {
-      "snippet": "Autocites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Autocites()(){}{}": {
-      "snippet": "Autocites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Autocites()()[]{}[]{}": {
-      "snippet": "Autocites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Autocites[]{}[]{}": {
-      "snippet": "Autocites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Autocites[][]{}[][]{}": {
-      "snippet": "Autocites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Autocites()()[][]{}[][]{}": {
-      "snippet": "Autocites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "citeauthor[][]{}": {
-      "snippet": "citeauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citeauthor[]{}": {
-      "snippet": "citeauthor[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citeauthor{}": {
-      "snippet": "citeauthor{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citeauthor[][]{}": {
-      "snippet": "Citeauthor[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Citeauthor[]{}": {
-      "snippet": "Citeauthor[${2:postnote}]{${1:bibid}}"
-    },
-    "Citeauthor{}": {
-      "snippet": "Citeauthor{${1:bibid}}"
-    },
-    "citeauthor*[][]{}": {
-      "snippet": "citeauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citeauthor*[]{}": {
-      "snippet": "citeauthor*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citeauthor*{}": {
-      "snippet": "citeauthor*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citeauthor*[][]{}": {
-      "snippet": "Citeauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Citeauthor*[]{}": {
-      "snippet": "Citeauthor*[${2:postnote}]{${1:bibid}}"
-    },
-    "Citeauthor*{}": {
-      "snippet": "Citeauthor*{${1:bibid}}"
-    },
-    "citetitle[][]{}": {
-      "snippet": "citetitle[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "citetitle[]{}": {
-      "snippet": "citetitle[${2:postnote}]{${1:bibid}}"
-    },
-    "citetitle{}": {
-      "snippet": "citetitle{${1:bibid}}"
-    },
-    "citetitle*[][]{}": {
-      "snippet": "citetitle*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "citetitle*[]{}": {
-      "snippet": "citetitle*[${2:postnote}]{${1:bibid}}"
-    },
-    "citetitle*{}": {
-      "snippet": "citetitle*{${1:bibid}}"
-    },
-    "Citetitle[][]{}": {
-      "snippet": "Citetitle[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Citetitle[]{}": {
-      "snippet": "Citetitle[${2:postnote}]{${1:bibid}}"
-    },
-    "Citetitle{}": {
-      "snippet": "Citetitle{${1:bibid}}"
-    },
-    "Citetitle*[][]{}": {
-      "snippet": "Citetitle*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Citetitle*[]{}": {
-      "snippet": "Citetitle*[${2:postnote}]{${1:bibid}}"
-    },
-    "Citetitle*{}": {
-      "snippet": "Citetitle*{${1:bibid}}"
-    },
-    "citeyear[][]{}": {
-      "snippet": "citeyear[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "citeyear[]{}": {
-      "snippet": "citeyear[${2:postnote}]{${1:bibid}}"
-    },
-    "citeyear*[][]{}": {
-      "snippet": "citeyear*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "citeyear*[]{}": {
-      "snippet": "citeyear*[${2:postnote}]{${1:bibid}}"
-    },
-    "citeyear*{}": {
-      "snippet": "citeyear*{${1:bibid}}"
-    },
-    "citedate[][]{}": {
-      "snippet": "citedate[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "citedate[]{}": {
-      "snippet": "citedate[${2:postnote}]{${1:bibid}}"
-    },
-    "citedate{}": {
-      "snippet": "citedate{${1:bibid}}"
-    },
-    "citedate*[][]{}": {
-      "snippet": "citedate*[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "citedate*[]{}": {
-      "snippet": "citedate*[${2:postnote}]{${1:bibid}}"
-    },
-    "citedate*{}": {
-      "snippet": "citedate*{${1:bibid}}"
-    },
-    "citeurl[][]{}": {
-      "snippet": "citeurl[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "citeurl[]{}": {
-      "snippet": "citeurl[${2:postnote}]{${1:bibid}}"
-    },
-    "citeurl{}": {
-      "snippet": "citeurl{${1:bibid}}"
-    },
-    "parentext{}": {
-      "snippet": "parentext{${1:text}}"
-    },
-    "brackettext{}": {
-      "snippet": "brackettext{${1:text}}"
-    },
-    "fullcite[][]{}": {
-      "snippet": "fullcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "fullcite[]{}": {
-      "snippet": "fullcite[${2:postnote}]{${1:bibid}}"
-    },
-    "fullcite{}": {
-      "snippet": "fullcite{${1:bibid}}"
-    },
-    "footfullcite[][]{}": {
-      "snippet": "footfullcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "footfullcite[]{}": {
-      "snippet": "footfullcite[${2:postnote}]{${1:bibid}}"
-    },
-    "footfullcite{}": {
-      "snippet": "footfullcite{${1:bibid}}"
-    },
-    "volcite{}{}": {
-      "snippet": "volcite{${1:volume}}{${2:bibid}}"
-    },
-    "volcite[]{}{}": {
-      "snippet": "volcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "volcite{}[]{}": {
-      "snippet": "volcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "volcite[]{}[]{}": {
-      "snippet": "volcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "Volcite{}{}": {
-      "snippet": "Volcite{${1:volume}}{${2:bibid}}"
-    },
-    "Volcite[]{}{}": {
-      "snippet": "Volcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "Volcite{}[]{}": {
-      "snippet": "Volcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "Volcite[]{}[]{}": {
-      "snippet": "Volcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "volcites{}{}{}{}": {
-      "snippet": "volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "volcites(){}{}{}{}": {
-      "snippet": "volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "volcites()(){}{}{}{}": {
-      "snippet": "volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "volcites()()[]{}{}[]{}{}": {
-      "snippet": "volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "volcites[]{}{}[]{}{}": {
-      "snippet": "volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "volcites[][]{}{}[][]{}{}": {
-      "snippet": "volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "volcites()()[][]{}{}[][]{}{}": {
-      "snippet": "volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites{}{}{}{}": {
-      "snippet": "Volcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites(){}{}{}{}": {
-      "snippet": "Volcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites()(){}{}{}{}": {
-      "snippet": "Volcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites()()[]{}{}[]{}{}": {
-      "snippet": "Volcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites[]{}{}[]{}{}": {
-      "snippet": "Volcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites[][]{}{}[][]{}{}": {
-      "snippet": "Volcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Volcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Volcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcite{}{}": {
-      "snippet": "pvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "pvolcite[]{}{}": {
-      "snippet": "pvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "pvolcite{}[]{}": {
-      "snippet": "pvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "pvolcite[]{}[]{}": {
-      "snippet": "pvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "Pvolcite{}{}": {
-      "snippet": "Pvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "Pvolcite[]{}{}": {
-      "snippet": "Pvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "Pvolcite{}[]{}": {
-      "snippet": "Pvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "Pvolcite[]{}[]{}": {
-      "snippet": "Pvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "pvolcites{}{}{}{}": {
-      "snippet": "pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites(){}{}{}{}": {
-      "snippet": "pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites()(){}{}{}{}": {
-      "snippet": "pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites()()[]{}{}[]{}{}": {
-      "snippet": "pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites[]{}{}[]{}{}": {
-      "snippet": "pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites[][]{}{}[][]{}{}": {
-      "snippet": "pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "pvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites{}{}{}{}": {
-      "snippet": "Pvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites(){}{}{}{}": {
-      "snippet": "Pvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites()(){}{}{}{}": {
-      "snippet": "Pvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Pvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites[]{}{}[]{}{}": {
-      "snippet": "Pvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites[][]{}{}[][]{}{}": {
-      "snippet": "Pvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Pvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Pvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcite{}{}": {
-      "snippet": "fvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "fvolcite[]{}{}": {
-      "snippet": "fvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "fvolcite{}[]{}": {
-      "snippet": "fvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "fvolcite[]{}[]{}": {
-      "snippet": "fvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "Fvolcite{}{}": {
-      "snippet": "Fvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "Fvolcite[]{}{}": {
-      "snippet": "Fvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "Fvolcite{}[]{}": {
-      "snippet": "Fvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "Fvolcite[]{}[]{}": {
-      "snippet": "Fvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "fvolcites{}{}{}{}": {
-      "snippet": "fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites(){}{}{}{}": {
-      "snippet": "fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites()(){}{}{}{}": {
-      "snippet": "fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites()()[]{}{}[]{}{}": {
-      "snippet": "fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites[]{}{}[]{}{}": {
-      "snippet": "fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites[][]{}{}[][]{}{}": {
-      "snippet": "fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "fvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites{}{}{}{}": {
-      "snippet": "Fvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites(){}{}{}{}": {
-      "snippet": "Fvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites()(){}{}{}{}": {
-      "snippet": "Fvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Fvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites[]{}{}[]{}{}": {
-      "snippet": "Fvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites[][]{}{}[][]{}{}": {
-      "snippet": "Fvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Fvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Fvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcite{}{}": {
-      "snippet": "ftvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "ftvolcite[]{}{}": {
-      "snippet": "ftvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "ftvolcite{}[]{}": {
-      "snippet": "ftvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "ftvolcite[]{}[]{}": {
-      "snippet": "ftvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "Ftvolcite{}{}": {
-      "snippet": "Ftvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "Ftvolcite[]{}{}": {
-      "snippet": "Ftvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "Ftvolcite{}[]{}": {
-      "snippet": "Ftvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "Ftvolcite[]{}[]{}": {
-      "snippet": "Ftvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "ftvolcites{}{}{}{}": {
-      "snippet": "ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites(){}{}{}{}": {
-      "snippet": "ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites()(){}{}{}{}": {
-      "snippet": "ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites()()[]{}{}[]{}{}": {
-      "snippet": "ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites[]{}{}[]{}{}": {
-      "snippet": "ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites[][]{}{}[][]{}{}": {
-      "snippet": "ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "ftvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites{}{}{}{}": {
-      "snippet": "Ftvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites(){}{}{}{}": {
-      "snippet": "Ftvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites()(){}{}{}{}": {
-      "snippet": "Ftvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Ftvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites[]{}{}[]{}{}": {
-      "snippet": "Ftvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites[][]{}{}[][]{}{}": {
-      "snippet": "Ftvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Ftvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Ftvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "svolcite{}{}": {
-      "snippet": "svolcite{${1:volume}}{${2:bibid}}"
-    },
-    "svolcite[]{}{}": {
-      "snippet": "svolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "svolcite{}[]{}": {
-      "snippet": "svolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "svolcite[]{}[]{}": {
-      "snippet": "svolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "Svolcite{}{}": {
-      "snippet": "Svolcite{${1:volume}}{${2:bibid}}"
-    },
-    "Svolcite[]{}{}": {
-      "snippet": "Svolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "Svolcite{}[]{}": {
-      "snippet": "Svolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "Svolcite[]{}[]{}": {
-      "snippet": "Svolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "svolcites{}{}{}{}": {
-      "snippet": "svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites(){}{}{}{}": {
-      "snippet": "svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites()(){}{}{}{}": {
-      "snippet": "svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites()()[]{}{}[]{}{}": {
-      "snippet": "svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites[]{}{}[]{}{}": {
-      "snippet": "svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites[][]{}{}[][]{}{}": {
-      "snippet": "svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "svolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites{}{}{}{}": {
-      "snippet": "Svolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites(){}{}{}{}": {
-      "snippet": "Svolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites()(){}{}{}{}": {
-      "snippet": "Svolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites()()[]{}{}[]{}{}": {
-      "snippet": "Svolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites[]{}{}[]{}{}": {
-      "snippet": "Svolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites[][]{}{}[][]{}{}": {
-      "snippet": "Svolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Svolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Svolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcite{}{}": {
-      "snippet": "tvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "tvolcite[]{}{}": {
-      "snippet": "tvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "tvolcite{}[]{}": {
-      "snippet": "tvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "tvolcite[]{}[]{}": {
-      "snippet": "tvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "Tvolcite{}{}": {
-      "snippet": "Tvolcite{${1:volume}}{${2:bibid}}"
-    },
-    "Tvolcite[]{}{}": {
-      "snippet": "Tvolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "Tvolcite{}[]{}": {
-      "snippet": "Tvolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "Tvolcite[]{}[]{}": {
-      "snippet": "Tvolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "tvolcites{}{}{}{}": {
-      "snippet": "tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites(){}{}{}{}": {
-      "snippet": "tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites()(){}{}{}{}": {
-      "snippet": "tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites()()[]{}{}[]{}{}": {
-      "snippet": "tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites[]{}{}[]{}{}": {
-      "snippet": "tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites[][]{}{}[][]{}{}": {
-      "snippet": "tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "tvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites{}{}{}{}": {
-      "snippet": "Tvolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites(){}{}{}{}": {
-      "snippet": "Tvolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites()(){}{}{}{}": {
-      "snippet": "Tvolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites()()[]{}{}[]{}{}": {
-      "snippet": "Tvolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites[]{}{}[]{}{}": {
-      "snippet": "Tvolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites[][]{}{}[][]{}{}": {
-      "snippet": "Tvolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Tvolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Tvolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "avolcite{}{}": {
-      "snippet": "avolcite{${1:volume}}{${2:bibid}}"
-    },
-    "avolcite[]{}{}": {
-      "snippet": "avolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "avolcite{}[]{}": {
-      "snippet": "avolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "avolcite[]{}[]{}": {
-      "snippet": "avolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "Avolcite{}{}": {
-      "snippet": "Avolcite{${1:volume}}{${2:bibid}}"
-    },
-    "Avolcite[]{}{}": {
-      "snippet": "Avolcite[${3:prenote}]{${1:volume}}{${2:bibid}}"
-    },
-    "Avolcite{}[]{}": {
-      "snippet": "Avolcite{${1:volume}}[${2:pages}]{${3:bibid}}"
-    },
-    "Avolcite[]{}[]{}": {
-      "snippet": "Avolcite[${3:prenote}]{${1:volume}}[${4:pages}]{${2:bibid}}"
-    },
-    "avolcites{}{}{}{}": {
-      "snippet": "avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites(){}{}{}{}": {
-      "snippet": "avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites()(){}{}{}{}": {
-      "snippet": "avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites()()[]{}{}[]{}{}": {
-      "snippet": "avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites[]{}{}[]{}{}": {
-      "snippet": "avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites[][]{}{}[][]{}{}": {
-      "snippet": "avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "avolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites{}{}{}{}": {
-      "snippet": "Avolcites{${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites(){}{}{}{}": {
-      "snippet": "Avolcites(${5:pre}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites()(){}{}{}{}": {
-      "snippet": "Avolcites(${5:pre})(${6:post}){${1:volume}}{${2:bibid}}{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites()()[]{}{}[]{}{}": {
-      "snippet": "Avolcites(${7:pre})(${8:post})[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites[]{}{}[]{}{}": {
-      "snippet": "Avolcites[${5:pre}]{${1:volume}}{${2:bibid}}[${6:pre}]{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites[][]{}{}[][]{}{}": {
-      "snippet": "Avolcites[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "Avolcites()()[][]{}{}[][]{}{}": {
-      "snippet": "Avolcites(${9:pre})(${10:post})[${5:pre}][${6:post}]{${1:volume}}{${2:bibid}}[${7:pre}][${8:post}]{${3:volume}}{${4:bibid}}"
-    },
-    "notecite[][]{}": {
-      "snippet": "notecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "notecite[]{}": {
-      "snippet": "notecite[${2:postnote}]{${1:bibid}}"
-    },
-    "notecite{}": {
-      "snippet": "notecite{${1:bibid}}"
-    },
-    "Notecite[][]{}": {
-      "snippet": "Notecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Notecite[]{}": {
-      "snippet": "Notecite[${2:postnote}]{${1:bibid}}"
-    },
-    "Notecite{}": {
-      "snippet": "Notecite{${1:bibid}}"
-    },
-    "pnotecite[][]{}": {
-      "snippet": "pnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "pnotecite[]{}": {
-      "snippet": "pnotecite[${2:postnote}]{${1:bibid}}"
-    },
-    "pnotecite{}": {
-      "snippet": "pnotecite{${1:bibid}}"
-    },
-    "Pnotecite[][]{}": {
-      "snippet": "Pnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Pnotecite[]{}": {
-      "snippet": "Pnotecite[${2:postnote}]{${1:bibid}}"
-    },
-    "Pnotecite{}": {
-      "snippet": "Pnotecite{${1:bibid}}"
-    },
-    "fnotecite[][]{}": {
-      "snippet": "fnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "fnotecite[]{}": {
-      "snippet": "fnotecite[${2:postnote}]{${1:bibid}}"
-    },
-    "fnotecite{}": {
-      "snippet": "fnotecite{${1:bibid}}"
-    },
-    "citename[][]{}[]{}": {
-      "snippet": "citename[${3:prenote}][${4:postnote}]{${1:bibid}}[${5:format}]{${2:name list}}"
-    },
-    "citename[]{}[]{}": {
-      "snippet": "citename[${3:postnote}]{${1:bibid}}[${4:format}]{${2:name list}}"
-    },
-    "citename[]{}{}": {
-      "snippet": "citename[${3:postnote}]{${1:bibid}}{${2:name list}}"
-    },
-    "citename{}[]{}": {
-      "snippet": "citename{${1:bibid}}[${2:format}]{${3:name list}}"
-    },
-    "citename{}{}": {
-      "snippet": "citename{${1:bibid}}{${2:name list}}"
-    },
-    "citelist[][]{}[]{}": {
-      "snippet": "citelist[${3:prenote}][${4:postnote}]{${1:bibid}}[${5:format}]{${2:literal list}}"
-    },
-    "citelist[]{}[]{}": {
-      "snippet": "citelist[${3:postnote}]{${1:bibid}}[${4:format}]{${2:literal list}}"
-    },
-    "citelist[]{}{}": {
-      "snippet": "citelist[${3:postnote}]{${1:bibid}}{${2:literal list}}"
-    },
-    "citelist{}[]{}": {
-      "snippet": "citelist{${1:bibid}}[${2:format}]{${3:literal list}}"
-    },
-    "citelist{}{}": {
-      "snippet": "citelist{${1:bibid}}{${2:literal list}}"
-    },
-    "citefield[][]{}[]{}": {
-      "snippet": "citefield[${3:prenote}][${4:postnote}]{${1:bibid}}[${5:format}]{${2:field}}"
-    },
-    "citefield[]{}[]{}": {
-      "snippet": "citefield[${3:postnote}]{${1:bibid}}[${4:format}]{${2:field}}"
-    },
-    "citefield[]{}{}": {
-      "snippet": "citefield[${3:postnote}]{${1:bibid}}{${2:field}}"
-    },
-    "citefield{}[]{}": {
-      "snippet": "citefield{${1:bibid}}[${2:format}]{${3:field}}"
-    },
-    "citefield{}{}": {
-      "snippet": "citefield{${1:bibid}}{${2:field}}"
-    },
-    "citereset": {},
-    "citereset*": {},
-    "mancite": {},
-    "pno": {},
-    "ppno": {},
-    "nopp": {},
-    "psq": {},
-    "psqq": {},
-    "sqspace": {},
-    "ppspace": {},
-    "pnfmt{}": {
-      "snippet": "pnfmt{${1:text}}"
-    },
-    "RN{}": {
-      "snippet": "RN{${1:integer}}"
-    },
-    "RNfont": {},
-    "Rn{}": {
-      "snippet": "Rn{${1:integer}}"
-    },
-    "Rnfont": {},
-    "citet[][]{}": {
-      "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citet[]{}": {
-      "snippet": "citet[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citet{}": {
-      "snippet": "citet{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citet*[][]{}": {
-      "snippet": "citet*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citet*[]{}": {
-      "snippet": "citet*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citet*{}": {
-      "snippet": "citet*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citep[][]{}": {
-      "snippet": "citep[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citep[]{}": {
-      "snippet": "citep[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citep{}": {
-      "snippet": "citep{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citep*[][]{}": {
-      "snippet": "citep*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citep*[]{}": {
-      "snippet": "citep*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citep*{}": {
-      "snippet": "citep*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealt[][]{}": {
-      "snippet": "citealt[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealt[]{}": {
-      "snippet": "citealt[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealt{}": {
-      "snippet": "citealt{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealt*[][]{}": {
-      "snippet": "citealt*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealt*[]{}": {
-      "snippet": "citealt*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealt*{}": {
-      "snippet": "citealt*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealp[][]{}": {
-      "snippet": "citealp[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealp[]{}": {
-      "snippet": "citealp[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealp{}": {
-      "snippet": "citealp{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealp*[][]{}": {
-      "snippet": "citealp*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealp*[]{}": {
-      "snippet": "citealp*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citealp*{}": {
-      "snippet": "citealp*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citeyearpar[][]{}": {
-      "snippet": "citeyearpar[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=acmauthoryear"
-    },
-    "citeyearpar[]{}": {
-      "snippet": "citeyearpar[${2:postnote}]{${1:bibid}}",
-      "option": "style=acmauthoryear"
-    },
-    "citeyearpar{}": {
-      "snippet": "citeyearpar{${1:bibid}}",
-      "option": "style=acmauthoryear"
-    },
-    "Citet[][]{}": {
-      "snippet": "Citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citet[]{}": {
-      "snippet": "Citet[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citet{}": {
-      "snippet": "Citet{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citet*[][]{}": {
-      "snippet": "Citet*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citet*[]{}": {
-      "snippet": "Citet*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citet*{}": {
-      "snippet": "Citet*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citep[][]{}": {
-      "snippet": "Citep[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citep[]{}": {
-      "snippet": "Citep[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citep{}": {
-      "snippet": "Citep{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citep*[][]{}": {
-      "snippet": "Citep*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citep*[]{}": {
-      "snippet": "Citep*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citep*{}": {
-      "snippet": "Citep*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealt[][]{}": {
-      "snippet": "Citealt[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealt[]{}": {
-      "snippet": "Citealt[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealt{}": {
-      "snippet": "Citealt{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealt*[][]{}": {
-      "snippet": "Citealt*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealt*[]{}": {
-      "snippet": "Citealt*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealt*{}": {
-      "snippet": "Citealt*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealp[][]{}": {
-      "snippet": "Citealp[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealp[]{}": {
-      "snippet": "Citealp[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealp{}": {
-      "snippet": "Citealp{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealp*[][]{}": {
-      "snippet": "Citealp*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealp*[]{}": {
-      "snippet": "Citealp*[${2:postnote}]{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "Citealp*{}": {
-      "snippet": "Citealp*{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citefullauthor[][]{}": {
-      "snippet": "citefullauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citefullauthor[]{}": {
-      "snippet": "citefullauthor[${2:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citefullauthor{}": {
-      "snippet": "citefullauthor{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "Citefullauthor[][]{}": {
-      "snippet": "Citefullauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "Citefullauthor[]{}": {
-      "snippet": "Citefullauthor[${2:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "Citefullauthor{}": {
-      "snippet": "Citefullauthor{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citetext{}": {
-      "snippet": "citetext{${1:text}}",
-      "option": "natbib=true"
-    },
-    "defcitealias{}{}": {
-      "snippet": "defcitealias{${1:bibid}}{${2:alias}}",
-      "option": "natbib=true"
-    },
-    "citetalias{}": {
-      "snippet": "citetalias{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "citepalias{}": {
-      "snippet": "citepalias{${1:bibid}}",
-      "option": "natbib=true"
-    },
-    "mcite[][]{}": {
-      "snippet": "mcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mcite[]{}": {
-      "snippet": "mcite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mcite{}": {
-      "snippet": "mcite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mcite[][]{}": {
-      "snippet": "Mcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mcite[]{}": {
-      "snippet": "Mcite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mcite{}": {
-      "snippet": "Mcite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mparencite[][]{}": {
-      "snippet": "mparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mparencite[]{}": {
-      "snippet": "mparencite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mparencite{}": {
-      "snippet": "mparencite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mparencite[][]{}": {
-      "snippet": "Mparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mparencite[]{}": {
-      "snippet": "Mparencite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mparencite{}": {
-      "snippet": "Mparencite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mfootcite[][]{}": {
-      "snippet": "mfootcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mfootcite[]{}": {
-      "snippet": "mfootcite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mfootcite{}": {
-      "snippet": "mfootcite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mfootcitetext[][]{}": {
-      "snippet": "mfootcitetext[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mfootcitetext[]{}": {
-      "snippet": "mfootcitetext[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mfootcitetext{}": {
-      "snippet": "mfootcitetext{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mtextcite[][]{}": {
-      "snippet": "mtextcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mtextcite[]{}": {
-      "snippet": "mtextcite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mtextcite{}": {
-      "snippet": "mtextcite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mtextcite[][]{}": {
-      "snippet": "Mtextcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mtextcite[]{}": {
-      "snippet": "Mtextcite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mtextcite{}": {
-      "snippet": "Mtextcite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "msupercite{}": {
-      "snippet": "msupercite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mcite*[][]{}": {
-      "snippet": "mcite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mcite*[]{}": {
-      "snippet": "mcite*[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mcite*{}": {
-      "snippet": "mcite*{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mparencite*[][]{}": {
-      "snippet": "mparencite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mparencite*[]{}": {
-      "snippet": "mparencite*[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mparencite*{}": {
-      "snippet": "mparencite*{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mautocite[][]{}": {
-      "snippet": "mautocite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mautocite[]{}": {
-      "snippet": "mautocite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mautocite{}": {
-      "snippet": "mautocite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mautocite[][]{}": {
-      "snippet": "Mautocite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mautocite[]{}": {
-      "snippet": "Mautocite[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mautocite{}": {
-      "snippet": "Mautocite{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mautocite*[][]{}": {
-      "snippet": "mautocite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mautocite*[]{}": {
-      "snippet": "mautocite*[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "mautocite*{}": {
-      "snippet": "mautocite*{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mautocite*[][]{}": {
-      "snippet": "Mautocite*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mautocite*[]{}": {
-      "snippet": "Mautocite*[${2:postnote}]{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "Mautocite*{}": {
-      "snippet": "Mautocite*{${1:bibid}}",
-      "option": "mcite=true"
-    },
-    "DefineBibliographyStrings{}{}": {
-      "snippet": "DefineBibliographyStrings{${1:language}}{${2:definitions}}"
-    },
-    "DefineBibliographyExtras{}{}": {
-      "snippet": "DefineBibliographyExtras{${1:language}}{${2:code}}"
-    },
-    "UndefineBibliographyExtras{}{}": {
-      "snippet": "UndefineBibliographyExtras{${1:language}}{${2:code}}"
-    },
-    "DefineHyphenationExceptions{}{}": {
-      "snippet": "DefineHyphenationExceptions{${1:language}}{${2:text}}"
-    },
-    "NewBibliographyString{}": {
-      "snippet": "NewBibliographyString{${1:bibid}}"
-    },
-    "ifentryseen{}{}{}": {
-      "snippet": "ifentryseen{${1:entrykey}}{${2:true}}{${3:false}}"
-    },
-    "ifentryinbib{}{}{}": {
-      "snippet": "ifentryinbib{${1:entrykey}}{${2:true}}{${3:false}}"
-    },
-    "ifentrycategory{}{}{}{}": {
-      "snippet": "ifentrycategory{${1:entrykey}}{${2:category}}{${3:true}}{${4:false}}"
-    },
-    "ifentrykeyword{}{}{}{}": {
-      "snippet": "ifentrykeyword{${1:entrykey}}{${2:keyword}}{${3:true}}{${4:false}}"
-    },
-    "bibsetup": {},
-    "bibfont": {},
-    "citesetup": {},
-    "newblockpunct": {},
-    "newunitpunct": {},
-    "finentrypunct": {},
-    "entrysetpunct": {},
-    "bibnamedelima": {},
-    "bibnamedelimb": {},
-    "bibnamedelimc": {},
-    "bibnamedelimd": {},
-    "bibnamedelimi": {},
-    "bibinitperiod": {},
-    "bibinitdelim": {},
-    "bibinithyphendelim": {},
-    "bibindexnamedelima": {},
-    "bibindexnamedelimb": {},
-    "bibindexnamedelimc": {},
-    "bibindexnamedelimd": {},
-    "bibindexnamedelimi": {},
-    "bibindexinitperiod": {},
-    "bibindexinitdelim": {},
-    "bibindexinithyphendelim": {},
-    "revsdnamepunct": {},
-    "bibnamedash": {},
-    "labelnamepunct": {},
-    "subtitlepunct": {},
-    "intitlepunct": {},
-    "bibpagespunct": {},
-    "bibpagerefpunct": {},
-    "bibeidpunct": {},
-    "multinamedelim": {},
-    "finalnamedelim": {},
-    "revsdnamedelim": {},
-    "andothersdelim": {},
-    "multilistdelim": {},
-    "finallistdelim": {},
-    "andmoredelim": {},
-    "multicitedelim": {},
-    "multiciterangedelim": {},
-    "multicitesubentrydelim": {},
-    "multicitesubentryrangedelim": {},
-    "supercitedelim": {},
-    "superciterangedelim": {},
-    "supercitesubentrydelim": {},
-    "supercitesubentryrangedelim": {},
-    "compcitedelim": {},
-    "textcitedelim": {},
-    "nametitledelim": {},
-    "nameyeardelim": {},
-    "namelabeldelim": {},
-    "nonameyeardelim": {},
-    "authortypedelim": {},
-    "editortypedelim": {},
-    "translatortypedelim": {},
-    "labelalphaothers": {},
-    "sortalphaothers": {},
-    "volcitedelim": {},
-    "mkvolcitenote{}{}": {
-      "snippet": "mkvolcitenote{${1:volume}}{${2:pages}}"
-    },
-    "prenotedelim": {},
-    "postnotedelim": {},
-    "extpostnotedelim": {},
-    "multiprenotedelim": {},
-    "multipostnotedelim": {},
-    "mkbibnamefamily{}": {
-      "snippet": "mkbibnamefamily{${1:text}}"
-    },
-    "mkbibnamegiven{}": {
-      "snippet": "mkbibnamegiven{${1:text}}"
-    },
-    "mkbibnameprefix{}": {
-      "snippet": "mkbibnameprefix{${1:text}}"
-    },
-    "mkbibnamesuffix{}": {
-      "snippet": "mkbibnamesuffix{${1:text}}"
-    },
-    "mkbibcompletenamefamily": {},
-    "mkbibcompletenamefamilygiven": {},
-    "mkbibcompletenamegivenfamily": {},
-    "mkbibcompletename": {},
-    "datecircadelim": {},
-    "dateeradelim": {},
-    "dateuncertainprint": {},
-    "enddateuncertainprint": {},
-    "datecircaprint": {},
-    "enddatecircaprint": {},
-    "datecircaprintiso": {},
-    "enddatecircaprintiso": {},
-    "dateeraprint{}": {
-      "snippet": "dateeraprint{${1:yearfield}}"
-    },
-    "dateeraprintpre": {},
-    "relatedpunct": {},
-    "relateddelim": {},
-    "begrelateddelim": {},
-    "bibleftparen": {},
-    "bibrightparen": {},
-    "bibleftbracket": {},
-    "bibrightbracket": {},
-    "DeclareDelimFormat{}{}": {
-      "snippet": "DeclareDelimFormat{${1:name}}{${2:code}}"
-    },
-    "DeclareDelimFormat[]{}{}": {
-      "snippet": "DeclareDelimFormat[${3:context}]{${1:name}}{${2:code}}"
-    },
-    "DeclareDelimFormat*{}{}": {
-      "snippet": "DeclareDelimFormat*{${1:name}}{${2:code}}"
-    },
-    "DeclareDelimFormat*[]{}{}": {
-      "snippet": "DeclareDelimFormat*[${3:context}]{${1:name}}{${2:code}}"
-    },
-    "DeclareDelimAlias{}{}": {
-      "snippet": "DeclareDelimAlias{${1:alias}}{${2:delim}}"
-    },
-    "DeclareDelimAlias[]{}[]{}": {
-      "snippet": "DeclareDelimAlias[${3:alias context}]{${1:alias}}[${4:delim context}]{${2:delim}}"
-    },
-    "DeclareDelimAlias*[]{}[]{}": {
-      "snippet": "DeclareDelimAlias*[${3:alias context}]{${1:alias}}[${4:delim context}]{${2:delim}}"
-    },
-    "printdelim{}": {
-      "snippet": "printdelim{${1:name}}"
-    },
-    "printdelim[]{}": {
-      "snippet": "printdelim[${2:context}]{${1:name}}"
-    },
-    "delimcontext{}": {
-      "snippet": "delimcontext{${1:context}}"
-    },
-    "DeclareDelimcontextAlias{}{}": {
-      "snippet": "DeclareDelimcontextAlias{${1:alias}}{${2:name}}"
-    },
-    "UndeclareDelimcontextAlias{}": {
-      "snippet": "UndeclareDelimcontextAlias{${1:alias}}"
-    },
-    "bibrangedash": {},
-    "bibrangessep": {},
-    "bibdatesep": {},
-    "bibdatendsep": {},
-    "bibdaterangesep": {},
-    "mkbibdatelong{}{}{}": {
-      "snippet": "mkbibdatelong{${1:year}}{${2:month}}{${3:day}}"
-    },
-    "mkbibdateshort{}{}{}": {
-      "snippet": "mkbibdateshort{${1:year}}{${2:month}}{${3:day}}"
-    },
-    "mkbibtimezone{}": {
-      "snippet": "mkbibtimezone{${1:timezone}}"
-    },
-    "bibdateuncertain": {},
-    "bibdateeraprefix": {},
-    "bibdateeraendprefix": {},
-    "bibtimesep": {},
-    "bibutctimezone": {},
-    "bibtimezonesep": {},
-    "bibtzminsep": {},
-    "bibdatetimesep": {
-      "snippet": "bibdatetimesep "
-    },
-    "finalandcomma": {},
-    "finalandsemicolon": {},
-    "mkbibordinal{}": {
-      "snippet": "mkbibordinal{${1:integer}}"
-    },
-    "mkbibmascord{}": {
-      "snippet": "mkbibmascord{${1:integer}}"
-    },
-    "mkbibfemord{}": {
-      "snippet": "mkbibfemord{${1:integer}}"
-    },
-    "mkbibneutord{}": {
-      "snippet": "mkbibneutord{${1:integer}}"
-    },
-    "mkbibordedition{}": {
-      "snippet": "mkbibordedition{${1:integer}}"
-    },
-    "mkbibordseries{}": {
-      "snippet": "mkbibordseries{${1:integer}}"
-    },
-    "bibhang": {},
-    "biblabelsep": {},
-    "bibitemsep": {},
-    "bibnamesep": {},
-    "bibinitsep": {},
-    "bibparsep": {},
-    "theabbrvpenalty": {},
-    "thehighnamepenalty": {},
-    "thelownamepenalty": {},
-    "thebiburlbigbreakpenalty": {},
-    "thebiburlbreakpenalty": {},
-    "thebiburlnumpenalty": {},
-    "thebiburlucpenalty": {},
-    "thebiburllcpenalty": {},
-    "biburlbigskip": {},
-    "biburlnumskip": {},
-    "biburlucskip": {},
-    "biburllcskip": {},
-    "bibellipsis": {},
-    "noligature": {},
-    "hyphenate": {},
-    "hyphen": {},
-    "nbhyphen": {},
-    "nohyphenation": {},
-    "textnohyphenation{}": {
-      "snippet": "textnohyphenation{${1:text}}"
-    },
-    "mknumalph{}": {
-      "snippet": "mknumalph{${1:integer}}"
-    },
-    "mkbibacro{}": {
-      "snippet": "mkbibacro{${1:text}}"
-    },
-    "autocap{}": {
-      "snippet": "autocap{${1:character}}"
-    },
-    "thesmartand": {},
-    "forceE{}": {
-      "snippet": "forceE{${1:text}}"
-    },
-    "forceY{}": {
-      "snippet": "forceY{${1:text}}"
-    },
-    "smartof": {},
-    "forceD{}": {
-      "snippet": "forceD{${1:text}}"
-    },
-    "forceDE{}": {
-      "snippet": "forceDE{${1:text}}"
-    },
-    "bibabstractprefix": {},
-    "bibannotationprefix": {},
-    "ifkomabibtotoc{}{}": {
-      "snippet": "ifkomabibtotoc{${1:true}}{${2:false}}"
-    },
-    "ifkomabibtotocnumbered{}{}": {
-      "snippet": "ifkomabibtotocnumbered{${1:true}}{${2:false}}"
-    },
-    "ifmemoirbibintoc{}{}": {
-      "snippet": "ifmemoirbibintoc{${1:true}}{${2:false}}"
-    },
-    "RequireBibliographyStyle{}": {
-      "snippet": "RequireBibliographyStyle{${1:style}}"
-    },
-    "InitializeBibliographyStyle{}": {
-      "snippet": "InitializeBibliographyStyle{${1:code}}"
-    },
-    "DeclareBibliographyDriver{}{}": {
-      "snippet": "DeclareBibliographyDriver{${1:entrytype}}{${2:code}}"
-    },
-    "DeclareBibliographyAlias{}{}": {
-      "snippet": "DeclareBibliographyAlias{${1:alias}}{${2:entrytype}}"
-    },
-    "DeclareBibliographyOption{}{}": {
-      "snippet": "DeclareBibliographyOption{${1:key}}{${2:code}}"
-    },
-    "DeclareBibliographyOption[]{}{}": {
-      "snippet": "DeclareBibliographyOption[${3:datatype}]{${1:key}}{${2:code}}"
-    },
-    "DeclareBibliographyOption{}[]{}": {
-      "snippet": "DeclareBibliographyOption{${1:key}}[${2:value}]{${3:code}}"
-    },
-    "DeclareBibliographyOption[]{}[]{}": {
-      "snippet": "DeclareBibliographyOption[${3:datatype}]{${1:key}}[${4:value}]{${2:code}}"
-    },
-    "DeclareTypeOption{}{}": {
-      "snippet": "DeclareTypeOption{${1:key}}{${2:code}}"
-    },
-    "DeclareTypeOption[]{}{}": {
-      "snippet": "DeclareTypeOption[${3:datatype}]{${1:key}}{${2:code}}"
-    },
-    "DeclareTypeOption{}[]{}": {
-      "snippet": "DeclareTypeOption{${1:key}}[${2:value}]{${3:code}}"
-    },
-    "DeclareTypeOption[]{}[]{}": {
-      "snippet": "DeclareTypeOption[${3:datatype}]{${1:key}}[${4:value}]{${2:code}}"
-    },
-    "DeclareEntryOption{}{}": {
-      "snippet": "DeclareEntryOption{${1:key}}{${2:code}}"
-    },
-    "DeclareEntryOption[]{}{}": {
-      "snippet": "DeclareEntryOption[${3:datatype}]{${1:key}}{${2:code}}"
-    },
-    "DeclareEntryOption{}[]{}": {
-      "snippet": "DeclareEntryOption{${1:key}}[${2:value}]{${3:code}}"
-    },
-    "DeclareEntryOption[]{}[]{}": {
-      "snippet": "DeclareEntryOption[${3:datatype}]{${1:key}}[${4:value}]{${2:code}}"
-    },
-    "DeclareBiblatexOption{}{}{}": {
-      "snippet": "DeclareBiblatexOption{${1:scope}}{${2:key}}{${3:code}}"
-    },
-    "DeclareBiblatexOption{}[]{}{}": {
-      "snippet": "DeclareBiblatexOption{${1:scope}}[${2:datatype}]{${3:key}}{${4:code}}"
-    },
-    "DeclareBiblatexOption{}{}[]{}": {
-      "snippet": "DeclareBiblatexOption{${1:scope}}{${2:key}}[${3:value}]{${4:code}}"
-    },
-    "DeclareBiblatexOption{}[]{}[]{}": {
-      "snippet": "DeclareBiblatexOption{${1:scope}}[${2:datatype}]{${3:key}}[${4:value}]{${5:code}}"
-    },
-    "RequireCitationStyle{}": {
-      "snippet": "RequireCitationStyle{${1:style}}"
-    },
-    "InitializeCitationStyle{}": {
-      "snippet": "InitializeCitationStyle{${1:code}}"
-    },
-    "OnManualCitation{}": {
-      "snippet": "OnManualCitation{${1:code}}"
-    },
-    "DeclareCiteCommand{}{}{}{}{}": {
-      "snippet": "DeclareCiteCommand{${1:cmd}}{${2:precode}}{${3:loopcode}}{${4:sepcode}}{${5:postcode}}"
-    },
-    "DeclareCiteCommand{}[]{}{}{}{}": {
-      "snippet": "DeclareCiteCommand{${1:cmd}}[${2:wrapper}]{${3:precode}}{${4:loopcode}}{${5:sepcode}}{${6:postcode}}"
-    },
-    "DeclareCiteCommand*{}{}{}{}{}": {
-      "snippet": "DeclareCiteCommand*{${1:cmd}}{${2:precode}}{${3:loopcode}}{${4:sepcode}}{${5:postcode}}"
-    },
-    "DeclareCiteCommand*{}[]{}{}{}{}": {
-      "snippet": "DeclareCiteCommand*{${1:cmd}}[${2:wrapper}]{${3:precode}}{${4:loopcode}}{${5:sepcode}}{${6:postcode}}"
-    },
-    "DeclareMultiCiteCommand{}{}{}": {
-      "snippet": "DeclareMultiCiteCommand{${1:cmd}}{${2:cite}}{${3:delimiter}}"
-    },
-    "DeclareMultiCiteCommand{}[]{}{}": {
-      "snippet": "DeclareMultiCiteCommand{${1:cmd}}[${2:wrapper}]{${3:cite}}{${4:delimiter}}"
-    },
-    "DeclareAutoCiteCommand{}{}{}": {
-      "snippet": "DeclareAutoCiteCommand{${1:name}}{${2:cite}}{${3:multicite}}"
-    },
-    "DeclareAutoCiteCommand{}[]{}{}": {
-      "snippet": "DeclareAutoCiteCommand{${1:name}}[${2:position}]{${3:cite}}{${4:multicite}}"
-    },
-    "DeclareCitePunctuationPosition{}{}": {
-      "snippet": "DeclareCitePunctuationPosition{${1:cmd}}{${2:position}}"
-    },
-    "DeprecateField{}{}": {
-      "snippet": "DeprecateField{${1:field}}{${2:message}}"
-    },
-    "DeprecateList{}{}": {
-      "snippet": "DeprecateList{${1:list}}{${2:message}}"
-    },
-    "DeprecateName{}{}": {
-      "snippet": "DeprecateName{${1:name}}{${2:message}}"
-    },
-    "DeprecateFieldWithReplacement{}{}": {
-      "snippet": "DeprecateFieldWithReplacement{${1:field}}{${2:replacement}}"
-    },
-    "DeprecateListWithReplacement{}{}": {
-      "snippet": "DeprecateListWithReplacement{${1:list}}{${2:replacement}}"
-    },
-    "DeprecateNameWithReplacement{}{}": {
-      "snippet": "DeprecateNameWithReplacement{${1:name}}{${2:replacement}}"
-    },
-    "printfield{}": {
-      "snippet": "printfield{${1:field}}"
-    },
-    "printfield[]{}": {
-      "snippet": "printfield[${2:format}]{${1:field}}"
-    },
-    "printlist{}": {
-      "snippet": "printlist{${1:literal list}}"
-    },
-    "printlist[]{}": {
-      "snippet": "printlist[${2:format}]{${1:literal list}}"
-    },
-    "printlist[][]{}": {
-      "snippet": "printlist[${2:format}][${3:start-stop}]{${1:literal list}}"
-    },
-    "printnames{}": {
-      "snippet": "printnames{${1:name list}}"
-    },
-    "printnames[]{}": {
-      "snippet": "printnames[${2:format}]{${1:name list}}"
-    },
-    "printnames[][]{}": {
-      "snippet": "printnames[${2:format}][${3:start-stop}]{${1:name list}}"
-    },
-    "printtext{}": {
-      "snippet": "printtext{${1:text}}"
-    },
-    "printtext[]{}": {
-      "snippet": "printtext[${2:format}]{${1:text}}"
-    },
-    "printfile{}": {
-      "snippet": "printfile{${1:file}}"
-    },
-    "printfile[]{}": {
-      "snippet": "printfile[${2:format}]{${1:file}}"
-    },
-    "printdate": {},
-    "printdateextra": {},
-    "printlabeldate": {},
-    "printlabeldateextra": {},
-    "printlabeltime": {},
-    "printorigdate": {},
-    "printeventdate": {},
-    "printurldate": {},
-    "printtime": {},
-    "printorigtime": {},
-    "printeventtime": {},
-    "printurltime": {},
-    "indexfield{}": {
-      "snippet": "indexfield{${1:field}}"
-    },
-    "indexfield[]{}": {
-      "snippet": "indexfield[${2:format}]{${1:field}}"
-    },
-    "indexlist{}": {
-      "snippet": "indexlist{${1:literal list}}"
-    },
-    "indexlist[]{}": {
-      "snippet": "indexlist[${2:format}]{${1:literal list}}"
-    },
-    "indexlist[][]{}": {
-      "snippet": "indexlist[${2:format}][${3:start-stop}]{${1:literal list}}"
-    },
-    "indexnames{}": {
-      "snippet": "indexnames{${1:name list}}"
-    },
-    "indexnames[]{}": {
-      "snippet": "indexnames[${2:format}]{${1:name list}}"
-    },
-    "indexnames[][]{}": {
-      "snippet": "indexnames[${2:format}][${3:start-stop}]{${1:name list}}"
-    },
-    "entrydata{}{}": {
-      "snippet": "entrydata{${1:key}}{${2:code}}"
-    },
-    "entrydata*{}{}": {
-      "snippet": "entrydata*{${1:key}}{${2:code}}"
-    },
-    "entryset{}{}": {
-      "snippet": "entryset{${1:precode}}{${2:postcode}}"
-    },
-    "DeclareFieldInputHandler{}{}": {
-      "snippet": "DeclareFieldInputHandler{${1:field}}{${2:code}}"
-    },
-    "DeclareListInputHandler{}{}": {
-      "snippet": "DeclareListInputHandler{${1:list}}{${2:code}}"
-    },
-    "DeclareNameInputHandler{}{}": {
-      "snippet": "DeclareNameInputHandler{${1:name}}{${2:code}}"
-    },
-    "NewCount": {},
-    "NewOption": {},
-    "NewValue": {},
-    "DeclareFieldFormat[]{}{}": {
-      "snippet": "DeclareFieldFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareFieldFormat*{}{}": {
-      "snippet": "DeclareFieldFormat*{${1:format}}{${2:code}}"
-    },
-    "DeclareListFormat[]{}{}": {
-      "snippet": "DeclareListFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareListFormat*{}{}": {
-      "snippet": "DeclareListFormat*{${1:format}}{${2:code}}"
-    },
-    "DeclareNameFormat[]{}{}": {
-      "snippet": "DeclareNameFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareNameFormat*{}{}": {
-      "snippet": "DeclareNameFormat*{${1:format}}{${2:code}}"
-    },
-    "namepartprefix": {},
-    "namepartprefixi": {},
-    "namepartfamily": {},
-    "namepartfamilyi": {},
-    "namepartsuffix": {},
-    "namepartsuffixi": {},
-    "namepartgiven": {},
-    "namepartgiveni": {},
-    "DeclareListWrapperFormat[]{}{}": {
-      "snippet": "DeclareListWrapperFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareListWrapperFormat*{}{}": {
-      "snippet": "DeclareListWrapperFormat*{${1:format}}{${2:code}}"
-    },
-    "DeclareNameWrapperFormat[]{}{}": {
-      "snippet": "DeclareNameWrapperFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareNameWrapperFormat*{}{}": {
-      "snippet": "DeclareNameWrapperFormat*{${1:format}}{${2:code}}"
-    },
-    "DeclareIndexFieldFormat[]{}{}": {
-      "snippet": "DeclareIndexFieldFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareIndexFieldFormat*{}{}": {
-      "snippet": "DeclareIndexFieldFormat*{${1:format}}{${2:code}}"
-    },
-    "DeclareIndexListFormat[]{}{}": {
-      "snippet": "DeclareIndexListFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareIndexListFormat*{}{}": {
-      "snippet": "DeclareIndexListFormat*{${1:format}}{${2:code}}"
-    },
-    "DeclareIndexNameFormat[]{}{}": {
-      "snippet": "DeclareIndexNameFormat[${3:entrytype, ...}]{${1:format}}{${2:code}}"
-    },
-    "DeclareIndexNameFormat*{}{}": {
-      "snippet": "DeclareIndexNameFormat*{${1:format}}{${2:code}}"
-    },
-    "DeclareFieldAlias[]{}[]{}": {
-      "snippet": "DeclareFieldAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareFieldAlias{}{}": {
-      "snippet": "DeclareFieldAlias{${1:alias}}{${2:format}}"
-    },
-    "DeclareListAlias[]{}[]{}": {
-      "snippet": "DeclareListAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareListAlias{}{}": {
-      "snippet": "DeclareListAlias{${1:alias}}{${2:format}}"
-    },
-    "DeclareNameAlias[]{}[]{}": {
-      "snippet": "DeclareNameAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareNameAlias{}{}": {
-      "snippet": "DeclareNameAlias{${1:alias}}{${2:format}}"
-    },
-    "DeclareListWrapperAlias[]{}[]{}": {
-      "snippet": "DeclareListWrapperAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareListWrapperAlias{}{}": {
-      "snippet": "DeclareListWrapperAlias{${1:alias}}{${2:format}}"
-    },
-    "DeclareNameWrapperAlias[]{}[]{}": {
-      "snippet": "DeclareNameWrapperAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareNameWrapperAlias{}{}": {
-      "snippet": "DeclareNameWrapperAlias{${1:alias}}{${2:format}}"
-    },
-    "DeclareIndexFieldAlias[]{}[]{}": {
-      "snippet": "DeclareIndexFieldAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareIndexFieldAlias{}{}": {
-      "snippet": "DeclareIndexFieldAlias{${1:alias}}{${2:format}}"
-    },
-    "DeclareIndexListAlias[]{}[]{}": {
-      "snippet": "DeclareIndexListAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareIndexListAlias{}{}": {
-      "snippet": "DeclareIndexListAlias{${1:alias}}{${2:format}}"
-    },
-    "DeclareIndexNameAlias[]{}[]{}": {
-      "snippet": "DeclareIndexNameAlias[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeclareIndexNameAlias{}{}": {
-      "snippet": "DeclareIndexNameAlias{${1:alias}}{${2:format}}"
-    },
-    "DeprecateFieldFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateFieldFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateFieldFormatWithReplacement{}{}": {
-      "snippet": "DeprecateFieldFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeprecateListFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateListFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateListFormatWithReplacement{}{}": {
-      "snippet": "DeprecateListFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeprecateNameFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateNameFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateNameFormatWithReplacement{}{}": {
-      "snippet": "DeprecateNameFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeprecateListWrapperFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateListWrapperFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateListWrapperFormatWithReplacement{}{}": {
-      "snippet": "DeprecateListWrapperFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeprecateNameWrapperFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateNameWrapperFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateNameWrapperFormatWithReplacement{}{}": {
-      "snippet": "DeprecateNameWrapperFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeprecateIndexFieldFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateIndexFieldFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateIndexFieldFormatWithReplacement{}{}": {
-      "snippet": "DeprecateIndexFieldFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeprecateIndexListFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateIndexListFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateIndexListFormatWithReplacement{}{}": {
-      "snippet": "DeprecateIndexListFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeprecateIndexNameFormatWithReplacement[]{}[]{}": {
-      "snippet": "DeprecateIndexNameFormatWithReplacement[${3:entry type}]{${1:alias}}[${4:format entry type}]{${2:format}}"
-    },
-    "DeprecateIndexNameFormatWithReplacement{}{}": {
-      "snippet": "DeprecateIndexNameFormatWithReplacement{${1:alias}}{${2:format}}"
-    },
-    "DeclareDatafieldSet{}{}": {
-      "snippet": "DeclareDatafieldSet{${1:name}}{${2:specification}}"
-    },
-    "member": {},
-    "member[]": {
-      "snippet": "member[${1:options}]",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "DeclareSourcemap{}": {
-      "snippet": "DeclareSourcemap{${1:specification}}"
-    },
-    "maps{}": {
-      "snippet": "maps{${1:elements}}"
-    },
-    "maps[]{}": {
-      "snippet": "maps[${2:options}]{${1:elements}}",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "map{}": {
-      "snippet": "map{${1:restrictions,steps}}"
-    },
-    "map[]{}": {
-      "snippet": "map[${2:options}]{${1:restrictions,steps}}",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "regexp{}": {
-      "snippet": "regexp{${1:regexp}}"
-    },
-    "perdatasource{}": {
-      "snippet": "perdatasource{${1:datasource}}"
-    },
-    "pertype{}": {
-      "snippet": "pertype{${1:entrytype}}"
-    },
-    "pernottype{}": {
-      "snippet": "pernottype{${1:entrytype}}"
-    },
-    "step": {},
-    "step[]": {
-      "snippet": "step[${1:options}]",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "DeclareStyleSourcemap{}": {
-      "snippet": "DeclareStyleSourcemap{${1:specification}}"
-    },
-    "DeclareDriverSourcemap{}": {
-      "snippet": "DeclareDriverSourcemap{${1:specification}}"
-    },
-    "DeclareDriverSourcemap[]{}": {
-      "snippet": "DeclareDriverSourcemap[${2:datatype=driver}]{${1:specification}}"
-    },
-    "DeclareDatamodelConstant{}{}": {
-      "snippet": "DeclareDatamodelConstant{${1:name}}{${2:constantdef}}"
-    },
-    "DeclareDatamodelConstant[]{}{}": {
-      "snippet": "DeclareDatamodelConstant[${3:options}]{${1:name}}{${2:constantdef}}",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "DeclareDatamodelEntrytypes{}": {
-      "snippet": "DeclareDatamodelEntrytypes{${1:entrytypes}}"
-    },
-    "DeclareDatamodelEntrytypes[]{}": {
-      "snippet": "DeclareDatamodelEntrytypes[${2:options}]{${1:entrytypes}}",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "DeclareDatamodelFields{}": {
-      "snippet": "DeclareDatamodelFields{${1:fields}}"
-    },
-    "DeclareDatamodelFields[]{}": {
-      "snippet": "DeclareDatamodelFields[${2:options}]{${1:fields}}",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "DeclareDatamodelEntryfields{}": {
-      "snippet": "DeclareDatamodelEntryfields{${1:fields}}"
-    },
-    "DeclareDatamodelEntryfields[]{}": {
-      "snippet": "DeclareDatamodelEntryfields[${2:entrytypes}]{${1:specification}}"
-    },
-    "DeclareDatamodelConstraints{}": {
-      "snippet": "DeclareDatamodelConstraints{${1:specification}}"
-    },
-    "constraint{}": {
-      "snippet": "constraint{${1:elements}}"
-    },
-    "constraint[]{}": {
-      "snippet": "constraint[${2:options}]{${1:elements}}",
-      "keyvalindex": 15,
-      "keyvalpos": 0
-    },
-    "constraintfieldsor{}": {
-      "snippet": "constraintfieldsor{${1:fields}}"
-    },
-    "constraintfieldsxor{}": {
-      "snippet": "constraintfieldsxor{${1:fields}}"
-    },
-    "antecedent{}": {
-      "snippet": "antecedent{${1:fields}}"
-    },
-    "antecedent[]{}": {
-      "snippet": "antecedent[${2:options}]{${1:fields}}",
-      "keyvalindex": 16,
-      "keyvalpos": 0
-    },
-    "consequent{}": {
-      "snippet": "consequent{${1:fields}}"
-    },
-    "consequent[]{}": {
-      "snippet": "consequent[${2:options}]{${1:fields}}",
-      "keyvalindex": 16,
-      "keyvalpos": 0
-    },
-    "constraintfield{}": {
-      "snippet": "constraintfield{${1:field}}"
-    },
-    "ResetDatamodelEntrytypes": {},
-    "ResetDatamodelFields": {},
-    "ResetDatamodelEntryfields": {},
-    "ResetDatamodelConstraints": {},
-    "DeclareLabelalphaTemplate{}": {
-      "snippet": "DeclareLabelalphaTemplate{${1:specification}}"
-    },
-    "DeclareLabelalphaTemplate[]{}": {
-      "snippet": "DeclareLabelalphaTemplate[${2:entrytypes}]{${1:specification}}"
-    },
-    "labelelement{}": {
-      "snippet": "labelelement{${1:elements}}"
-    },
-    "field{}": {
-      "snippet": "field{${1:field}}"
-    },
-    "field[]{}": {
-      "snippet": "field[${2:options}]{${1:field}}",
-      "keyvalindex": 17,
-      "keyvalpos": 0
-    },
-    "literal{}": {
-      "snippet": "literal{${1:characters}}"
-    },
-    "DeclareLabelalphaNameTemplate{}": {
-      "snippet": "DeclareLabelalphaNameTemplate{${1:specification}}"
-    },
-    "DeclareLabelalphaNameTemplate[]{}": {
-      "snippet": "DeclareLabelalphaNameTemplate[${2:name}]{${1:specification}}"
-    },
-    "namepart{}": {
-      "snippet": "namepart{${1:namepart}}"
-    },
-    "namepart[]{}": {
-      "snippet": "namepart[${2:options}]{${1:namepart}}",
-      "keyvalindex": 18,
-      "keyvalpos": 0
-    },
-    "DeclareNolabel{}": {
-      "snippet": "DeclareNolabel{${1:specification}}"
-    },
-    "nolabel{}": {
-      "snippet": "nolabel{${1:regexp}}"
-    },
-    "DeclareNolabelwidthcount{}": {
-      "snippet": "DeclareNolabelwidthcount{${1:specification}}"
-    },
-    "nolabelwidthcount{}": {
-      "snippet": "nolabelwidthcount{${1:regexp}}"
-    },
-    "DeclareSortingTemplate{}{}": {
-      "snippet": "DeclareSortingTemplate{${1:name}}{${2:specification}}"
-    },
-    "DeclareSortingTemplate[]{}{}": {
-      "snippet": "DeclareSortingTemplate[${3:options}]{${1:name}}{${2:specification}}",
-      "keyvalindex": 19,
-      "keyvalpos": 0
-    },
-    "sort{}": {
-      "snippet": "sort{${1:elements}}"
-    },
-    "sort[]{}": {
-      "snippet": "sort[${2:options}]{${1:elements}}",
-      "keyvalindex": 20,
-      "keyvalpos": 0
-    },
-    "citecount": {},
-    "citeorder": {},
-    "intciteorder": {},
-    "DeclareSortingNamekeyTemplate{}": {
-      "snippet": "DeclareSortingNamekeyTemplate{${1:specification}}"
-    },
-    "DeclareSortingNamekeyTemplate[]{}": {
-      "snippet": "DeclareSortingNamekeyTemplate[${2:name}]{${1:specification}}"
-    },
-    "visibility{}": {
-      "snippet": "visibility{${1:visibility scope}}"
-    },
-    "keypart{}": {
-      "snippet": "keypart{${1:part}}"
-    },
-    "DeclareSortExclusion{}{}": {
-      "snippet": "DeclareSortExclusion{${1:entrytype list}}{${2:field list}}"
-    },
-    "DeclareSortInclusion{}{}": {
-      "snippet": "DeclareSortInclusion{${1:entrytype list}}{${2:field list}}"
-    },
-    "DeclarePresort{}": {
-      "snippet": "DeclarePresort{${1:string}}"
-    },
-    "DeclarePresort[]{}": {
-      "snippet": "DeclarePresort[${2:entrytype list}]{${1:string}}"
-    },
-    "DeclareSortTranslit{}": {
-      "snippet": "DeclareSortTranslit{${1:specification}}"
-    },
-    "DeclareSortTranslit[]{}": {
-      "snippet": "DeclareSortTranslit[${2:entrytype}]{${1:specification}}"
-    },
-    "translit{}{}{}": {
-      "snippet": "translit{${1:field}}{${2:from}}{${3:to}}"
-    },
-    "translit[]{}{}{}": {
-      "snippet": "translit[${4:lang ids}]{${1:field}}{${2:from}}{${3:to}}"
-    },
-    "DeclareBiblistFilter{}{}": {
-      "snippet": "DeclareBiblistFilter{${1:name}}{${2:specification}}"
-    },
-    "filter{}": {
-      "snippet": "filter{${1:filter}}"
-    },
-    "filter[]{}": {
-      "snippet": "filter[${2:filterspec}]{${1:filter}}"
-    },
-    "filteror{}{}": {
-      "snippet": "filteror{${1:type}}{${2:filters}}"
-    },
-    "DeclareNoinit{}": {
-      "snippet": "DeclareNoinit{${1:specification}}"
-    },
-    "noinit{}": {
-      "snippet": "noinit{${1:regexp}}"
-    },
-    "DeclareNosort{}": {
-      "snippet": "DeclareNosort{${1:specification}}"
-    },
-    "nosort{}{}": {
-      "snippet": "nosort{${1:field}}{${2:regexp}}"
-    },
-    "DeclareNonamestring{}": {
-      "snippet": "DeclareNonamestring{${1:specification}}"
-    },
-    "nonamestring{}{}": {
-      "snippet": "nonamestring{${1:field}}{${2:regexp}}"
-    },
-    "DeclareLabelname{}": {
-      "snippet": "DeclareLabelname{${1:specification}}"
-    },
-    "DeclareLabelname[]{}": {
-      "snippet": "DeclareLabelname[${2:entrytype list}]{${1:specification}}"
-    },
-    "DeclareLabeldate{}": {
-      "snippet": "DeclareLabeldate{${1:specification}}"
-    },
-    "DeclareLabeldate[]{}": {
-      "snippet": "DeclareLabeldate[${2:entrytype list}]{${1:specification}}"
-    },
-    "DeclareExtradate{}": {
-      "snippet": "DeclareExtradate{${1:specification}}"
-    },
-    "scope{}": {
-      "snippet": "scope{${1:code}}"
-    },
-    "DeclareExtradateContext{}": {
-      "snippet": "DeclareExtradateContext{${1:specification}}"
-    },
-    "DeclareExtradateContext[]{}": {
-      "snippet": "DeclareExtradateContext[${2:entrytype list}]{${1:specification}}"
-    },
-    "DeclareLabeltitle{}": {
-      "snippet": "DeclareLabeltitle{${1:specification}}"
-    },
-    "DeclareLabeltitle[]{}": {
-      "snippet": "DeclareLabeltitle[${2:entrytype list}]{${1:specification}}"
-    },
-    "DefaultInheritance{}": {
-      "snippet": "DefaultInheritance{${1:options}}",
-      "keyvalindex": 21,
-      "keyvalpos": 0
-    },
-    "DefaultInheritance[]{}": {
-      "snippet": "DefaultInheritance[${2:exceptions}]{${1:options}}",
-      "keyvalindex": 21,
-      "keyvalpos": 1
-    },
-    "except{}{}{}": {
-      "snippet": "except{${1:source}}{${2:target}}{${3:options}}",
-      "keyvalindex": 21,
-      "keyvalpos": 2
-    },
-    "DeclareDataInheritance{}{}{}": {
-      "snippet": "DeclareDataInheritance{${1:source}}{${2:target}}{${3:rules}}"
-    },
-    "DeclareDataInheritance[]{}{}{}": {
-      "snippet": "DeclareDataInheritance[${4:options}]{${1:source}}{${2:target}}{${3:rules}}",
-      "keyvalindex": 22,
-      "keyvalpos": 0
-    },
-    "inherit{}{}": {
-      "snippet": "inherit{${1:source}}{${2:target}}"
-    },
-    "inherit[]{}{}": {
-      "snippet": "inherit[${3:options}]{${1:source}}{${2:target}}",
-      "keyvalindex": 23,
-      "keyvalpos": 0
-    },
-    "noinherit{}": {
-      "snippet": "noinherit{${1:source}}"
-    },
-    "ResetDataInheritance": {},
-    "thefield{}": {
-      "snippet": "thefield{${1:field}}"
-    },
-    "strfield{}": {
-      "snippet": "strfield{${1:field}}"
-    },
-    "csfield{}": {
-      "snippet": "csfield{${1:field}}"
-    },
-    "usefield{}{}": {
-      "snippet": "usefield{${1:command}}{${2:field}}"
-    },
-    "thelist{}": {
-      "snippet": "thelist{${1:literal list}}"
-    },
-    "strlist{}": {
-      "snippet": "strlist{${1:literal list}}"
-    },
-    "thefirstlistitem{}": {
-      "snippet": "thefirstlistitem{${1:literal list}}"
-    },
-    "strfirstlistitem{}": {
-      "snippet": "strfirstlistitem{${1:literal list}}"
-    },
-    "usefirstlistitem{}{}": {
-      "snippet": "usefirstlistitem{${1:cmd}}{${2:literal list}}"
-    },
-    "thename{}": {
-      "snippet": "thename{${1:name list}}"
-    },
-    "strname{}": {
-      "snippet": "strname{${1:name list}}"
-    },
-    "savefield{}{}": {
-      "snippet": "savefield{${1:field}}{${2:cmd}}"
-    },
-    "savefield*{}{}": {
-      "snippet": "savefield*{${1:field}}{${2:cmd}}"
-    },
-    "savelist{}{}": {
-      "snippet": "savelist{${1:literal list}}{${2:cmd}}"
-    },
-    "savelist*{}{}": {
-      "snippet": "savelist*{${1:literal list}}{${2:cmd}}"
-    },
-    "savename{}{}": {
-      "snippet": "savename{${1:name list}}{${2:cmd}}"
-    },
-    "savename*{}{}": {
-      "snippet": "savename*{${1:name list}}{${2:cmd}}"
-    },
-    "savefieldcs{}{}": {
-      "snippet": "savefieldcs{${1:field}}{${2:csname}}"
-    },
-    "savefieldcs*{}{}": {
-      "snippet": "savefieldcs*{${1:field}}{${2:csname}}"
-    },
-    "savelistcs{}{}": {
-      "snippet": "savelistcs{${1:literal list}}{${2:csname}}"
-    },
-    "savelistcs*{}{}": {
-      "snippet": "savelistcs*{${1:literal list}}{${2:csname}}"
-    },
-    "savenamecs{}{}": {
-      "snippet": "savenamecs{${1:name list}}{${2:csname}}"
-    },
-    "savenamecs*{}{}": {
-      "snippet": "savenamecs*{${1:name list}}{${2:csname}}"
-    },
-    "restorefield{}{}": {
-      "snippet": "restorefield{${1:field}}{${2:cmd}}"
-    },
-    "restorelist{}{}": {
-      "snippet": "restorelist{${1:literal list}}{${2:cmd}}"
-    },
-    "restorename{}{}": {
-      "snippet": "restorename{${1:name list}}{${2:cmd}}"
-    },
-    "clearfield{}": {
-      "snippet": "clearfield{${1:field}}"
-    },
-    "clearlist{}": {
-      "snippet": "clearlist{${1:literal list}}"
-    },
-    "clearname{}": {
-      "snippet": "clearname{${1:name list}}"
-    },
-    "ifdatejulian{}{}": {
-      "snippet": "ifdatejulian{${1:true}}{${2:false}}"
-    },
-    "ifenddatejulian{}{}": {
-      "snippet": "ifenddatejulian{${1:true}}{${2:false}}"
-    },
-    "ifdateera{}{}{}": {
-      "snippet": "ifdateera{${1:era}}{${2:true}}{${3:false}}"
-    },
-    "ifenddateera{}{}{}": {
-      "snippet": "ifenddateera{${1:era}}{${2:true}}{${3:false}}"
-    },
-    "ifdatecirca{}{}": {
-      "snippet": "ifdatecirca{${1:true}}{${2:false}}"
-    },
-    "ifenddatecirca{}{}": {
-      "snippet": "ifenddatecirca{${1:true}}{${2:false}}"
-    },
-    "ifdateuncertain{}{}": {
-      "snippet": "ifdateuncertain{${1:true}}{${2:false}}"
-    },
-    "ifenddateuncertain{}{}": {
-      "snippet": "ifenddateuncertain{${1:true}}{${2:false}}"
-    },
-    "ifdateunknown{}{}": {
-      "snippet": "ifdateunknown{${1:true}}{${2:false}}"
-    },
-    "ifenddateunknown{}{}": {
-      "snippet": "ifenddateunknown{${1:true}}{${2:false}}"
-    },
-    "iflabeldateisdate{}{}": {
-      "snippet": "iflabeldateisdate{${1:true}}{${2:false}}"
-    },
-    "ifdatehasyearonlyprecision{}{}{}": {
-      "snippet": "ifdatehasyearonlyprecision{${1:datetype}}{${2:true}}{${3:false}}"
-    },
-    "ifdatehastime{}{}{}": {
-      "snippet": "ifdatehastime{${1:datetype}}{${2:true}}{${3:false}}"
-    },
-    "ifdateshavedifferentprecision{}{}{}{}": {
-      "snippet": "ifdateshavedifferentprecision{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
-    },
-    "ifdateyearsequal{}{}{}{}": {
-      "snippet": "ifdateyearsequal{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
-    },
-    "ifdatesequal{}{}{}{}": {
-      "snippet": "ifdatesequal{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
-    },
-    "ifdaterangesequal{}{}{}{}": {
-      "snippet": "ifdaterangesequal{${1:datetype1}}{${2:datetype2}}{${3:true}}{${4:false}}"
-    },
-    "ifcaselang{}{}": {
-      "snippet": "ifcaselang{${1:true}}{${2:false}}"
-    },
-    "ifcaselang[]{}{}": {
-      "snippet": "ifcaselang[${3:language}]{${1:true}}{${2:false}}"
-    },
-    "ifsortingnamekeytemplatename{}{}{}": {
-      "snippet": "ifsortingnamekeytemplatename{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "ifuniquenametemplatename{}{}{}": {
-      "snippet": "ifuniquenametemplatename{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "iflabelalphanametemplatename{}{}{}": {
-      "snippet": "iflabelalphanametemplatename{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "ifnamehashtemplatename{}{}{}": {
-      "snippet": "ifnamehashtemplatename{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "iffieldundef{}{}{}": {
-      "snippet": "iffieldundef{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "iflistundef{}{}{}": {
-      "snippet": "iflistundef{${1:literal list}}{${2:true}}{${3:false}}"
-    },
-    "ifnameundef{}{}{}": {
-      "snippet": "ifnameundef{${1:name list}}{${2:true}}{${3:false}}"
-    },
-    "iffieldsequal{}{}{}{}": {
-      "snippet": "iffieldsequal{${1:field1}}{${2:field2}}{${3:true}}{${4:false}}"
-    },
-    "iflistsequal{}{}{}{}": {
-      "snippet": "iflistsequal{${1:literal list1}}{${2:literal list2}}{${3:true}}{${4:false}}"
-    },
-    "ifnamesequal{}{}{}{}": {
-      "snippet": "ifnamesequal{${1:name list1}}{${2:name list2}}{${3:true}}{${4:false}}"
-    },
-    "iffieldequals{}{}{}{}": {
-      "snippet": "iffieldequals{${1:field}}{${2:cmd}}{${3:true}}{${4:false}}"
-    },
-    "iflistequals{}{}{}{}": {
-      "snippet": "iflistequals{${1:literal list}}{${2:cmd}}{${3:true}}{${4:false}}"
-    },
-    "ifnameequals{}{}{}{}": {
-      "snippet": "ifnameequals{${1:name list}}{${2:cmd}}{${3:true}}{${4:false}}"
-    },
-    "iffieldequalcs{}{}{}{}": {
-      "snippet": "iffieldequalcs{${1:field}}{${2:csname}}{${3:true}}{${4:false}}"
-    },
-    "iflistequalcs{}{}{}{}": {
-      "snippet": "iflistequalcs{${1:literal list}}{${2:csname}}{${3:true}}{${4:false}}"
-    },
-    "ifnameequalcs{}{}{}{}": {
-      "snippet": "ifnameequalcs{${1:name list}}{${2:csname}}{${3:true}}{${4:false}}"
-    },
-    "iffieldequalstr{}{}{}{}": {
-      "snippet": "iffieldequalstr{${1:field}}{${2:string}}{${3:true}}{${4:false}}"
-    },
-    "iffieldxref{}{}{}": {
-      "snippet": "iffieldxref{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "iflistxref{}{}{}": {
-      "snippet": "iflistxref{${1:literal list}}{${2:true}}{${3:false}}"
-    },
-    "ifnamexref{}{}{}": {
-      "snippet": "ifnamexref{${1:name list}}{${2:true}}{${3:false}}"
-    },
-    "ifcurrentfield{}{}{}": {
-      "snippet": "ifcurrentfield{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "ifcurrentlist{}{}{}": {
-      "snippet": "ifcurrentlist{${1:literal list}}{${2:true}}{${3:false}}"
-    },
-    "ifcurrentname{}{}{}": {
-      "snippet": "ifcurrentname{${1:name list}}{${2:true}}{${3:false}}"
-    },
-    "ifuseprefix{}{}": {
-      "snippet": "ifuseprefix{${1:true}}{${2:false}}"
-    },
-    "ifuseauthor{}{}": {
-      "snippet": "ifuseauthor{${1:true}}{${2:false}}"
-    },
-    "ifuseeditor{}{}": {
-      "snippet": "ifuseeditor{${1:true}}{${2:false}}"
-    },
-    "ifusetranslator{}{}": {
-      "snippet": "ifusetranslator{${1:true}}{${2:false}}"
-    },
-    "ifcrossrefsource{}{}": {
-      "snippet": "ifcrossrefsource{${1:true}}{${2:false}}"
-    },
-    "ifxrefsource{}{}": {
-      "snippet": "ifxrefsource{${1:true}}{${2:false}}"
-    },
-    "ifsingletitle{}{}": {
-      "snippet": "ifsingletitle{${1:true}}{${2:false}}"
-    },
-    "ifnocite{}{}": {
-      "snippet": "ifnocite{${1:true}}{${2:false}}"
-    },
-    "ifuniquetitle{}{}": {
-      "snippet": "ifuniquetitle{${1:true}}{${2:false}}"
-    },
-    "ifuniquebaretitle{}{}": {
-      "snippet": "ifuniquebaretitle{${1:true}}{${2:false}}"
-    },
-    "ifuniquework{}{}": {
-      "snippet": "ifuniquework{${1:true}}{${2:false}}"
-    },
-    "ifuniqueprimaryauthor{}{}": {
-      "snippet": "ifuniqueprimaryauthor{${1:true}}{${2:false}}"
-    },
-    "ifandothers{}{}{}": {
-      "snippet": "ifandothers{${1:list}}{${2:true}}{${3:false}}"
-    },
-    "ifmorenames{}{}": {
-      "snippet": "ifmorenames{${1:true}}{${2:false}}"
-    },
-    "ifmoreitems{}{}": {
-      "snippet": "ifmoreitems{${1:true}}{${2:false}}"
-    },
-    "ifterseinits{}{}": {
-      "snippet": "ifterseinits{${1:true}}{${2:false}}"
-    },
-    "ifentrytype{}{}{}": {
-      "snippet": "ifentrytype{${1:type}}{${2:true}}{${3:false}}"
-    },
-    "ifkeyword{}{}{}": {
-      "snippet": "ifkeyword{${1:keyword}}{${2:true}}{${3:false}}"
-    },
-    "ifcategory{}{}{}": {
-      "snippet": "ifcategory{${1:category}}{${2:true}}{${3:false}}"
-    },
-    "ifciteseen{}{}": {
-      "snippet": "ifciteseen{${1:true}}{${2:false}}"
-    },
-    "iffirstcitekey{}{}": {
-      "snippet": "iffirstcitekey{${1:true}}{${2:false}}"
-    },
-    "iflastcitekey{}{}": {
-      "snippet": "iflastcitekey{${1:true}}{${2:false}}"
-    },
-    "ifciteibid{}{}": {
-      "snippet": "ifciteibid{${1:true}}{${2:false}}"
-    },
-    "ifciteidem{}{}": {
-      "snippet": "ifciteidem{${1:true}}{${2:false}}"
-    },
-    "ifopcit{}{}": {
-      "snippet": "ifopcit{${1:true}}{${2:false}}"
-    },
-    "ifloccit{}{}": {
-      "snippet": "ifloccit{${1:true}}{${2:false}}"
-    },
-    "iffirstonpage{}{}": {
-      "snippet": "iffirstonpage{${1:true}}{${2:false}}"
-    },
-    "ifsamepage{}{}{}{}": {
-      "snippet": "ifsamepage{${1:instance1}}{${2:instance2}}{${3:true}}{${4:false}}"
-    },
-    "ifinteger{}{}{}": {
-      "snippet": "ifinteger{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "hascomputableequivalent{}{}{}": {
-      "snippet": "hascomputableequivalent{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "ifiscomputable{}{}{}": {
-      "snippet": "ifiscomputable{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "getcomputableequivalent{}{}": {
-      "snippet": "getcomputableequivalent{${1:string}}{${2:macro}}"
-    },
-    "ifnumeral{}{}{}": {
-      "snippet": "ifnumeral{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "ifnumerals{}{}{}": {
-      "snippet": "ifnumerals{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "ifpages{}{}{}": {
-      "snippet": "ifpages{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "iffieldint{}{}{}": {
-      "snippet": "iffieldint{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "fieldhascomputableequivalent{}{}{}": {
-      "snippet": "fieldhascomputableequivalent{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "iffieldiscomputable{}{}{}": {
-      "snippet": "iffieldiscomputable{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "iffieldnum{}{}{}": {
-      "snippet": "iffieldnum{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "iffieldnums{}{}{}": {
-      "snippet": "iffieldnums{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "iffieldpages{}{}{}": {
-      "snippet": "iffieldpages{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "ifbibstring{}{}{}": {
-      "snippet": "ifbibstring{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "ifbibxstring{}{}{}": {
-      "snippet": "ifbibxstring{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "iffieldbibstring{}{}{}": {
-      "snippet": "iffieldbibstring{${1:field}}{${2:true}}{${3:false}}"
-    },
-    "iffieldplusstringbibstring{}{}{}{}": {
-      "snippet": "iffieldplusstringbibstring{${1:field}}{${2:string}}{${3:true}}{${4:false}}"
-    },
-    "ifdriver{}{}{}": {
-      "snippet": "ifdriver{${1:entrytype}}{${2:true}}{${3:false}}"
-    },
-    "ifcapital{}{}": {
-      "snippet": "ifcapital{${1:true}}{${2:false}}"
-    },
-    "ifcitation{}{}": {
-      "snippet": "ifcitation{${1:true}}{${2:false}}"
-    },
-    "ifvolcite{}{}": {
-      "snippet": "ifvolcite{${1:true}}{${2:false}}"
-    },
-    "ifbibliography{}{}": {
-      "snippet": "ifbibliography{${1:true}}{${2:false}}"
-    },
-    "ifnatbibmode{}{}": {
-      "snippet": "ifnatbibmode{${1:true}}{${2:false}}"
-    },
-    "ifciteindex{}{}": {
-      "snippet": "ifciteindex{${1:true}}{${2:false}}"
-    },
-    "ifbibindex{}{}": {
-      "snippet": "ifbibindex{${1:true}}{${2:false}}"
-    },
-    "iffootnote{}{}": {
-      "snippet": "iffootnote{${1:true}}{${2:false}}"
-    },
-    "thecitecounter": {},
-    "themaxcitecounter": {},
-    "thesavedcitecounter": {},
-    "theuniquename": {},
-    "theuniquelist": {},
-    "theparenlevel": {},
-    "themaxparens": {},
-    "ifboolexpr{}{}{}": {
-      "snippet": "ifboolexpr{${1:expression}}{${2:true}}{${3:false}}"
-    },
-    "ifthenelse{}{}{}": {
-      "snippet": "ifthenelse{${1:tests}}{${2:true}}{${3:false}}"
-    },
-    "newbibmacro{}{}": {
-      "snippet": "newbibmacro{${1:name}}{${2:definition}}"
-    },
-    "newbibmacro{}[]{}": {
-      "snippet": "newbibmacro{${1:name}}[${2:args}]{${3:definition}}"
-    },
-    "newbibmacro{}[][]{}": {
-      "snippet": "newbibmacro{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
-    },
-    "newbibmacro*{}{}": {
-      "snippet": "newbibmacro*{${1:name}}{${2:definition}}"
-    },
-    "newbibmacro*{}[]{}": {
-      "snippet": "newbibmacro*{${1:name}}[${2:args}]{${3:definition}}"
-    },
-    "newbibmacro*{}[][]{}": {
-      "snippet": "newbibmacro*{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
-    },
-    "renewbibmacro{}{}": {
-      "snippet": "renewbibmacro{${1:name}}{${2:definition}}"
-    },
-    "renewbibmacro{}[]{}": {
-      "snippet": "renewbibmacro{${1:name}}[${2:args}]{${3:definition}}"
-    },
-    "renewbibmacro{}[][]{}": {
-      "snippet": "renewbibmacro{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
-    },
-    "renewbibmacro*{}{}": {
-      "snippet": "renewbibmacro*{${1:name}}{${2:definition}}"
-    },
-    "renewbibmacro*{}[]{}": {
-      "snippet": "renewbibmacro*{${1:name}}[${2:args}]{${3:definition}}"
-    },
-    "renewbibmacro*{}[][]{}": {
-      "snippet": "renewbibmacro*{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
-    },
-    "providebibmacro{}{}": {
-      "snippet": "providebibmacro{${1:name}}{${2:definition}}"
-    },
-    "providebibmacro{}[]{}": {
-      "snippet": "providebibmacro{${1:name}}[${2:args}]{${3:definition}}"
-    },
-    "providebibmacro{}[][]{}": {
-      "snippet": "providebibmacro{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
-    },
-    "providebibmacro*{}{}": {
-      "snippet": "providebibmacro*{${1:name}}{${2:definition}}"
-    },
-    "providebibmacro*{}[]{}": {
-      "snippet": "providebibmacro*{${1:name}}[${2:args}]{${3:definition}}"
-    },
-    "providebibmacro*{}[][]{}": {
-      "snippet": "providebibmacro*{${1:name}}[${2:args}][${3:default}]{${4:definition}}"
-    },
-    "letbibmacro{}{}": {
-      "snippet": "letbibmacro{${1:alias}}{${2:name}}"
-    },
-    "letbibmacro*{}{}": {
-      "snippet": "letbibmacro*{${1:alias}}{${2:name}}"
-    },
-    "usebibmacro{}": {
-      "snippet": "usebibmacro{${1:name}}"
-    },
-    "usebibmacro*{}": {
-      "snippet": "usebibmacro*{${1:name}}"
-    },
-    "savecommand{}": {
-      "snippet": "savecommand{${1:cmd}}"
-    },
-    "restorecommand{}": {
-      "snippet": "restorecommand{${1:cmd}}"
-    },
-    "savebibmacro{}": {
-      "snippet": "savebibmacro{${1:name}}"
-    },
-    "restorebibmacro{}": {
-      "snippet": "restorebibmacro{${1:name}}"
-    },
-    "savefieldformat{}": {
-      "snippet": "savefieldformat{${1:format}}"
-    },
-    "savefieldformat[]{}": {
-      "snippet": "savefieldformat[${2:entrytype}]{${1:format}}"
-    },
-    "restorefieldformat{}": {
-      "snippet": "restorefieldformat{${1:format}}"
-    },
-    "restorefieldformat[]{}": {
-      "snippet": "restorefieldformat[${2:entrytype}]{${1:format}}"
-    },
-    "savelistformat{}": {
-      "snippet": "savelistformat{${1:format}}"
-    },
-    "savelistformat[]{}": {
-      "snippet": "savelistformat[${2:entrytype}]{${1:format}}"
-    },
-    "restorelistformat{}": {
-      "snippet": "restorelistformat{${1:format}}"
-    },
-    "restorelistformat[]{}": {
-      "snippet": "restorelistformat[${2:entrytype}]{${1:format}}"
-    },
-    "savenameformat{}": {
-      "snippet": "savenameformat{${1:format}}"
-    },
-    "savenameformat[]{}": {
-      "snippet": "savenameformat[${2:entrytype}]{${1:format}}"
-    },
-    "restorenameformat{}": {
-      "snippet": "restorenameformat{${1:format}}"
-    },
-    "restorenameformat[]{}": {
-      "snippet": "restorenameformat[${2:entrytype}]{${1:format}}"
-    },
-    "savelistwrapperformat{}": {
-      "snippet": "savelistwrapperformat{${1:format}}"
-    },
-    "savelistwrapperformat[]{}": {
-      "snippet": "savelistwrapperformat[${2:entrytype}]{${1:format}}"
-    },
-    "restorelistwrapperformat{}": {
-      "snippet": "restorelistwrapperformat{${1:format}}"
-    },
-    "restorelistwrapperformat[]{}": {
-      "snippet": "restorelistwrapperformat[${2:entrytype}]{${1:format}}"
-    },
-    "savenamewrapperformat{}": {
-      "snippet": "savenamewrapperformat{${1:format}}"
-    },
-    "savenamewrapperformat[]{}": {
-      "snippet": "savenamewrapperformat[${2:entrytype}]{${1:format}}"
-    },
-    "restorenamewrapperformat{}": {
-      "snippet": "restorenamewrapperformat{${1:format}}"
-    },
-    "restorenamewrapperformat[]{}": {
-      "snippet": "restorenamewrapperformat[${2:entrytype}]{${1:format}}"
-    },
-    "ifbibmacroundef{}{}{}": {
-      "snippet": "ifbibmacroundef{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "iffieldformatundef{}{}{}": {
-      "snippet": "iffieldformatundef{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "iffieldformatundef[]{}{}{}": {
-      "snippet": "iffieldformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "iflistformatundef{}{}{}": {
-      "snippet": "iflistformatundef{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "iflistformatundef[]{}{}{}": {
-      "snippet": "iflistformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "ifnameformatundef{}{}{}": {
-      "snippet": "ifnameformatundef{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "ifnameformatundef[]{}{}{}": {
-      "snippet": "ifnameformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "iflistwrapperformatundef{}{}{}": {
-      "snippet": "iflistwrapperformatundef{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "iflistwrapperformatundef[]{}{}{}": {
-      "snippet": "iflistwrapperformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "ifnamewrapperformatundef{}{}{}": {
-      "snippet": "ifnamewrapperformatundef{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "ifnamewrapperformatundef[]{}{}{}": {
-      "snippet": "ifnamewrapperformatundef[${4:entrytype}]{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "usedriver{}{}": {
-      "snippet": "usedriver{${1:code}}{${2:entrytype}}"
-    },
-    "bibhypertarget{}{}": {
-      "snippet": "bibhypertarget{${1:name}}{${2:text}}"
-    },
-    "bibhyperlink{}{}": {
-      "snippet": "bibhyperlink{${1:name}}{${2:text}}"
-    },
-    "bibhyperref{}": {
-      "snippet": "bibhyperref{${1:text}}"
-    },
-    "bibhyperref[]{}": {
-      "snippet": "bibhyperref[${2:entrykey}]{${1:text}}"
-    },
-    "ifhyperref{}{}": {
-      "snippet": "ifhyperref{${1:true}}{${2:false}}"
-    },
-    "docsvfield{}": {
-      "snippet": "docsvfield{${1:field}}"
-    },
-    "forcsvfield{}{}": {
-      "snippet": "forcsvfield{${1:handler}}{${2:field}}"
-    },
-    "MakeCapital{}": {
-      "snippet": "MakeCapital{${1:text}}"
-    },
-    "MakeSentenceCase{}": {
-      "snippet": "MakeSentenceCase{${1:text}}"
-    },
-    "MakeSentenceCase*{}": {
-      "snippet": "MakeSentenceCase*{${1:text}}"
-    },
-    "mkpageprefix{}": {
-      "snippet": "mkpageprefix{${1:text}}"
-    },
-    "mkpageprefix[]{}": {
-      "snippet": "mkpageprefix[${2:pagination}]{${1:text}}"
-    },
-    "mkpageprefix[][]{}": {
-      "snippet": "mkpageprefix[${2:pagination}][${3:postpro}]{${1:text}}"
-    },
-    "mkpagetotal{}": {
-      "snippet": "mkpagetotal{${1:text}}"
-    },
-    "mkpagetotal[]{}": {
-      "snippet": "mkpagetotal[${2:pagination}]{${1:text}}"
-    },
-    "mkpagetotal[][]{}": {
-      "snippet": "mkpagetotal[${2:pagination}][${3:postpro}]{${1:text}}"
-    },
-    "themincomprange": {},
-    "themaxcomprange": {},
-    "themincompwidth": {},
-    "mkcomprange{}": {
-      "snippet": "mkcomprange{${1:text}}"
-    },
-    "mkcomprange[]{}": {
-      "snippet": "mkcomprange[${2:postpro}]{${1:text}}"
-    },
-    "mkcomprange[][]{}": {
-      "snippet": "mkcomprange[${2:postpro}][${3:itempostpro}]{${1:text}}"
-    },
-    "mkcomprange*{}": {
-      "snippet": "mkcomprange*{${1:text}}"
-    },
-    "mkcomprange*[]{}": {
-      "snippet": "mkcomprange*[${2:postpro}]{${1:text}}"
-    },
-    "mkcomprange*[][]{}": {
-      "snippet": "mkcomprange*[${2:postpro}][${3:itempostpro}]{${1:text}}"
-    },
-    "mknormrange{}": {
-      "snippet": "mknormrange{${1:text}}"
-    },
-    "mknormrange[]{}": {
-      "snippet": "mknormrange[${2:postpro}]{${1:text}}"
-    },
-    "mknormrange[][]{}": {
-      "snippet": "mknormrange[${2:postpro}][${3:itempostpro}]{${1:text}}"
-    },
-    "mknormrange*{}": {
-      "snippet": "mknormrange*{${1:text}}"
-    },
-    "mknormrange*[]{}": {
-      "snippet": "mknormrange*[${2:postpro}]{${1:text}}"
-    },
-    "mknormrange*[][]{}": {
-      "snippet": "mknormrange*[${2:postpro}][${3:itempostpro}]{${1:text}}"
-    },
-    "mkfirstpage{}": {
-      "snippet": "mkfirstpage{${1:text}}"
-    },
-    "mkfirstpage[]{}": {
-      "snippet": "mkfirstpage[${2:postpro}]{${1:text}}"
-    },
-    "mkfirstpage[][]{}": {
-      "snippet": "mkfirstpage[${2:postpro}][${3:itempostpro}]{${1:text}}"
-    },
-    "mkfirstpage*{}": {
-      "snippet": "mkfirstpage*{${1:text}}"
-    },
-    "mkfirstpage*[]{}": {
-      "snippet": "mkfirstpage*[${2:postpro}]{${1:text}}"
-    },
-    "mkfirstpage*[][]{}": {
-      "snippet": "mkfirstpage*[${2:postpro}][${3:itempostpro}]{${1:text}}"
-    },
-    "rangelen{}": {
-      "snippet": "rangelen{${1:rangefield}}"
-    },
-    "DeclareNumChars{}": {
-      "snippet": "DeclareNumChars{${1:characters}}"
-    },
-    "DeclareNumChars*{}": {
-      "snippet": "DeclareNumChars*{${1:characters}}"
-    },
-    "DeclareRangeChars{}": {
-      "snippet": "DeclareRangeChars{${1:characters}}"
-    },
-    "DeclareRangeChars*{}": {
-      "snippet": "DeclareRangeChars*{${1:characters}}"
-    },
-    "DeclareRangeCommands{}": {
-      "snippet": "DeclareRangeCommands{${1:cmds}}"
-    },
-    "DeclareRangeCommands*{}": {
-      "snippet": "DeclareRangeCommands*{${1:cmds}}"
-    },
-    "DeclarePageCommands{}": {
-      "snippet": "DeclarePageCommands{${1:cmds}}"
-    },
-    "DeclarePageCommands*{}": {
-      "snippet": "DeclarePageCommands*{${1:cmds}}"
-    },
-    "NumCheckSetup{}": {
-      "snippet": "NumCheckSetup{${1:code}}"
-    },
-    "NumcheckSetup{}": {
-      "snippet": "NumcheckSetup{${1:code}}"
-    },
-    "NumsCheckSetup{}": {
-      "snippet": "NumsCheckSetup{${1:code}}"
-    },
-    "PagesCheckSetup{}": {
-      "snippet": "PagesCheckSetup{${1:code}}"
-    },
-    "DeclareBabelToExplLanguageMapping{}{}": {
-      "snippet": "DeclareBabelToExplLanguageMapping{${1:babel language}}{${2:expl language}}"
-    },
-    "UndeclareBabelToExplLanguageMapping{}": {
-      "snippet": "UndeclareBabelToExplLanguageMapping{${1:babel language}}"
-    },
-    "DeclareCaseLangs{}": {
-      "snippet": "DeclareCaseLangs{${1:languages}}"
-    },
-    "DeclareCaseLangs*{}": {
-      "snippet": "DeclareCaseLangs*{${1:languages}}"
-    },
-    "BibliographyWarning{}": {
-      "snippet": "BibliographyWarning{${1:message}}"
-    },
-    "pagetrackertrue": {},
-    "pagetrackerfalse": {},
-    "citetrackertrue": {},
-    "citetrackerfalse": {},
-    "backtrackertrue": {},
-    "backtrackerfalse": {},
-    "newblock": {},
-    "newunit": {},
-    "finentry": {},
-    "setunit{}": {
-      "snippet": "setunit{${1:punctuation}}"
-    },
-    "setunit*{}": {
-      "snippet": "setunit*{${1:punctuation}}"
-    },
-    "printunit{}": {
-      "snippet": "printunit{${1:punctuation}}"
-    },
-    "printunit*{}": {
-      "snippet": "printunit*{${1:punctuation}}"
-    },
-    "setpunctfont{}": {
-      "snippet": "setpunctfont{${1:cmd}}"
-    },
-    "resetpunctfont": {},
-    "ifpunct{}{}": {
-      "snippet": "ifpunct{${1:true}}{${2:false}}"
-    },
-    "ifterm{}{}": {
-      "snippet": "ifterm{${1:true}}{${2:false}}"
-    },
-    "ifpunctmark{}{}{}": {
-      "snippet": "ifpunctmark{${1:character}}{${2:true}}{${3:false}}"
-    },
-    "ifprefchar{}{}": {
-      "snippet": "ifprefchar{${1:true}}{${2:false}}"
-    },
-    "adddot": {},
-    "addcomma": {},
-    "addsemicolon": {},
-    "addcolon": {},
-    "addperiod": {},
-    "addexclam": {},
-    "addquestion": {},
-    "isdot": {},
-    "nopunct": {},
-    "unspace": {},
-    "addspace": {},
-    "addnbspace": {},
-    "addthinspace": {},
-    "addnbthinspace": {},
-    "addlowpenspace": {},
-    "addhighpenspace": {},
-    "addlpthinspace": {},
-    "addhpthinspace": {},
-    "addabbrvspace": {},
-    "addabthinspace": {},
-    "adddotspace": {},
-    "addslash": {},
-    "DeclarePrefChars{}": {
-      "snippet": "DeclarePrefChars{${1:characters}}"
-    },
-    "DeclarePrefChars*{}": {
-      "snippet": "DeclarePrefChars*{${1:characters}}"
-    },
-    "DeclareAutoPunctuation{}": {
-      "snippet": "DeclareAutoPunctuation{${1:characters}}"
-    },
-    "DeclareCapitalPunctuation{}": {
-      "snippet": "DeclareCapitalPunctuation{${1:characters}}"
-    },
-    "DeclarePunctuationPairs{}{}": {
-      "snippet": "DeclarePunctuationPairs{${1:identifier}}{${2:characters}}"
-    },
-    "DeclareQuotePunctuation{}": {
-      "snippet": "DeclareQuotePunctuation{${1:characters}}"
-    },
-    "uspunctuation": {},
-    "stdpunctuation": {},
-    "bibsentence": {},
-    "midsentence": {},
-    "midsentence*": {},
-    "bibstring{}": {
-      "snippet": "bibstring{${1:string key}}"
-    },
-    "bibstring[]{}": {
-      "snippet": "bibstring[${2:wrapper}]{${1:string key}}"
-    },
-    "biblstring{}": {
-      "snippet": "biblstring{${1:string key}}"
-    },
-    "biblstring[]{}": {
-      "snippet": "biblstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibsstring{}": {
-      "snippet": "bibsstring{${1:string key}}"
-    },
-    "bibsstring[]{}": {
-      "snippet": "bibsstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibcpstring{}": {
-      "snippet": "bibcpstring{${1:string key}}"
-    },
-    "bibcpstring[]{}": {
-      "snippet": "bibcpstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibcplstring{}": {
-      "snippet": "bibcplstring{${1:string key}}"
-    },
-    "bibcplstring[]{}": {
-      "snippet": "bibcplstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibcpsstring{}": {
-      "snippet": "bibcpsstring{${1:string key}}"
-    },
-    "bibcpsstring[]{}": {
-      "snippet": "bibcpsstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibucstring{}": {
-      "snippet": "bibucstring{${1:string key}}"
-    },
-    "bibucstring[]{}": {
-      "snippet": "bibucstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibuclstring{}": {
-      "snippet": "bibuclstring{${1:string key}}"
-    },
-    "bibuclstring[]{}": {
-      "snippet": "bibuclstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibucsstring{}": {
-      "snippet": "bibucsstring{${1:string key}}"
-    },
-    "bibucsstring[]{}": {
-      "snippet": "bibucsstring[${2:wrapper}]{${1:string key}}"
-    },
-    "biblcstring{}": {
-      "snippet": "biblcstring{${1:string key}}"
-    },
-    "biblcstring[]{}": {
-      "snippet": "biblcstring[${2:wrapper}]{${1:string key}}"
-    },
-    "biblclstring{}": {
-      "snippet": "biblclstring{${1:string key}}"
-    },
-    "biblclstring[]{}": {
-      "snippet": "biblclstring[${2:wrapper}]{${1:string key}}"
-    },
-    "biblcsstring{}": {
-      "snippet": "biblcsstring{${1:string key}}"
-    },
-    "biblcsstring[]{}": {
-      "snippet": "biblcsstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibxstring{}": {
-      "snippet": "bibxstring{${1:string key}}"
-    },
-    "bibxstring[]{}": {
-      "snippet": "bibxstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibxlstring{}": {
-      "snippet": "bibxlstring{${1:string key}}"
-    },
-    "bibxlstring[]{}": {
-      "snippet": "bibxlstring[${2:wrapper}]{${1:string key}}"
-    },
-    "bibxsstring{}": {
-      "snippet": "bibxsstring{${1:string key}}"
-    },
-    "bibxsstring[]{}": {
-      "snippet": "bibxsstring[${2:wrapper}]{${1:string key}}"
-    },
-    "mainlang": {},
-    "textmainlang{}": {
-      "snippet": "textmainlang{${1:text}}"
-    },
-    "texouterlang{}": {
-      "snippet": "texouterlang{${1:text}}"
-    },
-    "DeclareBibstringSet{}{}": {
-      "snippet": "DeclareBibstringSet{${1:name}}{${2:key1,${3:key2},...}}"
-    },
-    "UndeclareBibstringSet{}": {
-      "snippet": "UndeclareBibstringSet{${1:name}}"
-    },
-    "UndeclareBibstringSets": {},
-    "DeclareBibstringSetFormat{}{}": {
-      "snippet": "DeclareBibstringSetFormat{${1:name}}{${2:code}}"
-    },
-    "UneclareBibstringSetFormat{}": {
-      "snippet": "UneclareBibstringSetFormat{${1:name}}"
-    },
-    "DeclareLanguageMapping{}{}": {
-      "snippet": "DeclareLanguageMapping{${1:language}}{${2:file}}"
-    },
-    "DeclareLanguageMappingSuffix{}": {
-      "snippet": "DeclareLanguageMappingSuffix{${1:suffix}}"
-    },
-    "mkbibemph{}": {
-      "snippet": "mkbibemph{${1:text}}"
-    },
-    "mkbibitalic{}": {
-      "snippet": "mkbibitalic{${1:text}}"
-    },
-    "mkbibbold{}": {
-      "snippet": "mkbibbold{${1:text}}"
-    },
-    "mkbibquote{}": {
-      "snippet": "mkbibquote{${1:text}}"
-    },
-    "mkbibparens{}": {
-      "snippet": "mkbibparens{${1:text}}"
-    },
-    "mkbibbrackets{}": {
-      "snippet": "mkbibbrackets{${1:text}}"
-    },
-    "bibopenparen": {},
-    "bibcloseparen": {},
-    "bibopenbracket": {},
-    "bibclosebracket": {},
-    "mkbibfootnote{}": {
-      "snippet": "mkbibfootnote{${1:text}}"
-    },
-    "mkbibfootnotetext{}": {
-      "snippet": "mkbibfootnotetext{${1:text}}"
-    },
-    "mkbibendnote{}": {
-      "snippet": "mkbibendnote{${1:text}}"
-    },
-    "mkbibendnotetext{}": {
-      "snippet": "mkbibendnotetext{${1:text}}"
-    },
-    "bibfootnotewrapper{}": {
-      "snippet": "bibfootnotewrapper{${1:text}}"
-    },
-    "bibendnotewrapper{}": {
-      "snippet": "bibendnotewrapper{${1:text}}"
-    },
-    "mkbibsuperscript{}": {
-      "snippet": "mkbibsuperscript{${1:text}}"
-    },
-    "mkbibmonth{}": {
-      "snippet": "mkbibmonth{${1:integer}}"
-    },
-    "mkbibseason{}": {
-      "snippet": "mkbibseason{${1:string}}"
-    },
-    "mkyearzeros{}": {
-      "snippet": "mkyearzeros{${1:integer}}"
-    },
-    "mkmonthzeros{}": {
-      "snippet": "mkmonthzeros{${1:integer}}"
-    },
-    "mkdayzeros{}": {
-      "snippet": "mkdayzeros{${1:integer}}"
-    },
-    "mktimezeros{}": {
-      "snippet": "mktimezeros{${1:integer}}"
-    },
-    "forcezerosy{}": {
-      "snippet": "forcezerosy{${1:integer}}"
-    },
-    "forcezerosmdt{}": {
-      "snippet": "forcezerosmdt{${1:integer}}"
-    },
-    "stripzeros{}": {
-      "snippet": "stripzeros{${1:integer}}"
-    },
-    "labelnumberwidth": {},
-    "labelalphawidth": {},
-    "themaxextraalpha": {},
-    "themaxextradate": {},
-    "themaxextraname": {},
-    "themaxextratitle": {},
-    "themaxextratitleyear": {},
-    "themaxnames": {},
-    "theminnames": {},
-    "themaxitems": {},
-    "theminitems": {},
-    "theinstcount": {},
-    "thecitetotal": {},
-    "thecitecount": {},
-    "themulticitetotal": {},
-    "themulticitecount": {},
-    "thelisttotal": {},
-    "thelistcount": {},
-    "theliststart": {},
-    "theliststop": {},
-    "currentlang": {},
-    "currentfield": {},
-    "currentlist": {},
-    "currentname": {},
-    "AtBeginRefsection{}": {
-      "snippet": "AtBeginRefsection{${1:code}}"
-    },
-    "AtNextRefsection{}": {
-      "snippet": "AtNextRefsection{${1:code}}"
-    },
-    "AtFollowingRefsections{}": {
-      "snippet": "AtFollowingRefsections{${1:code}}"
-    },
-    "AtBeginBibliography{}": {
-      "snippet": "AtBeginBibliography{${1:code}}"
-    },
-    "AtBeginShorthands{}": {
-      "snippet": "AtBeginShorthands{${1:code}}"
-    },
-    "AtBeginBiblist{}{}": {
-      "snippet": "AtBeginBiblist{${1:biblistname}}{${2:code}}"
-    },
-    "AtEveryBibitem{}": {
-      "snippet": "AtEveryBibitem{${1:code}}"
-    },
-    "AtEveryLositem{}": {
-      "snippet": "AtEveryLositem{${1:code}}"
-    },
-    "AtEveryBiblistitem{}{}": {
-      "snippet": "AtEveryBiblistitem{${1:biblistname}}{${2:code}}"
-    },
-    "AtNextBibliography{}": {
-      "snippet": "AtNextBibliography{${1:code}}"
-    },
-    "AtUsedriver{}": {
-      "snippet": "AtUsedriver{${1:code}}"
-    },
-    "AtUsedriver*{}": {
-      "snippet": "AtUsedriver*{${1:code}}"
-    },
-    "AtEveryCite{}": {
-      "snippet": "AtEveryCite{${1:code}}"
-    },
-    "AtEveryCitekey{}": {
-      "snippet": "AtEveryCitekey{${1:code}}"
-    },
-    "AtEveryMultiCite{}": {
-      "snippet": "AtEveryMultiCite{${1:code}}"
-    },
-    "AtNextCite{}": {
-      "snippet": "AtNextCite{${1:code}}"
-    },
-    "AtEachCitekey{}": {
-      "snippet": "AtEachCitekey{${1:code}}"
-    },
-    "AtNextCitekey{}": {
-      "snippet": "AtNextCitekey{${1:code}}"
-    },
-    "AtNextMultiCite{}": {
-      "snippet": "AtNextMultiCite{${1:code}}"
-    },
-    "AtVolcite{}": {
-      "snippet": "AtVolcite{${1:code}}"
-    },
-    "AtVolcite*{}": {
-      "snippet": "AtVolcite*{${1:code}}"
-    },
-    "AtDataInput{}": {
-      "snippet": "AtDataInput{${1:code}}"
-    },
-    "AtDataInput[]{}": {
-      "snippet": "AtDataInput[${2:entrytype}]{${1:code}}"
-    },
-    "UseBibitemHook": {},
-    "UseUsedriverHook": {},
-    "UseEveryCiteHook": {},
-    "UseEveryCitekeyHook": {},
-    "UseEveryMultiCiteHook": {},
-    "UseNextCiteHook": {},
-    "UseNextCitekeyHook": {},
-    "UseNextMultiCiteHook": {},
-    "UseVolciteHook": {},
-    "DeferNextCitekeyHook": {},
-    "AtEveryEntrykey{}{}{}": {
-      "snippet": "AtEveryEntrykey{${1:code}}{${2:success}}{${3:failure}}"
-    },
-    "DeclareUniquenameTemplate{}": {
-      "snippet": "DeclareUniquenameTemplate{${1:specification}}"
-    },
-    "DeclareUniquenameTemplate[]{}": {
-      "snippet": "DeclareUniquenameTemplate[${2:name}]{${1:specification}}"
-    },
-    "DeclareNamehashTemplate{}": {
-      "snippet": "DeclareNamehashTemplate{${1:specification}}"
-    },
-    "DeclareNamehashTemplate[]{}": {
-      "snippet": "DeclareNamehashTemplate[${2:name}]{${1:specification}}"
-    },
-    "actualoperator": {},
-    "begrelateddelimmultivolume": {},
-    "BiblatexHungarianWarningOff": {},
-    "BiblatexLatvianWarningOff": {},
-    "BiblatexSplitbibDefernumbersWarningOff": {},
-    "biburlsetup": {},
-    "blxcitecmd{}{}{}{}{}": {
-      "snippet": "blxcitecmd{${1:name}}{${2:prenote}}{${3:postnote}}{${4:citekey}}{${5:punct}}"
-    },
-    "blxciteicmd{}{}{}{}{}": {
-      "snippet": "blxciteicmd{${1:name}}{${2:prenote}}{${3:postnote}}{${4:citekey}}{${5:punct}}"
-    },
-    "blxendmcites": {},
-    "blxmciteicmd{}{}{}{}{}{}": {
-      "snippet": "blxmciteicmd{${1:multicitecount}}{${2:<name>}}{${3:prenote}}{${4:postnote}}{${5:citekey}}{${6:punct}}"
-    },
-    "blxmcites{}{}{}": {
-      "snippet": "blxmcites{${1:multicitetotal}}{${2:multiprenote}}{${3:multipostnote}}"
-    },
-    "iffinalcitedelim{}{}": {
-      "snippet": "iffinalcitedelim{${1:true}}{${2:false}}"
-    },
-    "iftextcitepunct{}{}": {
-      "snippet": "iftextcitepunct{${1:true}}{${2:false}}"
-    },
-    "mkbibindexentry{}{}": {
-      "snippet": "mkbibindexentry{${1:entry}}{${2:text}}"
-    },
-    "mkbibindexfield{}{}": {
-      "snippet": "mkbibindexfield{${1:entry}}{${2:text}}"
-    },
-    "mkbibindexname{}{}{}{}": {
-      "snippet": "mkbibindexname{${1:family name}}{${2:given name}}{${3:prefix}}{${4:suffix}}"
-    },
-    "mkbibindexsubentry{}{}": {
-      "snippet": "mkbibindexsubentry{${1:csname1}}{${2:csname2}}"
-    },
-    "mkdaterangecomp{}": {
-      "snippet": "mkdaterangecomp{${1:datetype}}"
-    },
-    "mkdaterangecompextra{}": {
-      "snippet": "mkdaterangecompextra{${1:datetype}}"
-    },
-    "mkdaterangefull{}{}": {
-      "snippet": "mkdaterangefull{${1:short|long}}{${2:datetype}}"
-    },
-    "mkdaterangefullextra{}{}": {
-      "snippet": "mkdaterangefullextra{${1:short|long}}{${2:datetype}}"
-    },
-    "mkdaterangeiso{}": {
-      "snippet": "mkdaterangeiso{${1:datetype}}"
-    },
-    "mkdaterangeisoextra{}": {
-      "snippet": "mkdaterangeisoextra{${1:datetype}}"
-    },
-    "mkdaterangelong{}": {
-      "snippet": "mkdaterangelong{${1:datetype}}"
-    },
-    "mkdaterangelongextra{}": {
-      "snippet": "mkdaterangelongextra{${1:datetype}}"
-    },
-    "mkdaterangeshort{}": {
-      "snippet": "mkdaterangeshort{${1:datetype}}"
-    },
-    "mkdaterangeshortextra{}": {
-      "snippet": "mkdaterangeshortextra{${1:datetype}}"
-    },
-    "mkdaterangeterse{}": {
-      "snippet": "mkdaterangeterse{${1:datetype}}"
-    },
-    "mkdaterangeterseextra{}": {
-      "snippet": "mkdaterangeterseextra{${1:datetype}}"
-    },
-    "mkdaterangetrunc{}{}": {
-      "snippet": "mkdaterangetrunc{${1:short|long}}{${2:datetype}}"
-    },
-    "mkdaterangetruncextra{}{}": {
-      "snippet": "mkdaterangetruncextra{${1:short|long}}{${2:datetype}}"
-    },
-    "mkdaterangeyear{}": {
-      "snippet": "mkdaterangeyear{${1:datetype}}"
-    },
-    "mkdaterangeyearextra{}": {
-      "snippet": "mkdaterangeyearextra{${1:datetype}}"
-    },
-    "mkdaterangeymd{}": {
-      "snippet": "mkdaterangeymd{${1:datetype}}"
-    },
-    "mkdaterangeymdextra{}": {
-      "snippet": "mkdaterangeymdextra{${1:datetype}}"
-    },
-    "mkrelatedstringtext{}": {
-      "snippet": "mkrelatedstringtext{${1:text}}"
-    },
-    "mktimehh{}": {
-      "snippet": "mktimehh{${1:number}}"
-    },
-    "multivolcitecmd": {},
-    "shorthandwidth": {},
-    "shortjournalwidth": {},
-    "shortserieswidth": {},
-    "subentryoperator": {},
-    "thetextcitecount": {},
-    "thetextcitemaxnames": {},
-    "thetextcitetotal": {},
-    "volcitecmd": {},
-    "Fnotecite[]{}": {
-      "snippet": "Fnotecite[${2:postnote}]{${1:bibid}}"
-    },
-    "Fnotecite[][]{}": {
-      "snippet": "Fnotecite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Fnotecite{}": {
-      "snippet": "Fnotecite{${1:bibid}}"
-    },
-    "Footcite[]{}": {
-      "snippet": "Footcite[${2:postnote}]{${1:bibid}}"
-    },
-    "Footcite[][]{}": {
-      "snippet": "Footcite[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Footcite{}": {
-      "snippet": "Footcite{${1:bibid}}"
-    },
-    "Footcites()()[][]{}[][]{}": {
-      "snippet": "Footcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Footcites()()[]{}[]{}": {
-      "snippet": "Footcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Footcites()(){}{}": {
-      "snippet": "Footcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Footcites(){}{}": {
-      "snippet": "Footcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Footcites[][]{}[][]{}": {
-      "snippet": "Footcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Footcites[]{}[]{}": {
-      "snippet": "Footcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Footcites{}{}": {
-      "snippet": "Footcites{${1:bibid}}{${2:bibid}}"
-    },
-    "Footcitetext[]{}": {
-      "snippet": "Footcitetext[${2:postnote}]{${1:bibid}}"
-    },
-    "Footcitetext[][]{}": {
-      "snippet": "Footcitetext[${2:prenote}][${3:postnote}]{${1:bibid}}"
-    },
-    "Footcitetext{}": {
-      "snippet": "Footcitetext{${1:bibid}}"
-    },
-    "Footcitetexts(){}{}": {
-      "snippet": "Footcitetexts(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Footcitetexts()()[]{}[]{}": {
-      "snippet": "Footcitetexts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Footcitetexts()()[][]{}[][]{}": {
-      "snippet": "Footcitetexts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Footcitetexts()(){}{}": {
-      "snippet": "Footcitetexts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "Footcitetexts[]{}[]{}": {
-      "snippet": "Footcitetexts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
-    "Footcitetexts[][]{}[][]{}": {
-      "snippet": "Footcitetexts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "Footcitetexts{}{}": {
-      "snippet": "Footcitetexts{${1:bibid}}{${2:bibid}}"
-    },
-    "origbibsetup": {
-      "option": "style=abnt-numeric"
-    },
-    "FirstWordUpper{}": {
-      "snippet": "FirstWordUpper{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "FirstWordSC{}": {
-      "snippet": "FirstWordSC{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "FirstWordLCSC{}": {
-      "snippet": "FirstWordLCSC{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "traceparam{}": {
-      "snippet": "traceparam{${1:arg}}",
-      "option": "style=abnt-numeric"
-    },
-    "paramL": {
-      "option": "style=abnt-numeric"
-    },
-    "traceparamA": {
-      "option": "style=abnt-numeric"
-    },
-    "traceparamB": {
-      "option": "style=abnt-numeric"
-    },
-    "traceparamS": {
-      "option": "style=abnt-numeric"
-    },
-    "traceparamC{}": {
-      "snippet": "traceparamC{${1:arg}}",
-      "option": "style=abnt-numeric"
-    },
-    "traceparamD{}": {
-      "snippet": "traceparamD{${1:arg}}",
-      "option": "style=abnt-numeric"
-    },
-    "traceparamE": {
-      "option": "style=abnt-numeric"
-    },
-    "smartuppercase{}": {
-      "snippet": "smartuppercase{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "smartlowercase{}": {
-      "snippet": "smartlowercase{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "smartlcsc{}": {
-      "snippet": "smartlcsc{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "smartsc{}": {
-      "snippet": "smartsc{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "UpperOrSC{}": {
-      "snippet": "UpperOrSC{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "NormalOrSC{}": {
-      "snippet": "NormalOrSC{${1:text}}",
-      "option": "style=abnt-numeric"
-    },
-    "iffieldregex{}{}{}{}": {
-      "snippet": "iffieldregex{${1:field}}{${2:regex}}{${3:true}}{${4:false}}",
-      "option": "style=abnt-numeric"
-    },
-    "iffieldendswithpunct{}{}{}": {
-      "snippet": "iffieldendswithpunct{${1:field}}{${2:true}}{${3:false}}",
-      "option": "style=abnt-numeric"
-    },
-    "IfGivenIsInitial{}{}": {
-      "snippet": "IfGivenIsInitial{${1:arg1}}{${2:arg2}}",
-      "option": "style=abnt-numeric"
-    },
-    "multinamedelimorig": {
-      "option": "style=abnt-numeric"
-    },
-    "finalnamedelimorig": {
-      "option": "style=abnt-numeric"
-    },
-    "abntnum{}": {
-      "snippet": "abntnum{${1:number}}",
-      "option": "style=abnt-numeric"
-    },
-    "bibnameunderscore": {
-      "option": "style=abnt-numeric"
-    },
-    "nopunctdash": {
-      "option": "style=abnt-numeric"
-    },
-    "UpperOrSCCite{}": {
-      "snippet": "UpperOrSCCite{${1:text}}",
-      "option": "style=abnt-ibid"
-    },
-    "NormalOrSCCite{}": {
-      "snippet": "NormalOrSCCite{${1:text}}",
-      "option": "style=abnt-ibid"
-    },
-    "IfGivenIsInit{}{}": {
-      "snippet": "IfGivenIsInit{${1:arg1}}{${2:arg2}}",
-      "option": "style=abnt"
-    },
-    "origmkbibnamefamily": {
-      "option": "style=abnt-ibid"
-    },
-    "origmkbibnamegiven": {
-      "option": "style=abnt-ibid"
-    },
-    "origmkbibnameprefix": {
-      "option": "style=abnt-ibid"
-    },
-    "origmkbibnamesuffix": {
-      "option": "style=abnt-ibid"
-    },
-    "FirstWord{}": {
-      "snippet": "FirstWord{${1:text}}",
-      "option": "style=abnt"
-    },
-    "addapud": {
-      "option": "style=abnt-ibid"
-    },
-    "apud{}{}": {
-      "snippet": "apud{${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud(){}{}": {
-      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud()(){}{}": {
-      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud()()[]{}[]{}": {
-      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud[]{}[]{}": {
-      "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud[][]{}[][]{}": {
-      "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "apud()()[][]{}[][]{}": {
-      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=abnt-ibid"
-    },
-    "plaincite[][]{}": {
-      "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "plaincite[]{}": {
-      "snippet": "plaincite[${2:postnote}]{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "plaincite{}": {
-      "snippet": "plaincite{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "citelastname[][]{}": {
-      "snippet": "citelastname[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "citelastname[]{}": {
-      "snippet": "citelastname[${2:postnote}]{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "citelastname{}": {
-      "snippet": "citelastname{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "textapud{}{}": {
-      "snippet": "textapud{${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt"
-    },
-    "textapud{}[]{}": {
-      "snippet": "textapud{${1:bibid}}[${2:post}]{${3:bibid}}",
-      "option": "style=abnt"
-    },
-    "textapud[]{}{}": {
-      "snippet": "textapud[${3:post}]{${1:bibid}}{${2:bibid}}",
-      "option": "style=abnt"
-    },
-    "textapud[]{}[]{}": {
-      "snippet": "textapud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=abnt"
-    },
-    "textapud[][]{}[][]{}": {
-      "snippet": "textapud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=abnt"
-    },
-    "citeyearorsh*[][]{}": {
-      "snippet": "citeyearorsh*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "citeyearorsh*[]{}": {
-      "snippet": "citeyearorsh*[${2:postnote}]{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "citeyearorsh*{}": {
-      "snippet": "citeyearorsh*{${1:bibid}}",
-      "option": "style=abnt"
-    },
-    "IfInitial{}{}{}": {
-      "snippet": "IfInitial{${1:arg1}}{${2:arg2}}{${3:arg3}}",
-      "option": "style=abnt-ibid"
-    },
-    "mkidem{}": {
-      "snippet": "mkidem{${1:arg}}",
-      "option": "style=biblatex-juradiss"
-    },
-    "mkibid{}": {
-      "snippet": "mkibid{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkopcit{}": {
-      "snippet": "mkopcit{${1:arg}}",
-      "option": "style=abnt-ibid"
-    },
-    "mkloccit{}": {
-      "snippet": "mkloccit{${1:arg}}",
-      "option": "style=abnt-ibid"
-    },
-    "newcommaunit": {
-      "option": "style=trad-unsrt"
-    },
-    "newcommaunit*": {
-      "option": "style=trad-unsrt"
-    },
-    "newcommaunitStar": {
-      "option": "style=trad-unsrt"
-    },
-    "newcommaunitNoStar": {
-      "option": "style=trad-unsrt"
-    },
-    "volumenumberdelim": {
-      "option": "style=trad-unsrt"
-    },
-    "archDate": {
-      "option": "style=archaeologie"
-    },
-    "archVersion": {
-      "option": "style=archaeologie"
-    },
-    "archaeologieversion": {
-      "option": "style=archaeologie"
-    },
-    "archaeologiedate": {
-      "option": "style=archaeologie"
-    },
-    "labwidthsameline": {
-      "option": "style=arthistory-bonn"
-    },
-    "labwidthsamelineVALUE": {
-      "option": "style=archaeologie"
-    },
-    "archaeologieoptions": {
-      "option": "style=archaeologie"
-    },
-    "seperator": {
-      "option": "style=archaeologie"
-    },
-    "maintitlepunct": {
-      "option": "style=archaeologie"
-    },
-    "locationdelim": {
-      "option": "style=archaeologie"
-    },
-    "relateddelimmultivolume": {
-      "option": "style=archaeologie"
-    },
-    "volnumdelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "yearnumdelim": {
-      "option": "style=archaeologie"
-    },
-    "jourvoldelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "bibdatesubseqesep": {
-      "option": "style=archaeologie"
-    },
-    "bibdaterangesepx{}": {
-      "snippet": "bibdaterangesepx{${1:arg}}",
-      "option": "style=archaeologie"
-    },
-    "labelyeardelim": {
-      "option": "style=archaeologie"
-    },
-    "citeauthorformatVALUE": {
-      "option": "style=archaeologie"
-    },
-    "citetranslator[][]{}": {
-      "snippet": "citetranslator[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=archaeologie"
-    },
-    "citetranslator[]{}": {
-      "snippet": "citetranslator[${2:postnote}]{${1:bibid}}",
-      "option": "style=archaeologie"
-    },
-    "citetranslator{}": {
-      "snippet": "citetranslator{${1:bibid}}",
-      "option": "style=archaeologie"
-    },
-    "citetranslator*[][]{}": {
-      "snippet": "citetranslator*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=archaeologie"
-    },
-    "citetranslator*[]{}": {
-      "snippet": "citetranslator*[${2:postnote}]{${1:bibid}}",
-      "option": "style=archaeologie"
-    },
-    "citetranslator*{}": {
-      "snippet": "citetranslator*{${1:bibid}}",
-      "option": "style=archaeologie"
-    },
-    "archaeobibstyletitle": {
-      "option": "style=zaes"
-    },
-    "archaeocitestyletitle": {
-      "option": "style=zaes"
-    },
-    "ifuselabeltitle{}{}": {
-      "snippet": "ifuselabeltitle{${1:true}}{${2:false}}",
-      "option": "style=ufg-muenster-verbose"
-    },
-    "foreverunspace": {
-      "option": "style=apa"
-    },
-    "printtexte{}": {
-      "snippet": "printtexte{${1:text}}",
-      "option": "style=apa"
-    },
-    "printtexte[]{}": {
-      "snippet": "printtexte[${2:format}]{${1:text}}",
-      "option": "style=apa"
-    },
-    "maxprtauth": {
-      "option": "style=apa6"
-    },
-    "apanum{}": {
-      "snippet": "apanum{${1:arg}}",
-      "option": "style=apa6"
-    },
-    "mkdaterangeapalong{}": {
-      "snippet": "mkdaterangeapalong{${1:arg}}",
-      "option": "style=apa6"
-    },
-    "mkdaterangeapalongextra{}": {
-      "snippet": "mkdaterangeapalongextra{${1:arg}}",
-      "option": "style=apa6"
-    },
-    "begrelateddelimcommenton": {
-      "option": "style=apa"
-    },
-    "begrelateddelimreviewof": {
-      "option": "style=apa6"
-    },
-    "begrelateddelimreprintfrom": {
-      "option": "style=apa"
-    },
-    "urldatecomma": {
-      "option": "style=apa"
-    },
-    "apashortdash": {
-      "option": "style=apa6"
-    },
-    "citeresetapa": {
-      "option": "style=apa6"
-    },
-    "fullcitebib[][]{}": {
-      "snippet": "fullcitebib[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=apa6"
-    },
-    "fullcitebib[]{}": {
-      "snippet": "fullcitebib[${2:postnote}]{${1:bibid}}",
-      "option": "style=apa6"
-    },
-    "fullcitebib{}": {
-      "snippet": "fullcitebib{${1:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcite[][]{}": {
-      "snippet": "nptextcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcite[]{}": {
-      "snippet": "nptextcite[${2:postnote}]{${1:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcite{}": {
-      "snippet": "nptextcite{${1:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites{}{}": {
-      "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites[]{}[]{}": {
-      "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites[][]{}[][]{}": {
-      "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=apa6"
-    },
-    "arthistoryversion": {
-      "option": "style=arthistory-bonn"
-    },
-    "arthistorydate": {
-      "option": "style=arthistory-bonn"
-    },
-    "titleaddondelim": {
-      "option": "style=arthistory-bonn"
-    },
-    "volissuedelim": {
-      "option": "style=arthistory-bonn"
-    },
-    "exhibbibdaterangesep": {
-      "option": "style=arthistory-bonn"
-    },
-    "Version": {
-      "option": "style=oxnum"
-    },
-    "dononameyeardelim": {
-      "option": "style=bath"
-    },
-    "mknoyeardaterangefull{}{}": {
-      "snippet": "mknoyeardaterangefull{${1:arg1}}{${2:arg2}}",
-      "option": "style=oxyear"
-    },
-    "mknoyeardaterangetrunc{}{}": {
-      "snippet": "mknoyeardaterangetrunc{${1:arg1}}{${2:arg2}}",
-      "option": "style=oxyear"
-    },
-    "ifrelatedloop{}{}": {
-      "snippet": "ifrelatedloop{${1:true}}{${2:false}}",
-      "option": "style=bath"
-    },
-    "mkbibnocomma{}": {
-      "snippet": "mkbibnocomma{${1:arg}}",
-      "option": "style=chem-angew"
-    },
-    "mkbibsuperbracket{}": {
-      "snippet": "mkbibsuperbracket{${1:text}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "mkgroupeddigits{}": {
-      "snippet": "mkgroupeddigits{${1:arg}}",
-      "option": "style=chem-rsc"
-    },
-    "AddBiblatexClavis{}": {
-      "snippet": "AddBiblatexClavis{${1:abbrev}}",
-      "option": "bibstyle=claves"
-    },
-    "multiclavesseparator": {
-      "option": "bibstyle=claves"
-    },
-    "clavisseparator": {
-      "option": "bibstyle=claves"
-    },
-    "clavisformat{}": {
-      "snippet": "clavisformat{${1:text}}",
-      "option": "bibstyle=claves"
-    },
-    "citeallclaves": {
-      "option": "bibstyle=claves"
-    },
-    "clavesadddashinset": {
-      "option": "bibstyle=claves"
-    },
-    "shorthandsep": {
-      "option": "style=biblatex-juradiss"
-    },
-    "jourvolstring": {
-      "option": "style=biblatex-juradiss"
-    },
-    "jourvolnumsep": {
-      "option": "style=biblatex-juradiss"
-    },
-    "journumstring": {
-      "option": "style=biblatex-juradiss"
-    },
-    "seriespunct": {
-      "option": "style=biblatex-juradiss"
-    },
-    "sernumstring": {
-      "option": "style=biblatex-juradiss"
-    },
-    "shorthandpunct": {
-      "option": "style=biblatex-juradiss"
-    },
-    "shorthandinbibpunct": {
-      "option": "style=biblatex-juradiss"
-    },
-    "titleaddonpunct": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "locationdatepunct": {
-      "option": "style=biblatex-juradiss"
-    },
-    "locationpublisherpunct": {
-      "option": "style=biblatex-juradiss"
-    },
-    "publisherdatepunct": {
-      "option": "style=biblatex-juradiss"
-    },
-    "origfieldspunct": {
-      "option": "style=biblatex-juradiss"
-    },
-    "bibleftpseudo": {
-      "option": "style=biblatex-juradiss"
-    },
-    "bibrightpseudo": {
-      "option": "style=biblatex-juradiss"
-    },
-    "bibrevsdnamedelim": {
-      "option": "style=biblatex-juradiss"
-    },
-    "bibmultinamedelim": {
-      "option": "style=biblatex-juradiss"
-    },
-    "bibfinalnamedelim": {
-      "option": "style=biblatex-juradiss"
-    },
-    "annotationfont": {
-      "option": "style=philosophy-verbose"
-    },
-    "libraryfont": {
-      "option": "style=philosophy-verbose"
-    },
-    "citenamepunct": {
-      "option": "style=footnote-dw"
-    },
-    "citerevsdnamedelim": {
-      "option": "style=footnote-dw"
-    },
-    "citemultinamedelim": {
-      "option": "style=footnote-dw"
-    },
-    "citefinalnamedelim": {
-      "option": "style=footnote-dw"
-    },
-    "textcitesdelim": {
-      "option": "style=footnote-dw"
-    },
-    "titleyeardelim": {
-      "option": "style=authortitle-dw"
-    },
-    "mkfootnotecite{}": {
-      "snippet": "mkfootnotecite{${1:arg}}",
-      "option": "style=footnote-dw"
-    },
-    "mkparencite{}": {
-      "snippet": "mkparencite{${1:arg}}",
-      "option": "style=footnote-dw"
-    },
-    "footnotecheck": {
-      "option": "style=footnote-dw"
-    },
-    "thebibitem": {
-      "option": "style=enc"
-    },
-    "thelositem": {
-      "option": "style=enc"
-    },
-    "mkoutercitedelims{}": {
-      "snippet": "mkoutercitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkinnercitedelims{}": {
-      "snippet": "mkinnercitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkouterparencitedelims{}": {
-      "snippet": "mkouterparencitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkinnerparencitedelims{}": {
-      "snippet": "mkinnerparencitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkoutertextcitedelims{}": {
-      "snippet": "mkoutertextcitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkinnertextcitedelims{}": {
-      "snippet": "mkinnertextcitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkouterfootcitedelims{}": {
-      "snippet": "mkouterfootcitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkinnerfootcitedelims{}": {
-      "snippet": "mkinnerfootcitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkoutersupercitedelims{}": {
-      "snippet": "mkoutersupercitedelims{${1:arg}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "namenumberdelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "nonamenumberdelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "innametitledelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "extradateonlycompcitedelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "extradateonlycompciterangedelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "extranameonlycompcitedelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "extranameonlycompciterangedelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "DeclareOuterCiteDelims{}{}{}": {
-      "snippet": "DeclareOuterCiteDelims{${1:cite cmd}}{${2:open delim}}{${3:close delim}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "DeclareInnerCiteDelims{}{}{}": {
-      "snippet": "DeclareInnerCiteDelims{${1:cite cmd}}{${2:open delim}}{${3:close delim}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "UndeclareOuterCiteDelims{}": {
-      "snippet": "UndeclareOuterCiteDelims{${1:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "UndeclareInnerCiteDelims{}": {
-      "snippet": "UndeclareInnerCiteDelims{${1:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "UndeclareCiteDelims{}": {
-      "snippet": "UndeclareCiteDelims{${1:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "DeclareOuterCiteDelimsAlias{}{}": {
-      "snippet": "DeclareOuterCiteDelimsAlias{${1:cite alias}}{${2:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "DeclareOuterCiteDelimsAlias*{}{}": {
-      "snippet": "DeclareOuterCiteDelimsAlias*{${1:cite alias}}{${2:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "DeclareInnerCiteDelimsAlias{}{}": {
-      "snippet": "DeclareInnerCiteDelimsAlias{${1:cite alias}}{${2:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "DeclareInnerCiteDelimsAlias*{}{}": {
-      "snippet": "DeclareInnerCiteDelimsAlias*{${1:cite alias}}{${2:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "RegisterCiteDelims{}{}": {
-      "snippet": "RegisterCiteDelims{${1:modifier}}{${2:cite cmd}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkextblxsupercite{}": {
-      "snippet": "mkextblxsupercite{${1:text}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkextblxfootcite{}": {
-      "snippet": "mkextblxfootcite{${1:text}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkextblxfootcitetext{}": {
-      "snippet": "mkextblxfootcitetext{${1:text}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "mksmartcite{}": {
-      "snippet": "mksmartcite{${1:text}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "introcitepunct": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "introcitebreak": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "introcitewidth": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "introcitesep": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "AtIntrocite{}": {
-      "snippet": "AtIntrocite{${1:code}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "AtIntrocite*{}": {
-      "snippet": "AtIntrocite*{${1:code}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "AtXrefcite{}": {
-      "snippet": "AtXrefcite{${1:code}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "AtXrefcite*{}": {
-      "snippet": "AtXrefcite*{${1:code}}",
-      "option": "style=socialscienceshuberlin"
-    },
-    "titlemaintitledelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "maintitletitledelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "voltitledelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "jourserdelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "servoldelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "volnumdatedelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "sernumdelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "locdatedelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "locpubdelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "publocdelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "pubdatedelim": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "filmruntime": {
-      "option": "style=fiwi2"
-    },
-    "nopublisher": {
-      "option": "style=oscola"
-    },
-    "noseries": {
-      "option": "style=fiwi2"
-    },
-    "nociteprefix": {
-      "option": "style=fiwi2"
-    },
-    "ignoreaddendumtrue": {
-      "option": "style=fiwi2"
-    },
-    "ignoreaddendumfalse": {
-      "option": "style=fiwi2"
-    },
-    "ignoreforewordtrue": {
-      "option": "style=fiwi2"
-    },
-    "ignoreforewordfalse": {
-      "option": "style=fiwi2"
-    },
-    "ignoreafterwordtrue": {
-      "option": "style=fiwi2"
-    },
-    "ignoreafterwordfalse": {
-      "option": "style=fiwi2"
-    },
-    "ignoreintroductiontrue": {
-      "option": "style=fiwi2"
-    },
-    "ignoreintroductionfalse": {
-      "option": "style=fiwi2"
-    },
-    "ignorepublisherfalse": {
-      "option": "style=fiwi2"
-    },
-    "ignorepublishertrue": {
-      "option": "style=fiwi2"
-    },
-    "ignoreaddresstrue": {
-      "option": "style=fiwi2"
-    },
-    "ignoreaddressfalse": {
-      "option": "style=fiwi2"
-    },
-    "ignorelocationtrue": {
-      "option": "style=fiwi2"
-    },
-    "ignorelocationfalse": {
-      "option": "style=fiwi2"
-    },
-    "ifpseudo{}{}": {
-      "snippet": "ifpseudo{${1:true}}{${2:false}}",
-      "option": "style=fiwi2"
-    },
-    "mkfinalnamedelimfirst{}": {
-      "snippet": "mkfinalnamedelimfirst{${1:text}}",
-      "option": "style=fiwi2"
-    },
-    "film{}": {
-      "snippet": "film{${1:text}}",
-      "option": "style=fiwi2"
-    },
-    "fullcitefilm": {
-      "option": "style=fiwi2"
-    },
-    "completecitefilm": {
-      "option": "style=fiwi2"
-    },
-    "sortentry{}": {
-      "snippet": "sortentry{${1:arg}}",
-      "option": "style=fiwi2"
-    },
-    "xindy": {
-      "option": "style=fiwi2"
-    },
-    "citets{}{}": {
-      "snippet": "citets{${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets(){}{}": {
-      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets()(){}{}": {
-      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets()()[]{}[]{}": {
-      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets[]{}[]{}": {
-      "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets[][]{}[][]{}": {
-      "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "citets()()[][]{}[][]{}": {
-      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-author-year"
-    },
-    "Citets{}{}": {
-      "snippet": "Citets{${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets(){}{}": {
-      "snippet": "Citets(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets()(){}{}": {
-      "snippet": "Citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets()()[]{}[]{}": {
-      "snippet": "Citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets[]{}[]{}": {
-      "snippet": "Citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets[][]{}[][]{}": {
-      "snippet": "Citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citets()()[][]{}[][]{}": {
-      "snippet": "Citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts{}{}": {
-      "snippet": "citealts{${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts(){}{}": {
-      "snippet": "citealts(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts()(){}{}": {
-      "snippet": "citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts()()[]{}[]{}": {
-      "snippet": "citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts[]{}[]{}": {
-      "snippet": "citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts[][]{}[][]{}": {
-      "snippet": "citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealts()()[][]{}[][]{}": {
-      "snippet": "citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts{}{}": {
-      "snippet": "Citealts{${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts(){}{}": {
-      "snippet": "Citealts(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts()(){}{}": {
-      "snippet": "Citealts(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts()()[]{}[]{}": {
-      "snippet": "Citealts(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts[]{}[]{}": {
-      "snippet": "Citealts[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts[][]{}[][]{}": {
-      "snippet": "Citealts[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "Citealts()()[][]{}[][]{}": {
-      "snippet": "Citealts(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "mkbibindextruename{}{}{}{}": {
-      "snippet": "mkbibindextruename{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}",
-      "option": "style=fiwi2"
-    },
-    "inparencite{}": {
-      "snippet": "inparencite{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "inparencite[]{}": {
-      "snippet": "inparencite[${2:postnote}]{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "inparencite[][]{}": {
-      "snippet": "inparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealtnoibidem{}": {
-      "snippet": "citealtnoibidem{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealtnoibidem[]{}": {
-      "snippet": "citealtnoibidem[${2:postnote}]{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citealtnoibidem[][]{}": {
-      "snippet": "citealtnoibidem[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citetnoibidem{}": {
-      "snippet": "citetnoibidem{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citetnoibidem[]{}": {
-      "snippet": "citetnoibidem[${2:postnote}]{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citetnoibidem[][]{}": {
-      "snippet": "citetnoibidem[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citeepisode{}": {
-      "snippet": "citeepisode{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citefilm{}": {
-      "snippet": "citefilm{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citecfilm{}": {
-      "snippet": "citecfilm{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citefullfilm{}": {
-      "snippet": "citefullfilm{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "citefilmnoindex{}": {
-      "snippet": "citefilmnoindex{${1:bibid}}",
-      "option": "style=fiwi2"
-    },
-    "versionofgbtstyle": {
-      "option": "style=thuthesis-numeric"
-    },
-    "versionofbiblatex": {
-      "option": "style=thuthesis-numeric"
-    },
-    "defversion{}{}{}": {
-      "snippet": "defversion{${1:arg1}}{${2:arg2}}{${3:arg3}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "switchversion{}{}": {
-      "snippet": "switchversion{${1:arg1}}{${2:arg2}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "testCJKfirst{}": {
-      "snippet": "testCJKfirst{${1:field}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "multivolparser{}": {
-      "snippet": "multivolparser{${1:arg}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "multinumberparser{}": {
-      "snippet": "multinumberparser{${1:arg}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "BracketLift": {
-      "option": "style=chinese-erj"
-    },
-    "gbleftparen": {
-      "option": "style=chinese-erj"
-    },
-    "gbrightparen": {
-      "option": "style=chinese-erj"
-    },
-    "gbleftbracket": {
-      "option": "style=chinese-erj"
-    },
-    "gbrightbracket": {
-      "option": "style=chinese-erj"
-    },
-    "execgbfootbibfmt": {
-      "option": "style=chinese-erj"
-    },
-    "SlashFont": {
-      "option": "style=chinese-erj"
-    },
-    "footbibmargin": {
-      "option": "style=thuthesis-numeric"
-    },
-    "footbiblabelsep": {
-      "option": "style=thuthesis-numeric"
-    },
-    "execgbfootbib": {
-      "option": "style=thuthesis-numeric"
-    },
-    "thegbnamefmtcase": {
-      "option": "style=thuthesis-numeric"
-    },
-    "mkgbnumlabel{}": {
-      "snippet": "mkgbnumlabel{${1:arg}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "thegbalignlabel": {
-      "option": "style=thuthesis-numeric"
-    },
-    "thegbcitelocalcase": {
-      "option": "style=thuthesis-numeric"
-    },
-    "thegbbiblocalcase": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lancnorder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lanjporder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lankrorder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lanenorder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lanfrorder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lanruorder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "execlanodeah": {
-      "option": "style=thuthesis-numeric"
-    },
-    "thelanordernum": {
-      "option": "style=thuthesis-numeric"
-    },
-    "execlanodudf{}": {
-      "snippet": "execlanodudf{${1:string}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "setlocalbibstring{}{}": {
-      "snippet": "setlocalbibstring{${1:string}}{${2:text}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "setlocalbiblstring{}{}": {
-      "snippet": "setlocalbiblstring{${1:string}}{${2:text}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "dealsortlan": {
-      "option": "style=thuthesis-numeric"
-    },
-    "bibitemindent": {
-      "option": "style=thuthesis-numeric"
-    },
-    "biblabelextend": {
-      "option": "style=thuthesis-numeric"
-    },
-    "setaligngbstyle": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lengthid": {
-      "option": "style=thuthesis-numeric"
-    },
-    "lengthlw": {
-      "option": "style=thuthesis-numeric"
-    },
-    "itemcmd": {
-      "option": "style=thuthesis-numeric"
-    },
-    "setaligngbstyleay": {
-      "option": "style=thuthesis-numeric"
-    },
-    "publocpunct": {
-      "option": "style=thuthesis-numeric"
-    },
-    "bibtitlefont": {
-      "option": "style=thuthesis-numeric"
-    },
-    "bibauthorfont": {
-      "option": "style=thuthesis-numeric"
-    },
-    "bibpubfont": {
-      "option": "style=thuthesis-numeric"
-    },
-    "execgbfdfmtstd": {
-      "option": "style=thuthesis-numeric"
-    },
-    "aftertransdelim": {
-      "option": "style=thuthesis-numeric"
-    },
-    "gbcaselocalset": {
-      "option": "style=thuthesis-numeric"
-    },
-    "gbpinyinlocalset": {
-      "option": "style=thuthesis-numeric"
-    },
-    "gbquanpinlocalset": {
-      "option": "style=thuthesis-numeric"
-    },
-    "defdoublelangentry{}{}": {
-      "snippet": "defdoublelangentry{${1:entrykey1}}{${2:entrykey2}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "addEntryField{}{}{}": {
-      "snippet": "addEntryField{${1:entrykeys}}{${2:field}}{${3:fieldvalue}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "entrykeya": {
-      "option": "style=thuthesis-numeric"
-    },
-    "entrykeyb": {
-      "option": "style=thuthesis-numeric"
-    },
-    "userfieldabcde": {
-      "option": "style=thuthesis-numeric"
-    },
-    "mkbibleftborder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "mkbibrightborder": {
-      "option": "style=thuthesis-numeric"
-    },
-    "mkbibsuperscriptusp{}": {
-      "snippet": "mkbibsuperscriptusp{${1:text}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "upcite{}": {
-      "snippet": "upcite{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "upcite[]{}": {
-      "snippet": "upcite[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "upcite[][]{}": {
-      "snippet": "upcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "pagescite{}": {
-      "snippet": "pagescite{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "pagescite[]{}": {
-      "snippet": "pagescite[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "pagescite[][]{}": {
-      "snippet": "pagescite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "yearpagescite{}": {
-      "snippet": "yearpagescite{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "yearpagescite[]{}": {
-      "snippet": "yearpagescite[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "yearpagescite[][]{}": {
-      "snippet": "yearpagescite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "yearcite{}": {
-      "snippet": "yearcite{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "yearcite[]{}": {
-      "snippet": "yearcite[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "yearcite[][]{}": {
-      "snippet": "yearcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcite{}": {
-      "snippet": "authornumcite{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcite[]{}": {
-      "snippet": "authornumcite[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcite[][]{}": {
-      "snippet": "authornumcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citetns{}": {
-      "snippet": "citetns{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citetns[]{}": {
-      "snippet": "citetns[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citetns[][]{}": {
-      "snippet": "citetns[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citepns{}": {
-      "snippet": "citepns{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citepns[]{}": {
-      "snippet": "citepns[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citepns[][]{}": {
-      "snippet": "citepns[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "inlinecite{}": {
-      "snippet": "inlinecite{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "inlinecite[]{}": {
-      "snippet": "inlinecite[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "inlinecite[][]{}": {
-      "snippet": "inlinecite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citec{}": {
-      "snippet": "citec{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citec[]{}": {
-      "snippet": "citec[${2:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citec[][]{}": {
-      "snippet": "citec[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs{}{}": {
-      "snippet": "citecs{${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs[]{}[]{}": {
-      "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs[][]{}[][]{}": {
-      "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites{}{}": {
-      "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites[]{}[]{}": {
-      "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites[][]{}[][]{}": {
-      "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=thuthesis-numeric"
-    },
-    "dealnoathor": {
-      "option": "style=thuthesis-author-year"
-    },
-    "therefnumeric": {
-      "option": "style=thuthesis-author-year"
-    },
-    "biblabelbox": {
-      "option": "style=gb7714-2015ay"
-    },
-    "setaligngbnumeric": {
-      "option": "style=thuthesis-author-year"
-    },
-    "pubdatadelim": {
-      "option": "style=thuthesis-numeric"
-    },
-    "locnopubdelim": {
-      "option": "style=chinese-erj"
-    },
-    "compextradelim": {
-      "option": "style=thuthesis-author-year"
-    },
-    "localsetchinesecode": {
-      "option": "style=gb7714-2015ms"
-    },
-    "setaystylesection{}": {
-      "snippet": "setaystylesection{${1:number}}",
-      "option": "style=gb7714-2015mx"
-    },
-    "gbpunctdot": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctdotlanen": {
-      "option": "style=gb7714-CCNU"
-    },
-    "gbpunctmark": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctcomma": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctcommalanen": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctcolon": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctcolonlanen": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctsemicolon": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctsemicolonlanen": {
-      "option": "style=gb7714-CCNU"
-    },
-    "gbpunctparenl": {
-      "option": "style=gb7714-CCNU"
-    },
-    "gbpunctparenr": {
-      "option": "style=gb7714-CCNU"
-    },
-    "execpuncten": {
-      "option": "style=gb7714-CCNU"
-    },
-    "nwafubibfont": {
-      "option": "style=gb7714-NWAFU"
-    },
-    "gbpunctttl": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctttr": {
-      "option": "style=chinese-erj"
-    },
-    "execerjpuncten": {
-      "option": "style=chinese-erj"
-    },
-    "thenumberwithoutzero": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctmarkcite": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctsemicoloncite": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctparenlcite": {
-      "option": "style=chinese-erj"
-    },
-    "gbpunctparenrcite": {
-      "option": "style=chinese-erj"
-    },
-    "exegbpunctencite": {
-      "option": "style=chinese-erj"
-    },
-    "commentator{}": {
-      "snippet": "commentator{${1:bibid}}",
-      "option": "style=german-legal-book"
-    },
-    "mkpagegrouped{}": {
-      "snippet": "mkpagegrouped{${1:text}}",
-      "option": "style=ieee-alphabetic"
-    },
-    "mkonepagegrouped{}": {
-      "snippet": "mkonepagegrouped{${1:text}}",
-      "option": "style=ieee-alphabetic"
-    },
-    "stdidentifierspunct": {
-      "option": "style=iso-numeric"
-    },
-    "dateaddonpunct": {
-      "option": "style=iso-numeric"
-    },
-    "numerationpunct": {
-      "option": "style=iso-numeric"
-    },
-    "addspacecolon": {
-      "option": "style=iso-numeric"
-    },
-    "familynameformat{}": {
-      "snippet": "familynameformat{${1:text}}",
-      "option": "style=iso-numeric"
-    },
-    "mainlangbibstring{}": {
-      "snippet": "mainlangbibstring{${1:string}}",
-      "option": "style=iso-numeric"
-    },
-    "mainlangbibstring[]{}": {
-      "snippet": "mainlangbibstring[${2:wrapper}]{${1:string}}",
-      "option": "style=iso-numeric"
-    },
-    "mainlangbiblstring{}": {
-      "snippet": "mainlangbiblstring{${1:string}}",
-      "option": "style=iso-numeric"
-    },
-    "mainlangbiblstring[]{}": {
-      "snippet": "mainlangbiblstring[${2:wrapper}]{${1:string}}",
-      "option": "style=iso-numeric"
-    },
-    "mainlangbibsstring{}": {
-      "snippet": "mainlangbibsstring{${1:string}}",
-      "option": "style=iso-numeric"
-    },
-    "mainlangbibsstring[]{}": {
-      "snippet": "mainlangbibsstring[${2:wrapper}]{${1:string}}",
-      "option": "style=iso-numeric"
-    },
-    "mkmlpagetotal{}": {
-      "snippet": "mkmlpagetotal{${1:text}}",
-      "option": "style=iso-numeric"
-    },
-    "mkmlpagetotal[]{}": {
-      "snippet": "mkmlpagetotal[${2:pagination}]{${1:text}}",
-      "option": "style=iso-numeric"
-    },
-    "mkmlpageprefix{}": {
-      "snippet": "mkmlpageprefix{${1:prefix}}",
-      "option": "style=iso-numeric"
-    },
-    "mkmlpageprefix[]{}": {
-      "snippet": "mkmlpageprefix[${2:pagination}]{${1:prefix}}",
-      "option": "style=iso-numeric"
-    },
-    "addspcolon": {
-      "option": "style=iso-numeric"
-    },
-    "mkopenendeddaterange": {
-      "option": "style=iso-numeric"
-    },
-    "ifdatehasyearonly{}{}": {
-      "snippet": "ifdatehasyearonly{${1:true}}{${2:false}}",
-      "option": "style=iso-authoryear"
-    },
-    "qverweis{}": {
-      "snippet": "qverweis{${1:label}}",
-      "option": "style=biblatex-juradiss"
-    },
-    "oldpostnotedelim": {
-      "option": "style=jura2"
-    },
-    "mkpostnote{}": {
-      "snippet": "mkpostnote{${1:arg}}",
-      "option": "style=jura2"
-    },
-    "LNIversion": {
-      "option": "style=LNI"
-    },
-    "LNIdate": {
-      "option": "style=LNI"
-    },
-    "aftertitledelim": {
-      "option": "style=LNI"
-    },
-    "shcite{}": {
-      "snippet": "shcite{${1:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "shcite[]{}": {
-      "snippet": "shcite[${2:postnote}]{${1:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "shcite[][]{}": {
-      "snippet": "shcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscite{}": {
-      "snippet": "detailscite{${1:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscite[]{}": {
-      "snippet": "detailscite[${2:postnote}]{${1:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscite[][]{}": {
-      "snippet": "detailscite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites{}{}": {
-      "snippet": "detailscites{${1:bibid}}{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites(){}{}": {
-      "snippet": "detailscites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites()(){}{}": {
-      "snippet": "detailscites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites()()[]{}[]{}": {
-      "snippet": "detailscites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites[]{}[]{}": {
-      "snippet": "detailscites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites[][]{}[][]{}": {
-      "snippet": "detailscites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "detailscites()()[][]{}[][]{}": {
-      "snippet": "detailscites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "collectionshelfmarkpunct": {
-      "option": "style=oxnum"
-    },
-    "datingpagespunct": {
-      "option": "style=oxnum"
-    },
-    "librarycollectionpunct": {
-      "option": "style=oxnum"
-    },
-    "mkcolumns{}": {
-      "snippet": "mkcolumns{${1:text}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "mklayer{}": {
-      "snippet": "mklayer{${1:text}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "mkcolumnslayer{}": {
-      "snippet": "mkcolumnslayer{${1:text}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "mklocation{}": {
-      "snippet": "mklocation{${1:text}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "mkmanuscriptdescriptionlabel{}": {
-      "snippet": "mkmanuscriptdescriptionlabel{${1:text}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "mkmanuscriptdescriptionlabelparagraphed{}": {
-      "snippet": "mkmanuscriptdescriptionlabelparagraphed{${1:text}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "mkshcite{}": {
-      "snippet": "mkshcite{${1:text}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "locationlibrarypunct": {
-      "option": "style=oxnum"
-    },
-    "manuscriptdescriptionlabelpunct": {
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "moreinterpunct": {
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "pagetotalpagespunct": {
-      "option": "style=oxnum"
-    },
-    "columnslayerpunct": {
-      "option": "style=oxnum"
-    },
-    "multidetailscitedelim": {
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "recto": {
-      "option": "style=oxnum"
-    },
-    "verso": {
-      "option": "style=oxnum"
-    },
-    "manuscriptaddshortened{}": {
-      "snippet": "manuscriptaddshortened{${1:arg}}",
-      "option": "bibstyle=manuscripts-noautoshorthand"
-    },
-    "openrangeformat{}": {
-      "snippet": "openrangeformat{${1:arg}}",
-      "option": "style=mla-new"
-    },
-    "openrangemark": {
-      "option": "style=mla-new"
-    },
-    "mlanamedash": {
-      "option": "style=mla-new"
-    },
-    "splitfootnoterule": {
-      "option": "style=mla-new"
-    },
-    "pagefootnoterule": {
-      "option": "style=mla-new"
-    },
-    "mlasymbolfootnote": {
-      "option": "style=mla-new"
-    },
-    "themladraftnote": {
-      "option": "style=mla-new"
-    },
-    "headlesscite[][]{}": {
-      "snippet": "headlesscite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "headlesscite[]{}": {
-      "snippet": "headlesscite[${2:postnote}]{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "headlesscite{}": {
-      "snippet": "headlesscite{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "headlessfullcite[][]{}": {
-      "snippet": "headlessfullcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "headlessfullcite[]{}": {
-      "snippet": "headlessfullcite[${2:postnote}]{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "headlessfullcite{}": {
-      "snippet": "headlessfullcite{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "titleandsubtitle[][]{}": {
-      "snippet": "titleandsubtitle[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "titleandsubtitle[]{}": {
-      "snippet": "titleandsubtitle[${2:postnote}]{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "titleandsubtitle{}": {
-      "snippet": "titleandsubtitle{${1:bibid}}",
-      "option": "style=mla-new"
-    },
-    "biblatexnejmversionbbx": {
-      "option": "style=nejm"
-    },
-    "biblatexnejmpackagenamebbx": {
-      "option": "style=nejm"
-    },
-    "biblatexnejmsvnbbx": {
-      "option": "style=nejm"
-    },
-    "oldbibnamedelima": {
-      "option": "style=oscola"
-    },
-    "oldbibnamedelimb": {
-      "option": "style=oscola"
-    },
-    "oldbibnamedelimc": {
-      "option": "style=oscola"
-    },
-    "oldbibnamedelimd": {
-      "option": "style=oscola"
-    },
-    "oldbibnamedelimi": {
-      "option": "style=oscola"
-    },
-    "bbxinitsep": {
-      "option": "style=oscola"
-    },
-    "bibyearwatershed": {
-      "option": "style=oscola"
-    },
-    "nameaddonpseud": {
-      "option": "style=oscola"
-    },
-    "subtypemag": {
-      "option": "style=oscola"
-    },
-    "subtypenewsp": {
-      "option": "style=oxnum"
-    },
-    "subtypeclassic": {
-      "option": "style=oscola"
-    },
-    "subtypebiblical": {
-      "option": "style=oscola"
-    },
-    "subtypeearlybook": {
-      "option": "style=oscola"
-    },
-    "subtypevideo": {
-      "option": "style=oscola"
-    },
-    "entrytypearchive": {
-      "option": "style=oscola"
-    },
-    "subtypevolume": {
-      "option": "style=oscola"
-    },
-    "subtypeonline": {
-      "option": "style=oscola"
-    },
-    "subtypedatabase": {
-      "option": "style=oscola"
-    },
-    "subtypeblog": {
-      "option": "style=oscola"
-    },
-    "subtypelistmessage": {
-      "option": "style=oscola"
-    },
-    "subtypebooklike": {
-      "option": "style=oscola"
-    },
-    "subtypepublicdocument": {
-      "option": "style=oscola"
-    },
-    "authortypeanon": {
-      "option": "style=oscola"
-    },
-    "authortypeunsure": {
-      "option": "style=oscola"
-    },
-    "authortyperedundant": {
-      "option": "style=oscola"
-    },
-    "authortypealternate": {
-      "option": "style=oscola"
-    },
-    "authortypejournal": {
-      "option": "style=oscola"
-    },
-    "subtypeintro": {
-      "option": "style=oscola"
-    },
-    "subtypeexcerpt": {
-      "option": "style=oscola"
-    },
-    "subtypenone": {
-      "option": "style=oscola"
-    },
-    "edtypecorp": {
-      "option": "style=oscola"
-    },
-    "entrytypeper": {
-      "option": "style=oscola"
-    },
-    "entrytypemanual": {
-      "option": "style=oscola"
-    },
-    "entrytypecoll": {
-      "option": "style=oscola"
-    },
-    "entrytypebook": {
-      "option": "style=oscola"
-    },
-    "subtypeprimarylegislation": {
-      "option": "style=oxnum"
-    },
-    "subtypesecondarylegislation": {
-      "option": "style=oscola"
-    },
-    "subtypecourtrules": {
-      "option": "style=oxnum"
-    },
-    "entrytyperef": {
-      "option": "style=oscola"
-    },
-    "entrytypeproc": {
-      "option": "style=oscola"
-    },
-    "entrytypereport": {
-      "option": "style=oscola"
-    },
-    "entrytypebooklet": {
-      "option": "style=oscola"
-    },
-    "entrytypemisc": {
-      "option": "style=oscola"
-    },
-    "entrytypeonline": {
-      "option": "style=oscola"
-    },
-    "entrytypevideo": {
-      "option": "style=oscola"
-    },
-    "entrytypeaudio": {
-      "option": "style=oscola"
-    },
-    "entrytypebookinbook": {
-      "option": "style=oscola"
-    },
-    "entrytypearticle": {
-      "option": "style=oscola"
-    },
-    "entrytypelegislation": {
-      "option": "style=oscola"
-    },
-    "entrytypeletter": {
-      "option": "style=oscola"
-    },
-    "entrytypeperformance": {
-      "option": "style=oscola"
-    },
-    "optionaddoriginal": {
-      "option": "style=oscola"
-    },
-    "optionnoreprints": {
-      "option": "style=oscola"
-    },
-    "optionorigfirst": {
-      "option": "style=oscola"
-    },
-    "optiontransfromorig": {
-      "option": "style=oscola"
-    },
-    "optionorigtransas": {
-      "option": "style=oscola"
-    },
-    "optiondoubledate": {
-      "option": "style=oscola"
-    },
-    "noplace": {
-      "option": "style=oscola"
-    },
-    "officialjournaltitle": {
-      "option": "style=oxnum"
-    },
-    "ojspecedtitle": {
-      "option": "style=oxnum"
-    },
-    "ecrreporttitle": {
-      "option": "style=oxnum"
-    },
-    "commission": {
-      "option": "style=oxnum"
-    },
-    "Commission": {
-      "option": "style=oxnum"
-    },
-    "pcijrep": {
-      "option": "style=oscola"
-    },
-    "explanatorynote": {
-      "option": "style=oxnum"
-    },
-    "eudirective": {
-      "option": "style=oscola"
-    },
-    "euregulation": {
-      "option": "style=oscola"
-    },
-    "eudecision": {
-      "option": "style=oscola"
-    },
-    "treatysubtype": {
-      "option": "style=oxnum"
-    },
-    "comdocsubtype": {
-      "option": "style=oscola"
-    },
-    "jurisechr": {
-      "option": "style=oscola"
-    },
-    "eutreaty": {
-      "option": "style=oscola"
-    },
-    "casenote": {
-      "option": "style=oxnum"
-    },
-    "pagemarkings": {
-      "option": "style=oscola"
-    },
-    "paragraphmarkings": {
-      "option": "style=oxnum"
-    },
-    "paragraphtext": {
-      "option": "style=oscola"
-    },
-    "seriesa": {
-      "option": "style=oxnum"
-    },
-    "echrreports": {
-      "option": "style=oxnum"
-    },
-    "decisionsandreports": {
-      "option": "style=oxnum"
-    },
-    "collectionofdecisions": {
-      "option": "style=oxnum"
-    },
-    "parliamentarytype": {
-      "option": "style=oxnum"
-    },
-    "houseofcommons": {
-      "option": "style=oscola"
-    },
-    "houseoflords": {
-      "option": "style=oscola"
-    },
-    "undoctype": {
-      "option": "style=oscola"
-    },
-    "extracitedelim": {
-      "option": "style=oscola"
-    },
-    "casenotetext": {
-      "option": "style=oxnum"
-    },
-    "firstpublishedstr": {
-      "option": "style=oscola"
-    },
-    "legalstarturl": {
-      "option": "style=oscola"
-    },
-    "legalendurl": {
-      "option": "style=oscola"
-    },
-    "paratextformatted{}": {
-      "snippet": "paratextformatted{${1:text}}",
-      "option": "style=oscola"
-    },
-    "csusebibmacro{}": {
-      "snippet": "csusebibmacro{${1:name}}",
-      "option": "style=oscola"
-    },
-    "forbbxrange": {
-      "option": "style=oscola"
-    },
-    "rangesplit{}": {
-      "snippet": "rangesplit{${1:arg}}",
-      "option": "style=oscola"
-    },
-    "formatpostnote{}": {
-      "snippet": "formatpostnote{${1:text}}",
-      "option": "style=oscola"
-    },
-    "ifnumeralfirst{}{}{}": {
-      "snippet": "ifnumeralfirst{${1:arg1}}{${2:arg2}}{${3:arg3}}",
-      "option": "style=oscola"
-    },
-    "ifnumeralsfirst{}{}{}": {
-      "snippet": "ifnumeralsfirst{${1:arg1}}{${2:arg2}}{${3:arg3}}",
-      "option": "style=oscola"
-    },
-    "numeraljustfirst{}{}{}": {
-      "snippet": "numeraljustfirst{${1:arg1}}{${2:arg2}}{${3:arg3}}",
-      "option": "style=oscola"
-    },
-    "siganddate{}": {
-      "snippet": "siganddate{${1:arg}}",
-      "option": "style=oxnum"
-    },
-    "treatypartysep": {
-      "option": "style=oxnum"
-    },
-    "SetStandardIndices": {
-      "option": "style=oscola"
-    },
-    "DeclareIndexAssociation{}{}": {
-      "snippet": "DeclareIndexAssociation{${1:category}}{${2:index}}",
-      "option": "style=oscola"
-    },
-    "ShowIndexAssociation{}": {
-      "snippet": "ShowIndexAssociation{${1:category}}",
-      "option": "style=oscola"
-    },
-    "legislationindex": {
-      "option": "style=oscola"
-    },
-    "iflistcontains{}{}{}{}": {
-      "snippet": "iflistcontains{${1:arg1}}{${2:arg2}}{${3:true}}{${4:false}}",
-      "option": "style=oscola"
-    },
-    "printindexearly": {
-      "option": "style=oscola"
-    },
-    "printindexearly[]": {
-      "snippet": "printindexearly[${1:name}]",
-      "option": "style=oscola"
-    },
-    "DNI": {
-      "option": "style=oscola"
-    },
-    "reponly[][]{}": {
-      "snippet": "reponly[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "reponly[]{}": {
-      "snippet": "reponly[${2:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "reponly{}": {
-      "snippet": "reponly{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "footciteref[][]{}": {
-      "snippet": "footciteref[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "footciteref[]{}": {
-      "snippet": "footciteref[${2:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "footciteref{}": {
-      "snippet": "footciteref{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "dopipedlist": {
-      "option": "style=oscola"
-    },
-    "setuppostnotes": {
-      "option": "style=sbl"
-    },
-    "postnotefirst": {
-      "option": "style=sbl"
-    },
-    "postnotesecond": {
-      "option": "style=oscola"
-    },
-    "citeinindex[][]{}": {
-      "snippet": "citeinindex[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "citeinindex[]{}": {
-      "snippet": "citeinindex[${2:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "citeinindex{}": {
-      "snippet": "citeinindex{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "citeinindexnum[][]{}": {
-      "snippet": "citeinindexnum[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "citeinindexnum[]{}": {
-      "snippet": "citeinindexnum[${2:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "citeinindexnum{}": {
-      "snippet": "citeinindexnum{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "indexonly[][]{}": {
-      "snippet": "indexonly[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "indexonly[]{}": {
-      "snippet": "indexonly[${2:postnote}]{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "indexonly{}": {
-      "snippet": "indexonly{${1:bibid}}",
-      "option": "style=oscola"
-    },
-    "cacasetitlepunct": {
-      "option": "style=oxnum"
-    },
-    "DeclareAbbrEndChars{}": {
-      "snippet": "DeclareAbbrEndChars{${1:characters}}",
-      "option": "style=oxnum"
-    },
-    "ifabbrev{}{}{}": {
-      "snippet": "ifabbrev{${1:field}}{${2:true}}{${3:false}}",
-      "option": "style=oxnum"
-    },
-    "iflistcontains{}{}": {
-      "snippet": "iflistcontains{${1:list}}{${2:string}}",
-      "option": "style=oxnum"
-    },
-    "legreport": {
-      "option": "style=oxnum"
-    },
-    "mkbibnametitle{}": {
-      "snippet": "mkbibnametitle{${1:text}}",
-      "option": "style=oxnum"
-    },
-    "mkrawpageprefix": {
-      "option": "style=oxnum"
-    },
-    "mkrawpageprefix[]": {
-      "snippet": "mkrawpageprefix[${1:type}]",
-      "option": "style=oxnum"
-    },
-    "mkusbibordinal{}": {
-      "snippet": "mkusbibordinal{${1:number}}",
-      "option": "style=oxnum"
-    },
-    "oxrefand": {
-      "option": "style=oxnum"
-    },
-    "oxrefanon": {
-      "option": "style=oxnum"
-    },
-    "recordseriespunct": {
-      "option": "style=oxnum"
-    },
-    "thelocpubpairs": {
-      "option": "style=oxnum"
-    },
-    "thenamepairs": {
-      "option": "style=oxnum"
-    },
-    "titlebyauthordelim": {
-      "option": "style=oxnum"
-    },
-    "uscasetitlepunct": {
-      "option": "style=oxnum"
-    },
-    "iflabeldateisanydate{}{}": {
-      "snippet": "iflabeldateisanydate{${1:true}}{${2:false}}",
-      "option": "style=oxyear"
-    },
-    "iflabeldateispubstate{}{}": {
-      "snippet": "iflabeldateispubstate{${1:true}}{${2:false}}",
-      "option": "style=oxyear"
-    },
-    "sdcite{}": {
-      "snippet": "sdcite{${1:bibid}}",
-      "option": "style=philosophy-modern"
-    },
-    "footcitet{}": {
-      "snippet": "footcitet{${1:bibid}}",
-      "option": "style=philosophy-modern"
-    },
-    "volnumpunct": {
-      "option": "style=philosophy-verbose"
-    },
-    "editorstrgdelim": {
-      "option": "style=philosophy-verbose"
-    },
-    "ccite{}": {
-      "snippet": "ccite{${1:bibid}}",
-      "option": "style=philosophy-verbose"
-    },
-    "ExecutePublistOptions{}": {
-      "snippet": "ExecutePublistOptions{${1:options}}",
-      "option": "style=publist"
-    },
-    "setplnum{}": {
-      "snippet": "setplnum{${1:integer}}",
-      "option": "style=publist"
-    },
-    "plauthorname{}": {
-      "snippet": "plauthorname{${1:surname}}",
-      "option": "bibstyle=publist"
-    },
-    "plauthorname[]{}": {
-      "snippet": "plauthorname[${2:first name}]{${1:surname}}",
-      "option": "bibstyle=publist"
-    },
-    "plauthorname[][]{}": {
-      "snippet": "plauthorname[${2:first name}][${3:von part}]{${1:surname}}",
-      "option": "bibstyle=publist"
-    },
-    "plnameomission": {
-      "option": "bibstyle=publist"
-    },
-    "plmarginyear{}": {
-      "snippet": "plmarginyear{${1:text}}",
-      "option": "bibstyle=publist"
-    },
-    "plyearhl{}": {
-      "snippet": "plyearhl{${1:text}}",
-      "option": "style=publist"
-    },
-    "plauthorhl{}": {
-      "snippet": "plauthorhl{${1:text}}",
-      "option": "bibstyle=publist"
-    },
-    "bplopenoa": {
-      "option": "style=publist"
-    },
-    "bplcloseoa": {
-      "option": "style=publist"
-    },
-    "plextrainfosep": {
-      "option": "style=publist"
-    },
-    "extralabelnumberwidth": {
-      "option": "bibstyle=publist"
-    },
-    "shiftplnum{}": {
-      "snippet": "shiftplnum{${1:integer}}",
-      "option": "style=publist"
-    },
-    "publistbasestyle": {
-      "option": "bibstyle=publist"
-    },
-    "plisbnlink{}": {
-      "snippet": "plisbnlink{${1:ISBN}}",
-      "option": "bibstyle=publist"
-    },
-    "plissnlink{}": {
-      "snippet": "plissnlink{${1:ISSN}}",
-      "option": "bibstyle=publist"
-    },
-    "mkbibdesc{}": {
-      "snippet": "mkbibdesc{${1:number}}",
-      "option": "bibstyle=publist"
-    },
-    "mkbibsecstart{}": {
-      "snippet": "mkbibsecstart{${1:number}}",
-      "option": "bibstyle=publist"
-    },
-    "thenonplauthors": {
-      "option": "bibstyle=publist"
-    },
-    "thenonpleditors": {
-      "option": "bibstyle=publist"
-    },
-    "theplauthor": {
-      "option": "bibstyle=publist"
-    },
-    "thepleditor": {
-      "option": "bibstyle=publist"
-    },
-    "theplauthors": {
-      "option": "bibstyle=publist"
-    },
-    "thepleditors": {
-      "option": "bibstyle=publist"
-    },
-    "therealliststop": {
-      "option": "bibstyle=publist"
-    },
-    "thenonplauthor": {
-      "option": "bibstyle=publist"
-    },
-    "thenonpleditor": {
-      "option": "bibstyle=publist"
-    },
-    "ExecuteDepPublistOptions{}": {
-      "snippet": "ExecuteDepPublistOptions{${1:arg}}",
-      "option": "bibstyle=publist"
-    },
-    "thebplitems": {
-      "option": "bibstyle=publist"
-    },
-    "thebplsecitems": {
-      "option": "bibstyle=publist"
-    },
-    "thebplbgitems": {
-      "option": "bibstyle=publist"
-    },
-    "theplnumgroup": {
-      "option": "bibstyle=publist"
-    },
-    "resetplnumgroup": {
-      "option": "bibstyle=publist"
-    },
-    "GetTotalCount": {
-      "option": "bibstyle=publist"
-    },
-    "GetSectionCount": {
-      "option": "bibstyle=publist"
-    },
-    "GetSectionCount[]": {
-      "snippet": "GetSectionCount[${1:section number}]",
-      "option": "bibstyle=publist"
-    },
-    "citeitem[][]{}": {
-      "snippet": "citeitem[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citeitem[]{}": {
-      "snippet": "citeitem[${2:postnote}]{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citeitem{}": {
-      "snippet": "citeitem{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitem[][]{}": {
-      "snippet": "citesecitem[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitem[]{}": {
-      "snippet": "citesecitem[${2:postnote}]{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitem{}": {
-      "snippet": "citesecitem{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitem*{}": {
-      "snippet": "citesecitem*{${1:bibid}}",
-      "option": "style=publist"
-    },
-    "citeitemrange{}{}": {
-      "snippet": "citeitemrange{${1:bibid}}{${2:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitemrange{}{}": {
-      "snippet": "citesecitemrange{${1:bibid}}{${2:bibid}}",
-      "option": "style=publist"
-    },
-    "citesecitemrange*{}{}": {
-      "snippet": "citesecitemrange*{${1:bibid}}{${2:bibid}}",
-      "option": "style=publist"
-    },
-    "itemrangesep": {
-      "option": "style=publist"
-    },
-    "shiftciteitem{}": {
-      "snippet": "shiftciteitem{${1:integer}}",
-      "option": "style=publist"
-    },
-    "mkrefdesc{}": {
-      "snippet": "mkrefdesc{${1:number}}",
-      "option": "style=publist"
-    },
-    "secitemsecref": {
-      "option": "style=publist"
-    },
-    "theprevcrefsection": {
-      "option": "style=publist"
-    },
-    "shiftbplnum{}": {
-      "snippet": "shiftbplnum{${1:integer}}",
-      "option": "bibstyle=publist"
-    },
-    "printprinfo{}": {
-      "snippet": "printprinfo{${1:string}}",
-      "option": "bibstyle=publist"
-    },
-    "mkbibrealauthor{}": {
-      "snippet": "mkbibrealauthor{${1:arg}}",
-      "option": "bibstyle=realauthor"
-    },
-    "mkrealauthor{}": {
-      "snippet": "mkrealauthor{${1:arg}}",
-      "option": "bibstyle=realauthor"
-    },
-    "realauthorequalsign": {
-      "option": "bibstyle=realauthor"
-    },
-    "mkbibrealeditor{}": {
-      "snippet": "mkbibrealeditor{${1:arg}}",
-      "option": "bibstyle=realauthor"
-    },
-    "mkrealeditor{}": {
-      "snippet": "mkrealeditor{${1:arg}}",
-      "option": "bibstyle=realauthor"
-    },
-    "realeditorequalsign": {
-      "option": "bibstyle=realauthor"
-    },
-    "printsblversion": {
-      "option": "style=sbl"
-    },
-    "printsbldate": {
-      "option": "style=sbl"
-    },
-    "xprintsbldateiso": {
-      "option": "style=sbl"
-    },
-    "xprintsbldateau": {
-      "option": "style=sbl"
-    },
-    "ifciteidemsbl{}{}": {
-      "snippet": "ifciteidemsbl{${1:true}}{${2:false}}",
-      "option": "style=sbl"
-    },
-    "namedashpunct": {
-      "option": "style=sbl"
-    },
-    "lexiconfinalnamedelim": {
-      "option": "style=sbl"
-    },
-    "volpostnotedelim": {
-      "option": "style=sbl"
-    },
-    "addskipentry{}": {
-      "snippet": "addskipentry{${1:arg}}",
-      "option": "style=sbl"
-    },
-    "addincludeentry{}": {
-      "snippet": "addincludeentry{${1:arg}}",
-      "option": "style=sbl"
-    },
-    "abbrevwidth": {
-      "option": "style=sbl"
-    },
-    "setmaxlength{}{}": {
-      "snippet": "setmaxlength{${1:length1}}{${2:length2}}",
-      "option": "style=sbl"
-    },
-    "iffirstcharsec{}{}{}": {
-      "snippet": "iffirstcharsec{${1:arg}}{${2:true}}{${3:false}}",
-      "option": "style=sbl"
-    },
-    "iffirstcharnum{}{}{}": {
-      "snippet": "iffirstcharnum{${1:arg}}{${2:true}}{${3:false}}",
-      "option": "style=sbl"
-    },
-    "thecurrentpublisher": {
-      "option": "style=sbl"
-    },
-    "thecurrentlocation": {
-      "option": "style=sbl"
-    },
-    "thecurrentorganization": {
-      "option": "style=sbl"
-    },
-    "thecurrentinstitution": {
-      "option": "style=sbl"
-    },
-    "thepublishertotal": {
-      "option": "style=sbl"
-    },
-    "thelocationtotal": {
-      "option": "style=sbl"
-    },
-    "theorganizationtotal": {
-      "option": "style=sbl"
-    },
-    "theinstitutiontotal": {
-      "option": "style=sbl"
-    },
-    "savepostnotes": {
-      "option": "style=sbl"
-    },
-    "postnotelast": {
-      "option": "style=sbl"
-    },
-    "splitpostnote": {
-      "option": "style=sbl"
-    },
-    "volsplitpostnote{}{}": {
-      "snippet": "volsplitpostnote{${1:arg1}}{${2:arg2}}",
-      "option": "style=sbl"
-    },
-    "volvol": {
-      "option": "style=sbl"
-    },
-    "citefullauthor*{}": {
-      "snippet": "citefullauthor*{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citefullauthor*[]{}": {
-      "snippet": "citefullauthor*[${2:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citefullauthor*[][]{}": {
-      "snippet": "citefullauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "Citefullauthor*{}": {
-      "snippet": "Citefullauthor*{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "Citefullauthor*[]{}": {
-      "snippet": "Citefullauthor*[${2:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "Citefullauthor*[][]{}": {
-      "snippet": "Citefullauthor*[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citejournal{}": {
-      "snippet": "citejournal{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citeseries{}": {
-      "snippet": "citeseries{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "citeshorthand{}": {
-      "snippet": "citeshorthand{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "bibentrycite{}": {
-      "snippet": "bibentrycite{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "biblistcite{}": {
-      "snippet": "biblistcite{${1:bibid}}",
-      "option": "style=sbl"
-    },
-    "DeclareNestableCiteCommand{}{}": {
-      "snippet": "DeclareNestableCiteCommand{${1:cmd}}{${2:def}}",
-      "option": "style=sbl"
-    },
-    "socialscienceshuberlinversion": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "socialscienceshuberlindate": {
-      "option": "style=socialscienceshuberlin"
-    },
-    "mkbibdateunified{}{}{}": {
-      "snippet": "mkbibdateunified{${1:arg1}}{${2:arg2}}{${3:arg3}}",
-      "option": "style=univie-ling"
-    },
-    "iflinkparens{}{}": {
-      "snippet": "iflinkparens{${1:true}}{${2:false}}",
-      "option": "style=unified"
-    },
-    "pgcitep{}{}": {
-      "snippet": "pgcitep{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "pgcitealt{}{}": {
-      "snippet": "pgcitealt{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "pgcitet{}{}": {
-      "snippet": "pgcitet{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "pgposscitet{}{}": {
-      "snippet": "pgposscitet{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "seccitealt{}{}": {
-      "snippet": "seccitealt{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "seccitep{}{}": {
-      "snippet": "seccitep{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "seccitet{}{}": {
-      "snippet": "seccitet{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "secposscitet{}{}": {
-      "snippet": "secposscitet{${1:bibid}}{${2:text}}",
-      "option": "style=unified"
-    },
-    "posscitet{}": {
-      "snippet": "posscitet{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "posscitet[]{}": {
-      "snippet": "posscitet[${2:postnote}]{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "posscitet[][]{}": {
-      "snippet": "posscitet[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "posscitealt{}": {
-      "snippet": "posscitealt{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "posscitealt[]{}": {
-      "snippet": "posscitealt[${2:postnote}]{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "posscitealt[][]{}": {
-      "snippet": "posscitealt[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "possciteauthor{}": {
-      "snippet": "possciteauthor{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "possciteauthor[]{}": {
-      "snippet": "possciteauthor[${2:postnote}]{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "possciteauthor[][]{}": {
-      "snippet": "possciteauthor[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=unified"
-    },
-    "idemcite{}": {
-      "snippet": "idemcite{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcite[]{}": {
-      "snippet": "idemcite[${2:postnote}]{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcite[][]{}": {
-      "snippet": "idemcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites{}{}": {
-      "snippet": "idemcites{${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites(){}{}": {
-      "snippet": "idemcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites()(){}{}": {
-      "snippet": "idemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites()()[]{}[]{}": {
-      "snippet": "idemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites[]{}[]{}": {
-      "snippet": "idemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites[][]{}[][]{}": {
-      "snippet": "idemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "idemcites()()[][]{}[][]{}": {
-      "snippet": "idemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcite{}": {
-      "snippet": "footidemcite{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcite[]{}": {
-      "snippet": "footidemcite[${2:postnote}]{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcite[][]{}": {
-      "snippet": "footidemcite[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites{}{}": {
-      "snippet": "footidemcites{${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites(){}{}": {
-      "snippet": "footidemcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites()(){}{}": {
-      "snippet": "footidemcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites()()[]{}[]{}": {
-      "snippet": "footidemcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites[]{}[]{}": {
-      "snippet": "footidemcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites[][]{}[][]{}": {
-      "snippet": "footidemcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "footidemcites()()[][]{}[][]{}": {
-      "snippet": "footidemcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauth{}": {
-      "snippet": "parenauth{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauth[]{}": {
-      "snippet": "parenauth[${2:postnote}]{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauth[][]{}": {
-      "snippet": "parenauth[${2:prenote}][${3:postnote}]{${1:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths{}{}": {
-      "snippet": "parenauths{${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths(){}{}": {
-      "snippet": "parenauths(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths()(){}{}": {
-      "snippet": "parenauths(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths()()[]{}[]{}": {
-      "snippet": "parenauths(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths[]{}[]{}": {
-      "snippet": "parenauths[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths[][]{}[][]{}": {
-      "snippet": "parenauths[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "parenauths()()[][]{}[][]{}": {
-      "snippet": "parenauths(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=windycity"
-    },
-    "mkmonthrange{}{}": {
-      "snippet": "mkmonthrange{${1:arg1}}{${2:arg2}}",
-      "option": "style=windycity"
-    },
-    "mkmonthdayrange{}{}": {
-      "snippet": "mkmonthdayrange{${1:arg1}}{${2:arg2}}",
-      "option": "style=windycity"
-    },
-    "mkmonthdayyearrange{}{}": {
-      "snippet": "mkmonthdayyearrange{${1:arg1}}{${2:arg2}}",
-      "option": "style=windycity"
-    },
-    "anona": {
-      "option": "style=windycity"
-    },
-    "anonb": {
-      "option": "style=windycity"
-    },
-    "crossreflist": {
-      "option": "style=windycity"
-    },
-    "pluga": {
-      "option": "style=windycity"
-    },
-    "plugb": {
-      "option": "style=windycity"
-    },
-    "xtitle": {
-      "option": "style=windycity"
-    },
-    "xeditor": {
-      "option": "style=windycity"
-    },
-    "yeditor": {
-      "option": "style=windycity"
-    },
-    "edtypes": {
-      "option": "style=windycity"
-    },
-    "transtypes": {
-      "option": "style=windycity"
-    },
-    "AtBeginLists": {
-      "option": "style=windycity"
-    },
-    "AtEveryItem": {
-      "option": "style=windycity"
-    },
-    "authtypes": {
-      "option": "style=windycity"
-    },
-    "iffieldstart{}{}{}{}": {
-      "snippet": "iffieldstart{${1:field}}{${2:sym}}{${3:true}}{${4:false}}",
-      "option": "style=windycity"
-    }
-  },
-  "envs": {
-    "refsection": {},
-    "refsection[]": {
-      "name": "refsection",
-      "snippet": "[${1:bib files}]"
-    },
-    "refsegment": {},
-    "refcontext{}": {
-      "name": "refcontext",
-      "snippet": "{${1:name}}"
-    },
-    "refcontext[]{}": {
-      "name": "refcontext",
-      "snippet": "[${2:options}]{${1:name}}",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "fullexpotherlanguage{}": {
-      "name": "fullexpotherlanguage",
-      "snippet": "{${1:language}}",
-      "option": "style=archaeologie"
-    },
-    "theshorthands": {
-      "option": "style=enc"
-    },
-    "plnumgroup": {
-      "option": "style=publist"
-    }
-  },
-  "options": [
-    "backend=",
-    "style=",
-    "bibstyle=",
-    "citestyle=",
-    "natbib",
-    "mcite",
-    "casechanger=",
-    "datamodel=${1:model}",
-    "sorting=",
-    "sortcase",
-    "sortupper",
-    "sortlocale=",
-    "sortcites",
-    "sortsets",
-    "pluralothers",
-    "maxnames=${1:integer}",
-    "minnames=${1:integer}",
-    "maxbibnames=${1:integer}",
-    "minbibnames=${1:integer}",
-    "maxcitenames=${1:integer}",
-    "mincitenames=${1:integer}",
-    "maxsortnames=${1:integer}",
-    "minsortnames=${1:integer}",
-    "maxitems=${1:integer}",
-    "minitems=${1:integer}",
-    "autocite=",
-    "autopunct",
-    "language=",
-    "clearlang",
-    "autolang=",
-    "langhook=",
-    "block=",
-    "locallabelwidth",
-    "notetype=",
-    "hyperref=",
-    "backref",
-    "backrefstyle=",
-    "backrefsetstyle=",
-    "backreffloats",
-    "indexing=",
-    "loadfiles",
-    "refsection=",
-    "refsegment=",
-    "citereset=",
-    "abbreviate",
-    "date=",
-    "labeldate=",
-    "eventdate=",
-    "origdate=",
-    "urldate=",
-    "alldates=",
-    "julian",
-    "gregorianstart=${1:YYYY-MM-DD}",
-    "datezeros",
-    "timezeros",
-    "timezones",
-    "seconds",
-    "dateabbrev",
-    "datecirca",
-    "dateuncertain",
-    "dateera=",
-    "dateeraauto=${1:integer}",
-    "time=",
-    "labeltime=",
-    "eventtime=",
-    "origtime=",
-    "urltime=",
-    "alltimes=",
-    "dateusetime",
-    "labeldateusetime",
-    "eventdateusetime",
-    "origdateusetime",
-    "urldateusetime",
-    "alldatesusetime",
-    "defernumbers",
-    "punctfont",
-    "arxiv=",
-    "texencoding=",
-    "bibencoding=",
-    "safeinputenc",
-    "bibwarn",
-    "mincrossrefs=${1:integer}",
-    "minxrefs=${1:integer}",
-    "bibtexcaseprotection",
-    "isbn",
-    "url",
-    "doi",
-    "eprint",
-    "related",
-    "subentry",
-    "subentrycomp",
-    "dashed",
-    "mergedate=",
-    "ibidpage",
-    "citepages=",
-    "strict",
-    "pagetracker=",
-    "citecounter=",
-    "citetracker=",
-    "ibidtracker=",
-    "opcittracker=",
-    "loccittracker=",
-    "idemtracker=",
-    "trackfloats",
-    "parentracker",
-    "maxparens=${1:integer}",
-    "giveninits",
-    "terseinits",
-    "labelalpha",
-    "maxalphanames=${1:integer}",
-    "minalphanames=${1:integer}",
-    "labelnumber",
-    "noroman",
-    "labeltitle",
-    "labeltitleyear",
-    "labeldateparts",
-    "singletitle",
-    "uniquetitle",
-    "uniquebaretitle",
-    "uniquework",
-    "uniqueprimaryauthor",
-    "uniquename=",
-    "uniquelist=",
-    "nohashothers",
-    "nosortothers",
-    "useauthor",
-    "useeditor",
-    "usetranslator",
-    "useprefix",
-    "indexing=",
-    "skipbib",
-    "skipbiblist",
-    "skiplab",
-    "dataonly",
-    "ittitles",
-    "scbib",
-    "nosl",
-    "nosn",
-    "noslsn",
-    "repeattitles",
-    "repeatfirstfields",
-    "repeatfields",
-    "usedashes",
-    "indent",
-    "extradate",
-    "extrayear",
-    "justify",
-    "pretty",
-    "citecount",
-    "sccite",
-    "ittitles",
-    "scbib",
-    "nosl",
-    "nosn",
-    "noslsn",
-    "repeattitles",
-    "repeatfirstfields",
-    "repeatfields",
-    "usedashes",
-    "indent",
-    "extradate",
-    "extrayear",
-    "justify",
-    "pretty",
-    "citecount",
-    "sccite",
-    "ittitles",
-    "scbib",
-    "nosl",
-    "nosn",
-    "noslsn",
-    "repeattitles",
-    "repeatfirstfields",
-    "repeatfields",
-    "usedashes",
-    "indent",
-    "extradate",
-    "extrayear",
-    "justify",
-    "pretty",
-    "citecount",
-    "comp",
-    "halid",
-    "swhid",
-    "shortswhid",
-    "swlabels",
-    "vcs",
-    "license",
-    "halid",
-    "swhid",
-    "shortswhid",
-    "swlabels",
-    "vcs",
-    "license",
-    "bibancient",
-    "bibcorpora",
-    "lstabbrv",
-    "lstlocations",
-    "lstpublishers",
-    "bibfullname",
-    "scshape",
-    "edby",
-    "publisher",
-    "translation",
-    "yearseries",
-    "width=",
-    "counter",
-    "jstor",
-    "arachne",
-    "zenon",
-    "urn",
-    "biblabel=",
-    "inreferencesasfullcite",
-    "eventdatelanguage",
-    "citeauthorformat=",
-    "seenote",
-    "yearinparens",
-    "nametracker",
-    "apamaxprtauth=${1:number}",
-    "apamaxprtauth=${1:number}",
-    "width=",
-    "publisher",
-    "jstor",
-    "urn",
-    "arthist",
-    "enddot",
-    "pagesfull",
-    "firstcitefull",
-    "allnamesfamilygiven",
-    "namelinked",
-    "nonodate",
-    "utf8",
-    "gbk",
-    "cparen",
-    "utf8",
-    "gbk",
-    "cparen",
-    "articletitle",
-    "chaptertitle",
-    "pageranges",
-    "biblabel=",
-    "articletitle",
-    "chaptertitle",
-    "pageranges",
-    "biblabel=",
-    "articletitle",
-    "chaptertitle",
-    "pageranges",
-    "biblabel=",
-    "articletitle",
-    "chaptertitle",
-    "pageranges",
-    "biblabel=",
-    "acronyms",
-    "shorthandinbib",
-    "shorthandwidth=",
-    "shortjournal",
-    "terselos",
-    "xref",
-    "pagetotal",
-    "journalnumber=",
-    "bernhard",
-    "series=",
-    "seriesformat=",
-    "annotation",
-    "edbyidem",
-    "editionstring",
-    "edsuper",
-    "idembib",
-    "library",
-    "nolocation",
-    "nopublisher",
-    "oldauthor",
-    "origfields",
-    "pseudoauthor",
-    "origfieldsformat=",
-    "namefont=",
-    "firstnamefont=",
-    "idemfont=",
-    "ibidemfont=",
-    "idembibformat=",
-    "editorstring=",
-    "editorstringfont=",
-    "citedas",
-    "edstringincitations",
-    "omiteditor",
-    "shorthandibid",
-    "citeauthor=",
-    "citeauthorname=",
-    "ibidpage",
-    "pageref",
-    "citepages=",
-    "addyear",
-    "firstfull",
-    "inreference=",
-    "acronyms",
-    "shorthandinbib",
-    "shorthandwidth=",
-    "shortjournal",
-    "terselos",
-    "xref",
-    "pagetotal",
-    "journalnumber=",
-    "bernhard",
-    "series=",
-    "seriesformat=",
-    "annotation",
-    "edbyidem",
-    "editionstring",
-    "edsuper",
-    "idembib",
-    "library",
-    "nolocation",
-    "nopublisher",
-    "oldauthor",
-    "origfields",
-    "pseudoauthor",
-    "origfieldsformat=",
-    "namefont=",
-    "firstnamefont=",
-    "idemfont=",
-    "ibidemfont=",
-    "idembibformat=",
-    "editorstring=",
-    "editorstringfont=",
-    "citedas",
-    "edstringincitations",
-    "omiteditor",
-    "shorthandibid",
-    "citeauthor=",
-    "citeauthorname=",
-    "ibidpage",
-    "pageref",
-    "citepages=",
-    "annotatedBibliography",
-    "postnote=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "ignoreaddendum=",
-    "ignoreforeword=",
-    "ignoreafterword=",
-    "ignoreintroduction=",
-    "ignoreparatext=",
-    "publisher",
-    "parensvolume",
-    "script",
-    "actor",
-    "ignorearticle",
-    "partofcited",
-    "germ",
-    "translatedas",
-    "directorreplace",
-    "noseries",
-    "series",
-    "nopublisher",
-    "parensfilmnote",
-    "filmruntime",
-    "citeprefix",
-    "yearatbeginning",
-    "origyearwithyear",
-    "origyearsuperscript",
-    "pages=",
-    "origcite=",
-    "filmindex=",
-    "splitfilmindex",
-    "titleindex=",
-    "fullcitefilm",
-    "compactcite",
-    "citefilm=",
-    "xindy",
-    "ignoreaddendum=",
-    "ignoreforeword=",
-    "ignoreafterword=",
-    "ignoreintroduction=",
-    "ignoreparatext=",
-    "publisher",
-    "parensvolume",
-    "script",
-    "actor",
-    "ignorearticle",
-    "partofcited",
-    "germ",
-    "translatedas",
-    "directorreplace",
-    "noseries",
-    "series",
-    "nopublisher",
-    "parensfilmnote",
-    "filmruntime",
-    "citeprefix",
-    "yearatbeginning",
-    "origyearwithyear",
-    "origyearsuperscript",
-    "pages=",
-    "origcite=",
-    "filmindex=",
-    "splitfilmindex",
-    "titleindex=",
-    "fullcitefilm",
-    "compactcite",
-    "citefilm=",
-    "xindy",
-    "citexref",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitecomp",
-    "gbcitelabel=",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitelabel=",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitecomp",
-    "gbcitelabel=",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "CCNUpunctcn",
-    "citexref",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitecomp",
-    "gbcitelabel=",
-    "citexref",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitelabel=",
-    "citexref",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitecomp",
-    "gbcitelabel=",
-    "gbpunctcn",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfootbibfmt",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gbcitepunctcn",
-    "gblabelref",
-    "gbcitelabel=",
-    "edsuper",
-    "switchprefix",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "spacecolon",
-    "pagetotal",
-    "shortnumeration",
-    "thesisinfoinnotes",
-    "articlepubinfo",
-    "currentlang",
-    "noenddot",
-    "spacecolon",
-    "pagetotal",
-    "shortnumeration",
-    "thesisinfoinnotes",
-    "articlepubinfo",
-    "currentlang",
-    "noenddot",
-    "spacecolon",
-    "pagetotal",
-    "shortnumeration",
-    "thesisinfoinnotes",
-    "articlepubinfo",
-    "currentlang",
-    "noenddot",
-    "spacecolon",
-    "pagetotal",
-    "shortnumeration",
-    "thesisinfoinnotes",
-    "articlepubinfo",
-    "currentlang",
-    "noenddot",
-    "acronyms",
-    "shorthandinbib",
-    "shorthandwidth=",
-    "shortjournal",
-    "terselos",
-    "xref",
-    "pagetotal",
-    "journalnumber=",
-    "bernhard",
-    "series=",
-    "seriesformat=",
-    "annotation",
-    "edbyidem",
-    "editionstring",
-    "edsuper",
-    "idembib",
-    "library",
-    "nolocation",
-    "nopublisher",
-    "oldauthor",
-    "origfields",
-    "pseudoauthor",
-    "origfieldsformat=",
-    "namefont=",
-    "firstnamefont=",
-    "idemfont=",
-    "ibidemfont=",
-    "idembibformat=",
-    "editorstring=",
-    "editorstringfont=",
-    "citedas",
-    "edstringincitations",
-    "omiteditor",
-    "shorthandibid",
-    "citeauthor=",
-    "citeauthorname=",
-    "ibidpage",
-    "pageref",
-    "citepages=",
-    "addyear",
-    "firstfull",
-    "inreference=",
-    "citedbytitle",
-    "howcited",
-    "bearbeiterin",
-    "fshowcited",
-    "citedbypage",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "acronym",
-    "series=",
-    "conference=",
-    "annotation",
-    "showlocation",
-    "longdash",
-    "noremoteinfo",
-    "isan",
-    "ismn",
-    "isrn",
-    "issn",
-    "firstlonghand",
-    "nofullfootnote",
-    "mancitepar",
-    "footnoterulestrict",
-    "mladraft",
-    "annotation",
-    "showlocation",
-    "longdash",
-    "noremoteinfo",
-    "isan",
-    "ismn",
-    "isrn",
-    "issn",
-    "firstlonghand",
-    "nofullfootnote",
-    "mancitepar",
-    "footnoterulestrict",
-    "mladraft",
-    "annotation",
-    "showlocation",
-    "longdash",
-    "noremoteinfo",
-    "isan",
-    "ismn",
-    "isrn",
-    "issn",
-    "firstlonghand",
-    "nofullfootnote",
-    "mancitepar",
-    "footnoterulestrict",
-    "mladraft",
-    "articletitle",
-    "intitle",
-    "articledoi",
-    "articlein",
-    "printlang",
-    "caseshorthands",
-    "ecli=",
-    "ibidstyle=",
-    "shortindex",
-    "eutreaty",
-    "anon=",
-    "bookseries=",
-    "court-plain",
-    "ecli=",
-    "isourls",
-    "issuedate-plain",
-    "issuestyle=",
-    "mergedate=",
-    "nolocation",
-    "nonodate",
-    "nopublisher",
-    "norelatedin",
-    "relationpunct=",
-    "thesis=",
-    "timefirst",
-    "usenametitles",
-    "anon=",
-    "bookseries=",
-    "court-plain",
-    "ecli=",
-    "isourls",
-    "issuedate-plain",
-    "issuestyle=",
-    "mergedate=",
-    "nolocation",
-    "nonodate",
-    "nopublisher",
-    "norelatedin",
-    "relationpunct=",
-    "thesis=",
-    "timefirst",
-    "usenametitles",
-    "anon=",
-    "bookseries=",
-    "court-plain",
-    "ecli=",
-    "isourls",
-    "issuedate-plain",
-    "issuestyle=",
-    "nolocation",
-    "nopublisher",
-    "norelatedin",
-    "relationpunct=",
-    "scnames",
-    "thesis=",
-    "timefirst",
-    "usenametitles",
-    "anon=",
-    "bookseries=",
-    "court-plain",
-    "ecli=",
-    "isourls",
-    "issuedate-plain",
-    "issuestyle=",
-    "nolocation",
-    "nopublisher",
-    "norelatedin",
-    "relationpunct=",
-    "scnames",
-    "thesis=",
-    "timefirst",
-    "usenametitles",
-    "relatedformat=",
-    "publocformat=",
-    "volnumformat=",
-    "volumeformat=",
-    "editionformat=",
-    "scauthors=",
-    "lowscauthors",
-    "shorthandintro",
-    "inbeforejournal",
-    "classical",
-    "library",
-    "annotation",
-    "latinemph",
-    "square",
-    "nodate",
-    "relatedformat=",
-    "publocformat=",
-    "volnumformat=",
-    "volumeformat=",
-    "editionformat=",
-    "scauthors=",
-    "lowscauthors",
-    "shorthandintro",
-    "inbeforejournal",
-    "classical",
-    "library",
-    "annotation",
-    "latinemph",
-    "square",
-    "nodate",
-    "yearleft",
-    "restoreclassic",
-    "relatedformat=",
-    "publocformat=",
-    "volnumformat=",
-    "volumeformat=",
-    "editionformat=",
-    "scauthors=",
-    "lowscauthors",
-    "shorthandintro",
-    "inbeforejournal",
-    "classical",
-    "library",
-    "annotation",
-    "latinemph",
-    "iviemph",
-    "commacit",
-    "articletitle",
-    "chaptertitle",
-    "pageranges",
-    "biblabel=",
-    "plauthorname=${1:surname}",
-    "plauthorfirstname=${1:first name}",
-    "plauthornameprefix=${1:von-part}",
-    "plauthorhandling=",
-    "nameorder=",
-    "fixyear",
-    "hlyear",
-    "marginyear",
-    "plsorting=${1:sorting scheme}",
-    "plauthorfirstinit",
-    "jifinfo",
-    "oainfo=",
-    "prinfo",
-    "linktitles=",
-    "pubstateextra",
-    "plnumbering=",
-    "plauthorname=${1:surname}",
-    "plauthorfirstname=${1:first name}",
-    "plauthornameprefix=${1:von part}",
-    "plauthorhandling=",
-    "nameorder=",
-    "boldyear",
-    "pubstateextra",
-    "marginyear",
-    "plnumbered=",
-    "reversenumbering",
-    "plauthorfirstinit",
-    "prinfo",
-    "linktitleall",
-    "linktitledoi",
-    "linktitleurl",
-    "linktitleisbn",
-    "linktitleissn",
-    "accessdate",
-    "citepages=",
-    "eprintdate=",
-    "fullbibrefs",
-    "idemtracker=",
-    "sblfootnotes",
-    "shorthand=",
-    "useshorttitle",
-    "usefullcite",
-    "usevolume",
-    "useseries",
-    "articletitle",
-    "colornames",
-    "dashed=",
-    "articlein",
-    "citexref",
-    "innamebeforetitle",
-    "innameidem",
-    "maintitleaftertitle",
-    "introcite=",
-    "halid",
-    "swhid",
-    "shortswhid",
-    "swlabels",
-    "vcs",
-    "license",
-    "pubstate",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitelabel=",
-    "citexref",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitecomp",
-    "gbcitelabel=",
-    "citexref",
-    "gbmedium",
-    "gbannote",
-    "gbfieldtype",
-    "gbfnperpage",
-    "gbfootbib",
-    "gbstyle",
-    "gbtype",
-    "gbcodegbk",
-    "gbstrict",
-    "gbtitlelink",
-    "gbctexset",
-    "gbnoauthor",
-    "gbfieldstd",
-    "gbpub",
-    "gbpunctin",
-    "gblanorder=",
-    "gbcitelocal=",
-    "gbbiblocal=",
-    "gblocal=",
-    "gbbiblabel=",
-    "gbnamefmt=",
-    "gbalign=",
-    "gblabelref",
-    "gbcitecomp",
-    "gbcitelabel=",
-    "issueandeditor",
-    "compactlinks",
-    "alllinks",
-    "issueeditor",
-    "annotate",
-    "collsonly",
-    "ibid",
-    "issn",
-    "library",
-    "noetal",
-    "nolos",
-    "nopages",
-    "reflist",
-    "sentencecase",
-    "short",
-    "shortafter",
-    "shortfirst",
-    "shortlinks",
-    "swapvol"
-  ],
-  "keyvals": [
-    [
-      "bibencoding=",
-      "label=",
-      "location=",
-      "type=",
-      "datatype=",
-      "glob"
-    ],
-    [
-      "env=${1:name}",
-      "heading=${1:name}",
-      "title=${1:text}",
-      "label=",
-      "block=",
-      "prenote=${1:name}",
-      "postnote=${1:name}",
-      "section=${1:integer}",
-      "segment=${1:integer}",
-      "type=${1:entrytype}",
-      "nottype=${1:entrytype}",
-      "subtype=${1:subtype}",
-      "notsubtype=${1:subtype}",
-      "keyword=${1:keyword}",
-      "notkeyword=${1:keyword}",
-      "category=${1:category}",
-      "notcategory=${1:category}",
-      "filter=${1:name}",
-      "check=${1:name}",
-      "resetnumbers=",
-      "omitnumbers",
-      "locallabelwidth"
-    ],
-    [
-      "env=${1:name}",
-      "heading=${1:name}",
-      "prenote=${1:name}",
-      "postnote=${1:name}"
-    ],
-    [
-      "heading=${1:name}",
-      "title=${1:text}",
-      "label="
-    ],
-    [
-      "env=${1:name}",
-      "heading=${1:name}",
-      "title=${1:text}",
-      "prenote=${1:name}",
-      "postnote=${1:name}",
-      "filter=${1:name}"
-    ],
-    [
-      "env=${1:name}",
-      "heading=${1:name}",
-      "title=${1:text}",
-      "label=",
-      "block=",
-      "prenote=${1:name}",
-      "postnote=${1:name}",
-      "section=${1:integer}",
-      "segment=${1:integer}",
-      "type=${1:entrytype}",
-      "nottype=${1:entrytype}",
-      "subtype=${1:subtype}",
-      "notsubtype=${1:subtype}",
-      "keyword=${1:keyword}",
-      "notkeyword=${1:keyword}",
-      "category=${1:category}",
-      "notcategory=${1:category}",
-      "filter=${1:name}",
-      "check=${1:name}",
-      "locallabelwidth",
-      "driver=",
-      "biblistfilter="
-    ],
-    [
-      "sorting=${1:name}",
-      "sortingnamekeytemplatename=${1:name}",
-      "uniquenametemplatename=${1:name}",
-      "labelalphanametemplatename=${1:name}",
-      "namehashtemplatename=${1:name}",
-      "nametemplates=${1:name}",
-      "labelprefix=${1:string}"
-    ],
-    [
-      "sorting=${1:name}",
-      "sortingnamekeytemplatename=${1:name}",
-      "uniquenametemplatename=${1:name}",
-      "labelalphanametemplatename=${1:name}",
-      "namehashtemplatename=${1:name}",
-      "nametemplates=${1:name}",
-      "labelprefix=${1:string}",
-      "name=${1:refcontextname}"
-    ],
-    [
-      "fieldtype=",
-      "datatype=",
-      "field="
-    ],
-    [
-      "datatype=",
-      "overwrite"
-    ],
-    [
-      "overwrite",
-      "foreach=${1:loopval}",
-      "refsection=${1:integer}"
-    ],
-    [
-      "typesource=${1:entrytype}",
-      "typetarget=${1:entrytype}",
-      "fieldsource=${1:entryfield}",
-      "notfield=${1:entryfield}",
-      "fieldtarget=${1:entryfield}",
-      "match=${1:regexp}",
-      "matchi=${1:regexp}",
-      "notmatch=${1:regexp}",
-      "notmatchi=${1:regexp}",
-      "replace=${1:regexp}",
-      "fieldset=${1:entryfield}",
-      "fieldvalue=${1:string}",
-      "entryclone=${1:clonekey}",
-      "entrynew=${1:entrynewkey}",
-      "entrynewtype=${1:string}",
-      "entrytarget=${1:string}",
-      "cited",
-      "nocited",
-      "citedornocited",
-      "allnocited",
-      "starnocited",
-      "entrynocite",
-      "entrynull",
-      "append",
-      "appendstrict",
-      "final",
-      "null",
-      "origfield",
-      "origfieldval",
-      "origentrytype"
-    ],
-    [
-      "type="
-    ],
-    [
-      "skipout"
-    ],
-    [
-      "type=${1:field type}",
-      "format=${1:field format}",
-      "datatype=${1:field datatype}",
-      "nullok",
-      "skipout",
-      "label"
-    ],
-    [
-      "type=",
-      "datatype=",
-      "rangemin=${1:number}",
-      "rangemax=${1:number}",
-      "pattern="
-    ],
-    [
-      "quantifier="
-    ],
-    [
-      "final",
-      "lowercase",
-      "strwidth=${1:integer}",
-      "strside=",
-      "padside=",
-      "padwidth=${1:integer}",
-      "padchar=${1:character}",
-      "uppercase",
-      "varwidth",
-      "varwidthnorm",
-      "varwidthlist",
-      "strwidthmax=${1:integer}",
-      "strfixedcount=${1:integer}",
-      "ifnames=${1:range}",
-      "names=${1:range}",
-      "namessep=${1:string}",
-      "noalphaothers"
-    ],
-    [
-      "use",
-      "pre",
-      "compound",
-      "strwidth=${1:integer}",
-      "strside=",
-      "inits",
-      "base",
-      "disambiguation=",
-      "hashscope="
-    ],
-    [
-      "locale="
-    ],
-    [
-      "locale=",
-      "direction=",
-      "final",
-      "sortcase",
-      "sortupper"
-    ],
-    [
-      "all",
-      "override",
-      "ignore=${1:csv list of uniqueness options}"
-    ],
-    [
-      "ignore=${1:csv list of uniqueness options}"
-    ],
-    [
-      "override"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/bibleref.json b/dev/packages/bibleref.json
index 6eb707655..81574b431 100644
--- a/dev/packages/bibleref.json
+++ b/dev/packages/bibleref.json
@@ -9,9 +9,6 @@
     "bibleverse{}": {
       "snippet": "bibleverse{${1:book title}}"
     },
-    "bibleverse{}()": {
-      "snippet": "bibleverse{${1:book title}}(${2:chapter:verse})"
-    },
     "BRvrsep": {},
     "BRvsep": {},
     "BRchsep": {},
@@ -36,40 +33,16 @@
     "ibibleverse{}": {
       "snippet": "ibibleverse{${1:book title}}"
     },
-    "ibibleverse{}()": {
-      "snippet": "ibibleverse{${1:book title}}(${2:chapter:verse})"
-    },
-    "ibibleverse[]{}()": {
-      "snippet": "ibibleverse[${2:format}]{${1:book title}}(${3:chapter:verse})"
-    },
     "bvidxpgformat": {},
     "ibiblechvs{}": {
       "snippet": "ibiblechvs{${1:book title}}"
     },
-    "ibiblechvs{}()": {
-      "snippet": "ibiblechvs{${1:book title}}(${2:chapter:verse})"
-    },
-    "ibiblechvs[]{}()": {
-      "snippet": "ibiblechvs[${2:format}]{${1:book title}}(${3:chapter:verse})"
-    },
     "ibiblevs{}": {
       "snippet": "ibiblevs{${1:book title}}"
     },
-    "ibiblevs{}()": {
-      "snippet": "ibiblevs{${1:book title}}(${2:chapter:verse})"
-    },
-    "ibiblevs[]{}()": {
-      "snippet": "ibiblevs[${2:format}]{${1:book title}}(${3:chapter:verse})"
-    },
     "ibible{}": {
       "snippet": "ibible{${1:book title}}"
     },
-    "ibible{}()": {
-      "snippet": "ibible{${1:book title}}(${2:chapter:verse})"
-    },
-    "ibible[]{}()": {
-      "snippet": "ibible[${2:format}]{${1:book title}}(${3:chapter:verse})"
-    },
     "biblerefcategory{}": {
       "snippet": "biblerefcategory{${1:category title}}"
     },
diff --git a/dev/packages/bibpes.json b/dev/packages/bibpes.json
deleted file mode 100644
index 373bde2f8..000000000
--- a/dev/packages/bibpes.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "includes": {
-    "xkeyval": []
-  },
-  "macros": {
-    "reportOnBibPes": {},
-    "readbackDefFile": {},
-    "bibpesBody": {},
-    "ifreadOK": {},
-    "readOKtrue": {},
-    "readOKfalse": {},
-    "inbiblepassage": {},
-    "outbiblepassage": {},
-    "iwo": {},
-    "FN": {},
-    "CO": {},
-    "CF": {}
-  },
-  "envs": {},
-  "options": [
-    "infolder=${1:file path}",
-    "outfolder=${1:file path}",
-    "txtfilein=${1:base name}",
-    "deffileout=${1:base name}",
-    "build",
-    "!build"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/bidi.json b/dev/packages/bidi.json
deleted file mode 100644
index 55bb06238..000000000
--- a/dev/packages/bidi.json
+++ /dev/null
@@ -1,341 +0,0 @@
-{
-  "includes": {
-    "xetex": [],
-    "iftex": [],
-    "biditools": [],
-    "zref-abspage": [],
-    "auxhook": [],
-    "ltxcmds": [],
-    "xkeyval": [],
-    "bidi-perpage": [
-      "perpagefootnote",
-      "perpagefootnote=on"
-    ]
-  },
-  "macros": {
-    "normalfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "twocolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "threecolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "fourcolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "fivecolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "sixcolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "sevencolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "eightcolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "ninecolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "tencolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "RTLcolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "LTRcolumnfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "paragraphfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "setLTRparagraphfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "setRTLparagraphfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "TwoColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "ThreeColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "FourColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "FiveColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "SixColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "SevenColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "EightColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "NineColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "TenColumnFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "ParagraphFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "NormalRTLParaLTRFootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "AddExtraParaSkip{}": {
-      "snippet": "AddExtraParaSkip{${1:arg}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "extrafeetendmini": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "extrafeetendminihook": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "extrafeetins": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "extrafeetinshook": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "FeetAboveFloat": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "FeetAtBottom": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "FeetBelowFloat": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "FeetBelowRagged": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "footfootmark": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "footfudgefactor": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "footinsdim": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "footmarkstyle{}": {
-      "snippet": "footmarkstyle{${1:text}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "footmarkwidth": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "footscript{}": {
-      "snippet": "footscript{${1:arg}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "foottextfont": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "LTRfootfootmark": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "LTRfootmarkstyle{}": {
-      "snippet": "LTRfootmarkstyle{${1:text}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "LTRfootscript{}": {
-      "snippet": "LTRfootscript{${1:arg}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "LTRfoottextfont": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "multiplefootnotemarker": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "normalRTLparaLTRfootnotes": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "RTLfootfootmark": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "RTLfootmarkstyle{}": {
-      "snippet": "RTLfootmarkstyle{${1:text}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "RTLfootscript{}": {
-      "snippet": "RTLfootscript{${1:arg}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "RTLfoottextfont": {
-      "option": "extrafootnotefeatures=on"
-    },
-    "setSingleSpace{}": {
-      "snippet": "setSingleSpace{${1:number}}",
-      "option": "extrafootnotefeatures=on"
-    },
-    "DetectColumn{}{}": {
-      "snippet": "DetectColumn{${1:arg1}}{${2:arg2}}",
-      "option": "DetectColumn=on"
-    },
-    "DetectColumn[]{}{}": {
-      "snippet": "DetectColumn[${3:opt}]{${1:arg1}}{${2:arg2}}",
-      "option": "DetectColumn=on"
-    },
-    "bidiversion": {},
-    "bididate": {},
-    "bidireleasename": {},
-    "TeXXeTOn": {},
-    "TeXXeTOff": {},
-    "setLTR": {},
-    "setLR": {},
-    "unsetRL": {},
-    "unsetRTL": {},
-    "setRTL": {},
-    "setRL": {},
-    "unsetLTR": {},
-    "LRE{}": {
-      "snippet": "LRE{${1:text}}"
-    },
-    "LR{}": {
-      "snippet": "LR{${1:text}}"
-    },
-    "RLE{}": {
-      "snippet": "RLE{${1:text}}"
-    },
-    "RL{}": {
-      "snippet": "RL{${1:text}}"
-    },
-    "LTRfootnote{}": {
-      "snippet": "LTRfootnote{${1:text}}"
-    },
-    "LTRfootnote[]{}": {
-      "snippet": "LTRfootnote[${2:num}]{${1:text}}"
-    },
-    "RTLfootnote{}": {
-      "snippet": "RTLfootnote{${1:text}}"
-    },
-    "RTLfootnote[]{}": {
-      "snippet": "RTLfootnote[${2:num}]{${1:text}}"
-    },
-    "setfootnoteRL": {},
-    "setfootnoteLR": {},
-    "unsetfootnoteRL": {},
-    "LTRthanks{}": {
-      "snippet": "LTRthanks{${1:text}}"
-    },
-    "RTLthanks{}": {
-      "snippet": "RTLthanks{${1:text}}"
-    },
-    "LTRfootnotetext{}": {
-      "snippet": "LTRfootnotetext{${1:text}}"
-    },
-    "LTRfootnotetext[]{}": {
-      "snippet": "LTRfootnotetext[${2:num}]{${1:text}}"
-    },
-    "RTLfootnotetext{}": {
-      "snippet": "RTLfootnotetext{${1:text}}"
-    },
-    "RTLfootnotetext[]{}": {
-      "snippet": "RTLfootnotetext[${2:num}]{${1:text}}"
-    },
-    "autofootnoterule": {},
-    "rightfootnoterule": {},
-    "leftfootnoterule": {},
-    "LRfootnoterule": {},
-    "textwidthfootnoterule": {},
-    "SplitFootnoteRule": {},
-    "debugfootnotedirection": {},
-    "RTLdblcol": {},
-    "LTRdblcol": {},
-    "XeTeX": {},
-    "XeLaTeX": {},
-    "SepMark{}": {
-      "snippet": "SepMark{${1:mark}}"
-    },
-    "hboxR{}": {
-      "snippet": "hboxR{${1:text}}"
-    },
-    "hboxL{}": {
-      "snippet": "hboxL{${1:text}}"
-    },
-    "vboxR{}": {
-      "snippet": "vboxR{${1:text}}"
-    },
-    "vboxL{}": {
-      "snippet": "vboxL{${1:text}}"
-    },
-    "bidillap": {},
-    "bidirlap": {},
-    "setLTRbibitems": {},
-    "setRTLbibitems": {},
-    "setdefaultbibitems": {},
-    "setRTLmarginpar": {},
-    "setLTRmarginpar": {},
-    "setdefaultmarginpar": {},
-    "LTRmarginpar[]{}": {
-      "snippet": "LTRmarginpar[${2:left-text}]{${1:right-text}}"
-    },
-    "RTLmarginpar[]{}": {
-      "snippet": "RTLmarginpar[${2:left-text}]{${1:right-text}}"
-    },
-    "RTLdfnmakecol": {},
-    "LTRdfnmakecol": {},
-    "RTLmulticolcolumns": {},
-    "LTRmulticolcolumns": {},
-    "bracetext": {},
-    "DigitsDotDashInterCharToks": {},
-    "IfbidiPackageVersion{}{}{}": {
-      "snippet": "IfbidiPackageVersion{${1:version}}{${2:true}}{${3:false}}"
-    },
-    "IfbidiPackageVersionBefore{}{}{}": {
-      "snippet": "IfbidiPackageVersionBefore{${1:version}}{${2:true}}{${3:false}}"
-    },
-    "IfbidiPackageVersionLater{}{}{}": {
-      "snippet": "IfbidiPackageVersionLater{${1:version}}{${2:true}}{${3:false}}"
-    },
-    "pdfencryptsetup{}": {
-      "snippet": "pdfencryptsetup{${1:keyvals}}"
-    },
-    "pLRE": {},
-    "pRLE": {},
-    "setlatin": {},
-    "setLTRtable": {},
-    "setnonlatin": {},
-    "setRTLtable": {},
-    "moreLRE": {},
-    "moreRLE": {}
-  },
-  "envs": {
-    "LTR": {},
-    "RTL": {},
-    "LTRitems": {},
-    "RTLitems": {},
-    "LTRbibitems": {},
-    "RTLbibitems": {},
-    "LTR*": {},
-    "RTL*": {}
-  },
-  "options": [
-    "RTLdocument",
-    "documentdirection=",
-    "tabledirection=",
-    "script=",
-    "rldocument",
-    "footnoterule=",
-    "footnotedirection=",
-    "debugfootnotedirection",
-    "extrafootnotefeatures",
-    "DetectColumn",
-    "logo",
-    "pdfinfo",
-    "perpagefootnote"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/bidishadowtext.json b/dev/packages/bidishadowtext.json
index 03413beb5..41dedfd35 100644
--- a/dev/packages/bidishadowtext.json
+++ b/dev/packages/bidishadowtext.json
@@ -16,7 +16,7 @@
       "snippet": "bidishadowcolor{${1:color}}"
     },
     "bidishadowrgb{}": {
-      "snippet": "bidishadowrgb{${1:r,${2:g},b}}"
+      "snippet": "bidishadowrgb{${1:r,g,b}}"
     },
     "bidishadowtext{}": {
       "snippet": "bidishadowtext{${1:text}}"
diff --git a/dev/packages/bm.json b/dev/packages/bm.json
deleted file mode 100644
index 10e091440..000000000
--- a/dev/packages/bm.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "bm{}": {
-      "snippet": "bm{${1:math expression}}"
-    },
-    "hm{}": {
-      "snippet": "hm{${1:math expression}}"
-    },
-    "bmdefine{}{}": {
-      "snippet": "bmdefine{${1:cmd}}{${2:def}}"
-    },
-    "hmdefine{}{}": {
-      "snippet": "hmdefine{${1:cmd}}{${2:def}}"
-    },
-    "boldsymbol{}": {
-      "snippet": "boldsymbol{${1:math expression}}"
-    },
-    "heavysymbol{}": {
-      "snippet": "heavysymbol{${1:math expression}}"
-    },
-    "DeclareBoldMathCommand[]{}{}": {
-      "snippet": "DeclareBoldMathCommand[${3:math version}]{${1:cmd}}{${2:def}}"
-    },
-    "DeclareBoldMathCommand{}{}": {
-      "snippet": "DeclareBoldMathCommand{${1:cmd}}{${2:def}}"
-    },
-    "bmmax": {},
-    "hmmax": {}
-  },
-  "envs": {},
-  "options": [
-    "nopmb",
-    "warn",
-    "info",
-    "silent"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/bondcolor.json b/dev/packages/bondcolor.json
index 3a714844e..6ff348748 100644
--- a/dev/packages/bondcolor.json
+++ b/dev/packages/bondcolor.json
@@ -36,12 +36,6 @@
     "redx{}": {
       "snippet": "redx{${1:content}}"
     },
-    "replaceSKbond()(){}{}": {
-      "snippet": "replaceSKbond(${3:xstart},${4:ystart})(${5:xslope},${6:yslope}){${1:bdlength}}{${2:skelbcolor}}"
-    },
-    "replaceSKbond[]()(){}{}": {
-      "snippet": "replaceSKbond[${3:thickness}](${4:xstart},${5:ystart})(${6:xslope},${7:yslope}){${1:bdlength}}{${2:skelbcolor}}"
-    },
     "thinLineWidth": {},
     "white": {},
     "whitex{}": {
diff --git a/dev/packages/booktabs.json b/dev/packages/booktabs.json
deleted file mode 100644
index e315bafad..000000000
--- a/dev/packages/booktabs.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "toprule": {},
-    "toprule[]": {
-      "snippet": "toprule[${1:line width}]"
-    },
-    "midrule": {},
-    "midrule[]": {
-      "snippet": "midrule[${1:line width}]"
-    },
-    "bottomrule": {},
-    "bottomrule[]": {
-      "snippet": "bottomrule[${1:line width}]"
-    },
-    "cmidrule{}": {
-      "snippet": "cmidrule{${1:a-b}}"
-    },
-    "cmidrule(){}": {
-      "snippet": "cmidrule(${2:trim}){${1:a-b}}"
-    },
-    "cmidrule[](){}": {
-      "snippet": "cmidrule[${2:line width}](${3:trim}){${1:a-b}}"
-    },
-    "morecmidrules": {},
-    "specialrule{}{}{}": {
-      "snippet": "specialrule{${1:line width}}{${2:above space}}{${3:below space}}"
-    },
-    "addlinespace": {},
-    "addlinespace[]": {
-      "snippet": "addlinespace[${1:vspace}]"
-    },
-    "heavyrulewidth": {},
-    "lightrulewidth": {},
-    "cmidrulewidth": {},
-    "belowrulesep": {},
-    "belowbottomsep": {},
-    "aboverulesep": {},
-    "abovetopsep": {},
-    "cmidrulesep": {},
-    "cmidrulekern": {},
-    "defaultaddspace": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/bxeepic.json b/dev/packages/bxeepic.json
index 32a660df5..ee98abb15 100644
--- a/dev/packages/bxeepic.json
+++ b/dev/packages/bxeepic.json
@@ -16,26 +16,8 @@
     "flushjoin": {},
     "noeepicdottedlines": {},
     "spacewidth": {},
-    "multiputlist()(){}": {
-      "snippet": "multiputlist(${2:x},${3:y})(${4:Δx},${5:Δy}){${1:item1,${6:item2},...}}"
-    },
-    "multiputlist()()[]{}": {
-      "snippet": "multiputlist(${3:x},${4:y})(${5:Δx},${6:Δy})[${2:pos}]{${1:item1,${7:item2},...}}"
-    },
-    "matrixput()(){}(){}{}": {
-      "snippet": "matrixput(${4:x},${5:y})(${6:Δx1},${7:Δy1}){${1:n1}}(${8:Δx2},${9:Δy2}){${2:n2}}{${3:object}}"
-    },
-    "grid()()": {
-      "snippet": "grid(${1:width},${2:height})(${3:Δwidth},${4:Δheight})"
-    },
-    "grid()()[]": {
-      "snippet": "grid(${2:width},${3:height})(${4:Δwidth},${5:Δheight})[${1:x0,y0}]"
-    },
     "dashlinestretch": {},
     "drawlinestretch": {},
-    "jput(){}": {
-      "snippet": "jput(${2:x},${3:y}){${1:object}}"
-    },
     "picsquare": {},
     "putfile{}{}": {
       "snippet": "putfile{${1:file}}{${2:object}}"
@@ -46,21 +28,12 @@
     "enddashjoin": {},
     "enddottedjoin": {},
     "enddrawjoin": {},
-    "line(){}": {
-      "snippet": "line(${2:x},${3:y}){${1:length}}"
-    },
     "circle{}": {
       "snippet": "circle{${1:diameter}}"
     },
     "circle*{}": {
       "snippet": "circle*{${1:diameter}}"
     },
-    "oval()": {
-      "snippet": "oval(${1:width},${2:height})"
-    },
-    "oval()[]": {
-      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
-    },
     "maxovaldiam": {},
     "allinethickness{}": {
       "snippet": "allinethickness{${1:dimen}}"
diff --git a/dev/packages/bxorigcapt.json b/dev/packages/bxorigcapt.json
index caabc8707..6f968b4dd 100644
--- a/dev/packages/bxorigcapt.json
+++ b/dev/packages/bxorigcapt.json
@@ -7,7 +7,7 @@
       "snippet": "bxDebug{${1:message}}"
     },
     "bxorigcaptDeprecateCommand{}": {
-      "snippet": "bxorigcaptDeprecateCommand{${1:csname1,${2:csname2},...}}"
+      "snippet": "bxorigcaptDeprecateCommand{${1:csname1,csname2,...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/calc.json b/dev/packages/calc.json
deleted file mode 100644
index 5ad2bef91..000000000
--- a/dev/packages/calc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "setcounter{}{}": {
-      "snippet": "setcounter{${1:ctr}}{${2:num}}"
-    },
-    "addtocounter{}{}": {
-      "snippet": "addtocounter{${1:ctr}}{${2:num}}"
-    },
-    "setlength{}{}": {
-      "snippet": "setlength{${1:cmd}}{${2:len}}"
-    },
-    "addtolength{}{}": {
-      "snippet": "addtolength{${1:cmd}}{${2:len}}"
-    },
-    "real{}": {
-      "snippet": "real{${1:decimal constant}}"
-    },
-    "ratio{}{}": {
-      "snippet": "ratio{${1:dimen expression}}{${2:dimen expression}}"
-    },
-    "widthof{}": {
-      "snippet": "widthof{${1:text}}"
-    },
-    "heightof{}": {
-      "snippet": "heightof{${1:text}}"
-    },
-    "depthof{}": {
-      "snippet": "depthof{${1:text}}"
-    },
-    "totalheightof{}": {
-      "snippet": "totalheightof{${1:text}}"
-    },
-    "settototalheight{}{}": {
-      "snippet": "settototalheight{${1:cmd}}{${2:text}}"
-    },
-    "maxof{}{}": {
-      "snippet": "maxof{${1:type expression}}{${2:type expression}}"
-    },
-    "minof{}{}": {
-      "snippet": "minof{${1:type expression}}{${2:type expression}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/callouts.json b/dev/packages/callouts.json
deleted file mode 100644
index 0500e17d7..000000000
--- a/dev/packages/callouts.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "tikzlibrarycalc": [],
-    "xifthen": [],
-    "kvoptions": []
-  },
-  "macros": {
-    "helpgrid": {},
-    "helpgrid[]": {
-      "snippet": "helpgrid[${1:color}]"
-    },
-    "callout{}{}{}": {
-      "snippet": "callout{${1:center-coords}}{${2:note}}{${3:tip-coords}}"
-    },
-    "note{}{}": {
-      "snippet": "note{${1:coords}}{${2:note}}"
-    },
-    "arrow{}{}": {
-      "snippet": "arrow{${1:center-coords}}{${2:tip-coords}}"
-    },
-    "focol": {},
-    "bgcol": {},
-    "arcol": {},
-    "xtic": {},
-    "ytic": {}
-  },
-  "envs": {
-    "annotate{}{}": {
-      "name": "annotate",
-      "snippet": "{${1:object}}{${2:width-factor}}"
-    }
-  },
-  "options": [
-    "bwr",
-    "wby",
-    "bww",
-    "background=",
-    "arrow="
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/caption.json b/dev/packages/caption.json
deleted file mode 100644
index e597820dc..000000000
--- a/dev/packages/caption.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "includes": {
-    "caption3": [],
-    "ltcaption": [],
-    "setspace": [
-      "font=onehalfspacing",
-      "labelfont=onehalfspacing",
-      "textfont=onehalfspacing",
-      "font+=onehalfspacing",
-      "labelfont+=onehalfspacing",
-      "textfont+=onehalfspacing",
-      "font=doublespacing",
-      "labelfont=doublespacing",
-      "textfont=doublespacing",
-      "font+=doublespacing",
-      "labelfont+=doublespacing",
-      "textfont+=doublespacing"
-    ],
-    "sansmath": [
-      "font=sansmath",
-      "labelfont=sansmath",
-      "textfont=sansmath",
-      "font+=sansmath",
-      "labelfont+=sansmath",
-      "textfont+=sansmath"
-    ],
-    "ragged2e": [
-      "justification=RaggedRight",
-      "justification=RaggedLeft",
-      "justification=Justified",
-      "justification=Centering",
-      "justification=RaggedRight",
-      "justification=RaggedLeft"
-    ]
-  },
-  "macros": {
-    "caption*{}": {
-      "snippet": "caption*{${1:heading}}"
-    },
-    "captionof{}[]{}": {
-      "snippet": "captionof{${1:float type}}[${2:list entry}]{${3:heading}}"
-    },
-    "captionof{}{}": {
-      "snippet": "captionof{${1:float type}}{${2:heading}}"
-    },
-    "captionof*{}{}": {
-      "snippet": "captionof*{${1:float type}}{${2:heading}}"
-    },
-    "captionlistentry[]{}": {
-      "snippet": "captionlistentry[${2:float type}]{${1:list entry}}"
-    },
-    "captionlistentry{}": {
-      "snippet": "captionlistentry{${1:list entry}}"
-    },
-    "ContinuedFloat": {},
-    "ContinuedFloat*": {},
-    "theContinuedFloat": {},
-    "piccaptiontype{}": {
-      "snippet": "piccaptiontype{${1:float type}}"
-    },
-    "captionbox*{}[][]{}": {
-      "snippet": "captionbox*{${1:heading}}[${2:width}][${3:inner-pos}]{${4:content}}"
-    },
-    "captionbox*{}[]{}": {
-      "snippet": "captionbox*{${1:heading}}[${2:width}]{${3:content}}"
-    },
-    "captionbox*{}{}": {
-      "snippet": "captionbox*{${1:heading}}{${2:content}}"
-    },
-    "captionbox[]{}[][]{}": {
-      "snippet": "captionbox[${3:list entry}]{${1:heading}}[${4:width}][${5:inner-pos}]{${2:content}}"
-    },
-    "captionbox[]{}[]{}": {
-      "snippet": "captionbox[${3:list entry}]{${1:heading}}[${4:width}]{${2:content}}"
-    },
-    "captionbox[]{}{}": {
-      "snippet": "captionbox[${3:list entry}]{${1:heading}}{${2:content}}"
-    },
-    "captionbox{}[][]{}": {
-      "snippet": "captionbox{${1:heading}}[${2:width}][${3:inner-pos}]{${4:content}}"
-    },
-    "captionbox{}[]{}": {
-      "snippet": "captionbox{${1:heading}}[${2:width}]{${3:content}}"
-    },
-    "captionbox{}{}": {
-      "snippet": "captionbox{${1:heading}}{${2:content}}"
-    },
-    "captiontext*[]{}": {
-      "snippet": "captiontext*[${2:number}]{${1:text}}"
-    },
-    "captiontext*{}": {
-      "snippet": "captiontext*{${1:text}}"
-    },
-    "captiontext[]{}": {
-      "snippet": "captiontext[${2:number}]{${1:text}}"
-    },
-    "captiontext{}": {
-      "snippet": "captiontext{${1:text}}"
-    },
-    "flushsubcaptionlistentries": {},
-    "nextfloat": {},
-    "nextfloat*": {},
-    "phantomcaption": {},
-    "setcaptionsubtype*": {},
-    "setcaptionsubtype{}": {
-      "snippet": "setcaptionsubtype{${1:float type}}"
-    },
-    "setcaptiontype*": {},
-    "setcaptiontype{}": {
-      "snippet": "setcaptiontype{${1:float type}}"
-    },
-    "subcaptionsetup[]{}": {
-      "snippet": "subcaptionsetup[${2:float type}]{${1:options}}"
-    },
-    "subcaptionsetup{}": {
-      "snippet": "subcaptionsetup{${1:options}}"
-    },
-    "subcaptionsetup*[]{}": {
-      "snippet": "subcaptionsetup*[${2:float type}]{${1:options}}"
-    },
-    "subcaptionsetup*{}": {
-      "snippet": "subcaptionsetup*{${1:options}}"
-    },
-    "continuedfloat": {},
-    "thecontinuedfloat": {}
-  },
-  "envs": {
-    "captionblock{}": {
-      "name": "captionblock",
-      "snippet": "{${1:width}}"
-    },
-    "captionblock[]{}": {
-      "name": "captionblock",
-      "snippet": "[${2:position}]{${1:width}}"
-    },
-    "captionblock[][]{}": {
-      "name": "captionblock",
-      "snippet": "[${2:position}][${3:height}]{${1:width}}"
-    },
-    "captionblock[][][]{}": {
-      "name": "captionblock",
-      "snippet": "[${2:position}][${3:height}][${4:inner-pos}]{${1:width}}"
-    },
-    "captiongroup": {},
-    "captiongroup*": {},
-    "longtable*": {}
-  },
-  "options": [
-    "compatibility",
-    "config=${1:file name}"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/catppuccinpalette.json b/dev/packages/catppuccinpalette.json
deleted file mode 100644
index 9e2cbd0f6..000000000
--- a/dev/packages/catppuccinpalette.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "includes": {
-    "pgfopts": [],
-    "xcolor": []
-  },
-  "macros": {},
-  "envs": {},
-  "options": [
-    "style=",
-    "textcolor",
-    "pagecolor",
-    "styleAll"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/censor.json b/dev/packages/censor.json
deleted file mode 100644
index 31c704337..000000000
--- a/dev/packages/censor.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "includes": {
-    "pbox": [],
-    "tokcycle": []
-  },
-  "macros": {
-    "blackout{}": {
-      "snippet": "blackout{${1:text}}"
-    },
-    "blackoutenv": {},
-    "censor*{}": {
-      "snippet": "censor*{${1:width multiplier}}"
-    },
-    "censor{}": {
-      "snippet": "censor{${1:text}}"
-    },
-    "censorbox*[]{}{}{}": {
-      "snippet": "censorbox*[${4:pre-commands}]{${1:width mult}}{${2:height mult}}{${3:depth mult}}"
-    },
-    "censorbox*{}{}{}": {
-      "snippet": "censorbox*{${1:width mult}}{${2:height mult}}{${3:depth mult}}"
-    },
-    "censorbox[]{}": {
-      "snippet": "censorbox[${2:pre-commands}]{${1:contents}}"
-    },
-    "censorbox{}": {
-      "snippet": "censorbox{${1:contents}}"
-    },
-    "censordot": {},
-    "censormathgreekfalse": {},
-    "censormathgreektrue": {},
-    "censorrule{}": {
-      "snippet": "censorrule{${1:length}}"
-    },
-    "censorruledepth": {},
-    "censorruleheight": {},
-    "endblackoutenv": {},
-    "endxblackoutenv": {},
-    "RestartCensoring": {},
-    "StopCensoring": {},
-    "xblackout{}": {
-      "snippet": "xblackout{${1:text}}"
-    },
-    "xblackoutenv": {},
-    "ccenspace": {},
-    "censorfalse": {},
-    "censortrue": {},
-    "censorversiondate": {},
-    "censorversionnumber": {},
-    "censpace": {},
-    "expandargfalse": {},
-    "expandargtrue": {},
-    "ifcensor": {},
-    "ifcensormathgreek": {},
-    "ifexpandarg": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/cesenaexam.json b/dev/packages/cesenaexam.json
deleted file mode 100644
index 23ae3fb27..000000000
--- a/dev/packages/cesenaexam.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "graphicx": [],
-    "tikz": [],
-    "circuitikz": [],
-    "tikzlibraryintersections": [],
-    "tikzlibrarypositioning": [],
-    "tikzlibraryfit": [],
-    "tikzlibrarycalc": [],
-    "tikzlibrarythrough": [],
-    "tikzlibrarybabel": [],
-    "tikzlibrarydecorations.pathmorphing": [],
-    "tikzlibrarybackgrounds": [],
-    "titlesec": []
-  },
-  "macros": {
-    "examsection{}{}": {
-      "snippet": "examsection{${1:title}}{${2:italic text}}"
-    },
-    "examsection*{}{}": {
-      "snippet": "examsection*{${1:title}}{${2:italic text}}"
-    },
-    "boxempty": {},
-    "boxcheck": {},
-    "examparts{}": {
-      "snippet": "examparts{${1:content}}"
-    },
-    "maketitle{}{}{}{}{}": {
-      "snippet": "maketitle{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}"
-    },
-    "maketitle[]{}{}{}{}{}": {
-      "snippet": "maketitle[${6:options}]{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "maketitle*{}{}{}{}{}": {
-      "snippet": "maketitle*{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}"
-    },
-    "maketitle*[]{}{}{}{}{}": {
-      "snippet": "maketitle*[${6:options}]{${1:surname}}{${2:name}}{${3:id}}{${4:signature}}{${5:N}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "examtwoblocks{}{}{}{}": {
-      "snippet": "examtwoblocks{${1:length1}}{${2:length2}}{${3:block1}}{${4:block2}}"
-    },
-    "examtwoblockstop{}{}{}{}": {
-      "snippet": "examtwoblockstop{${1:length1}}{${2:length2}}{${3:block1}}{${4:block2}}"
-    },
-    "examoneblocktop{}{}": {
-      "snippet": "examoneblocktop{${1:length}}{${2:block}}"
-    },
-    "sectionfont": {},
-    "boxlen": {},
-    "cesenaexamversion": {},
-    "lastboxlen": {},
-    "minheighttypebox": {}
-  },
-  "envs": {},
-  "options": [
-    "boxed"
-  ],
-  "keyvals": [
-    [
-      "textboxheight=",
-      "whiteboxheight=",
-      "textboxone={${1:content}}",
-      "textboxtwo={${1:content}}",
-      "textboxthree={${1:content}}",
-      "textboxfour={${1:content}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/cgloss4e.json b/dev/packages/cgloss4e.json
index 4bcb47bbe..8e293074f 100644
--- a/dev/packages/cgloss4e.json
+++ b/dev/packages/cgloss4e.json
@@ -22,9 +22,6 @@
       "snippet": "lastword{${1:each}}{${2:line box}}{${3:word box}}"
     },
     "testdone": {},
-    "getwords()": {
-      "snippet": "getwords(${1:line box},${2:each})"
-    },
     "more": {},
     "donewords": {},
     "twosent": {},
diff --git a/dev/packages/chapterbib.json b/dev/packages/chapterbib.json
deleted file mode 100644
index 38328bff3..000000000
--- a/dev/packages/chapterbib.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "cbinput{}": {
-      "snippet": "cbinput{${1:file}}"
-    },
-    "sectionbib{}{}": {
-      "snippet": "sectionbib{${1:section cmd}}{${2:section name}}"
-    },
-    "CitationPrefix{}": {
-      "snippet": "CitationPrefix{${1:prefix code}}"
-    },
-    "FinalBibTitles": {},
-    "FinalBibPrefix": {},
-    "StartFinalBibs": {},
-    "CBMainSectioning": {},
-    "citeform{}": {
-      "snippet": "citeform{${1:arg}}"
-    },
-    "citepunct": {},
-    "bibname": {},
-    "bibcite{}": {
-      "snippet": "bibcite{${1:arg}}"
-    },
-    "bibsection": {}
-  },
-  "envs": {
-    "cbunit": {}
-  },
-  "options": [
-    "sectionbib",
-    "draft",
-    "rootbib",
-    "duplicate",
-    "gather"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/chemcompounds.json b/dev/packages/chemcompounds.json
index cf85df32d..de42bf0b8 100644
--- a/dev/packages/chemcompounds.json
+++ b/dev/packages/chemcompounds.json
@@ -8,10 +8,10 @@
       "snippet": "declarecompound[${2:name}]{${1:label}}"
     },
     "compound{}": {
-      "snippet": "compound{${1:label1,${2:label2},...}}"
+      "snippet": "compound{${1:label1,label2,...}}"
     },
     "compound*{}": {
-      "snippet": "compound*{${1:label1,${2:label2},...}}"
+      "snippet": "compound*{${1:label1,label2,...}}"
     },
     "compoundseparator": {},
     "compoundglobalprefix": {},
diff --git a/dev/packages/chemfig.json b/dev/packages/chemfig.json
deleted file mode 100644
index 272bed015..000000000
--- a/dev/packages/chemfig.json
+++ /dev/null
@@ -1,243 +0,0 @@
-{
-  "includes": {
-    "simplekv": [],
-    "tikz": []
-  },
-  "macros": {
-    "chemfig{}": {
-      "snippet": "chemfig{${1:code}}"
-    },
-    "chemfig[]{}": {
-      "snippet": "chemfig[${2:options}]{${1:code}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "setchemfig{}": {
-      "snippet": "setchemfig{${1:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "resetchemfig": {},
-    "printatom{}": {
-      "snippet": "printatom{${1:code}}"
-    },
-    "hflipnext": {},
-    "vflipnext": {},
-    "definesubmol{}{}": {
-      "snippet": "definesubmol{${1:name}}{${2:code}}"
-    },
-    "definesubmol{}[]{}": {
-      "snippet": "definesubmol{${1:name}}[${2:code1}]{${3:code2}}"
-    },
-    "redefinesubmol{}{}": {
-      "snippet": "redefinesubmol{${1:name}}{${2:code}}"
-    },
-    "redefinesubmol{}[]{}": {
-      "snippet": "redefinesubmol{${1:name}}[${2:code1}]{${3:code2}}"
-    },
-    "chemskipalign": {},
-    "setcharge{}": {
-      "snippet": "setcharge{${1:options}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "resetcharge": {},
-    "chargeangle": {},
-    "chemabove{}{}": {
-      "snippet": "chemabove{${1:txt1}}{${2:txt2}}"
-    },
-    "chemabove[]{}{}": {
-      "snippet": "chemabove[${3:dim}]{${1:txt1}}{${2:txt2}}"
-    },
-    "chembelow{}{}": {
-      "snippet": "chembelow{${1:txt1}}{${2:txt2}}"
-    },
-    "chembelow[]{}{}": {
-      "snippet": "chembelow[${3:dim}]{${1:txt1}}{${2:txt2}}"
-    },
-    "Chemabove{}{}": {
-      "snippet": "Chemabove{${1:txt1}}{${2:txt2}}"
-    },
-    "Chemabove[]{}{}": {
-      "snippet": "Chemabove[${3:dim}]{${1:txt1}}{${2:txt2}}"
-    },
-    "Chembelow{}{}": {
-      "snippet": "Chembelow{${1:txt1}}{${2:txt2}}"
-    },
-    "Chembelow[]{}{}": {
-      "snippet": "Chembelow[${3:dim}]{${1:txt1}}{${2:txt2}}"
-    },
-    "chemname{}{}": {
-      "snippet": "chemname{${1:molecule}}{${2:name}}"
-    },
-    "chemname[]{}{}": {
-      "snippet": "chemname[${3:dim}]{${1:molecule}}{${2:name}}"
-    },
-    "chemname*{}": {
-      "snippet": "chemname*{${1:name}}"
-    },
-    "chemnameinit{}": {
-      "snippet": "chemnameinit{${1:arg}}"
-    },
-    "schemestart": {},
-    "schemestart[]": {
-      "snippet": "schemestart[${1:angle,${2:coeff},style}]"
-    },
-    "schemestart[][]": {
-      "snippet": "schemestart[${1:angle,${3:coeff},style}][${2:position}]"
-    },
-    "schemestop": {},
-    "arrow": {},
-    "arrow[]": {
-      "snippet": "arrow[${1:angle,${2:coeff},style}]"
-    },
-    "arrow{}": {
-      "snippet": "arrow{${1:type}}"
-    },
-    "arrow{}[]": {
-      "snippet": "arrow{${1:type}}[${2:angle,${3:coeff},style}]"
-    },
-    "setcompoundstyle{}": {
-      "snippet": "setcompoundstyle{${1:TikZ code}}"
-    },
-    "subscheme{}": {
-      "snippet": "subscheme{${1:code}}"
-    },
-    "definearrow{}{}{}": {
-      "snippet": "definearrow{${1:number}}{${2:name}}{${3:code}}"
-    },
-    "chemleft{}": {
-      "snippet": "chemleft{${1:delim}}"
-    },
-    "chemright{}": {
-      "snippet": "chemright{${1:delim}}"
-    },
-    "chemup{}": {
-      "snippet": "chemup{${1:delim}}"
-    },
-    "chemdown{}": {
-      "snippet": "chemdown{${1:delim}}"
-    },
-    "polymerdelim{}{}": {
-      "snippet": "polymerdelim{${1:node1}}{${2:node2}}"
-    },
-    "polymerdelim[]{}{}": {
-      "snippet": "polymerdelim[${3:options}]{${1:node1}}{${2:node2}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "CFver": {},
-    "CFname": {},
-    "CFdate": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "chemfig style={${1:TikZ keys}}",
-      "atom style={${1:TikZ keys}}",
-      "bond join",
-      "fixed length",
-      "cram rectangle",
-      "cram width=",
-      "cram dash width=",
-      "cram dash sep=",
-      "atom sep=",
-      "bond offset=",
-      "double bond sep=",
-      "angle increment=${1:degrees}",
-      "node style={${1:TikZ keys}}",
-      "bond style={${1:TikZ keys}}",
-      "cycle radius coeff=",
-      "stack sep=",
-      "show cntcycle",
-      "autoreset cntcycle",
-      "compound style={${1:TikZ keys}}",
-      "compound sep=",
-      "arrow offset=",
-      "arrow angle=${1:degrees}",
-      "arrow coeff=${1:decimal}",
-      "arrow style={${1:TikZ keys}}",
-      "arrow double sep=",
-      "arrow double coeff=",
-      "arrow double harpoon",
-      "arrow label sep=",
-      "arrow head=",
-      "+ sep left=",
-      "+ sep right=",
-      "+ vshift=",
-      "gchemname",
-      "schemestart code=${1:code}",
-      "schemestop code=${1:code}",
-      "baseline="
-    ],
-    [
-      "chemfig style={${1:TikZ keys}}",
-      "atom style={${1:TikZ keys}}",
-      "bond join",
-      "fixed length",
-      "cram rectangle",
-      "cram width=",
-      "cram dash width=",
-      "cram dash sep=",
-      "atom sep=",
-      "bond offset=",
-      "double bond sep=",
-      "angle increment=${1:degrees}",
-      "node style={${1:TikZ keys}}",
-      "bond style={${1:TikZ keys}}",
-      "cycle radius coeff=",
-      "stack sep=",
-      "show cntcycle",
-      "autoreset cntcycle",
-      "compound style={${1:TikZ keys}}",
-      "compound sep=",
-      "arrow offset=",
-      "arrow angle=${1:degrees}",
-      "arrow coeff=${1:decimal}",
-      "arrow style={${1:TikZ keys}}",
-      "arrow double sep=",
-      "arrow double coeff=",
-      "arrow double harpoon",
-      "arrow label sep=",
-      "arrow head=",
-      "+ sep left=",
-      "+ sep right=",
-      "+ vshift=",
-      "gchemname",
-      "schemestart code=${1:code}",
-      "schemestop code=${1:code}",
-      "baseline=",
-      "debug",
-      "scheme debug"
-    ],
-    [
-      "debug",
-      "macro atom=${1:cmd}",
-      "circle",
-      "macro charge=${1:cmd}",
-      "extra sep=",
-      "overlay",
-      "shortcuts",
-      "lewisautorot",
-      ".radius=",
-      ":sep=",
-      ".style={${1:TikZ keys}}",
-      "\"length=",
-      "\"width=",
-      "\"style={${1:TikZ keys}}",
-      "|style={${1:TikZ keys}}"
-    ],
-    [
-      "delimiters=",
-      "height=",
-      "depth=",
-      "h align",
-      "auto rotate",
-      "rotate=${1:degrees}",
-      "open xshift=",
-      "close x shift=",
-      "indice=${1:integer}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/chemformula-ru.json b/dev/packages/chemformula-ru.json
index aa30379be..f5daacc88 100644
--- a/dev/packages/chemformula-ru.json
+++ b/dev/packages/chemformula-ru.json
@@ -1,7 +1,5 @@
 {
-  "includes": {
-    "chemformula": []
-  },
+  "includes": {},
   "macros": {},
   "envs": {},
   "options": [
diff --git a/dev/packages/chemformula.json b/dev/packages/chemformula.json
index 38486ecd5..26d290ca6 100644
--- a/dev/packages/chemformula.json
+++ b/dev/packages/chemformula.json
@@ -115,9 +115,6 @@
     "charrow{}[][]": {
       "snippet": "charrow{${1:type}}[${2:above}][${3:below}]"
     },
-    "chname()()": {
-      "snippet": "chname(${1:text 1})(${2:text 2})"
-    },
     "chlewis{}{}": {
       "snippet": "chlewis{${1:electron spec}}{${2:atom}}"
     },
diff --git a/dev/packages/chemist.json b/dev/packages/chemist.json
deleted file mode 100644
index b941145a7..000000000
--- a/dev/packages/chemist.json
+++ /dev/null
@@ -1,470 +0,0 @@
-{
-  "includes": {
-    "assurechemist": []
-  },
-  "macros": {
-    "bury{}": {
-      "snippet": "bury{${1:content}}"
-    },
-    "cdonecell{}{}{}": {
-      "snippet": "cdonecell{${1:dimenA}}{${2:dimenB}}{${3:content}}"
-    },
-    "cdtwocell{}{}{}{}": {
-      "snippet": "cdtwocell{${1:dimenA}}{${2:dimenB}}{${3:content}}{${4:label}}"
-    },
-    "ChemEqFont": {},
-    "ChemForm{}": {
-      "snippet": "ChemForm{${1:formula}}"
-    },
-    "chemform{}": {
-      "snippet": "chemform{${1:formula}}"
-    },
-    "chemistsw": {},
-    "ChemStrut": {},
-    "compd": {},
-    "compdlabel{}": {
-      "snippet": "compdlabel{${1:label}}"
-    },
-    "cref{}": {
-      "snippet": "cref{${1:label}}"
-    },
-    "dbond": {},
-    "degC": {},
-    "degF": {},
-    "deriv": {},
-    "deriva": {},
-    "derivalabel{}": {
-      "snippet": "derivalabel{${1:label}}"
-    },
-    "derivlabel{}": {
-      "snippet": "derivlabel{${1:label}}"
-    },
-    "derivnum": {},
-    "doublebond": {},
-    "eqlbarrowstretch": {},
-    "Equilibarrow": {},
-    "equilibarrow": {},
-    "Equiliblongarrow": {},
-    "equiliblongarrow": {},
-    "fboxit{}{}": {
-      "snippet": "fboxit{${1:width}}{${2:text}}"
-    },
-    "leftshfbox{}": {
-      "snippet": "leftshfbox{${1:text}}"
-    },
-    "leftshframe{}{}": {
-      "snippet": "leftshframe{${1:width}}{${2:text}}"
-    },
-    "Lllongleftarrow": {},
-    "lllongleftarrow": {},
-    "lllongleftharpoondown": {},
-    "lllongleftharpoonup": {},
-    "Lllongleftrightarrow": {},
-    "lllongleftrightarrow": {},
-    "Lllongrightarrow": {},
-    "lllongrightarrow": {},
-    "lllongrightharpoondown": {},
-    "lllongrightharpoonup": {},
-    "Llongleftarrow": {},
-    "llongleftarrow": {},
-    "llongleftharpoondown": {},
-    "llongleftharpoonup": {},
-    "Llongleftrightarrow": {},
-    "llongleftrightarrow": {},
-    "Llongrightarrow": {},
-    "llongrightarrow": {},
-    "llongrightharpoondown": {},
-    "llongrightharpoonup": {},
-    "newchemenvironment{}{}": {
-      "snippet": "newchemenvironment{${1:envname}}{${2:old envname}}"
-    },
-    "nocompd": {},
-    "nocompdlabel{}": {
-      "snippet": "nocompdlabel{${1:label}}"
-    },
-    "noderiv": {},
-    "noderiva": {},
-    "noderivalabel{}": {
-      "snippet": "noderivalabel{${1:label}}"
-    },
-    "noderivlabel{}": {
-      "snippet": "noderivlabel{${1:label}}"
-    },
-    "reactarrowsep": {},
-    "reactarrowseprate": {},
-    "reactdarrow{}{}{}{}": {
-      "snippet": "reactdarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactDEqarrow{}{}{}{}": {
-      "snippet": "reactDEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactdeqarrow{}{}{}{}": {
-      "snippet": "reactdeqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactdlrarrow{}{}{}{}": {
-      "snippet": "reactdlrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactduarrow{}{}{}{}": {
-      "snippet": "reactduarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactEqarrow{}{}{}{}": {
-      "snippet": "reactEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reacteqarrow{}{}{}{}": {
-      "snippet": "reacteqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactlarrow{}{}{}{}": {
-      "snippet": "reactlarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactLEqarrow{}{}{}{}": {
-      "snippet": "reactLEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactleqarrow{}{}{}{}": {
-      "snippet": "reactleqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactlrarrow{}{}{}{}": {
-      "snippet": "reactlrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactnearrow{}{}{}{}": {
-      "snippet": "reactnearrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactnwarrow{}{}{}{}": {
-      "snippet": "reactnwarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactrarrow{}{}{}{}": {
-      "snippet": "reactrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactREqarrow{}{}{}{}": {
-      "snippet": "reactREqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactreqarrow{}{}{}{}": {
-      "snippet": "reactreqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactsearrow{}{}{}{}": {
-      "snippet": "reactsearrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactswarrow{}{}{}{}": {
-      "snippet": "reactswarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactuarrow{}{}{}{}": {
-      "snippet": "reactuarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactUEqarrow{}{}{}{}": {
-      "snippet": "reactUEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactueqarrow{}{}{}{}": {
-      "snippet": "reactueqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactulrarrow{}{}{}{}": {
-      "snippet": "reactulrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactVEqarrow{}{}{}{}": {
-      "snippet": "reactVEqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "reactveqarrow{}{}{}{}": {
-      "snippet": "reactveqarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "rightshfbox{}": {
-      "snippet": "rightshfbox{${1:text}}"
-    },
-    "rightshframe{}{}": {
-      "snippet": "rightshframe{${1:width}}{${2:text}}"
-    },
-    "schemelarrow{}{}{}{}": {
-      "snippet": "schemelarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "schemelrarrow{}{}{}{}": {
-      "snippet": "schemelrarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "schemerarrow{}{}{}{}": {
-      "snippet": "schemerarrow{${1:shift}}{${2:length}}{${3:above}}{${4:below}}"
-    },
-    "tbond": {},
-    "tboxtitle": {},
-    "thecompd": {},
-    "triplebond": {},
-    "aaa": {},
-    "agx": {},
-    "agxdv": {},
-    "agxlatent": {},
-    "bbb": {},
-    "Bib": {},
-    "BibTeX": {},
-    "calcontrolpoints{}": {
-      "snippet": "calcontrolpoints{${1:arg1}}"
-    },
-    "Cent": {},
-    "changespace{}": {
-      "snippet": "changespace{${1:arg1}}"
-    },
-    "chapinitial": {},
-    "ChemAccent{}{}{}": {
-      "snippet": "ChemAccent{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "chemcorr": {},
-    "chemGreekletter{}{}": {
-      "snippet": "chemGreekletter{${1:arg1}}{${2:arg2}}"
-    },
-    "chemtimesfalse": {},
-    "chemtimestrue": {},
-    "chemUpGreekletter{}{}{}": {
-      "snippet": "chemUpGreekletter{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "compdfbox{}{}{}": {
-      "snippet": "compdfbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "compdmbox{}{}{}": {
-      "snippet": "compdmbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "cyandv": {},
-    "cyandye": {},
-    "deHBr": {},
-    "derivfbox{}{}{}": {
-      "snippet": "derivfbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "derivlist{}": {
-      "snippet": "derivlist{${1:arg1}}"
-    },
-    "derivmbox{}{}{}": {
-      "snippet": "derivmbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "downwardarrowcalcA": {},
-    "downwardarrowcalcB": {},
-    "endash": {},
-    "eqproton": {},
-    "ffparbox{}{}": {
-      "snippet": "ffparbox{${1:arg1}}{${2:arg2}}"
-    },
-    "fgcaption": {},
-    "horizon": {},
-    "ifchemtimes": {},
-    "ifupgreekrm": {},
-    "ifverbswitch": {},
-    "jBibTeX": {},
-    "jLaTeX": {},
-    "journalID": {},
-    "jTeX": {},
-    "kanzanchi": {},
-    "kanzanhalf": {},
-    "kkk": {},
-    "La": {},
-    "lbcompdpbox{}{}{}": {
-      "snippet": "lbcompdpbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "lbderivpbox{}{}{}": {
-      "snippet": "lbderivpbox{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "leavechemcorr": {},
-    "Leftarrowfill": {},
-    "Leftrightarrowfill": {},
-    "leftrightarrowfill": {},
-    "lethead{}{}{}": {
-      "snippet": "lethead{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "magentadv": {},
-    "magentadye": {},
-    "member": {},
-    "miniscreentoprule": {},
-    "next": {},
-    "nrep": {},
-    "nrepmax": {},
-    "oldalpha": {},
-    "oldbeta": {},
-    "oldcal": {},
-    "oldchi": {},
-    "oldDelta": {},
-    "olddelta": {},
-    "oldepsilon": {},
-    "oldEquilibarrow": {},
-    "oldequilibarrow": {},
-    "oldEquiliblongarrow": {},
-    "oldequiliblongarrow": {},
-    "oldeta": {},
-    "oldGamma": {},
-    "oldgamma": {},
-    "oldiota": {},
-    "oldkappa": {},
-    "oldlambda": {},
-    "oldLamda": {},
-    "oldLllongleftarrow": {},
-    "oldlllongleftarrow": {},
-    "oldlllongleftharpoondown": {},
-    "oldLllongleftrightarrow": {},
-    "oldlllongleftrightarrow": {},
-    "oldLllongrightarrow": {},
-    "oldlllongrightarrow": {},
-    "oldlllongrightharpoonup": {},
-    "oldLlongleftarrow": {},
-    "oldllongleftarrow": {},
-    "oldllongleftharpoondown": {},
-    "oldLlongleftrightarrow": {},
-    "oldllongleftrightarrow": {},
-    "oldLlongrightarrow": {},
-    "oldllongrightarrow": {},
-    "oldllongrightharpoonup": {},
-    "oldmathcal": {},
-    "oldmathnormal": {},
-    "oldmu": {},
-    "oldnu": {},
-    "oldOmega": {},
-    "oldomega": {},
-    "oldPhi": {},
-    "oldphi": {},
-    "oldPi": {},
-    "oldpi": {},
-    "oldPsi": {},
-    "oldpsi": {},
-    "oldreactdarrow": {},
-    "oldreactdeqarrow": {},
-    "oldreactdlrarrow": {},
-    "oldreactduarrow": {},
-    "oldreacteqarrow": {},
-    "oldreactlarrow": {},
-    "oldreactleqarrow": {},
-    "oldreactlrarrow": {},
-    "oldreactnearrow": {},
-    "oldreactnwarrow": {},
-    "oldreactrarrow": {},
-    "oldreactreqarrow": {},
-    "oldreactsearrow": {},
-    "oldreactswarrow": {},
-    "oldreactuarrow": {},
-    "oldreactueqarrow": {},
-    "oldreactulrarrow": {},
-    "oldreactveqarrow": {},
-    "oldrho": {},
-    "oldschemelarrow{}{}{}{}": {
-      "snippet": "oldschemelarrow{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "oldschemelrarrow{}{}{}{}": {
-      "snippet": "oldschemelrarrow{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "oldschemerarrow{}{}{}{}": {
-      "snippet": "oldschemerarrow{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "oldSigma": {},
-    "oldsigma": {},
-    "oldstyle": {},
-    "oldtau": {},
-    "oldTheta": {},
-    "oldtheta": {},
-    "oldUpsilon": {},
-    "oldupsilon": {},
-    "oldvarepsilon": {},
-    "oldvarphi": {},
-    "oldvarpi": {},
-    "oldvarrho": {},
-    "oldvarsigma": {},
-    "oldvartheta": {},
-    "oldXi": {},
-    "oldxi": {},
-    "oldzeta": {},
-    "penetrate{}{}": {
-      "snippet": "penetrate{${1:arg1}}{${2:arg2}}"
-    },
-    "PiC": {},
-    "PiCTeX": {},
-    "Post": {},
-    "PostScript": {},
-    "pTeX": {},
-    "pushtowall": {},
-    "resetfontsize": {},
-    "Rightarrowfill": {},
-    "rshfboxit{}": {
-      "snippet": "rshfboxit{${1:arg1}}"
-    },
-    "sboxit{}{}": {
-      "snippet": "sboxit{${1:arg1}}{${2:arg2}}"
-    },
-    "Script": {},
-    "SetChemSymbol": {},
-    "smcaption": {},
-    "Sub": {},
-    "SubBib": {},
-    "tbaselineshift": {},
-    "tbcaption": {},
-    "tboxscreentoprule": {},
-    "TestCount": {},
-    "thederiv": {},
-    "tmpkern": {},
-    "tpic": {},
-    "upgreekrmfalse": {},
-    "upgreekrmtrue": {},
-    "upwardarrowcalcA": {},
-    "upwardarrowcalcB": {},
-    "verbatimbaselineskip": {},
-    "verbatimleftmargin": {},
-    "verbatimsize": {},
-    "verbswitchfalse": {},
-    "verbswitchtrue": {},
-    "xlethead{}": {
-      "snippet": "xlethead{${1:arg1}}"
-    },
-    "xymrefa": {},
-    "xymrefb": {},
-    "ybaselineshift": {},
-    "yellowdv": {},
-    "yellowdye": {},
-    "yen": {
-      "detail": "¥",
-      "documentation": "YEN SIGN"
-    },
-    "yubin": {},
-    "Yubin{}": {
-      "snippet": "Yubin{${1:arg1}}"
-    }
-  },
-  "envs": {
-    "ChemEqnarray": {},
-    "ChemEqnarray*": {},
-    "ChemEquation": {},
-    "XyMcompd(width,height)(xshift,yshift){}{}": {
-      "name": "XyMcompd",
-      "snippet": "(${3:width},${4:height})(${5:xshift},${6:yshift}){${1:refkey}}{${2:subkey}}"
-    },
-    "XyMtab{}": {
-      "name": "XyMtab",
-      "snippet": "{${1:cols}}"
-    },
-    "chemeqn": {},
-    "chemeqnarray": {},
-    "chemeqnarraya": {},
-    "chemmath": {},
-    "frameboxit{}": {
-      "name": "frameboxit",
-      "snippet": "{${1:width}}"
-    },
-    "glshfboxit{}": {
-      "name": "glshfboxit",
-      "snippet": "{${1:width}}"
-    },
-    "grshfboxit{}": {
-      "name": "grshfboxit",
-      "snippet": "{${1:width}}"
-    },
-    "lshfboxit{}": {
-      "name": "lshfboxit",
-      "snippet": "{${1:width}}"
-    },
-    "miniscreen{}": {
-      "name": "miniscreen",
-      "snippet": "{${1:width}}"
-    },
-    "rshfboxit{}": {
-      "name": "rshfboxit",
-      "snippet": "{${1:width}}"
-    },
-    "screen": {},
-    "tboxminiscreen{}": {
-      "name": "tboxminiscreen",
-      "snippet": "{${1:width}}"
-    },
-    "tboxscreen": {},
-    "ffboxit": {},
-    "XyMderiv": {}
-  },
-  "options": [
-    "chemtimes"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/chemmacros.json b/dev/packages/chemmacros.json
index 22221e33b..55cb61cd6 100644
--- a/dev/packages/chemmacros.json
+++ b/dev/packages/chemmacros.json
@@ -323,11 +323,6 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
-    "newman[](){}": {
-      "snippet": "newman[${2:options}](${3:angle}){${1:part-list}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "orbital{}": {
       "snippet": "orbital{${1:type}}"
     },
@@ -470,55 +465,22 @@
     "OX{}": {
       "snippet": "OX{${1:name,atom}}"
     },
-    "redox(){}": {
-      "snippet": "redox(${2:name1},${3:name2}){${1:text}}"
-    },
-    "redox()[]{}": {
-      "snippet": "redox(${3:name1},${4:name2})[${2:TikZ-options}]{${1:text}}"
-    },
-    "redox()[][]{}": {
-      "snippet": "redox(${4:name1},${5:name2})[${2:TikZ-options}][${3:vertical-factor}]{${1:text}}"
-    },
     "listschemename": {},
     "schemename": {},
     "listofschemes": {},
-    "NMR{}()[]": {
-      "snippet": "NMR{${1:isotope,element}}(${3:frequency})[${2:solvent}]"
-    },
-    "NMR{}()": {
-      "snippet": "NMR{${1:isotope,element}}(${2:frequency})"
-    },
     "NMR{}": {
       "snippet": "NMR{${1:isotope,element}}"
     },
     "NMR{}[]": {
       "snippet": "NMR{${1:isotope,element}}[${2:solvent}]"
     },
-    "NMR()[]": {
-      "snippet": "NMR(${2:frequency})[${1:solvent}]"
-    },
-    "NMR()": {
-      "snippet": "NMR(${1:frequency})"
-    },
     "NMR": {},
-    "NMR*{}()[]": {
-      "snippet": "NMR*{${1:isotope,element}}(${3:frequency})[${2:solvent}]"
-    },
-    "NMR*{}()": {
-      "snippet": "NMR*{${1:isotope,element}}(${2:frequency})"
-    },
     "NMR*{}": {
       "snippet": "NMR*{${1:isotope,element}}"
     },
     "NMR*{}[]": {
       "snippet": "NMR*{${1:isotope,element}}[${2:solvent}]"
     },
-    "NMR*()[]": {
-      "snippet": "NMR*(${2:frequency})[${1:solvent}]"
-    },
-    "NMR*()": {
-      "snippet": "NMR*(${1:frequency})"
-    },
     "NMR*": {},
     "data{}": {
       "snippet": "data{${1:type}}"
@@ -532,12 +494,6 @@
     "data*{}[]": {
       "snippet": "data*{${1:type}}[${2:specification}]"
     },
-    "J()[]{}": {
-      "snippet": "J(${3:bonds;nuclei})[${2:unit}]{${1:num-list}}"
-    },
-    "J(){}": {
-      "snippet": "J(${2:bonds;nuclei}){${1:num-list}}"
-    },
     "J[]{}": {
       "snippet": "J[${2:unit}]{${1:num-list}}"
     },
@@ -571,99 +527,51 @@
       "keyvalindex": 6,
       "keyvalpos": 0
     },
-    "enthalpy[](){}": {
-      "snippet": "enthalpy[${2:options}](${3:subscript}){${1:value}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
     "enthalpy[]{}": {
       "snippet": "enthalpy[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
-    "enthalpy(){}": {
-      "snippet": "enthalpy(${2:subscript}){${1:value}}"
-    },
     "enthalpy{}": {
       "snippet": "enthalpy{${1:value}}"
     },
-    "enthalpy*[](){}": {
-      "snippet": "enthalpy*[${2:options}](${3:subscript}){${1:value}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
     "enthalpy*[]{}": {
       "snippet": "enthalpy*[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
-    "enthalpy*(){}": {
-      "snippet": "enthalpy*(${2:subscript}){${1:value}}"
-    },
     "enthalpy*{}": {
       "snippet": "enthalpy*{${1:value}}"
     },
-    "entropy[](){}": {
-      "snippet": "entropy[${2:options}](${3:subscript}){${1:value}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
     "entropy[]{}": {
       "snippet": "entropy[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
-    "entropy(){}": {
-      "snippet": "entropy(${2:subscript}){${1:value}}"
-    },
     "entropy{}": {
       "snippet": "entropy{${1:value}}"
     },
-    "entropy*[](){}": {
-      "snippet": "entropy*[${2:options}](${3:subscript}){${1:value}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
     "entropy*[]{}": {
       "snippet": "entropy*[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
-    "entropy*(){}": {
-      "snippet": "entropy*(${2:subscript}){${1:value}}"
-    },
     "entropy*{}": {
       "snippet": "entropy*{${1:value}}"
     },
-    "gibbs[](){}": {
-      "snippet": "gibbs[${2:options}](${3:subscript}){${1:value}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
     "gibbs[]{}": {
       "snippet": "gibbs[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
-    "gibbs(){}": {
-      "snippet": "gibbs(${2:subscript}){${1:value}}"
-    },
     "gibbs{}": {
       "snippet": "gibbs{${1:value}}"
     },
-    "gibbs*[](){}": {
-      "snippet": "gibbs*[${2:options}](${3:subscript}){${1:value}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
     "gibbs*[]{}": {
       "snippet": "gibbs*[${2:options}]{${1:value}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
-    "gibbs*(){}": {
-      "snippet": "gibbs*(${2:subscript}){${1:value}}"
-    },
     "gibbs*{}": {
       "snippet": "gibbs*{${1:value}}"
     },
diff --git a/dev/packages/chemplants.json b/dev/packages/chemplants.json
index 5fb0ab6c3..ec00cc724 100644
--- a/dev/packages/chemplants.json
+++ b/dev/packages/chemplants.json
@@ -8,10 +8,10 @@
   },
   "macros": {
     "measure{}{}{}": {
-      "snippet": "measure{${1:(${4:x1},${5:y1})}}{${2:(${6:x2},${7:y2})}}{${3:label}}"
+      "snippet": "measure{${1:(${4:x1,y1})}}{${2:(${5:x2,y2})}}{${3:label}}"
     },
     "measure[]{}{}{}": {
-      "snippet": "measure[${4:anchor spec}]{${1:(${5:x1},${6:y1})}}{${2:(${7:x2},${8:y2})}}{${3:label}}"
+      "snippet": "measure[${4:anchor spec}]{${1:(${5:x1,y1})}}{${2:(${6:x2,y2})}}{${3:label}}"
     },
     "setchpblockfontsize{}": {
       "snippet": "setchpblockfontsize{${1:fontsize}}"
diff --git a/dev/packages/chemstr.json b/dev/packages/chemstr.json
index 5f5f2855a..c4e9115b8 100644
--- a/dev/packages/chemstr.json
+++ b/dev/packages/chemstr.json
@@ -6,15 +6,9 @@
     "addbscolor{}{}": {
       "snippet": "addbscolor{${1:bondcolor}}{${2:substituent}}"
     },
-    "ayl(){}": {
-      "snippet": "ayl(${2:x},${3:y}){${1:stuff}}"
-    },
     "ayl{}": {
       "snippet": "ayl{${1:stuff}}"
     },
-    "BiFunc(){}{}{}": {
-      "snippet": "BiFunc(${4:xslope},${5:yslope}){${1:length}}{${2:moietyA}}{${3:moietyB}}"
-    },
     "bscolorswOFF": {},
     "bscolorswON": {},
     "changeunitlength{}": {
@@ -29,9 +23,6 @@
     "lmoiety{}": {
       "snippet": "lmoiety{${1:substituent}}"
     },
-    "lyl(){}": {
-      "snippet": "lyl(${2:link}){${1:ylgroup}}"
-    },
     "member": {},
     "originalpicture": {},
     "origptfalse": {},
@@ -53,9 +44,6 @@
     "rmoiety{}": {
       "snippet": "rmoiety{${1:substituent}}"
     },
-    "ryl(){}": {
-      "snippet": "ryl(${2:link}){${1:ylgroup}}"
-    },
     "SetTwoAtoms{}": {
       "snippet": "SetTwoAtoms{${1:frontobject}}"
     },
diff --git a/dev/packages/chet.json b/dev/packages/chet.json
deleted file mode 100644
index 938191a4f..000000000
--- a/dev/packages/chet.json
+++ /dev/null
@@ -1,243 +0,0 @@
-{
-  "includes": {
-    "kvoptions": [],
-    "xspace": [],
-    "datetime": [],
-    "amsmath": [],
-    "caption": [],
-    "tocloft": [],
-    "cite": [],
-    "collref": [],
-    "color": [],
-    "microtype": [],
-    "manyfoot": [],
-    "footmisc": [],
-    "filecontents": [],
-    "geometry": [],
-    "hyperref": []
-  },
-  "macros": {
-    "draftmode": {},
-    "titlemath{}": {
-      "snippet": "titlemath{${1:math}}"
-    },
-    "email{}": {
-      "snippet": "email{${1:email}}"
-    },
-    "emailV{}": {
-      "snippet": "emailV{${1:email}}"
-    },
-    "emails{}": {
-      "snippet": "emails{${1:emails}}"
-    },
-    "newsec{}": {
-      "snippet": "newsec{${1:title}}"
-    },
-    "newsec{}[]": {
-      "snippet": "newsec{${1:title}}[${2:label}]"
-    },
-    "subsec{}": {
-      "snippet": "subsec{${1:title}}"
-    },
-    "subsec{}[]": {
-      "snippet": "subsec{${1:title}}[${2:label}]"
-    },
-    "subsubsec{}": {
-      "snippet": "subsubsec{${1:title}}"
-    },
-    "subsubsec{}[]": {
-      "snippet": "subsubsec{${1:title}}[${2:label}]"
-    },
-    "eqn{}": {
-      "snippet": "eqn{${1:math}}"
-    },
-    "eqn{}[]": {
-      "snippet": "eqn{${1:math}}[${2:label}]"
-    },
-    "eqna{}": {
-      "snippet": "eqna{${1:math}}"
-    },
-    "eqna{}[]": {
-      "snippet": "eqna{${1:math}}[${2:label}]"
-    },
-    "twoseqn{}{}": {
-      "snippet": "twoseqn{${1:math1}}{${2:math2}}"
-    },
-    "twoseqn{}{}[]": {
-      "snippet": "twoseqn{${1:math1}}{${2:math2}}[${3:label2}]"
-    },
-    "twoseqn{}{}[][]": {
-      "snippet": "twoseqn{${1:math1}}{${2:math2}}[${3:label2}][${4:overall-label}]"
-    },
-    "twoseqn{}[]{}": {
-      "snippet": "twoseqn{${1:math1}}[${2:label1}]{${3:math2}}"
-    },
-    "twoseqn{}[]{}[]": {
-      "snippet": "twoseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]"
-    },
-    "twoseqn{}[]{}[][]": {
-      "snippet": "twoseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}][${5:overall-label}]"
-    },
-    "threeseqn{}{}{}": {
-      "snippet": "threeseqn{${1:math1}}{${2:math2}}{${3:math3}}"
-    },
-    "threeseqn{}{}{}[]": {
-      "snippet": "threeseqn{${1:math1}}{${2:math2}}{${3:math3}}[${4:label3}]"
-    },
-    "threeseqn{}{}[]{}": {
-      "snippet": "threeseqn{${1:math1}}{${2:math2}}[${3:label2}]{${4:math3}}"
-    },
-    "threeseqn{}[]{}{}": {
-      "snippet": "threeseqn{${1:math1}}[${2:label1}]{${3:math2}}{${4:math3}}"
-    },
-    "threeseqn{}[]{}[]{}[]": {
-      "snippet": "threeseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}]"
-    },
-    "threeseqn{}[]{}[]{}[][]": {
-      "snippet": "threeseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}][${7:overall-label}]"
-    },
-    "fourseqn{}{}{}{}": {
-      "snippet": "fourseqn{${1:math1}}{${2:math2}}{${3:math3}}{${4:math4}}"
-    },
-    "fourseqn{}{}{}{}[]": {
-      "snippet": "fourseqn{${1:math1}}{${2:math2}}{${3:math3}}{${4:math4}}[${5:label4}]"
-    },
-    "fourseqn{}{}{}[]{}": {
-      "snippet": "fourseqn{${1:math1}}{${2:math2}}{${3:math3}}[${4:label3}]{${5:math4}}"
-    },
-    "fourseqn{}{}[]{}{}": {
-      "snippet": "fourseqn{${1:math1}}{${2:math2}}[${3:label2}]{${4:math3}}{${5:math4}}"
-    },
-    "fourseqn{}[]{}{}{}": {
-      "snippet": "fourseqn{${1:math1}}[${2:label1}]{${3:math2}}{${4:math3}}{${5:math4}}"
-    },
-    "fourseqn{}[]{}[]{}[]{}[]": {
-      "snippet": "fourseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}]{${7:math4}}[${8:label4}]"
-    },
-    "fourseqn{}[]{}[]{}[]{}[][]": {
-      "snippet": "fourseqn{${1:math1}}[${2:label1}]{${3:math2}}[${4:label2}]{${5:math3}}[${6:label3}]{${7:math4}}[${8:label4}][${9:overall-label}]"
-    },
-    "rcite{}": {
-      "snippet": "rcite{${1:bibid}}"
-    },
-    "rcite[]{}": {
-      "snippet": "rcite[${2:add. text}]{${1:bibid}}"
-    },
-    "toc": {},
-    "foot{}": {
-      "snippet": "foot{${1:text}}"
-    },
-    "foot[]{}": {
-      "snippet": "foot[${2:number}]{${1:text}}"
-    },
-    "ack{}": {
-      "snippet": "ack{${1:acknowledgments}}"
-    },
-    "appendices": {},
-    "preprint{}": {
-      "snippet": "preprint{${1:preprint}}"
-    },
-    "affiliation{}": {
-      "snippet": "affiliation{${1:affiliation}}"
-    },
-    "abstract{}": {
-      "snippet": "abstract{${1:text}}"
-    },
-    "mytitlefont": {},
-    "rcitedraft{}": {
-      "snippet": "rcitedraft{${1:bibid}}"
-    },
-    "showkeyslabelformat{}": {
-      "snippet": "showkeyslabelformat{${1:text}}"
-    },
-    "footinsE": {},
-    "thefootnoteE": {},
-    "FootnoteE{}{}": {
-      "snippet": "FootnoteE{${1:marker}}{${2:text}}"
-    },
-    "FootnotemarkE{}": {
-      "snippet": "FootnotemarkE{${1:marker}}"
-    },
-    "FootnotetextE{}{}": {
-      "snippet": "FootnotetextE{${1:marker}}{${2:text}}"
-    },
-    "footnoteE{}": {
-      "snippet": "footnoteE{${1:text}}"
-    },
-    "footnoteE[]{}": {
-      "snippet": "footnoteE[${2:number}]{${1:text}}"
-    },
-    "footnotemarkE": {},
-    "footnotemarkE[]": {
-      "snippet": "footnotemarkE[${1:number}]"
-    },
-    "footnotetextE{}": {
-      "snippet": "footnotetextE{${1:text}}"
-    },
-    "footnotetextE[]{}": {
-      "snippet": "footnotetextE[${2:number}]{${1:text}}"
-    },
-    "footinsEE": {},
-    "thefootnoteEE": {},
-    "FootnoteEE{}{}": {
-      "snippet": "FootnoteEE{${1:marker}}{${2:text}}"
-    },
-    "FootnotemarkEE{}": {
-      "snippet": "FootnotemarkEE{${1:marker}}"
-    },
-    "FootnotetextEE{}{}": {
-      "snippet": "FootnotetextEE{${1:marker}}{${2:text}}"
-    },
-    "footnoteEE{}": {
-      "snippet": "footnoteEE{${1:text}}"
-    },
-    "footnoteEE[]{}": {
-      "snippet": "footnoteEE[${2:number}]{${1:text}}"
-    },
-    "footnotemarkEE": {},
-    "footnotemarkEE[]": {
-      "snippet": "footnotemarkEE[${1:number}]"
-    },
-    "footnotetextEE{}": {
-      "snippet": "footnotetextEE{${1:text}}"
-    },
-    "footnotetextEE[]{}": {
-      "snippet": "footnotetextEE[${2:number}]{${1:text}}"
-    },
-    "footinsEEE": {},
-    "thefootnoteEEE": {},
-    "FootnoteEEE{}{}": {
-      "snippet": "FootnoteEEE{${1:marker}}{${2:text}}"
-    },
-    "FootnotemarkEEE{}": {
-      "snippet": "FootnotemarkEEE{${1:marker}}"
-    },
-    "FootnotetextEEE{}{}": {
-      "snippet": "FootnotetextEEE{${1:marker}}{${2:text}}"
-    },
-    "footnoteEEE{}": {
-      "snippet": "footnoteEEE{${1:text}}"
-    },
-    "footnoteEEE[]{}": {
-      "snippet": "footnoteEEE[${2:number}]{${1:text}}"
-    },
-    "footnotemarkEEE": {},
-    "footnotemarkEEE[]": {
-      "snippet": "footnotemarkEEE[${1:number}]"
-    },
-    "footnotetextEEE{}": {
-      "snippet": "footnotetextEEE{${1:text}}"
-    },
-    "footnotetextEEE[]{}": {
-      "snippet": "footnotetextEEE[${2:number}]{${1:text}}"
-    }
-  },
-  "envs": {
-    "acknowledgments": {},
-    "appendices": {}
-  },
-  "options": [
-    "macrosonly"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/chextras.json b/dev/packages/chextras.json
index 0bef3c6db..ae5591264 100644
--- a/dev/packages/chextras.json
+++ b/dev/packages/chextras.json
@@ -328,9 +328,6 @@
     "fgii": {
       "option": "french"
     },
-    "fprimo)": {
-      "option": "french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/chmst-pdf.json b/dev/packages/chmst-pdf.json
index 991de3cd4..5362095d6 100644
--- a/dev/packages/chmst-pdf.json
+++ b/dev/packages/chmst-pdf.json
@@ -5,60 +5,6 @@
   },
   "macros": {
     "chmstpdfsw": {},
-    "electronHldshiftarrow()()": {
-      "snippet": "electronHldshiftarrow(${1:xend},${2:yend})(${3:xstart},${4:ystart})"
-    },
-    "electronHldshiftarrow[]()()": {
-      "snippet": "electronHldshiftarrow[${1:direction}](${2:xend},${3:yend})(${4:xstart},${5:ystart})"
-    },
-    "electronHlushiftarrow()()": {
-      "snippet": "electronHlushiftarrow(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "electronHlushiftarrow[]()()": {
-      "snippet": "electronHlushiftarrow[${1:direction}](${2:xstart},${3:ystart})(${4:xend},${5:yend})"
-    },
-    "electronHrdshiftarrow()()": {
-      "snippet": "electronHrdshiftarrow(${1:xend},${2:yend})(${3:xstart},${4:ystart})"
-    },
-    "electronHrdshiftarrow[]()()": {
-      "snippet": "electronHrdshiftarrow[${1:direction}](${2:xend},${3:yend})(${4:xstart},${5:ystart})"
-    },
-    "electronHrushiftarrow()()": {
-      "snippet": "electronHrushiftarrow(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "electronHrushiftarrow[]()()": {
-      "snippet": "electronHrushiftarrow[${1:direction}](${2:xstart},${3:ystart})(${4:xend},${5:yend})"
-    },
-    "electronlshiftarrow()()": {
-      "snippet": "electronlshiftarrow(${1:xend},${2:yend})(${3:xstart},${4:ystart})"
-    },
-    "electronlshiftarrow[]()()": {
-      "snippet": "electronlshiftarrow[${1:direction}](${2:xend},${3:yend})(${4:xstart},${5:ystart})"
-    },
-    "electronrshiftarrow()()": {
-      "snippet": "electronrshiftarrow(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "electronrshiftarrow[]()()": {
-      "snippet": "electronrshiftarrow[${1:direction}](${2:xstart},${3:ystart})(${4:xend},${5:yend})"
-    },
-    "electronshiftArrowl()()()()": {
-      "snippet": "electronshiftArrowl(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
-    },
-    "electronshiftArrowr()()()()": {
-      "snippet": "electronshiftArrowr(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
-    },
-    "electronshiftHld()()()()": {
-      "snippet": "electronshiftHld(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
-    },
-    "electronshiftHlu()()()()": {
-      "snippet": "electronshiftHlu(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
-    },
-    "electronshiftHrd()()()()": {
-      "snippet": "electronshiftHrd(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
-    },
-    "electronshiftHru()()()()": {
-      "snippet": "electronshiftHru(${1:xstart},${2:ystart})(${3:xctrl1},${4:yctrl1})(${5:xctrl2},${6:yctrl2})(${7:xend},${8:yend})"
-    },
     "futuresubst{}": {
       "snippet": "futuresubst{${1:content}}"
     },
diff --git a/dev/packages/circuitikz.json b/dev/packages/circuitikz.json
index b9d0a4c89..10d7aa748 100644
--- a/dev/packages/circuitikz.json
+++ b/dev/packages/circuitikz.json
@@ -69,7 +69,7 @@
       "snippet": "ctikztextnot{${1:text}}"
     },
     "ctikzsubcircuitdef{}{}{}": {
-      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,${4:anchor2},...}}{${3:definition}}"
+      "snippet": "ctikzsubcircuitdef{${1:name}}{${2:anchor1,anchor2,...}}{${3:definition}}"
     },
     "ctikzsubcircuitactivate{}": {
       "snippet": "ctikzsubcircuitactivate{${1:name}}"
diff --git a/dev/packages/citation-style-language.json b/dev/packages/citation-style-language.json
index 45d160a1a..dba06d8ed 100644
--- a/dev/packages/citation-style-language.json
+++ b/dev/packages/citation-style-language.json
@@ -79,14 +79,6 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
-    "fullcite{}": {
-      "snippet": "fullcite{${1:keylist}}"
-    },
-    "fullcite[]{}": {
-      "snippet": "fullcite[${2:options}]{${1:keylist}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "printbibliography": {},
     "printbibliography[]": {
       "snippet": "printbibliography[${1:options}]",
diff --git a/dev/packages/cite.json b/dev/packages/cite.json
deleted file mode 100644
index b0f2c1e09..000000000
--- a/dev/packages/cite.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "citeform": {},
-    "citepunct": {},
-    "citeleft": {},
-    "citeright": {},
-    "citemid": {},
-    "citedash": {},
-    "CiteMoveChars": {},
-    "OverciteFont": {},
-    "citeprepenalty": {},
-    "citemidpenalty": {},
-    "citepunctpenalty": {},
-    "citenum{}": {
-      "snippet": "citenum{${1:bibid}}"
-    },
-    "citen{}": {
-      "snippet": "citen{${1:bibid}}"
-    },
-    "citeonline{}": {
-      "snippet": "citeonline{${1:bibid}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "superscript",
-    "super",
-    "ref",
-    "nospace",
-    "space",
-    "nobreak",
-    "nosort",
-    "sort",
-    "nomove",
-    "move",
-    "noadjust",
-    "adjust",
-    "nocompress",
-    "compress",
-    "biblabel"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/class-abntex2.json b/dev/packages/class-abntex2.json
index 15a50190b..f76e22c15 100644
--- a/dev/packages/class-abntex2.json
+++ b/dev/packages/class-abntex2.json
@@ -23,7 +23,7 @@
     },
     "imprimirtituloestrangeiro": {},
     "autor{}": {
-      "snippet": "autor{${1:nome do(${2:s}) autor(${3:es})}}"
+      "snippet": "autor{${1:nome do(s) autor(${2:es})}}"
     },
     "imprimirautor": {},
     "data{}": {
@@ -47,18 +47,18 @@
     },
     "imprimirtipotrabalho": {},
     "orientador{}": {
-      "snippet": "orientador{${1:nome do(${2:s}) orientador(${3:es})}}"
+      "snippet": "orientador{${1:nome do(s) orientador(${2:es})}}"
     },
     "orientador[]{}": {
-      "snippet": "orientador[${2:rótulo}]{${1:nome do(${3:s}) orientador(${4:es})}}"
+      "snippet": "orientador[${2:rótulo}]{${1:nome do(s) orientador(${3:es})}}"
     },
     "imprimirorientador": {},
     "imprimirorientadorRotulo": {},
     "coorientador{}": {
-      "snippet": "coorientador{${1:nome do(${2:s}) coorientador(${3:es})}}"
+      "snippet": "coorientador{${1:nome do(s) coorientador(${2:es})}}"
     },
     "coorientador[]{}": {
-      "snippet": "coorientador[${2:rótulo}]{${1:nome do(${3:s}) coorientador(${4:es})}}"
+      "snippet": "coorientador[${2:rótulo}]{${1:nome do(s) coorientador(${3:es})}}"
     },
     "imprimircoorientador": {},
     "imprimircoorientadorRotulo": {},
diff --git a/dev/packages/class-acmart.json b/dev/packages/class-acmart.json
index 6f97bbe1f..7e8c9899c 100644
--- a/dev/packages/class-acmart.json
+++ b/dev/packages/class-acmart.json
@@ -581,9 +581,6 @@
     "fgii": {
       "option": "language=french"
     },
-    "fprimo)": {
-      "option": "language=french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "language=french"
diff --git a/dev/packages/class-altacv.json b/dev/packages/class-altacv.json
index bbd266cda..b69421c99 100644
--- a/dev/packages/class-altacv.json
+++ b/dev/packages/class-altacv.json
@@ -145,7 +145,7 @@
     "xetexorluatextrue": {},
     "xetexorluatexfalse": {},
     "mynames{}": {
-      "snippet": "mynames{${1:name1,${2:name2},...}}"
+      "snippet": "mynames{${1:name1,name2,...}}"
     },
     "utffriendlydetokenize{}": {
       "snippet": "utffriendlydetokenize{${1:arg}}"
diff --git a/dev/packages/class-aomart.json b/dev/packages/class-aomart.json
index 85b0a709c..88af9a753 100644
--- a/dev/packages/class-aomart.json
+++ b/dev/packages/class-aomart.json
@@ -4,7 +4,6 @@
     "fancyhdr": [],
     "lastpage": [],
     "ifpdf": [],
-    "graphicx": [],
     "environ": [],
     "yhmath": [],
     "cmtiup": [],
diff --git a/dev/packages/class-apa6.json b/dev/packages/class-apa6.json
index be33be5c6..9eaffb201 100644
--- a/dev/packages/class-apa6.json
+++ b/dev/packages/class-apa6.json
@@ -432,18 +432,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "biblatex"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "biblatex"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "biblatex"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "biblatex"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "biblatex"
@@ -452,10 +440,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "biblatex"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "biblatex"
-    },
     "maskparencite[][]{}": {
       "snippet": "maskparencite[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "mask"
@@ -601,7 +585,7 @@
       "snippet": "keywords{${1:keywords}}"
     },
     "leftheader{}": {
-      "snippet": "leftheader{${1:author last name(${2:s})}}"
+      "snippet": "leftheader{${1:author last name(s)}}"
     },
     "note{}": {
       "snippet": "note{${1:text}}"
diff --git a/dev/packages/class-asmeconf.json b/dev/packages/class-asmeconf.json
index 8b376f211..e3f285519 100644
--- a/dev/packages/class-asmeconf.json
+++ b/dev/packages/class-asmeconf.json
@@ -678,9 +678,6 @@
     "fgii": {
       "option": "french"
     },
-    "fprimo)": {
-      "option": "french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
@@ -2286,7 +2283,7 @@
       "snippet": "SetAffiliation{${1:number}}{${2:address}}"
     },
     "SetAuthors{}": {
-      "snippet": "SetAuthors{${1:name1,${2:name2},...}}"
+      "snippet": "SetAuthors{${1:name1,name2,...}}"
     },
     "sfalpha": {},
     "sfbeta": {},
diff --git a/dev/packages/class-asmejour.json b/dev/packages/class-asmejour.json
index 65d39bb4d..38ab1542c 100644
--- a/dev/packages/class-asmejour.json
+++ b/dev/packages/class-asmejour.json
@@ -677,9 +677,6 @@
     "fgii": {
       "option": "french"
     },
-    "fprimo)": {
-      "option": "french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-bfhpub.json b/dev/packages/class-bfhpub.json
index ad736de12..01801a089 100644
--- a/dev/packages/class-bfhpub.json
+++ b/dev/packages/class-bfhpub.json
@@ -71,11 +71,11 @@
       "option": "type=projectproposal"
     },
     "DisplayCompetenceRatingChart{}": {
-      "snippet": "DisplayCompetenceRatingChart{${1:name1=val1,${2:name2=val2},...}}",
+      "snippet": "DisplayCompetenceRatingChart{${1:name1=val1,name2=val2,...}}",
       "option": "type=projectproposal"
     },
     "DisplayCompetenceRatingChart[]{}": {
-      "snippet": "DisplayCompetenceRatingChart[${2:options}]{${1:name1=val1,${3:name2=val2},...}}",
+      "snippet": "DisplayCompetenceRatingChart[${2:options}]{${1:name1=val1,name2=val2,...}}",
       "option": "type=projectproposal",
       "keyvalindex": 0,
       "keyvalpos": 0
diff --git a/dev/packages/class-bitart.json b/dev/packages/class-bitart.json
index dab782ec7..17860e6eb 100644
--- a/dev/packages/class-bitart.json
+++ b/dev/packages/class-bitart.json
@@ -342,18 +342,6 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -362,26 +350,10 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -389,10 +361,6 @@
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-bitbook.json b/dev/packages/class-bitbook.json
index 06ccd9df8..26c05377b 100644
--- a/dev/packages/class-bitbook.json
+++ b/dev/packages/class-bitbook.json
@@ -215,44 +215,20 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-bjfuthesis.json b/dev/packages/class-bjfuthesis.json
index 9c7bdcdf0..fff4636cd 100644
--- a/dev/packages/class-bjfuthesis.json
+++ b/dev/packages/class-bjfuthesis.json
@@ -23,10 +23,10 @@
     },
     "kaiti": {},
     "keywordscn{}": {
-      "snippet": "keywordscn{${1:keyword1,${2:keyword2},...}}"
+      "snippet": "keywordscn{${1:keyword1,keyword2,...}}"
     },
     "keywordsen{}": {
-      "snippet": "keywordsen{${1:keyword1,${2:keyword2},...}}"
+      "snippet": "keywordsen{${1:keyword1,keyword2,...}}"
     },
     "oldbackmatter": {},
     "oldfrontmatter": {},
@@ -216,44 +216,20 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-bookcover.json b/dev/packages/class-bookcover.json
index 7c9574de4..8d7e6b7a3 100644
--- a/dev/packages/class-bookcover.json
+++ b/dev/packages/class-bookcover.json
@@ -13,7 +13,7 @@
       "snippet": "bookcovercomponent{${1:type}}{${2:part}}{${3:content}}"
     },
     "bookcovercomponent{}{}[]{}": {
-      "snippet": "bookcovercomponent{${1:type}}{${2:part}}[${3:left,${5:bottom},${6:right},top}]{${4:content}}"
+      "snippet": "bookcovercomponent{${1:type}}{${2:part}}[${3:left,bottom,right,top}]{${4:content}}"
     },
     "partheight": {},
     "partwidth": {},
@@ -34,7 +34,7 @@
       "option": "trimmed=true"
     },
     "bookcovertrimmedpart{}[]": {
-      "snippet": "bookcovertrimmedpart{${1:trimmed part}}[${2:left,${3:bottom},${4:right},top}]",
+      "snippet": "bookcovertrimmedpart{${1:trimmed part}}[${2:left,bottom,right,top}]",
       "option": "trimmed=true"
     },
     "setbookcover{}": {
@@ -70,7 +70,7 @@
       "snippet": "letnamebookcoverpart{${1:new part}}{${2:defined part}}"
     },
     "letnamebookcoverpart{}{}[]": {
-      "snippet": "letnamebookcoverpart{${1:new part}}{${2:defined part}}[${3:left,${4:bottom},${5:right},top}]"
+      "snippet": "letnamebookcoverpart{${1:new part}}{${2:defined part}}[${3:left,bottom,right,top}]"
     },
     "newbookcovercomponenttype{}{}": {
       "snippet": "newbookcovercomponenttype{${1:new type}}{${2:formatting}}"
@@ -96,7 +96,7 @@
     },
     "bookcoverelement{}{}[]": {
       "name": "bookcoverelement",
-      "snippet": "{${1:type}}{${2:part}}[${3:left,${4:bottom},${5:right},top}]"
+      "snippet": "{${1:type}}{${2:part}}[${3:left,bottom,right,top}]"
     },
     "bookcoverdescription": {}
   },
diff --git a/dev/packages/class-cquthesis.json b/dev/packages/class-cquthesis.json
index 9395a72b8..2665d01db 100644
--- a/dev/packages/class-cquthesis.json
+++ b/dev/packages/class-cquthesis.json
@@ -54,7 +54,7 @@
     },
     "cdate": {},
     "cec{}": {
-      "snippet": "cec{${1:molecule1,${2:molecule2},...}}"
+      "snippet": "cec{${1:molecule1,molecule2,...}}"
     },
     "cftafterequENtitle": {},
     "cftafterequtitle": {},
@@ -66,7 +66,7 @@
       "snippet": "chapterstar{${1:title}}"
     },
     "ckeywords{}": {
-      "snippet": "ckeywords{${1:关键词 1,${2:关键词 2},...}}"
+      "snippet": "ckeywords{${1:关键词 1,关键词 2,...}}"
     },
     "colsep": {},
     "colsep[]": {
@@ -80,7 +80,7 @@
     "cquthesis": {},
     "edate": {},
     "ekeywords{}": {
-      "snippet": "ekeywords{${1:keyword1,${2:keyword2},...}}"
+      "snippet": "ekeywords{${1:keyword1,keyword2,...}}"
     },
     "eqlist{}": {
       "snippet": "eqlist{${1:中文 name}}"
diff --git a/dev/packages/class-droit-fr.json b/dev/packages/class-droit-fr.json
index 800f03ed3..ba0906154 100644
--- a/dev/packages/class-droit-fr.json
+++ b/dev/packages/class-droit-fr.json
@@ -211,9 +211,6 @@
     "fgii": {
       "option": "french"
     },
-    "fprimo)": {
-      "option": "french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-elegantbook.json b/dev/packages/class-elegantbook.json
index f750654f7..7bd66309e 100644
--- a/dev/packages/class-elegantbook.json
+++ b/dev/packages/class-elegantbook.json
@@ -459,9 +459,6 @@
     "fgii": {
       "option": "fr"
     },
-    "fprimo)": {
-      "option": "fr"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "fr"
diff --git a/dev/packages/class-elteikthesis.json b/dev/packages/class-elteikthesis.json
index 0f1aef589..b22d325bb 100644
--- a/dev/packages/class-elteikthesis.json
+++ b/dev/packages/class-elteikthesis.json
@@ -196,12 +196,6 @@
     "Apageref{}": {
       "snippet": "Apageref{${1:label}}"
     },
-    "aref({})": {
-      "snippet": "aref(${2:{${1:label}}})"
-    },
-    "Aref({})": {
-      "snippet": "Aref(${2:{${1:label}}})"
-    },
     "aref*{}": {
       "snippet": "aref*{${1:label}}"
     },
diff --git a/dev/packages/class-fei.json b/dev/packages/class-fei.json
index 4046f2920..a716a5f63 100644
--- a/dev/packages/class-fei.json
+++ b/dev/packages/class-fei.json
@@ -479,24 +479,12 @@
     "apud{}{}": {
       "snippet": "apud{${1:bibid}}{${2:bibid}}"
     },
-    "apud(){}{}": {
-      "snippet": "apud(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "apud()(){}{}": {
-      "snippet": "apud(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "apud()()[]{}[]{}": {
-      "snippet": "apud(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "apud[]{}[]{}": {
       "snippet": "apud[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "apud[][]{}[][]{}": {
       "snippet": "apud[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "apud()()[][]{}[][]{}": {
-      "snippet": "apud(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "plaincite[][]{}": {
       "snippet": "plaincite[${2:prenote}][${3:postnote}]{${1:bibid}}"
     },
diff --git a/dev/packages/class-gztarticle.json b/dev/packages/class-gztarticle.json
index df2e9a891..2ffafa800 100644
--- a/dev/packages/class-gztarticle.json
+++ b/dev/packages/class-gztarticle.json
@@ -264,7 +264,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-hecthese.json b/dev/packages/class-hecthese.json
index d13f0ec2e..d8673aaf2 100644
--- a/dev/packages/class-hecthese.json
+++ b/dev/packages/class-hecthese.json
@@ -377,9 +377,6 @@
     "fgii": {
       "option": "french"
     },
-    "fprimo)": {
-      "option": "french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-hgbarticle.json b/dev/packages/class-hgbarticle.json
index cd31f0c99..f0b5d329b 100644
--- a/dev/packages/class-hgbarticle.json
+++ b/dev/packages/class-hgbarticle.json
@@ -86,18 +86,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "apa"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -105,10 +93,6 @@
     "nptextcites[][]{}[][]{}": {
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
-    },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-hgbreport.json b/dev/packages/class-hgbreport.json
index e38470192..00ca88868 100644
--- a/dev/packages/class-hgbreport.json
+++ b/dev/packages/class-hgbreport.json
@@ -87,18 +87,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "apa"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -106,10 +94,6 @@
     "nptextcites[][]{}[][]{}": {
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
-    },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-hgbthesis.json b/dev/packages/class-hgbthesis.json
index ffd1ee5cd..1be4e6494 100644
--- a/dev/packages/class-hgbthesis.json
+++ b/dev/packages/class-hgbthesis.json
@@ -85,18 +85,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "apa"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -105,10 +93,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa"
-    },
     "advisor{}": {
       "snippet": "advisor{${1:name}}"
     },
diff --git a/dev/packages/class-iopart.json b/dev/packages/class-iopart.json
index 3f5af7f43..7854b06b7 100644
--- a/dev/packages/class-iopart.json
+++ b/dev/packages/class-iopart.json
@@ -370,9 +370,6 @@
     "pcal": {},
     "pmit": {},
     "psemicolon": {},
-    "pt()": {
-      "snippet": "pt(${1:arg})"
-    },
     "sssty": {},
     "ssty": {},
     "theeqnval": {},
diff --git a/dev/packages/class-l3doc.json b/dev/packages/class-l3doc.json
index 219863e77..50c715965 100644
--- a/dev/packages/class-l3doc.json
+++ b/dev/packages/class-l3doc.json
@@ -185,11 +185,11 @@
     },
     "macro{}": {
       "name": "macro",
-      "snippet": "{${1:macro1,${2:macro2},...}}"
+      "snippet": "{${1:macro1,macro2,...}}"
     },
     "macro[]{}": {
       "name": "macro",
-      "snippet": "[${2:options}]{${1:macro1,${3:macro2},...}}",
+      "snippet": "[${2:options}]{${1:macro1,macro2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -231,11 +231,14 @@
     "full",
     "onlydoc",
     "check",
+    "nocheck",
     "checktest",
+    "nochecktest",
     "kernel",
     "stdmodule",
+    "cm-default",
     "lm-default",
-    "cs-break",
+    "cs-break-off",
     "cs-break-nohyphen",
     "show-notes",
     "hide-notes",
@@ -268,19 +271,11 @@
       "replace"
     ],
     [
-      "EXP",
-      "rEXP",
+      "int",
       "TF",
       "pTF",
       "noTF",
-      "added=${1:date}",
-      "updated=${1:date}",
-      "deprecated",
-      "no-user-doc",
-      "label=",
-      "verb",
-      "module=",
-      "int"
+      "verb"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/class-langscibook.json b/dev/packages/class-langscibook.json
index 083887d1c..ac08f2732 100644
--- a/dev/packages/class-langscibook.json
+++ b/dev/packages/class-langscibook.json
@@ -276,9 +276,6 @@
     "fgii": {
       "option": "booklanguage=french"
     },
-    "fprimo)": {
-      "option": "booklanguage=french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "booklanguage=french"
diff --git a/dev/packages/class-letgut.json b/dev/packages/class-letgut.json
index 1434c1131..1917e1c02 100644
--- a/dev/packages/class-letgut.json
+++ b/dev/packages/class-letgut.json
@@ -389,7 +389,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-lni.json b/dev/packages/class-lni.json
index 7ded5a36b..82d98aa41 100644
--- a/dev/packages/class-lni.json
+++ b/dev/packages/class-lni.json
@@ -337,7 +337,7 @@
     "doihoffset": {},
     "doivoffset": {},
     "editor{}": {
-      "snippet": "editor{${1:name(${2:s})}}"
+      "snippet": "editor{${1:name(s)}}"
     },
     "eg": {},
     "email{}": {
@@ -369,9 +369,6 @@
     "lniinitialism{}{}": {
       "snippet": "lniinitialism{${1:cmd}}{${2:text}}"
     },
-    "multiaffil{}{}{}": {
-      "snippet": "multiaffil{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
     "nofontsfalse": {},
     "nofontstrue": {},
     "norunningheadsfalse": {},
diff --git a/dev/packages/class-ltugboat.json b/dev/packages/class-ltugboat.json
index 5e5d8f6c5..86b0f2998 100644
--- a/dev/packages/class-ltugboat.json
+++ b/dev/packages/class-ltugboat.json
@@ -549,9 +549,6 @@
     "tubhideheight{}": {
       "snippet": "tubhideheight{${1:height}}"
     },
-    "tubissue{}()": {
-      "snippet": "tubissue{${1:volume}}(${2:issue})"
-    },
     "tubjustifiedpar": {},
     "tubline{}": {
       "snippet": "tubline{${1:text}}"
diff --git a/dev/packages/class-matapli.json b/dev/packages/class-matapli.json
index 0f6dbe75e..62e03dcd9 100644
--- a/dev/packages/class-matapli.json
+++ b/dev/packages/class-matapli.json
@@ -199,7 +199,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-meetingmins.json b/dev/packages/class-meetingmins.json
index d3024935f..e61971a29 100644
--- a/dev/packages/class-meetingmins.json
+++ b/dev/packages/class-meetingmins.json
@@ -15,10 +15,10 @@
   },
   "macros": {
     "absent{}": {
-      "snippet": "absent{${1:name1,${2:name2},...}}"
+      "snippet": "absent{${1:name1,name2,...}}"
     },
     "alsopresent{}": {
-      "snippet": "alsopresent{${1:name1,${2:name2},...}}"
+      "snippet": "alsopresent{${1:name1,name2,...}}"
     },
     "chair{}": {
       "snippet": "chair{${1:name}}"
@@ -40,10 +40,10 @@
       "snippet": "setdate{${1:date}}"
     },
     "setmembers{}": {
-      "snippet": "setmembers{${1:name1,${2:name2},...}}"
+      "snippet": "setmembers{${1:name1,name2,...}}"
     },
     "setpresent{}": {
-      "snippet": "setpresent{${1:name1,${2:name2},...}}"
+      "snippet": "setpresent{${1:name1,name2,...}}"
     },
     "DH": {},
     "dh": {},
diff --git a/dev/packages/class-memoir.json b/dev/packages/class-memoir.json
index 86844323f..b82ea65b8 100644
--- a/dev/packages/class-memoir.json
+++ b/dev/packages/class-memoir.json
@@ -835,9 +835,6 @@
     "glossary[]{}{}": {
       "snippet": "glossary[${3:file}]{${1:term}}{${2:description}}"
     },
-    "glossary[](){}{}": {
-      "snippet": "glossary[${3:file}](${4:key}){${1:term}}{${2:description}}"
-    },
     "glossarycolsep": {},
     "glossaryintoc": {},
     "glossarymark": {},
@@ -1051,9 +1048,6 @@
     "justlastraggedleft": {},
     "keepthetitle": {},
     "killtitle": {},
-    "label(){}": {
-      "snippet": "label(${2:bookmark}){${1:label}}"
-    },
     "LastFrameCommand": {},
     "lastlineparrule": {},
     "lastlinerulefill": {},
diff --git a/dev/packages/class-mitthesis.json b/dev/packages/class-mitthesis.json
index 76ba8a317..8116ae7e1 100644
--- a/dev/packages/class-mitthesis.json
+++ b/dev/packages/class-mitthesis.json
@@ -83,12 +83,6 @@
     "CClicense{}{}": {
       "snippet": "CClicense{${1:license type}}{${2:URL}}"
     },
-    "Institution{}": {
-      "snippet": "Institution{${1:institution}}"
-    },
-    "SupervisorDesignation{}": {
-      "snippet": "SupervisorDesignation{${1:title}}"
-    },
     "PDFRightsText": {},
     "SuppressMonthError": {},
     "SuppressAcceptorError": {},
diff --git a/dev/packages/class-moderncv.json b/dev/packages/class-moderncv.json
index ad8fc51b6..f95c8cb4d 100644
--- a/dev/packages/class-moderncv.json
+++ b/dev/packages/class-moderncv.json
@@ -37,9 +37,6 @@
     "homepage{}": {
       "snippet": "homepage{${1:URL}}"
     },
-    "homepage[]{}": {
-      "snippet": "homepage[${2:protocol}]{${1:URL}}"
-    },
     "phone{}": {
       "snippet": "phone{${1:number}}"
     },
@@ -86,17 +83,6 @@
     "signalsocialsymbol": {},
     "codebergsocialsymbol": {},
     "discordsocialsymbol": {},
-    "twitchsocialsymbol": {},
-    "youtubesocialsymbol": {},
-    "tiktoksocialsymbol": {},
-    "instagramsocialsymbol": {},
-    "soundcloudsocialsymbol": {},
-    "steamsocialsymbol": {},
-    "xboxsocialsymbol": {},
-    "playstationsocialsymbol": {},
-    "battlenetsocialsymbol": {},
-    "arxivsocialsymbol": {},
-    "inspiresocialsymbol": {},
     "enclname": {},
     "makefooter": {},
     "moderncvstyle{}": {
@@ -158,12 +144,6 @@
     "namestyle{}": {
       "snippet": "namestyle{${1:text}}"
     },
-    "firstnamestyle{}": {
-      "snippet": "firstnamestyle{${1:text}}"
-    },
-    "lastnamestyle{}": {
-      "snippet": "lastnamestyle{${1:text}}"
-    },
     "titlestyle{}": {
       "snippet": "titlestyle{${1:text}}"
     },
@@ -205,12 +185,6 @@
     "cvdoubleitem[]{}{}{}{}": {
       "snippet": "cvdoubleitem[${5:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}"
     },
-    "cvtripleitem{}{}{}{}{}{}": {
-      "snippet": "cvtripleitem{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
-    },
-    "cvtripleitem[]{}{}{}{}{}{}": {
-      "snippet": "cvtripleitem[${7:spacing}]{${1:heading1}}{${2:text1}}{${3:heading2}}{${4:text2}}{${5:heading3}}{${6:text3}}"
-    },
     "cvlistitem{}": {
       "snippet": "cvlistitem{${1:item}}"
     },
@@ -288,18 +262,12 @@
     "recipient{}{}": {
       "snippet": "recipient{${1:recipient}}{${2:recipient address}}"
     },
-    "subject{}": {
-      "snippet": "subject{${1:subject}}"
-    },
     "opening{}": {
       "snippet": "opening{${1:opening}}"
     },
     "closing{}": {
       "snippet": "closing{${1:closing}}"
     },
-    "signature{}{}": {
-      "snippet": "signature{${1:scale}}{${2:imagefile}}"
-    },
     "enclosure{}": {
       "snippet": "enclosure{${1:enclosure}}"
     },
@@ -314,16 +282,13 @@
     "makeletterhead": {},
     "makeletterfoot": {},
     "makeletterclosing": {},
-    "hintscolumnwidth": {},
     "separatorcolumnwidth": {},
     "maincolumnwidth": {},
     "doubleitemcolumnwidth": {},
-    "tripleitemcolumnwidth": {},
     "separatorrulewidth": {},
     "listitemsymbolwidth": {},
     "listitemcolumnwidth": {},
     "listdoubleitemcolumnwidth": {},
-    "listitemsymbolspace": {},
     "cventryyearbox": {},
     "cventrytitleboxwidth": {},
     "cvskill{}": {
diff --git a/dev/packages/class-msu-thesis.json b/dev/packages/class-msu-thesis.json
index 77d524c12..60b293580 100644
--- a/dev/packages/class-msu-thesis.json
+++ b/dev/packages/class-msu-thesis.json
@@ -38,7 +38,6 @@
     "msuabbrevwidth{}": {
       "snippet": "msuabbrevwidth{${1:width}}"
     },
-    "msuappendixdelim": {},
     "msuappendixnumformat": {},
     "msucaptiondelim": {},
     "msutocdelim": {},
diff --git a/dev/packages/class-mucproc.json b/dev/packages/class-mucproc.json
index 64cc77c40..be8492cbb 100644
--- a/dev/packages/class-mucproc.json
+++ b/dev/packages/class-mucproc.json
@@ -150,24 +150,12 @@
     "nptextcites{}{}": {
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}"
     },
     "nptextcites[][]{}[][]{}": {
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "DH": {},
     "dh": {},
     "dj": {},
diff --git a/dev/packages/class-newlfm.json b/dev/packages/class-newlfm.json
index b81075645..15402aa15 100644
--- a/dev/packages/class-newlfm.json
+++ b/dev/packages/class-newlfm.json
@@ -315,7 +315,7 @@
     },
     "monthname": {},
     "multletter{}": {
-      "snippet": "multletter{${1:id1,${2:id2},...}}"
+      "snippet": "multletter{${1:id1,id2,...}}"
     },
     "newlfmParam": {},
     "noFootline": {},
diff --git a/dev/packages/class-njuthesis.json b/dev/packages/class-njuthesis.json
index 131549551..ecddce84f 100644
--- a/dev/packages/class-njuthesis.json
+++ b/dev/packages/class-njuthesis.json
@@ -408,18 +408,6 @@
       "snippet": "citecs{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -428,26 +416,10 @@
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}",
       "option": "style=gb7714-2015"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
@@ -455,10 +427,6 @@
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "style=gb7714-2015"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "style=gb7714-2015"
     }
   },
   "envs": {
diff --git a/dev/packages/class-novel.json b/dev/packages/class-novel.json
index 40d71af0c..6a81bc588 100644
--- a/dev/packages/class-novel.json
+++ b/dev/packages/class-novel.json
@@ -252,13 +252,13 @@
       "snippet": "charscale{${1:text}}"
     },
     "charscale[]{}": {
-      "snippet": "charscale[${2:scale,${3:hoffset},voffset}]{${1:text}}"
+      "snippet": "charscale[${2:scale,hoffset,voffset}]{${1:text}}"
     },
     "charscale*{}": {
       "snippet": "charscale*{${1:text}}"
     },
     "charscale*[]{}": {
-      "snippet": "charscale*[${2:scale,${3:hoffset},voffset}]{${1:text}}"
+      "snippet": "charscale*[${2:scale,hoffset,voffset}]{${1:text}}"
     },
     "TotalYpos": {},
     "PosTolerance": {},
@@ -307,7 +307,7 @@
       "snippet": "sidebyside{${1:content1}}{${2:content2}}"
     },
     "sidebyside[]{}{}": {
-      "snippet": "sidebyside[${3:a,${4:b},${5:c},d}]{${1:content1}}{${2:content2}}"
+      "snippet": "sidebyside[${3:a,b,c,d}]{${1:content1}}{${2:content2}}"
     },
     "myparindent{}": {
       "snippet": "myparindent{${1:length}}"
@@ -453,7 +453,7 @@
       "snippet": "FloatImage{${1:imagefile}}"
     },
     "FloatImage[]{}": {
-      "snippet": "FloatImage[${2:pos,${3:xoffset},yoffset}]{${1:imagefile}}"
+      "snippet": "FloatImage[${2:pos,xoffset,yoffset}]{${1:imagefile}}"
     },
     "WrapImage{}": {
       "snippet": "WrapImage{${1:imagefile}}"
@@ -484,10 +484,10 @@
     "realmarker": {},
     "fakemarker": {},
     "SetMarkerStyle{}": {
-      "snippet": "SetMarkerStyle{${1:astersk,${2:dagger},number}}"
+      "snippet": "SetMarkerStyle{${1:astersk,dagger,number}}"
     },
     "SetMarkerStyle[]{}": {
-      "snippet": "SetMarkerStyle[${2:real,${3:fake}]{${1:astersk},${4:dagger},number}}"
+      "snippet": "SetMarkerStyle[${2:real,fake}]{${1:astersk,dagger,number}}"
     },
     "SetMarkers": {},
     "endnote{}": {
diff --git a/dev/packages/class-nwafuthesis.json b/dev/packages/class-nwafuthesis.json
index 235b08f57..03dbe6fff 100644
--- a/dev/packages/class-nwafuthesis.json
+++ b/dev/packages/class-nwafuthesis.json
@@ -251,24 +251,12 @@
     "citets{}{}": {
       "snippet": "citets{${1:bibid}}{${2:bibid}}"
     },
-    "citets(){}{}": {
-      "snippet": "citets(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citets()(){}{}": {
-      "snippet": "citets(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citets()()[]{}[]{}": {
-      "snippet": "citets(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "citets[]{}[]{}": {
       "snippet": "citets[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citets[][]{}[][]{}": {
       "snippet": "citets[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citets()()[][]{}[][]{}": {
-      "snippet": "citets(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "citetns{}": {
       "snippet": "citetns{${1:bibid}}"
     },
@@ -308,44 +296,20 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-nwejmart.json b/dev/packages/class-nwejmart.json
index 1336bd0f5..17f61baae 100644
--- a/dev/packages/class-nwejmart.json
+++ b/dev/packages/class-nwejmart.json
@@ -233,9 +233,6 @@
     "fgii": {
       "option": "french"
     },
-    "fprimo)": {
-      "option": "french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
diff --git a/dev/packages/class-oup-authoring-template.json b/dev/packages/class-oup-authoring-template.json
index f491f62c5..38dccd249 100644
--- a/dev/packages/class-oup-authoring-template.json
+++ b/dev/packages/class-oup-authoring-template.json
@@ -100,7 +100,7 @@
       "snippet": "journaltitle{${1:title}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:keyword1,${2:keyword2},...}}"
+      "snippet": "keywords{${1:keyword1,keyword2,...}}"
     },
     "midrule": {},
     "noappendicestocpagenum": {},
diff --git a/dev/packages/class-philosophersimprint.json b/dev/packages/class-philosophersimprint.json
index 06b30574f..bc886eddd 100644
--- a/dev/packages/class-philosophersimprint.json
+++ b/dev/packages/class-philosophersimprint.json
@@ -33,7 +33,7 @@
       "snippet": "journalvolume{${1:number}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:keyword1,${2:keyword2},...}}"
+      "snippet": "keywords{${1:keyword1,keyword2,...}}"
     },
     "subject{}": {
       "snippet": "subject{${1:subject}}"
diff --git a/dev/packages/class-prtec.json b/dev/packages/class-prtec.json
index 456a0835a..284ae20a9 100644
--- a/dev/packages/class-prtec.json
+++ b/dev/packages/class-prtec.json
@@ -1,6 +1,8 @@
 {
   "includes": {
     "ifthen": [],
+    "kvoptions": [],
+    "kvsetkeys": [],
     "geometry": [],
     "parskip": [],
     "natbib": [],
@@ -10,6 +12,7 @@
     "array": [],
     "dcolumn": [],
     "mathtools": [],
+    "inputenc": [],
     "newtxtext": [],
     "newtxmath": [],
     "bm": [],
@@ -17,10 +20,13 @@
     "fnpos": [],
     "caption": [],
     "subcaption": [],
+    "textcase": [],
     "titlesec": [],
+    "hyperxmp": [],
     "hyperref": [],
     "doi": [],
     "etoolbox": [],
+    "xpatch": [],
     "multicol": [],
     "xcoffins": [],
     "metalogo": [],
@@ -43,7 +49,7 @@
       "snippet": "papertitle{${1:text}}"
     },
     "SetAuthors{}": {
-      "snippet": "SetAuthors{${1:name1,${2:name2},...}}"
+      "snippet": "SetAuthors{${1:name1,name2,...}}"
     },
     "affil{}": {
       "snippet": "affil{${1:number}}"
@@ -70,6 +76,15 @@
     "section*[]{}": {
       "snippet": "section*[${2:short title}]{${1:title}}"
     },
+    "svsection{}": {
+      "snippet": "svsection{${1:title}}"
+    },
+    "svsection[]{}": {
+      "snippet": "svsection[${2:short title}]{${1:title}}"
+    },
+    "svsection*{}": {
+      "snippet": "svsection*{${1:title}}"
+    },
     "ifCD": {},
     "CDtrue": {},
     "CDfalse": {},
@@ -112,6 +127,7 @@
     }
   },
   "options": [
+    "nodefaultsups",
     "nofoot",
     "upint",
     "smallerops",
@@ -121,7 +137,6 @@
     "frenchmath",
     "varbb",
     "cmbraces",
-    "subscriptcorrection",
     "largesc"
   ],
   "keyvals": []
diff --git a/dev/packages/class-randexam.json b/dev/packages/class-randexam.json
index d8b8eb30e..64bdba41e 100644
--- a/dev/packages/class-randexam.json
+++ b/dev/packages/class-randexam.json
@@ -264,18 +264,6 @@
       "detail": "𝑅",
       "documentation": "MATHEMATICAL ITALIC CAPITAL R"
     },
-    "jacobi{}{}": {
-      "snippet": "jacobi{${1:arg1}}{${2:arg2}}",
-      "option": "moremath"
-    },
-    "ii": {
-      "option": "moremath",
-      "detail": "ⅈ",
-      "documentation": "DOUBLE-STRUCK ITALIC SMALL I"
-    },
-    "Zi": {
-      "option": "moremath"
-    },
     "arccot": {
       "option": "math=all"
     },
diff --git a/dev/packages/class-resphilosophica.json b/dev/packages/class-resphilosophica.json
index be3d42d89..3045f4b13 100644
--- a/dev/packages/class-resphilosophica.json
+++ b/dev/packages/class-resphilosophica.json
@@ -33,7 +33,7 @@
       "snippet": "doinumber{${1:DOI}}"
     },
     "ECSelect{}": {
-      "snippet": "ECSelect{${1:level1,${2:level2},...}}"
+      "snippet": "ECSelect{${1:level1,level2,...}}"
     },
     "EditorialComment[]{}": {
       "snippet": "EditorialComment[${2:level}]{${1:comments}}"
@@ -45,7 +45,7 @@
       "snippet": "endpage{${1:number}}"
     },
     "issuenumber{}": {
-      "snippet": "issuenumber{${1:number(${2:s})}}"
+      "snippet": "issuenumber{${1:number(s)}}"
     },
     "manuscriptid{}": {
       "snippet": "manuscriptid{${1:id}}"
@@ -63,10 +63,10 @@
       "snippet": "prevpaper{${1:previous paper}}"
     },
     "publicationmonth[]{}": {
-      "snippet": "publicationmonth[${2:abbrev month(${3:s})}]{${1:month(${4:s})}}"
+      "snippet": "publicationmonth[${2:abbrev month(s)}]{${1:month(s)}}"
     },
     "publicationmonth{}": {
-      "snippet": "publicationmonth{${1:month(${2:s})}}"
+      "snippet": "publicationmonth{${1:month(s)}}"
     },
     "publicationyear{}": {
       "snippet": "publicationyear{${1:year}}"
@@ -82,16 +82,16 @@
       "snippet": "TC{${1:text}}"
     },
     "TCSelect[]{}": {
-      "snippet": "TCSelect[${2:color}]{${1:level1,${3:level2},...}}"
+      "snippet": "TCSelect[${2:color}]{${1:level1,level2,...}}"
     },
     "TCSelect{}": {
-      "snippet": "TCSelect{${1:level1,${2:level2},...}}"
+      "snippet": "TCSelect{${1:level1,level2,...}}"
     },
     "titlenote{}": {
       "snippet": "titlenote{${1:note}}"
     },
     "volumenumber{}": {
-      "snippet": "volumenumber{${1:number(${2:s})}}"
+      "snippet": "volumenumber{${1:number(s)}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-sagej.json b/dev/packages/class-sagej.json
index eb43ec58b..45ced4c76 100644
--- a/dev/packages/class-sagej.json
+++ b/dev/packages/class-sagej.json
@@ -68,7 +68,7 @@
     "journalclassshort": {},
     "journalname": {},
     "keywords{}": {
-      "snippet": "keywords{${1:word1,${2:word2},...}}"
+      "snippet": "keywords{${1:word1,word2,...}}"
     },
     "refsize": {},
     "runninghead{}": {
diff --git a/dev/packages/class-sapthesis.json b/dev/packages/class-sapthesis.json
index a272d1973..fa5767772 100644
--- a/dev/packages/class-sapthesis.json
+++ b/dev/packages/class-sapthesis.json
@@ -96,10 +96,10 @@
     "eu": {},
     "iu": {},
     "der{}{}": {
-      "snippet": "der{${1:function}}{${2:var1,${3:var2},...}}"
+      "snippet": "der{${1:function}}{${2:var1,var2,...}}"
     },
     "pder{}{}": {
-      "snippet": "pder{${1:function}}{${2:var1,${3:var2},...}}"
+      "snippet": "pder{${1:function}}{${2:var1,var2,...}}"
     },
     "rb{}": {
       "snippet": "rb{${1:sub}}"
diff --git a/dev/packages/class-schulma-klausur.json b/dev/packages/class-schulma-klausur.json
index 1613e2cbe..5e8e9d29c 100644
--- a/dev/packages/class-schulma-klausur.json
+++ b/dev/packages/class-schulma-klausur.json
@@ -43,15 +43,6 @@
     "Aufgabe[][]": {
       "snippet": "Aufgabe[${1:Thema}][${2:Bearbeitungszeit}]"
     },
-    "Aufgabe()": {
-      "snippet": "Aufgabe(${1:Punktzahl})"
-    },
-    "Aufgabe[]()": {
-      "snippet": "Aufgabe[${1:Thema}](${2:Punktzahl})"
-    },
-    "Aufgabe[][]()": {
-      "snippet": "Aufgabe[${1:Thema}][${2:Bearbeitungszeit}](${3:Punktzahl})"
-    },
     "Aufgabe*": {},
     "Aufgabe*[]": {
       "snippet": "Aufgabe*[${1:Thema}]"
@@ -59,15 +50,6 @@
     "Aufgabe*[][]": {
       "snippet": "Aufgabe*[${1:Thema}][${2:Bearbeitungszeit}]"
     },
-    "Aufgabe*()": {
-      "snippet": "Aufgabe*(${1:Punktzahl})"
-    },
-    "Aufgabe*[]()": {
-      "snippet": "Aufgabe*[${1:Thema}](${2:Punktzahl})"
-    },
-    "Aufgabe*[][]()": {
-      "snippet": "Aufgabe*[${1:Thema}][${2:Bearbeitungszeit}](${3:Punktzahl})"
-    },
     "schulmaalph{}": {
       "snippet": "schulmaalph{${1:counter}}"
     },
diff --git a/dev/packages/class-scrlttr2.json b/dev/packages/class-scrlttr2.json
index 7a15b64dc..b8030dca6 100644
--- a/dev/packages/class-scrlttr2.json
+++ b/dev/packages/class-scrlttr2.json
@@ -268,14 +268,6 @@
     "edgesize": {
       "option": "visualize"
     },
-    "showenvelope()()": {
-      "snippet": "showenvelope(${1:width},${2:height})(${3:h-offset},${4:v-offset})",
-      "option": "visualize"
-    },
-    "showenvelope()()[]": {
-      "snippet": "showenvelope(${2:width},${3:height})(${4:h-offset},${5:v-offset})[${1:instructions}]",
-      "option": "visualize"
-    },
     "showISOenvelope{}": {
       "snippet": "showISOenvelope{${1:format}}",
       "option": "visualize"
diff --git a/dev/packages/class-se2thesis.json b/dev/packages/class-se2thesis.json
index 7130749c4..609db58ad 100644
--- a/dev/packages/class-se2thesis.json
+++ b/dev/packages/class-se2thesis.json
@@ -63,9 +63,6 @@
     "signatureBox[]{}": {
       "snippet": "signatureBox[${2:width}]{${1:signature-name}}"
     },
-    "summarybox{}{}": {
-      "snippet": "summarybox{${1:label text}}{${2:text}}"
-    },
     "headingdot": {}
   },
   "envs": {
diff --git a/dev/packages/class-skdoc.json b/dev/packages/class-skdoc.json
index 8af71c976..6c236b0e5 100644
--- a/dev/packages/class-skdoc.json
+++ b/dev/packages/class-skdoc.json
@@ -92,10 +92,10 @@
       "snippet": "Option{${1:option}}"
     },
     "Options{}": {
-      "snippet": "Options{${1:option1,${2:option2},...}}"
+      "snippet": "Options{${1:option1,option2,...}}"
     },
     "WithValues{}": {
-      "snippet": "WithValues{${1:value1,${2:value2},...}}"
+      "snippet": "WithValues{${1:value1,value2,...}}"
     },
     "AndDefault{}": {
       "snippet": "AndDefault{${1:default value}}"
diff --git a/dev/packages/class-sn-jnl.json b/dev/packages/class-sn-jnl.json
index eab5be8b4..1cfd4ae44 100644
--- a/dev/packages/class-sn-jnl.json
+++ b/dev/packages/class-sn-jnl.json
@@ -551,7 +551,7 @@
     },
     "keywordname": {},
     "keywords{}": {
-      "snippet": "keywords{${1:word1,${2:word2},...}}"
+      "snippet": "keywords{${1:word1,word2,...}}"
     },
     "labelwidthi": {},
     "labelwidthii": {},
diff --git a/dev/packages/class-standalone.json b/dev/packages/class-standalone.json
index a9c8b6f6c..732db975e 100644
--- a/dev/packages/class-standalone.json
+++ b/dev/packages/class-standalone.json
@@ -41,7 +41,7 @@
       "snippet": "standaloneconfig{${1:options}}"
     },
     "standaloneenv{}": {
-      "snippet": "standaloneenv{${1:envname1,${2:envname2},...}}"
+      "snippet": "standaloneenv{${1:envname1,envname2,...}}"
     },
     "standaloneignore": {},
     "thesapage": {},
diff --git a/dev/packages/class-thuthesis.json b/dev/packages/class-thuthesis.json
index ea7a75ffa..b01dd7f33 100644
--- a/dev/packages/class-thuthesis.json
+++ b/dev/packages/class-thuthesis.json
@@ -294,7 +294,6 @@
       "math-ellipsis=",
       "real-part=",
       "math-font=",
-      "eqn-paren-style=",
       "cite-style=",
       "toc-depth=${1:integer}",
       "spine-font={${1:font commands}}",
diff --git a/dev/packages/class-tkz-doc.json b/dev/packages/class-tkz-doc.json
index cbc3f213f..4387550c4 100644
--- a/dev/packages/class-tkz-doc.json
+++ b/dev/packages/class-tkz-doc.json
@@ -111,9 +111,6 @@
     "NameSys{}": {
       "snippet": "NameSys{${1:os}}"
     },
-    "nodeshadowedone(){}": {
-      "snippet": "nodeshadowedone(${2:x},${3:y}){${1:arg}}"
-    },
     "ntt": {},
     "oarg{}": {
       "snippet": "oarg{${1:arg}}"
diff --git a/dev/packages/class-tudapub.json b/dev/packages/class-tudapub.json
index 188e74154..5fdc0a838 100644
--- a/dev/packages/class-tudapub.json
+++ b/dev/packages/class-tudapub.json
@@ -159,7 +159,7 @@
       "snippet": "setupReviewName[${2:num}]{${1:Referent}}"
     },
     "setupReviewName*{}": {
-      "snippet": "setupReviewName*{${1:Bezeicher1,${2:Bezeicher2},...}}"
+      "snippet": "setupReviewName*{${1:Bezeicher1,Bezeicher2,...}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-udes-genie-these.json b/dev/packages/class-udes-genie-these.json
index 053cc25d6..9ecb686b4 100644
--- a/dev/packages/class-udes-genie-these.json
+++ b/dev/packages/class-udes-genie-these.json
@@ -135,7 +135,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/class-ulthese.json b/dev/packages/class-ulthese.json
index e958b44fa..13593368e 100644
--- a/dev/packages/class-ulthese.json
+++ b/dev/packages/class-ulthese.json
@@ -6,10 +6,14 @@
     "natbib": [],
     "babel": [],
     "numprint": [],
+    "etoolbox": [],
     "hyperref": [],
     "graphicx": [],
     "xcolor": [],
-    "microtype": []
+    "chapterbib": [
+      "bibchapitre",
+      "bibsection"
+    ]
   },
   "macros": {
     "captionsenglish": {
@@ -248,9 +252,6 @@
     "fgii": {
       "option": "french"
     },
-    "fprimo)": {
-      "option": "french"
-    },
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
       "option": "french"
@@ -615,6 +616,8 @@
   },
   "options": [
     "nonatbib",
+    "bibchapitre",
+    "bibsection",
     "nobabel",
     "nohyperref",
     "10pt",
@@ -631,10 +634,10 @@
     "LLM",
     "MErg",
     "MMus",
+    "MPht",
     "MSc",
     "MScGeogr",
     "MServSoc",
-    "MTravSoc",
     "MPsEd",
     "multifacultaire",
     "cotutelle",
diff --git a/dev/packages/class-univie-ling-expose.json b/dev/packages/class-univie-ling-expose.json
index 23278f569..44e9fc582 100644
--- a/dev/packages/class-univie-ling-expose.json
+++ b/dev/packages/class-univie-ling-expose.json
@@ -21,7 +21,6 @@
     "biblatex": [],
     "varioref": [],
     "prettyref": [],
-    "isodate": [],
     "draftwatermark": [
       "draftmark",
       "draftmark=true",
@@ -110,18 +109,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -130,10 +117,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -426,18 +409,6 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
-    "weblink{}": {
-      "snippet": "weblink{${1:URL}}"
-    },
-    "weblink{}[]": {
-      "snippet": "weblink{${1:URL}}[${2:date}]"
-    },
-    "SetURLDate{}": {
-      "snippet": "SetURLDate{${1:date}}"
-    },
-    "urldate{}": {
-      "snippet": "urldate{${1:date}}"
-    },
     "footnumwidth": {},
     "lecsemshort": {},
     "lecsemverb": {},
diff --git a/dev/packages/class-univie-ling-handout.json b/dev/packages/class-univie-ling-handout.json
index d02c0db0d..642cb4e90 100644
--- a/dev/packages/class-univie-ling-handout.json
+++ b/dev/packages/class-univie-ling-handout.json
@@ -112,18 +112,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -132,10 +120,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -518,18 +502,6 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
-    "weblink{}": {
-      "snippet": "weblink{${1:URL}}"
-    },
-    "weblink{}[]": {
-      "snippet": "weblink{${1:URL}}[${2:date}]"
-    },
-    "SetURLDate{}": {
-      "snippet": "SetURLDate{${1:date}}"
-    },
-    "urldate{}": {
-      "snippet": "urldate{${1:date}}"
-    },
     "aftertitle": {},
     "beforedate": {},
     "beforeevent": {},
diff --git a/dev/packages/class-univie-ling-paper.json b/dev/packages/class-univie-ling-paper.json
index a7c932bf4..f8be12eda 100644
--- a/dev/packages/class-univie-ling-paper.json
+++ b/dev/packages/class-univie-ling-paper.json
@@ -19,7 +19,6 @@
     "biblatex": [],
     "varioref": [],
     "prettyref": [],
-    "isodate": [],
     "draftwatermark": [
       "draftmark",
       "draftmark=true",
@@ -108,18 +107,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -128,10 +115,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -428,18 +411,6 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
-    "weblink{}": {
-      "snippet": "weblink{${1:URL}}"
-    },
-    "weblink{}[]": {
-      "snippet": "weblink{${1:URL}}[${2:date}]"
-    },
-    "SetURLDate{}": {
-      "snippet": "SetURLDate{${1:date}}"
-    },
-    "urldate{}": {
-      "snippet": "urldate{${1:date}}"
-    },
     "footnumwidth": {},
     "lecsemshort": {},
     "lecsemverb": {},
diff --git a/dev/packages/class-univie-ling-poster.json b/dev/packages/class-univie-ling-poster.json
index 6bfc22218..2de79ae0f 100644
--- a/dev/packages/class-univie-ling-poster.json
+++ b/dev/packages/class-univie-ling-poster.json
@@ -19,7 +19,6 @@
     "prettyref": [],
     "tikzpagenodes": [],
     "tikzlibrarycalc": [],
-    "isodate": [],
     "fontspec": [
       "fonts=otf",
       "polyglossia",
@@ -108,18 +107,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -128,10 +115,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -437,18 +420,6 @@
     "restspace[]": {
       "snippet": "restspace[${1:label}]"
     },
-    "weblink{}": {
-      "snippet": "weblink{${1:URL}}"
-    },
-    "weblink{}[]": {
-      "snippet": "weblink{${1:URL}}[${2:date}]"
-    },
-    "SetURLDate{}": {
-      "snippet": "SetURLDate{${1:date}}"
-    },
-    "urldate{}": {
-      "snippet": "urldate{${1:date}}"
-    },
     "headeroffset": {},
     "titleoffset": {},
     "beforetitling": {},
@@ -460,14 +431,12 @@
     "umbruch[]": {
       "snippet": "umbruch[${1:length}]"
     },
-    "lmoffset": {},
     "lsoffset": {},
     "titleindent": {},
     "restwidth": {},
     "leadingzero{}": {
       "snippet": "leadingzero{${1:arg}}"
     },
-    "unitindent": {},
     "urlprefix": {},
     "DH": {},
     "dh": {},
@@ -531,7 +500,6 @@
     "cd=",
     "pagesize=",
     "portrait",
-    "smallmargins",
     "scale=${1:factor}",
     "polyglossia",
     "all",
diff --git a/dev/packages/class-univie-ling-thesis.json b/dev/packages/class-univie-ling-thesis.json
index c099491e1..a281cd61c 100644
--- a/dev/packages/class-univie-ling-thesis.json
+++ b/dev/packages/class-univie-ling-thesis.json
@@ -20,7 +20,6 @@
     "biblatex": [],
     "varioref": [],
     "prettyref": [],
-    "isodate": [],
     "draftwatermark": [
       "draftmark",
       "draftmark=true",
@@ -113,18 +112,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:pre}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa=true"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:pre}]{${1:bibid}}[${4:pre}]{${2:bibid}}",
       "option": "apa=true"
@@ -133,10 +120,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa=true"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa=true"
-    },
     "citet[][]{}": {
       "snippet": "citet[${2:prenote}][${3:postnote}]{${1:bibid}}",
       "option": "apa=true"
@@ -436,18 +419,6 @@
     "Concept{}": {
       "snippet": "Concept{${1:text}}"
     },
-    "weblink{}": {
-      "snippet": "weblink{${1:URL}}"
-    },
-    "weblink{}[]": {
-      "snippet": "weblink{${1:URL}}[${2:date}]"
-    },
-    "SetURLDate{}": {
-      "snippet": "SetURLDate{${1:date}}"
-    },
-    "urldate{}": {
-      "snippet": "urldate{${1:date}}"
-    },
     "footnumwidth": {},
     "lecsemshort": {},
     "lecsemverb": {},
diff --git a/dev/packages/class-univie-ling-wlg.json b/dev/packages/class-univie-ling-wlg.json
index 1a86f297d..70ee9449b 100644
--- a/dev/packages/class-univie-ling-wlg.json
+++ b/dev/packages/class-univie-ling-wlg.json
@@ -27,7 +27,6 @@
     "multirow": [],
     "varioref": [],
     "prettyref": [],
-    "isodate": [],
     "biblatex": [
       "biblatex",
       "biblatex=true"
@@ -119,7 +118,7 @@
       "snippet": "jeditors{${1:name}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:word1,${2:word2},...}}"
+      "snippet": "keywords{${1:word1,word2,...}}"
     },
     "lastpageref": {},
     "ljobname": {},
@@ -151,19 +150,7 @@
     "versal{}": {
       "snippet": "versal{${1:text}}"
     },
-    "wlgurl": {},
-    "weblink{}": {
-      "snippet": "weblink{${1:URL}}"
-    },
-    "weblink{}[]": {
-      "snippet": "weblink{${1:URL}}[${2:date}]"
-    },
-    "SetURLDate{}": {
-      "snippet": "SetURLDate{${1:date}}"
-    },
-    "urldate{}": {
-      "snippet": "urldate{${1:date}}"
-    }
+    "wlgurl": {}
   },
   "envs": {},
   "options": [
diff --git a/dev/packages/class-utexasthesis.json b/dev/packages/class-utexasthesis.json
index 04043f6d7..3e1e76fad 100644
--- a/dev/packages/class-utexasthesis.json
+++ b/dev/packages/class-utexasthesis.json
@@ -29,7 +29,7 @@
     },
     "maketableofcontents": {},
     "othercommitteemembers{}": {
-      "snippet": "othercommitteemembers{${1:name1,${2:name2},...}}"
+      "snippet": "othercommitteemembers{${1:name1,name2,...}}"
     },
     "supervisor{}": {
       "snippet": "supervisor{${1:name}}"
diff --git a/dev/packages/class-xdupgthesis.json b/dev/packages/class-xdupgthesis.json
index 3067c29b8..c39a81328 100644
--- a/dev/packages/class-xdupgthesis.json
+++ b/dev/packages/class-xdupgthesis.json
@@ -228,44 +228,20 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-xduugthesis.json b/dev/packages/class-xduugthesis.json
index b0a7589cc..0e66cd14c 100644
--- a/dev/packages/class-xduugthesis.json
+++ b/dev/packages/class-xduugthesis.json
@@ -210,44 +210,20 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/class-xduugtp.json b/dev/packages/class-xduugtp.json
index 96d81db5b..3d29b1339 100644
--- a/dev/packages/class-xduugtp.json
+++ b/dev/packages/class-xduugtp.json
@@ -206,44 +206,20 @@
     "citecs{}{}": {
       "snippet": "citecs{${1:bibid}}{${2:bibid}}"
     },
-    "citecs(){}{}": {
-      "snippet": "citecs(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()(){}{}": {
-      "snippet": "citecs(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "citecs()()[]{}[]{}": {
-      "snippet": "citecs(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "citecs[]{}[]{}": {
       "snippet": "citecs[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "citecs[][]{}[][]{}": {
       "snippet": "citecs[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "citecs()()[][]{}[][]{}": {
-      "snippet": "citecs(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "authornumcites{}{}": {
       "snippet": "authornumcites{${1:bibid}}{${2:bibid}}"
     },
-    "authornumcites(){}{}": {
-      "snippet": "authornumcites(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()(){}{}": {
-      "snippet": "authornumcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "authornumcites()()[]{}[]{}": {
-      "snippet": "authornumcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "authornumcites[]{}[]{}": {
       "snippet": "authornumcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "authornumcites[][]{}[][]{}": {
       "snippet": "authornumcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
-    "authornumcites()()[][]{}[][]{}": {
-      "snippet": "authornumcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     }
   },
   "envs": {
diff --git a/dev/packages/class-yathesis.json b/dev/packages/class-yathesis.json
index 339b43305..1596d19ba 100644
--- a/dev/packages/class-yathesis.json
+++ b/dev/packages/class-yathesis.json
@@ -337,7 +337,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/clock.json b/dev/packages/clock.json
deleted file mode 100644
index 6d4fbb590..000000000
--- a/dev/packages/clock.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "clock{}{}": {
-      "snippet": "clock{${1:hour}}{${2:minute}}"
-    },
-    "clocktime": {},
-    "clockfont": {},
-    "bigclockfont": {},
-    "ifClockFrame": {},
-    "ClockFrametrue": {},
-    "ClockFramefalse": {},
-    "texthours": {},
-    "textminutes": {},
-    "texttime": {},
-    "LaTeXclock": {},
-    "TeXclock": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/cmdtrack.json b/dev/packages/cmdtrack.json
index 64c0786d5..348b912f8 100644
--- a/dev/packages/cmdtrack.json
+++ b/dev/packages/cmdtrack.json
@@ -3,7 +3,7 @@
   "macros": {
     "commandlist": {},
     "untrack{}": {
-      "snippet": "untrack{${1:cmd1,${2:cmd2},...}}"
+      "snippet": "untrack{${1:cmd1,cmd2,...}}"
     },
     "logcmd{}{}": {
       "snippet": "logcmd{${1:cmd1}}{${2:cmd2}}"
diff --git a/dev/packages/codeanatomy.json b/dev/packages/codeanatomy.json
index b28f464f3..8f8d95a64 100644
--- a/dev/packages/codeanatomy.json
+++ b/dev/packages/codeanatomy.json
@@ -57,10 +57,7 @@
       "snippet": "bgcode{${1:code}}"
     },
     "ptab": {},
-    "phspace": {},
-    "codeAnnotation{}(){}": {
-      "snippet": "codeAnnotation{${1:node name}}(${3:coordinate}){${2:label text}}"
-    }
+    "phspace": {}
   },
   "envs": {},
   "options": [],
diff --git a/dev/packages/codelisting.json b/dev/packages/codelisting.json
deleted file mode 100644
index aa3e289dd..000000000
--- a/dev/packages/codelisting.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "includes": {
-    "listings": [],
-    "scontents": []
-  },
-  "macros": {
-    "tscode{}": {
-      "snippet": "tscode{${1:st-name}}"
-    },
-    "tscode[]{}": {
-      "snippet": "tscode[${2:code-keys}]{${1:st-name}}"
-    },
-    "tscode*{}": {
-      "snippet": "tscode*{${1:st-name}}"
-    },
-    "tscode*[]{}": {
-      "snippet": "tscode*[${2:code-keys}]{${1:st-name}}"
-    },
-    "tsdemo{}": {
-      "snippet": "tsdemo{${1:st-name}}"
-    },
-    "tsdemo[]{}": {
-      "snippet": "tsdemo[${2:code-keys}]{${1:st-name}}"
-    },
-    "tsdemo*{}": {
-      "snippet": "tsdemo*{${1:st-name}}"
-    },
-    "tsdemo*[]{}": {
-      "snippet": "tsdemo*[${2:code-keys}]{${1:st-name}}"
-    },
-    "tsresult{}": {
-      "snippet": "tsresult{${1:st-name}}"
-    },
-    "tsresult[]{}": {
-      "snippet": "tsresult[${2:code-keys}]{${1:st-name}}"
-    },
-    "tsresult*{}": {
-      "snippet": "tsresult*{${1:st-name}}"
-    },
-    "tsresult*[]{}": {
-      "snippet": "tsresult*[${2:code-keys}]{${1:st-name}}"
-    },
-    "setcodekeys{}": {
-      "snippet": "setcodekeys{${1:code-keys}}"
-    },
-    "PkgDescription{}": {
-      "snippet": "PkgDescription{${1:arg}}"
-    },
-    "PkgInfo{}{}": {
-      "snippet": "PkgInfo{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {
-    "codestore": {},
-    "codestore[]": {
-      "name": "codestore",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "${1:st-name}",
-      "st=${1:st-name}",
-      "store-at=${1:st-name}",
-      "store-env=${1:seq name}",
-      "print-env",
-      "write-env=${1:file.ext}",
-      "write-out=${1:file.ext}",
-      "overwrite",
-      "force-eol"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/color.json b/dev/packages/color.json
deleted file mode 100644
index 27b5e9caf..000000000
--- a/dev/packages/color.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "textcolor{}{}": {
-      "snippet": "textcolor{${1:color}}{${2:text}}"
-    },
-    "textcolor[]{}{}": {
-      "snippet": "textcolor[${3:model}]{${1:color}}{${2:text}}"
-    },
-    "mathcolor{}{}": {
-      "snippet": "mathcolor{${1:color}}{${2:math}}"
-    },
-    "mathcolor[]{}{}": {
-      "snippet": "mathcolor[${3:model}]{${1:color}}{${2:math}}"
-    },
-    "pagecolor{}": {
-      "snippet": "pagecolor{${1:color}}"
-    },
-    "nopagecolor": {},
-    "definecolor{}{}{}": {
-      "snippet": "definecolor{${1:name}}{${2:model}}{${3:color-spec}}"
-    },
-    "DefineNamedColor{}{}{}{}": {
-      "snippet": "DefineNamedColor{${1:type}}{${2:name}}{${3:model}}{${4:spec}}"
-    },
-    "normalcolor": {},
-    "color[]{}": {
-      "snippet": "color[${2:model}]{${1:color}}"
-    },
-    "color{}": {
-      "snippet": "color{${1:color}}"
-    },
-    "colorbox[]{}{}": {
-      "snippet": "colorbox[${3:model}]{${1:color}}{${2:text}}"
-    },
-    "colorbox{}{}": {
-      "snippet": "colorbox{${1:color}}{${2:text}}"
-    },
-    "fcolorbox[]{}{}{}": {
-      "snippet": "fcolorbox[${4:model}]{${1:color}}{${2:color}}{${3:text}}"
-    },
-    "fcolorbox{}{}{}": {
-      "snippet": "fcolorbox{${1:color}}{${2:color}}{${3:text}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "monochrome",
-    "debugshow",
-    "setpagesize",
-    "nosetpagesize",
-    "dvips",
-    "xdvi",
-    "dvipdf",
-    "dvipdfm",
-    "dvipdfmx",
-    "pdftex",
-    "luatex",
-    "dvisvgm",
-    "xetex",
-    "dvipsone",
-    "dviwindo",
-    "emtex",
-    "dviwin",
-    "oztex",
-    "textures",
-    "pctexps",
-    "pctexwin",
-    "pctexhp",
-    "pctex32",
-    "truetex",
-    "tcidvi",
-    "vtex",
-    "dvipsnames",
-    "nodvipsnames",
-    "usenames"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/colorblind.json b/dev/packages/colorblind.json
deleted file mode 100644
index 78405358b..000000000
--- a/dev/packages/colorblind.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "includes": {
-    "xcolor": [],
-    "ifthen": [],
-    "tikz": [],
-    "tikzlibrarymath": [],
-    "pgfplots": []
-  },
-  "macros": {
-    "drawScheme{}": {
-      "snippet": "drawScheme{${1:scheme}}"
-    },
-    "drawSchemeC{}": {
-      "snippet": "drawSchemeC{${1:scheme}}"
-    },
-    "drawSchemeC[]{}": {
-      "snippet": "drawSchemeC[${2:width}]{${1:scheme}}"
-    },
-    "theColorNum": {}
-  },
-  "envs": {},
-  "options": [
-    "Tol",
-    "OkabeIto"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/colortbl.json b/dev/packages/colortbl.json
deleted file mode 100644
index 764bfe2f4..000000000
--- a/dev/packages/colortbl.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "includes": {
-    "array": [],
-    "color": []
-  },
-  "macros": {
-    "arrayrulecolor{}": {
-      "snippet": "arrayrulecolor{${1:color}}"
-    },
-    "arrayrulecolor[]{}": {
-      "snippet": "arrayrulecolor[${2:color model}]{${1:color}}"
-    },
-    "cellcolor{}": {
-      "snippet": "cellcolor{${1:color}}"
-    },
-    "cellcolor[]{}[][]": {
-      "snippet": "cellcolor[${2:color model}]{${1:color}}[${3:left overhang}][${4:right overhang}]"
-    },
-    "columncolor{}": {
-      "snippet": "columncolor{${1:color}}"
-    },
-    "columncolor[]{}[][]": {
-      "snippet": "columncolor[${2:color model}]{${1:color}}[${3:left overhang}][${4:right overhang}]"
-    },
-    "doublerulesepcolor{}": {
-      "snippet": "doublerulesepcolor{${1:color}}"
-    },
-    "doublerulesepcolor[]{}": {
-      "snippet": "doublerulesepcolor[${2:color model}]{${1:color}}"
-    },
-    "rowcolor{}": {
-      "snippet": "rowcolor{${1:color}}"
-    },
-    "rowcolor[]{}[][]": {
-      "snippet": "rowcolor[${2:color model}]{${1:color}}[${3:left overhang}][${4:right overhang}]"
-    },
-    "minrowclearance": {},
-    "rowcolors{}{}{}": {
-      "snippet": "rowcolors{${1:row}}{${2:color}}{${3:color}}"
-    },
-    "rowcolors[]{}{}{}": {
-      "snippet": "rowcolors[${4:commands}]{${1:row}}{${2:color}}{${3:color}}"
-    },
-    "rowcolors*{}{}{}": {
-      "snippet": "rowcolors*{${1:row}}{${2:color}}{${3:color}}"
-    },
-    "rowcolors*[]{}{}{}": {
-      "snippet": "rowcolors*[${4:commands}]{${1:row}}{${2:color}}{${3:color}}"
-    },
-    "showrowcolors": {},
-    "hiderowcolors": {},
-    "rownum": {},
-    "therownum": {}
-  },
-  "envs": {},
-  "options": [
-    "monochrome",
-    "debugshow",
-    "setpagesize",
-    "nosetpagesize",
-    "dvips",
-    "xdvi",
-    "dvipdf",
-    "dvipdfm",
-    "dvipdfmx",
-    "pdftex",
-    "luatex",
-    "dvisvgm",
-    "xetex",
-    "dvipsone",
-    "dviwindo",
-    "emtex",
-    "dviwin",
-    "oztex",
-    "textures",
-    "pctexps",
-    "pctexwin",
-    "pctexhp",
-    "pctex32",
-    "truetex",
-    "tcidvi",
-    "vtex",
-    "dvipsnames",
-    "nodvipsnames",
-    "usenames"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/comma.json b/dev/packages/comma.json
deleted file mode 100644
index 6e4891350..000000000
--- a/dev/packages/comma.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "commaform{}": {
-      "snippet": "commaform{${1:counter}}"
-    },
-    "commaformtoken": {},
-    "addcomma{}{}{}{}": {
-      "snippet": "addcomma{${1:digit1}}{${2:digit2}}{${3:digit3}}{${4:digit4 or \\relax}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/comment.json b/dev/packages/comment.json
deleted file mode 100644
index b4e49ab56..000000000
--- a/dev/packages/comment.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "includecomment{}": {
-      "snippet": "includecomment{${1:envname}}"
-    },
-    "excludecomment{}": {
-      "snippet": "excludecomment{${1:envname}}"
-    },
-    "CommentCutFile": {},
-    "ProcessCutFile": {},
-    "generalcomment{}{}{}": {
-      "snippet": "generalcomment{${1:envname}}{${2:begdef}}{${3:enddef}}"
-    },
-    "specialcomment{}{}{}": {
-      "snippet": "specialcomment{${1:envname}}{${2:begdef}}{${3:enddef}}"
-    },
-    "Thiscomment{}": {
-      "snippet": "Thiscomment{${1:line stuff}}"
-    },
-    "WriteCommentLine{}": {
-      "snippet": "WriteCommentLine{${1:line stuff}}"
-    },
-    "ThisComment{}": {
-      "snippet": "ThisComment{${1:line stuff}}"
-    },
-    "processcomment{}{}{}{}": {
-      "snippet": "processcomment{${1:envname}}{${2:def}}{${3:begdef}}{${4:enddef}}"
-    },
-    "makeinnocent{}": {
-      "snippet": "makeinnocent{${1:arg}}"
-    },
-    "csarg{}{}": {
-      "snippet": "csarg{${1:arg1}}{${2:arg2}}"
-    },
-    "latexname": {},
-    "latexename": {},
-    "CommentStream": {},
-    "DefaultCutFileName": {},
-    "ProcessComment{}": {
-      "snippet": "ProcessComment{${1:arg}}"
-    },
-    "CurrentComment": {},
-    "xComment{}": {
-      "snippet": "xComment{${1:arg}}"
-    },
-    "ProcessCommentLine{}": {
-      "snippet": "ProcessCommentLine{${1:arg}}"
-    },
-    "SetUpCutFile": {},
-    "PrepareCutFile": {},
-    "CloseAndInputCutFile": {},
-    "FinalizeCutFile": {},
-    "leveledcomment{}{}": {
-      "snippet": "leveledcomment{${1:arg1}}{${2:arg2}}"
-    },
-    "EndOfComment{}": {
-      "snippet": "EndOfComment{${1:arg}}"
-    },
-    "CommentEndDef{}": {
-      "snippet": "CommentEndDef{${1:arg}}"
-    }
-  },
-  "envs": {
-    "comment": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/commutative-diagrams.json b/dev/packages/commutative-diagrams.json
deleted file mode 100644
index 82c9946d6..000000000
--- a/dev/packages/commutative-diagrams.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "tikzlibrarycommutative-diagrams": []
-  },
-  "macros": {},
-  "envs": {
-    "codi": {},
-    "codi[]": {
-      "name": "codi",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "prompter",
-      "expand=",
-      "replace character=${1:character1} with ${2:character2}",
-      "replace charcode=${1:charcode} with ${2:character}",
-      "remove characters=${1:characters}",
-      "remove character=${1:character}",
-      "remove charcode=${1:charcode}",
-      "overwrite=",
-      "every diagram/.append style={${1:TikZ options}}",
-      "every layout/.append style={${1:TikZ options}}",
-      "every object/.append style={${1:TikZ options}}",
-      "every arrow/.append style={${1:TikZ options}}",
-      "every label/.append style={${1:TikZ options}}",
-      "tetragonal",
-      "tetragonal=base ${1:<length>} height ${2:<length>}",
-      "hexagonal",
-      "hexagonal=${1:<direction>} side ${2:<length>} angle ${3:<angle>}",
-      "square=",
-      "golden=",
-      "arrows/crossing over",
-      "arrows/crossing over/clearance=",
-      "arrows/crossing over/color=",
-      "arrows/slide=",
-      "arrows/shove=",
-      "%color",
-      "x=",
-      "y=",
-      "node distance="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/competences.json b/dev/packages/competences.json
index 3fd19db0a..4f16e8b72 100644
--- a/dev/packages/competences.json
+++ b/dev/packages/competences.json
@@ -28,7 +28,7 @@
       "snippet": "tableaupartie{${1:partie}}"
     },
     "tableauprefix{}": {
-      "snippet": "tableauprefix{${1:partie1,${2:partie2},...}}"
+      "snippet": "tableauprefix{${1:partie1,partie2,...}}"
     },
     "cstotal": {},
     "dummyMacro": {},
diff --git a/dev/packages/contour.json b/dev/packages/contour.json
deleted file mode 100644
index b8685689b..000000000
--- a/dev/packages/contour.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "includes": {
-    "color": []
-  },
-  "macros": {
-    "contour{}{}": {
-      "snippet": "contour{${1:color}}{${2:text}}"
-    },
-    "contour*{}{}": {
-      "snippet": "contour*{${1:color}}{${2:text}}"
-    },
-    "contour[]{}{}": {
-      "snippet": "contour[${3:number}]{${1:color}}{${2:text}}"
-    },
-    "contourlength{}": {
-      "snippet": "contourlength{${1:length}}"
-    },
-    "contournumber{}": {
-      "snippet": "contournumber{${1:number}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "auto",
-    "dvips",
-    "xdvi",
-    "pdftex",
-    "vtex",
-    "dvipsone",
-    "outline",
-    "copies"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/contracard.json b/dev/packages/contracard.json
deleted file mode 100644
index 7fd39e856..000000000
--- a/dev/packages/contracard.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
-  "includes": {
-    "calc": [],
-    "intcalc": [],
-    "ifthen": [],
-    "tocloft": [],
-    "imakeidx": [
-      "enableidx"
-    ]
-  },
-  "macros": {
-    "defaultcontraenv": {},
-    "dancetitleenv": {},
-    "dancetitleformat": {},
-    "danceauthorformat": {},
-    "danceformformat": {},
-    "movedelimiter": {},
-    "partdelimiter": {},
-    "midpartdelimiter": {},
-    "phrasevspace": {},
-    "phraseseparator": {},
-    "showcountbefore": {},
-    "showcountafter": {},
-    "hidecountbefore": {},
-    "hidecountafter": {},
-    "countleftbracket{}": {
-      "snippet": "countleftbracket{${1:bracket}}"
-    },
-    "countrightbracket{}": {
-      "snippet": "countrightbracket{${1:bracket}}"
-    },
-    "setdefaultnotesenv{}": {
-      "snippet": "setdefaultnotesenv{${1:envname}}"
-    },
-    "prenotevspace": {},
-    "thedancecount": {},
-    "thepartcount": {},
-    "thephrasecount": {},
-    "thedancepart": {},
-    "thedancephrase": {},
-    "thedancepartlength": {},
-    "thedancephraselength": {},
-    "resetdancepartlength": {},
-    "resetdancephraselength": {},
-    "resetdancephrase": {},
-    "resetdancephrase*": {},
-    "resetdancepart": {},
-    "resetdancepart*": {},
-    "newdancephrase": {},
-    "newdancepart": {},
-    "thephrasemovenum": {},
-    "thepartmovenum": {},
-    "thehalfpartmovenum": {},
-    "thedancemovenum": {},
-    "move{}": {
-      "snippet": "move{${1:move}}"
-    },
-    "move[]{}": {
-      "snippet": "move[${2:beats}]{${1:move}}"
-    },
-    "move*{}": {
-      "snippet": "move*{${1:move}}"
-    },
-    "move*[]{}": {
-      "snippet": "move*[${2:beats}]{${1:move}}"
-    },
-    "themovecount": {},
-    "allemande{}{}": {
-      "snippet": "allemande{${1:beats}}{${2:direction}}"
-    },
-    "allemande[]{}{}": {
-      "snippet": "allemande[${3:person}]{${1:beats}}{${2:direction}}"
-    },
-    "allemande*{}{}": {
-      "snippet": "allemande*{${1:beats}}{${2:direction}}"
-    },
-    "allemande*[]{}{}": {
-      "snippet": "allemande*[${3:person}]{${1:beats}}{${2:direction}}"
-    },
-    "balance": {},
-    "balance[]": {
-      "snippet": "balance[${1:post-text}]"
-    },
-    "balance*": {},
-    "balance*[]": {
-      "snippet": "balance*[${1:pre-text}]"
-    },
-    "balanceand": {},
-    "balanceand[]": {
-      "snippet": "balanceand[${1:post-text}]"
-    },
-    "balanceand*": {},
-    "balanceand*[]": {
-      "snippet": "balanceand*[${1:pre-text}]"
-    },
-    "butterflywhirl{}": {
-      "snippet": "butterflywhirl{${1:beats}}"
-    },
-    "butterflywhirl[]{}": {
-      "snippet": "butterflywhirl[${2:post-text}]{${1:beats}}"
-    },
-    "butterflywhirl*{}": {
-      "snippet": "butterflywhirl*{${1:beats}}"
-    },
-    "butterflywhirl*[]{}": {
-      "snippet": "butterflywhirl*[${2:pre-text}]{${1:beats}}"
-    },
-    "circleleft{}": {
-      "snippet": "circleleft{${1:beats}}"
-    },
-    "circleleft[]{}": {
-      "snippet": "circleleft[${2:post-text}]{${1:beats}}"
-    },
-    "circleleft*{}": {
-      "snippet": "circleleft*{${1:beats}}"
-    },
-    "circleleft*[]{}": {
-      "snippet": "circleleft*[${2:pre-text}]{${1:beats}}"
-    },
-    "circleright{}": {
-      "snippet": "circleright{${1:beats}}"
-    },
-    "circleright[]{}": {
-      "snippet": "circleright[${2:post-text}]{${1:beats}}"
-    },
-    "circleright*{}": {
-      "snippet": "circleright*{${1:beats}}"
-    },
-    "circleright*[]{}": {
-      "snippet": "circleright*[${2:pre-text}]{${1:beats}}"
-    },
-    "courtesyturn{}": {
-      "snippet": "courtesyturn{${1:beats}}"
-    },
-    "courtesyturn[]{}": {
-      "snippet": "courtesyturn[${2:person}]{${1:beats}}"
-    },
-    "courtesyturn*{}": {
-      "snippet": "courtesyturn*{${1:beats}}"
-    },
-    "courtesyturn*[]{}": {
-      "snippet": "courtesyturn*[${2:person}]{${1:beats}}"
-    },
-    "dosido{}": {
-      "snippet": "dosido{${1:beats}}"
-    },
-    "dosido[]{}": {
-      "snippet": "dosido[${2:person}]{${1:beats}}"
-    },
-    "dosido*{}": {
-      "snippet": "dosido*{${1:beats}}"
-    },
-    "dosido*[]{}": {
-      "snippet": "dosido*[${2:person}]{${1:beats}}"
-    },
-    "seesaw{}": {
-      "snippet": "seesaw{${1:beats}}"
-    },
-    "seesaw[]{}": {
-      "snippet": "seesaw[${2:person}]{${1:beats}}"
-    },
-    "seesaw*{}": {
-      "snippet": "seesaw*{${1:beats}}"
-    },
-    "seesaw*[]{}": {
-      "snippet": "seesaw*[${2:person}]{${1:beats}}"
-    },
-    "walkaround{}": {
-      "snippet": "walkaround{${1:beats}}"
-    },
-    "walkaround[]{}": {
-      "snippet": "walkaround[${2:person}]{${1:beats}}"
-    },
-    "walkaround*{}": {
-      "snippet": "walkaround*{${1:beats}}"
-    },
-    "walkaround*[]{}": {
-      "snippet": "walkaround*[${2:person}]{${1:beats}}"
-    },
-    "walkaroundleft{}": {
-      "snippet": "walkaroundleft{${1:beats}}"
-    },
-    "walkaroundleft[]{}": {
-      "snippet": "walkaroundleft[${2:person}]{${1:beats}}"
-    },
-    "walkaroundleft*{}": {
-      "snippet": "walkaroundleft*{${1:beats}}"
-    },
-    "walkaroundleft*[]{}": {
-      "snippet": "walkaroundleft*[${2:person}]{${1:beats}}"
-    },
-    "walkaroundright{}": {
-      "snippet": "walkaroundright{${1:beats}}"
-    },
-    "walkaroundright[]{}": {
-      "snippet": "walkaroundright[${2:person}]{${1:beats}}"
-    },
-    "walkaroundright*{}": {
-      "snippet": "walkaroundright*{${1:beats}}"
-    },
-    "walkaroundright*[]{}": {
-      "snippet": "walkaroundright*[${2:person}]{${1:beats}}"
-    },
-    "heyforfour": {},
-    "heyforfour[]": {
-      "snippet": "heyforfour[${1:post-text}]"
-    },
-    "heyforfour*": {},
-    "heyforfour*[]": {
-      "snippet": "heyforfour*[${1:pre-text}]"
-    },
-    "halfhey": {},
-    "halfhey[]": {
-      "snippet": "halfhey[${1:post-text}]"
-    },
-    "halfhey*": {},
-    "halfhey*[]": {
-      "snippet": "halfhey*[${1:pre-text}]"
-    },
-    "halfheyricochet": {},
-    "halfheyricochet[]": {
-      "snippet": "halfheyricochet[${1:post-text}]"
-    },
-    "halfheyricochet*": {},
-    "halfheyricochet*[]": {
-      "snippet": "halfheyricochet*[${1:pre-text}]"
-    },
-    "fullhey": {},
-    "fullhey[]": {
-      "snippet": "fullhey[${1:post-text}]"
-    },
-    "fullhey*": {},
-    "fullhey*[]": {
-      "snippet": "fullhey*[${1:pre-text}]"
-    },
-    "fullheyricochet": {},
-    "fullheyricochet[]": {
-      "snippet": "fullheyricochet[${1:post-text}]"
-    },
-    "fullheyricochet*": {},
-    "fullheyricochet*[]": {
-      "snippet": "fullheyricochet*[${1:pre-text}]"
-    },
-    "ladieschain": {},
-    "ladieschain[]": {
-      "snippet": "ladieschain[${1:post-text}]"
-    },
-    "ladieschain*": {},
-    "ladieschain*[]": {
-      "snippet": "ladieschain*[${1:pre-text}]"
-    },
-    "menchain": {},
-    "menchain[]": {
-      "snippet": "menchain[${1:post-text}]"
-    },
-    "menchain*": {},
-    "menchain*[]": {
-      "snippet": "menchain*[${1:pre-text}]"
-    },
-    "halfladieschain": {},
-    "halfladieschain[]": {
-      "snippet": "halfladieschain[${1:post-text}]"
-    },
-    "halfladieschain*": {},
-    "halfladieschain*[]": {
-      "snippet": "halfladieschain*[${1:pre-text}]"
-    },
-    "halfmenchain": {},
-    "halfmenchain[]": {
-      "snippet": "halfmenchain[${1:post-text}]"
-    },
-    "halfmenchain*": {},
-    "halfmenchain*[]": {
-      "snippet": "halfmenchain*[${1:pre-text}]"
-    },
-    "fullladieschain": {},
-    "fullladieschain[]": {
-      "snippet": "fullladieschain[${1:post-text}]"
-    },
-    "fullladieschain*": {},
-    "fullladieschain*[]": {
-      "snippet": "fullladieschain*[${1:pre-text}]"
-    },
-    "fullmenchain": {},
-    "fullmenchain[]": {
-      "snippet": "fullmenchain[${1:post-text}]"
-    },
-    "fullmenchain*": {},
-    "fullmenchain*[]": {
-      "snippet": "fullmenchain*[${1:pre-text}]"
-    },
-    "lines": {},
-    "lines[]": {
-      "snippet": "lines[${1:type}]"
-    },
-    "lines*": {},
-    "lines*[]": {
-      "snippet": "lines*[${1:type}]"
-    },
-    "longlines": {},
-    "longlines[]": {
-      "snippet": "longlines[${1:type}]"
-    },
-    "longlines*": {},
-    "longlines*[]": {
-      "snippet": "longlines*[${1:type}]"
-    },
-    "madrobin": {},
-    "madrobin[]": {
-      "snippet": "madrobin[${1:post-text}]"
-    },
-    "madrobin*": {},
-    "madrobin*[]": {
-      "snippet": "madrobin*[${1:pre-text}]"
-    },
-    "petronella": {},
-    "petronella[]": {
-      "snippet": "petronella[${1:post-text}]"
-    },
-    "petronella*": {},
-    "petronella*[]": {
-      "snippet": "petronella*[${1:pre-text}]"
-    },
-    "petronellanella": {},
-    "petronellanella[]": {
-      "snippet": "petronellanella[${1:post-text}]"
-    },
-    "petronellanella*": {},
-    "petronellanella*[]": {
-      "snippet": "petronellanella*[${1:pre-text}]"
-    },
-    "promenade{}": {
-      "snippet": "promenade{${1:beats}}"
-    },
-    "promenade[]{}": {
-      "snippet": "promenade[${2:person}]{${1:beats}}"
-    },
-    "promenade*{}": {
-      "snippet": "promenade*{${1:beats}}"
-    },
-    "promenade*[]{}": {
-      "snippet": "promenade*[${2:person}]{${1:beats}}"
-    },
-    "halfpromenade": {},
-    "halfpromenade[]": {
-      "snippet": "halfpromenade[${1:person}]"
-    },
-    "halfpromenade*": {},
-    "halfpromenade*[]": {
-      "snippet": "halfpromenade*[${1:person}]"
-    },
-    "rightandleftthrough": {},
-    "rightandleftthrough[]": {
-      "snippet": "rightandleftthrough[${1:post-text}]"
-    },
-    "rightandleftthrough*": {},
-    "rightandleftthrough*[]": {
-      "snippet": "rightandleftthrough*[${1:pre-text}]"
-    },
-    "rightsandlefts": {},
-    "rightsandlefts[]": {
-      "snippet": "rightsandlefts[${1:post-text}]"
-    },
-    "rightsandlefts*": {},
-    "rightsandlefts*[]": {
-      "snippet": "rightsandlefts*[${1:pre-text}]"
-    },
-    "rollaway": {},
-    "rollaway[]": {
-      "snippet": "rollaway[${1:post-text}]"
-    },
-    "rollaway*{}": {
-      "snippet": "rollaway*{${1:post-text}}"
-    },
-    "rollaway*[]{}": {
-      "snippet": "rollaway*[${2:pre-text}]{${1:post-text}}"
-    },
-    "rollawaysashay": {},
-    "rollawaysashay[]": {
-      "snippet": "rollawaysashay[${1:post-text}]"
-    },
-    "rollawaysashay*{}": {
-      "snippet": "rollawaysashay*{${1:post-text}}"
-    },
-    "rollawaysashay*[]{}": {
-      "snippet": "rollawaysashay*[${2:pre-text}]{${1:post-text}}"
-    },
-    "starleft{}": {
-      "snippet": "starleft{${1:beats}}"
-    },
-    "starleft*{}": {
-      "snippet": "starleft*{${1:beats}}"
-    },
-    "starright{}": {
-      "snippet": "starright{${1:beats}}"
-    },
-    "starright*{}": {
-      "snippet": "starright*{${1:beats}}"
-    },
-    "sashay{}": {
-      "snippet": "sashay{${1:beats}}"
-    },
-    "sashay[]{}": {
-      "snippet": "sashay[${2:post-text}]{${1:beats}}"
-    },
-    "sashay*{}{}": {
-      "snippet": "sashay*{${1:beats}}{${2:pre-text}}"
-    },
-    "sashay*[]{}{}": {
-      "snippet": "sashay*[${3:post-text}]{${1:beats}}{${2:pre-text}}"
-    },
-    "swing": {},
-    "swing[]": {
-      "snippet": "swing[${1:post-text}]"
-    },
-    "swing*": {},
-    "swing*[]": {
-      "snippet": "swing*[${1:pre-text}]"
-    },
-    "turnalone": {},
-    "turnalone[]": {
-      "snippet": "turnalone[${1:post-text}]"
-    },
-    "turnalone*{}": {
-      "snippet": "turnalone*{${1:beats}}"
-    },
-    "turnalone*[]{}": {
-      "snippet": "turnalone*[${2:post-text}]{${1:beats}}"
-    },
-    "turncouple": {},
-    "turncouple[]": {
-      "snippet": "turncouple[${1:post-text}]"
-    },
-    "turncouple*{}": {
-      "snippet": "turncouple*{${1:beats}}"
-    },
-    "turncouple*[]{}": {
-      "snippet": "turncouple*[${2:post-text}]{${1:beats}}"
-    },
-    "turntogether": {},
-    "turntogether[]": {
-      "snippet": "turntogether[${1:post-text}]"
-    },
-    "turntogether*{}": {
-      "snippet": "turntogether*{${1:beats}}"
-    },
-    "turntogether*[]{}": {
-      "snippet": "turntogether*[${2:post-text}]{${1:beats}}"
-    },
-    "twirltoswap": {},
-    "californiatwirl": {},
-    "starthrough": {},
-    "starthru": {},
-    "boxthegnat": {},
-    "swattheflea": {},
-    "jerseytwirl": {},
-    "arizonatwirl": {},
-    "downthehall{}": {
-      "snippet": "downthehall{${1:beats}}"
-    },
-    "downthehall[]{}": {
-      "snippet": "downthehall[${2:post-text}]{${1:beats}}"
-    },
-    "downthehall*{}": {
-      "snippet": "downthehall*{${1:beats}}"
-    },
-    "downthehall*[]{}": {
-      "snippet": "downthehall*[${2:pre-text}]{${1:beats}}"
-    },
-    "upthehall{}": {
-      "snippet": "upthehall{${1:beats}}"
-    },
-    "upthehall[]{}": {
-      "snippet": "upthehall[${2:post-text}]{${1:beats}}"
-    },
-    "upthehall*{}": {
-      "snippet": "upthehall*{${1:beats}}"
-    },
-    "upthehall*[]{}": {
-      "snippet": "upthehall*[${2:pre-text}]{${1:beats}}"
-    },
-    "dancetitle": {},
-    "danceauthor": {},
-    "danceform": {},
-    "listofdance": {},
-    "listofdances": {},
-    "thedance": {},
-    "lodtitle": {},
-    "enableidx": {},
-    "pauseindexing": {},
-    "resumeindexing": {},
-    "dbtname": {},
-    "dbaname": {},
-    "mvpname": {},
-    "mvdname": {},
-    "moveindex{}": {
-      "snippet": "moveindex{${1:entry}}"
-    },
-    "moveindex*{}": {
-      "snippet": "moveindex*{${1:entry}}"
-    },
-    "moveindexNoStar{}": {
-      "snippet": "moveindexNoStar{${1:entry}}"
-    },
-    "moveindexStar{}": {
-      "snippet": "moveindexStar{${1:entry}}"
-    },
-    "timesaround{}{}": {
-      "snippet": "timesaround{${1:beats-around}}{${2:total-beats}}"
-    },
-    "thetimesaround": {},
-    "thequartertimesaround": {},
-    "notes{}": {
-      "snippet": "notes{${1:text}}"
-    },
-    "spelldosido": {},
-    "spellDosido": {},
-    "setdosidospelling{}": {
-      "snippet": "setdosidospelling{${1:spelling}}"
-    }
-  },
-  "envs": {
-    "contra{}{}{}": {
-      "name": "contra",
-      "snippet": "{${1:title}}{${2:author}}{${3:form}}"
-    },
-    "contra[]{}{}{}": {
-      "name": "contra",
-      "snippet": "[${4:envname}]{${1:title}}{${2:author}}{${3:form}}"
-    }
-  },
-  "options": [
-    "showcountafter",
-    "showcountbefore",
-    "enableidx"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/conv-xkv.json b/dev/packages/conv-xkv.json
index 624c12e01..0bcebafac 100644
--- a/dev/packages/conv-xkv.json
+++ b/dev/packages/conv-xkv.json
@@ -6,15 +6,6 @@
     "cxkvsetkeys{}{}": {
       "snippet": "cxkvsetkeys{${1:family}}{${2:keyval pairs}}"
     },
-    "cxkvsetkeys(){}{}": {
-      "snippet": "cxkvsetkeys(${3:name}){${1:family}}{${2:keyval pairs}}"
-    },
-    "cxkvsetkeys()[]{}{}": {
-      "snippet": "cxkvsetkeys(${4:name})[${3:prefix}]{${1:family}}{${2:keyval pairs}}"
-    },
-    "cxkvsetkeys()[]{}[]{}": {
-      "snippet": "cxkvsetkeys(${5:name})[${3:prefix}]{${1:family}}[${4:na}]{${2:keyval pairs}}"
-    },
     "DeclareDelimiter{}{}": {
       "snippet": "DeclareDelimiter{${1:name}}{${2:delimiter}}"
     },
diff --git a/dev/packages/coordsys.json b/dev/packages/coordsys.json
index 20a7802c7..487bf54a7 100644
--- a/dev/packages/coordsys.json
+++ b/dev/packages/coordsys.json
@@ -25,96 +25,6 @@
     "vnumbline*[]{}{}": {
       "snippet": "vnumbline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
-    "coordsys()()": {
-      "snippet": "coordsys(${1:lower-left})(${2:upper-right})"
-    },
-    "coordsys[]()()": {
-      "snippet": "coordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordsys[][]()()": {
-      "snippet": "coordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "coordsys*()()": {
-      "snippet": "coordsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "coordsys*[]()()": {
-      "snippet": "coordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordsys*[][]()()": {
-      "snippet": "coordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "fcoordsys()()": {
-      "snippet": "fcoordsys(${1:lower-left})(${2:upper-right})"
-    },
-    "fcoordsys[]()()": {
-      "snippet": "fcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "fcoordsys[][]()()": {
-      "snippet": "fcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "fcoordsys*()()": {
-      "snippet": "fcoordsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "fcoordsys*[]()()": {
-      "snippet": "fcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "fcoordsys*[][]()()": {
-      "snippet": "fcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "bcoordsys()()": {
-      "snippet": "bcoordsys(${1:lower-left})(${2:upper-right})"
-    },
-    "bcoordsys[]()()": {
-      "snippet": "bcoordsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "bcoordsys[][]()()": {
-      "snippet": "bcoordsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "bcoordsys*()()": {
-      "snippet": "bcoordsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "bcoordsys*[]()()": {
-      "snippet": "bcoordsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "bcoordsys*[][]()()": {
-      "snippet": "bcoordsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "window()()": {
-      "snippet": "window(${1:lower-left})(${2:upper-right})"
-    },
-    "window[]()()": {
-      "snippet": "window[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "window[][]()()": {
-      "snippet": "window[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "window*()()": {
-      "snippet": "window*(${1:lower-left})(${2:upper-right})"
-    },
-    "window*[]()()": {
-      "snippet": "window*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "window*[][]()()": {
-      "snippet": "window*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "coordgrid()()": {
-      "snippet": "coordgrid(${1:lower-left})(${2:upper-right})"
-    },
-    "coordgrid[]()()": {
-      "snippet": "coordgrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordgrid[][]()()": {
-      "snippet": "coordgrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "coordgrid*()()": {
-      "snippet": "coordgrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "coordgrid*[]()()": {
-      "snippet": "coordgrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "coordgrid*[][]()()": {
-      "snippet": "coordgrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
     "gridstyle{}{}": {
       "snippet": "gridstyle{${1:thin-declaration}}{${2:thick-declaration}}"
     },
diff --git a/dev/packages/cquthesis.json b/dev/packages/cquthesis.json
deleted file mode 100644
index bda6129a1..000000000
--- a/dev/packages/cquthesis.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "includes": {
-    "dirtree": []
-  },
-  "macros": {
-    "speakyourlove": {},
-    "speakyourlove[]": {
-      "snippet": "speakyourlove[${1:name}]"
-    },
-    "qthis{}": {
-      "snippet": "qthis{${1:text}}"
-    },
-    "figref{}": {
-      "snippet": "figref{${1:label}}"
-    },
-    "tabref{}": {
-      "snippet": "tabref{${1:label}}"
-    },
-    "cmd{}": {
-      "snippet": "cmd{${1:cmd}}"
-    },
-    "cs{}": {
-      "snippet": "cs{${1:csname}}"
-    },
-    "csgo{}{}": {
-      "snippet": "csgo{${1:csname}}{${2:arg}}"
-    },
-    "meta{}": {
-      "snippet": "meta{${1:arg}}"
-    },
-    "marg{}": {
-      "snippet": "marg{${1:arg}}"
-    },
-    "oarg{}": {
-      "snippet": "oarg{${1:arg}}"
-    },
-    "parg{}": {
-      "snippet": "parg{${1:arg}}"
-    },
-    "pkg{}": {
-      "snippet": "pkg{${1:package}}"
-    },
-    "myicon{}": {
-      "snippet": "myicon{${1:color}}"
-    },
-    "myfolder{}{}": {
-      "snippet": "myfolder{${1:color}}{${2:folder}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/cropmark.json b/dev/packages/cropmark.json
deleted file mode 100644
index 46e7de734..000000000
--- a/dev/packages/cropmark.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "croplength": {},
-    "cropwidth": {},
-    "cropsep": {},
-    "croppadtop": {},
-    "croppadbot": {},
-    "croppadlr": {},
-    "crophrule": {},
-    "cropvrule": {},
-    "shipAfterBox": {},
-    "shipAfterRegister": {},
-    "SomeBox": {},
-    "xshipout": {},
-    "yshipout": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/cursor.json b/dev/packages/cursor.json
deleted file mode 100644
index b9339feaf..000000000
--- a/dev/packages/cursor.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "cursorformula{}": {
-      "snippet": "cursorformula{${1:formula}}"
-    },
-    "Lc{}": {
-      "snippet": "Lc{${1:arg}}"
-    },
-    "Rc{}": {
-      "snippet": "Rc{${1:arg}}"
-    },
-    "LRc{}{}": {
-      "snippet": "LRc{${1:arg1}}{${2:arg2}}"
-    },
-    "cursorheight{}": {
-      "snippet": "cursorheight{${1:arg}}"
-    },
-    "ruled": {},
-    "ruleh": {},
-    "rulew": {},
-    "rulewr": {},
-    "rulewl": {},
-    "cursorlinew": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/curve2e.json b/dev/packages/curve2e.json
index 4cea17578..305dc3da8 100644
--- a/dev/packages/curve2e.json
+++ b/dev/packages/curve2e.json
@@ -5,21 +5,12 @@
     "pict2e": []
   },
   "macros": {
-    "Arc()(){}": {
-      "snippet": "Arc(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
-    },
     "AutoGrid": {},
-    "AutoGrid()": {
-      "snippet": "AutoGrid(${1:coordinates})"
-    },
     "ChangeDir<>": {
       "snippet": "ChangeDir<${1:cmd}>"
     },
     "CurveEnd": {},
     "CurveFinish": {},
-    "Dashline()(){}": {
-      "snippet": "Dashline(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dash length}}"
-    },
     "defaultlinethickness{}": {
       "snippet": "defaultlinethickness{${1:dimension}}"
     },
@@ -28,12 +19,6 @@
     "Divvect{}{}{}": {
       "snippet": "Divvect{${1:vector1}}{${2:vector2}}{${3:vector macro}}"
     },
-    "Dotline()(){}": {
-      "snippet": "Dotline(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dot gap}}"
-    },
-    "Dotline()(){}[]": {
-      "snippet": "Dotline(${3:x1},${4:y1})(${5:x2},${6:y2}){${1:dot gap}}[${2:dot diameter}]"
-    },
     "FillCurve": {},
     "fillstroke": {},
     "fpdowhile{}{}": {
@@ -45,25 +30,13 @@
     "fpwhiledo{}{}": {
       "snippet": "fpwhiledo{${1:test}}{${2:code}}"
     },
-    "GetCoord(){}{}": {
-      "snippet": "GetCoord(${3:cmd}){${1:x}}{${2:y}}"
-    },
-    "GraphGrid()": {
-      "snippet": "GraphGrid(${1:coordinates})"
-    },
     "Integer{}": {
       "snippet": "Integer{${1:number}}"
     },
     "IsPolar{}": {
       "snippet": "IsPolar{${1:arg1}}"
     },
-    "legenda(){}": {
-      "snippet": "legenda(${2:coordinates}){${1:formula}}"
-    },
     "legendbox": {},
-    "LIne()": {
-      "snippet": "LIne(${1:cmd})"
-    },
     "ModDirDot": {},
     "Multvect{}*{}*{}": {
       "snippet": "Multvect{${1:vector1}}*{${2:vector2}}*{${3:vector macro}}"
@@ -82,105 +55,12 @@
       "snippet": "Numero{${1:cmd}}{${2:dimen}}"
     },
     "PbDim": {},
-    "Pbox()[]{}": {
-      "snippet": "Pbox(${3:coordinates})[${2:position}]{${1:formula}}"
-    },
-    "Pbox()[]{}*": {
-      "snippet": "Pbox(${3:coordinates})[${2:position}]{${1:formula}}*"
-    },
-    "Pbox()[]{}*<>": {
-      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}*<${3:angle}>"
-    },
-    "Pbox()[]{}[]": {
-      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]"
-    },
-    "Pbox()[]{}[]*": {
-      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]*"
-    },
-    "Pbox()[]{}[]*<>": {
-      "snippet": "Pbox(${5:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]*<${4:angle}>"
-    },
-    "Pbox()[]{}[]<>": {
-      "snippet": "Pbox(${5:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]<${4:angle}>"
-    },
-    "Pbox()[]{}<>": {
-      "snippet": "Pbox(${4:coordinates})[${2:position}]{${1:formula}}<${3:angle}>"
-    },
-    "Pbox(){}": {
-      "snippet": "Pbox(${2:coordinates}){${1:formula}}"
-    },
-    "Pbox(){}*": {
-      "snippet": "Pbox(${2:coordinates}){${1:formula}}*"
-    },
-    "Pbox(){}*<>": {
-      "snippet": "Pbox(${3:coordinates}){${1:formula}}*<${2:angle}>"
-    },
-    "Pbox(){}[]": {
-      "snippet": "Pbox(${3:coordinates}){${1:formula}}[${2:dot diameter}]"
-    },
-    "Pbox(){}[]*": {
-      "snippet": "Pbox(${3:coordinates}){${1:formula}}[${2:dot diameter}]*"
-    },
-    "Pbox(){}[]*<>": {
-      "snippet": "Pbox(${4:coordinates}){${1:formula}}[${2:dot diameter}]*<${3:angle}>"
-    },
-    "Pbox(){}[]<>": {
-      "snippet": "Pbox(${4:coordinates}){${1:formula}}[${2:dot diameter}]<${3:angle}>"
-    },
-    "Pbox(){}<>": {
-      "snippet": "Pbox(${3:coordinates}){${1:formula}}<${2:angle}>"
-    },
     "Rapp": {},
-    "segment()()": {
-      "snippet": "segment(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
     "Segno": {},
-    "SplitCartesian(){}{}": {
-      "snippet": "SplitCartesian(${3:x},${4:y}){${1:xmacro}}{${2:ymacro}}"
-    },
-    "SplitPolar(){}{}": {
-      "snippet": "SplitPolar(${3:angle:radius}){${1:anglemacro}}{${2:radiusmacro}}"
-    },
     "TROF": {},
     "TRON": {},
-    "VECTOR()()": {
-      "snippet": "VECTOR(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "VectorArc()(){}": {
-      "snippet": "VectorArc(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
-    },
-    "VectorARC()(){}": {
-      "snippet": "VectorARC(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
-    },
-    "VVECTOR()()": {
-      "snippet": "VVECTOR(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "VVectorArc()(){}": {
-      "snippet": "VVectorArc(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:angle}}"
-    },
-    "xmultiput()(){}{}": {
-      "snippet": "xmultiput(${3:x},${4:y})(${5:Δx},${6:Δy}){${1:copies}}{${2:object}}"
-    },
-    "xmultiput[]()(){}{}": {
-      "snippet": "xmultiput[${3:center}](${4:x},${5:y})(${6:Δx},${7:Δy}){${1:copies}}{${2:object}}"
-    },
-    "Zbox()[]{}": {
-      "snippet": "Zbox(${3:coordinates})[${2:position}]{${1:formula}}"
-    },
-    "Zbox()[]{}[]": {
-      "snippet": "Zbox(${4:coordinates})[${2:position}]{${1:formula}}[${3:dot diameter}]"
-    },
-    "Zbox(){}": {
-      "snippet": "Zbox(${2:coordinates}){${1:formula}}"
-    },
-    "Zbox(){}[]": {
-      "snippet": "Zbox(${3:coordinates}){${1:formula}}[${2:dot diameter}]"
-    },
     "DivideFN": {},
     "DivVect": {},
-    "Dline()(){}": {
-      "snippet": "Dline(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dash length}}"
-    },
     "MultiplyFN": {},
     "MultVect": {},
     "originalcurveto": {},
diff --git a/dev/packages/curves.json b/dev/packages/curves.json
index 3afedf55f..36ad3708f 100644
--- a/dev/packages/curves.json
+++ b/dev/packages/curves.json
@@ -25,38 +25,11 @@
     "xscaley": {},
     "yscale": {},
     "yscalex": {},
-    "arc(){}": {
-      "snippet": "arc(${2:x},${3:y}){${1:angle}}"
-    },
-    "arc[](){}": {
-      "snippet": "arc[${2:n}](${3:x},${4:y}){${1:angle}}"
-    },
     "bigcircle{}": {
       "snippet": "bigcircle{${1:diameter}}"
     },
     "bigcircle[]{}": {
       "snippet": "bigcircle[${2:n}]{${1:diameter}}"
-    },
-    "closecurve()": {
-      "snippet": "closecurve(${1:coords})"
-    },
-    "closecurve[]()": {
-      "snippet": "closecurve[${1:n}](${2:coords})"
-    },
-    "curve()": {
-      "snippet": "curve(${1:coords})"
-    },
-    "curve[]()": {
-      "snippet": "curve[${1:n}](${2:coords})"
-    },
-    "scaleput(){}": {
-      "snippet": "scaleput(${2:x},${3:y}){${1:object}}"
-    },
-    "tagcurve()": {
-      "snippet": "tagcurve(${1:coords})"
-    },
-    "tagcurve[]()": {
-      "snippet": "tagcurve[${1:n}](${2:coords})"
     }
   },
   "envs": {},
diff --git a/dev/packages/cyber.json b/dev/packages/cyber.json
index a5b3e135d..2d7210c36 100644
--- a/dev/packages/cyber.json
+++ b/dev/packages/cyber.json
@@ -65,7 +65,7 @@
     "Cyberindexingenabledfalse": {},
     "complianceaux": {},
     "foreach{}{}{}{}": {
-      "snippet": "foreach{${1:macro}}{${2:arg1}}{${3:arg2}}{${4:item1,${5:item2},...}}"
+      "snippet": "foreach{${1:macro}}{${2:arg1}}{${3:arg2}}{${4:item1,item2,...}}"
     },
     "requirement{}{}": {
       "snippet": "requirement{${1:document id}}{${2:requirement name}}"
diff --git a/dev/packages/dad.json b/dev/packages/dad.json
deleted file mode 100644
index 40670a49c..000000000
--- a/dev/packages/dad.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "includes": {
-    "luatex": [],
-    "luatex85": []
-  },
-  "macros": {
-    "arab{}": {
-      "snippet": "arab{${1:arabic text}}"
-    },
-    "arabttexample{}": {
-      "snippet": "arabttexample{${1:arabic text}}"
-    },
-    "arabtt{}": {
-      "snippet": "arabtt{${1:arabic text}}"
-    },
-    "kesh": {},
-    "arabdottedcircle": {},
-    "arabttsep{}{}": {
-      "snippet": "arabttsep{${1:arabic text}}{${2:text}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/dbshow.json b/dev/packages/dbshow.json
index b3b9d5c6d..a862250dd 100644
--- a/dev/packages/dbshow.json
+++ b/dev/packages/dbshow.json
@@ -2,13 +2,13 @@
   "includes": {},
   "macros": {
     "dbNewDatabase{}{}": {
-      "snippet": "dbNewDatabase{${1:database}}{${2:attr1=val1,${3:attr2=val2},...}}"
+      "snippet": "dbNewDatabase{${1:database}}{${2:attr1=val1,attr2=val2,...}}"
     },
     "dbNewDatabase[]{}{}": {
-      "snippet": "dbNewDatabase[${3:base database}]{${1:database}}{${2:attr1=val1,${4:attr2=val2},...}}"
+      "snippet": "dbNewDatabase[${3:base database}]{${1:database}}{${2:attr1=val1,attr2=val2,...}}"
     },
     "dbNewDatabase*{}{}": {
-      "snippet": "dbNewDatabase*{${1:database}}{${2:attr1=val1,${3:attr2=val2},...}}"
+      "snippet": "dbNewDatabase*{${1:database}}{${2:attr1=val1,attr2=val2,...}}"
     },
     "dbshow{}{}": {
       "snippet": "dbshow{${1:style}}{${2:database}}"
@@ -84,7 +84,7 @@
       "snippet": "dbitemkv{${1:database}}"
     },
     "dbitemkv{}[]": {
-      "snippet": "dbitemkv{${1:database}}[${2:attr1=val1,${3:attr2=val2},...}]"
+      "snippet": "dbitemkv{${1:database}}[${2:attr1=val1,attr2=val2,...}]"
     },
     "dbsave{}{}": {
       "snippet": "dbsave{${1:attr}}{${2:data}}"
@@ -164,7 +164,7 @@
     },
     "dbitem{}[]": {
       "name": "dbitem",
-      "snippet": "{${1:database}}[${2:attr1=val1,${3:attr2=val2},...}]"
+      "snippet": "{${1:database}}[${2:attr1=val1,attr2=val2,...}]"
     }
   },
   "options": [],
diff --git a/dev/packages/delim.json b/dev/packages/delim.json
deleted file mode 100644
index 40e58246a..000000000
--- a/dev/packages/delim.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "delimdef{}{}": {
-      "snippet": "delimdef{${1:cmd}}{${2:def}}"
-    },
-    "dleft": {},
-    "dright": {},
-    "dmiddle": {},
-    "mnorm": {},
-    "mbig": {},
-    "mBig": {},
-    "mbigg": {},
-    "mBigg": {},
-    "mauto": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/delimset.json b/dev/packages/delimset.json
index 8de940f87..a2d0d4f7c 100644
--- a/dev/packages/delimset.json
+++ b/dev/packages/delimset.json
@@ -4,47 +4,18 @@
     "keyval": []
   },
   "macros": {
-    "delimsize": {},
-    "kerndelim{}": {
-      "snippet": "kerndelim{${1:width}}"
-    },
-    "usedelim": {},
     "DeclareMathDelimiterSet{}{}": {
       "snippet": "DeclareMathDelimiterSet{${1:command}}{${2:definition}}"
     },
     "DeclareMathDelimiterSet{}[]{}": {
       "snippet": "DeclareMathDelimiterSet{${1:command}}[${2:args}]{${3:definition}}"
     },
-    "selectdeliml{}": {
-      "snippet": "selectdeliml{${1:delim}}"
-    },
-    "selectdeliml*{}": {
-      "snippet": "selectdeliml*{${1:delim}}"
-    },
     "selectdelim{}": {
       "snippet": "selectdelim{${1:delim}}"
     },
-    "selectdelim*{}": {
-      "snippet": "selectdelim*{${1:delim}}"
-    },
     "selectdelim[]{}": {
       "snippet": "selectdelim[${2:class}]{${1:delim}}"
     },
-    "selectdelim[]*{}": {
-      "snippet": "selectdelim[${2:class}]*{${1:delim}}"
-    },
-    "selectdelimr{}": {
-      "snippet": "selectdelimr{${1:delim}}"
-    },
-    "selectdelimr*{}": {
-      "snippet": "selectdelimr*{${1:delim}}"
-    },
-    "DeclareMathDelimiterSel{}{}{}": {
-      "snippet": "DeclareMathDelimiterSel{${1:command}}{${2:left-def}}{${3:right-def}}"
-    },
-    "parsedelimflags{}{}": {
-      "snippet": "parsedelimflags{${1:compositor}}{${2:selector}}"
-    },
     "brk[]": {
       "snippet": "brk[${1:options}]",
       "keyvalindex": 0,
@@ -68,11 +39,7 @@
     "Biggp": {},
     "Bigp": {},
     "biggb": {},
-    "biggp": {},
-    "bigi": {},
-    "Bigi": {},
-    "biggi": {},
-    "Biggi": {}
+    "biggp": {}
   },
   "envs": {},
   "options": [
diff --git a/dev/packages/democodetools.json b/dev/packages/democodetools.json
index c1460ab34..ba84873ef 100644
--- a/dev/packages/democodetools.json
+++ b/dev/packages/democodetools.json
@@ -127,10 +127,10 @@
       "snippet": "Key[${2:pre}]{${1:key}}"
     },
     "Keylst{}": {
-      "snippet": "Keylst{${1:key1,${2:key2},...}}"
+      "snippet": "Keylst{${1:key1,key2,...}}"
     },
     "Keylst[]{}": {
-      "snippet": "Keylst[${2:default}]{${1:key1,${3:key2},...}}"
+      "snippet": "Keylst[${2:default}]{${1:key1,key2,...}}"
     },
     "KeyUse{}{}": {
       "snippet": "KeyUse{${1:key}}{${2:value}}"
@@ -142,10 +142,10 @@
       "snippet": "Env[${2:pre}]{${1:envname}}"
     },
     "Envlst{}": {
-      "snippet": "Envlst{${1:env1,${2:env2},...}}"
+      "snippet": "Envlst{${1:env1,env2,...}}"
     },
     "Envlst[]{}": {
-      "snippet": "Envlst[${2:pre}]{${1:env1,${3:env2},...}}"
+      "snippet": "Envlst[${2:pre}]{${1:env1,env2,...}}"
     },
     "Option{}": {
       "snippet": "Option{${1:option}}"
@@ -154,10 +154,10 @@
       "snippet": "Option[${2:pre}]{${1:option}}"
     },
     "Optionlst{}": {
-      "snippet": "Optionlst{${1:opt1,${2:opt2},...}}"
+      "snippet": "Optionlst{${1:opt1,opt2,...}}"
     },
     "Optionlst[]{}": {
-      "snippet": "Optionlst[${2:pre}]{${1:opt1,${3:opt2},...}}"
+      "snippet": "Optionlst[${2:pre}]{${1:opt1,opt2,...}}"
     },
     "Pack{}": {
       "snippet": "Pack{${1:package}}"
@@ -166,10 +166,10 @@
       "snippet": "Pack[${2:pre}]{${1:package}}"
     },
     "Packlst{}": {
-      "snippet": "Packlst{${1:package1,${2:package2},...}}"
+      "snippet": "Packlst{${1:package1,package2,...}}"
     },
     "Packlst[]{}": {
-      "snippet": "Packlst[${2:pre}]{${1:package1,${3:package2},...}}"
+      "snippet": "Packlst[${2:pre}]{${1:package1,package2,...}}"
     },
     "Value{}": {
       "snippet": "Value{${1:value}}"
@@ -178,10 +178,10 @@
       "snippet": "Value[${2:pre}]{${1:value}}"
     },
     "Valuelst{}": {
-      "snippet": "Valuelst{${1:val1,${2:val2},...}}"
+      "snippet": "Valuelst{${1:val1,val2,...}}"
     },
     "Valuelst[]{}": {
-      "snippet": "Valuelst[${2:pre}]{${1:val1,${3:val2},...}}"
+      "snippet": "Valuelst[${2:pre}]{${1:val1,val2,...}}"
     },
     "MetaFmt": {},
     "MetaFmt[]": {
diff --git a/dev/packages/diagbox.json b/dev/packages/diagbox.json
deleted file mode 100644
index 797a38a78..000000000
--- a/dev/packages/diagbox.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "includes": {
-    "keyval": [],
-    "pict2e": [],
-    "calc": [],
-    "array": [],
-    "fp": []
-  },
-  "macros": {
-    "diagbox{}{}": {
-      "snippet": "diagbox{${1:left}}{${2:right}}"
-    },
-    "diagbox[]{}{}": {
-      "snippet": "diagbox[${3:options}]{${1:left}}{${2:right}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "diagbox{}{}{}": {
-      "snippet": "diagbox{${1:left}}{${2:middle}}{${3:right}}"
-    },
-    "backslashbox{}{}": {
-      "snippet": "backslashbox{${1:left}}{${2:right}}"
-    },
-    "backslashbox[]{}{}": {
-      "snippet": "backslashbox[${3:width}]{${1:left}}{${2:right}}"
-    },
-    "backslashbox[][]{}{}": {
-      "snippet": "backslashbox[${3:width}][${4:trim}]{${1:left}}{${2:right}}"
-    },
-    "slashbox{}{}": {
-      "snippet": "slashbox{${1:left}}{${2:right}}"
-    },
-    "slashbox[]{}{}": {
-      "snippet": "slashbox[${3:width}]{${1:left}}{${2:right}}"
-    },
-    "slashbox[][]{}{}": {
-      "snippet": "slashbox[${3:width}][${4:trim}]{${1:left}}{${2:right}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "width=",
-      "height=",
-      "dir=",
-      "innerwidth=",
-      "innerleftsep=",
-      "innerrightsep=",
-      "outerleftsep=",
-      "outerrightsep=",
-      "leftsep=",
-      "rightsep=",
-      "trim=",
-      "font=${1:font commands}",
-      "linewidth=",
-      "linecolor="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/diagram.json b/dev/packages/diagram.json
deleted file mode 100644
index 70e9fb467..000000000
--- a/dev/packages/diagram.json
+++ /dev/null
@@ -1,278 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "calc": [],
-    "pstricks": []
-  },
-  "macros": {
-    "putsol": {},
-    "normalnames": {},
-    "reversednames": {},
-    "Dr": {},
-    "Prof": {},
-    "ProfDr": {},
-    "pieces{}": {
-      "snippet": "pieces{${1:pieces}}"
-    },
-    "pieces[]{}": {
-      "snippet": "pieces[${2:white+black}]{${1:pieces}}"
-    },
-    "fen{}": {
-      "snippet": "fen{${1:pieces}}"
-    },
-    "fen[]{}": {
-      "snippet": "fen[${2:white+black}]{${1:pieces}}"
-    },
-    "stipulation{}": {
-      "snippet": "stipulation{${1:stipulation}}"
-    },
-    "stip{}": {
-      "snippet": "stip{${1:stipulation}}"
-    },
-    "city{}": {
-      "snippet": "city{${1:city}}"
-    },
-    "specialdiagnum{}": {
-      "snippet": "specialdiagnum{${1:number}}"
-    },
-    "sourcenr{}": {
-      "snippet": "sourcenr{${1:number}}"
-    },
-    "source{}": {
-      "snippet": "source{${1:source}}"
-    },
-    "issue{}": {
-      "snippet": "issue{${1:number}}"
-    },
-    "pages{}": {
-      "snippet": "pages{${1:pages}}"
-    },
-    "day{}": {
-      "snippet": "day{${1:day}}"
-    },
-    "month{}": {
-      "snippet": "month{${1:month}}"
-    },
-    "months{}": {
-      "snippet": "months{${1:months}}"
-    },
-    "year{}": {
-      "snippet": "year{${1:year}}"
-    },
-    "tournament{}": {
-      "snippet": "tournament{${1:name}}"
-    },
-    "tourn{}": {
-      "snippet": "tourn{${1:name}}"
-    },
-    "award{}": {
-      "snippet": "award{${1:name}}"
-    },
-    "dedication{}": {
-      "snippet": "dedication{${1:text}}"
-    },
-    "dedic{}": {
-      "snippet": "dedic{${1:text}}"
-    },
-    "condition{}": {
-      "snippet": "condition{${1:text}}"
-    },
-    "cond{}": {
-      "snippet": "cond{${1:text}}"
-    },
-    "twins{}": {
-      "snippet": "twins{${1:text}}"
-    },
-    "remark{}": {
-      "snippet": "remark{${1:text}}"
-    },
-    "rem{}": {
-      "snippet": "rem{${1:text}}"
-    },
-    "piecedefs{{}{}{}": {
-      "snippet": "piecedefs{{${1:piece1}}{${2:piece2}}{${3:text};...}}"
-    },
-    "solution{}": {
-      "snippet": "solution{${1:text}}"
-    },
-    "sol{}": {
-      "snippet": "sol{${1:text}}"
-    },
-    "judgement{}": {
-      "snippet": "judgement{${1:text}}"
-    },
-    "comment{}": {
-      "snippet": "comment{${1:text}}"
-    },
-    "themes{}": {
-      "snippet": "themes{${1:text}}"
-    },
-    "verticalcylinder": {},
-    "horizontalcylinder": {},
-    "noframe": {},
-    "noinnerframe": {},
-    "gridchess": {},
-    "stdgrid": {},
-    "diagleft": {},
-    "diagcenter": {},
-    "diagright": {},
-    "widedias": {},
-    "dianamestyle{}": {
-      "snippet": "dianamestyle{${1:option}}"
-    },
-    "solnamestyle{}": {
-      "snippet": "solnamestyle{${1:option}}"
-    },
-    "diagnumbering{}": {
-      "snippet": "diagnumbering{${1:numstyle}}"
-    },
-    "setmonthstyle{}": {
-      "snippet": "setmonthstyle{${1:numstyle}}"
-    },
-    "nocomputer": {},
-    "showcomputer": {},
-    "notcomputerproofedsymbol": {},
-    "computerproofedsymbol": {},
-    "selectelchfont{}": {
-      "snippet": "selectelchfont{${1:type}}"
-    },
-    "diagramx": {},
-    "diagramxi": {},
-    "diagramxii": {},
-    "diagnum{}": {
-      "snippet": "diagnum{${1:number}}"
-    },
-    "diagnum[]{}": {
-      "snippet": "diagnum[${2:prefix}]{${1:number}}"
-    },
-    "spacelayout{}": {
-      "snippet": "spacelayout{${1:type}}"
-    },
-    "allwhite": {},
-    "switchcolors": {},
-    "nofields{}": {
-      "snippet": "nofields{${1:list of squares}}"
-    },
-    "nosquares{}": {
-      "snippet": "nosquares{${1:list of squares}}"
-    },
-    "fieldframe{}": {
-      "snippet": "fieldframe{${1:list of fields}}"
-    },
-    "magic{}": {
-      "snippet": "magic{${1:list of fields}}"
-    },
-    "gridlines{}": {
-      "snippet": "gridlines{${1:list of lines}}"
-    },
-    "fieldtext{{}": {
-      "snippet": "fieldtext{{${1:text1}piece1,...}}"
-    },
-    "swL": {},
-    "ssL": {},
-    "wNr": {},
-    "nNr": {},
-    "sNr": {},
-    "wGh": {},
-    "nGh": {},
-    "sGh": {},
-    "Imi": {},
-    "wC": {},
-    "nC": {},
-    "sC": {},
-    "wE": {},
-    "sE": {},
-    "nE": {},
-    "wX": {},
-    "sX": {},
-    "nX": {},
-    "set": {},
-    "ra": {},
-    "lra": {},
-    "OO": {},
-    "OOO": {},
-    "x": {
-      "detail": "𝑥",
-      "documentation": "MATHEMATICAL ITALIC SMALL X"
-    },
-    "any": {},
-    "DefinePieces{}{}{}": {
-      "snippet": "DefinePieces{${1:color letters}}{${2:piece letters}}{${3:rotation letters}}"
-    },
-    "develop": {},
-    "makeaindex": {},
-    "authorindex": {},
-    "makesindex": {},
-    "sourceindex": {},
-    "maketindex": {},
-    "themeindex": {},
-    "solpar": {},
-    "after{}": {
-      "snippet": "after{${1:arg}}"
-    },
-    "authorfont": {},
-    "awardfont": {},
-    "cityfont": {},
-    "Co{}": {
-      "snippet": "Co{${1:arg}}"
-    },
-    "correction{}": {
-      "snippet": "correction{${1:arg}}"
-    },
-    "dedicfont": {},
-    "DefaultDiagramSize": {},
-    "defaultelchfont": {},
-    "elchfont": {},
-    "fidealbum{}": {
-      "snippet": "fidealbum{${1:arg}}"
-    },
-    "further": {},
-    "ifimitator": {},
-    "imitatorfalse": {},
-    "imitatortrue": {},
-    "labelfont": {},
-    "legendfont": {},
-    "nodiagnumbering": {},
-    "normalboardwidth": {},
-    "nowidedias": {},
-    "remfont": {},
-    "rla": {},
-    "setboardwidth": {},
-    "showlabel{}": {
-      "snippet": "showlabel{${1:arg}}"
-    },
-    "showtypis{}": {
-      "snippet": "showtypis{${1:arg}}"
-    },
-    "solafterdiagram": {},
-    "solhead{}": {
-      "snippet": "solhead{${1:arg}}"
-    },
-    "sourcefont": {},
-    "spacehorizontal": {},
-    "stipfont": {},
-    "textproblem": {},
-    "thediag": {},
-    "topdist": {},
-    "version{}": {
-      "snippet": "version{${1:arg}}"
-    },
-    "wF": {}
-  },
-  "envs": {
-    "diagram": {},
-    "diagram[]": {
-      "name": "diagram",
-      "snippet": "[${1:<${2:cols}>x<${3:rows}>}]"
-    },
-    "stereodiagram": {},
-    "spacediagram": {},
-    "figurine": {}
-  },
-  "options": [
-    "10pt",
-    "11pt",
-    "12pt"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/dichokey.json b/dev/packages/dichokey.json
deleted file mode 100644
index d349e8849..000000000
--- a/dev/packages/dichokey.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "includes": {
-    "calc": [],
-    "ifthen": []
-  },
-  "macros": {
-    "alter": {},
-    "name{}": {
-      "snippet": "name{${1:name}}"
-    },
-    "name[]{}": {
-      "snippet": "name[${2:prefix}]{${1:name}}"
-    },
-    "altindent": {},
-    "hang": {},
-    "keylabelwidth": {},
-    "oldparindent": {},
-    "panic{}": {
-      "snippet": "panic{${1:arg}}"
-    },
-    "thebacksteps": {},
-    "thebinarycounter": {},
-    "thebincouplet": {},
-    "thecouplet": {},
-    "thedelta": {},
-    "theindentcounter": {},
-    "thelastcouplet": {},
-    "thetemp": {},
-    "gprefix": {}
-  },
-  "envs": {
-    "Key{}": {
-      "name": "Key",
-      "snippet": "{${1:prefix}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/diffcoeff.json b/dev/packages/diffcoeff.json
index aa2b543c6..08af17d8d 100644
--- a/dev/packages/diffcoeff.json
+++ b/dev/packages/diffcoeff.json
@@ -5,196 +5,196 @@
   },
   "macros": {
     "diff{}{}": {
-      "snippet": "diff{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "diff{${1:variable(s)}}{${2:differentiand}}"
     },
     "diff{}{}[]": {
-      "snippet": "diff{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diff{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diff[]{}{}": {
-      "snippet": "diff[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "diff[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "diff[]{}{}[]": {
-      "snippet": "diff[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diff[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diff*{}{}": {
-      "snippet": "diff*{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "diff*{${1:variable(s)}}{${2:differentiand}}"
     },
     "diff*{}{}[]": {
-      "snippet": "diff*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diff*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diff*[]{}{}": {
-      "snippet": "diff*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "diff*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "diff*[]{}{}[]": {
-      "snippet": "diff*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diff*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diff**{}{}": {
-      "snippet": "diff**{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "diff**{${1:variable(s)}}{${2:differentiand}}"
     },
     "diff**{}{}[]": {
-      "snippet": "diff**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diff**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diff**[]{}{}": {
-      "snippet": "diff**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "diff**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "diff**[]{}{}[]": {
-      "snippet": "diff**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diff**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difs{}{}": {
-      "snippet": "difs{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difs{${1:variable(s)}}{${2:differentiand}}"
     },
     "difs{}{}[]": {
-      "snippet": "difs{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difs{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difs[]{}{}": {
-      "snippet": "difs[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difs[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difs[]{}{}[]": {
-      "snippet": "difs[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difs[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difs*{}{}": {
-      "snippet": "difs*{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difs*{${1:variable(s)}}{${2:differentiand}}"
     },
     "difs*{}{}[]": {
-      "snippet": "difs*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difs*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difs*[]{}{}": {
-      "snippet": "difs*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difs*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difs*[]{}{}[]": {
-      "snippet": "difs*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difs*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difs**{}{}": {
-      "snippet": "difs**{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difs**{${1:variable(s)}}{${2:differentiand}}"
     },
     "difs**{}{}[]": {
-      "snippet": "difs**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difs**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difs**[]{}{}": {
-      "snippet": "difs**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difs**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difs**[]{}{}[]": {
-      "snippet": "difs**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difs**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difc{}{}": {
-      "snippet": "difc{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difc{${1:variable(s)}}{${2:differentiand}}"
     },
     "difc{}{}[]": {
-      "snippet": "difc{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difc{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difc[]{}{}": {
-      "snippet": "difc[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difc[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difc[]{}{}[]": {
-      "snippet": "difc[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difc[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difc**{}{}": {
-      "snippet": "difc**{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difc**{${1:variable(s)}}{${2:differentiand}}"
     },
     "difc**{}{}[]": {
-      "snippet": "difc**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difc**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difc**[]{}{}": {
-      "snippet": "difc**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difc**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difc**[]{}{}[]": {
-      "snippet": "difc**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difc**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diffp{}{}": {
-      "snippet": "diffp{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "diffp{${1:variable(s)}}{${2:differentiand}}"
     },
     "diffp{}{}[]": {
-      "snippet": "diffp{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diffp{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diffp[]{}{}": {
-      "snippet": "diffp[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "diffp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "diffp[]{}{}[]": {
-      "snippet": "diffp[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diffp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diffp*{}{}": {
-      "snippet": "diffp*{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "diffp*{${1:variable(s)}}{${2:differentiand}}"
     },
     "diffp*{}{}[]": {
-      "snippet": "diffp*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diffp*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diffp*[]{}{}": {
-      "snippet": "diffp*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "diffp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "diffp*[]{}{}[]": {
-      "snippet": "diffp*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diffp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "diffp**{}{}": {
-      "snippet": "diffp**{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "diffp**{${1:variable(s)}}{${2:differentiand}}"
     },
     "diffp**{}{}[]": {
-      "snippet": "diffp**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "diffp**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "diffp**[]{}{}": {
-      "snippet": "diffp**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "diffp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "diffp**[]{}{}[]": {
-      "snippet": "diffp**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "diffp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difsp{}{}": {
-      "snippet": "difsp{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difsp{${1:variable(s)}}{${2:differentiand}}"
     },
     "difsp{}{}[]": {
-      "snippet": "difsp{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difsp{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difsp[]{}{}": {
-      "snippet": "difsp[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difsp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difsp[]{}{}[]": {
-      "snippet": "difsp[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difsp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difsp*{}{}": {
-      "snippet": "difsp*{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difsp*{${1:variable(s)}}{${2:differentiand}}"
     },
     "difsp*{}{}[]": {
-      "snippet": "difsp*{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difsp*{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difsp*[]{}{}": {
-      "snippet": "difsp*[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difsp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difsp*[]{}{}[]": {
-      "snippet": "difsp*[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difsp*[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difsp**{}{}": {
-      "snippet": "difsp**{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difsp**{${1:variable(s)}}{${2:differentiand}}"
     },
     "difsp**{}{}[]": {
-      "snippet": "difsp**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difsp**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difsp**[]{}{}": {
-      "snippet": "difsp**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difsp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difsp**[]{}{}[]": {
-      "snippet": "difsp**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difsp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difcp{}{}": {
-      "snippet": "difcp{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difcp{${1:variable(s)}}{${2:differentiand}}"
     },
     "difcp{}{}[]": {
-      "snippet": "difcp{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difcp{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difcp[]{}{}": {
-      "snippet": "difcp[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difcp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difcp[]{}{}[]": {
-      "snippet": "difcp[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difcp[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "difcp**{}{}": {
-      "snippet": "difcp**{${1:variable(${3:s})}}{${2:differentiand}}"
+      "snippet": "difcp**{${1:variable(s)}}{${2:differentiand}}"
     },
     "difcp**{}{}[]": {
-      "snippet": "difcp**{${1:variable(${4:s})}}{${2:differentiand}}[${3:pt of eval}]"
+      "snippet": "difcp**{${1:variable(s)}}{${2:differentiand}}[${3:pt of eval}]"
     },
     "difcp**[]{}{}": {
-      "snippet": "difcp**[${3:order-spec}]{${1:variable(${4:s})}}{${2:differentiand}}"
+      "snippet": "difcp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}"
     },
     "difcp**[]{}{}[]": {
-      "snippet": "difcp**[${3:order-spec}]{${1:variable(${5:s})}}{${2:differentiand}}[${4:pt of eval}]"
+      "snippet": "difcp**[${3:order-spec}]{${1:variable(s)}}{${2:differentiand}}[${4:pt of eval}]"
     },
     "negmu": {},
     "nilmu": {},
@@ -209,16 +209,16 @@
       "keyvalpos": 2
     },
     "dl{}": {
-      "snippet": "dl{${1:variable(${2:s})}}"
+      "snippet": "dl{${1:variable(s)}}"
     },
     "dl[]{}": {
-      "snippet": "dl[${2:order-spec}]{${1:variable(${3:s})}}"
+      "snippet": "dl[${2:order-spec}]{${1:variable(s)}}"
     },
     "difl{}": {
-      "snippet": "difl{${1:variable(${2:s})}}"
+      "snippet": "difl{${1:variable(s)}}"
     },
     "difl[]{}": {
-      "snippet": "difl[${2:order-spec}]{${1:variable(${3:s})}}"
+      "snippet": "difl[${2:order-spec}]{${1:variable(s)}}"
     },
     "jacob{}{}": {
       "snippet": "jacob{${1:numer}}{${2:denom}}"
diff --git a/dev/packages/digicap-pro.json b/dev/packages/digicap-pro.json
index 352827b9c..f3b9a0049 100644
--- a/dev/packages/digicap-pro.json
+++ b/dev/packages/digicap-pro.json
@@ -45,7 +45,7 @@
       "option": "display1"
     },
     "presentationOrder{}": {
-      "snippet": "presentationOrder{${1:name1,${2:name2},...}}",
+      "snippet": "presentationOrder{${1:name1,name2,...}}",
       "option": "display1"
     },
     "digiDisplaySpace{}{}": {
diff --git a/dev/packages/dline.json b/dev/packages/dline.json
deleted file mode 100644
index f71e52a49..000000000
--- a/dev/packages/dline.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "includes": {
-    "lineno": [],
-    "vplref": [
-      "addpageno"
-    ],
-    "ednmath0": [
-      "mathrefs"
-    ],
-    "edtable": [
-      "edtable",
-      "longtable",
-      "nolongtablepatch"
-    ],
-    "longtable": [
-      "longtable",
-      "nolongtablepatch"
-    ],
-    "ltabptch": [
-      "longtable"
-    ]
-  },
-  "macros": {
-    "dlinebox": {},
-    "dlinerule": {},
-    "ddlinerule": {},
-    "dlinesep": {},
-    "ddlinesep": {}
-  },
-  "envs": {
-    "dline": {}
-  },
-  "options": [
-    "addpageno",
-    "mathrefs",
-    "edtable",
-    "longtable",
-    "nolongtablepatch",
-    "left",
-    "right",
-    "switch",
-    "switch*",
-    "columnwise",
-    "pagewise",
-    "running",
-    "modulo",
-    "modulo*",
-    "mathlines"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/dljslib.json b/dev/packages/dljslib.json
index e0ed43a53..46222e9a3 100644
--- a/dev/packages/dljslib.json
+++ b/dev/packages/dljslib.json
@@ -48,9 +48,6 @@
     "dljsRegister{}": {
       "snippet": "dljsRegister{${1:name}}"
     },
-    "emptyCompComplexMsg()": {
-      "snippet": "emptyCompComplexMsg(${1:arg})"
-    },
     "eqDuplEntries": {},
     "eqNonzeroEntries": {},
     "eqSyntaxErrorNoParens": {},
@@ -77,9 +74,6 @@
     "notifyWrongNumEntries": {},
     "NoTrigAllowedErrorMsg": {},
     "NoTrigLogAllowedErrorMsg": {},
-    "pointEmptyCompMsgiv()": {
-      "snippet": "pointEmptyCompMsgiv(${1:arg})"
-    },
     "pointErrorMsgi": {},
     "pointErrorMsgii": {},
     "pointErrorMsgiii": {},
@@ -87,9 +81,6 @@
     "sciNotNormalForm": {},
     "sciNotSyntaxError": {},
     "SyntaxErrorAuthor": {},
-    "vectorEmptyCompMsgiv()": {
-      "snippet": "vectorEmptyCompMsgiv(${1:arg})"
-    },
     "vectorsErrorMsgi": {},
     "vectorsErrorMsgii": {},
     "vectorsErrorMsgiii": {},
diff --git a/dev/packages/doc.json b/dev/packages/doc.json
deleted file mode 100644
index 9e0a3b11d..000000000
--- a/dev/packages/doc.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": [],
-    "multicol": [],
-    "hypdoc": []
-  },
-  "macros": {
-    "SetupDoc{}": {
-      "snippet": "SetupDoc{${1:options}}"
-    },
-    "DocInput{}": {
-      "snippet": "DocInput{${1:file}}"
-    },
-    "IndexInput{}": {
-      "snippet": "IndexInput{${1:file}}"
-    },
-    "DescribeMacro{}": {
-      "snippet": "DescribeMacro{${1:macro}}"
-    },
-    "DescribeMacro[]{}": {
-      "snippet": "DescribeMacro[${2:options}]{${1:macro}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "DescribeEnv{}": {
-      "snippet": "DescribeEnv{${1:envname}}"
-    },
-    "DescribeEnv[]{}": {
-      "snippet": "DescribeEnv[${2:options}]{${1:envname}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "MacrocodeTopsep": {},
-    "MacroTopsep": {},
-    "MacroIndent": {},
-    "MacroFont": {},
-    "PrintDescribeMacro{}": {
-      "snippet": "PrintDescribeMacro{${1:macro}}"
-    },
-    "PrintDescribeEnv{}": {
-      "snippet": "PrintDescribeEnv{${1:envname}}"
-    },
-    "PrintMacroName{}": {
-      "snippet": "PrintMacroName{${1:macro}}"
-    },
-    "PrintEnvName{}": {
-      "snippet": "PrintEnvName{${1:envname}}"
-    },
-    "NewDocElement{}{}": {
-      "snippet": "NewDocElement{${1:element}}{${2:envname}}"
-    },
-    "NewDocElement[]{}{}": {
-      "snippet": "NewDocElement[${3:options}]{${1:element}}{${2:envname}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "RenewDocElement{}{}": {
-      "snippet": "RenewDocElement{${1:element}}{${2:envname}}"
-    },
-    "RenewDocElement[]{}{}": {
-      "snippet": "RenewDocElement[${3:options}]{${1:element}}{${2:envname}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "ProvideDocElement{}{}": {
-      "snippet": "ProvideDocElement{${1:element}}{${2:envname}}"
-    },
-    "ProvideDocElement[]{}{}": {
-      "snippet": "ProvideDocElement[${3:options}]{${1:element}}{${2:envname}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "SpecialEscapechar": {},
-    "DisableCrossrefs": {},
-    "EnableCrossrefs": {},
-    "DoNotIndex{}": {
-      "snippet": "DoNotIndex{${1:macro list}}"
-    },
-    "PageIndex": {},
-    "CodelineIndex": {},
-    "theCodelineNo": {},
-    "CodelineNumbered": {},
-    "actualchar": {},
-    "quotechar": {},
-    "encapchar": {},
-    "levelchar": {},
-    "SpecialMainMacroIndex{}": {
-      "snippet": "SpecialMainMacroIndex{${1:cmd}}"
-    },
-    "SpecialMainEnvIndex{}": {
-      "snippet": "SpecialMainEnvIndex{${1:envname}}"
-    },
-    "SpecialMacroIndex{}": {
-      "snippet": "SpecialMacroIndex{${1:cmd}}"
-    },
-    "SpecialEnvIndex{}": {
-      "snippet": "SpecialEnvIndex{${1:envname}}"
-    },
-    "SpecialIndex{}": {
-      "snippet": "SpecialIndex{${1:cmd}}"
-    },
-    "SpecialShortIndex{}": {
-      "snippet": "SpecialShortIndex{${1:cmd}}"
-    },
-    "SpecialMainIndex{}": {
-      "snippet": "SpecialMainIndex{${1:cmd}}"
-    },
-    "SpecialUsageIndex{}": {
-      "snippet": "SpecialUsageIndex{${1:cmd}}"
-    },
-    "SortIndex{}{}": {
-      "snippet": "SortIndex{${1:sort key}}{${2:index entry}}"
-    },
-    "verbatimchar": {},
-    "*": {
-      "detail": "*",
-      "documentation": "(high) ASTERISK, star"
-    },
-    "PrintIndex": {},
-    "IndexMin": {},
-    "IndexPrologue{}": {
-      "snippet": "IndexPrologue{${1:text}}"
-    },
-    "IndexParms": {},
-    "main{}": {
-      "snippet": "main{${1:text}}"
-    },
-    "usage{}": {
-      "snippet": "usage{${1:text}}"
-    },
-    "code{}": {
-      "snippet": "code{${1:text}}"
-    },
-    "DocstyleParms": {},
-    "MakeShortVerb{}": {
-      "snippet": "MakeShortVerb{${1:definition}}"
-    },
-    "MakeShortVerb*{}": {
-      "snippet": "MakeShortVerb*{${1:definition}}"
-    },
-    "DeleteShortVerb{}": {
-      "snippet": "DeleteShortVerb{${1:definition}}"
-    },
-    "Web": {},
-    "AmSTeX": {},
-    "BibTeX": {},
-    "SliTeX": {},
-    "PlainTeX": {},
-    "meta{}": {
-      "snippet": "meta{${1:arg}}"
-    },
-    "OnlyDescription": {},
-    "MaybeStop{}": {
-      "snippet": "MaybeStop{${1:finale code}}"
-    },
-    "StopEventually{}": {
-      "snippet": "StopEventually{${1:finale code}}"
-    },
-    "Finale": {},
-    "AlsoImplementation": {},
-    "changes{}{}{}": {
-      "snippet": "changes{${1:version}}{${2:date}}{${3:text}}"
-    },
-    "generalname": {},
-    "cs{}": {
-      "snippet": "cs{${1:csname}}"
-    },
-    "RecordChanges": {},
-    "PrintChanges": {},
-    "GlossaryMin": {},
-    "GlossaryPrologue{}": {
-      "snippet": "GlossaryPrologue{${1:text}}"
-    },
-    "GlossaryParms": {},
-    "bslash": {},
-    "MakePrivateLetters": {},
-    "DontCheckModules": {},
-    "CheckModules": {},
-    "Module{}": {
-      "snippet": "Module{${1:directive}}"
-    },
-    "AltMacroFont": {},
-    "theStandardModuleDepth": {},
-    "OldMakeindex": {},
-    "percentchar": {},
-    "CharacterTable{}": {
-      "snippet": "CharacterTable{${1:contents}}"
-    },
-    "CharTableChanges": {},
-    "CheckSum{}": {
-      "snippet": "CheckSum{${1:number}}"
-    },
-    "efill": {},
-    "filedate": {},
-    "fileinfo": {},
-    "filename": {},
-    "fileversion": {},
-    "GetFileInfo{}": {
-      "snippet": "GetFileInfo{${1:file}}"
-    },
-    "LeftBraceIndex": {},
-    "MakePercentComment": {},
-    "MakePercentIgnore": {},
-    "PercentIndex": {},
-    "pfill": {},
-    "RecordIndexType{}{}": {
-      "snippet": "RecordIndexType{${1:cmd}}{${2:type}}"
-    },
-    "RecordIndexTypeAux{}{}": {
-      "snippet": "RecordIndexTypeAux{${1:cmd}}{${2:type}}"
-    },
-    "RightBraceIndex": {},
-    "ShowIndexingState": {}
-  },
-  "envs": {
-    "macrocode": {},
-    "macrocode*": {},
-    "macro{}": {
-      "name": "macro",
-      "snippet": "{${1:macro}}"
-    },
-    "macro[]{}": {
-      "name": "macro",
-      "snippet": "[${2:options}]{${1:macro}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "environment{}": {
-      "name": "environment",
-      "snippet": "{${1:envname}}"
-    },
-    "environment[]{}": {
-      "name": "environment",
-      "snippet": "[${2:options}]{${1:envname}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "theglossary": {}
-  },
-  "options": [
-    "hyperref",
-    "nohyperref",
-    "multicol",
-    "nomulticol",
-    "debugshow",
-    "noindex",
-    "noprint",
-    "reportchangedates",
-    "toplevel",
-    "notoplevel"
-  ],
-  "keyvals": [
-    [
-      "noindex",
-      "noprint"
-    ],
-    [
-      "macrolike",
-      "envlike",
-      "toplevel",
-      "notoplevel",
-      "idxtype=${1:string}",
-      "printtype=${1:string}",
-      "idxgroup=${1:string}",
-      "noindex",
-      "noprint"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/drawstack.json b/dev/packages/drawstack.json
index 323257690..6aa5841c2 100644
--- a/dev/packages/drawstack.json
+++ b/dev/packages/drawstack.json
@@ -27,7 +27,7 @@
       "snippet": "cellround{${1:text}}"
     },
     "drawstruct{}": {
-      "snippet": "drawstruct{${1:(${2:x},${3:y})}}"
+      "snippet": "drawstruct{${1:(${2:x,y})}}"
     },
     "ebp": {},
     "esp": {},
diff --git a/dev/packages/dsptricks.json b/dev/packages/dsptricks.json
index 220368d66..136266c6d 100644
--- a/dev/packages/dsptricks.json
+++ b/dev/packages/dsptricks.json
@@ -17,9 +17,6 @@
     "dspCustomTicks[]{}": {
       "snippet": "dspCustomTicks[${2:options}]{${1:pos1 label1 pos2 label2 ...}}"
     },
-    "dspText(){}": {
-      "snippet": "dspText(${2:x},${3:y}){${1:label}}"
-    },
     "dspTaps{}": {
       "snippet": "dspTaps{${1:data}}"
     },
@@ -203,11 +200,11 @@
   "envs": {
     "dspPlot{}{}": {
       "name": "dspPlot",
-      "snippet": "{${1:xmin,${3:xmax}}{${2:ymin},ymax}}"
+      "snippet": "{${1:xmin,xmax}}{${2:ymin,ymax}}"
     },
     "dspPlot[]{}{}": {
       "name": "dspPlot",
-      "snippet": "[${3:options}]{${1:xmin,${4:xmax}}{${2:ymin},ymax}}"
+      "snippet": "[${3:options}]{${1:xmin,xmax}}{${2:ymin,ymax}}"
     },
     "dspClip": {},
     "dspPZPlot{}": {
diff --git a/dev/packages/dtk-url.json b/dev/packages/dtk-url.json
index 4aae3eca5..d81a49dec 100644
--- a/dev/packages/dtk-url.json
+++ b/dev/packages/dtk-url.json
@@ -9,9 +9,6 @@
     "embedfile": []
   },
   "macros": {
-    "File{}": {
-      "snippet": "File{${1:file}}"
-    },
     "CTANurl{}": {
       "snippet": "CTANurl{${1:URL}}"
     },
diff --git a/dev/packages/dynkin-diagrams.json b/dev/packages/dynkin-diagrams.json
index ac17f611d..1d9c065af 100644
--- a/dev/packages/dynkin-diagrams.json
+++ b/dev/packages/dynkin-diagrams.json
@@ -114,9 +114,6 @@
     "Bdynkin": {},
     "braceYshift": {},
     "Cdynkin": {},
-    "centerarc[]()()": {
-      "snippet": "centerarc[${1:TikZ keys}](${2:center})(${3:initangle:finalangle:radius})"
-    },
     "convertRootNumber{}": {
       "snippet": "convertRootNumber{${1:n}}"
     },
@@ -733,7 +730,6 @@
       "Bourbaki arrow",
       "ceref",
       "Coxeter",
-      "Coxeter above",
       "double edges",
       "double fold",
       "double fold left",
diff --git a/dev/packages/easybase.json b/dev/packages/easybase.json
index 585db846e..14247e408 100644
--- a/dev/packages/easybase.json
+++ b/dev/packages/easybase.json
@@ -47,22 +47,12 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "tableofcontents[]()": {
-      "snippet": "tableofcontents[${1:options}](${2:代码钩子})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "tableofcontents*": {},
     "tableofcontents*[]": {
       "snippet": "tableofcontents*[${1:options}]",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "tableofcontents*[]()": {
-      "snippet": "tableofcontents*[${1:options}](${2:代码钩子})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "listoffigures[]": {
       "snippet": "listoffigures[${1:options}]",
       "keyvalindex": 0,
@@ -139,12 +129,6 @@
     "appendix[]": {
       "snippet": "appendix[${1:前名字,后名字}]"
     },
-    "appendix[]()": {
-      "snippet": "appendix[${1:前名字,后名字}](${2:数字输出命令})"
-    },
-    "appendix()": {
-      "snippet": "appendix(${1:数字输出命令})"
-    },
     "BeforeAddBitoc{}": {
       "snippet": "BeforeAddBitoc{${1:英文标题加入目录前的代码}}"
     },
@@ -195,10 +179,10 @@
       "keyvalpos": 0
     },
     "DeclareThemeColor{}": {
-      "snippet": "DeclareThemeColor{${1:name,${2:frame color},${3:emph color},verb color}}"
+      "snippet": "DeclareThemeColor{${1:name,frame color,emph color,verb color}}"
     },
     "DeclareLinkColor{}": {
-      "snippet": "DeclareLinkColor{${1:name,${2:link color},${3:url color},cite color}}"
+      "snippet": "DeclareLinkColor{${1:name,link color,url color,cite color}}"
     },
     "addtosubfont{}{}": {
       "snippet": "addtosubfont{${1:字体类型}}{${2:字体命令}}"
@@ -213,9 +197,6 @@
     "markrule{}": {
       "snippet": "markrule{${1:线宽}}"
     },
-    "markrule[](){}[]": {
-      "snippet": "markrule[${2:长度}](${4:颜色名}){${1:线宽}}[${3:上间距|下间距}]"
-    },
     "fnfirstindent": {},
     "fnafterindent": {},
     "fnparskip": {},
@@ -251,15 +232,9 @@
     "tocrule{}": {
       "snippet": "tocrule{${1:引导点}}"
     },
-    "tocrule[](){}[]": {
-      "snippet": "tocrule[${2:引导点间距}](${4:放大因子}){${1:引导点}}[${3:页码格式}]"
-    },
     "tocrule*{}": {
       "snippet": "tocrule*{${1:引导点}}"
     },
-    "tocrule*[](){}[]": {
-      "snippet": "tocrule*[${2:引导点间距}](${4:放大因子}){${1:引导点}}[${3:页码格式}]"
-    },
     "RegisterTocName{}": {
       "snippet": "RegisterTocName{${1:条目名}}"
     },
@@ -293,15 +268,9 @@
     "counteruse{}": {
       "snippet": "counteruse{${1:计数器}}"
     },
-    "counteruse[](){}[]": {
-      "snippet": "counteruse[${2:编号}](${4:分隔符}){${1:计数器}}[${3:父计数器}]"
-    },
     "counteruse*{}": {
       "snippet": "counteruse*{${1:计数器}}"
     },
-    "counteruse*[](){}[]": {
-      "snippet": "counteruse*[${2:编号}](${4:分隔符}){${1:计数器}}[${3:父计数器}]"
-    },
     "counterwithin[]{}{}": {
       "snippet": "counterwithin[${3:⟨格式⟩}]{${1:⟨计数器⟩}}{${2:⟨父计数器⟩}}"
     },
diff --git a/dev/packages/easylist.json b/dev/packages/easylist.json
deleted file mode 100644
index 295580441..000000000
--- a/dev/packages/easylist.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "ListProperties()": {
-      "snippet": "ListProperties(${1:options})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "NewList()": {
-      "snippet": "NewList(${1:options})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ifPilcrow": {},
-    "Pilcrowtrue": {},
-    "Pilcrowfalse": {},
-    "ifAt": {},
-    "Attrue": {},
-    "Atfalse": {},
-    "ifSharp": {},
-    "Sharptrue": {},
-    "Sharpfalse": {},
-    "ifAmpersand": {},
-    "Ampersandtrue": {},
-    "Ampersandfalse": {},
-    "ifDubiousFigure": {},
-    "DubiousFiguretrue": {},
-    "DubiousFigurefalse": {}
-  },
-  "envs": {
-    "easylist": {
-      "option": "ampersand"
-    },
-    "easylist[]": {
-      "name": "easylist",
-      "snippet": "[${1:style}]",
-      "option": "ampersand"
-    }
-  },
-  "options": [
-    "pilcrow",
-    "at",
-    "sharp",
-    "ampersand",
-    "${1:number of counters}"
-  ],
-  "keyvals": [
-    [
-      "Start${1:n}=${2:number}",
-      "Start${1:n}*=${2:counter}",
-      "Mark=${1:punctuation}",
-      "Mark${1:n}=${2:punctuation}",
-      "FinalMark=${1:punctuation}",
-      "FinalMark${1:n}=${2:punctuation}",
-      "Numbers=",
-      "Numbers${1:n}=",
-      "Hide=${1:number}",
-      "Hide${1:n}=${2:number}",
-      "Style=${1:format}",
-      "Style${1:n}=${2:format}",
-      "Style*=${1:format}",
-      "Style${1:n}*=${2:format}",
-      "Style**=${1:format}",
-      "Style${1:n}**=${2:format}",
-      "CtrCom=${1:command}",
-      "CtrCom${1:n}=${2:command}",
-      "Hang",
-      "Hang${1:n}",
-      "Align=${1:move, fixed, or <dimen>}",
-      "Align${1:n}=${2:move, fixed, or <dimen>}",
-      "Margin=",
-      "Margin${1:n}=",
-      "Progressive=",
-      "Progressive${1:n}=",
-      "Space=",
-      "Space${1:n}=",
-      "Space*=",
-      "Space${1:n}*=",
-      "Indent=",
-      "Indent${1:n}=",
-      "FinalSpace=",
-      "FinalSpace${1:n}="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/easyvector.json b/dev/packages/easyvector.json
index 081284c72..cb2cf1d7e 100644
--- a/dev/packages/easyvector.json
+++ b/dev/packages/easyvector.json
@@ -4,9 +4,6 @@
     "newvector[]{}": {
       "snippet": "newvector[${2:scalar macro,vector macro}]{${1:text}}"
     },
-    "newvector()[]": {
-      "snippet": "newvector(${2:letter})[${1:text}]"
-    },
     "newvectora{}{}": {
       "snippet": "newvectora{${1:macro}}{${2:text}}"
     },
diff --git a/dev/packages/ebook.json b/dev/packages/ebook.json
deleted file mode 100644
index 45114e1c3..000000000
--- a/dev/packages/ebook.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "includes": {
-    "geometry": [],
-    "graphicx": [],
-    "hyperref": [],
-    "moreverb": []
-  },
-  "macros": {
-    "pagefill": {},
-    "pagefill[]": {
-      "snippet": "pagefill[${1:length}]"
-    },
-    "ebook": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ed.json b/dev/packages/ed.json
deleted file mode 100644
index a1fc40063..000000000
--- a/dev/packages/ed.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "includes": {
-    "paralist": [],
-    "xcolor": [],
-    "verbatim": []
-  },
-  "macros": {
-    "ednote{}": {
-      "snippet": "ednote{${1:text}}"
-    },
-    "ednote[]{}": {
-      "snippet": "ednote[${2:label}]{${1:text}}"
-    },
-    "Ednote{}": {
-      "snippet": "Ednote{${1:text}}"
-    },
-    "Ednote[]{}": {
-      "snippet": "Ednote[${2:label}]{${1:text}}"
-    },
-    "edissue{}": {
-      "snippet": "edissue{${1:text}}"
-    },
-    "edissue[]{}": {
-      "snippet": "edissue[${2:label}]{${1:text}}"
-    },
-    "edIssue{}": {
-      "snippet": "edIssue{${1:text}}"
-    },
-    "edIssue[]{}": {
-      "snippet": "edIssue[${2:label}]{${1:text}}"
-    },
-    "tweak{}": {
-      "snippet": "tweak{${1:text}}"
-    },
-    "tweak[]{}": {
-      "snippet": "tweak[${2:label}]{${1:text}}"
-    },
-    "Tweak{}": {
-      "snippet": "Tweak{${1:text}}"
-    },
-    "Tweak[]{}": {
-      "snippet": "Tweak[${2:label}]{${1:text}}"
-    },
-    "edstubURI{}": {
-      "snippet": "edstubURI{${1:URI}}"
-    },
-    "ednoteshape": {},
-    "ifshowednotes": {},
-    "showednotestrue": {},
-    "showednotesfalse": {},
-    "ifmargins": {},
-    "marginstrue": {},
-    "marginsfalse": {},
-    "theednote": {},
-    "ednotelabel{}": {
-      "snippet": "ednotelabel{${1:text}}"
-    },
-    "ednotemargin{}": {
-      "snippet": "ednotemargin{${1:text}}"
-    },
-    "tweaklabel{}": {
-      "snippet": "tweaklabel{${1:text}}"
-    },
-    "tweakmargin{}": {
-      "snippet": "tweakmargin{${1:text}}"
-    },
-    "edissuelabel{}": {
-      "snippet": "edissuelabel{${1:text}}"
-    },
-    "edissuemargin{}": {
-      "snippet": "edissuemargin{${1:text}}"
-    },
-    "newpartmargins{}{}": {
-      "snippet": "newpartmargins{${1:text1}}{${2:text2}}"
-    },
-    "oldpartlabels{}{}": {
-      "snippet": "oldpartlabels{${1:text1}}{${2:text2}}"
-    },
-    "oldpartmargins{}{}": {
-      "snippet": "oldpartmargins{${1:text1}}{${2:text2}}"
-    },
-    "todolabels{}{}": {
-      "snippet": "todolabels{${1:text1}}{${2:text2}}"
-    },
-    "todomargins{}{}": {
-      "snippet": "todomargins{${1:text1}}{${2:text2}}"
-    },
-    "ifhref": {},
-    "hreftrue": {},
-    "hreffalse": {},
-    "issue{}": {
-      "snippet": "issue{${1:text}}"
-    },
-    "issue[]{}": {
-      "snippet": "issue[${2:label}]{${1:text}}"
-    },
-    "Issue{}": {
-      "snippet": "Issue{${1:text}}"
-    },
-    "Issue[]{}": {
-      "snippet": "Issue[${2:label}]{${1:text}}"
-    },
-    "edexplanation": {},
-    "ednotemessage": {}
-  },
-  "envs": {
-    "todo{}": {
-      "name": "todo",
-      "snippet": "{${1:comment}}"
-    },
-    "Todo{}": {
-      "name": "Todo",
-      "snippet": "{${1:comment}}"
-    },
-    "todolist{}": {
-      "name": "todolist",
-      "snippet": "{${1:comment}}"
-    },
-    "Todolist{}": {
-      "name": "Todolist",
-      "snippet": "{${1:comment}}"
-    },
-    "newpart{}": {
-      "name": "newpart",
-      "snippet": "{${1:comment}}"
-    },
-    "Newpart{}": {
-      "name": "Newpart",
-      "snippet": "{${1:comment}}"
-    },
-    "oldpart{}": {
-      "name": "oldpart",
-      "snippet": "{${1:comment}}"
-    },
-    "Oldpart{}": {
-      "name": "Oldpart",
-      "snippet": "{${1:comment}}"
-    },
-    "edstub{}": {
-      "name": "edstub",
-      "snippet": "{${1:file}}"
-    },
-    "edstub[]{}": {
-      "name": "edstub",
-      "snippet": "[${2:desc}]{${1:file}}"
-    },
-    "musings": {}
-  },
-  "options": [
-    "show",
-    "hide",
-    "nomargins",
-    "draft",
-    "final"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/eepic.json b/dev/packages/eepic.json
deleted file mode 100644
index 69c7ea358..000000000
--- a/dev/packages/eepic.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "line(){}": {
-      "snippet": "line(${2:x},${3:y}){${1:length}}"
-    },
-    "circle{}": {
-      "snippet": "circle{${1:diameter}}"
-    },
-    "circle*{}": {
-      "snippet": "circle*{${1:diameter}}"
-    },
-    "oval()": {
-      "snippet": "oval(${1:width},${2:height})"
-    },
-    "oval()[]": {
-      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
-    },
-    "maxovaldiam": {},
-    "allinethickness{}": {
-      "snippet": "allinethickness{${1:dimen}}"
-    },
-    "Thicklines": {},
-    "ellipse{}{}": {
-      "snippet": "ellipse{${1:x diameter}}{${2:y diameter}}"
-    },
-    "ellipse*{}{}": {
-      "snippet": "ellipse*{${1:x diameter}}{${2:y diameter}}"
-    },
-    "arc{}{}{}": {
-      "snippet": "arc{${1:diameter}}{${2:start angle}}{${3:end angle}}"
-    },
-    "filltype{}": {
-      "snippet": "filltype{${1:type}}"
-    },
-    "blacken": {},
-    "whiten": {},
-    "shade": {},
-    "texture{}": {
-      "snippet": "texture{${1:hex nums}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/egpeirce.json b/dev/packages/egpeirce.json
index 9668aa9c1..d9debae17 100644
--- a/dev/packages/egpeirce.json
+++ b/dev/packages/egpeirce.json
@@ -84,10 +84,10 @@
       "snippet": "longinversevscroll*{${1:top-width}}{${2:top}}{${3:middle-width}}{${4:bottom}}{${5:bottom-width}}"
     },
     "nscroll{}": {
-      "snippet": "nscroll{${1:A,${2:B},${3:C},...}}"
+      "snippet": "nscroll{${1:A,B,C,...}}"
     },
     "nscroll*{}{}": {
-      "snippet": "nscroll*{${1:A,${3:B},${4:C},...}}{${2:center}}"
+      "snippet": "nscroll*{${1:A,B,C,...}}{${2:center}}"
     },
     "nscrollwidth{}": {
       "snippet": "nscrollwidth{${1:factor}}"
diff --git a/dev/packages/elements.json b/dev/packages/elements.json
deleted file mode 100644
index a3a0efc38..000000000
--- a/dev/packages/elements.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "translations": []
-  },
-  "macros": {
-    "elementname{}": {
-      "snippet": "elementname{${1:atomic number|element symbol}}"
-    },
-    "setatomname{}{}": {
-      "snippet": "setatomname{${1:atomic number}}{${2:element name}}"
-    },
-    "setatomname[]{}{}": {
-      "snippet": "setatomname[${3:alt name}]{${1:atomic number}}{${2:element name}}"
-    },
-    "DeclareAtomName{}{}": {
-      "snippet": "DeclareAtomName{${1:atomic number}}{${2:element name}}"
-    },
-    "DeclareAtomName[]{}{}": {
-      "snippet": "DeclareAtomName[${3:alt name}]{${1:atomic number}}{${2:element name}}"
-    },
-    "saveelementname{}{}": {
-      "snippet": "saveelementname{${1:cmd}}{${2:atomic number|element symbol|element name}}"
-    },
-    "elementsymbol{}": {
-      "snippet": "elementsymbol{${1:atomic number|element name}}"
-    },
-    "setatomsymbol{}{}": {
-      "snippet": "setatomsymbol{${1:atomic number}}{${2:element symbol}}"
-    },
-    "DeclareAtomSymbol{}{}": {
-      "snippet": "DeclareAtomSymbol{${1:atomic number}}{${2:element symbol}}"
-    },
-    "saveelementsymbol{}{}": {
-      "snippet": "saveelementsymbol{${1:cmd}}{${2:atomic number|element symbol|element name}}"
-    },
-    "atomicnumber{}": {
-      "snippet": "atomicnumber{${1:element symbol|element name}}"
-    },
-    "Z{}": {
-      "snippet": "Z{${1:element symbol|element name}}"
-    },
-    "saveatomicnumber{}{}": {
-      "snippet": "saveatomicnumber{${1:cmd}}{${2:atomic number|element symbol|element name}}"
-    },
-    "elconf{}": {
-      "snippet": "elconf{${1:atomic number|element symbol|element name}}"
-    },
-    "writeelconf{}": {
-      "snippet": "writeelconf{${1:electron distribution}}"
-    },
-    "setelectrondistribution{}{}": {
-      "snippet": "setelectrondistribution{${1:atomic number}}{${2:element distribution}}"
-    },
-    "DeclareElectronDistribution{}{}": {
-      "snippet": "DeclareElectronDistribution{${1:atomic number}}{${2:element distribution}}"
-    },
-    "setangularmomentum{}{}": {
-      "snippet": "setangularmomentum{${1:type}}{${2:output}}"
-    },
-    "printangularmomentum{}": {
-      "snippet": "printangularmomentum{${1:value}}"
-    },
-    "setatomisotopes{}{}": {
-      "snippet": "setatomisotopes{${1:atomic number}}{${2:isotope list}}"
-    },
-    "DeclareAtomIsotopes{}{}": {
-      "snippet": "DeclareAtomIsotopes{${1:atomic number}}{${2:isotope list}}"
-    },
-    "saveelementisotopes{}{}": {
-      "snippet": "saveelementisotopes{${1:cmd}}{${2:atomic number|element symbol|element name}}"
-    },
-    "savemainelementisotope{}{}": {
-      "snippet": "savemainelementisotope{${1:cmd}}{${2:atomic number|element symbol|element name}}"
-    },
-    "mainelementisotope{}": {
-      "snippet": "mainelementisotope{${1:atomic number|element symbol|element name}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ellipsis.json b/dev/packages/ellipsis.json
deleted file mode 100644
index 01dbb5796..000000000
--- a/dev/packages/ellipsis.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "includes": {
-    "xspace": [
-      "xspace"
-    ]
-  },
-  "macros": {
-    "ellipsisgap": {},
-    "ellipsispunctuation": {},
-    "midwordellipsis": {}
-  },
-  "envs": {},
-  "options": [
-    "chicago",
-    "mla",
-    "xspace"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/emarks.json b/dev/packages/emarks.json
deleted file mode 100644
index 18fb02553..000000000
--- a/dev/packages/emarks.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "includes": {
-    "etex": []
-  },
-  "macros": {
-    "marksthe{}{}": {
-      "snippet": "marksthe{${1:named-mark}}{${2:content}}"
-    },
-    "marksthe*{}{}": {
-      "snippet": "marksthe*{${1:named-mark}}{${2:content}}"
-    },
-    "marksthecs{}{}": {
-      "snippet": "marksthecs{${1:named-mark}}{${2:csname}}"
-    },
-    "marksthecs*{}{}": {
-      "snippet": "marksthecs*{${1:named-mark}}{${2:csname}}"
-    },
-    "thefirstmarks{}": {
-      "snippet": "thefirstmarks{${1:named-mark}}"
-    },
-    "thebotmarks{}": {
-      "snippet": "thebotmarks{${1:named-mark}}"
-    },
-    "thetopmarks{}": {
-      "snippet": "thetopmarks{${1:named-mark}}"
-    },
-    "getthemarks{}{}{}": {
-      "snippet": "getthemarks{${1:marks}}{${2:named-mark}}{${3:cmd}}"
-    },
-    "getthefirstmarks{}{}": {
-      "snippet": "getthefirstmarks{${1:named-mark}}{${2:cmd}}"
-    },
-    "getthebotmarks{}{}": {
-      "snippet": "getthebotmarks{${1:named-mark}}{${2:cmd}}"
-    },
-    "getthetopmarks{}{}": {
-      "snippet": "getthetopmarks{${1:named-mark}}{${2:cmd}}"
-    },
-    "firstmarks": {},
-    "botmarks": {},
-    "topmarks": {},
-    "ifmarksvoid{}{}{}{}": {
-      "snippet": "ifmarksvoid{${1:marks}}{${2:named-mark}}{${3:true}}{${4:false}}"
-    },
-    "ifmarksequal{}{}{}{}{}": {
-      "snippet": "ifmarksequal{${1:marks1}}{${2:marks2}}{${3:named-mark}}{${4:true}}{${5:false}}"
-    },
-    "showthemarks{}": {
-      "snippet": "showthemarks{${1:named-mark}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/embrac.json b/dev/packages/embrac.json
index 52e6b7134..ff715b07c 100644
--- a/dev/packages/embrac.json
+++ b/dev/packages/embrac.json
@@ -19,19 +19,19 @@
       "snippet": "AddEmph{${1:o}}{${2:c}}"
     },
     "AddEmph{}[]{}[]": {
-      "snippet": "AddEmph{${1:o}}[${2:io-kern,${5:oo-kern}]{${3:c}}[${4:ic-kern},oc-kern}]"
+      "snippet": "AddEmph{${1:o}}[${2:io-kern,oo-kern}]{${3:c}}[${4:ic-kern,oc-kern}]"
     },
     "ChangeEmph{}{}": {
       "snippet": "ChangeEmph{${1:o}}{${2:c}}"
     },
     "ChangeEmph{}[]{}[]": {
-      "snippet": "ChangeEmph{${1:o}}[${2:io-kern,${5:oo-kern}]{${3:c}}[${4:ic-kern},oc-kern}]"
+      "snippet": "ChangeEmph{${1:o}}[${2:io-kern,oo-kern}]{${3:c}}[${4:ic-kern,oc-kern}]"
     },
     "RenewEmph{}{}": {
       "snippet": "RenewEmph{${1:o}}{${2:c}}"
     },
     "RenewEmph{}[]{}[]": {
-      "snippet": "RenewEmph{${1:o}}[${2:io-kern,${5:oo-kern}]{${3:c}}[${4:ic-kern},oc-kern}]"
+      "snippet": "RenewEmph{${1:o}}[${2:io-kern,oo-kern}]{${3:c}}[${4:ic-kern,oc-kern}]"
     },
     "DeleteEmph{}{}": {
       "snippet": "DeleteEmph{${1:o}}{${2:c}}"
diff --git a/dev/packages/emo.json b/dev/packages/emo.json
deleted file mode 100644
index cc56b22aa..000000000
--- a/dev/packages/emo.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "includes": {
-    "inputenc": [],
-    "iftex": [],
-    "graphicx": [],
-    "xcolor": [],
-    "xspace": [
-      "extra"
-    ],
-    "index": [
-      "index"
-    ]
-  },
-  "macros": {
-    "lingchi": {
-      "option": "extra"
-    },
-    "YHWH": {
-      "option": "extra"
-    },
-    "emo{}": {
-      "snippet": "emo{${1:emoji-name}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "extra",
-    "index",
-    "debug"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/emoji.json b/dev/packages/emoji.json
deleted file mode 100644
index 10c446e84..000000000
--- a/dev/packages/emoji.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "includes": {
-    "luatex": [],
-    "fontspec": []
-  },
-  "macros": {
-    "setemojifont{}": {
-      "snippet": "setemojifont{${1:font}}"
-    },
-    "setemojifont{}[]": {
-      "snippet": "setemojifont{${1:font}}[${2:font features}]"
-    },
-    "emoji{}": {
-      "snippet": "emoji{${1:name}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/emp.json b/dev/packages/emp.json
index 8607d59c4..343b793b1 100644
--- a/dev/packages/emp.json
+++ b/dev/packages/emp.json
@@ -33,28 +33,10 @@
       "snippet": "empfile[${1:METAPOST file}]"
     },
     "endempfile": {},
-    "emp()": {
-      "snippet": "emp(${1:width},${2:height})"
-    },
-    "emp[]()": {
-      "snippet": "emp[${1:name}](${2:width},${3:height})"
-    },
     "endemp": {},
-    "empdef()": {
-      "snippet": "empdef(${1:width},${2:height})"
-    },
-    "empdef[]()": {
-      "snippet": "empdef[${1:name}](${2:width},${3:height})"
-    },
     "endempdef": {},
     "empcmds": {},
     "endempcmds": {},
-    "empgraph()": {
-      "snippet": "empgraph(${1:width},${2:height})"
-    },
-    "empgraph[]()": {
-      "snippet": "empgraph[${1:name}](${2:width},${3:height})"
-    },
     "endempgraph": {},
     "filedate": {},
     "filemaintainer": {},
@@ -68,31 +50,7 @@
       "name": "empfile",
       "snippet": "[${1:METAPOST file}]"
     },
-    "emp(width,height)": {
-      "name": "emp",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "emp[](width,height)": {
-      "name": "emp",
-      "snippet": "[${1:name}](${2:width},${3:height})"
-    },
-    "empdef(width,height)": {
-      "name": "empdef",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "empdef[](width,height)": {
-      "name": "empdef",
-      "snippet": "[${1:name}](${2:width},${3:height})"
-    },
-    "empcmds": {},
-    "empgraph(width,height)": {
-      "name": "empgraph",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "empgraph[](width,height)": {
-      "name": "empgraph",
-      "snippet": "[${1:name}](${2:width},${3:height})"
-    }
+    "empcmds": {}
   },
   "options": [
     "unknownkeysallowed",
diff --git a/dev/packages/endiagram.json b/dev/packages/endiagram.json
index 15ce85235..4f8791882 100644
--- a/dev/packages/endiagram.json
+++ b/dev/packages/endiagram.json
@@ -17,10 +17,10 @@
       "keyvalpos": 1
     },
     "ENcurve{}": {
-      "snippet": "ENcurve{${1:level1,${2:level2},${3:level3},...}}"
+      "snippet": "ENcurve{${1:level1,level2,level3,...}}"
     },
     "ENcurve[]{}": {
-      "snippet": "ENcurve[${2:options}]{${1:level1,${3:level2},${4:level3},...}}",
+      "snippet": "ENcurve[${2:options}]{${1:level1,level2,level3,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
diff --git a/dev/packages/endnotes.json b/dev/packages/endnotes.json
deleted file mode 100644
index 7d8358f2e..000000000
--- a/dev/packages/endnotes.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "endnote{}": {
-      "snippet": "endnote{${1:text}}"
-    },
-    "endnote[]{}": {
-      "snippet": "endnote[${2:number}]{${1:text}}"
-    },
-    "endnotemark": {},
-    "endnotemark[]": {
-      "snippet": "endnotemark[${1:number}]"
-    },
-    "endnotetext{}": {
-      "snippet": "endnotetext{${1:text}}"
-    },
-    "endnotetext[]{}": {
-      "snippet": "endnotetext[${2:number}]{${1:text}}"
-    },
-    "addtoendnotes{}": {
-      "snippet": "addtoendnotes{${1:text}}"
-    },
-    "enotesize": {},
-    "theendnotes": {},
-    "theendnote": {},
-    "theenmark": {},
-    "makeenmark": {},
-    "enoteformat": {},
-    "enoteheading": {},
-    "notesname": {},
-    "endnotesep": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/enumerate.json b/dev/packages/enumerate.json
deleted file mode 100644
index b485bf624..000000000
--- a/dev/packages/enumerate.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {
-    "enumerate[]": {
-      "name": "enumerate",
-      "snippet": "[${1:option}]"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/epic.json b/dev/packages/epic.json
deleted file mode 100644
index 95d0bbc3d..000000000
--- a/dev/packages/epic.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "multiputlist()(){}": {
-      "snippet": "multiputlist(${2:x},${3:y})(${4:Δx},${5:Δy}){${1:item1,${6:item2},...}}"
-    },
-    "multiputlist()()[]{}": {
-      "snippet": "multiputlist(${3:x},${4:y})(${5:Δx},${6:Δy})[${2:pos}]{${1:item1,${7:item2},...}}"
-    },
-    "to{}": {
-      "snippet": "to{${1:arg}}"
-    },
-    "lopoff": {},
-    "matrixput()(){}(){}{}": {
-      "snippet": "matrixput(${4:x},${5:y})(${6:Δx1},${7:Δy1}){${1:n1}}(${8:Δx2},${9:Δy2}){${2:n2}}{${3:object}}"
-    },
-    "grid()()": {
-      "snippet": "grid(${1:width},${2:height})(${3:Δwidth},${4:Δheight})"
-    },
-    "grid()()[]": {
-      "snippet": "grid(${2:width},${3:height})(${4:Δwidth},${5:Δheight})[${1:x0,y0}]"
-    },
-    "dashlinestretch": {},
-    "drawlinestretch": {},
-    "lineslope": {},
-    "jput(){}": {
-      "snippet": "jput(${2:x},${3:y}){${1:object}}"
-    },
-    "picsquare": {},
-    "putfile{}{}": {
-      "snippet": "putfile{${1:file}}{${2:object}}"
-    },
-    "sqrtandstuff{}{}{}": {
-      "snippet": "sqrtandstuff{${1:Δx}}{${2:Δy}}{${3:dotgap}}"
-    },
-    "dashjoin": {},
-    "dottedjoin": {},
-    "drawjoin": {},
-    "enddashjoin": {},
-    "enddottedjoin": {},
-    "enddrawjoin": {},
-    "splittwoargs": {},
-    "iflistnonempty": {},
-    "listnonemptytrue": {},
-    "listnonemptyfalse": {}
-  },
-  "envs": {
-    "dottedjoin{}": {
-      "name": "dottedjoin",
-      "snippet": "{${1:dotgap}}"
-    },
-    "dottedjoin[]{}": {
-      "name": "dottedjoin",
-      "snippet": "[${2:character}]{${1:dotgap}}"
-    },
-    "dashjoin{}": {
-      "name": "dashjoin",
-      "snippet": "{${1:dashlength}}"
-    },
-    "dashjoin{}[]": {
-      "name": "dashjoin",
-      "snippet": "{${1:dashlength}}[${2:dashgap}]"
-    },
-    "dashjoin[]{}": {
-      "name": "dashjoin",
-      "snippet": "[${2:stretch}]{${1:dashlength}}"
-    },
-    "dashjoin[]{}[]": {
-      "name": "dashjoin",
-      "snippet": "[${2:stretch}]{${1:dashlength}}[${3:dashgap}]"
-    },
-    "drawjoin": {},
-    "drawjoin[]": {
-      "name": "drawjoin",
-      "snippet": "[${1:stretch}]"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/esami.json b/dev/packages/esami.json
index 984a15afe..36881d7c9 100644
--- a/dev/packages/esami.json
+++ b/dev/packages/esami.json
@@ -98,7 +98,7 @@
       "snippet": "newproblem{${1:text}}"
     },
     "esercizi{}": {
-      "snippet": "esercizi{${1:file1,${2:file2},...}}"
+      "snippet": "esercizi{${1:file1,file2,...}}"
     },
     "selectrandomlyn{}{}": {
       "snippet": "selectrandomlyn{${1:exercise number}}{${2:file}}"
diff --git a/dev/packages/esk.json b/dev/packages/esk.json
index 59df345a7..c7ee1ac39 100644
--- a/dev/packages/esk.json
+++ b/dev/packages/esk.json
@@ -30,12 +30,6 @@
     "esk[]": {
       "snippet": "esk[${1:name}]"
     },
-    "esk()": {
-      "snippet": "esk(${1:def1},${2:def2},${3:...})"
-    },
-    "esk[]()": {
-      "snippet": "esk[${1:name}](${2:def1},${3:def2},${4:...})"
-    },
     "endesk": {},
     "eskdef{}": {
       "snippet": "eskdef{${1:name}}"
diff --git a/dev/packages/eso-pic.json b/dev/packages/eso-pic.json
deleted file mode 100644
index b2aa30bcf..000000000
--- a/dev/packages/eso-pic.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "includes": {
-    "keyval": [],
-    "xcolor": []
-  },
-  "macros": {
-    "AddToShipoutPictureBG{}": {
-      "snippet": "AddToShipoutPictureBG{${1:code}}"
-    },
-    "AddToShipoutPictureBG*{}": {
-      "snippet": "AddToShipoutPictureBG*{${1:code}}"
-    },
-    "AddToShipoutPicture{}": {
-      "snippet": "AddToShipoutPicture{${1:code}}"
-    },
-    "AddToShipoutPicture*{}": {
-      "snippet": "AddToShipoutPicture*{${1:code}}"
-    },
-    "AddToShipoutPictureFG{}": {
-      "snippet": "AddToShipoutPictureFG{${1:code}}"
-    },
-    "AddToShipoutPictureFG*{}": {
-      "snippet": "AddToShipoutPictureFG*{${1:code}}"
-    },
-    "ClearShipoutPictureBG{}": {
-      "snippet": "ClearShipoutPictureBG{${1:code}}"
-    },
-    "ClearShipoutPicture{}": {
-      "snippet": "ClearShipoutPicture{${1:code}}"
-    },
-    "LenToUnit{}": {
-      "snippet": "LenToUnit{${1:arg}}"
-    },
-    "gridSetup{}{}{}{}{}": {
-      "snippet": "gridSetup{${1:unit}}{${2:label factor}}{${3:delta}}{${4:Delta}}{${5:gap}}"
-    },
-    "gridSetup[]{}{}{}{}{}": {
-      "snippet": "gridSetup[${6:unit name}]{${1:unit}}{${2:label factor}}{${3:delta}}{${4:Delta}}{${5:gap}}"
-    },
-    "AtPageUpperLeft{}": {
-      "snippet": "AtPageUpperLeft{${1:code}}"
-    },
-    "AtPageLowerLeft{}": {
-      "snippet": "AtPageLowerLeft{${1:code}}"
-    },
-    "AtPageCenter{}": {
-      "snippet": "AtPageCenter{${1:code}}"
-    },
-    "AtTextUpperLeft{}": {
-      "snippet": "AtTextUpperLeft{${1:code}}"
-    },
-    "AtTextLowerLeft{}": {
-      "snippet": "AtTextLowerLeft{${1:code}}"
-    },
-    "AtTextCenter{}": {
-      "snippet": "AtTextCenter{${1:code}}"
-    },
-    "AtStockUpperLeft{}": {
-      "snippet": "AtStockUpperLeft{${1:code}}"
-    },
-    "AtStockLowerLeft{}": {
-      "snippet": "AtStockLowerLeft{${1:code}}"
-    },
-    "AtStockCenter{}": {
-      "snippet": "AtStockCenter{${1:code}}"
-    },
-    "ProcessOptionsWithKV{}": {
-      "snippet": "ProcessOptionsWithKV{${1:family}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "pscoord",
-    "texcoord",
-    "grid",
-    "gridBG",
-    "gridunit=",
-    "gridcolor=",
-    "subgridcolor=",
-    "subgridstyle=",
-    "colorgrid",
-    "dvips"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/etaremune.json b/dev/packages/etaremune.json
index 2b42c8cb6..1194e1f3f 100644
--- a/dev/packages/etaremune.json
+++ b/dev/packages/etaremune.json
@@ -24,8 +24,7 @@
       "listparindent=",
       "itemindent=",
       "labelwidth=",
-      "labelsep=",
-      "start=${1:integer}"
+      "labelsep="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/etoc.json b/dev/packages/etoc.json
deleted file mode 100644
index 02ee1ae08..000000000
--- a/dev/packages/etoc.json
+++ /dev/null
@@ -1,366 +0,0 @@
-{
-  "includes": {
-    "kvoptions": [],
-    "multicol": []
-  },
-  "macros": {
-    "locallistoffigures": {
-      "option": "lof"
-    },
-    "etoclocallistoffigureshook": {
-      "option": "lof"
-    },
-    "locallistoftables": {
-      "option": "lot"
-    },
-    "etoclocallistoftableshook": {
-      "option": "lot"
-    },
-    "etocsetup{}": {
-      "snippet": "etocsetup{${1:keyvals}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "tableofcontents*": {},
-    "localtableofcontents": {},
-    "localtableofcontents*": {},
-    "etocclasstocstyle": {},
-    "etocetoclocaltocstyle": {},
-    "etocusertocstyle": {},
-    "etocstandardlines": {},
-    "etoctoclines": {},
-    "etocdefaultlines": {},
-    "etocstoretocstyleinto{}": {
-      "snippet": "etocstoretocstyleinto{${1:cmd}}"
-    },
-    "etocstorelinestylesinto{}": {
-      "snippet": "etocstorelinestylesinto{${1:cmd}}"
-    },
-    "etocstorethislinestyleinto{}{}": {
-      "snippet": "etocstorethislinestyleinto{${1:name or number}}{${2:cmd}}"
-    },
-    "etocifislocal{}{}": {
-      "snippet": "etocifislocal{${1:true}}{${2:false}}"
-    },
-    "etocifislocaltoc{}{}": {
-      "snippet": "etocifislocaltoc{${1:true}}{${2:false}}"
-    },
-    "etocifislocallof{}{}": {
-      "snippet": "etocifislocallof{${1:true}}{${2:false}}"
-    },
-    "etocifislocallot{}{}": {
-      "snippet": "etocifislocallot{${1:true}}{${2:false}}"
-    },
-    "etocifmaintoctotoc{}{}": {
-      "snippet": "etocifmaintoctotoc{${1:true}}{${2:false}}"
-    },
-    "etociflocaltoctotoc{}{}": {
-      "snippet": "etociflocaltoctotoc{${1:true}}{${2:false}}"
-    },
-    "etociflocalloftotoc{}{}": {
-      "snippet": "etociflocalloftotoc{${1:true}}{${2:false}}"
-    },
-    "etociflocallottotoc{}{}": {
-      "snippet": "etociflocallottotoc{${1:true}}{${2:false}}"
-    },
-    "etocifisstarred{}{}": {
-      "snippet": "etocifisstarred{${1:true}}{${2:false}}"
-    },
-    "etoclocalheadtotoc{}{}": {
-      "snippet": "etoclocalheadtotoc{${1:level name}}{${2:text}}"
-    },
-    "etocglobalheadtotoc{}{}": {
-      "snippet": "etocglobalheadtotoc{${1:level name}}{${2:text}}"
-    },
-    "etoclevel{}": {
-      "snippet": "etoclevel{${1:level name}}"
-    },
-    "etocthelevel{}": {
-      "snippet": "etocthelevel{${1:level name}}"
-    },
-    "etocthemaxlevel": {},
-    "etocifunknownlevelTF{}{}{}": {
-      "snippet": "etocifunknownlevelTF{${1:level name}}{${2:true}}{${3:false}}"
-    },
-    "etocdivisionnameatlevel{}": {
-      "snippet": "etocdivisionnameatlevel{${1:number}}"
-    },
-    "etocetoclocaltocmaketitle": {},
-    "etocetoclistoffiguresmaketitle": {},
-    "etocetoclistoftablesmaketitle": {},
-    "localcontentsname": {},
-    "locallistfigurename": {},
-    "locallisttablename": {},
-    "etocclasslocaltocmaketitle": {},
-    "etocclasslocallofmaketitle": {},
-    "etocclasslocallotmaketitle": {},
-    "etocclassmaintocaddtotoc": {},
-    "etocclasslocaltocaddtotoc": {},
-    "etocclasslocallofaddtotoc": {},
-    "etocclasslocallotaddtotoc": {},
-    "etocsettocstyle{}{}": {
-      "snippet": "etocsettocstyle{${1:before toc}}{${2:after toc}}"
-    },
-    "etocarticlestyle": {},
-    "etocarticlestylenomarks": {},
-    "etocreportstyle": {},
-    "etocreportstylenomarks": {},
-    "etocbookstyle": {},
-    "etocbookstylenomarks": {},
-    "etocmemoirstyle": {},
-    "etocscrartclstyle": {},
-    "etocscrreprtstyle": {},
-    "etocscrbookstyle": {},
-    "etoctocloftstyle": {},
-    "etocinline": {},
-    "etocnopar": {},
-    "etocdisplay": {},
-    "etocmulticolstyle{}": {
-      "snippet": "etocmulticolstyle{${1:heading}}"
-    },
-    "etocmulticolstyle[]{}": {
-      "snippet": "etocmulticolstyle[${2:num of cols}]{${1:heading}}"
-    },
-    "etocmulticol{}": {
-      "snippet": "etocmulticol{${1:heading}}"
-    },
-    "etocmulticol[]{}": {
-      "snippet": "etocmulticol[${2:num of cols}]{${1:heading}}"
-    },
-    "etocmulticol*{}": {
-      "snippet": "etocmulticol*{${1:heading}}"
-    },
-    "etocmulticol*[]{}": {
-      "snippet": "etocmulticol*[${2:num of cols}]{${1:heading}}"
-    },
-    "etoclocalmulticol{}": {
-      "snippet": "etoclocalmulticol{${1:heading}}"
-    },
-    "etoclocalmulticol[]{}": {
-      "snippet": "etoclocalmulticol[${2:num of cols}]{${1:heading}}"
-    },
-    "etoctocstyle{}{}": {
-      "snippet": "etoctocstyle{${1:num of cols}}{${2:title}}"
-    },
-    "etoctocstyle[]{}{}": {
-      "snippet": "etoctocstyle[${3:kind}]{${1:num of cols}}{${2:title}}"
-    },
-    "etoctocstylewithmarks{}{}{}": {
-      "snippet": "etoctocstylewithmarks{${1:num of cols}}{${2:title}}{${3:mark}}"
-    },
-    "etoctocstylewithmarks[]{}{}{}": {
-      "snippet": "etoctocstylewithmarks[${4:kind}]{${1:num of cols}}{${2:title}}{${3:mark}}"
-    },
-    "etoctocstylewithmarksnouc{}{}{}": {
-      "snippet": "etoctocstylewithmarksnouc{${1:num of cols}}{${2:title}}{${3:mark}}"
-    },
-    "etoctocstylewithmarksnouc[]{}{}{}": {
-      "snippet": "etoctocstylewithmarksnouc[${4:kind}]{${1:num of cols}}{${2:title}}{${3:mark}}"
-    },
-    "etocruledstyle{}": {
-      "snippet": "etocruledstyle{${1:title}}"
-    },
-    "etocruledstyle[]{}": {
-      "snippet": "etocruledstyle[${2:num of cols}]{${1:title}}"
-    },
-    "etocruled{}": {
-      "snippet": "etocruled{${1:title}}"
-    },
-    "etocruled[]{}": {
-      "snippet": "etocruled[${2:num of cols}]{${1:title}}"
-    },
-    "etoclocalruled{}": {
-      "snippet": "etoclocalruled{${1:title}}"
-    },
-    "etoclocalruled[]{}": {
-      "snippet": "etoclocalruled[${2:num of cols}]{${1:title}}"
-    },
-    "etocframedstyle{}": {
-      "snippet": "etocframedstyle{${1:title}}"
-    },
-    "etocframedstyle[]{}": {
-      "snippet": "etocframedstyle[${2:num of cols}]{${1:title}}"
-    },
-    "etocframed{}": {
-      "snippet": "etocframed{${1:title}}"
-    },
-    "etocframed[]{}": {
-      "snippet": "etocframed[${2:num of cols}]{${1:title}}"
-    },
-    "etoclocalframed{}": {
-      "snippet": "etoclocalframed{${1:title}}"
-    },
-    "etoclocalframed[]{}": {
-      "snippet": "etoclocalframed[${2:num of cols}]{${1:title}}"
-    },
-    "etocabovetocskip": {},
-    "etocbelowtocskip": {},
-    "etoccolumnsep": {},
-    "etocmulticolsep": {},
-    "etocmulticolpretolerance": {},
-    "etocmulticoltolerance": {},
-    "etocdefaultnbcol": {},
-    "etocinnertopsep": {},
-    "etoctoprule": {},
-    "etoctoprulecolorcmd": {},
-    "etocinnerleftsep": {},
-    "etocinnerrightsep": {},
-    "etocinnerbottomsep": {},
-    "etocleftrule": {},
-    "etocrightrule": {},
-    "etocbottomrule": {},
-    "etocleftrulecolorcmd": {},
-    "etocrightrulecolorcmd": {},
-    "etocbottomrulecolorcmd": {},
-    "etocbkgcolorcmd": {},
-    "etocframedmphook": {},
-    "etocoldpar": {},
-    "etocaftertitlehook": {},
-    "etocaftercontentshook": {},
-    "etocbeforetitlehook": {},
-    "etocaftertochook": {},
-    "etocsetstyle{}{}{}{}{}": {
-      "snippet": "etocsetstyle{${1:level name}}{${2:start}}{${3:prefix}}{${4:contents}}{${5:finish}}"
-    },
-    "etocname": {},
-    "etocnumber": {},
-    "etocpage": {},
-    "etocskipfirstprefix": {},
-    "etociffirst{}{}": {
-      "snippet": "etociffirst{${1:true}}{${2:false}}"
-    },
-    "etocxiffirst{}{}": {
-      "snippet": "etocxiffirst{${1:true}}{${2:false}}"
-    },
-    "etocifnumbered{}{}": {
-      "snippet": "etocifnumbered{${1:true}}{${2:false}}"
-    },
-    "etocxifnumbered{}{}": {
-      "snippet": "etocxifnumbered{${1:true}}{${2:false}}"
-    },
-    "etocthename": {},
-    "etocthenumber": {},
-    "etocthepage": {},
-    "etoclink{}": {
-      "snippet": "etoclink{${1:text}}"
-    },
-    "etocthelinkedname": {},
-    "etocthelinkednumber": {},
-    "etocthelinkedpage": {},
-    "etocthelink": {},
-    "etocsetlevel{}{}": {
-      "snippet": "etocsetlevel{${1:level name}}{${2:number}}"
-    },
-    "etocglobaldefs": {},
-    "etoclocaldefs": {},
-    "etocfontminustwo": {},
-    "etocfontminusone": {},
-    "etocfontzero": {},
-    "etocfontone": {},
-    "etocfonttwo": {},
-    "etocfontthree": {},
-    "etocsepminustwo": {},
-    "etocsepminusone": {},
-    "etocsepzero": {},
-    "etocsepone": {},
-    "etocseptwo": {},
-    "etocsepthree": {},
-    "etocminustwoleftmargin": {},
-    "etocminustworightmargin": {},
-    "etocminusoneleftmargin": {},
-    "etocminusonerightmargin": {},
-    "etocbaselinespreadminustwo": {},
-    "etocbaselinespreadminusone": {},
-    "etocbaselinespreadzero": {},
-    "etocbaselinespreadone": {},
-    "etocbaselinespreadtwo": {},
-    "etocbaselinespreadthree": {},
-    "etoctoclineleaders": {},
-    "etocabbrevpagename": {},
-    "etocpartname": {},
-    "etocbookname": {},
-    "etoctableofcontents": {},
-    "etockeeporiginaltableofcontents": {},
-    "localtableofcontentswithrelativedepth{}": {
-      "snippet": "localtableofcontentswithrelativedepth{${1:number}}"
-    },
-    "invisibletableofcontents": {},
-    "invisiblelocaltableofcontents": {},
-    "etocsettocdepth{}": {
-      "snippet": "etocsettocdepth{${1:level}}"
-    },
-    "etocsetnexttocdepth{}": {
-      "snippet": "etocsetnexttocdepth{${1:level}}"
-    },
-    "etocobeytoctocdepth": {},
-    "etocignoretoctocdepth": {},
-    "etocsettagdepth{}{}": {
-      "snippet": "etocsettagdepth{${1:tag name}}{${2:level}}"
-    },
-    "etocobeydepthtags": {},
-    "etocignoredepthtags": {},
-    "etoclocaltop": {},
-    "etocchecksemptiness": {},
-    "etocdoesnotcheckemptiness": {},
-    "etocnotocifnotoc": {},
-    "etocifwasempty{}{}": {
-      "snippet": "etocifwasempty{${1:true}}{${2:false}}"
-    },
-    "etocxifwasempty{}{}": {
-      "snippet": "etocxifwasempty{${1:true}}{${2:false}}"
-    },
-    "etoctoccontentsline{}{}": {
-      "snippet": "etoctoccontentsline{${1:level name}}{${2:name}}"
-    },
-    "etoctoccontentsline*{}{}{}": {
-      "snippet": "etoctoccontentsline*{${1:level name}}{${2:name}}{${3:bookmark level}}"
-    },
-    "etocimmediatetoccontentsline{}{}": {
-      "snippet": "etocimmediatetoccontentsline{${1:level name}}{${2:name}}"
-    },
-    "etocimmediatetoccontentsline*{}{}{}": {
-      "snippet": "etocimmediatetoccontentsline*{${1:level name}}{${2:name}}{${3:bookmark level}}"
-    },
-    "etocnoprotrusion": {},
-    "etocclasslocalperhapsaddtotoc{}": {
-      "snippet": "etocclasslocalperhapsaddtotoc{${1:arg}}"
-    },
-    "etoclocaltableofcontentshook": {},
-    "etocmarkbothnouc{}": {
-      "snippet": "etocmarkbothnouc{${1:text}}"
-    },
-    "etocmarkboth{}": {
-      "snippet": "etocmarkboth{${1:text}}"
-    },
-    "etocoriginaltableofcontents": {},
-    "etocsettoclineforclasstoc{}{}": {
-      "snippet": "etocsettoclineforclasstoc{${1:arg1}}{${2:arg2}}"
-    },
-    "etocsettoclineforclasslistof{}{}{}": {
-      "snippet": "etocsettoclineforclasslistof{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "etoctocloftlocalperhapsaddtotoc{}": {
-      "snippet": "etoctocloftlocalperhapsaddtotoc{${1:arg}}"
-    },
-    "etoctocbibindstyle": {},
-    "etocstandarddisplaystyle": {},
-    "etocmemoirtoctotocfmt{}{}": {
-      "snippet": "etocmemoirtoctotocfmt{${1:kind}}{${2:name}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "lof",
-    "lot",
-    "deeplevels"
-  ],
-  "keyvals": [
-    [
-      "maintoctotoc",
-      "localtoctotoc",
-      "localloftotoc",
-      "locallottotoc",
-      "ouroboros"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/euclideangeometry.json b/dev/packages/euclideangeometry.json
index 5a9843205..f2f31b79b 100644
--- a/dev/packages/euclideangeometry.json
+++ b/dev/packages/euclideangeometry.json
@@ -17,50 +17,14 @@
     "Cuno": {},
     "Den": {},
     "Dird": {},
-    "EllipseWithFocus()()()()": {
-      "snippet": "EllipseWithFocus(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
-    },
-    "EllipseWithFocus*()()()()": {
-      "snippet": "EllipseWithFocus*(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
-    },
     "ellisse*{}{}": {
       "snippet": "ellisse*{${1:semiaxis-h}}{${2:semiaxis-v}}"
     },
     "ellisse{}{}": {
       "snippet": "ellisse{${1:semiaxis-h}}{${2:semiaxis-v}}"
     },
-    "EllisseConFuoco()()()()": {
-      "snippet": "EllisseConFuoco(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
-    },
-    "EllisseConFuoco*()()()()": {
-      "snippet": "EllisseConFuoco*(${1:vertex1})(${2:vertex2})(${3:vertex3})(${4:focus})"
-    },
-    "EllisseSteiner()()()": {
-      "snippet": "EllisseSteiner(${1:vertex1})(${2:vertex2})(${3:vertex3})"
-    },
-    "EllisseSteiner()()()[]": {
-      "snippet": "EllisseSteiner(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
-    },
-    "EllisseSteiner*()()()": {
-      "snippet": "EllisseSteiner*(${1:vertex1})(${2:vertex2})(${3:vertex3})"
-    },
-    "EllisseSteiner*()()()[]": {
-      "snippet": "EllisseSteiner*(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
-    },
-    "EUGpolyvector()": {
-      "snippet": "EUGpolyvector(${1:arg})"
-    },
     "EUGpreviouspoint": {},
-    "EUGsplitArgs(){}{}": {
-      "snippet": "EUGsplitArgs(${3:x},${4:y}){${1:xmacro}}{${2:ymacro}}"
-    },
     "Int": {},
-    "IntersectionOfLines()() and ()() to ()": {
-      "snippet": "IntersectionOfLines(${1:point1})(${2:dir1}) and (${3:point2})(${4:dir2}) to (${5:vector})"
-    },
-    "IntersectionOfSegments()() and ()() to ()": {
-      "snippet": "IntersectionOfSegments(${1:point1})(${2:dir1}) and (${3:point2})(${4:dir2}) to (${5:vector})"
-    },
     "IntPd": {},
     "IntPu": {},
     "K": {
@@ -78,24 +42,6 @@
       "documentation": "MATHEMATICAL ITALIC CAPITAL R"
     },
     "Rdue": {},
-    "RegPolygon(){}{}": {
-      "snippet": "RegPolygon(${3:center}){${1:radius}}{${2:sides}}"
-    },
-    "RegPolygon(){}{}[]": {
-      "snippet": "RegPolygon(${4:center}){${1:radius}}{${2:sides}}[${3:angle}]"
-    },
-    "RegPolygon(){}{}[]<>": {
-      "snippet": "RegPolygon(${5:center}){${1:radius}}{${2:sides}}[${3:angle}]<${4:settings}>"
-    },
-    "RegPolygon*(){}{}": {
-      "snippet": "RegPolygon*(${3:center}){${1:radius}}{${2:sides}}"
-    },
-    "RegPolygon*(){}{}[]": {
-      "snippet": "RegPolygon*(${4:center}){${1:radius}}{${2:sides}}[${3:angle}]"
-    },
-    "RegPolygon*(){}{}[]<>": {
-      "snippet": "RegPolygon*(${5:center}){${1:radius}}{${2:sides}}[${3:angle}]<${4:settings}>"
-    },
     "Runo": {},
     "Sangdue": {},
     "Sellisse*{}{}": {
@@ -116,55 +62,10 @@
     "setfontsize{}": {
       "snippet": "setfontsize{${1:size}}"
     },
-    "SteinerEllipse()()()": {
-      "snippet": "SteinerEllipse(${1:vertex1})(${2:vertex2})(${3:vertex3})"
-    },
-    "SteinerEllipse()()()[]": {
-      "snippet": "SteinerEllipse(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
-    },
-    "SteinerEllipse*()()()": {
-      "snippet": "SteinerEllipse*(${1:vertex1})(${2:vertex2})(${3:vertex3})"
-    },
-    "SteinerEllipse*()()()[]": {
-      "snippet": "SteinerEllipse*(${2:vertex1})(${3:vertex2})(${4:vertex3})[${1:diameter}]"
-    },
     "TCIdiffR": {},
-    "ThreePointCircle()()()": {
-      "snippet": "ThreePointCircle(${1:point1})(${2:point2})(${3:point3})"
-    },
-    "ThreePointCircle*()()()": {
-      "snippet": "ThreePointCircle*(${1:point1})(${2:point2})(${3:point3})"
-    },
-    "TriangleCircummcircle()()()": {
-      "snippet": "TriangleCircummcircle(${1:point1})(${2:point2})(${3:point3})"
-    },
     "Ud": {},
     "Uu": {},
     "VScale": {},
-    "Xellisse()[]<>{}{}[][]": {
-      "snippet": "Xellisse(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
-    },
-    "Xellisse(){}{}": {
-      "snippet": "Xellisse(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
-    },
-    "Xellisse*()[]<>{}{}[][]": {
-      "snippet": "Xellisse*(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
-    },
-    "Xellisse*(){}{}": {
-      "snippet": "Xellisse*(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
-    },
-    "XSellisse()[]<>{}{}[][]": {
-      "snippet": "XSellisse(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
-    },
-    "XSellisse(){}{}": {
-      "snippet": "XSellisse(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
-    },
-    "XSellisse*()[]<>{}{}[][]": {
-      "snippet": "XSellisse*(${7:center})[${3:angle}]<${6:shear}>{${1:semiaxis-h}}{${2:semiaxis-v}}[${4:settings1}][${5:settings2}]"
-    },
-    "XSellisse*(){}{}": {
-      "snippet": "XSellisse*(${3:center}){${1:semiaxis-h}}{${2:semiaxis-v}}"
-    },
     "Ys": {},
     "ZTesto": {}
   },
diff --git a/dev/packages/euler.json b/dev/packages/euler.json
deleted file mode 100644
index 0fe8b6fbd..000000000
--- a/dev/packages/euler.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "mathfrak{}": {
-      "snippet": "mathfrak{${1:text}}"
-    },
-    "MathOldstyle{}": {
-      "snippet": "MathOldstyle{${1:text}}"
-    },
-    "TextOldstyle{}": {
-      "snippet": "TextOldstyle{${1:text}}"
-    },
-    "frak{}": {
-      "snippet": "frak{${1:text}}"
-    },
-    "scr{}": {
-      "snippet": "scr{${1:text}}"
-    },
-    "ifCorkEncoding": {},
-    "CorkEncodingtrue": {},
-    "CorkEncodingfalse": {},
-    "fileversion": {},
-    "filedate": {}
-  },
-  "envs": {},
-  "options": [
-    "mathbf",
-    "mathcal",
-    "text-hat-accent"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/example.json b/dev/packages/example.json
deleted file mode 100644
index 16d0d6102..000000000
--- a/dev/packages/example.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "ExampleWidth": {},
-    "ExampleSet": {},
-    "ExampleVerb": {}
-  },
-  "envs": {
-    "example": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/exercise.json b/dev/packages/exercise.json
deleted file mode 100644
index e0d688677..000000000
--- a/dev/packages/exercise.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-  "includes": {
-    "keyval": [],
-    "ifthen": []
-  },
-  "macros": {
-    "shipoutAnswer": {},
-    "shipoutExercise": {},
-    "Exercise": {},
-    "Exercise[]": {
-      "snippet": "Exercise[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Exercise*": {},
-    "Exercise*[]": {
-      "snippet": "Exercise*[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Answer": {},
-    "Answer[]": {
-      "snippet": "Answer[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "ExePart": {},
-    "ExePart[]": {
-      "snippet": "ExePart[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "ExePart*": {},
-    "ExePart*[]": {
-      "snippet": "ExePart*[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Question": {
-      "detail": "⁇",
-      "documentation": "DOUBLE QUESTION MARK"
-    },
-    "Question[]": {
-      "snippet": "Question[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "subQuestion": {},
-    "subQuestion[]": {
-      "snippet": "subQuestion[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "subsubQuestion": {},
-    "subsubQuestion[]": {
-      "snippet": "subsubQuestion[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "ExeText": {},
-    "ExerciseSelect": {},
-    "ExerciseSelect[]": {
-      "snippet": "ExerciseSelect[${1:options}]"
-    },
-    "ExerciseSelect*": {},
-    "ExerciseSelect*[]": {
-      "snippet": "ExerciseSelect*[${1:options}]"
-    },
-    "ExerciseStopSelect": {},
-    "refAnswer{}": {
-      "snippet": "refAnswer{${1:label}}"
-    },
-    "ExerciseLabel": {},
-    "marker{}{}": {
-      "snippet": "marker{${1:symbol}}{${2:number}}"
-    },
-    "DifficultyMarker": {},
-    "listofexercises": {},
-    "ListOfExerciseInToc": {},
-    "ExerciseLevelInToc{}": {
-      "snippet": "ExerciseLevelInToc{${1:level}}"
-    },
-    "ExerciseTitle": {},
-    "ExerciseName": {},
-    "ExerciseListName": {},
-    "AnswerName": {},
-    "AnswerListName": {},
-    "ExePartName": {},
-    "ExerciseHeaderTitle": {},
-    "ExerciseHeaderDifficulty": {},
-    "ExerciseHeaderOrigin": {},
-    "ExerciseHeaderNB": {},
-    "ExerciseHeader": {},
-    "ExerciseListHeader": {},
-    "AnswerHeader": {},
-    "AnswerListHeader": {},
-    "ExePartHeaderTitle": {},
-    "ExePartHeaderDifficulty": {},
-    "ExePartHeaderNB": {},
-    "ExePartHeader": {},
-    "ExePartListHeader": {},
-    "ExePartTitle": {},
-    "ExePartDifficulty": {},
-    "theExePart": {},
-    "AtBeginExercise": {},
-    "AtBeginAnswer": {},
-    "QuestionHeaderTitle": {},
-    "QuestionHeaderDifficulty": {},
-    "QuestionHeaderNB": {},
-    "subQuestionHeaderTitle": {},
-    "subQuestionHeaderDifficulty": {},
-    "subQuestionHeaderNB": {},
-    "subsubQuestionHeaderTitle": {},
-    "subsubQuestionHeaderDifficulty": {},
-    "subsubQuestionHeaderNB": {},
-    "ExerciseSkipBefore": {},
-    "ExerciseSkipAfter": {},
-    "AnswerSkipBefore": {},
-    "AnswerSkipAfter": {},
-    "Exesep": {},
-    "Exetopsep": {},
-    "Exeparsep": {},
-    "Exepartopsep": {},
-    "Exeleftmargin": {},
-    "Exerightmargin": {},
-    "Exelabelwidth": {},
-    "Exelabelsep": {},
-    "QuestionBefore": {},
-    "QuestionIndent": {},
-    "subQuestionBefore": {},
-    "subQuestionIndent": {},
-    "subsubQuestionBefore": {},
-    "subsubQuestionIndent": {},
-    "renewcounter{}": {
-      "snippet": "renewcounter{${1:name}}"
-    },
-    "renewcounter{}[]": {
-      "snippet": "renewcounter{${1:name}}[${2:counter}]"
-    },
-    "EndCurrentQuestion": {},
-    "EndCurrentsubQuestion": {},
-    "EndCurrentsubsubQuestion": {},
-    "AnswerCmd": {},
-    "AnswerHeaderRef": {},
-    "AnswerListHeaderRef": {},
-    "AnswerNB": {},
-    "AnswerRef": {},
-    "ArticleOf": {},
-    "beginAnswerEnv": {},
-    "beginExerciseEnv": {},
-    "beginExerciseListEnv": {},
-    "colonnesLevel": {},
-    "defineAnswerCmd": {},
-    "defineAnswerEnv": {},
-    "defineExePartInEnv": {},
-    "defineExePartInList": {},
-    "defineExerciseCmd": {},
-    "defineExerciseEnv": {},
-    "deuxcolonnes": {},
-    "endAnswerEnv": {},
-    "endExerciseEnv": {},
-    "endExerciseListEnv": {},
-    "ExerciseBefore": {},
-    "ExerciseClass": {},
-    "ExerciseCmd": {},
-    "ExerciseDifficulty": {},
-    "ExerciseExam": {},
-    "ExerciseHeaderExam": {},
-    "ExerciseHeaderLabel": {},
-    "ExerciseHeaderType": {},
-    "ExerciseHeaderYear": {},
-    "ExerciseLocalNB": {},
-    "ExerciseOrigin": {},
-    "ExerciseSelectClass": {},
-    "ExerciseSelectDifficulty": {},
-    "ExerciseSelectExam": {},
-    "ExerciseSelectLabel": {},
-    "ExerciseSelectOrigin": {},
-    "ExerciseSelectType": {},
-    "ExerciseSelectYear": {},
-    "ExerciseTrueLabel": {},
-    "ExerciseType": {},
-    "ExerciseYear": {},
-    "listexercisename": {},
-    "QuestionDifficulty": {},
-    "QuestionNB": {},
-    "QuestionTitle": {},
-    "recordExerciseLabel{}": {
-      "snippet": "recordExerciseLabel{${1:label}}"
-    },
-    "refstepExecounter": {},
-    "subQuestionDifficulty": {},
-    "subQuestionHeader": {},
-    "subQuestionNB": {},
-    "subQuestionTitle": {},
-    "subsubQuestionDifficulty": {},
-    "subsubQuestionHeader": {},
-    "subsubQuestionNB": {},
-    "subsubQuestionTitle": {},
-    "tempskipa": {},
-    "tempskipb": {},
-    "termineliste{}": {
-      "snippet": "termineliste{${1:number}}"
-    },
-    "theAnswer": {},
-    "theExePartDifficulty": {},
-    "theExercise": {},
-    "theExerciseDifficulty": {},
-    "theQuestion": {},
-    "theQuestionDifficulty": {},
-    "thesavedQuestion": {},
-    "thesavedsubQuestion": {},
-    "thesavedsubsubQuestion": {},
-    "thesubQuestion": {},
-    "thesubQuestionDifficulty": {},
-    "thesubsubQuestion": {},
-    "thesubsubQuestionDifficulty": {}
-  },
-  "envs": {
-    "Exercise": {},
-    "Exercise[]": {
-      "name": "Exercise",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Exercise*": {},
-    "Exercise*[]": {
-      "name": "Exercise*",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Answer": {},
-    "Answer[]": {
-      "name": "Answer",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "ExerciseList": {}
-  },
-  "options": [
-    "noanswer",
-    "answeronly",
-    "noexercise",
-    "exerciseonly",
-    "outputnothing",
-    "exercisedelayed",
-    "answerdelayed",
-    "lastexercise",
-    "showlabel"
-  ],
-  "keyvals": [
-    [
-      "label=",
-      "title={${1:text}}",
-      "difficulty=${1:number}",
-      "origin={${1:text}}",
-      "name={${1:text}}",
-      "counter=${1:counter}",
-      "number={${1:string}}",
-      "exam={${1:text}}",
-      "year=${1:year}"
-    ],
-    [
-      "ref=${1:label}",
-      "number={${1:string}}"
-    ],
-    [
-      "title={${1:text}}",
-      "difficulty=${1:number}",
-      "name={${1:text}}"
-    ],
-    [
-      "title={${1:text}}",
-      "difficulty=${1:number}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/exerquiz.json b/dev/packages/exerquiz.json
index f3b3d25e8..33c624a73 100644
--- a/dev/packages/exerquiz.json
+++ b/dev/packages/exerquiz.json
@@ -89,10 +89,6 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
-    "ccatCurrQzWith()": {
-      "snippet": "ccatCurrQzWith(${1:arg})",
-      "option": "usesumrytbls"
-    },
     "pbPopulateSumTable": {
       "option": "usesumrytbls"
     },
@@ -242,9 +238,6 @@
     "answersEndHook{}": {
       "snippet": "answersEndHook{${1:content}}"
     },
-    "Array()": {
-      "snippet": "Array(${1:JS funcs})"
-    },
     "autoAnsFldRaiseBox{}": {
       "snippet": "autoAnsFldRaiseBox{${1:length}}"
     },
@@ -269,7 +262,7 @@
       "snippet": "CorrAnsButton{${1:display answer}}*{${2:JS function}}"
     },
     "CorrAnsButtonGrp{}": {
-      "snippet": "CorrAnsButtonGrp{${1:n1,${2:n2},...}}"
+      "snippet": "CorrAnsButtonGrp{${1:n1,n2,...}}"
     },
     "CorrButton[]{}": {
       "snippet": "CorrButton[${2:eforms params}]{${1:field}}"
@@ -619,15 +612,6 @@
     "noPeekArgs{}": {
       "snippet": "noPeekArgs{${1:arg}}"
     },
-    "postDenyForm()": {
-      "snippet": "postDenyForm(${1:regexp})"
-    },
-    "preDenyForm()": {
-      "snippet": "preDenyForm(${1:regexp},${2:cMsg})"
-    },
-    "preReqForm()": {
-      "snippet": "preReqForm(${1:regexp},${2:cMsg})"
-    },
     "reany": {},
     "rebstr": {},
     "rechrclass{}": {
diff --git a/dev/packages/exesheet.json b/dev/packages/exesheet.json
deleted file mode 100644
index 3e147e22a..000000000
--- a/dev/packages/exesheet.json
+++ /dev/null
@@ -1,370 +0,0 @@
-{
-  "includes": {
-    "kvoptions": [],
-    "ifthen": [],
-    "geometry": [],
-    "xcolor": [],
-    "enumitem": [],
-    "tasks": [],
-    "versions": [],
-    "fancybox": [],
-    "translations": [],
-    "ragged2e": []
-  },
-  "macros": {
-    "exesheetset{}": {
-      "snippet": "exesheetset{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "exercise": {},
-    "exercise[]": {
-      "snippet": "exercise[${1:text}]"
-    },
-    "exercisename": {},
-    "labelexercise": {},
-    "theexercise": {},
-    "labelexercisestyle": {},
-    "exercise*{}": {
-      "snippet": "exercise*{${1:label}}"
-    },
-    "exercise*[]{}": {
-      "snippet": "exercise*[${2:text}]{${1:label}}"
-    },
-    "subpart": {},
-    "subpart[]": {
-      "snippet": "subpart[${1:text}]"
-    },
-    "thesubpart": {},
-    "subpartname": {},
-    "labelsubpart": {},
-    "labelsubpartstyle": {},
-    "subpart*{}": {
-      "snippet": "subpart*{${1:label}}"
-    },
-    "subpart*[]{}": {
-      "snippet": "subpart*[${2:text}]{${1:label}}"
-    },
-    "annex": {},
-    "annex[]": {
-      "snippet": "annex[${1:text}]"
-    },
-    "annexname": {},
-    "annexstyle": {},
-    "exe": {},
-    "exname": {},
-    "exlabel": {},
-    "exsepmark": {},
-    "exe*": {},
-    "labelenumone": {},
-    "labelenuma": {},
-    "enumfont": {},
-    "correctionstyle": {},
-    "correctionname": {},
-    "question{}": {
-      "snippet": "question{${1:question}}"
-    },
-    "question*{}": {
-      "snippet": "question*{${1:question}}"
-    },
-    "answer{}": {
-      "snippet": "answer{${1:answer}}"
-    },
-    "answer*{}": {
-      "snippet": "answer*{${1:answer}}"
-    },
-    "answerspace{}": {
-      "snippet": "answerspace{${1:height}}"
-    },
-    "points{}": {
-      "snippet": "points{${1:number}}"
-    },
-    "pointsname": {},
-    "pointname": {},
-    "pointsstyle": {},
-    "pts{}": {
-      "snippet": "pts{${1:number}}"
-    },
-    "ptsname": {},
-    "ptname": {},
-    "ptsstyle": {},
-    "totalexe{}": {
-      "snippet": "totalexe{${1:number}}"
-    },
-    "note{}": {
-      "snippet": "note{${1:comment}}"
-    },
-    "note[]{}": {
-      "snippet": "note[${2:points}]{${1:comment}}"
-    },
-    "note*{}": {
-      "snippet": "note*{${1:points}}"
-    },
-    "markingstyle": {},
-    "ptsboxlength": {},
-    "notestyle": {},
-    "totalpoints{}": {
-      "snippet": "totalpoints{${1:number}}"
-    },
-    "totalsheet{}": {
-      "snippet": "totalsheet{${1:number}}"
-    },
-    "largemarginwidthfactor": {},
-    "leftnotemarginwidth{}": {
-      "snippet": "leftnotemarginwidth{${1:length}}"
-    },
-    "noteragged": {},
-    "noteraggedleft": {},
-    "noteraggedright": {},
-    "ptsmark": {},
-    "refenuma": {},
-    "rightnotemarginwidth{}": {
-      "snippet": "rightnotemarginwidth{${1:length}}"
-    },
-    "standardmarginwidthfactor": {},
-    "questionsonly": {},
-    "answersonly": {},
-    "displaypts": {},
-    "displaypoints": {},
-    "displaynotes": {},
-    "displaynotes[]": {
-      "snippet": "displaynotes[${1:align cmd}]"
-    },
-    "displaynotesright": {},
-    "displaynotesright[]": {
-      "snippet": "displaynotesright[${1:align cmd}]"
-    }
-  },
-  "envs": {
-    "exenumerate": {},
-    "exenumerate[]": {
-      "name": "exenumerate",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "colsenum{}": {
-      "name": "colsenum",
-      "snippet": "{${1:cols}}"
-    },
-    "colsenum[]{}": {
-      "name": "colsenum",
-      "snippet": "[${2:options}]{${1:cols}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "colsenum*{}": {
-      "name": "colsenum*",
-      "snippet": "{${1:cols}}"
-    },
-    "colsenum*[]{}": {
-      "name": "colsenum*",
-      "snippet": "[${2:options}]{${1:cols}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "colsitem{}": {
-      "name": "colsitem",
-      "snippet": "{${1:cols}}"
-    },
-    "colsitem[]{}": {
-      "name": "colsitem",
-      "snippet": "[${2:options}]{${1:cols}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "colsitem*{}": {
-      "name": "colsitem*",
-      "snippet": "{${1:cols}}"
-    },
-    "colsitem*[]{}": {
-      "name": "colsitem*",
-      "snippet": "[${2:options}]{${1:cols}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "tablenum1": {},
-    "tablenum1(cols)": {
-      "name": "tablenum1",
-      "snippet": "(${1:cols})"
-    },
-    "tablenum1[](cols)": {
-      "name": "tablenum1",
-      "snippet": "[${1:options}](${2:cols})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "tablenuma": {},
-    "tablenuma(cols)": {
-      "name": "tablenuma",
-      "snippet": "(${1:cols})"
-    },
-    "tablenuma[](cols)": {
-      "name": "tablenuma",
-      "snippet": "[${1:options}](${2:cols})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "tablenuma*": {},
-    "tablitem": {},
-    "tablitem(cols)": {
-      "name": "tablitem",
-      "snippet": "(${1:cols})"
-    },
-    "tablitem[](cols)": {
-      "name": "tablitem",
-      "snippet": "[${1:options}](${2:cols})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "tablitem*": {},
-    "questions": {},
-    "answers": {},
-    "answers[]": {
-      "name": "answers",
-      "snippet": "[${1:level}]"
-    },
-    "answers*": {}
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "exetoc",
-      "setlist",
-      "output=",
-      "display=",
-      "answerspace",
-      "marginpos=",
-      "marginwidth=",
-      "noteragged=",
-      "checkpts",
-      "correct="
-    ],
-    [
-      "topsep=",
-      "partopsep=",
-      "parsep=",
-      "itemsep=",
-      "leftmargin=",
-      "rightmargin=",
-      "listparindent=",
-      "labelwidth=",
-      "labelsep=",
-      "itemindent=",
-      "label=${1:commands}",
-      "label*=${1:commands}",
-      "ref=${1:commands}",
-      "font=${1:commands}",
-      "format=${1:commands}",
-      "align=",
-      "labelindent=",
-      "left=${1:labelindent}",
-      "left=${1:labelindent} .. ${2:leftmargin}",
-      "widest",
-      "widest=${1:string}",
-      "widest*=${1:integer}",
-      "labelsep*=",
-      "labelindent*=",
-      "start=${1:integer}",
-      "resume",
-      "resume=${1:series name}",
-      "resume*",
-      "resume*=${1:series name}",
-      "series=${1:series name}",
-      "beginpenalty=${1:integer}",
-      "midpenalty=${1:integer}",
-      "endpenalty=${1:integer}",
-      "before=${1:code}",
-      "before*=${1:code}",
-      "after=${1:code}",
-      "after*=${1:code}",
-      "first=${1:code}",
-      "first*=${1:code}",
-      "style=",
-      "noitemsep",
-      "nosep",
-      "wide",
-      "wide=${1:parindent}",
-      "itemjoin=${1:string}",
-      "itemjoin*=${1:string}",
-      "afterlabel=${1:string}",
-      "mode=",
-      "%enumitemkey",
-      "A",
-      "a",
-      "I",
-      "i",
-      "1"
-    ],
-    [
-      "topsep=",
-      "partopsep=",
-      "parsep=",
-      "itemsep=",
-      "leftmargin=",
-      "rightmargin=",
-      "listparindent=",
-      "labelwidth=",
-      "labelsep=",
-      "itemindent=",
-      "label=${1:commands}",
-      "label*=${1:commands}",
-      "ref=${1:commands}",
-      "font=${1:commands}",
-      "format=${1:commands}",
-      "align=",
-      "labelindent=",
-      "left=${1:labelindent}",
-      "left=${1:labelindent} .. ${2:leftmargin}",
-      "widest",
-      "widest=${1:string}",
-      "widest*=${1:integer}",
-      "labelsep*=",
-      "labelindent*=",
-      "start=${1:integer}",
-      "resume",
-      "resume=${1:series name}",
-      "resume*",
-      "resume*=${1:series name}",
-      "series=${1:series name}",
-      "beginpenalty=${1:integer}",
-      "midpenalty=${1:integer}",
-      "endpenalty=${1:integer}",
-      "before=${1:code}",
-      "before*=${1:code}",
-      "after=${1:code}",
-      "after*=${1:code}",
-      "first=${1:code}",
-      "first*=${1:code}",
-      "style=",
-      "noitemsep",
-      "nosep",
-      "wide",
-      "wide=${1:parindent}",
-      "itemjoin=${1:string}",
-      "itemjoin*=${1:string}",
-      "afterlabel=${1:string}",
-      "mode=",
-      "%enumitemkey"
-    ],
-    [
-      "style=",
-      "label-format=${1:code}",
-      "label=${1:code}",
-      "ref=${1:code}",
-      "label-width=",
-      "label-offset=",
-      "item-format=${1:code}",
-      "item-indent=",
-      "column-sep=",
-      "label-align=",
-      "before-skip=",
-      "after-skip=",
-      "after-item-skip=",
-      "resume",
-      "start=${1:integer}",
-      "counter=${1:counter}",
-      "debug"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/expex-acro.json b/dev/packages/expex-acro.json
index bfe1e4128..268aeef88 100644
--- a/dev/packages/expex-acro.json
+++ b/dev/packages/expex-acro.json
@@ -24,10 +24,10 @@
       "snippet": "exrefnil[${2:tag1}]{${1:tag2}}"
     },
     "mexref{}": {
-      "snippet": "mexref{${1:tag1,${2:tag2},...}}"
+      "snippet": "mexref{${1:tag1,tag2,...}}"
     },
     "mexref[]{}": {
-      "snippet": "mexref[${2:separator}]{${1:tag1,${3:tag2},...}}"
+      "snippet": "mexref[${2:separator}]{${1:tag1,tag2,...}}"
     },
     "gl{}": {
       "snippet": "gl{${1:id}}"
diff --git a/dev/packages/expex.json b/dev/packages/expex.json
index ca8f187b8..ac0188733 100644
--- a/dev/packages/expex.json
+++ b/dev/packages/expex.json
@@ -144,7 +144,7 @@
       "snippet": "rightcomment{${1:text}}"
     },
     "defineglwlevels{}": {
-      "snippet": "defineglwlevels{${1:name1,${2:name2},...}}"
+      "snippet": "defineglwlevels{${1:name1,name2,...}}"
     },
     "beginglpanel": {},
     "beginglpanel[]": {
diff --git a/dev/packages/export.json b/dev/packages/export.json
deleted file mode 100644
index c8b532280..000000000
--- a/dev/packages/export.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "openexport{}": {
-      "snippet": "openexport{${1:file}}"
-    },
-    "openexport[]{}": {
-      "snippet": "openexport[${2:extension}]{${1:file}}"
-    },
-    "closeexport": {},
-    "Export{}": {
-      "snippet": "Export{${1:counter}}"
-    },
-    "ExportLength{}": {
-      "snippet": "ExportLength{${1:length}}"
-    },
-    "PreciseExportLength{}": {
-      "snippet": "PreciseExportLength{${1:length}}"
-    },
-    "ExportMuskip{}": {
-      "snippet": "ExportMuskip{${1:muskip}}"
-    },
-    "ExportParameter{}": {
-      "snippet": "ExportParameter{${1:parameter}}"
-    },
-    "ExportIf{}": {
-      "snippet": "ExportIf{${1:ifname}}"
-    },
-    "ExportPageLayout": {},
-    "ExportArrayParams": {},
-    "Import{}": {
-      "snippet": "Import{${1:file}}"
-    },
-    "Import[]{}": {
-      "snippet": "Import[${2:extension}]{${1:file}}"
-    },
-    "xcaption{}": {
-      "snippet": "xcaption{${1:float}}"
-    },
-    "xcaptionf{}": {
-      "snippet": "xcaptionf{${1:caption}}"
-    },
-    "xcaptiont{}": {
-      "snippet": "xcaptiont{${1:caption}}"
-    },
-    "AddInputInAux{}": {
-      "snippet": "AddInputInAux{${1:secondary document.aux}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/extract.json b/dev/packages/extract.json
deleted file mode 100644
index 8a768ab6f..000000000
--- a/dev/packages/extract.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "includes": {
-    "verbatim": [],
-    "xkeyval": []
-  },
-  "macros": {
-    "extractionlabel{}": {
-      "snippet": "extractionlabel{${1:name}}"
-    },
-    "extractline": {},
-    "extractline*": {}
-  },
-  "envs": {
-    "extract": {},
-    "extract[]": {
-      "name": "extract",
-      "snippet": "[${1:name}]"
-    },
-    "extract*": {},
-    "extract*[]": {
-      "name": "extract*",
-      "snippet": "[${1:name}]"
-    },
-    "extractskip": {},
-    "extractskip[]": {
-      "name": "extractskip",
-      "snippet": "[${1:name}]"
-    }
-  },
-  "options": [
-    "active",
-    "header",
-    "handles",
-    "copydocumentclass",
-    "generate=${1:file}",
-    "extract-env={${1:env1,env2,...}}",
-    "extract-cmd=${1:cmd}",
-    "extract-cmdline=${1:cmd}",
-    "line-nrs=${1:number spec}",
-    "line-labels={${1:label1,label2,...}}",
-    "extract-nrs=${1:number spec}",
-    "extract-labels={${1:label1,label2,...}}",
-    "extractskip-nrs=${1:number spec}",
-    "extractskip-labels={${1:label1,label2,...}}"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/fancybox.json b/dev/packages/fancybox.json
index 416d7a604..b89e35d42 100644
--- a/dev/packages/fancybox.json
+++ b/dev/packages/fancybox.json
@@ -22,37 +22,10 @@
     "cornersize*{}": {
       "snippet": "cornersize*{${1:dimen}}"
     },
-    "fancyoval()": {
-      "snippet": "fancyoval(${1:width},${2:height})"
-    },
-    "fancyoval()[]": {
-      "snippet": "fancyoval(${2:width},${3:height})[${1:portion}]"
-    },
     "TheSbox": {},
     "GenericCaption{}": {
       "snippet": "GenericCaption{${1:text}}"
     },
-    "item()": {
-      "snippet": "item(${1:vspace})"
-    },
-    "item()[]": {
-      "snippet": "item(${2:vspace})[${1:label}]"
-    },
-    "boxput(){}{}": {
-      "snippet": "boxput(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
-    },
-    "boxput*(){}{}": {
-      "snippet": "boxput*(${3:x},${4:y}){${1:contents1}}{${2:contents2}}"
-    },
-    "fancyput(){}": {
-      "snippet": "fancyput(${2:x},${3:y}){${1:contents}}"
-    },
-    "fancyput*(){}": {
-      "snippet": "fancyput*(${2:x},${3:y}){${1:contents}}"
-    },
-    "thisfancyput*(){}": {
-      "snippet": "thisfancyput*(${2:x},${3:y}){${1:contents}}"
-    },
     "fancypage{}{}": {
       "snippet": "fancypage{${1:cmds1}}{${2:cmds2}}"
     },
diff --git a/dev/packages/fancyhdr.json b/dev/packages/fancyhdr.json
deleted file mode 100644
index 1f9d3a02d..000000000
--- a/dev/packages/fancyhdr.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "fancyfoot[]{}": {
-      "snippet": "fancyfoot[${2:places}]{${1:footer}}"
-    },
-    "fancyfoot{}": {
-      "snippet": "fancyfoot{${1:footer}}"
-    },
-    "fancyhead[]{}": {
-      "snippet": "fancyhead[${2:places}]{${1:header}}"
-    },
-    "fancyhead{}": {
-      "snippet": "fancyhead{${1:header}}"
-    },
-    "fancyhf[]{}": {
-      "snippet": "fancyhf[${2:places}]{${1:output}}"
-    },
-    "fancyhf{}": {
-      "snippet": "fancyhf{${1:output}}"
-    },
-    "fancyfootoffset[]{}": {
-      "snippet": "fancyfootoffset[${2:places}]{${1:length}}"
-    },
-    "fancyfootoffset{}": {
-      "snippet": "fancyfootoffset{${1:length}}"
-    },
-    "fancyheadoffset[]{}": {
-      "snippet": "fancyheadoffset[${2:places}]{${1:length}}"
-    },
-    "fancyheadoffset{}": {
-      "snippet": "fancyheadoffset{${1:length}}"
-    },
-    "fancyhfoffset[]{}": {
-      "snippet": "fancyhfoffset[${2:places}]{${1:length}}"
-    },
-    "fancyhfoffset{}": {
-      "snippet": "fancyhfoffset{${1:length}}"
-    },
-    "fancypagestyle{}[]{}": {
-      "snippet": "fancypagestyle{${1:style name}}[${2:base style}]{${3:definitions}}"
-    },
-    "fancypagestyle{}{}": {
-      "snippet": "fancypagestyle{${1:style name}}{${2:definitions}}"
-    },
-    "iftopfloat{}{}": {
-      "snippet": "iftopfloat{${1:float page}}{${2:other}}"
-    },
-    "ifbotfloat{}{}": {
-      "snippet": "ifbotfloat{${1:float page}}{${2:other}}"
-    },
-    "iffloatpage{}{}": {
-      "snippet": "iffloatpage{${1:float page}}{${2:other}}"
-    },
-    "iffootnote{}{}": {
-      "snippet": "iffootnote{${1:float page}}{${2:other}}"
-    },
-    "headrulewidth": {},
-    "footrulewidth": {},
-    "headruleskip": {},
-    "footruleskip": {},
-    "headrule": {},
-    "footrule": {},
-    "headwidth": {},
-    "fancyheadinit{}": {
-      "snippet": "fancyheadinit{${1:code}}"
-    },
-    "fancyfootinit{}": {
-      "snippet": "fancyfootinit{${1:code}}"
-    },
-    "fancyhfinit{}": {
-      "snippet": "fancyhfinit{${1:code}}"
-    },
-    "fancycenter[][]{}{}{}": {
-      "snippet": "fancycenter[${4:distance}][${5:stretch}]{${1:left-mark}}{${2:center-mark}}{${3:right-mark}}"
-    },
-    "fancycenter[]{}{}{}": {
-      "snippet": "fancycenter[${4:distance}]{${1:left-mark}}{${2:center-mark}}{${3:right-mark}}"
-    },
-    "fancycenter{}{}{}": {
-      "snippet": "fancycenter{${1:left-mark}}{${2:center-mark}}{${3:right-mark}}"
-    },
-    "nouppercase{}": {
-      "snippet": "nouppercase{${1:text}}"
-    },
-    "chead[]{}": {
-      "snippet": "chead[${2:CH-even}]{${1:CH-odd}}"
-    },
-    "chead{}": {
-      "snippet": "chead{${1:header}}"
-    },
-    "cfoot[]{}": {
-      "snippet": "cfoot[${2:CF-even}]{${1:CF-odd}}"
-    },
-    "cfoot{}": {
-      "snippet": "cfoot{${1:footer}}"
-    },
-    "lhead[]{}": {
-      "snippet": "lhead[${2:LH-even}]{${1:LH-odd}}"
-    },
-    "lhead{}": {
-      "snippet": "lhead{${1:header}}"
-    },
-    "lfoot[]{}": {
-      "snippet": "lfoot[${2:LF-even}]{${1:LF-odd}}"
-    },
-    "lfoot{}": {
-      "snippet": "lfoot{${1:footer}}"
-    },
-    "rhead[]{}": {
-      "snippet": "rhead[${2:RH-even}]{${1:RH-odd}}"
-    },
-    "rhead{}": {
-      "snippet": "rhead{${1:header}}"
-    },
-    "rfoot[]{}": {
-      "snippet": "rfoot[${2:RF-even}]{${1:RF-odd}}"
-    },
-    "rfoot{}": {
-      "snippet": "rfoot{${1:footer}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "nocheck",
-    "compatV3",
-    "twoside",
-    "myheadings",
-    "headings"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/fancyvrb-ex.json b/dev/packages/fancyvrb-ex.json
index d7869c4bd..426974a6e 100644
--- a/dev/packages/fancyvrb-ex.json
+++ b/dev/packages/fancyvrb-ex.json
@@ -11,22 +11,6 @@
     "showgrid": {}
   },
   "envs": {
-    "PCenterExample(x1,y1)(x2,y2)": {
-      "name": "PCenterExample",
-      "snippet": "(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "PCenterExample[](x1,y1)(x2,y2)": {
-      "name": "PCenterExample",
-      "snippet": "[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "PSideBySideExample(x1,y1)(x2,y2)": {
-      "name": "PSideBySideExample",
-      "snippet": "(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "PSideBySideExample[](x1,y1)(x2,y2)": {
-      "name": "PSideBySideExample",
-      "snippet": "[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
     "Example": {},
     "Example[]": {
       "name": "Example",
diff --git a/dev/packages/fapapersize.json b/dev/packages/fapapersize.json
index 50ec8b101..0c0eba729 100644
--- a/dev/packages/fapapersize.json
+++ b/dev/packages/fapapersize.json
@@ -5,7 +5,7 @@
       "snippet": "usefastocksize{${1:width,height}}"
     },
     "usefapapersize{}": {
-      "snippet": "usefapapersize{${1:width,${2:height},${3:lmargin},${4:rmargin},${5:tmargin},bmargin}}"
+      "snippet": "usefapapersize{${1:width,height,lmargin,rmargin,tmargin,bmargin}}"
     },
     "definefageometry{}{}": {
       "snippet": "definefageometry{${1:name}}{${2:layout}}"
diff --git a/dev/packages/fbox.json b/dev/packages/fbox.json
deleted file mode 100644
index 165f272ba..000000000
--- a/dev/packages/fbox.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "includes": {
-    "xkeyval": [],
-    "xcolor": []
-  },
-  "macros": {
-    "fbox[]{}": {
-      "snippet": "fbox[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "fbox*{}": {
-      "snippet": "fbox*{${1:text}}"
-    },
-    "fbox*[]{}": {
-      "snippet": "fbox*[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "fparbox{}": {
-      "snippet": "fparbox{${1:text}}"
-    },
-    "fparbox[]{}": {
-      "snippet": "fparbox[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "fparbox*{}": {
-      "snippet": "fparbox*{${1:text}}"
-    },
-    "fparbox*[]{}": {
-      "snippet": "fparbox*[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "boxrule=",
-      "boxsep=",
-      "lcolor=",
-      "tcolor=",
-      "rcolor=",
-      "bcolor=",
-      "linewidth="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/fdsymbol.json b/dev/packages/fdsymbol.json
index c90558f4b..003c97db8 100644
--- a/dev/packages/fdsymbol.json
+++ b/dev/packages/fdsymbol.json
@@ -81,7 +81,6 @@
       "detail": "⊦",
       "documentation": "ASSERTION (ver short dash)"
     },
-    "awint,": {},
     "backcong": {
       "detail": "≌",
       "documentation": "ALL EQUAL TO"
@@ -147,7 +146,6 @@
     "bigcurlyvee": {},
     "bigcurlywedge": {},
     "bigdoublevee": {},
-    "bigdoublewedge,": {},
     "bigoast": {},
     "bigplus": {},
     "bigsqcap": {
diff --git a/dev/packages/fetchbibpes.json b/dev/packages/fetchbibpes.json
index a874e4cad..e7a7519d5 100644
--- a/dev/packages/fetchbibpes.json
+++ b/dev/packages/fetchbibpes.json
@@ -113,9 +113,6 @@
       "snippet": "sr{${1:text}}{${2:passages}}",
       "option": "usesr"
     },
-    "BV()": {
-      "snippet": "BV(${1:verse ref})"
-    },
     "null": {},
     "markverse{}": {
       "snippet": "markverse{${1:book ch:vrs}}",
diff --git a/dev/packages/feyn.json b/dev/packages/feyn.json
deleted file mode 100644
index 60bd5ea77..000000000
--- a/dev/packages/feyn.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "feyn{}": {
-      "snippet": "feyn{${1:chars}}"
-    },
-    "Feyn{}": {
-      "snippet": "Feyn{${1:chars}}"
-    },
-    "FEYN{}": {
-      "snippet": "FEYN{${1:chars}}"
-    },
-    "momentum{}{}": {
-      "snippet": "momentum{${1:chars}}{${2:text}}"
-    },
-    "momentum[]{}{}": {
-      "snippet": "momentum[${3:pos}]{${1:chars}}{${2:text}}"
-    },
-    "belowl{}": {
-      "snippet": "belowl{${1:chars}}"
-    },
-    "belowr{}": {
-      "snippet": "belowr{${1:chars}}"
-    },
-    "Diagram{}": {
-      "snippet": "Diagram{${1:array}}"
-    },
-    "Diagram[]{}": {
-      "snippet": "Diagram[${2:alignment}]{${1:array}}"
-    },
-    "DIAGRAM{}": {
-      "snippet": "DIAGRAM{${1:array}}"
-    },
-    "DIAGRAM[]{}": {
-      "snippet": "DIAGRAM[${2:alignment}]{${1:array}}"
-    },
-    "maxis{}": {
-      "snippet": "maxis{${1:arg}}"
-    },
-    "vertexlabel": {},
-    "feynstrut{}{}": {
-      "snippet": "feynstrut{${1:height}}{${2:depth}}"
-    },
-    "annotate{}{}{}": {
-      "snippet": "annotate{${1:x}}{${2:y}}{${3:text}}"
-    },
-    "tannotate{}{}{}": {
-      "snippet": "tannotate{${1:x}}{${2:y}}{${3:text}}"
-    },
-    "FeynSpaceChar": {},
-    "FeynxSpaceChar": {},
-    "wfermion": {},
-    "hfermion": {},
-    "shfermion": {},
-    "whfermion": {},
-    "gvcropped": {},
-    "bigbosonloop": {},
-    "smallbosonloop": {},
-    "bigbosonloopA": {},
-    "smallbosonloopA": {},
-    "bigbosonloopV": {},
-    "smallbosonloopV": {}
-  },
-  "envs": {},
-  "options": [
-    "globalbang",
-    "noglobalbang"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/feynmf.json b/dev/packages/feynmf.json
index 49e575914..ff99b9e7e 100644
--- a/dev/packages/feynmf.json
+++ b/dev/packages/feynmf.json
@@ -2,16 +2,16 @@
   "includes": {},
   "macros": {
     "fmf{}{}": {
-      "snippet": "fmf{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
+      "snippet": "fmf{${1:style,opt=val,...}}{${2:v1,v2,...}}"
     },
     "fmfblob{}{}": {
-      "snippet": "fmfblob{${1:diameter}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmfblob{${1:diameter}}{${2:v1,v2,...}}"
     },
     "fmfblobn{}{}{}": {
       "snippet": "fmfblobn{${1:diameter}}{${2:v}}{${3:n}}"
     },
     "fmfbottom{}": {
-      "snippet": "fmfbottom{${1:v1,${2:v2},...}}"
+      "snippet": "fmfbottom{${1:v1,v2,...}}"
     },
     "fmfbottomn{}{}": {
       "snippet": "fmfbottomn{${1:v}}{${2:n}}"
@@ -25,30 +25,27 @@
     },
     "fmfdisplay": {},
     "fmfdot{}": {
-      "snippet": "fmfdot{${1:v1,${2:v2},...}}"
+      "snippet": "fmfdot{${1:v1,v2,...}}"
     },
     "fmfdotn{}{}": {
       "snippet": "fmfdotn{${1:v}}{${2:n}}"
     },
     "fmfdraw": {},
     "fmffixed{}{}": {
-      "snippet": "fmffixed{${1:dist}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmffixed{${1:dist}}{${2:v1,v2,...}}"
     },
     "fmffixedx{}{}": {
-      "snippet": "fmffixedx{${1:dx}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmffixedx{${1:dx}}{${2:v1,v2,...}}"
     },
     "fmffixedy{}{}": {
-      "snippet": "fmffixedy{${1:dy}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmffixedy{${1:dy}}{${2:v1,v2,...}}"
     },
     "fmfforce{}{}": {
-      "snippet": "fmfforce{${1:pos}}{${2:v1,${3:v2},...}}"
-    },
-    "fmfframe(left,top}(){": {
-      "snippet": "fmfframe(${2:left},top}(${3:right},${4:bottom}){${1:box}}"
+      "snippet": "fmfforce{${1:pos}}{${2:v1,v2,...}}"
     },
     "fmffreeze": {},
     "fmfi{}{}": {
-      "snippet": "fmfi{${1:style,${3:opt=val},...}}{${2:p}}"
+      "snippet": "fmfi{${1:style,opt=val,...}}{${2:p}}"
     },
     "fmfiequ{}{}": {
       "snippet": "fmfiequ{${1:lval}}{${2:rval}}"
@@ -63,7 +60,7 @@
       "snippet": "fmfiset{${1:lval}}{${2:rval}}"
     },
     "fmfiv{}{}": {
-      "snippet": "fmfiv{${1:shape=val,${3:opt=val},...}}{${2:v}}"
+      "snippet": "fmfiv{${1:shape=val,opt=val,...}}{${2:v}}"
     },
     "fmfkeep{}": {
       "snippet": "fmfkeep{${1:name}}"
@@ -72,23 +69,23 @@
       "snippet": "fmflabel{${1:label}}{${2:v}}"
     },
     "fmfleft{}": {
-      "snippet": "fmfleft{${1:v1,${2:v2},...}}"
+      "snippet": "fmfleft{${1:v1,v2,...}}"
     },
     "fmfleftn{}{}": {
       "snippet": "fmfleftn{${1:v}}{${2:n}}"
     },
     "fmfn{}{}{}": {
-      "snippet": "fmfn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
     },
     "fmfnotrace": {},
     "fmfpen{}": {
       "snippet": "fmfpen{${1:weight}}"
     },
     "fmfpoly{}{}": {
-      "snippet": "fmfpoly{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
+      "snippet": "fmfpoly{${1:style,opt=val,...}}{${2:v1,v2,...}}"
     },
     "fmfpolyn{}{}{}": {
-      "snippet": "fmfpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
     },
     "fmfposition": {},
     "fmfrcyclen{}{}{}": {
@@ -98,37 +95,37 @@
       "snippet": "fmfreuse{${1:name}}"
     },
     "fmfright{}": {
-      "snippet": "fmfright{${1:v1,${2:v2},...}}"
+      "snippet": "fmfright{${1:v1,v2,...}}"
     },
     "fmfrightn{}{}": {
       "snippet": "fmfrightn{${1:v}}{${2:n}}"
     },
     "fmfrpolyn{}{}{}": {
-      "snippet": "fmfrpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfrpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
     },
     "fmfset{}{}": {
       "snippet": "fmfset{${1:parameter}}{${2:value}}"
     },
     "fmfshift{}{}": {
-      "snippet": "fmfshift{${1:dist}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmfshift{${1:dist}}{${2:v1,v2,...}}"
     },
     "fmfstopdisplay": {},
     "fmfstraight": {},
     "fmfsurround{}": {
-      "snippet": "fmfsurround{${1:v1,${2:v2},...}}"
+      "snippet": "fmfsurround{${1:v1,v2,...}}"
     },
     "fmfsurroundn{}{}": {
       "snippet": "fmfsurroundn{${1:v}}{${2:n}}"
     },
     "fmftop{}": {
-      "snippet": "fmftop{${1:v1,${2:v2},...}}"
+      "snippet": "fmftop{${1:v1,v2,...}}"
     },
     "fmftopn{}{}": {
       "snippet": "fmftopn{${1:v}}{${2:n}}"
     },
     "fmftrace": {},
     "fmfv{}{}": {
-      "snippet": "fmfv{${1:opt=val,${3:...}}{${2:v1},${4:v2},...}}"
+      "snippet": "fmfv{${1:opt=val,...}}{${2:v1,v2,...}}"
     },
     "fmfvn{}{}{}": {
       "snippet": "fmfvn{${1:opt=val,...}}{${2:v}}{${3:n}}"
@@ -203,34 +200,14 @@
       "name": "fmffile",
       "snippet": "{${1:METAFONT-file}}"
     },
-    "fmfchar(width,height)": {
-      "name": "fmfchar",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "fmfchar*(width,height)": {
-      "name": "fmfchar*",
-      "snippet": "(${1:width},${2:height})"
-    },
     "fmffor{}{}{}{}": {
       "name": "fmffor",
       "snippet": "{${1:var}}{${2:from}}{${3:step}}{${4:to}}"
     },
-    "fmfgraph(width,height)": {
-      "name": "fmfgraph",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "fmfgraph*(width,height)": {
-      "name": "fmfgraph*",
-      "snippet": "(${1:width},${2:height})"
-    },
     "fmfgroup": {},
     "fmfshrink{}": {
       "name": "fmfshrink",
       "snippet": "{${1:factor}}"
-    },
-    "fmfsubgraph(x,y)(width,height)": {
-      "name": "fmfsubgraph",
-      "snippet": "(${1:x},${2:y})(${3:width},${4:height})"
     }
   },
   "options": [
diff --git a/dev/packages/feynmp.json b/dev/packages/feynmp.json
index 70d6fa29b..15376ffcf 100644
--- a/dev/packages/feynmp.json
+++ b/dev/packages/feynmp.json
@@ -4,16 +4,16 @@
   },
   "macros": {
     "fmf{}{}": {
-      "snippet": "fmf{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
+      "snippet": "fmf{${1:style,opt=val,...}}{${2:v1,v2,...}}"
     },
     "fmfblob{}{}": {
-      "snippet": "fmfblob{${1:diameter}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmfblob{${1:diameter}}{${2:v1,v2,...}}"
     },
     "fmfblobn{}{}{}": {
       "snippet": "fmfblobn{${1:diameter}}{${2:v}}{${3:n}}"
     },
     "fmfbottom{}": {
-      "snippet": "fmfbottom{${1:v1,${2:v2},...}}"
+      "snippet": "fmfbottom{${1:v1,v2,...}}"
     },
     "fmfbottomn{}{}": {
       "snippet": "fmfbottomn{${1:v}}{${2:n}}"
@@ -27,30 +27,27 @@
     },
     "fmfdisplay": {},
     "fmfdot{}": {
-      "snippet": "fmfdot{${1:v1,${2:v2},...}}"
+      "snippet": "fmfdot{${1:v1,v2,...}}"
     },
     "fmfdotn{}{}": {
       "snippet": "fmfdotn{${1:v}}{${2:n}}"
     },
     "fmfdraw": {},
     "fmffixed{}{}": {
-      "snippet": "fmffixed{${1:dist}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmffixed{${1:dist}}{${2:v1,v2,...}}"
     },
     "fmffixedx{}{}": {
-      "snippet": "fmffixedx{${1:dx}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmffixedx{${1:dx}}{${2:v1,v2,...}}"
     },
     "fmffixedy{}{}": {
-      "snippet": "fmffixedy{${1:dy}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmffixedy{${1:dy}}{${2:v1,v2,...}}"
     },
     "fmfforce{}{}": {
-      "snippet": "fmfforce{${1:pos}}{${2:v1,${3:v2},...}}"
-    },
-    "fmfframe(left,top}(){": {
-      "snippet": "fmfframe(${2:left},top}(${3:right},${4:bottom}){${1:box}}"
+      "snippet": "fmfforce{${1:pos}}{${2:v1,v2,...}}"
     },
     "fmffreeze": {},
     "fmfi{}{}": {
-      "snippet": "fmfi{${1:style,${3:opt=val},...}}{${2:p}}"
+      "snippet": "fmfi{${1:style,opt=val,...}}{${2:p}}"
     },
     "fmfiequ{}{}": {
       "snippet": "fmfiequ{${1:lval}}{${2:rval}}"
@@ -65,7 +62,7 @@
       "snippet": "fmfiset{${1:lval}}{${2:rval}}"
     },
     "fmfiv{}{}": {
-      "snippet": "fmfiv{${1:shape=val,${3:opt=val},...}}{${2:v}}"
+      "snippet": "fmfiv{${1:shape=val,opt=val,...}}{${2:v}}"
     },
     "fmfkeep{}": {
       "snippet": "fmfkeep{${1:name}}"
@@ -74,23 +71,23 @@
       "snippet": "fmflabel{${1:label}}{${2:v}}"
     },
     "fmfleft{}": {
-      "snippet": "fmfleft{${1:v1,${2:v2},...}}"
+      "snippet": "fmfleft{${1:v1,v2,...}}"
     },
     "fmfleftn{}{}": {
       "snippet": "fmfleftn{${1:v}}{${2:n}}"
     },
     "fmfn{}{}{}": {
-      "snippet": "fmfn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
     },
     "fmfnotrace": {},
     "fmfpen{}": {
       "snippet": "fmfpen{${1:weight}}"
     },
     "fmfpoly{}{}": {
-      "snippet": "fmfpoly{${1:style,${3:opt=val},${4:...}}{${2:v1},${5:v2},...}}"
+      "snippet": "fmfpoly{${1:style,opt=val,...}}{${2:v1,v2,...}}"
     },
     "fmfpolyn{}{}{}": {
-      "snippet": "fmfpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
     },
     "fmfposition": {},
     "fmfrcyclen{}{}{}": {
@@ -100,37 +97,37 @@
       "snippet": "fmfreuse{${1:name}}"
     },
     "fmfright{}": {
-      "snippet": "fmfright{${1:v1,${2:v2},...}}"
+      "snippet": "fmfright{${1:v1,v2,...}}"
     },
     "fmfrightn{}{}": {
       "snippet": "fmfrightn{${1:v}}{${2:n}}"
     },
     "fmfrpolyn{}{}{}": {
-      "snippet": "fmfrpolyn{${1:style,${4:opt=val},...}}{${2:v}}{${3:n}}"
+      "snippet": "fmfrpolyn{${1:style,opt=val,...}}{${2:v}}{${3:n}}"
     },
     "fmfset{}{}": {
       "snippet": "fmfset{${1:parameter}}{${2:value}}"
     },
     "fmfshift{}{}": {
-      "snippet": "fmfshift{${1:dist}}{${2:v1,${3:v2},...}}"
+      "snippet": "fmfshift{${1:dist}}{${2:v1,v2,...}}"
     },
     "fmfstopdisplay": {},
     "fmfstraight": {},
     "fmfsurround{}": {
-      "snippet": "fmfsurround{${1:v1,${2:v2},...}}"
+      "snippet": "fmfsurround{${1:v1,v2,...}}"
     },
     "fmfsurroundn{}{}": {
       "snippet": "fmfsurroundn{${1:v}}{${2:n}}"
     },
     "fmftop{}": {
-      "snippet": "fmftop{${1:v1,${2:v2},...}}"
+      "snippet": "fmftop{${1:v1,v2,...}}"
     },
     "fmftopn{}{}": {
       "snippet": "fmftopn{${1:v}}{${2:n}}"
     },
     "fmftrace": {},
     "fmfv{}{}": {
-      "snippet": "fmfv{${1:opt=val,${3:...}}{${2:v1},${4:v2},...}}"
+      "snippet": "fmfv{${1:opt=val,...}}{${2:v1,v2,...}}"
     },
     "fmfvn{}{}{}": {
       "snippet": "fmfvn{${1:opt=val,...}}{${2:v}}{${3:n}}"
@@ -200,34 +197,14 @@
       "name": "fmffile",
       "snippet": "{${1:METAPOST-file}}"
     },
-    "fmfchar(width,height)": {
-      "name": "fmfchar",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "fmfchar*(width,height)": {
-      "name": "fmfchar*",
-      "snippet": "(${1:width},${2:height})"
-    },
     "fmffor{}{}{}{}": {
       "name": "fmffor",
       "snippet": "{${1:var}}{${2:from}}{${3:step}}{${4:to}}"
     },
-    "fmfgraph(width,height)": {
-      "name": "fmfgraph",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "fmfgraph*(width,height)": {
-      "name": "fmfgraph*",
-      "snippet": "(${1:width},${2:height})"
-    },
     "fmfgroup": {},
     "fmfshrink{}": {
       "name": "fmfshrink",
       "snippet": "{${1:factor}}"
-    },
-    "fmfsubgraph(x,y)(width,height)": {
-      "name": "fmfsubgraph",
-      "snippet": "(${1:x},${2:y})(${3:width},${4:height})"
     }
   },
   "options": [
diff --git a/dev/packages/filehook.json b/dev/packages/filehook.json
deleted file mode 100644
index ebeadac9b..000000000
--- a/dev/packages/filehook.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "AtBeginOfEveryFile{}": {
-      "snippet": "AtBeginOfEveryFile{${1:code}}"
-    },
-    "AtEndOfEveryFile{}": {
-      "snippet": "AtEndOfEveryFile{${1:code}}"
-    },
-    "AtBeginOfFiles{}": {
-      "snippet": "AtBeginOfFiles{${1:code}}"
-    },
-    "AtEndOfFiles{}": {
-      "snippet": "AtEndOfFiles{${1:code}}"
-    },
-    "AtBeginOfFile{}{}": {
-      "snippet": "AtBeginOfFile{${1:file}}{${2:code}}"
-    },
-    "AtEndOfFile{}{}": {
-      "snippet": "AtEndOfFile{${1:file}}{${2:code}}"
-    },
-    "AtBeginOfIncludes{}": {
-      "snippet": "AtBeginOfIncludes{${1:code}}"
-    },
-    "AtEndOfIncludes{}": {
-      "snippet": "AtEndOfIncludes{${1:code}}"
-    },
-    "AfterIncludes{}": {
-      "snippet": "AfterIncludes{${1:code}}"
-    },
-    "AtBeginOfIncludeFile{}{}": {
-      "snippet": "AtBeginOfIncludeFile{${1:file}}{${2:code}}"
-    },
-    "AtEndOfIncludeFile{}{}": {
-      "snippet": "AtEndOfIncludeFile{${1:file}}{${2:code}}"
-    },
-    "AfterIncludeFile{}{}": {
-      "snippet": "AfterIncludeFile{${1:file}}{${2:code}}"
-    },
-    "AtBeginOfInputs{}": {
-      "snippet": "AtBeginOfInputs{${1:code}}"
-    },
-    "AtEndOfInputs{}": {
-      "snippet": "AtEndOfInputs{${1:code}}"
-    },
-    "AtBeginOfInputFile{}{}": {
-      "snippet": "AtBeginOfInputFile{${1:file}}{${2:code}}"
-    },
-    "AtEndOfInputFile{}{}": {
-      "snippet": "AtEndOfInputFile{${1:file}}{${2:code}}"
-    },
-    "AtBeginOfPackageFile{}{}": {
-      "snippet": "AtBeginOfPackageFile{${1:package}}{${2:code}}"
-    },
-    "AtEndOfPackageFile{}{}": {
-      "snippet": "AtEndOfPackageFile{${1:package}}{${2:code}}"
-    },
-    "AtBeginOfPackageFile*{}{}": {
-      "snippet": "AtBeginOfPackageFile*{${1:package}}{${2:code}}"
-    },
-    "AtEndOfPackageFile*{}{}": {
-      "snippet": "AtEndOfPackageFile*{${1:package}}{${2:code}}"
-    },
-    "AtBeginOfClassFile{}{}": {
-      "snippet": "AtBeginOfClassFile{${1:class}}{${2:code}}"
-    },
-    "AtEndOfClassFile{}{}": {
-      "snippet": "AtEndOfClassFile{${1:class}}{${2:code}}"
-    },
-    "AtBeginOfClassFile*{}{}": {
-      "snippet": "AtBeginOfClassFile*{${1:class}}{${2:code}}"
-    },
-    "AtEndOfClassFile*{}{}": {
-      "snippet": "AtEndOfClassFile*{${1:class}}{${2:code}}"
-    },
-    "ClearHook": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/fitch.json b/dev/packages/fitch.json
deleted file mode 100644
index cc5120336..000000000
--- a/dev/packages/fitch.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-  "includes": {
-    "kvoptions": []
-  },
-  "macros": {
-    "hypo{}{}": {
-      "snippet": "hypo{${1:label}}{${2:formula}}"
-    },
-    "hypo[]{}{}": {
-      "snippet": "hypo[${3:symbol}]{${1:label}}{${2:formula}}"
-    },
-    "hypo[][]{}{}": {
-      "snippet": "hypo[${3:symbol}][${4:offset}]{${1:label}}{${2:formula}}"
-    },
-    "have{}{}": {
-      "snippet": "have{${1:label}}{${2:formula}}"
-    },
-    "have[]{}{}": {
-      "snippet": "have[${3:symbol}]{${1:label}}{${2:formula}}"
-    },
-    "have[][]{}{}": {
-      "snippet": "have[${3:symbol}][${4:offset}]{${1:label}}{${2:formula}}"
-    },
-    "open": {},
-    "open[]": {
-      "snippet": "open[${1:guard}]"
-    },
-    "close": {},
-    "close[]": {
-      "snippet": "close[${1:guard}]"
-    },
-    "r{}": {
-      "snippet": "r{${1:ref list}}"
-    },
-    "ii{}": {
-      "snippet": "ii{${1:ref list}}"
-    },
-    "ie{}": {
-      "snippet": "ie{${1:ref list}}"
-    },
-    "ai{}": {
-      "snippet": "ai{${1:ref list}}"
-    },
-    "ae{}": {
-      "snippet": "ae{${1:ref list}}"
-    },
-    "oi{}": {
-      "snippet": "oi{${1:ref list}}"
-    },
-    "oe{}": {
-      "snippet": "oe{${1:ref list}}"
-    },
-    "ni{}": {
-      "snippet": "ni{${1:ref list}}"
-    },
-    "ne{}": {
-      "snippet": "ne{${1:ref list}}"
-    },
-    "be{}": {
-      "snippet": "be{${1:ref list}}"
-    },
-    "nne{}": {
-      "snippet": "nne{${1:ref list}}"
-    },
-    "Ai{}": {
-      "snippet": "Ai{${1:ref list}}"
-    },
-    "Ae{}": {
-      "snippet": "Ae{${1:ref list}}"
-    },
-    "Ei{}": {
-      "snippet": "Ei{${1:ref list}}"
-    },
-    "Ee{}": {
-      "snippet": "Ee{${1:ref list}}"
-    },
-    "guard{}": {
-      "snippet": "guard{${1:guard}}"
-    },
-    "guard[]{}": {
-      "snippet": "guard[${2:n}]{${1:guard}}"
-    },
-    "by{}{}": {
-      "snippet": "by{${1:text}}{${2:ref list}}"
-    },
-    "ndref{}": {
-      "snippet": "ndref{${1:ref list}}"
-    },
-    "hypocont{}": {
-      "snippet": "hypocont{${1:formula}}"
-    },
-    "havecont{}": {
-      "snippet": "havecont{${1:formula}}"
-    },
-    "ndrules": {},
-    "ndjustformat": {},
-    "ndrefformat": {},
-    "nddim{}{}{}{}{}{}{}{}": {
-      "snippet": "nddim{${1:height}}{${2:topheight}}{${3:depth}}{${4:labelsep}}{${5:indent}}{${6:hsep}}{${7:justsep}}{${8:linethickness}}"
-    }
-  },
-  "envs": {
-    "nd": {},
-    "nd[]": {
-      "name": "nd",
-      "snippet": "[${1:options}]"
-    },
-    "fitchproof": {},
-    "fitchproof[]": {
-      "name": "fitchproof",
-      "snippet": "[${1:options}]"
-    },
-    "ndresume": {},
-    "ndresume[]": {
-      "name": "ndresume",
-      "snippet": "[${1:options}]"
-    },
-    "fitchproof*": {},
-    "fitchproof*[]": {
-      "name": "fitchproof*",
-      "snippet": "[${1:options}]"
-    }
-  },
-  "options": [
-    "rules=${1:csname}",
-    "arrayenv=${1:envname}",
-    "justformat=${1:csname}",
-    "refformat=${1:csname}",
-    "height=",
-    "topheight=",
-    "depth=",
-    "labelsep=",
-    "indent=",
-    "hsep=",
-    "justsep=",
-    "linethickness=",
-    "cindent=",
-    "outerline"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/float.json b/dev/packages/float.json
deleted file mode 100644
index f278bff1d..000000000
--- a/dev/packages/float.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "newfloat{}{}{}": {
-      "snippet": "newfloat{${1:float type}}{${2:placement}}{${3:ext}}"
-    },
-    "newfloat{}{}{}[]": {
-      "snippet": "newfloat{${1:float type}}{${2:placement}}{${3:ext}}[${4:within}]"
-    },
-    "floatstyle{}": {
-      "snippet": "floatstyle{${1:default style}}"
-    },
-    "floatname{}{}": {
-      "snippet": "floatname{${1:float type}}{${2:name}}"
-    },
-    "floatplacement{}{}": {
-      "snippet": "floatplacement{${1:float type}}{${2:default placement}}"
-    },
-    "restylefloat{}": {
-      "snippet": "restylefloat{${1:float type}}"
-    },
-    "listof{}{}": {
-      "snippet": "listof{${1:float type}}{${2:title}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/floatrow.json b/dev/packages/floatrow.json
index 0a161a9e3..ee438e73e 100644
--- a/dev/packages/floatrow.json
+++ b/dev/packages/floatrow.json
@@ -121,10 +121,10 @@
     },
     "RawFloats": {},
     "RawFloats[]": {
-      "snippet": "RawFloats[${1:type1,${2:type2},...}]"
+      "snippet": "RawFloats[${1:type1,type2,...}]"
     },
     "RawFloats[][]": {
-      "snippet": "RawFloats[${1:type}][${2:subtype1,${3:subtype2},...}]"
+      "snippet": "RawFloats[${1:type}][${2:subtype1,subtype2,...}]"
     },
     "RawCaption{}": {
       "snippet": "RawCaption{${1:arg}}"
diff --git a/dev/packages/fltrace.json b/dev/packages/fltrace.json
deleted file mode 100644
index 253a5a145..000000000
--- a/dev/packages/fltrace.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "tracefloats": {},
-    "tracefloatsoff": {},
-    "tracefloatvals": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/fontspec.json b/dev/packages/fontspec.json
deleted file mode 100644
index 848549b92..000000000
--- a/dev/packages/fontspec.json
+++ /dev/null
@@ -1,351 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "liningnums{}": {
-      "snippet": "liningnums{${1:text}}"
-    },
-    "strong{}": {
-      "snippet": "strong{${1:text}}"
-    },
-    "strongfontdeclare{}": {
-      "snippet": "strongfontdeclare{${1:font-switching list}}"
-    },
-    "strongreset": {},
-    "setmainfont{}": {
-      "snippet": "setmainfont{${1:font}}"
-    },
-    "setmainfont[]{}": {
-      "snippet": "setmainfont[${2:font features}]{${1:font}}"
-    },
-    "setmainfont{}[]": {
-      "snippet": "setmainfont{${1:font}}[${2:font features}]"
-    },
-    "setmainfont[]{}[]": {
-      "snippet": "setmainfont[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "setromanfont{}": {
-      "snippet": "setromanfont{${1:font}}"
-    },
-    "setromanfont[]{}": {
-      "snippet": "setromanfont[${2:font features}]{${1:font}}"
-    },
-    "setromanfont{}[]": {
-      "snippet": "setromanfont{${1:font}}[${2:font features}]"
-    },
-    "setromanfont[]{}[]": {
-      "snippet": "setromanfont[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "setsansfont{}": {
-      "snippet": "setsansfont{${1:font}}"
-    },
-    "setsansfont[]{}": {
-      "snippet": "setsansfont[${2:font features}]{${1:font}}"
-    },
-    "setsansfont{}[]": {
-      "snippet": "setsansfont{${1:font}}[${2:font features}]"
-    },
-    "setsansfont[]{}[]": {
-      "snippet": "setsansfont[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "setmonofont{}": {
-      "snippet": "setmonofont{${1:font}}"
-    },
-    "setmonofont[]{}": {
-      "snippet": "setmonofont[${2:font features}]{${1:font}}"
-    },
-    "setmonofont{}[]": {
-      "snippet": "setmonofont{${1:font}}[${2:font features}]"
-    },
-    "setmonofont[]{}[]": {
-      "snippet": "setmonofont[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "newfontfamily{}{}": {
-      "snippet": "newfontfamily{${1:cmd}}{${2:font}}"
-    },
-    "newfontfamily{}[]{}": {
-      "snippet": "newfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "newfontfamily{}{}[]": {
-      "snippet": "newfontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "newfontfamily{}[]{}[]": {
-      "snippet": "newfontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "setfontfamily{}{}": {
-      "snippet": "setfontfamily{${1:cmd}}{${2:font}}"
-    },
-    "setfontfamily{}[]{}": {
-      "snippet": "setfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "setfontfamily{}{}[]": {
-      "snippet": "setfontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "setfontfamily{}[]{}[]": {
-      "snippet": "setfontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "renewfontfamily{}{}": {
-      "snippet": "renewfontfamily{${1:cmd}}{${2:font}}"
-    },
-    "renewfontfamily{}[]{}": {
-      "snippet": "renewfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "renewfontfamily{}{}[]": {
-      "snippet": "renewfontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "renewfontfamily{}[]{}[]": {
-      "snippet": "renewfontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "providefontfamily{}{}": {
-      "snippet": "providefontfamily{${1:cmd}}{${2:font}}"
-    },
-    "providefontfamily{}[]{}": {
-      "snippet": "providefontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "providefontfamily{}{}[]": {
-      "snippet": "providefontfamily{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "providefontfamily{}[]{}[]": {
-      "snippet": "providefontfamily{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "fontspec{}": {
-      "snippet": "fontspec{${1:font}}"
-    },
-    "fontspec[]{}": {
-      "snippet": "fontspec[${2:font features}]{${1:font}}"
-    },
-    "fontspec{}[]": {
-      "snippet": "fontspec{${1:font}}[${2:font features}]"
-    },
-    "fontspec[]{}[]": {
-      "snippet": "fontspec[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "IfFontExistsTF{}{}{}": {
-      "snippet": "IfFontExistsTF{${1:font name}}{${2:true}}{${3:false}}"
-    },
-    "newfontface{}{}": {
-      "snippet": "newfontface{${1:cmd}}{${2:font}}"
-    },
-    "newfontface{}[]{}": {
-      "snippet": "newfontface{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "newfontface{}{}[]": {
-      "snippet": "newfontface{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "newfontface{}[]{}[]": {
-      "snippet": "newfontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "setfontface{}{}": {
-      "snippet": "setfontface{${1:cmd}}{${2:font}}"
-    },
-    "setfontface{}[]{}": {
-      "snippet": "setfontface{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "setfontface{}{}[]": {
-      "snippet": "setfontface{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "setfontface{}[]{}[]": {
-      "snippet": "setfontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "renewfontface{}{}": {
-      "snippet": "renewfontface{${1:cmd}}{${2:font}}"
-    },
-    "renewfontface{}[]{}": {
-      "snippet": "renewfontface{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "renewfontface{}{}[]": {
-      "snippet": "renewfontface{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "renewfontface{}[]{}[]": {
-      "snippet": "renewfontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "providefontface{}{}": {
-      "snippet": "providefontface{${1:cmd}}{${2:font}}"
-    },
-    "providefontface{}[]{}": {
-      "snippet": "providefontface{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "providefontface{}{}[]": {
-      "snippet": "providefontface{${1:cmd}}{${2:font}}[${3:font features}]"
-    },
-    "providefontface{}[]{}[]": {
-      "snippet": "providefontface{${1:cmd}}[${2:font features}]{${3:font}}[${4:font features}]"
-    },
-    "setmathrm{}": {
-      "snippet": "setmathrm{${1:font}}"
-    },
-    "setmathrm[]{}": {
-      "snippet": "setmathrm[${2:font features}]{${1:font}}"
-    },
-    "setmathrm{}[]": {
-      "snippet": "setmathrm{${1:font}}[${2:font features}]"
-    },
-    "setmathrm[]{}[]": {
-      "snippet": "setmathrm[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "setmathsf{}": {
-      "snippet": "setmathsf{${1:font}}"
-    },
-    "setmathsf[]{}": {
-      "snippet": "setmathsf[${2:font features}]{${1:font}}"
-    },
-    "setmathsf{}[]": {
-      "snippet": "setmathsf{${1:font}}[${2:font features}]"
-    },
-    "setmathsf[]{}[]": {
-      "snippet": "setmathsf[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "setmathtt{}": {
-      "snippet": "setmathtt{${1:font}}"
-    },
-    "setmathtt[]{}": {
-      "snippet": "setmathtt[${2:font features}]{${1:font}}"
-    },
-    "setmathtt{}[]": {
-      "snippet": "setmathtt{${1:font}}[${2:font features}]"
-    },
-    "setmathtt[]{}[]": {
-      "snippet": "setmathtt[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "setboldmathrm{}": {
-      "snippet": "setboldmathrm{${1:font}}"
-    },
-    "setboldmathrm[]{}": {
-      "snippet": "setboldmathrm[${2:font features}]{${1:font}}"
-    },
-    "setboldmathrm{}[]": {
-      "snippet": "setboldmathrm{${1:font}}[${2:font features}]"
-    },
-    "setboldmathrm[]{}[]": {
-      "snippet": "setboldmathrm[${2:font features}]{${1:font}}[${3:font features}]"
-    },
-    "defaultfontfeatures{}": {
-      "snippet": "defaultfontfeatures{${1:font features}}"
-    },
-    "defaultfontfeatures[]{}": {
-      "snippet": "defaultfontfeatures[${2:font name list}]{${1:font features}}"
-    },
-    "IfFontFeatureActiveTF{}{}{}": {
-      "snippet": "IfFontFeatureActiveTF{${1:font feature}}{${2:true}}{${3:false}}"
-    },
-    "addfontfeatures{}": {
-      "snippet": "addfontfeatures{${1:font features}}"
-    },
-    "addfontfeature{}": {
-      "snippet": "addfontfeature{${1:font features}}"
-    },
-    "EncodingCommand{}[][]{}": {
-      "snippet": "EncodingCommand{${1:cmd}}[${2:num}][${3:default}]{${4:code}}"
-    },
-    "EncodingAccent{}{}": {
-      "snippet": "EncodingAccent{${1:cmd}}{${2:code}}"
-    },
-    "EncodingSymbol{}{}": {
-      "snippet": "EncodingSymbol{${1:cmd}}{${2:code}}"
-    },
-    "EncodingComposite{}{}{}": {
-      "snippet": "EncodingComposite{${1:cmd}}{${2:letter}}{${3:slot}}"
-    },
-    "EncodingCompositeCommand(){}{}": {
-      "snippet": "EncodingCompositeCommand(${3:cmd}){${1:letter}}{${2:code}}"
-    },
-    "UndeclareSymbol{}": {
-      "snippet": "UndeclareSymbol{${1:cmd}}"
-    },
-    "UndeclareAccent{}": {
-      "snippet": "UndeclareAccent{${1:cmd}}"
-    },
-    "UndeclareCommand{}": {
-      "snippet": "UndeclareCommand{${1:cmd}}"
-    },
-    "UndeclareComposite{}{}": {
-      "snippet": "UndeclareComposite{${1:cmd}}{${2:letter}}"
-    },
-    "newAATfeature{}{}{}{}": {
-      "snippet": "newAATfeature{${1:feature}}{${2:option}}{${3:feature code}}{${4:selector code}}"
-    },
-    "newopentypefeature{}{}{}": {
-      "snippet": "newopentypefeature{${1:feature}}{${2:option}}{${3:feature tag}}"
-    },
-    "newfontfeature{}{}": {
-      "snippet": "newfontfeature{${1:name}}{${2:input string}}"
-    },
-    "newfontscript{}{}": {
-      "snippet": "newfontscript{${1:fontspec name}}{${2:OpenType tag list}}"
-    },
-    "newfontlanguage{}{}": {
-      "snippet": "newfontlanguage{${1:fontspec name}}{${2:OpenType tag list}}"
-    },
-    "aliasfontfeature{}{}": {
-      "snippet": "aliasfontfeature{${1:existing name}}{${2:new name}}"
-    },
-    "aliasfontfeatureoption{}{}{}": {
-      "snippet": "aliasfontfeatureoption{${1:font feature}}{${2:existing name}}{${3:new name}}"
-    },
-    "cyrillicencoding": {},
-    "latinencoding": {},
-    "UTFencname": {},
-    "emfontdeclare{}": {
-      "snippet": "emfontdeclare{${1:font-switching list}}"
-    },
-    "FontspecSetCheckBoolFalse": {},
-    "FontspecSetCheckBoolTrue": {},
-    "scitdefault": {},
-    "scsldefault": {},
-    "scswdefault": {},
-    "UnicodeEncodingName": {},
-    "UnicodeFontTeXLigatures": {},
-    "UnicodeFontFile{}{}": {
-      "snippet": "UnicodeFontFile{${1:arg1}}{${2:arg2}}"
-    },
-    "UnicodeFontName{}{}": {
-      "snippet": "UnicodeFontName{${1:arg1}}{${2:arg2}}"
-    },
-    "DeclareUnicodeAccent{}{}{}": {
-      "snippet": "DeclareUnicodeAccent{${1:cmd}}{${2:encoding}}{${3:char code}}"
-    },
-    "DeclareUnicodeCommand{}{}": {
-      "snippet": "DeclareUnicodeCommand{${1:command}}{${2:slot}}"
-    },
-    "DeclareUnicodeComposite{}{}{}": {
-      "snippet": "DeclareUnicodeComposite{${1:cmd}}{${2:letter}}{${3:definition}}"
-    },
-    "DeclareUnicodeSymbol{}{}": {
-      "snippet": "DeclareUnicodeSymbol{${1:command}}{${2:definition}}"
-    },
-    "textquotedbl": {},
-    "guillemetleft": {},
-    "guillemotleft": {},
-    "guillemetright": {},
-    "guillemotright": {},
-    "DH": {},
-    "TH": {},
-    "dh": {},
-    "th": {},
-    "DJ": {},
-    "dj": {},
-    "NG": {},
-    "ng": {},
-    "quotesinglbase": {},
-    "quotedblbase": {},
-    "guilsinglleft": {},
-    "guilsinglright": {},
-    "Hwithstroke": {},
-    "hwithstroke": {},
-    "k{}": {
-      "snippet": "k{${1:arg}}"
-    }
-  },
-  "envs": {
-    "strongenv": {}
-  },
-  "options": [
-    "math",
-    "no-math",
-    "config",
-    "no-config",
-    "quiet",
-    "silent",
-    "verbose"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/fonttable.json b/dev/packages/fonttable.json
deleted file mode 100644
index a2bec2bd2..000000000
--- a/dev/packages/fonttable.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "fnthours": {},
-    "fonttable{}": {
-      "snippet": "fonttable{${1:test font}}"
-    },
-    "xfonttable{}{}{}{}": {
-      "snippet": "xfonttable{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
-    },
-    "pikfont{}{}{}{}": {
-      "snippet": "pikfont{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
-    },
-    "fontrange{}{}": {
-      "snippet": "fontrange{${1:low}}{${2:high}}"
-    },
-    "decimals": {},
-    "nodecimals": {},
-    "hexoct": {},
-    "nohexoct": {},
-    "ftablewidth": {},
-    "fntcolwidth": {},
-    "fonttext{}": {
-      "snippet": "fonttext{${1:test font}}"
-    },
-    "simpletext": {},
-    "fulltext": {},
-    "regulartext{}": {
-      "snippet": "regulartext{${1:font spec}}"
-    },
-    "fonttexts{}{}": {
-      "snippet": "fonttexts{${1:test font}}{${2:text}}"
-    },
-    "regulartexts{}{}": {
-      "snippet": "regulartexts{${1:font spec}}{${2:text}}"
-    },
-    "germanparatext": {},
-    "latinparatext": {},
-    "aztext": {},
-    "AZtext": {},
-    "digitstext": {},
-    "punctext": {},
-    "glyphmixture{}{}{}": {
-      "snippet": "glyphmixture{${1:test glyph}}{${2:start glyph}}{${3:end glyph}}"
-    },
-    "glyphalternation{}{}{}": {
-      "snippet": "glyphalternation{${1:test glyph}}{${2:start glyph}}{${3:end glyph}}"
-    },
-    "glyphseries{}{}{}": {
-      "snippet": "glyphseries{${1:test glyph}}{${2:start glyph}}{${3:end glyph}}"
-    },
-    "glyphalphabet{}": {
-      "snippet": "glyphalphabet{${1:test glyph}}"
-    },
-    "GLYPHALPHABET{}": {
-      "snippet": "GLYPHALPHABET{${1:test glyph}}"
-    },
-    "glyphlowers": {},
-    "glyphuppers": {},
-    "glyphdigits": {},
-    "glyphpunct": {},
-    "sevenrm": {},
-    "ifhexoct": {},
-    "ftable": {},
-    "knutext": {},
-    "moreknutext": {},
-    "capknutext": {},
-    "knunames": {},
-    "guillemotleft": {},
-    "guillemotright": {},
-    "flqq": {},
-    "frqq": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/fontwrap.json b/dev/packages/fontwrap.json
index 0ef4e5755..778c0fcfe 100644
--- a/dev/packages/fontwrap.json
+++ b/dev/packages/fontwrap.json
@@ -20,10 +20,10 @@
       "snippet": "fontwrap{${1:text}}"
     },
     "setfontwrapallowedmacros{}": {
-      "snippet": "setfontwrapallowedmacros{${1:csname1,${2:csname2},...}}"
+      "snippet": "setfontwrapallowedmacros{${1:csname1,csname2,...}}"
     },
     "setfontwrapallowedenvironments{}": {
-      "snippet": "setfontwrapallowedenvironments{${1:envname1,${2:envname2},...}}"
+      "snippet": "setfontwrapallowedenvironments{${1:envname1,envname2,...}}"
     },
     "autfontunicodedata": {},
     "fontwrapallowedenvironments": {},
diff --git a/dev/packages/footnote.json b/dev/packages/footnote.json
deleted file mode 100644
index 1d2a9ca4b..000000000
--- a/dev/packages/footnote.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "savenotes": {},
-    "spewnotes": {},
-    "makesavenoteenv{}": {
-      "snippet": "makesavenoteenv{${1:environment}}"
-    },
-    "makesavenoteenv[]{}": {
-      "snippet": "makesavenoteenv[${2:new_envname}]{${1:environment}}"
-    }
-  },
-  "envs": {
-    "savenotes": {},
-    "minipage*{}": {
-      "name": "minipage*",
-      "snippet": "{${1:width}}"
-    },
-    "minipage*[]{}": {
-      "name": "minipage*",
-      "snippet": "[${2:position}]{${1:width}}"
-    },
-    "minipage*[][][]{}": {
-      "name": "minipage*",
-      "snippet": "[${2:position}][${3:height}][${4:inner-pos}]{${1:width}}"
-    },
-    "footnote": {},
-    "footnote[]": {
-      "name": "footnote",
-      "snippet": "[${1:number}]"
-    },
-    "footnotetext": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/forest-index.json b/dev/packages/forest-index.json
index 8903a8ae7..66ce2b4d4 100644
--- a/dev/packages/forest-index.json
+++ b/dev/packages/forest-index.json
@@ -6,12 +6,6 @@
     "index[]{}": {
       "snippet": "index[${2:index options}]{${1:content}}"
     },
-    "index(){}": {
-      "snippet": "index(${2:early options}){${1:content}}"
-    },
-    "index()[]{}": {
-      "snippet": "index(${3:early options})[${2:index options}]{${1:content}}"
-    },
     "indexdef{}": {
       "snippet": "indexdef{${1:option>content}}"
     },
@@ -24,9 +18,6 @@
     "indexitem{}": {
       "snippet": "indexitem{${1:option>content}}"
     },
-    "indexitem(){}": {
-      "snippet": "indexitem(${2:default}){${1:option>content}}"
-    },
     "indexset[]>{}": {
       "snippet": "indexset[${2:index options}]>{${1:entry}}"
     },
diff --git a/dev/packages/forest.json b/dev/packages/forest.json
index 7c4bc4990..d15a3b8d2 100644
--- a/dev/packages/forest.json
+++ b/dev/packages/forest.json
@@ -23,15 +23,9 @@
     "Forest{}": {
       "snippet": "Forest{${1:tree}}"
     },
-    "Forest(){}": {
-      "snippet": "Forest(${2:config}){${1:tree}}"
-    },
     "Forest*{}": {
       "snippet": "Forest*{${1:tree}}"
     },
-    "Forest*(){}": {
-      "snippet": "Forest*(${2:config}){${1:tree}}"
-    },
     "forestset{}": {
       "snippet": "forestset{${1:specs}}"
     },
@@ -123,12 +117,6 @@
     "forestdebugtempfalse": {},
     "forestdebugtemptrue": {},
     "forestdebugtrue": {},
-    "forestdebugtypeouttree()": {
-      "snippet": "forestdebugtypeouttree(${1:arg})"
-    },
-    "forestdebugtypeouttree()[]": {
-      "snippet": "forestdebugtypeouttree(${2:arg})[${1:opt}]"
-    },
     "forestdebugtypeouttreenodeinfo": {},
     "forestdebugtypeouttrees": {},
     "forestdebugtypeouttrees[]": {
diff --git a/dev/packages/forloop.json b/dev/packages/forloop.json
deleted file mode 100644
index 754c01bc0..000000000
--- a/dev/packages/forloop.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "includes": {
-    "ifthen": []
-  },
-  "macros": {
-    "forloop{}{}{}{}": {
-      "snippet": "forloop{${1:counter}}{${2:initial value}}{${3:condition}}{${4:code}}"
-    },
-    "forloop[]{}{}{}{}": {
-      "snippet": "forloop[${5:step}]{${1:counter}}{${2:initial value}}{${3:condition}}{${4:code}}"
-    },
-    "forLoop{}{}{}{}": {
-      "snippet": "forLoop{${1:start}}{${2:stop}}{${3:counter}}{${4:code}}"
-    },
-    "forLoop[]{}{}{}{}": {
-      "snippet": "forLoop[${5:step}]{${1:start}}{${2:stop}}{${3:counter}}{${4:code}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/forms16be.json b/dev/packages/forms16be.json
index cf7229f22..937689d1d 100644
--- a/dev/packages/forms16be.json
+++ b/dev/packages/forms16be.json
@@ -4,18 +4,12 @@
     "defUniStr{}{}": {
       "snippet": "defUniStr{${1:name}}{${2:string}}"
     },
-    "unicodeStr()": {
-      "snippet": "unicodeStr(${1:name})"
-    },
     "EURO": {},
     "BSLASH": {},
     "LBRACE": {},
     "RBRACE": {},
     "DQUOTE": {},
     "ucspace": {},
-    "aref()": {
-      "snippet": "aref(${1:arg})"
-    },
     "convertChriiUnicode{}{}": {
       "snippet": "convertChriiUnicode{${1:char}}{${2:codepoint}}"
     },
diff --git a/dev/packages/fp.json b/dev/packages/fp.json
deleted file mode 100644
index 150f569c6..000000000
--- a/dev/packages/fp.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "includes": {
-    "defpattern": [],
-    "fp-basic": [],
-    "fp-addons": [],
-    "fp-snap": [],
-    "fp-exp": [],
-    "fp-trigo": [],
-    "fp-pas": [],
-    "fp-random": [],
-    "fp-eqn": [],
-    "fp-upn": [],
-    "fp-eval": []
-  },
-  "macros": {},
-  "envs": {},
-  "options": [
-    "nomessages",
-    "debug"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/framed.json b/dev/packages/framed.json
deleted file mode 100644
index f30e27c62..000000000
--- a/dev/packages/framed.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "MakeFramed{}": {
-      "snippet": "MakeFramed{${1:settings}}"
-    },
-    "endMakeFramed": {},
-    "FrameCommand": {},
-    "FirstFrameCommand": {},
-    "LastFrameCommand": {},
-    "MidFrameCommand": {},
-    "FrameRestore": {},
-    "FrameRule": {},
-    "FrameSep": {},
-    "FrameHeightAdjust": {},
-    "OuterFrameSep": {},
-    "CustomFBox{}{}{}{}{}{}": {
-      "snippet": "CustomFBox{${1:after-top}}{${2:above-bottom}}{${3:trulewidth}}{${4:brulewidth}}{${5:lrulewidth}}{${6:rrulewidth}}"
-    },
-    "OpenFBox{}{}": {
-      "snippet": "OpenFBox{${1:trulewidth}}{${2:brulewidth}}"
-    },
-    "TitleBarFrame[]{}{}": {
-      "snippet": "TitleBarFrame[${3:marker}]{${1:title}}{${2:contents}}"
-    }
-  },
-  "envs": {
-    "framed": {},
-    "oframed": {},
-    "shaded": {},
-    "shaded*": {},
-    "snugshade": {},
-    "snugshade*": {},
-    "leftbar": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/fullpict.json b/dev/packages/fullpict.json
index 1eb1e78de..a033e9c8f 100644
--- a/dev/packages/fullpict.json
+++ b/dev/packages/fullpict.json
@@ -43,94 +43,9 @@
     "origin{}": {
       "snippet": "origin{${1:size}}"
     },
-    "cput(){}": {
-      "snippet": "cput(${2:x},${3:y}){${1:text}}"
-    },
-    "nput(){}": {
-      "snippet": "nput(${2:x},${3:y}){${1:text}}"
-    },
-    "sput(){}": {
-      "snippet": "sput(${2:x},${3:y}){${1:text}}"
-    },
-    "eput(){}": {
-      "snippet": "eput(${2:x},${3:y}){${1:text}}"
-    },
-    "wput(){}": {
-      "snippet": "wput(${2:x},${3:y}){${1:text}}"
-    },
-    "neput(){}": {
-      "snippet": "neput(${2:x},${3:y}){${1:text}}"
-    },
-    "seput(){}": {
-      "snippet": "seput(${2:x},${3:y}){${1:text}}"
-    },
-    "nwput(){}": {
-      "snippet": "nwput(${2:x},${3:y}){${1:text}}"
-    },
-    "swput(){}": {
-      "snippet": "swput(${2:x},${3:y}){${1:text}}"
-    },
-    "angleput{}(){}": {
-      "snippet": "angleput{${1:angle}}(${3:x},${4:y}){${2:text}}"
-    },
-    "angleput{}[](){}": {
-      "snippet": "angleput{${1:angle}}[${2:radius}](${4:x},${5:y}){${3:text}}"
-    },
-    "Vector(){}": {
-      "snippet": "Vector(${2:x},${3:y}){${1:length}}"
-    },
     "lcm": {}
   },
-  "envs": {
-    "fullpicture(width,height)": {
-      "name": "fullpicture",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "fullpicture(width,height)(xoffset,yoffset)": {
-      "name": "fullpicture",
-      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
-    },
-    "halfpicture(width,height)": {
-      "name": "halfpicture",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "halfpicture(width,height)(xoffset,yoffset)": {
-      "name": "halfpicture",
-      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
-    },
-    "scalepicture{}(width,height)": {
-      "name": "scalepicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})"
-    },
-    "scalepicture{}(width,height)(xoffset,yoffset)": {
-      "name": "scalepicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
-    },
-    "Scalepicture{}(width,height)": {
-      "name": "Scalepicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})"
-    },
-    "Scalepicture{}(width,height)(xoffset,yoffset)": {
-      "name": "Scalepicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
-    },
-    "scaledpicture{}(width,height)": {
-      "name": "scaledpicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})"
-    },
-    "scaledpicture{}(width,height)(xoffset,yoffset)": {
-      "name": "scaledpicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
-    },
-    "Scaledpicture{}(width,height)": {
-      "name": "Scaledpicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})"
-    },
-    "Scaledpicture{}(width,height)(xoffset,yoffset)": {
-      "name": "Scaledpicture",
-      "snippet": "{${1:percent}}(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
-    }
-  },
+  "envs": {},
   "options": [],
   "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/functional.json b/dev/packages/functional.json
deleted file mode 100644
index e35a030cd..000000000
--- a/dev/packages/functional.json
+++ /dev/null
@@ -1,1186 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "IgnoreSpacesOn": {},
-    "IgnoreSpacesOff": {},
-    "Functional{}": {
-      "snippet": "Functional{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "prgNewFunction{}{}{}": {
-      "snippet": "prgNewFunction{${1:cmd}}{${2:xargs}}{${3:def}}"
-    },
-    "prgSetEqFunction{}": {
-      "snippet": "prgSetEqFunction{${1:cmd}}"
-    },
-    "prgNewConditional{}{}{}": {
-      "snippet": "prgNewConditional{${1:cmd}}{${2:xargs}}{${3:def}}"
-    },
-    "prgReturn{}": {
-      "snippet": "prgReturn{${1:tokens}}"
-    },
-    "prgPrint{}": {
-      "snippet": "prgPrint{${1:tokens}}"
-    },
-    "gResultTl": {},
-    "prgDo{}": {
-      "snippet": "prgDo{${1:code}}"
-    },
-    "prgRunOneArgCode{}{}": {
-      "snippet": "prgRunOneArgCode{${1:arg1}}{${2:code}}"
-    },
-    "prgRunTwoArgCode{}{}{}": {
-      "snippet": "prgRunTwoArgCode{${1:arg1}}{${2:arg2}}{${3:code}}"
-    },
-    "prgRunThreeArgCode{}{}{}{}": {
-      "snippet": "prgRunThreeArgCode{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:code}}"
-    },
-    "prgRunFourArgCode{}{}{}{}{}": {
-      "snippet": "prgRunFourArgCode{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:code}}"
-    },
-    "evalWhole{}": {
-      "snippet": "evalWhole{${1:tokens}}"
-    },
-    "evalNone{}": {
-      "snippet": "evalNone{${1:tokens}}"
-    },
-    "expName{}": {
-      "snippet": "expName{${1:csname}}"
-    },
-    "expWhole{}": {
-      "snippet": "expWhole{${1:tokens}}"
-    },
-    "unExpand{}": {
-      "snippet": "unExpand{${1:tokens}}"
-    },
-    "onlyName{}": {
-      "snippet": "onlyName{${1:tokens}}"
-    },
-    "onlyValue{}": {
-      "snippet": "onlyValue{${1:tokens}}"
-    },
-    "useOne{}": {
-      "snippet": "useOne{${1:arg}}"
-    },
-    "gobbleOne{}": {
-      "snippet": "gobbleOne{${1:arg}}"
-    },
-    "useGobble{}{}": {
-      "snippet": "useGobble{${1:arg1}}{${2:arg2}}"
-    },
-    "gobbleUse{}{}": {
-      "snippet": "gobbleUse{${1:arg1}}{${2:arg2}}"
-    },
-    "cTrueBool": {},
-    "cFalseBool": {},
-    "lTmpaBool": {},
-    "lTmpbBool": {},
-    "lTmpcBool": {},
-    "lTmpiBool": {},
-    "lTmpjBool": {},
-    "lTmpkBool": {},
-    "gTmpaBool": {},
-    "gTmpbBool": {},
-    "gTmpcBool": {},
-    "gTmpiBool": {},
-    "gTmpjBool": {},
-    "gTmpkBool": {},
-    "boolNew{}": {
-      "snippet": "boolNew{${1:cmd}}"
-    },
-    "boolConst{}": {
-      "snippet": "boolConst{${1:cmd}}"
-    },
-    "boolSet{}": {
-      "snippet": "boolSet{${1:cmd}}"
-    },
-    "boolLog {}": {
-      "snippet": "boolLog {${1:bool expr}}"
-    },
-    "boolShow {}": {
-      "snippet": "boolShow {${1:bool expr}}"
-    },
-    "cSpaceTl": {},
-    "cEmptyTl": {},
-    "lTmpaTl": {},
-    "lTmpbTl": {},
-    "lTmpcTl": {},
-    "lTmpiTl": {},
-    "lTmpjTl": {},
-    "lTmpkTl": {},
-    "gTmpaTl": {},
-    "gTmpbTl": {},
-    "gTmpcTl": {},
-    "gTmpiTl": {},
-    "gTmpjTl": {},
-    "gTmpkTl": {},
-    "tlNew{}": {
-      "snippet": "tlNew{${1:cmd}}"
-    },
-    "tlConst{}{}": {
-      "snippet": "tlConst{${1:cmd}}{${2:def}}"
-    },
-    "tlToStr {}": {
-      "snippet": "tlToStr {${1:tokens}}"
-    },
-    "tlToStr{}": {
-      "snippet": "tlToStr{${1:tokens}}"
-    },
-    "tlLog {}": {
-      "snippet": "tlLog {${1:tokens}}"
-    },
-    "tlLog{}": {
-      "snippet": "tlLog{${1:tokens}}"
-    },
-    "tlShow {}": {
-      "snippet": "tlShow {${1:tokens}}"
-    },
-    "tlShow{}": {
-      "snippet": "tlShow{${1:tokens}}"
-    },
-    "tlSet{}{}": {
-      "snippet": "tlSet{${1:cmd}}{${2:def}}"
-    },
-    "tlSetEq{}": {
-      "snippet": "tlSetEq{${1:cmd}}"
-    },
-    "tlClearNew{}": {
-      "snippet": "tlClearNew{${1:cmd}}"
-    },
-    "tlConcat{}": {
-      "snippet": "tlConcat{${1:cmd}}"
-    },
-    "tlTrimSpaces {}": {
-      "snippet": "tlTrimSpaces {${1:tokens}}"
-    },
-    "tlCount {}": {
-      "snippet": "tlCount {${1:tokens}}"
-    },
-    "tlCount{}": {
-      "snippet": "tlCount{${1:tokens}}"
-    },
-    "tlHead {}": {
-      "snippet": "tlHead {${1:tokens}}"
-    },
-    "tlTail {}": {
-      "snippet": "tlTail {${1:tokens}}"
-    },
-    "tlItem {} {}": {
-      "snippet": "tlItem {${1:tokens}} {${2:int expr}}"
-    },
-    "tlRandItem {}": {
-      "snippet": "tlRandItem {${1:tokens}}"
-    },
-    "tlMapInline {} {}": {
-      "snippet": "tlMapInline {${1:tokens}} {${2:inline function}}"
-    },
-    "tlMapVariable{}{}{}": {
-      "snippet": "tlMapVariable{${1:tokens}}{${2:cmd}}{${3:def}}"
-    },
-    "tlVarMapVariable{}{}{}": {
-      "snippet": "tlVarMapVariable{${1:tlvar}}{${2:cmd}}{${3:def}}"
-    },
-    "tlIfEmpty {}": {
-      "snippet": "tlIfEmpty {${1:tokens}}"
-    },
-    "tlIfEmptyT {} {}": {
-      "snippet": "tlIfEmptyT {${1:tokens}} {${2:true code}}"
-    },
-    "tlIfEmptyF {} {}": {
-      "snippet": "tlIfEmptyF {${1:tokens}} {${2:false code}}"
-    },
-    "tlIfEmptyTF {} {} {}": {
-      "snippet": "tlIfEmptyTF {${1:tokens}} {${2:true code}} {${3:false code}}"
-    },
-    "tlIfBlank {}": {
-      "snippet": "tlIfBlank {${1:tokens}}"
-    },
-    "tlIfBlankT {} {}": {
-      "snippet": "tlIfBlankT {${1:tokens}} {${2:true code}}"
-    },
-    "tlIfBlankF {} {}": {
-      "snippet": "tlIfBlankF {${1:tokens}} {${2:false code}}"
-    },
-    "tlIfBlankTF {} {} {}": {
-      "snippet": "tlIfBlankTF {${1:tokens}} {${2:true code}} {${3:false code}}"
-    },
-    "tlIfEq {} {}": {
-      "snippet": "tlIfEq {${1:tokens1}} {${2:tokens2}}"
-    },
-    "tlIfEqT {} {} {}": {
-      "snippet": "tlIfEqT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
-    },
-    "tlIfEqF {} {} {}": {
-      "snippet": "tlIfEqF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
-    },
-    "tlIfEqTF {} {} {} {}": {
-      "snippet": "tlIfEqTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
-    },
-    "tlIfIn {} {}": {
-      "snippet": "tlIfIn {${1:tokens1}} {${2:tokens2}}"
-    },
-    "tlIfInT {} {} {}": {
-      "snippet": "tlIfInT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
-    },
-    "tlIfInF {} {} {}": {
-      "snippet": "tlIfInF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
-    },
-    "tlIfInTF {} {} {} {}": {
-      "snippet": "tlIfInTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
-    },
-    "tlIfSingle {}": {
-      "snippet": "tlIfSingle {${1:tokens}}"
-    },
-    "tlIfSingleT {} {}": {
-      "snippet": "tlIfSingleT {${1:tokens}} {${2:true code}}"
-    },
-    "tlIfSingleF {} {}": {
-      "snippet": "tlIfSingleF {${1:tokens}} {${2:false code}}"
-    },
-    "tlIfSingleTF {} {} {}": {
-      "snippet": "tlIfSingleTF {${1:tokens}} {${2:true code}} {${3:false code}}"
-    },
-    "cAmpersandStr": {},
-    "cAtsignStr": {},
-    "cBackslashStr": {},
-    "cLeftBraceStr": {},
-    "cRightBraceStr": {},
-    "cCircumflexStr": {},
-    "cColonStr": {},
-    "cDollarStr": {},
-    "cHashStr": {},
-    "cPercentStr": {},
-    "cTildeStr": {},
-    "cUnderscoreStr": {},
-    "cZeroStr": {},
-    "lTmpaStr": {},
-    "lTmpbStr": {},
-    "lTmpcStr": {},
-    "lTmpiStr": {},
-    "lTmpjStr": {},
-    "lTmpkStr": {},
-    "gTmpaStr": {},
-    "gTmpbStr": {},
-    "gTmpcStr": {},
-    "gTmpiStr": {},
-    "gTmpjStr": {},
-    "gTmpkStr": {},
-    "strNew{}": {
-      "snippet": "strNew{${1:cmd}}"
-    },
-    "strConst{}{}": {
-      "snippet": "strConst{${1:cmd}}{${2:def}}"
-    },
-    "strLog {}": {
-      "snippet": "strLog {${1:tokens}}"
-    },
-    "strLog{}": {
-      "snippet": "strLog{${1:tokens}}"
-    },
-    "strShow {}": {
-      "snippet": "strShow {${1:tokens}}"
-    },
-    "strShow{}": {
-      "snippet": "strShow{${1:tokens}}"
-    },
-    "strSet{}{}": {
-      "snippet": "strSet{${1:cmd}}{${2:def}}"
-    },
-    "strClearNew{}": {
-      "snippet": "strClearNew{${1:cmd}}"
-    },
-    "strConcat{}": {
-      "snippet": "strConcat{${1:cmd}}"
-    },
-    "strCount {}": {
-      "snippet": "strCount {${1:tokens}}"
-    },
-    "strCount{}": {
-      "snippet": "strCount{${1:tokens}}"
-    },
-    "strSize {}": {
-      "snippet": "strSize {${1:tokens}}"
-    },
-    "strSize{}": {
-      "snippet": "strSize{${1:tokens}}"
-    },
-    "strHead {}": {
-      "snippet": "strHead {${1:tokens}}"
-    },
-    "strTail {}": {
-      "snippet": "strTail {${1:tokens}}"
-    },
-    "strItem {} {}": {
-      "snippet": "strItem {${1:tokens}} {${2:int expr}}"
-    },
-    "strMapInline {} {}": {
-      "snippet": "strMapInline {${1:tokens}} {${2:inline function}}"
-    },
-    "strMapVariable{}{}{}": {
-      "snippet": "strMapVariable{${1:tokens}}{${2:cmd}}{${3:def}}"
-    },
-    "strVarMapVariable{}{}{}": {
-      "snippet": "strVarMapVariable{${1:strvar}}{${2:cmd}}{${3:def}}"
-    },
-    "strIfEq {} {}": {
-      "snippet": "strIfEq {${1:tokens1}} {${2:tokens2}}"
-    },
-    "strIfEqT {} {} {}": {
-      "snippet": "strIfEqT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
-    },
-    "strIfEqF {} {} {}": {
-      "snippet": "strIfEqF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
-    },
-    "strIfEqTF {} {} {} {}": {
-      "snippet": "strIfEqTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
-    },
-    "strIfIn {} {}": {
-      "snippet": "strIfIn {${1:tokens1}} {${2:tokens2}}"
-    },
-    "strIfInT {} {} {}": {
-      "snippet": "strIfInT {${1:tokens1}} {${2:tokens2}} {${3:true code}}"
-    },
-    "strIfInF {} {} {}": {
-      "snippet": "strIfInF {${1:tokens1}} {${2:tokens2}} {${3:false code}}"
-    },
-    "strIfInTF {} {} {} {}": {
-      "snippet": "strIfInTF {${1:tokens1}} {${2:tokens2}} {${3:true code}} {${4:false code}}"
-    },
-    "cZeroInt": {},
-    "cOneInt": {},
-    "cMaxInt": {},
-    "cMaxRegisterInt": {},
-    "cMaxCharInt": {},
-    "lTmpaInt": {},
-    "lTmpbInt": {},
-    "lTmpcInt": {},
-    "lTmpiInt": {},
-    "lTmpjInt": {},
-    "lTmpkInt": {},
-    "gTmpaInt": {},
-    "gTmpbInt": {},
-    "gTmpcInt": {},
-    "gTmpiInt": {},
-    "gTmpjInt": {},
-    "gTmpkInt": {},
-    "intEval {}": {
-      "snippet": "intEval {${1:int expr}}"
-    },
-    "intMathAdd {} {}": {
-      "snippet": "intMathAdd {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathSub {} {}": {
-      "snippet": "intMathSub {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathMult {} {}": {
-      "snippet": "intMathMult {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathDiv {} {}": {
-      "snippet": "intMathDiv {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathDivTruncate {} {}": {
-      "snippet": "intMathDivTruncate {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathSign {}": {
-      "snippet": "intMathSign {${1:int expr}}"
-    },
-    "intMathAbs {}": {
-      "snippet": "intMathAbs {${1:int expr}}"
-    },
-    "intMathMax {} {}": {
-      "snippet": "intMathMax {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathMin {} {}": {
-      "snippet": "intMathMin {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathMod {} {}": {
-      "snippet": "intMathMod {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intMathRand {} {}": {
-      "snippet": "intMathRand {${1:int expr1}} {${2:int expr2}}"
-    },
-    "intNew{}": {
-      "snippet": "intNew{${1:cmd}}"
-    },
-    "intConst{}": {
-      "snippet": "intConst{${1:cmd}}"
-    },
-    "intLog {}": {
-      "snippet": "intLog {${1:int expr}}"
-    },
-    "intShow {}": {
-      "snippet": "intShow {${1:int expr}}"
-    },
-    "intSet{}": {
-      "snippet": "intSet{${1:cmd}}"
-    },
-    "intSetEq{}": {
-      "snippet": "intSetEq{${1:cmd}}"
-    },
-    "intZeroNew{}": {
-      "snippet": "intZeroNew{${1:cmd}}"
-    },
-    "intReplicate {} {}": {
-      "snippet": "intReplicate {${1:int expr}} {${2:tokens}}"
-    },
-    "intStepInline {} {} {} {}": {
-      "snippet": "intStepInline {${1:init value}} {${2:step}} {${3:final value}} {${4:code}}"
-    },
-    "intStepOneInline {} {} {}": {
-      "snippet": "intStepOneInline {${1:init value}} {${2:final value}} {${3:code}}"
-    },
-    "intStepVariable{}{}{}{}{}": {
-      "snippet": "intStepVariable{${1:init value}}{${2:step}}{${3:final value}}{${4:cmd}}{${5:code}}"
-    },
-    "intStepOneVariable{}{}{}{}": {
-      "snippet": "intStepOneVariable{${1:init value}}{${2:final value}}{${3:cmd}}{${4:code}}"
-    },
-    "intIfOdd {}": {
-      "snippet": "intIfOdd {${1:int expr}}"
-    },
-    "intIfOddT {} {}": {
-      "snippet": "intIfOddT {${1:int expr}} {${2:true code}}"
-    },
-    "intIfOddF {} {}": {
-      "snippet": "intIfOddF {${1:int expr}} {${2:false code}}"
-    },
-    "intIfOddTF {} {} {}": {
-      "snippet": "intIfOddTF {${1:int expr}} {${2:true code}} {${3:false code}}"
-    },
-    "intIfEven {}": {
-      "snippet": "intIfEven {${1:int expr}}"
-    },
-    "intIfEvenT {} {}": {
-      "snippet": "intIfEvenT {${1:int expr}} {${2:true code}}"
-    },
-    "intIfEvenF {} {}": {
-      "snippet": "intIfEvenF {${1:int expr}} {${2:false code}}"
-    },
-    "intIfEvenTF {} {} {}": {
-      "snippet": "intIfEvenTF {${1:int expr}} {${2:true code}} {${3:false code}}"
-    },
-    "cZeroFp": {},
-    "cMinusZeroFp": {},
-    "cOneFp": {},
-    "cInfFp": {},
-    "cMinusInfFp": {},
-    "cEFp": {},
-    "cPiFp": {},
-    "cOneDegreeFp": {},
-    "lTmpaFp": {},
-    "lTmpbFp": {},
-    "lTmpcFp": {},
-    "lTmpiFp": {},
-    "lTmpjFp": {},
-    "lTmpkFp": {},
-    "gTmpaFp": {},
-    "gTmpbFp": {},
-    "gTmpcFp": {},
-    "gTmpiFp": {},
-    "gTmpjFp": {},
-    "gTmpkFp": {},
-    "fpEval {}": {
-      "snippet": "fpEval {${1:fp expr}}"
-    },
-    "fpMathAdd {} {}": {
-      "snippet": "fpMathAdd {${1:fp expr1}} {${2:fp expr2}}"
-    },
-    "fpMathSub {} {}": {
-      "snippet": "fpMathSub {${1:fp expr1}} {${2:fp expr2}}"
-    },
-    "fpMathMult {} {}": {
-      "snippet": "fpMathMult {${1:fp expr1}} {${2:fp expr2}}"
-    },
-    "fpMathDiv {} {}": {
-      "snippet": "fpMathDiv {${1:fp expr1}} {${2:fp expr2}}"
-    },
-    "fpMathSign {}": {
-      "snippet": "fpMathSign {${1:fp expr}}"
-    },
-    "fpMathAbs {}": {
-      "snippet": "fpMathAbs {${1:fp expr}}"
-    },
-    "fpMathMax {} {}": {
-      "snippet": "fpMathMax {${1:fp expr1}} {${2:fp expr2}}"
-    },
-    "fpMathMin {} {}": {
-      "snippet": "fpMathMin {${1:fp expr1}} {${2:fp expr2}}"
-    },
-    "fpNew{}": {
-      "snippet": "fpNew{${1:cmd}}"
-    },
-    "fpConst{}": {
-      "snippet": "fpConst{${1:cmd}}"
-    },
-    "fpLog {}": {
-      "snippet": "fpLog {${1:fp expr}}"
-    },
-    "fpShow {}": {
-      "snippet": "fpShow {${1:fp expr}}"
-    },
-    "fpSet{}": {
-      "snippet": "fpSet{${1:cmd}}"
-    },
-    "fpSetEq{}": {
-      "snippet": "fpSetEq{${1:cmd}}"
-    },
-    "fpZeroNew{}": {
-      "snippet": "fpZeroNew{${1:cmd}}"
-    },
-    "fpStepInline {} {} {} {}": {
-      "snippet": "fpStepInline {${1:init value}} {${2:step}} {${3:final value}} {${4:code}}"
-    },
-    "fpStepVariable{}{}{}{}{}": {
-      "snippet": "fpStepVariable{${1:init value}}{${2:step}}{${3:final value}}{${4:cmd}}{${5:code}}"
-    },
-    "cMaxDim": {},
-    "cZeroDim": {},
-    "lTmpaDim": {},
-    "lTmpbDim": {},
-    "lTmpcDim": {},
-    "lTmpiDim": {},
-    "lTmpjDim": {},
-    "lTmpkDim": {},
-    "gTmpaDim": {},
-    "gTmpbDim": {},
-    "gTmpcDim": {},
-    "gTmpiDim": {},
-    "gTmpjDim": {},
-    "gTmpkDim": {},
-    "dimEval {}": {
-      "snippet": "dimEval {${1:dim expr}}"
-    },
-    "dimMathAdd {} {}": {
-      "snippet": "dimMathAdd {${1:dim expr1}} {${2:dim expr2}}"
-    },
-    "dimMathSub {} {}": {
-      "snippet": "dimMathSub {${1:dim expr1}} {${2:dim expr2}}"
-    },
-    "dimMathRatio {} {}": {
-      "snippet": "dimMathRatio {${1:dim expr1}} {${2:dim expr2}}"
-    },
-    "dimMathSign {}": {
-      "snippet": "dimMathSign {${1:dim expr}}"
-    },
-    "dimMathAbs {}": {
-      "snippet": "dimMathAbs {${1:dim expr}}"
-    },
-    "dimMathMax {} {}": {
-      "snippet": "dimMathMax {${1:dim expr1}} {${2:dim expr2}}"
-    },
-    "dimMathMin {} {}": {
-      "snippet": "dimMathMin {${1:dim expr1}} {${2:dim expr2}}"
-    },
-    "dimNew{}": {
-      "snippet": "dimNew{${1:cmd}}"
-    },
-    "dimConst{}": {
-      "snippet": "dimConst{${1:cmd}}"
-    },
-    "dimLog {}": {
-      "snippet": "dimLog {${1:dim expr}}"
-    },
-    "dimShow {}": {
-      "snippet": "dimShow {${1:dim expr}}"
-    },
-    "dimSet{}": {
-      "snippet": "dimSet{${1:cmd}}"
-    },
-    "dimSetEq{}": {
-      "snippet": "dimSetEq{${1:cmd}}"
-    },
-    "dimZeroNew{}": {
-      "snippet": "dimZeroNew{${1:cmd}}"
-    },
-    "dimStepInline {} {} {} {}": {
-      "snippet": "dimStepInline {${1:init value}} {${2:step}} {${3:final value}} {${4:code}}"
-    },
-    "dimStepVariable{}{}{}{}{}": {
-      "snippet": "dimStepVariable{${1:init value}}{${2:step}}{${3:final value}}{${4:cmd}}{${5:code}}"
-    },
-    "cEmptyClist": {},
-    "lTmpaClist": {},
-    "lTmpbClist": {},
-    "lTmpcClist": {},
-    "lTmpiClist": {},
-    "lTmpjClist": {},
-    "lTmpkClist": {},
-    "gTmpaClist": {},
-    "gTmpbClist": {},
-    "gTmpcClist": {},
-    "gTmpiClist": {},
-    "gTmpjClist": {},
-    "gTmpkClist": {},
-    "clistNew{}": {
-      "snippet": "clistNew{${1:cmd}}"
-    },
-    "clistConst{}": {
-      "snippet": "clistConst{${1:cmd}}"
-    },
-    "clistJoin {} {}": {
-      "snippet": "clistJoin {${1:comma list}} {${2:separator}}"
-    },
-    "clistJoinExtended {} {} {} {}": {
-      "snippet": "clistJoinExtended {${1:comma list}} {${2:sep for 2}} {${3:sep for >2}} {${4:sep for final 2}}"
-    },
-    "clistLog {}": {
-      "snippet": "clistLog {${1:comma list}}"
-    },
-    "clistShow {}": {
-      "snippet": "clistShow {${1:comma list}}"
-    },
-    "clistSet{}": {
-      "snippet": "clistSet{${1:cmd}}"
-    },
-    "clistSetEq{}": {
-      "snippet": "clistSetEq{${1:cmd}}"
-    },
-    "clistSetFromSeq{}{}": {
-      "snippet": "clistSetFromSeq{${1:cmd}}{${2:arg}}"
-    },
-    "clistClearNew{}": {
-      "snippet": "clistClearNew{${1:cmd}}"
-    },
-    "clistCount {}": {
-      "snippet": "clistCount {${1:comma list}}"
-    },
-    "clistItem {} {}": {
-      "snippet": "clistItem {${1:comma list}} {${2:int expr}}"
-    },
-    "clistRandItem {}": {
-      "snippet": "clistRandItem {${1:comma list}}"
-    },
-    "clistGet{}{}": {
-      "snippet": "clistGet{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistGetT{}{}": {
-      "snippet": "clistGetT{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistGetF{}{}": {
-      "snippet": "clistGetF{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistGetTF{}{}": {
-      "snippet": "clistGetTF{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistPop{}{}": {
-      "snippet": "clistPop{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistPopT{}{}": {
-      "snippet": "clistPopT{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistPopF{}{}": {
-      "snippet": "clistPopF{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistPopTF{}{}": {
-      "snippet": "clistPopTF{${1:clistvar}}{${2:cmd}}"
-    },
-    "clistMapInline {} {}": {
-      "snippet": "clistMapInline {${1:comma list}} {${2:inline function}}"
-    },
-    "clistMapVariable{}{}{}": {
-      "snippet": "clistMapVariable{${1:comma list}}{${2:cmd}}{${3:def}}"
-    },
-    "clistVarMapVariable{}{}{}": {
-      "snippet": "clistVarMapVariable{${1:clistvar}}{${2:cmd}}{${3:def}}"
-    },
-    "clistIfEmpty {}": {
-      "snippet": "clistIfEmpty {${1:comma list}}"
-    },
-    "clistIfEmptyT {} {}": {
-      "snippet": "clistIfEmptyT {${1:comma list}} {${2:true code}}"
-    },
-    "clistIfEmptyF {} {}": {
-      "snippet": "clistIfEmptyF {${1:comma list}} {${2:false code}}"
-    },
-    "clistIfEmptyTF {} {} {}": {
-      "snippet": "clistIfEmptyTF {${1:comma list}} {${2:true code}} {${3:false code}}"
-    },
-    "clistIfIn {} {}": {
-      "snippet": "clistIfIn {${1:comma list}} {${2:item}}"
-    },
-    "clistIfInT {} {} {}": {
-      "snippet": "clistIfInT {${1:comma list}} {${2:item}} {${3:true code}}"
-    },
-    "clistIfInF {} {} {}": {
-      "snippet": "clistIfInF {${1:comma list}} {${2:item}} {${3:false code}}"
-    },
-    "clistIfInTF {} {} {} {}": {
-      "snippet": "clistIfInTF {${1:comma list}} {${2:item}} {${3:true code}} {${4:false code}}"
-    },
-    "cEmptySeq": {},
-    "lTmpaSeq": {},
-    "lTmpbSeq": {},
-    "lTmpcSeq": {},
-    "lTmpiSeq": {},
-    "lTmpjSeq": {},
-    "lTmpkSeq": {},
-    "gTmpaSeq": {},
-    "gTmpbSeq": {},
-    "gTmpcSeq": {},
-    "gTmpiSeq": {},
-    "gTmpjSeq": {},
-    "gTmpkSeq": {},
-    "seqNew{}": {
-      "snippet": "seqNew{${1:cmd}}"
-    },
-    "seqConstFromClist{}": {
-      "snippet": "seqConstFromClist{${1:cmd}}"
-    },
-    "seqSetFromClist{}": {
-      "snippet": "seqSetFromClist{${1:cmd}}"
-    },
-    "seqSetSplit{}": {
-      "snippet": "seqSetSplit{${1:cmd}}"
-    },
-    "seqSetEq{}": {
-      "snippet": "seqSetEq{${1:cmd}}"
-    },
-    "seqClearNew{}": {
-      "snippet": "seqClearNew{${1:cmd}}"
-    },
-    "seqVarMapVariable{}{}{}": {
-      "snippet": "seqVarMapVariable{${1:seqvar}}{${2:cmd}}{${3:def}}"
-    },
-    "cEmptyProp": {},
-    "lTmpaProp": {},
-    "lTmpbProp": {},
-    "lTmpcProp": {},
-    "lTmpiProp": {},
-    "lTmpjProp": {},
-    "lTmpkProp": {},
-    "gTmpaProp": {},
-    "gTmpbProp": {},
-    "gTmpcProp": {},
-    "gTmpiProp": {},
-    "gTmpjProp": {},
-    "gTmpkProp": {},
-    "propNew{}": {
-      "snippet": "propNew{${1:cmd}}"
-    },
-    "propConstFromKeyval{}": {
-      "snippet": "propConstFromKeyval{${1:cmd}}"
-    },
-    "propSetFromKeyval{}": {
-      "snippet": "propSetFromKeyval{${1:cmd}}"
-    },
-    "propSetEq{}": {
-      "snippet": "propSetEq{${1:cmd}}"
-    },
-    "propClearNew{}": {
-      "snippet": "propClearNew{${1:cmd}}"
-    },
-    "propGet{}{}{}": {
-      "snippet": "propGet{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "propGetT{}{}{}": {
-      "snippet": "propGetT{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "propGetF{}{}{}": {
-      "snippet": "propGetF{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "propGetTF{}{}{}": {
-      "snippet": "propGetTF{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "propPop{}{}{}": {
-      "snippet": "propPop{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "propPopT{}{}{}": {
-      "snippet": "propPopT{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "propPopF{}{}{}": {
-      "snippet": "propPopF{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "propPopTF{}{}{}": {
-      "snippet": "propPopTF{${1:propvar}}{${2:key}}{${3:cmd}}"
-    },
-    "lTmpaRegex": {},
-    "lTmpbRegex": {},
-    "lTmpcRegex": {},
-    "lTmpiRegex": {},
-    "lTmpjRegex": {},
-    "lTmpkRegex": {},
-    "gTmpaRegex": {},
-    "gTmpbRegex": {},
-    "gTmpcRegex": {},
-    "gTmpiRegex": {},
-    "gTmpjRegex": {},
-    "gTmpkRegex": {},
-    "regex{}": {
-      "snippet": "regex{${1:cmd}}"
-    },
-    "regexSet{}{}": {
-      "snippet": "regexSet{${1:cmd}}{${2:def}}"
-    },
-    "regexConst{}{}": {
-      "snippet": "regexConst{${1:cmd}}{${2:def}}"
-    },
-    "regexLog {}": {
-      "snippet": "regexLog {${1:regex}}"
-    },
-    "regexShow {}": {
-      "snippet": "regexShow {${1:regex}}"
-    },
-    "regexMatch {} {}": {
-      "snippet": "regexMatch {${1:regex}} {${2:tokens}}"
-    },
-    "regexMatchT {} {} {}": {
-      "snippet": "regexMatchT {${1:regex}} {${2:tokens}} {${3:true code}}"
-    },
-    "regexMatchF {} {} {}": {
-      "snippet": "regexMatchF {${1:regex}} {${2:tokens}} {${3:false code}}"
-    },
-    "regexMatchTF {} {} {} {}": {
-      "snippet": "regexMatchTF {${1:regex}} {${2:tokens}} {${3:true code}} {${4:false code}}"
-    },
-    "regexExtractOnce{}{}{}": {
-      "snippet": "regexExtractOnce{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexExtractOnceT{}{}{}": {
-      "snippet": "regexExtractOnceT{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexExtractOnceF{}{}{}": {
-      "snippet": "regexExtractOnceF{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexExtractOnceTF{}{}{}": {
-      "snippet": "regexExtractOnceTF{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractOnce{}{}{}": {
-      "snippet": "regexVarExtractOnce{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractOnceT{}{}{}": {
-      "snippet": "regexVarExtractOnceT{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractOnceF{}{}{}": {
-      "snippet": "regexVarExtractOnceF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractOnceTF{}{}{}": {
-      "snippet": "regexVarExtractOnceTF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexExtractAll{}{}{}": {
-      "snippet": "regexExtractAll{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexExtractAllT{}{}{}": {
-      "snippet": "regexExtractAllT{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexExtractAllF{}{}{}": {
-      "snippet": "regexExtractAllF{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexExtractAllTF{}{}{}": {
-      "snippet": "regexExtractAllTF{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractAll{}{}{}": {
-      "snippet": "regexVarExtractAll{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractAllT{}{}{}": {
-      "snippet": "regexVarExtractAllT{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractAllF{}{}{}": {
-      "snippet": "regexVarExtractAllF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarExtractAllTF{}{}{}": {
-      "snippet": "regexVarExtractAllTF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexSplit{}{}{}": {
-      "snippet": "regexSplit{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexSplitT{}{}{}": {
-      "snippet": "regexSplitT{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexSplitF{}{}{}": {
-      "snippet": "regexSplitF{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexSplitTF{}{}{}": {
-      "snippet": "regexSplitTF{${1:regex}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarSplit{}{}{}": {
-      "snippet": "regexVarSplit{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarSplitT{}{}{}": {
-      "snippet": "regexVarSplitT{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarSplitF{}{}{}": {
-      "snippet": "regexVarSplitF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "regexVarSplitTF{}{}{}": {
-      "snippet": "regexVarSplitTF{${1:regexvar}}{${2:tokens}}{${3:cmd}}"
-    },
-    "x{}": {
-      "snippet": "x{${1:hh}}"
-    },
-    "a": {
-      "detail": "𝑎",
-      "documentation": "MATHEMATICAL ITALIC SMALL A"
-    },
-    "e": {
-      "detail": "𝑒",
-      "documentation": "MATHEMATICAL ITALIC SMALL E"
-    },
-    "f": {
-      "detail": "𝑓",
-      "documentation": "MATHEMATICAL ITALIC SMALL F"
-    },
-    "n": {
-      "detail": "𝑛",
-      "documentation": "MATHEMATICAL ITALIC SMALL N"
-    },
-    "r": {
-      "detail": "𝑟",
-      "documentation": "MATHEMATICAL ITALIC SMALL R"
-    },
-    "t": {
-      "detail": "𝑡",
-      "documentation": "MATHEMATICAL ITALIC SMALL T"
-    },
-    "d": {
-      "detail": "𝑑",
-      "documentation": "MATHEMATICAL ITALIC SMALL D"
-    },
-    "h": {
-      "detail": "h",
-      "documentation": "LATIN SMALL LETTER H"
-    },
-    "s": {
-      "detail": "𝑠",
-      "documentation": "MATHEMATICAL ITALIC SMALL S"
-    },
-    "v": {
-      "detail": "𝑣",
-      "documentation": "MATHEMATICAL ITALIC SMALL V"
-    },
-    "w": {
-      "detail": "𝑤",
-      "documentation": "MATHEMATICAL ITALIC SMALL W"
-    },
-    "D": {
-      "detail": "𝐷",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL D"
-    },
-    "H": {
-      "detail": "𝐻",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL H"
-    },
-    "N": {
-      "detail": "𝑁",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL N"
-    },
-    "S": {
-      "detail": "𝑆",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL S"
-    },
-    "V": {
-      "detail": "𝑉",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL V"
-    },
-    "W": {
-      "detail": "𝑊",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL W"
-    },
-    "K": {
-      "detail": "𝐾",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL K"
-    },
-    "c{}": {
-      "snippet": "c{${1:regex}}"
-    },
-    "cC": {},
-    "cB": {},
-    "cE": {},
-    "cM": {},
-    "cT": {},
-    "cP": {},
-    "cU": {},
-    "cD": {},
-    "cS": {},
-    "cL": {},
-    "cO": {},
-    "cA": {},
-    "u{}": {
-      "snippet": "u{${1:var name}}"
-    },
-    "ur{}": {
-      "snippet": "ur{${1:var name}}"
-    },
-    "b": {
-      "detail": "𝑏",
-      "documentation": "MATHEMATICAL ITALIC SMALL B"
-    },
-    "B": {
-      "detail": "𝐵",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL B"
-    },
-    "A": {
-      "detail": "𝐴",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
-    },
-    "Z": {
-      "detail": "𝑍",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL Z"
-    },
-    "z": {
-      "detail": "𝑧",
-      "documentation": "MATHEMATICAL ITALIC SMALL Z"
-    },
-    "G": {
-      "detail": "𝐺",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL G"
-    },
-    "charSetLccode {} {}": {
-      "snippet": "charSetLccode {${1:int expr1}} {${2:int expr2}}"
-    },
-    "charSetUccode {} {}": {
-      "snippet": "charSetUccode {${1:int expr1}} {${2:int expr2}}"
-    },
-    "charValueLccode {}": {
-      "snippet": "charValueLccode {${1:int expr}}"
-    },
-    "charValueUccode {}": {
-      "snippet": "charValueUccode {${1:int expr}}"
-    },
-    "textExpand {}": {
-      "snippet": "textExpand {${1:text}}"
-    },
-    "textLowercase {}": {
-      "snippet": "textLowercase {${1:text}}"
-    },
-    "textUppercase {}": {
-      "snippet": "textUppercase {${1:text}}"
-    },
-    "textTitlecase {}": {
-      "snippet": "textTitlecase {${1:text}}"
-    },
-    "textTitlecaseFirst {}": {
-      "snippet": "textTitlecaseFirst {${1:text}}"
-    },
-    "textLangLowercase {} {}": {
-      "snippet": "textLangLowercase {${1:language}} {${2:text}}"
-    },
-    "textLangUppercase {} {}": {
-      "snippet": "textLangUppercase {${1:language}} {${2:text}}"
-    },
-    "textLangTitlecase {} {}": {
-      "snippet": "textLangTitlecase {${1:language}} {${2:text}}"
-    },
-    "textLangTitlecaseFirst {} {}": {
-      "snippet": "textLangTitlecaseFirst {${1:language}} {${2:text}}"
-    },
-    "fileInput {}": {
-      "snippet": "fileInput {${1:file name}}"
-    },
-    "fileInput{}": {
-      "snippet": "fileInput{${1:file}}"
-    },
-    "fileIfExistInput {}": {
-      "snippet": "fileIfExistInput {${1:file name}}"
-    },
-    "fileIfExistInput{}": {
-      "snippet": "fileIfExistInput{${1:file}}"
-    },
-    "fileIfExistInputF {} {}": {
-      "snippet": "fileIfExistInputF {${1:file name}} {${2:false code}}"
-    },
-    "fileIfExistInputF{}{}": {
-      "snippet": "fileIfExistInputF{${1:file}}{${2:false code}}"
-    },
-    "fileGet{}{}{}": {
-      "snippet": "fileGet{${1:file name}}{${2:setup}}{${3:cmd}}"
-    },
-    "fileGetT{}{}{}{}": {
-      "snippet": "fileGetT{${1:file name}}{${2:setup}}{${3:cmd}}{${4:true code}}"
-    },
-    "fileGetF{}{}{}{}": {
-      "snippet": "fileGetF{${1:file name}}{${2:setup}}{${3:cmd}}{${4:false code}}"
-    },
-    "fileGetTF{}{}{}{}{}": {
-      "snippet": "fileGetTF{${1:file name}}{${2:setup}}{${3:cmd}}{${4:true code}}{${5:false code}}"
-    },
-    "fileIfExist {}": {
-      "snippet": "fileIfExist {${1:file name}}"
-    },
-    "fileIfExistT {} {}": {
-      "snippet": "fileIfExistT {${1:file name}} {${2:true code}}"
-    },
-    "fileIfExistF {} {}": {
-      "snippet": "fileIfExistF {${1:file name}} {${2:false code}}"
-    },
-    "fileIfExistTF {} {} {}": {
-      "snippet": "fileIfExistTF {${1:file name}} {${2:true code}} {${3:false code}}"
-    },
-    "qNoValue": {},
-    "legacyIf {}": {
-      "snippet": "legacyIf {${1:name}}"
-    },
-    "legacyIfT {} {}": {
-      "snippet": "legacyIfT {${1:name}} {${2:true code}}"
-    },
-    "legacyIfF {} {}": {
-      "snippet": "legacyIfF {${1:name}} {${2:false code}}"
-    },
-    "legacyIfTF {} {} {}": {
-      "snippet": "legacyIfTF {${1:name}} {${2:true code}} {${3:false code}}"
-    },
-    "legacyIfSetTrue {}": {
-      "snippet": "legacyIfSetTrue {${1:name}}"
-    },
-    "legacyIfSetFalse {}": {
-      "snippet": "legacyIfSetFalse {${1:name}}"
-    },
-    "legacyIfSet {} {}": {
-      "snippet": "legacyIfSet {${1:name}} {${2:bool expr}}"
-    },
-    "clistMapBreak": {},
-    "clistVarSort{}{}": {
-      "snippet": "clistVarSort{${1:arg1}}{${2:arg2}}"
-    },
-    "cNoValueTl": {},
-    "expOnce{}": {
-      "snippet": "expOnce{${1:arg}}"
-    },
-    "expPartial{}": {
-      "snippet": "expPartial{${1:arg}}"
-    },
-    "fileInputStop": {},
-    "prgLocal": {},
-    "noExpand{}": {
-      "snippet": "noExpand{${1:tokens}}"
-    },
-    "onlyOnce{}": {
-      "snippet": "onlyOnce{${1:tokens}}"
-    },
-    "onlyPartial{}": {
-      "snippet": "onlyPartial{${1:tokens}}"
-    },
-    "prgBreak": {},
-    "prgBreakDo": {},
-    "propMapBreak": {},
-    "seqJoin{}{}": {
-      "snippet": "seqJoin{${1:arg1}}{${2:arg2}}"
-    },
-    "seqJoinExtended{}{}{}{}": {
-      "snippet": "seqJoinExtended{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "seqMapBreak": {},
-    "seqVarSort{}{}": {
-      "snippet": "seqVarSort{${1:arg1}}{${2:arg2}}"
-    },
-    "sortReturnSame": {},
-    "sortReturnSwapped": {},
-    "Result{}": {
-      "snippet": "Result{${1:tokens}}"
-    },
-    "PrgNewFunction{}{}{}": {
-      "snippet": "PrgNewFunction{${1:cmd}}{${2:xargs}}{${3:def}}"
-    },
-    "PrgNewConditional{}{}{}": {
-      "snippet": "PrgNewConditional{${1:cmd}}{${2:xargs}}{${3:def}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "scoping",
-      "tracing"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/fusering.json b/dev/packages/fusering.json
index 0c15ad8a1..f233052ca 100644
--- a/dev/packages/fusering.json
+++ b/dev/packages/fusering.json
@@ -18,18 +18,6 @@
     "fivefuseh[]{}{}{}[]": {
       "snippet": "fivefuseh[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "fivefuseh(){}{}{}": {
-      "snippet": "fivefuseh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefuseh(){}{}{}[]": {
-      "snippet": "fivefuseh(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "fivefuseh()[]{}{}{}": {
-      "snippet": "fivefuseh(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefuseh()[]{}{}{}[]": {
-      "snippet": "fivefuseh(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "fivefusehi{}{}{}": {
       "snippet": "fivefusehi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -42,18 +30,6 @@
     "fivefusehi[]{}{}{}[]": {
       "snippet": "fivefusehi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "fivefusehi(){}{}{}": {
-      "snippet": "fivefusehi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefusehi(){}{}{}[]": {
-      "snippet": "fivefusehi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "fivefusehi()[]{}{}{}": {
-      "snippet": "fivefusehi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefusehi()[]{}{}{}[]": {
-      "snippet": "fivefusehi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "fivefusev{}{}{}": {
       "snippet": "fivefusev{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -66,18 +42,6 @@
     "fivefusev[]{}{}{}[]": {
       "snippet": "fivefusev[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "fivefusev(){}{}{}": {
-      "snippet": "fivefusev(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefusev(){}{}{}[]": {
-      "snippet": "fivefusev(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "fivefusev()[]{}{}{}": {
-      "snippet": "fivefusev(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefusev()[]{}{}{}[]": {
-      "snippet": "fivefusev(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "fivefusevi{}{}{}": {
       "snippet": "fivefusevi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -90,18 +54,6 @@
     "fivefusevi[]{}{}{}[]": {
       "snippet": "fivefusevi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "fivefusevi(){}{}{}": {
-      "snippet": "fivefusevi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefusevi(){}{}{}[]": {
-      "snippet": "fivefusevi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "fivefusevi()[]{}{}{}": {
-      "snippet": "fivefusevi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fivefusevi()[]{}{}{}[]": {
-      "snippet": "fivefusevi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "fourfuse{}{}{}": {
       "snippet": "fourfuse{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -114,18 +66,6 @@
     "fourfuse[]{}{}{}[]": {
       "snippet": "fourfuse[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "fourfuse(){}{}{}": {
-      "snippet": "fourfuse(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fourfuse(){}{}{}[]": {
-      "snippet": "fourfuse(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "fourfuse()[]{}{}{}": {
-      "snippet": "fourfuse(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "fourfuse()[]{}{}{}[]": {
-      "snippet": "fourfuse(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "sixfuseh{}{}{}": {
       "snippet": "sixfuseh{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -138,18 +78,6 @@
     "sixfuseh[]{}{}{}[]": {
       "snippet": "sixfuseh[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "sixfuseh(){}{}{}": {
-      "snippet": "sixfuseh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfuseh(){}{}{}[]": {
-      "snippet": "sixfuseh(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "sixfuseh()[]{}{}{}": {
-      "snippet": "sixfuseh(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfuseh()[]{}{}{}[]": {
-      "snippet": "sixfuseh(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "sixfusehi{}{}{}": {
       "snippet": "sixfusehi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -162,18 +90,6 @@
     "sixfusehi[]{}{}{}[]": {
       "snippet": "sixfusehi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "sixfusehi(){}{}{}": {
-      "snippet": "sixfusehi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfusehi(){}{}{}[]": {
-      "snippet": "sixfusehi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "sixfusehi()[]{}{}{}": {
-      "snippet": "sixfusehi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfusehi()[]{}{}{}[]": {
-      "snippet": "sixfusehi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "sixfusev{}{}{}": {
       "snippet": "sixfusev{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -186,18 +102,6 @@
     "sixfusev[]{}{}{}[]": {
       "snippet": "sixfusev[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "sixfusev(){}{}{}": {
-      "snippet": "sixfusev(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfusev(){}{}{}[]": {
-      "snippet": "sixfusev(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "sixfusev()[]{}{}{}": {
-      "snippet": "sixfusev(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfusev()[]{}{}{}[]": {
-      "snippet": "sixfusev(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "sixfusevi{}{}{}": {
       "snippet": "sixfusevi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -210,18 +114,6 @@
     "sixfusevi[]{}{}{}[]": {
       "snippet": "sixfusevi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "sixfusevi(){}{}{}": {
-      "snippet": "sixfusevi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfusevi(){}{}{}[]": {
-      "snippet": "sixfusevi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "sixfusevi()[]{}{}{}": {
-      "snippet": "sixfusevi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "sixfusevi()[]{}{}{}[]": {
-      "snippet": "sixfusevi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "threefuseh{}{}{}": {
       "snippet": "threefuseh{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -234,18 +126,6 @@
     "threefuseh[]{}{}{}[]": {
       "snippet": "threefuseh[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "threefuseh(){}{}{}": {
-      "snippet": "threefuseh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefuseh(){}{}{}[]": {
-      "snippet": "threefuseh(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "threefuseh()[]{}{}{}": {
-      "snippet": "threefuseh(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefuseh()[]{}{}{}[]": {
-      "snippet": "threefuseh(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "threefusehi{}{}{}": {
       "snippet": "threefusehi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -258,18 +138,6 @@
     "threefusehi[]{}{}{}[]": {
       "snippet": "threefusehi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "threefusehi(){}{}{}": {
-      "snippet": "threefusehi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefusehi(){}{}{}[]": {
-      "snippet": "threefusehi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "threefusehi()[]{}{}{}": {
-      "snippet": "threefusehi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefusehi()[]{}{}{}[]": {
-      "snippet": "threefusehi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "threefusev{}{}{}": {
       "snippet": "threefusev{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -282,18 +150,6 @@
     "threefusev[]{}{}{}[]": {
       "snippet": "threefusev[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "threefusev(){}{}{}": {
-      "snippet": "threefusev(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefusev(){}{}{}[]": {
-      "snippet": "threefusev(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "threefusev()[]{}{}{}": {
-      "snippet": "threefusev(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefusev()[]{}{}{}[]": {
-      "snippet": "threefusev(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "threefusevi{}{}{}": {
       "snippet": "threefusevi{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
     },
@@ -306,18 +162,6 @@
     "threefusevi[]{}{}{}[]": {
       "snippet": "threefusevi[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
     },
-    "threefusevi(){}{}{}": {
-      "snippet": "threefusevi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefusevi(){}{}{}[]": {
-      "snippet": "threefusevi(${5:skelbdlist}){${1:atomlist}}{${2:subslist}}{${3:fuse}}[${4:delbdlist}]"
-    },
-    "threefusevi()[]{}{}{}": {
-      "snippet": "threefusevi(${5:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}"
-    },
-    "threefusevi()[]{}{}{}[]": {
-      "snippet": "threefusevi(${6:skelbdlist})[${4:bondlist}]{${1:atomlist}}{${2:subslist}}{${3:fuse}}[${5:delbdlist}]"
-    },
     "fivefuseposhi{}": {
       "snippet": "fivefuseposhi{${1:arg1}}"
     },
diff --git a/dev/packages/fvextra.json b/dev/packages/fvextra.json
index e48bf5d90..9c2a7f550 100644
--- a/dev/packages/fvextra.json
+++ b/dev/packages/fvextra.json
@@ -37,12 +37,6 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
-    "VerbatimClearBuffer": {},
-    "VerbatimClearBuffer[]": {
-      "snippet": "VerbatimClearBuffer[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "FancyVerbBreakStart": {},
     "FancyVerbBreakStop": {},
     "FancyVerbBreakAnywhereBreak": {},
diff --git a/dev/packages/gastex.json b/dev/packages/gastex.json
index 4f98f70a7..6e5bfddc8 100644
--- a/dev/packages/gastex.json
+++ b/dev/packages/gastex.json
@@ -27,178 +27,6 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
-    "node()(){}": {
-      "snippet": "node(${2:name})(${3:x},${4:y}){${1:label text}}"
-    },
-    "node[]()(){}": {
-      "snippet": "node[${2:options}](${3:name})(${4:x},${5:y}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "rpnode()()(){}": {
-      "snippet": "rpnode(${2:name})(${3:x},${4:y})(${5:n},${6:r}){${1:label text}}"
-    },
-    "rpnode[]()()(){}": {
-      "snippet": "rpnode[${2:options}](${3:name})(${4:x},${5:y})(${6:n},${7:r}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "imark()": {
-      "snippet": "imark(${1:node name})"
-    },
-    "imark[]()": {
-      "snippet": "imark[${1:options}](${2:node name})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "fmark()": {
-      "snippet": "fmark(${1:node name})"
-    },
-    "fmark[]()": {
-      "snippet": "fmark[${1:options}](${2:node name})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "rmark()": {
-      "snippet": "rmark(${1:node name})"
-    },
-    "rmark[]()": {
-      "snippet": "rmark[${1:options}](${2:node name})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "nodelabel(){}": {
-      "snippet": "nodelabel(${2:node name}){${1:label text}}"
-    },
-    "nodelabel[](){}": {
-      "snippet": "nodelabel[${2:options}](${3:node name}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawedge(){}": {
-      "snippet": "drawedge(${2:startNode},${3:endNode}){${1:label text}}"
-    },
-    "drawedge[](){}": {
-      "snippet": "drawedge[${2:options}](${3:startNode},${4:endNode}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawloop(){}": {
-      "snippet": "drawloop(${2:node name}){${1:label text}}"
-    },
-    "drawloop[](){}": {
-      "snippet": "drawloop[${2:options}](${3:node name}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawqbedge(){}": {
-      "snippet": "drawqbedge(${2:startNode},${3:x},${4:y},${5:endNode}){${1:label text}}"
-    },
-    "drawqbedge[](){}": {
-      "snippet": "drawqbedge[${2:options}](${3:startNode},${4:x},${5:y},${6:endNode}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawqbpedge(){}": {
-      "snippet": "drawqbpedge(${2:startNode},${3:sa},${4:endNode},${5:ea}){${1:label text}}"
-    },
-    "drawqbpedge[](){}": {
-      "snippet": "drawqbpedge[${2:options}](${3:startNode},${4:sa},${5:endNode},${6:ea}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawbcedge(){}": {
-      "snippet": "drawbcedge(${2:startNode},${3:xs},${4:ys},${5:endNode},${6:xe},${7:ye}){${1:label text}}"
-    },
-    "drawbcedge[](){}": {
-      "snippet": "drawbcedge[${2:options}](${3:startNode},${4:xs},${5:ys},${6:endNode},${7:xe},${8:ye}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawcbedge(){}": {
-      "snippet": "drawcbedge(${2:startNode},${3:xs},${4:ys},${5:endNode},${6:xe},${7:ye}){${1:label text}}"
-    },
-    "drawcbedge[](){}": {
-      "snippet": "drawcbedge[${2:options}](${3:startNode},${4:xs},${5:ys},${6:endNode},${7:xe},${8:ye}){${1:label text}}"
-    },
-    "drawbpedge(){}": {
-      "snippet": "drawbpedge(${2:startNode},${3:sa},${4:sr},${5:endNode},${6:ea},${7:er}){${1:label text}}"
-    },
-    "drawbpedge[](){}": {
-      "snippet": "drawbpedge[${2:options}](${3:startNode},${4:sa},${5:sr},${6:endNode},${7:ea},${8:er}){${1:label text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawcbpedge(){}": {
-      "snippet": "drawcbpedge(${2:startNode},${3:sa},${4:sr},${5:endNode},${6:ea},${7:er}){${1:label text}}"
-    },
-    "drawcbpedge[](){}": {
-      "snippet": "drawcbpedge[${2:options}](${3:startNode},${4:sa},${5:sr},${6:endNode},${7:ea},${8:er}){${1:label text}}"
-    },
-    "drawcircle()": {
-      "snippet": "drawcircle(${1:x},${2:y},${3:d})"
-    },
-    "drawcircle[]()": {
-      "snippet": "drawcircle[${1:options}](${2:x},${3:y},${4:d})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawarc()": {
-      "snippet": "drawarc(${1:x},${2:y},${3:r},${4:a},${5:b})"
-    },
-    "drawarc[]()": {
-      "snippet": "drawarc[${1:options}](${2:x},${3:y},${4:r},${5:a},${6:b})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawrect()": {
-      "snippet": "drawrect(${1:x0},${2:y0},${3:x1},${4:y1})"
-    },
-    "drawrect[]()": {
-      "snippet": "drawrect[${1:options}](${2:x0},${3:y0},${4:x1},${5:y1})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawoval()": {
-      "snippet": "drawoval(${1:x},${2:y},${3:w},${4:h},${5:mr})"
-    },
-    "drawoval[]()": {
-      "snippet": "drawoval[${1:options}](${2:x},${3:y},${4:w},${5:h},${6:mr})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawrpolygon()()": {
-      "snippet": "drawrpolygon(${1:x},${2:y})(${3:n},${4:r})"
-    },
-    "drawrpolygon[]()()": {
-      "snippet": "drawrpolygon[${1:options}](${2:x},${3:y})(${4:n},${5:r})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawqbezier()": {
-      "snippet": "drawqbezier(${1:x0},${2:y0},${3:x1},${4:y1},${5:x2},${6:y2})"
-    },
-    "drawqbezier[]()": {
-      "snippet": "drawqbezier[${1:options}](${2:x0},${3:y0},${4:x1},${5:y1},${6:x2},${7:y2})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawcbezier()": {
-      "snippet": "drawcbezier(${1:x0},${2:y0},${3:x1},${4:y1},${5:x2},${6:y2},${7:x3},${8:y3})"
-    },
-    "drawcbezier[]()": {
-      "snippet": "drawcbezier[${1:options}](${2:x0},${3:y0},${4:x1},${5:y1},${6:x2},${7:y2},${8:x3},${9:y3})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "drawsnake()()": {
-      "snippet": "drawsnake(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "drawsnake[]()()": {
-      "snippet": "drawsnake[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "ifgastexslide": {},
     "gastexslidetrue": {},
     "gastexslidefalse": {},
@@ -248,31 +76,11 @@
   },
   "envs": {
     "gpicture": {},
-    "gpicture(width,height)": {
-      "name": "gpicture",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "gpicture(width,height)(xoffset,yoffset)": {
-      "name": "gpicture",
-      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
-    },
     "gpicture[]": {
       "name": "gpicture",
       "snippet": "[${1:options}]",
       "keyvalindex": 2,
       "keyvalpos": 0
-    },
-    "gpicture[](width,height)": {
-      "name": "gpicture",
-      "snippet": "[${1:options}](${2:width},${3:height})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "gpicture[](width,height)(xoffset,yoffset)": {
-      "name": "gpicture",
-      "snippet": "[${1:options}](${2:width},${3:height})(${4:xoffset},${5:yoffset})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
     }
   },
   "options": [
diff --git a/dev/packages/gb4e.json b/dev/packages/gb4e.json
deleted file mode 100644
index d26e8ad13..000000000
--- a/dev/packages/gb4e.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-  "includes": {
-    "cgloss4e": []
-  },
-  "macros": {
-    "exewidth{}": {
-      "snippet": "exewidth{${1:string}}"
-    },
-    "ex[]{}": {
-      "snippet": "ex[${2:judgment}]{${1:example}}"
-    },
-    "judgewidth{}": {
-      "snippet": "judgewidth{${1:string}}"
-    },
-    "exi{}": {
-      "snippet": "exi{${1:identifier}}"
-    },
-    "exi{}[]{}": {
-      "snippet": "exi{${1:identifier}}[${2:judgment}]{${3:example}}"
-    },
-    "exr{}": {
-      "snippet": "exr{${1:label}}"
-    },
-    "exr{}[]{}": {
-      "snippet": "exr{${1:label}}[${2:judgment}]{${3:example}}"
-    },
-    "exp{}": {
-      "snippet": "exp{${1:label}}"
-    },
-    "exp{}[]{}": {
-      "snippet": "exp{${1:label}}[${2:judgment}]{${3:example}}"
-    },
-    "sn[]{}": {
-      "snippet": "sn[${2:judgment}]{${1:example}}"
-    },
-    "obar{}": {
-      "snippet": "obar{${1:arg}}"
-    },
-    "mbar{}": {
-      "snippet": "mbar{${1:arg}}"
-    },
-    "ibar{}": {
-      "snippet": "ibar{${1:arg}}"
-    },
-    "iibar{}": {
-      "snippet": "iibar{${1:arg}}"
-    },
-    "primebars": {},
-    "lb{}": {
-      "snippet": "lb{${1:arg}}"
-    },
-    "lb{}[]": {
-      "snippet": "lb{${1:arg}}[${2:sub}]"
-    },
-    "rb{}": {
-      "snippet": "rb{${1:arg}}"
-    },
-    "rb{}[]": {
-      "snippet": "rb{${1:arg}}[${2:sub}]"
-    },
-    "th": {},
-    "al": {},
-    "be": {},
-    "ga": {},
-    "de": {},
-    "noautomath": {},
-    "automath": {},
-    "attop{}": {
-      "snippet": "attop{${1:content}}"
-    },
-    "atcenter{}": {
-      "snippet": "atcenter{${1:content}}"
-    },
-    "fillright{}": {
-      "snippet": "fillright{${1:arg}}"
-    },
-    "fillleft{}": {
-      "snippet": "fillleft{${1:arg}}"
-    },
-    "arrowalign{}": {
-      "snippet": "arrowalign{${1:content}}"
-    },
-    "pu": {},
-    "pd": {},
-    "lf": {},
-    "link{}": {
-      "snippet": "link{${1:arg}}"
-    },
-    "spacer": {},
-    "centr{}": {
-      "snippet": "centr{${1:arg}}"
-    },
-    "prmbrs": {},
-    "spec{}": {
-      "snippet": "spec{${1:arg}}"
-    },
-    "ct{}": {
-      "snippet": "ct{${1:arg}}"
-    },
-    "tx": {},
-    "indexgroupmark{}": {
-      "snippet": "indexgroupmark{${1:text}}"
-    },
-    "theexx": {},
-    "thexnumi": {},
-    "thexnumii": {},
-    "thexnumiii": {},
-    "thexnumiv": {},
-    "therxnumi": {},
-    "therxnumii": {},
-    "therxnumiii": {},
-    "therxnumiv": {},
-    "bu": {},
-    "ea": {},
-    "z": {
-      "detail": "𝑧",
-      "documentation": "MATHEMATICAL ITALIC SMALL Z"
-    },
-    "lcommentsep": {},
-    "lcomment{}": {
-      "snippet": "lcomment{${1:text}}"
-    },
-    "leaderfill": {},
-    "pointerup": {},
-    "pointerdown": {},
-    "elevenex": {},
-    "pijl": {},
-    "bb{}": {
-      "snippet": "bb{${1:arg}}"
-    },
-    "boven{}{}": {
-      "snippet": "boven{${1:arg1}}{${2:arg2}}"
-    },
-    "bovenop{}{}": {
-      "snippet": "bovenop{${1:arg1}}{${2:arg2}}"
-    },
-    "vl": {},
-    "gbVersion": {}
-  },
-  "envs": {
-    "exe": {},
-    "exe[]": {
-      "name": "exe",
-      "snippet": "[${1:string}]"
-    },
-    "xlist": {},
-    "xlist[]": {
-      "name": "xlist",
-      "snippet": "[${1:string}]"
-    },
-    "xlista": {},
-    "xlista[]": {
-      "name": "xlista",
-      "snippet": "[${1:string}]"
-    },
-    "xlisti": {},
-    "xlisti[]": {
-      "name": "xlisti",
-      "snippet": "[${1:string}]"
-    },
-    "xlistn": {},
-    "xlistn[]": {
-      "name": "xlistn",
-      "snippet": "[${1:string}]"
-    },
-    "xlistA": {},
-    "xlistA[]": {
-      "name": "xlistA",
-      "snippet": "[${1:string}]"
-    },
-    "xlistI": {},
-    "xlistI[]": {
-      "name": "xlistI",
-      "snippet": "[${1:string}]"
-    },
-    "qlist": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/gchords.json b/dev/packages/gchords.json
index b803bbb59..af481e318 100644
--- a/dev/packages/gchords.json
+++ b/dev/packages/gchords.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "chord{}{}{}": {
-      "snippet": "chord{${1:modifiers}}{${2:x1,${4:x2},...}}{${3:name}}"
+      "snippet": "chord{${1:modifiers}}{${2:x1,x2,...}}{${3:name}}"
     },
     "chords{}": {
       "snippet": "chords{${1:chords}}"
diff --git a/dev/packages/gelasiomath.json b/dev/packages/gelasiomath.json
deleted file mode 100644
index c0f422b15..000000000
--- a/dev/packages/gelasiomath.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "includes": {
-    "iftex": [],
-    "etoolbox": [],
-    "xkeyval": [],
-    "ifthen": [],
-    "newtx": []
-  },
-  "macros": {
-    "textSC{}": {
-      "snippet": "textSC{${1:text}}"
-    },
-    "textsmde{}": {
-      "snippet": "textsmde{${1:text}}"
-    },
-    "capsescape{}": {
-      "snippet": "capsescape{${1:text}}"
-    },
-    "geltextfrac{}{}": {
-      "snippet": "geltextfrac{${1:arg1}}{${2:arg2}}"
-    },
-    "geltextfrac[]{}{}": {
-      "snippet": "geltextfrac[${3:opt}]{${1:arg1}}{${2:arg2}}"
-    },
-    "textULC{}": {
-      "snippet": "textULC{${1:text}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "scale=${1:factor}",
-    "scosf"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/geometry.json b/dev/packages/geometry.json
deleted file mode 100644
index eef512d7d..000000000
--- a/dev/packages/geometry.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "geometry{}": {
-      "snippet": "geometry{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "newgeometry{}": {
-      "snippet": "newgeometry{${1:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "restoregeometry": {},
-    "savegeometry{}": {
-      "snippet": "savegeometry{${1:name}}"
-    },
-    "loadgeometry{}": {
-      "snippet": "loadgeometry{${1:name}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "paper=",
-      "papername=",
-      "a0paper",
-      "a1paper",
-      "a2paper",
-      "a3paper",
-      "a4paper",
-      "a5paper",
-      "a6paper",
-      "b0paper",
-      "b1paper",
-      "b2paper",
-      "b3paper",
-      "b4paper",
-      "b5paper",
-      "b6paper",
-      "c0paper",
-      "c1paper",
-      "c2paper",
-      "c3paper",
-      "c4paper",
-      "c5paper",
-      "c6paper",
-      "b0j",
-      "b1j",
-      "b2j",
-      "b3j",
-      "b4j",
-      "b5j",
-      "b6j",
-      "ansiapaper",
-      "ansibpaper",
-      "ansicpaper",
-      "ansidpaper",
-      "ansiepaper",
-      "letterpaper",
-      "executivepaper",
-      "legalpaper",
-      "screen",
-      "paperwidth=",
-      "paperheight=",
-      "papersize=",
-      "papersize={${1:width},${2:height}}",
-      "landscape",
-      "portrait",
-      "layout=",
-      "layoutwidth=",
-      "layoutheight=",
-      "layoutsize=",
-      "layoutsize={${1:width},${2:height}}",
-      "layouthoffset=",
-      "layoutvoffset=",
-      "layoutoffset=",
-      "layoutoffset={${1:hoffset},${2:voffset}}",
-      "hscale=${1:scale}",
-      "vscale=${1:scale}",
-      "scale=${1:scale}",
-      "scale={${1:hscale},${2:vscale}}",
-      "width=",
-      "totalwidth=",
-      "height=",
-      "totalheight=",
-      "total=",
-      "total={${1:width},${2:height}}",
-      "textwidth=",
-      "textheight=",
-      "text=",
-      "body={${1:width},${2:height}}",
-      "lines=${1:integer}",
-      "includehead",
-      "includefoot",
-      "includeheadfoot",
-      "includemp",
-      "includeall",
-      "ignorehead",
-      "ignorefoot",
-      "ignoreheadfoot",
-      "ignoremp",
-      "ignoreall",
-      "heightrounded",
-      "hdivide={${1:left margin},${2:width},${3:right margin}}",
-      "vdivide={${1:top margin},${2:height},${3:bottom margin}}",
-      "divide={${1:left/top margin},${2:width/height},${3:right/bottom margin}}",
-      "left=",
-      "lmargin=",
-      "inner=",
-      "right=",
-      "rmargin=",
-      "outer=",
-      "top=",
-      "tmargin=",
-      "bottom=",
-      "bmargin=",
-      "hmargin=",
-      "hmargin={${1:left margin},${2:right margin}}",
-      "vmargin=",
-      "vmargin={${1:top margin},${2:bottom margin}}",
-      "margin=",
-      "margin={${1:left/top margin},${2:right/bottom margin}}",
-      "hmarginratio=${1:left}:${2:right}",
-      "vmarginratio=${1:top}:${2:bottom}",
-      "marginratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
-      "marginratio=${1:left/top}:${2:right/bottom}",
-      "ratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
-      "ratio=${1:left/top}:${2:right/bottom}",
-      "hcentering",
-      "vcentering",
-      "centering",
-      "twoside",
-      "asymmetric",
-      "bindingoffset=",
-      "headheight=",
-      "head=",
-      "headsep=",
-      "footskip=",
-      "foot=",
-      "nohead",
-      "nofoot",
-      "noheadfoot",
-      "footnotesep=",
-      "marginparwidth=",
-      "marginpar=",
-      "marginparsep=",
-      "nomarginpar",
-      "columnsep=",
-      "hoffset=",
-      "voffset=",
-      "offset=",
-      "offset={${1:hoffset},${2:voffset}}",
-      "twocolumn",
-      "onecolumn",
-      "twoside",
-      "reversemp",
-      "reversemarginpar",
-      "driver=",
-      "dvips",
-      "dvipdfm",
-      "pdftex",
-      "luatex",
-      "xetex",
-      "vtex",
-      "dvipdfmx",
-      "xdvipdfmx",
-      "verbose",
-      "reset",
-      "mag=${1:magnification}",
-      "truedimen",
-      "pass",
-      "showframe",
-      "showcrop"
-    ],
-    [
-      "layout=",
-      "layoutwidth=",
-      "layoutheight=",
-      "layoutsize=",
-      "layoutsize={${1:width},${2:height}}",
-      "layouthoffset=",
-      "layoutvoffset=",
-      "layoutoffset=",
-      "layoutoffset={${1:hoffset},${2:voffset}}",
-      "hscale=${1:scale}",
-      "vscale=${1:scale}",
-      "scale=${1:scale}",
-      "scale={${1:hscale},${2:vscale}}",
-      "width=",
-      "totalwidth=",
-      "height=",
-      "totalheight=",
-      "total=",
-      "total={${1:width},${2:height}}",
-      "textwidth=",
-      "textheight=",
-      "text=",
-      "body={${1:width},${2:height}}",
-      "lines=${1:integer}",
-      "includehead",
-      "includefoot",
-      "includeheadfoot",
-      "includemp",
-      "includeall",
-      "ignorehead",
-      "ignorefoot",
-      "ignoreheadfoot",
-      "ignoremp",
-      "ignoreall",
-      "heightrounded",
-      "hdivide={${1:left margin},${2:width},${3:right margin}}",
-      "vdivide={${1:top margin},${2:height},${3:bottom margin}}",
-      "divide={${1:left/top margin},${2:width/height},${3:right/bottom margin}}",
-      "left=",
-      "lmargin=",
-      "inner=",
-      "right=",
-      "rmargin=",
-      "outer=",
-      "top=",
-      "tmargin=",
-      "bottom=",
-      "bmargin=",
-      "hmargin=",
-      "hmargin={${1:left margin},${2:right margin}}",
-      "vmargin=",
-      "vmargin={${1:top margin},${2:bottom margin}}",
-      "margin=",
-      "margin={${1:left/top margin},${2:right/bottom margin}}",
-      "hmarginratio=${1:left}:${2:right}",
-      "vmarginratio=${1:top}:${2:bottom}",
-      "marginratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
-      "marginratio=${1:left/top}:${2:right/bottom}",
-      "ratio={${1:left}:${2:right},${3:top}:${4:bottom}}",
-      "ratio=${1:left/top}:${2:right/bottom}",
-      "hcentering",
-      "vcentering",
-      "centering",
-      "twoside",
-      "asymmetric",
-      "bindingoffset=",
-      "headheight=",
-      "head=",
-      "headsep=",
-      "footskip=",
-      "foot=",
-      "nohead",
-      "nofoot",
-      "noheadfoot",
-      "footnotesep=",
-      "marginparwidth=",
-      "marginpar=",
-      "marginparsep=",
-      "nomarginpar",
-      "columnsep=",
-      "hoffset=",
-      "voffset=",
-      "offset=",
-      "offset={${1:hoffset},${2:voffset}}",
-      "twocolumn",
-      "onecolumn",
-      "twoside",
-      "reversemp",
-      "reversemarginpar"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/german.json b/dev/packages/german.json
deleted file mode 100644
index bd04b2481..000000000
--- a/dev/packages/german.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/glossaries.json b/dev/packages/glossaries.json
deleted file mode 100644
index ca0a54764..000000000
--- a/dev/packages/glossaries.json
+++ /dev/null
@@ -1,4118 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "xkeyval": [],
-    "mfirstuc": [],
-    "textcase": [],
-    "xfor": [],
-    "datatool-base": [],
-    "amsgen": [],
-    "etoolbox": [],
-    "glossary-hypernav": [],
-    "glossary-list": [],
-    "glossary-long": [],
-    "glossary-super": [],
-    "glossary-tree": [],
-    "translator": [
-      "translate",
-      "translate=true"
-    ],
-    "tracklang": [
-      "translate",
-      "translate=true"
-    ],
-    "glossaries-babel": [
-      "translate=babel"
-    ]
-  },
-  "macros": {
-    "glsindexingsetting": {},
-    "GlsSetQuote{}": {
-      "snippet": "GlsSetQuote{${1:character}}"
-    },
-    "glsshowtarget{}": {
-      "snippet": "glsshowtarget{${1:target name}}"
-    },
-    "glsshowtargetinner{}": {
-      "snippet": "glsshowtargetinner{${1:target name}}"
-    },
-    "glsshowtargetfonttext{}": {
-      "snippet": "glsshowtargetfonttext{${1:text}}"
-    },
-    "glsshowtargetouter{}": {
-      "snippet": "glsshowtargetouter{${1:target name}}"
-    },
-    "glsshowtargetsymbol": {},
-    "glsshowtargetfont": {},
-    "glsshowaccsupp{}{}{}": {
-      "snippet": "glsshowaccsupp{${1:options}}{${2:tag}}{${3:replacement text}}"
-    },
-    "glslinkcheckfirsthyperhook": {},
-    "glstoctrue": {},
-    "glstocfalse": {},
-    "ifglstoc": {},
-    "setglossarysection{}": {
-      "snippet": "setglossarysection{${1:name}}"
-    },
-    "ifglsucmark": {},
-    "glsucmarkfalse": {},
-    "glsucmarktrue": {},
-    "glsautoprefix": {},
-    "glsrefentry{}": {
-      "snippet": "glsrefentry{${1:label}}"
-    },
-    "GlsEntryCounterLabelPrefix": {},
-    "glsresetentrycounter": {},
-    "glsstepentry{}": {
-      "snippet": "glsstepentry{${1:label}}"
-    },
-    "theglossaryentry": {},
-    "glsentrycounterlabel": {},
-    "ifglsentrycounter": {},
-    "glsentrycounterfalse": {},
-    "glsentrycountertrue": {},
-    "glsresetsubentrycounter": {},
-    "glsstepsubentry{}": {
-      "snippet": "glsstepsubentry{${1:label}}"
-    },
-    "theglossarysubentry": {},
-    "glssubentrycounterlabel": {},
-    "ifglssubentrycounter": {},
-    "glssubentrycounterfalse": {},
-    "glssubentrycountertrue": {},
-    "setglossarystyle{}": {
-      "snippet": "setglossarystyle{${1:style name}}"
-    },
-    "glscounter": {},
-    "glspostdescription": {},
-    "ifglsnogroupskip": {},
-    "glsnogroupskipfalse": {},
-    "glsnogroupskiptrue": {},
-    "ifglswrallowprimitivemods": {},
-    "glswrallowprimitivemodstrue": {},
-    "glswrallowprimitivemodsfalse": {},
-    "ifglsindexonlyfirst": {},
-    "glsindexonlyfirstfalse": {},
-    "glsindexonlyfirsttrue": {},
-    "glswriteentry{}{}": {
-      "snippet": "glswriteentry{${1:label}}{${2:wr-code}}"
-    },
-    "glssortnumberfmt{}": {
-      "snippet": "glssortnumberfmt{${1:number}}"
-    },
-    "glsprestandardsort{}{}{}": {
-      "snippet": "glsprestandardsort{${1:sort cs}}{${2:type}}{${3:label}}"
-    },
-    "glsdosanitizesort": {},
-    "ifglsxindy": {},
-    "glsxindyfalse": {},
-    "glsxindytrue": {},
-    "GlsDeclareNoHyperList{}": {
-      "snippet": "GlsDeclareNoHyperList{${1:list}}"
-    },
-    "printsymbols": {
-      "option": "symbols"
-    },
-    "printsymbols[]": {
-      "snippet": "printsymbols[${1:options}]",
-      "option": "symbols",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "printnumbers": {
-      "option": "numbers"
-    },
-    "printnumbers[]": {
-      "snippet": "printnumbers[${1:options}]",
-      "option": "numbers",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "newterm{}": {
-      "snippet": "newterm{${1:label}}",
-      "option": "index"
-    },
-    "newterm[]{}": {
-      "snippet": "newterm[${2:options}]{${1:label}}",
-      "option": "index",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "printindex": {
-      "option": "index"
-    },
-    "printindex[]": {
-      "snippet": "printindex[${1:options}]",
-      "option": "index",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "printacronyms": {
-      "option": "acronyms"
-    },
-    "printacronyms[]": {
-      "snippet": "printacronyms[${1:options}]",
-      "option": "acronyms",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "DeclareAcronymList{}": {
-      "snippet": "DeclareAcronymList{${1:list}}"
-    },
-    "SetAcronymLists{}": {
-      "snippet": "SetAcronymLists{${1:list}}"
-    },
-    "glsIfListOfAcronyms{}{}{}": {
-      "snippet": "glsIfListOfAcronyms{${1:glossary-label}}{${2:true}}{${3:false}}"
-    },
-    "DefineAcronymSynonyms": {},
-    "setupglossaries{}": {
-      "snippet": "setupglossaries{${1:options}}"
-    },
-    "makenoidxglossaries": {},
-    "makeglossaries": {},
-    "writeist": {},
-    "setStyleFile{}": {
-      "snippet": "setStyleFile{${1:name}}"
-    },
-    "GlsSetWriteIstHook{}": {
-      "snippet": "GlsSetWriteIstHook{${1:code}}"
-    },
-    "glswrite": {},
-    "noist": {},
-    "glsSetCompositor{}": {
-      "snippet": "glsSetCompositor{${1:symbol}}"
-    },
-    "glsSetAlphaCompositor{}": {
-      "snippet": "glsSetAlphaCompositor{${1:symbol}}"
-    },
-    "newglossaryentry{}{}": {
-      "snippet": "newglossaryentry{${1:label}}{${2:keyvals}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "longnewglossaryentry{}{}{}": {
-      "snippet": "longnewglossaryentry{${1:label}}{${2:keyvals}}{${3:description}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "provideglossaryentry{}{}": {
-      "snippet": "provideglossaryentry{${1:label}}{${2:keyvals}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "longprovideglossaryentry{}{}{}": {
-      "snippet": "longprovideglossaryentry{${1:label}}{${2:keyvals}}{${3:description}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "nopostdesc": {},
-    "glspar": {},
-    "glspluralsuffix": {},
-    "glsaddkey{}{}{}{}{}{}{}": {
-      "snippet": "glsaddkey{${1:key}}{${2:default}}{${3:nolink cs}}{${4:nolink ucfirst cs}}{${5:link cs}}{${6:link ucfirst cs}}{${7:link allcaps cs}}"
-    },
-    "glsaddkey*{}{}{}{}{}{}{}": {
-      "snippet": "glsaddkey*{${1:key}}{${2:default}}{${3:nolink cs}}{${4:nolink ucfirst cs}}{${5:link cs}}{${6:link ucfirst cs}}{${7:link allcaps cs}}"
-    },
-    "glsaddstoragekey{}{}{}": {
-      "snippet": "glsaddstoragekey{${1:key}}{${2:default}}{${3:nolink cs}}"
-    },
-    "glssetexpandfield{}": {
-      "snippet": "glssetexpandfield{${1:field}}"
-    },
-    "glssetnoexpandfield{}": {
-      "snippet": "glssetnoexpandfield{${1:field}}"
-    },
-    "glsexpandfields": {},
-    "glsnoexpandfields": {},
-    "loadglsentries{}": {
-      "snippet": "loadglsentries{${1:file}}"
-    },
-    "loadglsentries[]{}": {
-      "snippet": "loadglsentries[${2:type}]{${1:file}}"
-    },
-    "glsmoveentry{}{}": {
-      "snippet": "glsmoveentry{${1:label}}{${2:target glossary label}}"
-    },
-    "glstextformat{}": {
-      "snippet": "glstextformat{${1:text}}"
-    },
-    "glspatchtabularx": {},
-    "gls{}": {
-      "snippet": "gls{${1:label}}"
-    },
-    "gls[]{}": {
-      "snippet": "gls[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "gls{}[]": {
-      "snippet": "gls{${1:label}}[${2:insert}]"
-    },
-    "gls[]{}[]": {
-      "snippet": "gls[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Gls{}": {
-      "snippet": "Gls{${1:label}}"
-    },
-    "Gls[]{}": {
-      "snippet": "Gls[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Gls{}[]": {
-      "snippet": "Gls{${1:label}}[${2:insert}]"
-    },
-    "Gls[]{}[]": {
-      "snippet": "Gls[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLS{}": {
-      "snippet": "GLS{${1:label}}"
-    },
-    "GLS[]{}": {
-      "snippet": "GLS[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLS{}[]": {
-      "snippet": "GLS{${1:label}}[${2:insert}]"
-    },
-    "GLS[]{}[]": {
-      "snippet": "GLS[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "gls*{}": {
-      "snippet": "gls*{${1:label}}"
-    },
-    "gls*[]{}": {
-      "snippet": "gls*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "gls*{}[]": {
-      "snippet": "gls*{${1:label}}[${2:insert}]"
-    },
-    "gls*[]{}[]": {
-      "snippet": "gls*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Gls*{}": {
-      "snippet": "Gls*{${1:label}}"
-    },
-    "Gls*[]{}": {
-      "snippet": "Gls*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Gls*{}[]": {
-      "snippet": "Gls*{${1:label}}[${2:insert}]"
-    },
-    "Gls*[]{}[]": {
-      "snippet": "Gls*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLS*{}": {
-      "snippet": "GLS*{${1:label}}"
-    },
-    "GLS*[]{}": {
-      "snippet": "GLS*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLS*{}[]": {
-      "snippet": "GLS*{${1:label}}[${2:insert}]"
-    },
-    "GLS*[]{}[]": {
-      "snippet": "GLS*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glspl{}": {
-      "snippet": "glspl{${1:label}}"
-    },
-    "glspl[]{}": {
-      "snippet": "glspl[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glspl{}[]": {
-      "snippet": "glspl{${1:label}}[${2:insert}]"
-    },
-    "glspl[]{}[]": {
-      "snippet": "glspl[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glspl{}": {
-      "snippet": "Glspl{${1:label}}"
-    },
-    "Glspl[]{}": {
-      "snippet": "Glspl[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glspl{}[]": {
-      "snippet": "Glspl{${1:label}}[${2:insert}]"
-    },
-    "Glspl[]{}[]": {
-      "snippet": "Glspl[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSpl{}": {
-      "snippet": "GLSpl{${1:label}}"
-    },
-    "GLSpl[]{}": {
-      "snippet": "GLSpl[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSpl{}[]": {
-      "snippet": "GLSpl{${1:label}}[${2:insert}]"
-    },
-    "GLSpl[]{}[]": {
-      "snippet": "GLSpl[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glspl*{}": {
-      "snippet": "glspl*{${1:label}}"
-    },
-    "glspl*[]{}": {
-      "snippet": "glspl*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glspl*{}[]": {
-      "snippet": "glspl*{${1:label}}[${2:insert}]"
-    },
-    "glspl*[]{}[]": {
-      "snippet": "glspl*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glspl*{}": {
-      "snippet": "Glspl*{${1:label}}"
-    },
-    "Glspl*[]{}": {
-      "snippet": "Glspl*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glspl*{}[]": {
-      "snippet": "Glspl*{${1:label}}[${2:insert}]"
-    },
-    "Glspl*[]{}[]": {
-      "snippet": "Glspl*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSpl*{}": {
-      "snippet": "GLSpl*{${1:label}}"
-    },
-    "GLSpl*[]{}": {
-      "snippet": "GLSpl*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSpl*{}[]": {
-      "snippet": "GLSpl*{${1:label}}[${2:insert}]"
-    },
-    "GLSpl*[]{}[]": {
-      "snippet": "GLSpl*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsdisp{}{}": {
-      "snippet": "glsdisp{${1:label}}{${2:text}}"
-    },
-    "glsdisp[]{}{}": {
-      "snippet": "glsdisp[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsdisp*{}{}": {
-      "snippet": "glsdisp*{${1:label}}{${2:text}}"
-    },
-    "glsdisp*[]{}{}": {
-      "snippet": "glsdisp*[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsdisp{}{}": {
-      "snippet": "Glsdisp{${1:label}}{${2:text}}"
-    },
-    "Glsdisp[]{}{}": {
-      "snippet": "Glsdisp[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsdisp*{}{}": {
-      "snippet": "Glsdisp*{${1:label}}{${2:text}}"
-    },
-    "Glsdisp*[]{}{}": {
-      "snippet": "Glsdisp*[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glslink{}{}": {
-      "snippet": "glslink{${1:label}}{${2:text}}"
-    },
-    "glslink[]{}{}": {
-      "snippet": "glslink[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glslink*{}{}": {
-      "snippet": "glslink*{${1:label}}{${2:text}}"
-    },
-    "glslink*[]{}{}": {
-      "snippet": "glslink*[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glslink{}{}": {
-      "snippet": "Glslink{${1:label}}{${2:text}}"
-    },
-    "Glslink[]{}{}": {
-      "snippet": "Glslink[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glslink*{}{}": {
-      "snippet": "Glslink*{${1:label}}{${2:text}}"
-    },
-    "Glslink*[]{}{}": {
-      "snippet": "Glslink*[${3:options}]{${1:label}}{${2:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glstext{}": {
-      "snippet": "glstext{${1:label}}"
-    },
-    "glstext[]{}": {
-      "snippet": "glstext[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glstext{}[]": {
-      "snippet": "glstext{${1:label}}[${2:insert}]"
-    },
-    "glstext[]{}[]": {
-      "snippet": "glstext[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glstext{}": {
-      "snippet": "Glstext{${1:label}}"
-    },
-    "Glstext[]{}": {
-      "snippet": "Glstext[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glstext{}[]": {
-      "snippet": "Glstext{${1:label}}[${2:insert}]"
-    },
-    "Glstext[]{}[]": {
-      "snippet": "Glstext[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLStext{}": {
-      "snippet": "GLStext{${1:label}}"
-    },
-    "GLStext[]{}": {
-      "snippet": "GLStext[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLStext{}[]": {
-      "snippet": "GLStext{${1:label}}[${2:insert}]"
-    },
-    "GLStext[]{}[]": {
-      "snippet": "GLStext[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glstext*{}": {
-      "snippet": "glstext*{${1:label}}"
-    },
-    "glstext*[]{}": {
-      "snippet": "glstext*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glstext*{}[]": {
-      "snippet": "glstext*{${1:label}}[${2:insert}]"
-    },
-    "glstext*[]{}[]": {
-      "snippet": "glstext*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glstext*{}": {
-      "snippet": "Glstext*{${1:label}}"
-    },
-    "Glstext*[]{}": {
-      "snippet": "Glstext*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glstext*{}[]": {
-      "snippet": "Glstext*{${1:label}}[${2:insert}]"
-    },
-    "Glstext*[]{}[]": {
-      "snippet": "Glstext*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLStext*{}": {
-      "snippet": "GLStext*{${1:label}}"
-    },
-    "GLStext*[]{}": {
-      "snippet": "GLStext*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLStext*{}[]": {
-      "snippet": "GLStext*{${1:label}}[${2:insert}]"
-    },
-    "GLStext*[]{}[]": {
-      "snippet": "GLStext*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsfirst{}": {
-      "snippet": "glsfirst{${1:label}}"
-    },
-    "glsfirst[]{}": {
-      "snippet": "glsfirst[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsfirst{}[]": {
-      "snippet": "glsfirst{${1:label}}[${2:insert}]"
-    },
-    "glsfirst[]{}[]": {
-      "snippet": "glsfirst[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsfirst{}": {
-      "snippet": "Glsfirst{${1:label}}"
-    },
-    "Glsfirst[]{}": {
-      "snippet": "Glsfirst[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsfirst{}[]": {
-      "snippet": "Glsfirst{${1:label}}[${2:insert}]"
-    },
-    "Glsfirst[]{}[]": {
-      "snippet": "Glsfirst[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSfirst{}": {
-      "snippet": "GLSfirst{${1:label}}"
-    },
-    "GLSfirst[]{}": {
-      "snippet": "GLSfirst[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSfirst{}[]": {
-      "snippet": "GLSfirst{${1:label}}[${2:insert}]"
-    },
-    "GLSfirst[]{}[]": {
-      "snippet": "GLSfirst[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsfirst*{}": {
-      "snippet": "glsfirst*{${1:label}}"
-    },
-    "glsfirst*[]{}": {
-      "snippet": "glsfirst*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsfirst*{}[]": {
-      "snippet": "glsfirst*{${1:label}}[${2:insert}]"
-    },
-    "glsfirst*[]{}[]": {
-      "snippet": "glsfirst*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsfirst*{}": {
-      "snippet": "Glsfirst*{${1:label}}"
-    },
-    "Glsfirst*[]{}": {
-      "snippet": "Glsfirst*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsfirst*{}[]": {
-      "snippet": "Glsfirst*{${1:label}}[${2:insert}]"
-    },
-    "Glsfirst*[]{}[]": {
-      "snippet": "Glsfirst*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSfirst*{}": {
-      "snippet": "GLSfirst*{${1:label}}"
-    },
-    "GLSfirst*[]{}": {
-      "snippet": "GLSfirst*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSfirst*{}[]": {
-      "snippet": "GLSfirst*{${1:label}}[${2:insert}]"
-    },
-    "GLSfirst*[]{}[]": {
-      "snippet": "GLSfirst*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsplural{}": {
-      "snippet": "glsplural{${1:label}}"
-    },
-    "glsplural[]{}": {
-      "snippet": "glsplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsplural{}[]": {
-      "snippet": "glsplural{${1:label}}[${2:insert}]"
-    },
-    "glsplural[]{}[]": {
-      "snippet": "glsplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsplural{}": {
-      "snippet": "Glsplural{${1:label}}"
-    },
-    "Glsplural[]{}": {
-      "snippet": "Glsplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsplural{}[]": {
-      "snippet": "Glsplural{${1:label}}[${2:insert}]"
-    },
-    "Glsplural[]{}[]": {
-      "snippet": "Glsplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSplural{}": {
-      "snippet": "GLSplural{${1:label}}"
-    },
-    "GLSplural[]{}": {
-      "snippet": "GLSplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSplural{}[]": {
-      "snippet": "GLSplural{${1:label}}[${2:insert}]"
-    },
-    "GLSplural[]{}[]": {
-      "snippet": "GLSplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsplural*{}": {
-      "snippet": "glsplural*{${1:label}}"
-    },
-    "glsplural*[]{}": {
-      "snippet": "glsplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsplural*{}[]": {
-      "snippet": "glsplural*{${1:label}}[${2:insert}]"
-    },
-    "glsplural*[]{}[]": {
-      "snippet": "glsplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsplural*{}": {
-      "snippet": "Glsplural*{${1:label}}"
-    },
-    "Glsplural*[]{}": {
-      "snippet": "Glsplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsplural*{}[]": {
-      "snippet": "Glsplural*{${1:label}}[${2:insert}]"
-    },
-    "Glsplural*[]{}[]": {
-      "snippet": "Glsplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSplural*{}": {
-      "snippet": "GLSplural*{${1:label}}"
-    },
-    "GLSplural*[]{}": {
-      "snippet": "GLSplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSplural*{}[]": {
-      "snippet": "GLSplural*{${1:label}}[${2:insert}]"
-    },
-    "GLSplural*[]{}[]": {
-      "snippet": "GLSplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsfirstplural{}": {
-      "snippet": "glsfirstplural{${1:label}}"
-    },
-    "glsfirstplural[]{}": {
-      "snippet": "glsfirstplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsfirstplural{}[]": {
-      "snippet": "glsfirstplural{${1:label}}[${2:insert}]"
-    },
-    "glsfirstplural[]{}[]": {
-      "snippet": "glsfirstplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsfirstplural{}": {
-      "snippet": "Glsfirstplural{${1:label}}"
-    },
-    "Glsfirstplural[]{}": {
-      "snippet": "Glsfirstplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsfirstplural{}[]": {
-      "snippet": "Glsfirstplural{${1:label}}[${2:insert}]"
-    },
-    "Glsfirstplural[]{}[]": {
-      "snippet": "Glsfirstplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSfirstplural{}": {
-      "snippet": "GLSfirstplural{${1:label}}"
-    },
-    "GLSfirstplural[]{}": {
-      "snippet": "GLSfirstplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSfirstplural{}[]": {
-      "snippet": "GLSfirstplural{${1:label}}[${2:insert}]"
-    },
-    "GLSfirstplural[]{}[]": {
-      "snippet": "GLSfirstplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsfirstplural*{}": {
-      "snippet": "glsfirstplural*{${1:label}}"
-    },
-    "glsfirstplural*[]{}": {
-      "snippet": "glsfirstplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsfirstplural*{}[]": {
-      "snippet": "glsfirstplural*{${1:label}}[${2:insert}]"
-    },
-    "glsfirstplural*[]{}[]": {
-      "snippet": "glsfirstplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsfirstplural*{}": {
-      "snippet": "Glsfirstplural*{${1:label}}"
-    },
-    "Glsfirstplural*[]{}": {
-      "snippet": "Glsfirstplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsfirstplural*{}[]": {
-      "snippet": "Glsfirstplural*{${1:label}}[${2:insert}]"
-    },
-    "Glsfirstplural*[]{}[]": {
-      "snippet": "Glsfirstplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSfirstplural*{}": {
-      "snippet": "GLSfirstplural*{${1:label}}"
-    },
-    "GLSfirstplural*[]{}": {
-      "snippet": "GLSfirstplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSfirstplural*{}[]": {
-      "snippet": "GLSfirstplural*{${1:label}}[${2:insert}]"
-    },
-    "GLSfirstplural*[]{}[]": {
-      "snippet": "GLSfirstplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsname{}": {
-      "snippet": "glsname{${1:label}}"
-    },
-    "glsname[]{}": {
-      "snippet": "glsname[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsname{}[]": {
-      "snippet": "glsname{${1:label}}[${2:insert}]"
-    },
-    "glsname[]{}[]": {
-      "snippet": "glsname[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsname{}": {
-      "snippet": "Glsname{${1:label}}"
-    },
-    "Glsname[]{}": {
-      "snippet": "Glsname[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsname{}[]": {
-      "snippet": "Glsname{${1:label}}[${2:insert}]"
-    },
-    "Glsname[]{}[]": {
-      "snippet": "Glsname[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSname{}": {
-      "snippet": "GLSname{${1:label}}"
-    },
-    "GLSname[]{}": {
-      "snippet": "GLSname[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSname{}[]": {
-      "snippet": "GLSname{${1:label}}[${2:insert}]"
-    },
-    "GLSname[]{}[]": {
-      "snippet": "GLSname[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsname*{}": {
-      "snippet": "glsname*{${1:label}}"
-    },
-    "glsname*[]{}": {
-      "snippet": "glsname*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsname*{}[]": {
-      "snippet": "glsname*{${1:label}}[${2:insert}]"
-    },
-    "glsname*[]{}[]": {
-      "snippet": "glsname*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsname*{}": {
-      "snippet": "Glsname*{${1:label}}"
-    },
-    "Glsname*[]{}": {
-      "snippet": "Glsname*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsname*{}[]": {
-      "snippet": "Glsname*{${1:label}}[${2:insert}]"
-    },
-    "Glsname*[]{}[]": {
-      "snippet": "Glsname*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSname*{}": {
-      "snippet": "GLSname*{${1:label}}"
-    },
-    "GLSname*[]{}": {
-      "snippet": "GLSname*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSname*{}[]": {
-      "snippet": "GLSname*{${1:label}}[${2:insert}]"
-    },
-    "GLSname*[]{}[]": {
-      "snippet": "GLSname*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glssymbol{}": {
-      "snippet": "glssymbol{${1:label}}"
-    },
-    "glssymbol[]{}": {
-      "snippet": "glssymbol[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glssymbol{}[]": {
-      "snippet": "glssymbol{${1:label}}[${2:insert}]"
-    },
-    "glssymbol[]{}[]": {
-      "snippet": "glssymbol[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glssymbol{}": {
-      "snippet": "Glssymbol{${1:label}}"
-    },
-    "Glssymbol[]{}": {
-      "snippet": "Glssymbol[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glssymbol{}[]": {
-      "snippet": "Glssymbol{${1:label}}[${2:insert}]"
-    },
-    "Glssymbol[]{}[]": {
-      "snippet": "Glssymbol[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSsymbol{}": {
-      "snippet": "GLSsymbol{${1:label}}"
-    },
-    "GLSsymbol[]{}": {
-      "snippet": "GLSsymbol[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSsymbol{}[]": {
-      "snippet": "GLSsymbol{${1:label}}[${2:insert}]"
-    },
-    "GLSsymbol[]{}[]": {
-      "snippet": "GLSsymbol[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glssymbol*{}": {
-      "snippet": "glssymbol*{${1:label}}"
-    },
-    "glssymbol*[]{}": {
-      "snippet": "glssymbol*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glssymbol*{}[]": {
-      "snippet": "glssymbol*{${1:label}}[${2:insert}]"
-    },
-    "glssymbol*[]{}[]": {
-      "snippet": "glssymbol*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glssymbol*{}": {
-      "snippet": "Glssymbol*{${1:label}}"
-    },
-    "Glssymbol*[]{}": {
-      "snippet": "Glssymbol*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glssymbol*{}[]": {
-      "snippet": "Glssymbol*{${1:label}}[${2:insert}]"
-    },
-    "Glssymbol*[]{}[]": {
-      "snippet": "Glssymbol*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSsymbol*{}": {
-      "snippet": "GLSsymbol*{${1:label}}"
-    },
-    "GLSsymbol*[]{}": {
-      "snippet": "GLSsymbol*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSsymbol*{}[]": {
-      "snippet": "GLSsymbol*{${1:label}}[${2:insert}]"
-    },
-    "GLSsymbol*[]{}[]": {
-      "snippet": "GLSsymbol*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glssymbolplural{}": {
-      "snippet": "glssymbolplural{${1:label}}"
-    },
-    "glssymbolplural[]{}": {
-      "snippet": "glssymbolplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glssymbolplural{}[]": {
-      "snippet": "glssymbolplural{${1:label}}[${2:insert}]"
-    },
-    "glssymbolplural[]{}[]": {
-      "snippet": "glssymbolplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glssymbolplural{}": {
-      "snippet": "Glssymbolplural{${1:label}}"
-    },
-    "Glssymbolplural[]{}": {
-      "snippet": "Glssymbolplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glssymbolplural{}[]": {
-      "snippet": "Glssymbolplural{${1:label}}[${2:insert}]"
-    },
-    "Glssymbolplural[]{}[]": {
-      "snippet": "Glssymbolplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSsymbolplural{}": {
-      "snippet": "GLSsymbolplural{${1:label}}"
-    },
-    "GLSsymbolplural[]{}": {
-      "snippet": "GLSsymbolplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSsymbolplural{}[]": {
-      "snippet": "GLSsymbolplural{${1:label}}[${2:insert}]"
-    },
-    "GLSsymbolplural[]{}[]": {
-      "snippet": "GLSsymbolplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glssymbolplural*{}": {
-      "snippet": "glssymbolplural*{${1:label}}"
-    },
-    "glssymbolplural*[]{}": {
-      "snippet": "glssymbolplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glssymbolplural*{}[]": {
-      "snippet": "glssymbolplural*{${1:label}}[${2:insert}]"
-    },
-    "glssymbolplural*[]{}[]": {
-      "snippet": "glssymbolplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glssymbolplural*{}": {
-      "snippet": "Glssymbolplural*{${1:label}}"
-    },
-    "Glssymbolplural*[]{}": {
-      "snippet": "Glssymbolplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glssymbolplural*{}[]": {
-      "snippet": "Glssymbolplural*{${1:label}}[${2:insert}]"
-    },
-    "Glssymbolplural*[]{}[]": {
-      "snippet": "Glssymbolplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSsymbolplural*{}": {
-      "snippet": "GLSsymbolplural*{${1:label}}"
-    },
-    "GLSsymbolplural*[]{}": {
-      "snippet": "GLSsymbolplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSsymbolplural*{}[]": {
-      "snippet": "GLSsymbolplural*{${1:label}}[${2:insert}]"
-    },
-    "GLSsymbolplural*[]{}[]": {
-      "snippet": "GLSsymbolplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsdesc{}": {
-      "snippet": "glsdesc{${1:label}}"
-    },
-    "glsdesc[]{}": {
-      "snippet": "glsdesc[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsdesc{}[]": {
-      "snippet": "glsdesc{${1:label}}[${2:insert}]"
-    },
-    "glsdesc[]{}[]": {
-      "snippet": "glsdesc[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsdesc{}": {
-      "snippet": "Glsdesc{${1:label}}"
-    },
-    "Glsdesc[]{}": {
-      "snippet": "Glsdesc[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsdesc{}[]": {
-      "snippet": "Glsdesc{${1:label}}[${2:insert}]"
-    },
-    "Glsdesc[]{}[]": {
-      "snippet": "Glsdesc[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSdesc{}": {
-      "snippet": "GLSdesc{${1:label}}"
-    },
-    "GLSdesc[]{}": {
-      "snippet": "GLSdesc[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSdesc{}[]": {
-      "snippet": "GLSdesc{${1:label}}[${2:insert}]"
-    },
-    "GLSdesc[]{}[]": {
-      "snippet": "GLSdesc[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsdesc*{}": {
-      "snippet": "glsdesc*{${1:label}}"
-    },
-    "glsdesc*[]{}": {
-      "snippet": "glsdesc*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsdesc*{}[]": {
-      "snippet": "glsdesc*{${1:label}}[${2:insert}]"
-    },
-    "glsdesc*[]{}[]": {
-      "snippet": "glsdesc*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsdesc*{}": {
-      "snippet": "Glsdesc*{${1:label}}"
-    },
-    "Glsdesc*[]{}": {
-      "snippet": "Glsdesc*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsdesc*{}[]": {
-      "snippet": "Glsdesc*{${1:label}}[${2:insert}]"
-    },
-    "Glsdesc*[]{}[]": {
-      "snippet": "Glsdesc*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSdesc*{}": {
-      "snippet": "GLSdesc*{${1:label}}"
-    },
-    "GLSdesc*[]{}": {
-      "snippet": "GLSdesc*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSdesc*{}[]": {
-      "snippet": "GLSdesc*{${1:label}}[${2:insert}]"
-    },
-    "GLSdesc*[]{}[]": {
-      "snippet": "GLSdesc*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsdescplural{}": {
-      "snippet": "glsdescplural{${1:label}}"
-    },
-    "glsdescplural[]{}": {
-      "snippet": "glsdescplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsdescplural{}[]": {
-      "snippet": "glsdescplural{${1:label}}[${2:insert}]"
-    },
-    "glsdescplural[]{}[]": {
-      "snippet": "glsdescplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsdescplural{}": {
-      "snippet": "Glsdescplural{${1:label}}"
-    },
-    "Glsdescplural[]{}": {
-      "snippet": "Glsdescplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsdescplural{}[]": {
-      "snippet": "Glsdescplural{${1:label}}[${2:insert}]"
-    },
-    "Glsdescplural[]{}[]": {
-      "snippet": "Glsdescplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSdescplural{}": {
-      "snippet": "GLSdescplural{${1:label}}"
-    },
-    "GLSdescplural[]{}": {
-      "snippet": "GLSdescplural[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSdescplural{}[]": {
-      "snippet": "GLSdescplural{${1:label}}[${2:insert}]"
-    },
-    "GLSdescplural[]{}[]": {
-      "snippet": "GLSdescplural[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsdescplural*{}": {
-      "snippet": "glsdescplural*{${1:label}}"
-    },
-    "glsdescplural*[]{}": {
-      "snippet": "glsdescplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsdescplural*{}[]": {
-      "snippet": "glsdescplural*{${1:label}}[${2:insert}]"
-    },
-    "glsdescplural*[]{}[]": {
-      "snippet": "glsdescplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsdescplural*{}": {
-      "snippet": "Glsdescplural*{${1:label}}"
-    },
-    "Glsdescplural*[]{}": {
-      "snippet": "Glsdescplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsdescplural*{}[]": {
-      "snippet": "Glsdescplural*{${1:label}}[${2:insert}]"
-    },
-    "Glsdescplural*[]{}[]": {
-      "snippet": "Glsdescplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSdescplural*{}": {
-      "snippet": "GLSdescplural*{${1:label}}"
-    },
-    "GLSdescplural*[]{}": {
-      "snippet": "GLSdescplural*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSdescplural*{}[]": {
-      "snippet": "GLSdescplural*{${1:label}}[${2:insert}]"
-    },
-    "GLSdescplural*[]{}[]": {
-      "snippet": "GLSdescplural*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuseri{}": {
-      "snippet": "glsuseri{${1:label}}"
-    },
-    "glsuseri[]{}": {
-      "snippet": "glsuseri[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuseri{}[]": {
-      "snippet": "glsuseri{${1:label}}[${2:insert}]"
-    },
-    "glsuseri[]{}[]": {
-      "snippet": "glsuseri[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuseri{}": {
-      "snippet": "Glsuseri{${1:label}}"
-    },
-    "Glsuseri[]{}": {
-      "snippet": "Glsuseri[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuseri{}[]": {
-      "snippet": "Glsuseri{${1:label}}[${2:insert}]"
-    },
-    "Glsuseri[]{}[]": {
-      "snippet": "Glsuseri[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuseri{}": {
-      "snippet": "GLSuseri{${1:label}}"
-    },
-    "GLSuseri[]{}": {
-      "snippet": "GLSuseri[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuseri{}[]": {
-      "snippet": "GLSuseri{${1:label}}[${2:insert}]"
-    },
-    "GLSuseri[]{}[]": {
-      "snippet": "GLSuseri[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuseri*{}": {
-      "snippet": "glsuseri*{${1:label}}"
-    },
-    "glsuseri*[]{}": {
-      "snippet": "glsuseri*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuseri*{}[]": {
-      "snippet": "glsuseri*{${1:label}}[${2:insert}]"
-    },
-    "glsuseri*[]{}[]": {
-      "snippet": "glsuseri*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuseri*{}": {
-      "snippet": "Glsuseri*{${1:label}}"
-    },
-    "Glsuseri*[]{}": {
-      "snippet": "Glsuseri*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuseri*{}[]": {
-      "snippet": "Glsuseri*{${1:label}}[${2:insert}]"
-    },
-    "Glsuseri*[]{}[]": {
-      "snippet": "Glsuseri*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuseri*{}": {
-      "snippet": "GLSuseri*{${1:label}}"
-    },
-    "GLSuseri*[]{}": {
-      "snippet": "GLSuseri*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuseri*{}[]": {
-      "snippet": "GLSuseri*{${1:label}}[${2:insert}]"
-    },
-    "GLSuseri*[]{}[]": {
-      "snippet": "GLSuseri*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuserii{}": {
-      "snippet": "glsuserii{${1:label}}"
-    },
-    "glsuserii[]{}": {
-      "snippet": "glsuserii[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuserii{}[]": {
-      "snippet": "glsuserii{${1:label}}[${2:insert}]"
-    },
-    "glsuserii[]{}[]": {
-      "snippet": "glsuserii[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuserii{}": {
-      "snippet": "Glsuserii{${1:label}}"
-    },
-    "Glsuserii[]{}": {
-      "snippet": "Glsuserii[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuserii{}[]": {
-      "snippet": "Glsuserii{${1:label}}[${2:insert}]"
-    },
-    "Glsuserii[]{}[]": {
-      "snippet": "Glsuserii[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuserii{}": {
-      "snippet": "GLSuserii{${1:label}}"
-    },
-    "GLSuserii[]{}": {
-      "snippet": "GLSuserii[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuserii{}[]": {
-      "snippet": "GLSuserii{${1:label}}[${2:insert}]"
-    },
-    "GLSuserii[]{}[]": {
-      "snippet": "GLSuserii[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuserii*{}": {
-      "snippet": "glsuserii*{${1:label}}"
-    },
-    "glsuserii*[]{}": {
-      "snippet": "glsuserii*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuserii*{}[]": {
-      "snippet": "glsuserii*{${1:label}}[${2:insert}]"
-    },
-    "glsuserii*[]{}[]": {
-      "snippet": "glsuserii*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuserii*{}": {
-      "snippet": "Glsuserii*{${1:label}}"
-    },
-    "Glsuserii*[]{}": {
-      "snippet": "Glsuserii*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuserii*{}[]": {
-      "snippet": "Glsuserii*{${1:label}}[${2:insert}]"
-    },
-    "Glsuserii*[]{}[]": {
-      "snippet": "Glsuserii*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuserii*{}": {
-      "snippet": "GLSuserii*{${1:label}}"
-    },
-    "GLSuserii*[]{}": {
-      "snippet": "GLSuserii*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuserii*{}[]": {
-      "snippet": "GLSuserii*{${1:label}}[${2:insert}]"
-    },
-    "GLSuserii*[]{}[]": {
-      "snippet": "GLSuserii*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuseriii{}": {
-      "snippet": "glsuseriii{${1:label}}"
-    },
-    "glsuseriii[]{}": {
-      "snippet": "glsuseriii[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuseriii{}[]": {
-      "snippet": "glsuseriii{${1:label}}[${2:insert}]"
-    },
-    "glsuseriii[]{}[]": {
-      "snippet": "glsuseriii[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuseriii{}": {
-      "snippet": "Glsuseriii{${1:label}}"
-    },
-    "Glsuseriii[]{}": {
-      "snippet": "Glsuseriii[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuseriii{}[]": {
-      "snippet": "Glsuseriii{${1:label}}[${2:insert}]"
-    },
-    "Glsuseriii[]{}[]": {
-      "snippet": "Glsuseriii[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuseriii{}": {
-      "snippet": "GLSuseriii{${1:label}}"
-    },
-    "GLSuseriii[]{}": {
-      "snippet": "GLSuseriii[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuseriii{}[]": {
-      "snippet": "GLSuseriii{${1:label}}[${2:insert}]"
-    },
-    "GLSuseriii[]{}[]": {
-      "snippet": "GLSuseriii[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuseriii*{}": {
-      "snippet": "glsuseriii*{${1:label}}"
-    },
-    "glsuseriii*[]{}": {
-      "snippet": "glsuseriii*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuseriii*{}[]": {
-      "snippet": "glsuseriii*{${1:label}}[${2:insert}]"
-    },
-    "glsuseriii*[]{}[]": {
-      "snippet": "glsuseriii*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuseriii*{}": {
-      "snippet": "Glsuseriii*{${1:label}}"
-    },
-    "Glsuseriii*[]{}": {
-      "snippet": "Glsuseriii*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuseriii*{}[]": {
-      "snippet": "Glsuseriii*{${1:label}}[${2:insert}]"
-    },
-    "Glsuseriii*[]{}[]": {
-      "snippet": "Glsuseriii*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuseriii*{}": {
-      "snippet": "GLSuseriii*{${1:label}}"
-    },
-    "GLSuseriii*[]{}": {
-      "snippet": "GLSuseriii*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuseriii*{}[]": {
-      "snippet": "GLSuseriii*{${1:label}}[${2:insert}]"
-    },
-    "GLSuseriii*[]{}[]": {
-      "snippet": "GLSuseriii*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuseriv{}": {
-      "snippet": "glsuseriv{${1:label}}"
-    },
-    "glsuseriv[]{}": {
-      "snippet": "glsuseriv[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuseriv{}[]": {
-      "snippet": "glsuseriv{${1:label}}[${2:insert}]"
-    },
-    "glsuseriv[]{}[]": {
-      "snippet": "glsuseriv[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuseriv{}": {
-      "snippet": "Glsuseriv{${1:label}}"
-    },
-    "Glsuseriv[]{}": {
-      "snippet": "Glsuseriv[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuseriv{}[]": {
-      "snippet": "Glsuseriv{${1:label}}[${2:insert}]"
-    },
-    "Glsuseriv[]{}[]": {
-      "snippet": "Glsuseriv[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuseriv{}": {
-      "snippet": "GLSuseriv{${1:label}}"
-    },
-    "GLSuseriv[]{}": {
-      "snippet": "GLSuseriv[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuseriv{}[]": {
-      "snippet": "GLSuseriv{${1:label}}[${2:insert}]"
-    },
-    "GLSuseriv[]{}[]": {
-      "snippet": "GLSuseriv[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuseriv*{}": {
-      "snippet": "glsuseriv*{${1:label}}"
-    },
-    "glsuseriv*[]{}": {
-      "snippet": "glsuseriv*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuseriv*{}[]": {
-      "snippet": "glsuseriv*{${1:label}}[${2:insert}]"
-    },
-    "glsuseriv*[]{}[]": {
-      "snippet": "glsuseriv*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuseriv*{}": {
-      "snippet": "Glsuseriv*{${1:label}}"
-    },
-    "Glsuseriv*[]{}": {
-      "snippet": "Glsuseriv*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuseriv*{}[]": {
-      "snippet": "Glsuseriv*{${1:label}}[${2:insert}]"
-    },
-    "Glsuseriv*[]{}[]": {
-      "snippet": "Glsuseriv*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuseriv*{}": {
-      "snippet": "GLSuseriv*{${1:label}}"
-    },
-    "GLSuseriv*[]{}": {
-      "snippet": "GLSuseriv*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuseriv*{}[]": {
-      "snippet": "GLSuseriv*{${1:label}}[${2:insert}]"
-    },
-    "GLSuseriv*[]{}[]": {
-      "snippet": "GLSuseriv*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuserv{}": {
-      "snippet": "glsuserv{${1:label}}"
-    },
-    "glsuserv[]{}": {
-      "snippet": "glsuserv[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuserv{}[]": {
-      "snippet": "glsuserv{${1:label}}[${2:insert}]"
-    },
-    "glsuserv[]{}[]": {
-      "snippet": "glsuserv[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuserv{}": {
-      "snippet": "Glsuserv{${1:label}}"
-    },
-    "Glsuserv[]{}": {
-      "snippet": "Glsuserv[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuserv{}[]": {
-      "snippet": "Glsuserv{${1:label}}[${2:insert}]"
-    },
-    "Glsuserv[]{}[]": {
-      "snippet": "Glsuserv[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuserv{}": {
-      "snippet": "GLSuserv{${1:label}}"
-    },
-    "GLSuserv[]{}": {
-      "snippet": "GLSuserv[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuserv{}[]": {
-      "snippet": "GLSuserv{${1:label}}[${2:insert}]"
-    },
-    "GLSuserv[]{}[]": {
-      "snippet": "GLSuserv[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuserv*{}": {
-      "snippet": "glsuserv*{${1:label}}"
-    },
-    "glsuserv*[]{}": {
-      "snippet": "glsuserv*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuserv*{}[]": {
-      "snippet": "glsuserv*{${1:label}}[${2:insert}]"
-    },
-    "glsuserv*[]{}[]": {
-      "snippet": "glsuserv*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuserv*{}": {
-      "snippet": "Glsuserv*{${1:label}}"
-    },
-    "Glsuserv*[]{}": {
-      "snippet": "Glsuserv*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuserv*{}[]": {
-      "snippet": "Glsuserv*{${1:label}}[${2:insert}]"
-    },
-    "Glsuserv*[]{}[]": {
-      "snippet": "Glsuserv*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuserv*{}": {
-      "snippet": "GLSuserv*{${1:label}}"
-    },
-    "GLSuserv*[]{}": {
-      "snippet": "GLSuserv*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuserv*{}[]": {
-      "snippet": "GLSuserv*{${1:label}}[${2:insert}]"
-    },
-    "GLSuserv*[]{}[]": {
-      "snippet": "GLSuserv*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuservi{}": {
-      "snippet": "glsuservi{${1:label}}"
-    },
-    "glsuservi[]{}": {
-      "snippet": "glsuservi[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuservi{}[]": {
-      "snippet": "glsuservi{${1:label}}[${2:insert}]"
-    },
-    "glsuservi[]{}[]": {
-      "snippet": "glsuservi[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuservi{}": {
-      "snippet": "Glsuservi{${1:label}}"
-    },
-    "Glsuservi[]{}": {
-      "snippet": "Glsuservi[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Glsuservi{}[]": {
-      "snippet": "Glsuservi{${1:label}}[${2:insert}]"
-    },
-    "Glsuservi[]{}[]": {
-      "snippet": "Glsuservi[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuservi{}": {
-      "snippet": "GLSuservi{${1:label}}"
-    },
-    "GLSuservi[]{}": {
-      "snippet": "GLSuservi[${2:options}]{${1:label}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GLSuservi{}[]": {
-      "snippet": "GLSuservi{${1:label}}[${2:insert}]"
-    },
-    "GLSuservi[]{}[]": {
-      "snippet": "GLSuservi[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "glsuservi*{}": {
-      "snippet": "glsuservi*{${1:label}}"
-    },
-    "glsuservi*[]{}": {
-      "snippet": "glsuservi*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsuservi*{}[]": {
-      "snippet": "glsuservi*{${1:label}}[${2:insert}]"
-    },
-    "glsuservi*[]{}[]": {
-      "snippet": "glsuservi*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuservi*{}": {
-      "snippet": "Glsuservi*{${1:label}}"
-    },
-    "Glsuservi*[]{}": {
-      "snippet": "Glsuservi*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Glsuservi*{}[]": {
-      "snippet": "Glsuservi*{${1:label}}[${2:insert}]"
-    },
-    "Glsuservi*[]{}[]": {
-      "snippet": "Glsuservi*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuservi*{}": {
-      "snippet": "GLSuservi*{${1:label}}"
-    },
-    "GLSuservi*[]{}": {
-      "snippet": "GLSuservi*[${2:options}]{${1:label}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GLSuservi*{}[]": {
-      "snippet": "GLSuservi*{${1:label}}[${2:insert}]"
-    },
-    "GLSuservi*[]{}[]": {
-      "snippet": "GLSuservi*[${2:options}]{${1:label}}[${3:insert}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "glsentryfmt": {},
-    "defglsentryfmt{}": {
-      "snippet": "defglsentryfmt{${1:definition}}"
-    },
-    "defglsentryfmt[]{}": {
-      "snippet": "defglsentryfmt[${2:glossary-type}]{${1:definition}}"
-    },
-    "glslabel": {},
-    "glstype": {},
-    "glsinsert": {},
-    "glsifplural{}{}": {
-      "snippet": "glsifplural{${1:true}}{${2:false}}"
-    },
-    "glscapscase{}{}{}": {
-      "snippet": "glscapscase{${1:no case}}{${2:first uc}}{${3:all caps}}"
-    },
-    "glscustomtext": {},
-    "glsifhyperon{}{}": {
-      "snippet": "glsifhyperon{${1:true}}{${2:false}}"
-    },
-    "glslinkvar{}{}{}": {
-      "snippet": "glslinkvar{${1:unmodified}}{${2:star case}}{${3:plus case}}"
-    },
-    "glsgenentryfmt": {},
-    "glsgenacfmt": {},
-    "genacrfullformat{}{}": {
-      "snippet": "genacrfullformat{${1:label}}{${2:insert}}"
-    },
-    "genplacrfullformat{}{}": {
-      "snippet": "genplacrfullformat{${1:label}}{${2:insert}}"
-    },
-    "Genacrfullformat{}{}": {
-      "snippet": "Genacrfullformat{${1:label}}{${2:insert}}"
-    },
-    "Genplacrfullformat{}{}": {
-      "snippet": "Genplacrfullformat{${1:label}}{${2:insert}}"
-    },
-    "glslinkpostsetkeys": {},
-    "glspostlinkhook": {},
-    "glsdisablehyper": {},
-    "glsenablehyper": {},
-    "glsentrytitlecase{}{}": {
-      "snippet": "glsentrytitlecase{${1:label}}{${2:field}}"
-    },
-    "glshyperlink{}": {
-      "snippet": "glshyperlink{${1:label}}"
-    },
-    "glshyperlink[]{}": {
-      "snippet": "glshyperlink[${2:text}]{${1:label}}"
-    },
-    "glsentryname{}": {
-      "snippet": "glsentryname{${1:label}}"
-    },
-    "Glsentryname{}": {
-      "snippet": "Glsentryname{${1:label}}"
-    },
-    "glossentryname{}": {
-      "snippet": "glossentryname{${1:label}}"
-    },
-    "Glossentryname{}": {
-      "snippet": "Glossentryname{${1:label}}"
-    },
-    "glsentrytext{}": {
-      "snippet": "glsentrytext{${1:label}}"
-    },
-    "Glsentrytext{}": {
-      "snippet": "Glsentrytext{${1:label}}"
-    },
-    "glsentryplural{}": {
-      "snippet": "glsentryplural{${1:label}}"
-    },
-    "Glsentryplural{}": {
-      "snippet": "Glsentryplural{${1:label}}"
-    },
-    "glsentryfirst{}": {
-      "snippet": "glsentryfirst{${1:label}}"
-    },
-    "Glsentryfirst{}": {
-      "snippet": "Glsentryfirst{${1:label}}"
-    },
-    "glsentryfirstplural{}": {
-      "snippet": "glsentryfirstplural{${1:label}}"
-    },
-    "Glsentryfirstplural{}": {
-      "snippet": "Glsentryfirstplural{${1:label}}"
-    },
-    "glsentrydesc{}": {
-      "snippet": "glsentrydesc{${1:label}}"
-    },
-    "Glsentrydesc{}": {
-      "snippet": "Glsentrydesc{${1:label}}"
-    },
-    "glossentrydesc{}": {
-      "snippet": "glossentrydesc{${1:label}}"
-    },
-    "Glossentrydesc{}": {
-      "snippet": "Glossentrydesc{${1:label}}"
-    },
-    "glsentrydescplural{}": {
-      "snippet": "glsentrydescplural{${1:label}}"
-    },
-    "Glsentrydescplural{}": {
-      "snippet": "Glsentrydescplural{${1:label}}"
-    },
-    "glsentrysymbol{}": {
-      "snippet": "glsentrysymbol{${1:label}}"
-    },
-    "Glsentrysymbol{}": {
-      "snippet": "Glsentrysymbol{${1:label}}"
-    },
-    "glossentrysymbol{}": {
-      "snippet": "glossentrysymbol{${1:label}}"
-    },
-    "Glossentrysymbol{}": {
-      "snippet": "Glossentrysymbol{${1:label}}"
-    },
-    "glsentrysymbolplural{}": {
-      "snippet": "glsentrysymbolplural{${1:label}}"
-    },
-    "Glsentrysymbolplural{}": {
-      "snippet": "Glsentrysymbolplural{${1:label}}"
-    },
-    "glsentryuseri{}": {
-      "snippet": "glsentryuseri{${1:label}}"
-    },
-    "Glsentryuseri{}": {
-      "snippet": "Glsentryuseri{${1:label}}"
-    },
-    "glsentryuserii{}": {
-      "snippet": "glsentryuserii{${1:label}}"
-    },
-    "Glsentryuserii{}": {
-      "snippet": "Glsentryuserii{${1:label}}"
-    },
-    "glsentryuseriii{}": {
-      "snippet": "glsentryuseriii{${1:label}}"
-    },
-    "Glsentryuseriii{}": {
-      "snippet": "Glsentryuseriii{${1:label}}"
-    },
-    "glsentryuseriv{}": {
-      "snippet": "glsentryuseriv{${1:label}}"
-    },
-    "Glsentryuseriv{}": {
-      "snippet": "Glsentryuseriv{${1:label}}"
-    },
-    "glsentryuserv{}": {
-      "snippet": "glsentryuserv{${1:label}}"
-    },
-    "Glsentryuserv{}": {
-      "snippet": "Glsentryuserv{${1:label}}"
-    },
-    "glsentryuservi{}": {
-      "snippet": "glsentryuservi{${1:label}}"
-    },
-    "Glsentryuservi{}": {
-      "snippet": "Glsentryuservi{${1:label}}"
-    },
-    "glsentrynumberlist{}": {
-      "snippet": "glsentrynumberlist{${1:label}}"
-    },
-    "glsdisplaynumberlist{}": {
-      "snippet": "glsdisplaynumberlist{${1:label}}"
-    },
-    "glsnumlistsep": {},
-    "glsnumlistlastsep": {},
-    "glsnoidxdisplayloclisthandler{}": {
-      "snippet": "glsnoidxdisplayloclisthandler{${1:location}}"
-    },
-    "newacronym{}{}{}": {
-      "snippet": "newacronym{${1:label}}{${2:abbrv}}{${3:long}}"
-    },
-    "newacronym[]{}{}{}": {
-      "snippet": "newacronym[${4:options}]{${1:label}}{${2:abbrv}}{${3:long}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "glsacrpluralsuffix": {},
-    "acrshort{}": {
-      "snippet": "acrshort{${1:label}}"
-    },
-    "acrshort[]{}": {
-      "snippet": "acrshort[${2:options}]{${1:label}}"
-    },
-    "acrshort{}[]": {
-      "snippet": "acrshort{${1:label}}[${2:insert}]"
-    },
-    "acrshort[]{}[]": {
-      "snippet": "acrshort[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrshort*{}": {
-      "snippet": "acrshort*{${1:label}}"
-    },
-    "acrshort*[]{}": {
-      "snippet": "acrshort*[${2:options}]{${1:label}}"
-    },
-    "acrshort*{}[]": {
-      "snippet": "acrshort*{${1:label}}[${2:insert}]"
-    },
-    "acrshort*[]{}[]": {
-      "snippet": "acrshort*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrshort{}": {
-      "snippet": "Acrshort{${1:label}}"
-    },
-    "Acrshort[]{}": {
-      "snippet": "Acrshort[${2:options}]{${1:label}}"
-    },
-    "Acrshort{}[]": {
-      "snippet": "Acrshort{${1:label}}[${2:insert}]"
-    },
-    "Acrshort[]{}[]": {
-      "snippet": "Acrshort[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrshort*{}": {
-      "snippet": "Acrshort*{${1:label}}"
-    },
-    "Acrshort*[]{}": {
-      "snippet": "Acrshort*[${2:options}]{${1:label}}"
-    },
-    "Acrshort*{}[]": {
-      "snippet": "Acrshort*{${1:label}}[${2:insert}]"
-    },
-    "Acrshort*[]{}[]": {
-      "snippet": "Acrshort*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRshort{}": {
-      "snippet": "ACRshort{${1:label}}"
-    },
-    "ACRshort[]{}": {
-      "snippet": "ACRshort[${2:options}]{${1:label}}"
-    },
-    "ACRshort{}[]": {
-      "snippet": "ACRshort{${1:label}}[${2:insert}]"
-    },
-    "ACRshort[]{}[]": {
-      "snippet": "ACRshort[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRshort*{}": {
-      "snippet": "ACRshort*{${1:label}}"
-    },
-    "ACRshort*[]{}": {
-      "snippet": "ACRshort*[${2:options}]{${1:label}}"
-    },
-    "ACRshort*{}[]": {
-      "snippet": "ACRshort*{${1:label}}[${2:insert}]"
-    },
-    "ACRshort*[]{}[]": {
-      "snippet": "ACRshort*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrshortpl{}": {
-      "snippet": "acrshortpl{${1:label}}"
-    },
-    "acrshortpl[]{}": {
-      "snippet": "acrshortpl[${2:options}]{${1:label}}"
-    },
-    "acrshortpl{}[]": {
-      "snippet": "acrshortpl{${1:label}}[${2:insert}]"
-    },
-    "acrshortpl[]{}[]": {
-      "snippet": "acrshortpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrshortpl*{}": {
-      "snippet": "acrshortpl*{${1:label}}"
-    },
-    "acrshortpl*[]{}": {
-      "snippet": "acrshortpl*[${2:options}]{${1:label}}"
-    },
-    "acrshortpl*{}[]": {
-      "snippet": "acrshortpl*{${1:label}}[${2:insert}]"
-    },
-    "acrshortpl*[]{}[]": {
-      "snippet": "acrshortpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrshortpl{}": {
-      "snippet": "Acrshortpl{${1:label}}"
-    },
-    "Acrshortpl[]{}": {
-      "snippet": "Acrshortpl[${2:options}]{${1:label}}"
-    },
-    "Acrshortpl{}[]": {
-      "snippet": "Acrshortpl{${1:label}}[${2:insert}]"
-    },
-    "Acrshortpl[]{}[]": {
-      "snippet": "Acrshortpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrshortpl*{}": {
-      "snippet": "Acrshortpl*{${1:label}}"
-    },
-    "Acrshortpl*[]{}": {
-      "snippet": "Acrshortpl*[${2:options}]{${1:label}}"
-    },
-    "Acrshortpl*{}[]": {
-      "snippet": "Acrshortpl*{${1:label}}[${2:insert}]"
-    },
-    "Acrshortpl*[]{}[]": {
-      "snippet": "Acrshortpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRshortpl{}": {
-      "snippet": "ACRshortpl{${1:label}}"
-    },
-    "ACRshortpl[]{}": {
-      "snippet": "ACRshortpl[${2:options}]{${1:label}}"
-    },
-    "ACRshortpl{}[]": {
-      "snippet": "ACRshortpl{${1:label}}[${2:insert}]"
-    },
-    "ACRshortpl[]{}[]": {
-      "snippet": "ACRshortpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRshortpl*{}": {
-      "snippet": "ACRshortpl*{${1:label}}"
-    },
-    "ACRshortpl*[]{}": {
-      "snippet": "ACRshortpl*[${2:options}]{${1:label}}"
-    },
-    "ACRshortpl*{}[]": {
-      "snippet": "ACRshortpl*{${1:label}}[${2:insert}]"
-    },
-    "ACRshortpl*[]{}[]": {
-      "snippet": "ACRshortpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrlong{}": {
-      "snippet": "acrlong{${1:label}}"
-    },
-    "acrlong[]{}": {
-      "snippet": "acrlong[${2:options}]{${1:label}}"
-    },
-    "acrlong{}[]": {
-      "snippet": "acrlong{${1:label}}[${2:insert}]"
-    },
-    "acrlong[]{}[]": {
-      "snippet": "acrlong[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrlong*{}": {
-      "snippet": "acrlong*{${1:label}}"
-    },
-    "acrlong*[]{}": {
-      "snippet": "acrlong*[${2:options}]{${1:label}}"
-    },
-    "acrlong*{}[]": {
-      "snippet": "acrlong*{${1:label}}[${2:insert}]"
-    },
-    "acrlong*[]{}[]": {
-      "snippet": "acrlong*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrlong{}": {
-      "snippet": "Acrlong{${1:label}}"
-    },
-    "Acrlong[]{}": {
-      "snippet": "Acrlong[${2:options}]{${1:label}}"
-    },
-    "Acrlong{}[]": {
-      "snippet": "Acrlong{${1:label}}[${2:insert}]"
-    },
-    "Acrlong[]{}[]": {
-      "snippet": "Acrlong[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrlong*{}": {
-      "snippet": "Acrlong*{${1:label}}"
-    },
-    "Acrlong*[]{}": {
-      "snippet": "Acrlong*[${2:options}]{${1:label}}"
-    },
-    "Acrlong*{}[]": {
-      "snippet": "Acrlong*{${1:label}}[${2:insert}]"
-    },
-    "Acrlong*[]{}[]": {
-      "snippet": "Acrlong*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRlong{}": {
-      "snippet": "ACRlong{${1:label}}"
-    },
-    "ACRlong[]{}": {
-      "snippet": "ACRlong[${2:options}]{${1:label}}"
-    },
-    "ACRlong{}[]": {
-      "snippet": "ACRlong{${1:label}}[${2:insert}]"
-    },
-    "ACRlong[]{}[]": {
-      "snippet": "ACRlong[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRlong*{}": {
-      "snippet": "ACRlong*{${1:label}}"
-    },
-    "ACRlong*[]{}": {
-      "snippet": "ACRlong*[${2:options}]{${1:label}}"
-    },
-    "ACRlong*{}[]": {
-      "snippet": "ACRlong*{${1:label}}[${2:insert}]"
-    },
-    "ACRlong*[]{}[]": {
-      "snippet": "ACRlong*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrlongpl{}": {
-      "snippet": "acrlongpl{${1:label}}"
-    },
-    "acrlongpl[]{}": {
-      "snippet": "acrlongpl[${2:options}]{${1:label}}"
-    },
-    "acrlongpl{}[]": {
-      "snippet": "acrlongpl{${1:label}}[${2:insert}]"
-    },
-    "acrlongpl[]{}[]": {
-      "snippet": "acrlongpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrlongpl*{}": {
-      "snippet": "acrlongpl*{${1:label}}"
-    },
-    "acrlongpl*[]{}": {
-      "snippet": "acrlongpl*[${2:options}]{${1:label}}"
-    },
-    "acrlongpl*{}[]": {
-      "snippet": "acrlongpl*{${1:label}}[${2:insert}]"
-    },
-    "acrlongpl*[]{}[]": {
-      "snippet": "acrlongpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrlongpl{}": {
-      "snippet": "Acrlongpl{${1:label}}"
-    },
-    "Acrlongpl[]{}": {
-      "snippet": "Acrlongpl[${2:options}]{${1:label}}"
-    },
-    "Acrlongpl{}[]": {
-      "snippet": "Acrlongpl{${1:label}}[${2:insert}]"
-    },
-    "Acrlongpl[]{}[]": {
-      "snippet": "Acrlongpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrlongpl*{}": {
-      "snippet": "Acrlongpl*{${1:label}}"
-    },
-    "Acrlongpl*[]{}": {
-      "snippet": "Acrlongpl*[${2:options}]{${1:label}}"
-    },
-    "Acrlongpl*{}[]": {
-      "snippet": "Acrlongpl*{${1:label}}[${2:insert}]"
-    },
-    "Acrlongpl*[]{}[]": {
-      "snippet": "Acrlongpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRlongpl{}": {
-      "snippet": "ACRlongpl{${1:label}}"
-    },
-    "ACRlongpl[]{}": {
-      "snippet": "ACRlongpl[${2:options}]{${1:label}}"
-    },
-    "ACRlongpl{}[]": {
-      "snippet": "ACRlongpl{${1:label}}[${2:insert}]"
-    },
-    "ACRlongpl[]{}[]": {
-      "snippet": "ACRlongpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRlongpl*{}": {
-      "snippet": "ACRlongpl*{${1:label}}"
-    },
-    "ACRlongpl*[]{}": {
-      "snippet": "ACRlongpl*[${2:options}]{${1:label}}"
-    },
-    "ACRlongpl*{}[]": {
-      "snippet": "ACRlongpl*{${1:label}}[${2:insert}]"
-    },
-    "ACRlongpl*[]{}[]": {
-      "snippet": "ACRlongpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrfull{}": {
-      "snippet": "acrfull{${1:label}}"
-    },
-    "acrfull[]{}": {
-      "snippet": "acrfull[${2:options}]{${1:label}}"
-    },
-    "acrfull{}[]": {
-      "snippet": "acrfull{${1:label}}[${2:insert}]"
-    },
-    "acrfull[]{}[]": {
-      "snippet": "acrfull[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrfull*{}": {
-      "snippet": "acrfull*{${1:label}}"
-    },
-    "acrfull*[]{}": {
-      "snippet": "acrfull*[${2:options}]{${1:label}}"
-    },
-    "acrfull*{}[]": {
-      "snippet": "acrfull*{${1:label}}[${2:insert}]"
-    },
-    "acrfull*[]{}[]": {
-      "snippet": "acrfull*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrfull{}": {
-      "snippet": "Acrfull{${1:label}}"
-    },
-    "Acrfull[]{}": {
-      "snippet": "Acrfull[${2:options}]{${1:label}}"
-    },
-    "Acrfull{}[]": {
-      "snippet": "Acrfull{${1:label}}[${2:insert}]"
-    },
-    "Acrfull[]{}[]": {
-      "snippet": "Acrfull[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrfull*{}": {
-      "snippet": "Acrfull*{${1:label}}"
-    },
-    "Acrfull*[]{}": {
-      "snippet": "Acrfull*[${2:options}]{${1:label}}"
-    },
-    "Acrfull*{}[]": {
-      "snippet": "Acrfull*{${1:label}}[${2:insert}]"
-    },
-    "Acrfull*[]{}[]": {
-      "snippet": "Acrfull*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRfull{}": {
-      "snippet": "ACRfull{${1:label}}"
-    },
-    "ACRfull[]{}": {
-      "snippet": "ACRfull[${2:options}]{${1:label}}"
-    },
-    "ACRfull{}[]": {
-      "snippet": "ACRfull{${1:label}}[${2:insert}]"
-    },
-    "ACRfull[]{}[]": {
-      "snippet": "ACRfull[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRfull*{}": {
-      "snippet": "ACRfull*{${1:label}}"
-    },
-    "ACRfull*[]{}": {
-      "snippet": "ACRfull*[${2:options}]{${1:label}}"
-    },
-    "ACRfull*{}[]": {
-      "snippet": "ACRfull*{${1:label}}[${2:insert}]"
-    },
-    "ACRfull*[]{}[]": {
-      "snippet": "ACRfull*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrfullpl{}": {
-      "snippet": "acrfullpl{${1:label}}"
-    },
-    "acrfullpl[]{}": {
-      "snippet": "acrfullpl[${2:options}]{${1:label}}"
-    },
-    "acrfullpl{}[]": {
-      "snippet": "acrfullpl{${1:label}}[${2:insert}]"
-    },
-    "acrfullpl[]{}[]": {
-      "snippet": "acrfullpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrfullpl*{}": {
-      "snippet": "acrfullpl*{${1:label}}"
-    },
-    "acrfullpl*[]{}": {
-      "snippet": "acrfullpl*[${2:options}]{${1:label}}"
-    },
-    "acrfullpl*{}[]": {
-      "snippet": "acrfullpl*{${1:label}}[${2:insert}]"
-    },
-    "acrfullpl*[]{}[]": {
-      "snippet": "acrfullpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrfullpl{}": {
-      "snippet": "Acrfullpl{${1:label}}"
-    },
-    "Acrfullpl[]{}": {
-      "snippet": "Acrfullpl[${2:options}]{${1:label}}"
-    },
-    "Acrfullpl{}[]": {
-      "snippet": "Acrfullpl{${1:label}}[${2:insert}]"
-    },
-    "Acrfullpl[]{}[]": {
-      "snippet": "Acrfullpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "Acrfullpl*{}": {
-      "snippet": "Acrfullpl*{${1:label}}"
-    },
-    "Acrfullpl*[]{}": {
-      "snippet": "Acrfullpl*[${2:options}]{${1:label}}"
-    },
-    "Acrfullpl*{}[]": {
-      "snippet": "Acrfullpl*{${1:label}}[${2:insert}]"
-    },
-    "Acrfullpl*[]{}[]": {
-      "snippet": "Acrfullpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRfullpl{}": {
-      "snippet": "ACRfullpl{${1:label}}"
-    },
-    "ACRfullpl[]{}": {
-      "snippet": "ACRfullpl[${2:options}]{${1:label}}"
-    },
-    "ACRfullpl{}[]": {
-      "snippet": "ACRfullpl{${1:label}}[${2:insert}]"
-    },
-    "ACRfullpl[]{}[]": {
-      "snippet": "ACRfullpl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "ACRfullpl*{}": {
-      "snippet": "ACRfullpl*{${1:label}}"
-    },
-    "ACRfullpl*[]{}": {
-      "snippet": "ACRfullpl*[${2:options}]{${1:label}}"
-    },
-    "ACRfullpl*{}[]": {
-      "snippet": "ACRfullpl*{${1:label}}[${2:insert}]"
-    },
-    "ACRfullpl*[]{}[]": {
-      "snippet": "ACRfullpl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "acrfullfmt{}{}{}": {
-      "snippet": "acrfullfmt{${1:options}}{${2:label}}{${3:insert}}"
-    },
-    "ACRfullfmt{}{}{}": {
-      "snippet": "ACRfullfmt{${1:options}}{${2:label}}{${3:insert}}"
-    },
-    "Acrfullfmt{}{}{}": {
-      "snippet": "Acrfullfmt{${1:options}}{${2:label}}{${3:insert}}"
-    },
-    "ACRfullplfmt{}{}{}": {
-      "snippet": "ACRfullplfmt{${1:options}}{${2:label}}{${3:insert}}"
-    },
-    "Acrfullplfmt{}{}{}": {
-      "snippet": "Acrfullplfmt{${1:options}}{${2:label}}{${3:insert}}"
-    },
-    "acrfullplfmt{}{}{}": {
-      "snippet": "acrfullplfmt{${1:options}}{${2:label}}{${3:insert}}"
-    },
-    "acs{}": {
-      "snippet": "acs{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acs[]{}": {
-      "snippet": "acs[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acs{}[]": {
-      "snippet": "acs{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acs[]{}[]": {
-      "snippet": "acs[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acs*{}": {
-      "snippet": "acs*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acs*[]{}": {
-      "snippet": "acs*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acs*{}[]": {
-      "snippet": "acs*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acs*[]{}[]": {
-      "snippet": "acs*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acs{}": {
-      "snippet": "Acs{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acs[]{}": {
-      "snippet": "Acs[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acs{}[]": {
-      "snippet": "Acs{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acs[]{}[]": {
-      "snippet": "Acs[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acs*{}": {
-      "snippet": "Acs*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acs*[]{}": {
-      "snippet": "Acs*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acs*{}[]": {
-      "snippet": "Acs*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acs*[]{}[]": {
-      "snippet": "Acs*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acsp{}": {
-      "snippet": "acsp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acsp[]{}": {
-      "snippet": "acsp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acsp{}[]": {
-      "snippet": "acsp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acsp[]{}[]": {
-      "snippet": "acsp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acsp*{}": {
-      "snippet": "acsp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acsp*[]{}": {
-      "snippet": "acsp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acsp*{}[]": {
-      "snippet": "acsp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acsp*[]{}[]": {
-      "snippet": "acsp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acsp{}": {
-      "snippet": "Acsp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acsp[]{}": {
-      "snippet": "Acsp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acsp{}[]": {
-      "snippet": "Acsp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acsp[]{}[]": {
-      "snippet": "Acsp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acsp*{}": {
-      "snippet": "Acsp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acsp*[]{}": {
-      "snippet": "Acsp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acsp*{}[]": {
-      "snippet": "Acsp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acsp*[]{}[]": {
-      "snippet": "Acsp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acl{}": {
-      "snippet": "acl{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acl[]{}": {
-      "snippet": "acl[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acl{}[]": {
-      "snippet": "acl{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acl[]{}[]": {
-      "snippet": "acl[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acl*{}": {
-      "snippet": "acl*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acl*[]{}": {
-      "snippet": "acl*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acl*{}[]": {
-      "snippet": "acl*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acl*[]{}[]": {
-      "snippet": "acl*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acl{}": {
-      "snippet": "Acl{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acl[]{}": {
-      "snippet": "Acl[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acl{}[]": {
-      "snippet": "Acl{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acl[]{}[]": {
-      "snippet": "Acl[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acl*{}": {
-      "snippet": "Acl*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acl*[]{}": {
-      "snippet": "Acl*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acl*{}[]": {
-      "snippet": "Acl*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acl*[]{}[]": {
-      "snippet": "Acl*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "aclp{}": {
-      "snippet": "aclp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "aclp[]{}": {
-      "snippet": "aclp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "aclp{}[]": {
-      "snippet": "aclp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "aclp[]{}[]": {
-      "snippet": "aclp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "aclp*{}": {
-      "snippet": "aclp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "aclp*[]{}": {
-      "snippet": "aclp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "aclp*{}[]": {
-      "snippet": "aclp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "aclp*[]{}[]": {
-      "snippet": "aclp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Aclp{}": {
-      "snippet": "Aclp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Aclp[]{}": {
-      "snippet": "Aclp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Aclp{}[]": {
-      "snippet": "Aclp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Aclp[]{}[]": {
-      "snippet": "Aclp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Aclp*{}": {
-      "snippet": "Aclp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Aclp*[]{}": {
-      "snippet": "Aclp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Aclp*{}[]": {
-      "snippet": "Aclp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Aclp*[]{}[]": {
-      "snippet": "Aclp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acf{}": {
-      "snippet": "acf{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acf[]{}": {
-      "snippet": "acf[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acf{}[]": {
-      "snippet": "acf{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acf[]{}[]": {
-      "snippet": "acf[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acf*{}": {
-      "snippet": "acf*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acf*[]{}": {
-      "snippet": "acf*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acf*{}[]": {
-      "snippet": "acf*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acf*[]{}[]": {
-      "snippet": "acf*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acf{}": {
-      "snippet": "Acf{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acf[]{}": {
-      "snippet": "Acf[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acf{}[]": {
-      "snippet": "Acf{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acf[]{}[]": {
-      "snippet": "Acf[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acf*{}": {
-      "snippet": "Acf*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acf*[]{}": {
-      "snippet": "Acf*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acf*{}[]": {
-      "snippet": "Acf*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acf*[]{}[]": {
-      "snippet": "Acf*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acfp{}": {
-      "snippet": "acfp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acfp[]{}": {
-      "snippet": "acfp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acfp{}[]": {
-      "snippet": "acfp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acfp[]{}[]": {
-      "snippet": "acfp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acfp*{}": {
-      "snippet": "acfp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acfp*[]{}": {
-      "snippet": "acfp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acfp*{}[]": {
-      "snippet": "acfp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acfp*[]{}[]": {
-      "snippet": "acfp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acfp{}": {
-      "snippet": "Acfp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acfp[]{}": {
-      "snippet": "Acfp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acfp{}[]": {
-      "snippet": "Acfp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acfp[]{}[]": {
-      "snippet": "Acfp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acfp*{}": {
-      "snippet": "Acfp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acfp*[]{}": {
-      "snippet": "Acfp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acfp*{}[]": {
-      "snippet": "Acfp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acfp*[]{}[]": {
-      "snippet": "Acfp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "ac{}": {
-      "snippet": "ac{${1:label}}",
-      "option": "shortcuts"
-    },
-    "ac[]{}": {
-      "snippet": "ac[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "ac{}[]": {
-      "snippet": "ac{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "ac[]{}[]": {
-      "snippet": "ac[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Ac{}": {
-      "snippet": "Ac{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Ac[]{}": {
-      "snippet": "Ac[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Ac{}[]": {
-      "snippet": "Ac{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Ac[]{}[]": {
-      "snippet": "Ac[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "ac*{}": {
-      "snippet": "ac*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "ac*[]{}": {
-      "snippet": "ac*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "ac*{}[]": {
-      "snippet": "ac*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "ac*[]{}[]": {
-      "snippet": "ac*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Ac*{}": {
-      "snippet": "Ac*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Ac*[]{}": {
-      "snippet": "Ac*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Ac*{}[]": {
-      "snippet": "Ac*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Ac*[]{}[]": {
-      "snippet": "Ac*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acp{}": {
-      "snippet": "acp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acp[]{}": {
-      "snippet": "acp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acp{}[]": {
-      "snippet": "acp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acp[]{}[]": {
-      "snippet": "acp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acp{}": {
-      "snippet": "Acp{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acp[]{}": {
-      "snippet": "Acp[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acp{}[]": {
-      "snippet": "Acp{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acp[]{}[]": {
-      "snippet": "Acp[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "acp*{}": {
-      "snippet": "acp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acp*[]{}": {
-      "snippet": "acp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "acp*{}[]": {
-      "snippet": "acp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "acp*[]{}[]": {
-      "snippet": "acp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "Acp*{}": {
-      "snippet": "Acp*{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acp*[]{}": {
-      "snippet": "Acp*[${2:options}]{${1:label}}",
-      "option": "shortcuts"
-    },
-    "Acp*{}[]": {
-      "snippet": "Acp*{${1:label}}[${2:insert}]",
-      "option": "shortcuts"
-    },
-    "Acp*[]{}[]": {
-      "snippet": "Acp*[${2:options}]{${1:label}}[${3:insert}]",
-      "option": "shortcuts"
-    },
-    "glsentrylong{}": {
-      "snippet": "glsentrylong{${1:label}}"
-    },
-    "Glsentrylong{}": {
-      "snippet": "Glsentrylong{${1:label}}"
-    },
-    "glsentrylongpl{}": {
-      "snippet": "glsentrylongpl{${1:label}}"
-    },
-    "Glsentrylongpl{}": {
-      "snippet": "Glsentrylongpl{${1:label}}"
-    },
-    "glsentryshort{}": {
-      "snippet": "glsentryshort{${1:label}}"
-    },
-    "Glsentryshort{}": {
-      "snippet": "Glsentryshort{${1:label}}"
-    },
-    "glsentryshortpl{}": {
-      "snippet": "glsentryshortpl{${1:label}}"
-    },
-    "Glsentryshortpl{}": {
-      "snippet": "Glsentryshortpl{${1:label}}"
-    },
-    "glsentryfull{}": {
-      "snippet": "glsentryfull{${1:label}}"
-    },
-    "Glsentryfull{}": {
-      "snippet": "Glsentryfull{${1:label}}"
-    },
-    "glsentryfullpl{}": {
-      "snippet": "glsentryfullpl{${1:label}}"
-    },
-    "Glsentryfullpl{}": {
-      "snippet": "Glsentryfullpl{${1:label}}"
-    },
-    "setacronymstyle{}": {
-      "snippet": "setacronymstyle{${1:style-name}}"
-    },
-    "acronymentry{}": {
-      "snippet": "acronymentry{${1:label}}"
-    },
-    "acronymsort{}{}": {
-      "snippet": "acronymsort{${1:short}}{${2:long}}"
-    },
-    "firstacronymfont{}": {
-      "snippet": "firstacronymfont{${1:text}}"
-    },
-    "acronymfont{}": {
-      "snippet": "acronymfont{${1:text}}"
-    },
-    "acrpluralsuffix": {},
-    "glsupacrpluralsuffix": {},
-    "glstextup{}": {
-      "snippet": "glstextup{${1:text}}"
-    },
-    "glsacspace{}": {
-      "snippet": "glsacspace{${1:label}}"
-    },
-    "newacronymstyle{}{}{}": {
-      "snippet": "newacronymstyle{${1:name}}{${2:format def}}{${3:style defs}}"
-    },
-    "renewacronymstyle{}{}{}": {
-      "snippet": "renewacronymstyle{${1:name}}{${2:format def}}{${3:style defs}}"
-    },
-    "GenericAcronymFields": {},
-    "glskeylisttok": {},
-    "glslabeltok": {},
-    "glsshorttok": {},
-    "glslongtok": {},
-    "GlsUseAcrEntryDispStyle{}": {
-      "snippet": "GlsUseAcrEntryDispStyle{${1:style-name}}"
-    },
-    "GlsUseAcrStyleDefs{}": {
-      "snippet": "GlsUseAcrStyleDefs{${1:style-name}}"
-    },
-    "oldacronym{}{}{}": {
-      "snippet": "oldacronym{${1:short}}{${2:long}}{${3:keyvals}}"
-    },
-    "oldacronym[]{}{}{}": {
-      "snippet": "oldacronym[${4:label}]{${1:short}}{${2:long}}{${3:keyvals}}"
-    },
-    "glsreset{}": {
-      "snippet": "glsreset{${1:label}}"
-    },
-    "glslocalreset{}": {
-      "snippet": "glslocalreset{${1:label}}"
-    },
-    "glsunset{}": {
-      "snippet": "glsunset{${1:label}}"
-    },
-    "glslocalunset{}": {
-      "snippet": "glslocalunset{${1:label}}"
-    },
-    "glsresetall": {},
-    "glsresetall[]": {
-      "snippet": "glsresetall[${1:glossary list}]"
-    },
-    "glslocalresetall": {},
-    "glslocalresetall[]": {
-      "snippet": "glslocalresetall[${1:glossary list}]"
-    },
-    "glsunsetall": {},
-    "glsunsetall[]": {
-      "snippet": "glsunsetall[${1:glossary list}]"
-    },
-    "glslocalunsetall": {},
-    "glslocalunsetall[]": {
-      "snippet": "glslocalunsetall[${1:glossary list}]"
-    },
-    "glsenableentrycount": {},
-    "ifglsresetcurrcount": {},
-    "glsresetcurrcounttrue": {},
-    "glsresetcurrcountfalse": {},
-    "glsentrycurrcount{}": {
-      "snippet": "glsentrycurrcount{${1:label}}"
-    },
-    "glsentryprevcount{}": {
-      "snippet": "glsentryprevcount{${1:label}}"
-    },
-    "cgls{}": {
-      "snippet": "cgls{${1:label}}"
-    },
-    "cgls[]{}": {
-      "snippet": "cgls[${2:options}]{${1:label}}"
-    },
-    "cgls{}[]": {
-      "snippet": "cgls{${1:label}}[${2:insert}]"
-    },
-    "cgls[]{}[]": {
-      "snippet": "cgls[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cGls{}": {
-      "snippet": "cGls{${1:label}}"
-    },
-    "cGls[]{}": {
-      "snippet": "cGls[${2:options}]{${1:label}}"
-    },
-    "cGls{}[]": {
-      "snippet": "cGls{${1:label}}[${2:insert}]"
-    },
-    "cGls[]{}[]": {
-      "snippet": "cGls[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cgls*{}": {
-      "snippet": "cgls*{${1:label}}"
-    },
-    "cgls*[]{}": {
-      "snippet": "cgls*[${2:options}]{${1:label}}"
-    },
-    "cgls*{}[]": {
-      "snippet": "cgls*{${1:label}}[${2:insert}]"
-    },
-    "cgls*[]{}[]": {
-      "snippet": "cgls*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cGls*{}": {
-      "snippet": "cGls*{${1:label}}"
-    },
-    "cGls*[]{}": {
-      "snippet": "cGls*[${2:options}]{${1:label}}"
-    },
-    "cGls*{}[]": {
-      "snippet": "cGls*{${1:label}}[${2:insert}]"
-    },
-    "cGls*[]{}[]": {
-      "snippet": "cGls*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cglspl{}": {
-      "snippet": "cglspl{${1:label}}"
-    },
-    "cglspl[]{}": {
-      "snippet": "cglspl[${2:options}]{${1:label}}"
-    },
-    "cglspl{}[]": {
-      "snippet": "cglspl{${1:label}}[${2:insert}]"
-    },
-    "cglspl[]{}[]": {
-      "snippet": "cglspl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cGlspl{}": {
-      "snippet": "cGlspl{${1:label}}"
-    },
-    "cGlspl[]{}": {
-      "snippet": "cGlspl[${2:options}]{${1:label}}"
-    },
-    "cGlspl{}[]": {
-      "snippet": "cGlspl{${1:label}}[${2:insert}]"
-    },
-    "cGlspl[]{}[]": {
-      "snippet": "cGlspl[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cglspl*{}": {
-      "snippet": "cglspl*{${1:label}}"
-    },
-    "cglspl*[]{}": {
-      "snippet": "cglspl*[${2:options}]{${1:label}}"
-    },
-    "cglspl*{}[]": {
-      "snippet": "cglspl*{${1:label}}[${2:insert}]"
-    },
-    "cglspl*[]{}[]": {
-      "snippet": "cglspl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cGlspl*{}": {
-      "snippet": "cGlspl*{${1:label}}"
-    },
-    "cGlspl*[]{}": {
-      "snippet": "cGlspl*[${2:options}]{${1:label}}"
-    },
-    "cGlspl*{}[]": {
-      "snippet": "cGlspl*{${1:label}}[${2:insert}]"
-    },
-    "cGlspl*[]{}[]": {
-      "snippet": "cGlspl*[${2:options}]{${1:label}}[${3:insert}]"
-    },
-    "cglsformat{}{}": {
-      "snippet": "cglsformat{${1:label}}{${2:insert}}"
-    },
-    "cglsplformat{}{}": {
-      "snippet": "cglsplformat{${1:label}}{${2:insert}}"
-    },
-    "cGlsformat{}{}": {
-      "snippet": "cGlsformat{${1:label}}{${2:insert}}"
-    },
-    "cGlsplformat{}{}": {
-      "snippet": "cGlsplformat{${1:label}}{${2:insert}}"
-    },
-    "printnoidxglossaries": {},
-    "printglossaries": {},
-    "printnoidxglossary": {},
-    "printnoidxglossary[]": {
-      "snippet": "printnoidxglossary[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "printglossary": {},
-    "printglossary[]": {
-      "snippet": "printglossary[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "currentglossary": {},
-    "glossarysection{}": {
-      "snippet": "glossarysection{${1:title}}"
-    },
-    "glossarysection[]{}": {
-      "snippet": "glossarysection[${2:short title}]{${1:title}}"
-    },
-    "glsglossarymark{}": {
-      "snippet": "glsglossarymark{${1:title}}"
-    },
-    "glsclearpage": {},
-    "glossarytitle": {},
-    "glossarytoctitle": {},
-    "glssettoctitle{}": {
-      "snippet": "glssettoctitle{${1:glossary-type}}"
-    },
-    "glossarypreamble": {},
-    "setglossarypreamble{}": {
-      "snippet": "setglossarypreamble{${1:text}}"
-    },
-    "setglossarypreamble[]{}": {
-      "snippet": "setglossarypreamble[${2:type}]{${1:text}}"
-    },
-    "glossarypostamble": {},
-    "glossaryentrynumbers{}": {
-      "snippet": "glossaryentrynumbers{${1:locations}}"
-    },
-    "glsresetentrylist": {},
-    "glsnoidxprenumberlist{}": {
-      "snippet": "glsnoidxprenumberlist{${1:label}}"
-    },
-    "glsnonextpages": {},
-    "glsnextpages": {},
-    "newglossary{}{}{}{}": {
-      "snippet": "newglossary{${1:name}}{${2:in-ext}}{${3:out-ext}}{${4:title}}"
-    },
-    "newglossary[]{}{}{}{}": {
-      "snippet": "newglossary[${5:log-ext}]{${1:name}}{${2:in-ext}}{${3:out-ext}}{${4:title}}"
-    },
-    "newglossary[]{}{}{}{}[]": {
-      "snippet": "newglossary[${5:log-ext}]{${1:name}}{${2:in-ext}}{${3:out-ext}}{${4:title}}[${6:counter}]"
-    },
-    "newglossary*{}{}": {
-      "snippet": "newglossary*{${1:name}}{${2:title}}"
-    },
-    "newglossary*{}{}[]": {
-      "snippet": "newglossary*{${1:name}}{${2:title}}[${3:counter}]"
-    },
-    "altnewglossary{}{}{}": {
-      "snippet": "altnewglossary{${1:name}}{${2:tag}}{${3:title}}"
-    },
-    "altnewglossary{}{}{}[]": {
-      "snippet": "altnewglossary{${1:name}}{${2:tag}}{${3:title}}[${4:counter}]"
-    },
-    "newignoredglossary{}": {
-      "snippet": "newignoredglossary{${1:name}}"
-    },
-    "ifignoredglossary{}{}{}": {
-      "snippet": "ifignoredglossary{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "acronymtype": {},
-    "glsadd{}": {
-      "snippet": "glsadd{${1:label}}"
-    },
-    "glsadd[]{}": {
-      "snippet": "glsadd[${2:options}]{${1:label}}"
-    },
-    "glsaddall": {},
-    "glsaddall[]": {
-      "snippet": "glsaddall[${1:options}]",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "glsaddallunused": {},
-    "glsaddallunused[]": {
-      "snippet": "glsaddallunused[${1:glossary types}]"
-    },
-    "glssee{}{}": {
-      "snippet": "glssee{${1:label}}{${2:xr-list}}"
-    },
-    "glssee[]{}{}": {
-      "snippet": "glssee[${3:tag}]{${1:label}}{${2:xr-list}}"
-    },
-    "glsseeformat{}{}": {
-      "snippet": "glsseeformat{${1:xr-list}}{${2:location}}"
-    },
-    "glsseeformat[]{}{}": {
-      "snippet": "glsseeformat[${3:tag}]{${1:xr-list}}{${2:location}}"
-    },
-    "glsseelist{}": {
-      "snippet": "glsseelist{${1:label-list}}"
-    },
-    "glsseesep": {},
-    "glsseelastsep": {},
-    "glsseeitem{}": {
-      "snippet": "glsseeitem{${1:label}}"
-    },
-    "glsseeitemformat{}": {
-      "snippet": "glsseeitemformat{${1:label}}"
-    },
-    "delimN": {},
-    "glsignore{}": {
-      "snippet": "glsignore{${1:text}}"
-    },
-    "glsnumberformat{}": {
-      "snippet": "glsnumberformat{${1:locations}}"
-    },
-    "glshypernumber{}": {
-      "snippet": "glshypernumber{${1:locations}}"
-    },
-    "glswrglosslocationtextfmt{}": {
-      "snippet": "glswrglosslocationtextfmt{${1:location}}"
-    },
-    "setentrycounter{}": {
-      "snippet": "setentrycounter{${1:counter}}"
-    },
-    "setentrycounter[]{}": {
-      "snippet": "setentrycounter[${2:prefix}]{${1:counter}}"
-    },
-    "glsentrycounter": {},
-    "glswrglossdisableanchorcmds": {},
-    "glswrglosslocationtarget{}": {
-      "snippet": "glswrglosslocationtarget{${1:location}}"
-    },
-    "delimR": {},
-    "glsSetSuffixF{}": {
-      "snippet": "glsSetSuffixF{${1:suffix}}"
-    },
-    "glsSetSuffixFF{}": {
-      "snippet": "glsSetSuffixFF{${1:suffix}}"
-    },
-    "glswrglossdisablelocationcmds": {},
-    "glslocationcstoencap{}{}": {
-      "snippet": "glslocationcstoencap{${1:encap-csname}}{${2:location-csname}}"
-    },
-    "glsnoidxloclist{}": {
-      "snippet": "glsnoidxloclist{${1:list cs}}"
-    },
-    "glsnoidxloclisthandler{}": {
-      "snippet": "glsnoidxloclisthandler{${1:location}}"
-    },
-    "glsnumberlistloop{}{}{}": {
-      "snippet": "glsnumberlistloop{${1:label}}{${2:handler cs}}{${3:xr handler cs}}"
-    },
-    "glsnoidxdisplayloc{}{}{}{}": {
-      "snippet": "glsnoidxdisplayloc{${1:prefix}}{${2:counter}}{${3:format}}{${4:location}}"
-    },
-    "glsnoidxnumberlistloophandler{}": {
-      "snippet": "glsnoidxnumberlistloophandler{${1:location item}}"
-    },
-    "glsnamefont{}": {
-      "snippet": "glsnamefont{${1:text}}"
-    },
-    "newglossarystyle{}{}": {
-      "snippet": "newglossarystyle{${1:name}}{${2:definitions}}"
-    },
-    "renewglossarystyle{}{}": {
-      "snippet": "renewglossarystyle{${1:name}}{${2:definitions}}"
-    },
-    "glsentryitem{}": {
-      "snippet": "glsentryitem{${1:label}}"
-    },
-    "glssubentryitem{}": {
-      "snippet": "glssubentryitem{${1:label}}"
-    },
-    "glstarget{}{}": {
-      "snippet": "glstarget{${1:label}}{${2:text}}"
-    },
-    "glolinkprefix": {},
-    "glsgetgrouptitle{}": {
-      "snippet": "glsgetgrouptitle{${1:group-label}}"
-    },
-    "glossaryheader": {},
-    "glsgroupheading{}": {
-      "snippet": "glsgroupheading{${1:group-label}}"
-    },
-    "glossentry{}{}": {
-      "snippet": "glossentry{${1:label}}{${2:number-list}}"
-    },
-    "subglossentry{}{}{}": {
-      "snippet": "subglossentry{${1:level}}{${2:label}}{${3:number-list}}"
-    },
-    "glsgroupskip": {},
-    "glsopenbrace": {},
-    "glsclosebrace": {},
-    "glspercentchar": {},
-    "glstildechar": {},
-    "glsbackslash": {},
-    "glsquote{}": {
-      "snippet": "glsquote{${1:text}}"
-    },
-    "GlsAddXdyStyle{}": {
-      "snippet": "GlsAddXdyStyle{${1:style-name}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyStyles{}": {
-      "snippet": "GlsSetXdyStyles{${1:style name list}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyLanguage{}": {
-      "snippet": "GlsSetXdyLanguage{${1:language}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyLanguage[]{}": {
-      "snippet": "GlsSetXdyLanguage[${2:glossary-type}]{${1:language}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyCodePage{}": {
-      "snippet": "GlsSetXdyCodePage{${1:codepage}}",
-      "option": "xindy"
-    },
-    "GlsAddXdyCounters{}": {
-      "snippet": "GlsAddXdyCounters{${1:counter list}}",
-      "option": "xindy"
-    },
-    "GlsAddXdyAttribute{}": {
-      "snippet": "GlsAddXdyAttribute{${1:name}}",
-      "option": "xindy"
-    },
-    "GlsAddXdyLocation{}{}": {
-      "snippet": "GlsAddXdyLocation{${1:name}}{${2:definition}}",
-      "option": "xindy"
-    },
-    "GlsAddXdyLocation[]{}{}": {
-      "snippet": "GlsAddXdyLocation[${3:H-prefix}]{${1:name}}{${2:definition}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyLocationClassOrder{}": {
-      "snippet": "GlsSetXdyLocationClassOrder{${1:location names}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyMinRangeLength{}": {
-      "snippet": "GlsSetXdyMinRangeLength{${1:integer}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyFirstLetterAfterDigits{}": {
-      "snippet": "GlsSetXdyFirstLetterAfterDigits{${1:letter}}",
-      "option": "xindy"
-    },
-    "GlsSetXdyNumberGroupOrder{}": {
-      "snippet": "GlsSetXdyNumberGroupOrder{${1:relative location}}",
-      "option": "xindy"
-    },
-    "GlsAddLetterGroup{}{}": {
-      "snippet": "GlsAddLetterGroup{${1:name}}{${2:xindy code}}",
-      "option": "xindy"
-    },
-    "GlsAddSortRule{}{}": {
-      "snippet": "GlsAddSortRule{${1:arg1}}{${2:arg2}}",
-      "option": "xindy"
-    },
-    "GlsAddXdyAlphabet{}{}": {
-      "snippet": "GlsAddXdyAlphabet{${1:name}}{${2:definition}}",
-      "option": "xindy"
-    },
-    "glsdonohyperlink{}{}": {
-      "snippet": "glsdonohyperlink{${1:target}}{${2:text}}"
-    },
-    "glsdohypertarget{}{}": {
-      "snippet": "glsdohypertarget{${1:target}}{${2:text}}"
-    },
-    "glsdohyperlink{}{}": {
-      "snippet": "glsdohyperlink{${1:target}}{${2:text}}"
-    },
-    "glsdohypertargethook{}{}": {
-      "snippet": "glsdohypertargethook{${1:target}}{${2:text}}"
-    },
-    "glsdohyperlinkhook{}{}": {
-      "snippet": "glsdohyperlinkhook{${1:target}}{${2:text}}"
-    },
-    "glslabelhypertarget{}{}": {
-      "snippet": "glslabelhypertarget{${1:target}}{${2:text}}"
-    },
-    "glslabelhypertargetprefix": {},
-    "glslabelhypertargetdefs": {},
-    "glslabelhypertargetvalue": {},
-    "glstexorpdfstring{}{}": {
-      "snippet": "glstexorpdfstring{${1:TeX string}}{${2:PDF string}}"
-    },
-    "glsuppercase{}": {
-      "snippet": "glsuppercase{${1:text}}"
-    },
-    "glslowercase{}": {
-      "snippet": "glslowercase{${1:text}}"
-    },
-    "glssentencecase{}": {
-      "snippet": "glssentencecase{${1:text}}"
-    },
-    "glscapitalisewords{}": {
-      "snippet": "glscapitalisewords{${1:text}}"
-    },
-    "glsmfuexcl{}": {
-      "snippet": "glsmfuexcl{${1:cmd}}"
-    },
-    "glsmfublocker{}": {
-      "snippet": "glsmfublocker{${1:cmd}}"
-    },
-    "glsmfuaddmap{}{}": {
-      "snippet": "glsmfuaddmap{${1:cmd1}}{${2:cmd2}}"
-    },
-    "forallglossaries{}{}": {
-      "snippet": "forallglossaries{${1:cmd}}{${2:body}}"
-    },
-    "forallglossaries[]{}{}": {
-      "snippet": "forallglossaries[${3:types}]{${1:cmd}}{${2:body}}"
-    },
-    "forallacronyms{}{}": {
-      "snippet": "forallacronyms{${1:cmd}}{${2:body}}"
-    },
-    "forglsentries{}{}": {
-      "snippet": "forglsentries{${1:cmd}}{${2:body}}"
-    },
-    "forglsentries[]{}{}": {
-      "snippet": "forglsentries[${3:glossary label}]{${1:cmd}}{${2:body}}"
-    },
-    "forallglsentries{}{}": {
-      "snippet": "forallglsentries{${1:cmd}}{${2:body}}"
-    },
-    "forallglsentries[]{}{}": {
-      "snippet": "forallglsentries[${3:types}]{${1:cmd}}{${2:body}}"
-    },
-    "ifglossaryexists{}{}{}": {
-      "snippet": "ifglossaryexists{${1:glossary-type}}{${2:true}}{${3:false}}"
-    },
-    "ifglsentryexists{}{}{}": {
-      "snippet": "ifglsentryexists{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "glsdoifexists{}{}": {
-      "snippet": "glsdoifexists{${1:label}}{${2:code}}"
-    },
-    "glsdoifnoexists{}{}": {
-      "snippet": "glsdoifnoexists{${1:label}}{${2:code}}"
-    },
-    "glsdoifexistsorwarn{}{}": {
-      "snippet": "glsdoifexistsorwarn{${1:label}}{${2:code}}"
-    },
-    "glsdoifexistsordo{}{}": {
-      "snippet": "glsdoifexistsordo{${1:label}}{${2:code}}"
-    },
-    "ifglsused{}{}{}": {
-      "snippet": "ifglsused{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglshaschildren{}{}{}": {
-      "snippet": "ifglshaschildren{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglshasparent{}{}{}": {
-      "snippet": "ifglshasparent{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglshassymbol{}{}{}": {
-      "snippet": "ifglshassymbol{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglshaslong{}{}{}": {
-      "snippet": "ifglshaslong{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglshasshort{}{}{}": {
-      "snippet": "ifglshasshort{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglshasdesc{}{}{}": {
-      "snippet": "ifglshasdesc{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglsdescsuppressed{}{}{}": {
-      "snippet": "ifglsdescsuppressed{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "ifglsfieldvoid{}{}{}{}": {
-      "snippet": "ifglsfieldvoid{${1:field}}{${2:label}}{${3:true}}{${4:false}}"
-    },
-    "ifglshasfield{}{}{}{}": {
-      "snippet": "ifglshasfield{${1:field}}{${2:label}}{${3:true}}{${4:false}}"
-    },
-    "glscurrentfieldvalue": {},
-    "ifglsfieldeq{}{}{}{}{}": {
-      "snippet": "ifglsfieldeq{${1:label}}{${2:field}}{${3:string}}{${4:true}}{${5:false}}"
-    },
-    "ifglsfielddefeq{}{}{}{}{}": {
-      "snippet": "ifglsfielddefeq{${1:label}}{${2:field}}{${3:cmd}}{${4:true}}{${5:false}}"
-    },
-    "ifglsfieldcseq{}{}{}{}{}": {
-      "snippet": "ifglsfieldcseq{${1:label}}{${2:field}}{${3:csname}}{${4:true}}{${5:false}}"
-    },
-    "glsmeasureheight{}{}": {
-      "snippet": "glsmeasureheight{${1:length}}{${2:text}}"
-    },
-    "glsmeasuredepth{}{}": {
-      "snippet": "glsmeasuredepth{${1:length}}{${2:text}}"
-    },
-    "glsmeasurewidth{}{}": {
-      "snippet": "glsmeasurewidth{${1:length}}{${2:text}}"
-    },
-    "glsifmeasuring{}{}": {
-      "snippet": "glsifmeasuring{${1:true}}{${2:false}}"
-    },
-    "glsentrytype{}": {
-      "snippet": "glsentrytype{${1:label}}"
-    },
-    "glsentryparent{}": {
-      "snippet": "glsentryparent{${1:label}}"
-    },
-    "glsentrysort{}": {
-      "snippet": "glsentrysort{${1:label}}"
-    },
-    "glsfieldfetch{}{}{}": {
-      "snippet": "glsfieldfetch{${1:label}}{${2:field}}{${3:cmd}}"
-    },
-    "glsletentryfield{}{}{}": {
-      "snippet": "glsletentryfield{${1:cmd}}{${2:label}}{${3:field}}"
-    },
-    "glsunexpandedfieldvalue{}{}": {
-      "snippet": "glsunexpandedfieldvalue{${1:label}}{${2:field}}"
-    },
-    "glsfielddef{}{}{}": {
-      "snippet": "glsfielddef{${1:label}}{${2:field}}{${3:value}}"
-    },
-    "glsfieldedef{}{}{}": {
-      "snippet": "glsfieldedef{${1:label}}{${2:field}}{${3:value}}"
-    },
-    "glsfieldgdef{}{}{}": {
-      "snippet": "glsfieldgdef{${1:label}}{${2:field}}{${3:value}}"
-    },
-    "glsfieldxdef{}{}{}": {
-      "snippet": "glsfieldxdef{${1:label}}{${2:field}}{${3:value}}"
-    },
-    "acrnameformat{}{}": {
-      "snippet": "acrnameformat{${1:short text}}{${2:long text}}"
-    },
-    "acronymname": {},
-    "addglossarytocaptions{}": {
-      "snippet": "addglossarytocaptions{${1:language}}"
-    },
-    "andname": {},
-    "descriptionname": {},
-    "entryname": {},
-    "glossaryname": {},
-    "glscurrententrylabel": {},
-    "glsdefaulttype": {},
-    "glshyperfirstfalse": {},
-    "glshyperfirsttrue": {},
-    "glsifusedtranslatordict{}{}{}": {
-      "snippet": "glsifusedtranslatordict{${1:lang}}{${2:true}}{${3:false}}"
-    },
-    "glsnumbersgroupname": {},
-    "glssymbolsgroupname": {},
-    "glswritedefhook": {},
-    "hyperbf{}": {
-      "snippet": "hyperbf{${1:locations}}"
-    },
-    "hyperemph{}": {
-      "snippet": "hyperemph{${1:locations}}"
-    },
-    "hyperit{}": {
-      "snippet": "hyperit{${1:locations}}"
-    },
-    "hypermd{}": {
-      "snippet": "hypermd{${1:locations}}"
-    },
-    "hyperrm{}": {
-      "snippet": "hyperrm{${1:locations}}"
-    },
-    "hypersc{}": {
-      "snippet": "hypersc{${1:locations}}"
-    },
-    "hypersf{}": {
-      "snippet": "hypersf{${1:locations}}"
-    },
-    "hypersl{}": {
-      "snippet": "hypersl{${1:locations}}"
-    },
-    "hypertt{}": {
-      "snippet": "hypertt{${1:locations}}"
-    },
-    "hyperup{}": {
-      "snippet": "hyperup{${1:locations}}"
-    },
-    "ifglshyperfirst": {},
-    "newacronymhook": {},
-    "pagelistname": {},
-    "ProvidesGlossariesLang{}": {
-      "snippet": "ProvidesGlossariesLang{${1:language}}"
-    },
-    "RequireGlossariesLang{}": {
-      "snippet": "RequireGlossariesLang{${1:language}}"
-    },
-    "seename": {},
-    "symbolname": {},
-    "acrfootnote{}{}{}": {
-      "snippet": "acrfootnote{${1:options}}{${2:label}}{${3:link text}}"
-    },
-    "acrlinkfootnote{}{}{}": {
-      "snippet": "acrlinkfootnote{${1:options}}{${2:label}}{${3:link text}}"
-    },
-    "acrnolinkfootnote{}{}{}": {
-      "snippet": "acrnolinkfootnote{${1:options}}{${2:label}}{${3:link text}}"
-    },
-    "currentglssubentry": {},
-    "doifglossarynoexistsordo{}{}{}": {
-      "snippet": "doifglossarynoexistsordo{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "glosortentrieswarning": {},
-    "GlossariesWarning{}": {
-      "snippet": "GlossariesWarning{${1:warning}}"
-    },
-    "GlossariesWarningNoLine{}": {
-      "snippet": "GlossariesWarningNoLine{${1:warning}}"
-    },
-    "glsacronymtrue": {},
-    "glsacrshortcutsfalse": {},
-    "glsacrshortcutstrue": {},
-    "glsaddprotectedpagefmt{}": {
-      "snippet": "glsaddprotectedpagefmt{${1:internal cs name}}"
-    },
-    "glsautomakefalse": {},
-    "glsautomaketrue": {},
-    "glscompositor": {},
-    "glsdefmain": {},
-    "glsdetoklabel{}": {
-      "snippet": "glsdetoklabel{${1:arg}}"
-    },
-    "glsdoparenifnotempty{}{}": {
-      "snippet": "glsdoparenifnotempty{${1:arg}}{${2:cmd}}"
-    },
-    "glsdoshowtarget{}{}": {
-      "snippet": "glsdoshowtarget{${1:arg1}}{${2:arg2}}"
-    },
-    "glsencapwrcontent{}": {
-      "snippet": "glsencapwrcontent{${1:arg}}"
-    },
-    "glsesclocationsfalse": {},
-    "glsesclocationstrue": {},
-    "glsgetgrouplabel{}": {
-      "snippet": "glsgetgrouplabel{${1:title}}"
-    },
-    "glsifusetranslator{}{}": {
-      "snippet": "glsifusetranslator{${1:true}}{${2:false}}"
-    },
-    "glslongkey": {},
-    "glslongpluralkey": {},
-    "glsnoidxstripaccents": {},
-    "glsnomakeindexwarning{}": {
-      "snippet": "glsnomakeindexwarning{${1:cmd}}"
-    },
-    "glsnonumberlistfalse": {},
-    "glsnonumberlisttrue": {},
-    "glsnopostdotfalse": {},
-    "glsnopostdottrue": {},
-    "glsnoxindywarning{}": {
-      "snippet": "glsnoxindywarning{${1:cmd}}"
-    },
-    "glsnumlistparser": {},
-    "glsorder": {},
-    "glssanitizesortfalse": {},
-    "glssanitizesorttrue": {},
-    "glssavenumberlistfalse": {},
-    "glssavewritesfalse": {},
-    "glsshortkey": {},
-    "glsshortpluralkey": {},
-    "glsspace": {},
-    "glstranslatefalse": {},
-    "glstranslatetrue": {},
-    "GlsWarnAddProtectedPageFmt": {},
-    "glswritefiles": {},
-    "ifglsacronym": {},
-    "ifglsacrshortcuts": {},
-    "ifglsautomake": {},
-    "ifglsesclocations": {},
-    "ifglsnonumberlist": {},
-    "ifglsnopostdot": {},
-    "ifglsnopostdotfalse": {},
-    "ifglsnumberline": {},
-    "ifglssanitizesort": {},
-    "ifglssavenumberlist": {},
-    "ifglssavewrites": {},
-    "ifglstranslate": {},
-    "istfilename": {},
-    "SetDefaultAcronymDisplayStyle": {},
-    "SetGenericNewAcronym": {},
-    "showacronymlists": {},
-    "showglocounter{}": {
-      "snippet": "showglocounter{${1:label}}"
-    },
-    "showglodesc{}": {
-      "snippet": "showglodesc{${1:label}}"
-    },
-    "showglodescplural{}": {
-      "snippet": "showglodescplural{${1:label}}"
-    },
-    "showglofield{}{}": {
-      "snippet": "showglofield{${1:label}}{${2:field}}"
-    },
-    "showglofirst{}": {
-      "snippet": "showglofirst{${1:label}}"
-    },
-    "showglofirstpl{}": {
-      "snippet": "showglofirstpl{${1:label}}"
-    },
-    "showgloflag{}": {
-      "snippet": "showgloflag{${1:label}}"
-    },
-    "showgloindex{}": {
-      "snippet": "showgloindex{${1:label}}"
-    },
-    "showglolevel{}": {
-      "snippet": "showglolevel{${1:label}}"
-    },
-    "showgloloclist{}": {
-      "snippet": "showgloloclist{${1:label}}"
-    },
-    "showglolong{}": {
-      "snippet": "showglolong{${1:label}}"
-    },
-    "showgloname{}": {
-      "snippet": "showgloname{${1:label}}"
-    },
-    "showgloparent{}": {
-      "snippet": "showgloparent{${1:label}}"
-    },
-    "showgloplural{}": {
-      "snippet": "showgloplural{${1:label}}"
-    },
-    "showgloshort{}": {
-      "snippet": "showgloshort{${1:label}}"
-    },
-    "showglosort{}": {
-      "snippet": "showglosort{${1:label}}"
-    },
-    "showglossaries": {},
-    "showglossarycounter{}": {
-      "snippet": "showglossarycounter{${1:glossary label}}"
-    },
-    "showglossaryentries{}": {
-      "snippet": "showglossaryentries{${1:glossary label}}"
-    },
-    "showglossaryin{}": {
-      "snippet": "showglossaryin{${1:glossary label}}"
-    },
-    "showglossaryout{}": {
-      "snippet": "showglossaryout{${1:glossary label}}"
-    },
-    "showglossarytitle{}": {
-      "snippet": "showglossarytitle{${1:glossary label}}"
-    },
-    "showglosymbol{}": {
-      "snippet": "showglosymbol{${1:label}}"
-    },
-    "showglosymbolplural{}": {
-      "snippet": "showglosymbolplural{${1:label}}"
-    },
-    "showglotext{}": {
-      "snippet": "showglotext{${1:label}}"
-    },
-    "showglotype{}": {
-      "snippet": "showglotype{${1:label}}"
-    },
-    "showglouseri{}": {
-      "snippet": "showglouseri{${1:label}}"
-    },
-    "showglouserii{}": {
-      "snippet": "showglouserii{${1:label}}"
-    },
-    "showglouseriii{}": {
-      "snippet": "showglouseriii{${1:label}}"
-    },
-    "showglouseriv{}": {
-      "snippet": "showglouseriv{${1:label}}"
-    },
-    "showglouserv{}": {
-      "snippet": "showglouserv{${1:label}}"
-    },
-    "showglouservi{}": {
-      "snippet": "showglouservi{${1:label}}"
-    },
-    "theglsentrycounter": {},
-    "theHglossaryentry": {},
-    "theHglossarysubentry": {},
-    "theHglsentrycounter": {},
-    "acrfullformat": {},
-    "acrlinkfullformat": {},
-    "glossarymark": {}
-  },
-  "envs": {
-    "theglossary": {}
-  },
-  "options": [
-    "nowarn",
-    "nolangwarn",
-    "noredefwarn",
-    "translate=",
-    "notranslate",
-    "languages=${1:language}",
-    "nolong",
-    "nosuper",
-    "nolist",
-    "notree",
-    "nostyles",
-    "makeindex",
-    "xindy",
-    "xindy={${1:options}}",
-    "xindygloss",
-    "xindynoglsnumbers",
-    "acronym",
-    "acronyms",
-    "debug=",
-    "savewrites",
-    "hyperfirst",
-    "writeglslabels",
-    "writeglslabelnames",
-    "toc",
-    "numberline",
-    "section=${1:section unit}",
-    "ucmark",
-    "numberedsection=",
-    "savenumberlist",
-    "entrycounter",
-    "counterwithin=${1:counter}",
-    "subentrycounter",
-    "style=${1:style-name}",
-    "nonumberlist",
-    "seeautonumberlist",
-    "counter=${1:counter}",
-    "nopostdot",
-    "nogroupskip",
-    "seenoindex=",
-    "esclocations",
-    "indexonlyfirst",
-    "sanitizesort",
-    "sort=",
-    "order=",
-    "automake=",
-    "automakegloss",
-    "automakeglosslite",
-    "disablemakegloss",
-    "restoremakegloss",
-    "nohypertypes={${1:list}}",
-    "symbols",
-    "numbers",
-    "index",
-    "noglossaryindex",
-    "acronymlists={${1:label-list}}",
-    "shortcuts",
-    "mfirstuc=",
-    "kernelglossredefs="
-  ],
-  "keyvals": [
-    [
-      "type=${1:glossary-label}",
-      "title=${1:text}",
-      "toctitle=${1:text}",
-      "style=${1:style-name}",
-      "numberedsection=",
-      "nonumberlist",
-      "nogroupskip",
-      "nopostdot",
-      "entrycounter",
-      "subentrycounter",
-      "sort="
-    ],
-    [
-      "name=${1:text}",
-      "description=${1:text}",
-      "parent=${1:parent-label}",
-      "descriptionplural=${1:text}",
-      "text=${1:text}",
-      "first=${1:text}",
-      "plural=${1:text}",
-      "firstplural=${1:text}",
-      "symbol=${1:symbol}",
-      "symbolplural=${1:symbol}",
-      "sort=${1:entry-name}",
-      "type=${1:glossary-label}",
-      "user1=${1:text}",
-      "user2=${1:text}",
-      "user3=${1:text}",
-      "user4=${1:text}",
-      "user5=${1:text}",
-      "user6=${1:text}",
-      "nonumberlist",
-      "see={${1:xr-list}}",
-      "see={[${1:tag}]${2:xr-list}}"
-    ],
-    [
-      "hyper",
-      "format=${1:csname}",
-      "counter=${1:counter}",
-      "local"
-    ],
-    [
-      "format=${1:csname}",
-      "counter=${1:counter}",
-      "local"
-    ],
-    [
-      "long=${1:text}",
-      "longplural=${1:text}",
-      "short=${1:text}",
-      "shortplural=${1:text}"
-    ],
-    [
-      "types={${1:glossary-list}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/glosstex.json b/dev/packages/glosstex.json
index e79578345..9e96fc2fb 100644
--- a/dev/packages/glosstex.json
+++ b/dev/packages/glosstex.json
@@ -7,198 +7,84 @@
     "glosstex[]{}": {
       "snippet": "glosstex[${2:pageref-mode}]{${1:label}}"
     },
-    "glosstex(){}": {
-      "snippet": "glosstex(${2:list}){${1:label}}"
-    },
-    "glosstex()[]{}": {
-      "snippet": "glosstex(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "glosstex*{}": {
       "snippet": "glosstex*{${1:label}}"
     },
     "glosstex*[]{}": {
       "snippet": "glosstex*[${2:pageref-mode}]{${1:label}}"
     },
-    "glosstex*(){}": {
-      "snippet": "glosstex*(${2:list}){${1:label}}"
-    },
-    "glosstex*()[]{}": {
-      "snippet": "glosstex*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "acronym{}": {
       "snippet": "acronym{${1:label}}"
     },
     "acronym[]{}": {
       "snippet": "acronym[${2:pageref-mode}]{${1:label}}"
     },
-    "acronym(){}": {
-      "snippet": "acronym(${2:list}){${1:label}}"
-    },
-    "acronym()[]{}": {
-      "snippet": "acronym(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "acronym*{}": {
       "snippet": "acronym*{${1:label}}"
     },
     "acronym*[]{}": {
       "snippet": "acronym*[${2:pageref-mode}]{${1:label}}"
     },
-    "acronym*(){}": {
-      "snippet": "acronym*(${2:list}){${1:label}}"
-    },
-    "acronym*()[]{}": {
-      "snippet": "acronym*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "gls{}": {
       "snippet": "gls{${1:label}}"
     },
     "gls[]{}": {
       "snippet": "gls[${2:pageref-mode}]{${1:label}}"
     },
-    "gls(){}": {
-      "snippet": "gls(${2:list}){${1:label}}"
-    },
-    "gls()[]{}": {
-      "snippet": "gls(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "gls*{}": {
       "snippet": "gls*{${1:label}}"
     },
     "gls*[]{}": {
       "snippet": "gls*[${2:pageref-mode}]{${1:label}}"
     },
-    "gls*(){}": {
-      "snippet": "gls*(${2:list}){${1:label}}"
-    },
-    "gls*()[]{}": {
-      "snippet": "gls*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
     "ac{}": {
       "snippet": "ac{${1:label}}"
     },
     "ac[]{}": {
       "snippet": "ac[${2:pageref-mode}]{${1:label}}"
     },
-    "ac()[]{}": {
-      "snippet": "ac(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac<>()[]{}": {
-      "snippet": "ac<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac[]<>()[]{}": {
-      "snippet": "ac[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "ac*{}": {
       "snippet": "ac*{${1:label}}"
     },
     "ac*[]{}": {
       "snippet": "ac*[${2:pageref-mode}]{${1:label}}"
     },
-    "ac*()[]{}": {
-      "snippet": "ac*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac*<>()[]{}": {
-      "snippet": "ac*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "ac*[]<>()[]{}": {
-      "snippet": "ac*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acs{}": {
       "snippet": "acs{${1:label}}"
     },
     "acs[]{}": {
       "snippet": "acs[${2:pageref-mode}]{${1:label}}"
     },
-    "acs()[]{}": {
-      "snippet": "acs(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs<>()[]{}": {
-      "snippet": "acs<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs[]<>()[]{}": {
-      "snippet": "acs[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acs*{}": {
       "snippet": "acs*{${1:label}}"
     },
     "acs*[]{}": {
       "snippet": "acs*[${2:pageref-mode}]{${1:label}}"
     },
-    "acs*()[]{}": {
-      "snippet": "acs*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs*<>()[]{}": {
-      "snippet": "acs*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acs*[]<>()[]{}": {
-      "snippet": "acs*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acl{}": {
       "snippet": "acl{${1:label}}"
     },
     "acl[]{}": {
       "snippet": "acl[${2:pageref-mode}]{${1:label}}"
     },
-    "acl()[]{}": {
-      "snippet": "acl(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl<>()[]{}": {
-      "snippet": "acl<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl[]<>()[]{}": {
-      "snippet": "acl[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acl*{}": {
       "snippet": "acl*{${1:label}}"
     },
     "acl*[]{}": {
       "snippet": "acl*[${2:pageref-mode}]{${1:label}}"
     },
-    "acl*()[]{}": {
-      "snippet": "acl*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl*<>()[]{}": {
-      "snippet": "acl*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acl*[]<>()[]{}": {
-      "snippet": "acl*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acf{}": {
       "snippet": "acf{${1:label}}"
     },
     "acf[]{}": {
       "snippet": "acf[${2:pageref-mode}]{${1:label}}"
     },
-    "acf()[]{}": {
-      "snippet": "acf(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf<>()[]{}": {
-      "snippet": "acf<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf[]<>()[]{}": {
-      "snippet": "acf[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
     "acf*{}": {
       "snippet": "acf*{${1:label}}"
     },
     "acf*[]{}": {
       "snippet": "acf*[${2:pageref-mode}]{${1:label}}"
     },
-    "acf*()[]{}": {
-      "snippet": "acf*(${3:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf*<>()[]{}": {
-      "snippet": "acf*<${3:form}>(${4:list})[${2:pageref-mode}]{${1:label}}"
-    },
-    "acf*[]<>()[]{}": {
-      "snippet": "acf*[${2:,${5: lparen },${6: rparen },}]<${4:form}>(${7:list})[${3:pageref-mode}]{${1:label}}"
-    },
-    "printglosstex()": {
-      "snippet": "printglosstex(${1:list})"
-    },
-    "printglosstex()[]": {
-      "snippet": "printglosstex(${2:list})[${1:pageref-mode}]"
-    },
     "glxitemorderdefault{}{}": {
       "snippet": "glxitemorderdefault{${1:list}}{${2:item-order i/l/\"\"}}"
     },
diff --git a/dev/packages/gradient-text.json b/dev/packages/gradient-text.json
index 52908089d..af3d869db 100644
--- a/dev/packages/gradient-text.json
+++ b/dev/packages/gradient-text.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "gradientRGB{}{}{}": {
-      "snippet": "gradientRGB{${1:text}}{${2:R1,${4:G1},${5:B1}}{${3:R2},${6:G2},B2}}"
+      "snippet": "gradientRGB{${1:text}}{${2:R1,G1,B1}}{${3:R2,G2,B2}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/grafcet.json b/dev/packages/grafcet.json
index 2e926e52b..0deb63416 100644
--- a/dev/packages/grafcet.json
+++ b/dev/packages/grafcet.json
@@ -64,7 +64,7 @@
       "snippet": "Recept{${1:Tnnn}}{${2:condition}}"
     },
     "Recepts{}": {
-      "snippet": "Recepts{${1:1/r1,${2:2/r2},...}}"
+      "snippet": "Recepts{${1:1/r1,2/r2,...}}"
     },
     "TransitionSource{}": {
       "snippet": "TransitionSource{${1:nom}}"
@@ -115,7 +115,7 @@
       "snippet": "ActionXV[${3:dist}]{${1:etape}}{${2:liste actions}}"
     },
     "Actions{}": {
-      "snippet": "Actions{${1:1/A1,${2:2/A2},...}}"
+      "snippet": "Actions{${1:1/A1,2/A2,...}}"
     },
     "ForcageX{}{}": {
       "snippet": "ForcageX{${1:Xnnn}}{${2:forçage}}"
@@ -163,22 +163,22 @@
       "snippet": "SequenceTT[${3:pos}]{${1:trans init}}{${2:liste}}"
     },
     "ActionRecept{}": {
-      "snippet": "ActionRecept{${1:1/A1/r1,${2:2/A2/r2},...}}"
+      "snippet": "ActionRecept{${1:1/A1/r1,2/A2/r2,...}}"
     },
     "Graphe{}": {
-      "snippet": "Graphe{${1:1/A1/r1,${2:2/A2/r2},...}}"
+      "snippet": "Graphe{${1:1/A1/r1,2/A2/r2,...}}"
     },
     "Graphe[]{}": {
-      "snippet": "Graphe[${2:pos}]{${1:1/A1/r1,${3:2/A2/r2},...}}"
+      "snippet": "Graphe[${2:pos}]{${1:1/A1/r1,2/A2/r2,...}}"
     },
     "GrapheBoucle{}": {
-      "snippet": "GrapheBoucle{${1:1/A1/r1,${2:2/A2/r2},...}}"
+      "snippet": "GrapheBoucle{${1:1/A1/r1,2/A2/r2,...}}"
     },
     "GrapheBoucle[]{}": {
-      "snippet": "GrapheBoucle[${2:pos}]{${1:1/A1/r1,${3:2/A2/r2},...}}"
+      "snippet": "GrapheBoucle[${2:pos}]{${1:1/A1/r1,2/A2/r2,...}}"
     },
     "DivOU{}{}": {
-      "snippet": "DivOU{${1:Xnnn}}{${2:d1/nom1,${3:d2/nom2},...}}"
+      "snippet": "DivOU{${1:Xnnn}}{${2:d1/nom1,d2/nom2,...}}"
     },
     "ConvOU{}{}{}": {
       "snippet": "ConvOU{${1:Tnnn}}{${2:liste}}{${3:nom}}"
@@ -223,7 +223,7 @@
       "snippet": "DecaleNoeudy[${3:dist}]{${1:ni}}{${2:nf}}"
     },
     "DivET{}{}": {
-      "snippet": "DivET{${1:Tnnn}}{${2:d1/br1,${3:d2/br2},...}}"
+      "snippet": "DivET{${1:Tnnn}}{${2:d1/br1,d2/br2,...}}"
     },
     "ConvET{}{}{}": {
       "snippet": "ConvET{${1:Tnnn}}{${2:liste}}{${3:nom}}"
diff --git a/dev/packages/graphics.json b/dev/packages/graphics.json
deleted file mode 100644
index f5aaa60d2..000000000
--- a/dev/packages/graphics.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "includes": {
-    "trig": []
-  },
-  "macros": {
-    "DeclareGraphicsExtensions{}": {
-      "snippet": "DeclareGraphicsExtensions{${1:ext-list}}"
-    },
-    "DeclareGraphicsRule{}{}{}{}": {
-      "snippet": "DeclareGraphicsRule{${1:ext}}{${2:type}}{${3:read-file}}{${4:command}}"
-    },
-    "graphicspath{}": {
-      "snippet": "graphicspath{${1:dir-list}}"
-    },
-    "includegraphics[][]{}": {
-      "snippet": "includegraphics[${2:llx,${4:lly}][${3:urx},ury}]{${1:imagefile}}"
-    },
-    "includegraphics*{}": {
-      "snippet": "includegraphics*{${1:imagefile}}"
-    },
-    "includegraphics*[]{}": {
-      "snippet": "includegraphics*[${2:llx,lly}]{${1:imagefile}}"
-    },
-    "includegraphics*[][]{}": {
-      "snippet": "includegraphics*[${2:llx,${4:lly}][${3:urx},ury}]{${1:imagefile}}"
-    },
-    "reflectbox{}": {
-      "snippet": "reflectbox{${1:text}}"
-    },
-    "resizebox{}{}{}": {
-      "snippet": "resizebox{${1:h-length}}{${2:v-length}}{${3:text}}"
-    },
-    "resizebox*{}{}{}": {
-      "snippet": "resizebox*{${1:h-length}}{${2:v-length}}{${3:text}}"
-    },
-    "rotatebox{}{}": {
-      "snippet": "rotatebox{${1:angle}}{${2:text}}"
-    },
-    "scalebox{}{}": {
-      "snippet": "scalebox{${1:h-scale}}{${2:text}}"
-    },
-    "scalebox{}[]{}": {
-      "snippet": "scalebox{${1:h-scale}}[${2:v-scale}]{${3:text}}"
-    },
-    "GDebug{}": {
-      "snippet": "GDebug{${1:text}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "draft",
-    "final",
-    "hiresbb",
-    "demo",
-    "setpagesize",
-    "nosetpagesize",
-    "dvips",
-    "xdvi",
-    "dvipdf",
-    "dvipdfm",
-    "dvipdfmx",
-    "xetex",
-    "pdftex",
-    "luatex",
-    "dvisvgm",
-    "dvipsone",
-    "dviwindo",
-    "emtex",
-    "dviwin",
-    "oztex",
-    "textures",
-    "pctexps",
-    "pctexwin",
-    "pctexhp",
-    "pctex32",
-    "truetex",
-    "tcidvi",
-    "vtex",
-    "debugshow",
-    "hiderotate",
-    "hidescale"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/graphicsonthefly.json b/dev/packages/graphicsonthefly.json
index 58225749e..3a3a7c02c 100644
--- a/dev/packages/graphicsonthefly.json
+++ b/dev/packages/graphicsonthefly.json
@@ -27,7 +27,7 @@
       "keyvalpos": 0
     },
     "usegifonthefly[]{}": {
-      "snippet": "usegifonthefly[${2:options}]{${1:fps,${3:start},end}}",
+      "snippet": "usegifonthefly[${2:options}]{${1:fps,start,end}}",
       "option": "animate",
       "keyvalindex": 0,
       "keyvalpos": 0
diff --git a/dev/packages/graphpap.json b/dev/packages/graphpap.json
index 3a117815a..bd04b2481 100644
--- a/dev/packages/graphpap.json
+++ b/dev/packages/graphpap.json
@@ -1,13 +1,6 @@
 {
   "includes": {},
-  "macros": {
-    "graphpaper()()": {
-      "snippet": "graphpaper(${1:x_init},${2:y_init})(${3:x_dimen},${4:y_dimen})"
-    },
-    "graphpaper[]()()": {
-      "snippet": "graphpaper[${1:spacing}](${2:x_init},${3:y_init})(${4:x_dimen},${5:y_dimen})"
-    }
-  },
+  "macros": {},
   "envs": {},
   "options": [],
   "keyvals": []
diff --git a/dev/packages/greektonoi.json b/dev/packages/greektonoi.json
index 4848abd32..5b55a2eaf 100644
--- a/dev/packages/greektonoi.json
+++ b/dev/packages/greektonoi.json
@@ -12,10 +12,6 @@
       "detail": ">",
       "documentation": "GREATER-THAN SIGN r:"
     },
-    ")": {
-      "detail": ")",
-      "documentation": "RIGHT PARENTHESIS"
-    },
     "perispwmeni": {},
     "tildeOFF": {},
     "tildeON": {},
diff --git a/dev/packages/gregoriosyms.json b/dev/packages/gregoriosyms.json
index 460b33f80..bab7955f5 100644
--- a/dev/packages/gregoriosyms.json
+++ b/dev/packages/gregoriosyms.json
@@ -112,13 +112,13 @@
       "snippet": "gredefbarredsymbol{${1:csname}}{${2:definition}}{${3:symbol}}{${4:size}}{${5:hshift}}{${6:vshift}}"
     },
     "gresimpledefbarredsymbol{}{}": {
-      "snippet": "gresimpledefbarredsymbol{${1:A,${3: R}, or V}}{${2:left shift}}"
+      "snippet": "gresimpledefbarredsymbol{${1:A, R, or V}}{${2:left shift}}"
     },
     "ABar": {},
     "VBar": {},
     "RBar": {},
     "grelatexsimpledefbarredsymbol{}{}{}{}{}": {
-      "snippet": "grelatexsimpledefbarredsymbol{${1:A,${6: R}, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
+      "snippet": "grelatexsimpledefbarredsymbol{${1:A, R, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
     },
     "gothRbar": {},
     "gothVbar": {},
diff --git a/dev/packages/gregoriotex.json b/dev/packages/gregoriotex.json
index f56334bcd..caf33bc0a 100644
--- a/dev/packages/gregoriotex.json
+++ b/dev/packages/gregoriotex.json
@@ -786,13 +786,13 @@
       "snippet": "gredefbarredsymbol{${1:csname}}{${2:definition}}{${3:symbol}}{${4:size}}{${5:hshift}}{${6:vshift}}"
     },
     "gresimpledefbarredsymbol{}{}": {
-      "snippet": "gresimpledefbarredsymbol{${1:A,${3: R}, or V}}{${2:left shift}}"
+      "snippet": "gresimpledefbarredsymbol{${1:A, R, or V}}{${2:left shift}}"
     },
     "ABar": {},
     "VBar": {},
     "RBar": {},
     "grelatexsimpledefbarredsymbol{}{}{}{}{}": {
-      "snippet": "grelatexsimpledefbarredsymbol{${1:A,${6: R}, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
+      "snippet": "grelatexsimpledefbarredsymbol{${1:A, R, or V}}{${2:upmedium shift}}{${3:itmedium shift}}{${4:upbold shift}}{${5:itbold shift}}"
     },
     "gothRbar": {},
     "gothVbar": {},
diff --git a/dev/packages/grid.json b/dev/packages/grid.json
deleted file mode 100644
index d9a0f3da0..000000000
--- a/dev/packages/grid.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "includes": {
-    "keyval": []
-  },
-  "macros": {
-    "fight": {},
-    "roundoff": {},
-    "floatunit": {},
-    "allfloats": {},
-    "halfbaselineskip": {},
-    "figboxht": {},
-    "mylines": {},
-    "oldendfigure": {},
-    "oldendtable": {},
-    "oldfigure": {},
-    "oldtable": {},
-    "xbaselineskip": {},
-    "ProcessOptionsKV": {}
-  },
-  "envs": {
-    "gridenv": {},
-    "gridfltenv": {}
-  },
-  "options": [
-    "fontsize=",
-    "baseline=",
-    "lines=${1:number}"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/gridslides.json b/dev/packages/gridslides.json
deleted file mode 100644
index 6ac14c43e..000000000
--- a/dev/packages/gridslides.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "includes": {
-    "inputenc": [],
-    "amsmath": [],
-    "amsthm": [],
-    "amssymb": [],
-    "mathtools": [],
-    "babel": [],
-    "braket": [],
-    "siunitx": [],
-    "xspace": [],
-    "dsfont": [],
-    "microtype": [],
-    "ragged2e": [],
-    "tikz": [],
-    "geometry": [],
-    "xstring": [],
-    "enumerate": [],
-    "environ": [],
-    "hyperref": [],
-    "tikzlibrarycalc": []
-  },
-  "macros": {
-    "bg{}": {
-      "snippet": "bg{${1:imagefile}}"
-    },
-    "txt(){}": {
-      "snippet": "txt(${2:x},${3:y}){${1:text}}"
-    },
-    "block(){}": {
-      "snippet": "block(${2:x},${3:y},${4:w}){${1:content}}"
-    },
-    "block<>(){}": {
-      "snippet": "block<${2:}>(${3:x},${4:y},${5:w}){${1:content}}"
-    },
-    "fig(){}": {
-      "snippet": "fig(${2:x},${3:y},${4:w}){${1:imagefile}}"
-    },
-    "eq(){}": {
-      "snippet": "eq(${2:x},${3:y}){${1:formula}}"
-    },
-    "institute{}": {
-      "snippet": "institute{${1:institute}}"
-    },
-    "theheadline": {},
-    "theslide": {},
-    "theauthor": {},
-    "thetitle": {},
-    "thedate": {},
-    "theinstitute": {},
-    "rgb{}": {
-      "snippet": "rgb{${1:rgb}}"
-    },
-    "captionsngerman": {},
-    "datengerman": {},
-    "extrasngerman": {},
-    "noextrasngerman": {},
-    "dq": {},
-    "ntosstrue": {},
-    "ntossfalse": {},
-    "prefacename": {},
-    "bibname": {},
-    "chaptername": {},
-    "enclname": {},
-    "ccname": {},
-    "headtoname": {},
-    "seename": {},
-    "alsoname": {},
-    "proofname": {},
-    "glossaryname": {},
-    "mdqon": {},
-    "mdqoff": {}
-  },
-  "envs": {
-    "slide{}": {
-      "name": "slide",
-      "snippet": "{${1:title}}"
-    },
-    "style": {},
-    "rawslide": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/grmath.json b/dev/packages/grmath.json
deleted file mode 100644
index cf15cdddf..000000000
--- a/dev/packages/grmath.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "lcm": {},
-    "arccot": {},
-    "arcsec": {},
-    "arccsc": {},
-    "symgroperators": {}
-  },
-  "envs": {},
-  "options": [
-    "grlog",
-    "enlog"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/guit.json b/dev/packages/guit.json
deleted file mode 100644
index c0dfc5f37..000000000
--- a/dev/packages/guit.json
+++ /dev/null
@@ -1,197 +0,0 @@
-{
-  "includes": {
-    "graphics": [],
-    "url": [],
-    "xcolor": [],
-    "xkeyval": []
-  },
-  "macros": {
-    "GuIT": {},
-    "GuIT[]": {
-      "snippet": "GuIT[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "guit": {},
-    "guit[]": {
-      "snippet": "guit[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "GuIT*": {},
-    "GuIT*[]": {
-      "snippet": "GuIT*[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "guit*": {},
-    "guit*[]": {
-      "snippet": "guit*[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Ars": {},
-    "Arsob": {},
-    "ars": {},
-    "tecnica": {},
-    "arsta": {},
-    "arstb": {},
-    "arstv": {},
-    "arsto": {},
-    "Arsto": {},
-    "GuITcolor{}": {
-      "snippet": "GuITcolor{${1:c,${2:m},${3:y},k}}"
-    },
-    "GuITcolor[]{}": {
-      "snippet": "GuITcolor[${2:model}]{${1:color spec}}"
-    },
-    "guitcolor{}": {
-      "snippet": "guitcolor{${1:c,${2:m},${3:y},k}}"
-    },
-    "guitcolor[]{}": {
-      "snippet": "guitcolor[${2:model}]{${1:color spec}}"
-    },
-    "GuITcolor*{}": {
-      "snippet": "GuITcolor*{${1:c,${2:m},${3:y},k}}"
-    },
-    "GuITcolor*[]{}": {
-      "snippet": "GuITcolor*[${2:model}]{${1:color spec}}"
-    },
-    "guitcolor*{}": {
-      "snippet": "guitcolor*{${1:c,${2:m},${3:y},k}}"
-    },
-    "guitcolor*[]{}": {
-      "snippet": "guitcolor*[${2:model}]{${1:color spec}}"
-    },
-    "GuITtext": {},
-    "GuITtext[]": {
-      "snippet": "GuITtext[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "guittext": {},
-    "guittext[]": {
-      "snippet": "guittext[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "GuITtextEn": {},
-    "GuITtextEn[]": {
-      "snippet": "GuITtextEn[${1:options}]"
-    },
-    "guittexten": {},
-    "guittexten[]": {
-      "snippet": "guittexten[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "GuITurl": {},
-    "GuITurl[]": {
-      "snippet": "GuITurl[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "guiturl": {},
-    "guiturl[]": {
-      "snippet": "guiturl[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "GuITforum": {},
-    "GuITforum[]": {
-      "snippet": "GuITforum[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "guitforum": {},
-    "guitforum[]": {
-      "snippet": "guitforum[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "GuITmeeting": {},
-    "GuITmeeting[]": {
-      "snippet": "GuITmeeting[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "guitmeeting": {},
-    "guitmeeting[]": {
-      "snippet": "guitmeeting[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "GuITmeeting*": {},
-    "GuITmeeting*[]": {
-      "snippet": "GuITmeeting*[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "guitmeeting*": {},
-    "guitmeeting*[]": {
-      "snippet": "guitmeeting*[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "setupGuIT[]": {
-      "snippet": "setupGuIT[${1:options}]",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "setupguit[]": {
-      "snippet": "setupguit[${1:options}]",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "DeclareGuITLogoCommand{}{}{}{}{}": {
-      "snippet": "DeclareGuITLogoCommand{${1:family}}{${2:u-hor}}{${3:u-vert}}{${4:i-hor}}{${5:t-hor}}"
-    },
-    "DeclareGuITLogoCommand{}[]{}{}{}{}": {
-      "snippet": "DeclareGuITLogoCommand{${1:family}}[${2:series}]{${3:u-hor}}{${4:u-vert}}{${5:i-hor}}{${6:t-hor}}"
-    },
-    "AliasGuITLogoCommand{}{}{}{}": {
-      "snippet": "AliasGuITLogoCommand{${1:family1}}{${2:series1}}{${3:family2}}{${4:series2}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "color",
-    "nocolor",
-    "link"
-  ],
-  "keyvals": [
-    [
-      "color=",
-      "link=",
-      "family=${1:family}",
-      "series=${1:series}",
-      "url=${1:URL}"
-    ],
-    [
-      "link=",
-      "url=${1:URL}"
-    ],
-    [
-      "link=",
-      "url=${1:URL}",
-      "document=${1:path}"
-    ],
-    [
-      "color=",
-      "link=",
-      "url=${1:URL}",
-      "year=${1:year}",
-      "style="
-    ],
-    [
-      "color=",
-      "link=",
-      "family=${1:family}",
-      "series=${1:series}",
-      "url=${1:URL}",
-      "document=${1:path}",
-      "year=${1:year}",
-      "style="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/hamnosys.json b/dev/packages/hamnosys.json
index 643b18fd6..64d933a6d 100644
--- a/dev/packages/hamnosys.json
+++ b/dev/packages/hamnosys.json
@@ -11,7 +11,7 @@
     },
     "hamnosysfont": {},
     "hamnosys{}": {
-      "snippet": "hamnosys{${1:sym1,${2:sym2},...}}"
+      "snippet": "hamnosys{${1:sym1,sym2,...}}"
     },
     "hamfist": {},
     "hamflathand": {},
diff --git a/dev/packages/handout.json b/dev/packages/handout.json
deleted file mode 100644
index 92a6a3ae3..000000000
--- a/dev/packages/handout.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "includes": {
-    "kvoptions": [],
-    "etoolbox": [],
-    "suffix": []
-  },
-  "macros": {
-    "handout{}": {
-      "snippet": "handout{${1:file path}}"
-    },
-    "thehandoutnumber": {},
-    "handoutnumber{}": {
-      "snippet": "handoutnumber{${1:arg}}"
-    },
-    "handoutnumberintxt{}": {
-      "snippet": "handoutnumberintxt{${1:arg}}"
-    },
-    "disablehandout": {},
-    "enablehandout": {},
-    "onlyhandout{}": {
-      "snippet": "onlyhandout{${1:contents}}"
-    },
-    "nothandout{}": {
-      "snippet": "nothandout{${1:contents}}"
-    },
-    "forhandout{}": {
-      "snippet": "forhandout{${1:contents}}"
-    },
-    "forhandout*{}": {
-      "snippet": "forhandout*{${1:contents}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "dir=${1:file path}",
-    "sectioning",
-    "disabled",
-    "printing",
-    "numbering"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/hcycle.json b/dev/packages/hcycle.json
index a83bc703a..7382d88b0 100644
--- a/dev/packages/hcycle.json
+++ b/dev/packages/hcycle.json
@@ -15,18 +15,6 @@
     "FiveSugarh[]{}{}[]": {
       "snippet": "FiveSugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "FiveSugarh(){}{}": {
-      "snippet": "FiveSugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "FiveSugarh(){}{}[]": {
-      "snippet": "FiveSugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "FiveSugarh()[]{}{}": {
-      "snippet": "FiveSugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "FiveSugarh()[]{}{}[]": {
-      "snippet": "FiveSugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "Furanose{}": {
       "snippet": "Furanose{${1:subslist}}"
     },
@@ -63,18 +51,6 @@
     "SixSugarh[]{}{}[]": {
       "snippet": "SixSugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "SixSugarh(){}{}": {
-      "snippet": "SixSugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "SixSugarh(){}{}[]": {
-      "snippet": "SixSugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "SixSugarh()[]{}{}": {
-      "snippet": "SixSugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "SixSugarh()[]{}{}[]": {
-      "snippet": "SixSugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "fivesugarh{}{}": {
       "snippet": "fivesugarh{${1:atomlist}}{${2:subslist}}"
     },
@@ -87,18 +63,6 @@
     "fivesugarh[]{}{}[]": {
       "snippet": "fivesugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "fivesugarh(){}{}": {
-      "snippet": "fivesugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "fivesugarh(){}{}[]": {
-      "snippet": "fivesugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "fivesugarh()[]{}{}": {
-      "snippet": "fivesugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "fivesugarh()[]{}{}[]": {
-      "snippet": "fivesugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "fivesugarhw{}{}": {
       "snippet": "fivesugarhw{${1:atomlist}}{${2:subslist}}"
     },
@@ -111,18 +75,6 @@
     "fivesugarhw[]{}{}[]": {
       "snippet": "fivesugarhw[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "fivesugarhw(){}{}": {
-      "snippet": "fivesugarhw(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "fivesugarhw(){}{}[]": {
-      "snippet": "fivesugarhw(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "fivesugarhw()[]{}{}": {
-      "snippet": "fivesugarhw(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "fivesugarhw()[]{}{}[]": {
-      "snippet": "fivesugarhw(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "furanose{}": {
       "snippet": "furanose{${1:subslist}}"
     },
@@ -159,18 +111,6 @@
     "sixsugarh[]{}{}[]": {
       "snippet": "sixsugarh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "sixsugarh(){}{}": {
-      "snippet": "sixsugarh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "sixsugarh(){}{}[]": {
-      "snippet": "sixsugarh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "sixsugarh()[]{}{}": {
-      "snippet": "sixsugarh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "sixsugarh()[]{}{}[]": {
-      "snippet": "sixsugarh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "sixsugarhw{}{}": {
       "snippet": "sixsugarhw{${1:atomlist}}{${2:subslist}}"
     },
@@ -183,18 +123,6 @@
     "sixsugarhw[]{}{}[]": {
       "snippet": "sixsugarhw[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "sixsugarhw(){}{}": {
-      "snippet": "sixsugarhw(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "sixsugarhw(){}{}[]": {
-      "snippet": "sixsugarhw(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "sixsugarhw()[]{}{}": {
-      "snippet": "sixsugarhw(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "sixsugarhw()[]{}{}[]": {
-      "snippet": "sixsugarhw(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "Cyclitol": {},
     "cyclitol": {},
     "fSugarhbondd": {},
diff --git a/dev/packages/hep-math.json b/dev/packages/hep-math.json
index ee0680c97..d597e9062 100644
--- a/dev/packages/hep-math.json
+++ b/dev/packages/hep-math.json
@@ -202,10 +202,10 @@
     },
     "rowseperator": {},
     "row{}": {
-      "snippet": "row{${1:x1,${2:x2},...}}"
+      "snippet": "row{${1:x1,x2,...}}"
     },
     "column{}": {
-      "snippet": "column{${1:x1,${2:x2},...}}"
+      "snippet": "column{${1:x1,x2,...}}"
     },
     "midbar": {},
     "midbar[]": {
diff --git a/dev/packages/hetarom.json b/dev/packages/hetarom.json
index a03b07cc9..f4598c961 100644
--- a/dev/packages/hetarom.json
+++ b/dev/packages/hetarom.json
@@ -81,18 +81,6 @@
     "decaheterov[]{}{}[]": {
       "snippet": "decaheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "decaheterov(){}{}": {
-      "snippet": "decaheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterov(){}{}[]": {
-      "snippet": "decaheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "decaheterov()[]{}{}": {
-      "snippet": "decaheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterov()[]{}{}[]": {
-      "snippet": "decaheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "decaheterovi{}{}": {
       "snippet": "decaheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -105,18 +93,6 @@
     "decaheterovi[]{}{}[]": {
       "snippet": "decaheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "decaheterovi(){}{}": {
-      "snippet": "decaheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterovi(){}{}[]": {
-      "snippet": "decaheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "decaheterovi()[]{}{}": {
-      "snippet": "decaheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterovi()[]{}{}[]": {
-      "snippet": "decaheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "decaheterovb{}{}": {
       "snippet": "decaheterovb{${1:atomlist}}{${2:subslist}}"
     },
@@ -129,18 +105,6 @@
     "decaheterovb[]{}{}[]": {
       "snippet": "decaheterovb[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "decaheterovb(){}{}": {
-      "snippet": "decaheterovb(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterovb(){}{}[]": {
-      "snippet": "decaheterovb(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "decaheterovb()[]{}{}": {
-      "snippet": "decaheterovb(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterovb()[]{}{}[]": {
-      "snippet": "decaheterovb(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "decaheterovt{}{}": {
       "snippet": "decaheterovt{${1:atomlist}}{${2:subslist}}"
     },
@@ -153,18 +117,6 @@
     "decaheterovt[]{}{}[]": {
       "snippet": "decaheterovt[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "decaheterovt(){}{}": {
-      "snippet": "decaheterovt(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterovt(){}{}[]": {
-      "snippet": "decaheterovt(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "decaheterovt()[]{}{}": {
-      "snippet": "decaheterovt(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterovt()[]{}{}[]": {
-      "snippet": "decaheterovt(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "fiveheterov{}{}": {
       "snippet": "fiveheterov{${1:atomlist}}{${2:subslist}}"
     },
@@ -177,18 +129,6 @@
     "fiveheterov[]{}{}[]": {
       "snippet": "fiveheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "fiveheterov(){}{}": {
-      "snippet": "fiveheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheterov(){}{}[]": {
-      "snippet": "fiveheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "fiveheterov()[]{}{}": {
-      "snippet": "fiveheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheterov()[]{}{}[]": {
-      "snippet": "fiveheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "fiveheterovi{}{}": {
       "snippet": "fiveheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -201,18 +141,6 @@
     "fiveheterovi[]{}{}[]": {
       "snippet": "fiveheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "fiveheterovi(){}{}": {
-      "snippet": "fiveheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheterovi(){}{}[]": {
-      "snippet": "fiveheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "fiveheterovi()[]{}{}": {
-      "snippet": "fiveheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheterovi()[]{}{}[]": {
-      "snippet": "fiveheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "fourhetero{}{}": {
       "snippet": "fourhetero{${1:atomlist}}{${2:subslist}}"
     },
@@ -225,18 +153,6 @@
     "fourhetero[]{}{}[]": {
       "snippet": "fourhetero[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "fourhetero(){}{}": {
-      "snippet": "fourhetero(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "fourhetero(){}{}[]": {
-      "snippet": "fourhetero(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "fourhetero()[]{}{}": {
-      "snippet": "fourhetero(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "fourhetero()[]{}{}[]": {
-      "snippet": "fourhetero(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "furanv{}": {
       "snippet": "furanv{${1:subslist}}"
     },
@@ -357,18 +273,6 @@
     "nonaheterov[]{}{}[]": {
       "snippet": "nonaheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "nonaheterov(){}{}": {
-      "snippet": "nonaheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheterov(){}{}[]": {
-      "snippet": "nonaheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "nonaheterov()[]{}{}": {
-      "snippet": "nonaheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheterov()[]{}{}[]": {
-      "snippet": "nonaheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "nonaheterovi{}{}": {
       "snippet": "nonaheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -381,18 +285,6 @@
     "nonaheterovi[]{}{}[]": {
       "snippet": "nonaheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "nonaheterovi(){}{}": {
-      "snippet": "nonaheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheterovi(){}{}[]": {
-      "snippet": "nonaheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "nonaheterovi()[]{}{}": {
-      "snippet": "nonaheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheterovi()[]{}{}[]": {
-      "snippet": "nonaheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "oxazolev{}": {
       "snippet": "oxazolev{${1:subslist}}"
     },
@@ -615,18 +507,6 @@
     "sixheterov[]{}{}[]": {
       "snippet": "sixheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "sixheterov(){}{}": {
-      "snippet": "sixheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheterov(){}{}[]": {
-      "snippet": "sixheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "sixheterov()[]{}{}": {
-      "snippet": "sixheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheterov()[]{}{}[]": {
-      "snippet": "sixheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "sixheterovi{}{}": {
       "snippet": "sixheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -639,18 +519,6 @@
     "sixheterovi[]{}{}[]": {
       "snippet": "sixheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "sixheterovi(){}{}": {
-      "snippet": "sixheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheterovi(){}{}[]": {
-      "snippet": "sixheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "sixheterovi()[]{}{}": {
-      "snippet": "sixheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheterovi()[]{}{}[]": {
-      "snippet": "sixheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "thietane{}": {
       "snippet": "thietane{${1:subslist}}"
     },
@@ -696,18 +564,6 @@
     "threeheteroi[]{}{}[]": {
       "snippet": "threeheteroi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "threeheteroi(){}{}": {
-      "snippet": "threeheteroi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheteroi(){}{}[]": {
-      "snippet": "threeheteroi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "threeheteroi()[]{}{}": {
-      "snippet": "threeheteroi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheteroi()[]{}{}[]": {
-      "snippet": "threeheteroi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "threeheterov{}{}": {
       "snippet": "threeheterov{${1:atomlist}}{${2:subslist}}"
     },
@@ -720,18 +576,6 @@
     "threeheterov[]{}{}[]": {
       "snippet": "threeheterov[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "threeheterov(){}{}": {
-      "snippet": "threeheterov(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheterov(){}{}[]": {
-      "snippet": "threeheterov(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "threeheterov()[]{}{}": {
-      "snippet": "threeheterov(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheterov()[]{}{}[]": {
-      "snippet": "threeheterov(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "threeheterovi{}{}": {
       "snippet": "threeheterovi{${1:atomlist}}{${2:subslist}}"
     },
@@ -744,18 +588,6 @@
     "threeheterovi[]{}{}[]": {
       "snippet": "threeheterovi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "threeheterovi(){}{}": {
-      "snippet": "threeheterovi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheterovi(){}{}[]": {
-      "snippet": "threeheterovi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "threeheterovi()[]{}{}": {
-      "snippet": "threeheterovi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheterovi()[]{}{}[]": {
-      "snippet": "threeheterovi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "triazinev{}": {
       "snippet": "triazinev{${1:subslist}}"
     },
diff --git a/dev/packages/hetaromh.json b/dev/packages/hetaromh.json
index abc71cd9c..7a9097094 100644
--- a/dev/packages/hetaromh.json
+++ b/dev/packages/hetaromh.json
@@ -61,18 +61,6 @@
     "decaheteroh[]{}{}[]": {
       "snippet": "decaheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "decaheteroh(){}{}": {
-      "snippet": "decaheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheteroh(){}{}[]": {
-      "snippet": "decaheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "decaheteroh()[]{}{}": {
-      "snippet": "decaheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheteroh()[]{}{}[]": {
-      "snippet": "decaheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "decaheterohi{}{}": {
       "snippet": "decaheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -85,18 +73,6 @@
     "decaheterohi[]{}{}[]": {
       "snippet": "decaheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "decaheterohi(){}{}": {
-      "snippet": "decaheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterohi(){}{}[]": {
-      "snippet": "decaheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "decaheterohi()[]{}{}": {
-      "snippet": "decaheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "decaheterohi()[]{}{}[]": {
-      "snippet": "decaheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "fiveheteroh{}{}": {
       "snippet": "fiveheteroh{${1:atomlist}}{${2:subslist}}"
     },
@@ -109,18 +85,6 @@
     "fiveheteroh[]{}{}[]": {
       "snippet": "fiveheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "fiveheteroh(){}{}": {
-      "snippet": "fiveheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheteroh(){}{}[]": {
-      "snippet": "fiveheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "fiveheteroh()[]{}{}": {
-      "snippet": "fiveheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheteroh()[]{}{}[]": {
-      "snippet": "fiveheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "fiveheterohi{}{}": {
       "snippet": "fiveheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -133,18 +97,6 @@
     "fiveheterohi[]{}{}[]": {
       "snippet": "fiveheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "fiveheterohi(){}{}": {
-      "snippet": "fiveheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheterohi(){}{}[]": {
-      "snippet": "fiveheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "fiveheterohi()[]{}{}": {
-      "snippet": "fiveheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "fiveheterohi()[]{}{}[]": {
-      "snippet": "fiveheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "furanh{}": {
       "snippet": "furanh{${1:subslist}}"
     },
@@ -253,18 +205,6 @@
     "nonaheteroh[]{}{}[]": {
       "snippet": "nonaheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "nonaheteroh(){}{}": {
-      "snippet": "nonaheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheteroh(){}{}[]": {
-      "snippet": "nonaheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "nonaheteroh()[]{}{}": {
-      "snippet": "nonaheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheteroh()[]{}{}[]": {
-      "snippet": "nonaheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "nonaheterohi{}{}": {
       "snippet": "nonaheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -277,18 +217,6 @@
     "nonaheterohi[]{}{}[]": {
       "snippet": "nonaheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "nonaheterohi(){}{}": {
-      "snippet": "nonaheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheterohi(){}{}[]": {
-      "snippet": "nonaheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "nonaheterohi()[]{}{}": {
-      "snippet": "nonaheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "nonaheterohi()[]{}{}[]": {
-      "snippet": "nonaheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "oxazoleh{}": {
       "snippet": "oxazoleh{${1:subslist}}"
     },
@@ -457,18 +385,6 @@
     "sixheteroh[]{}{}[]": {
       "snippet": "sixheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "sixheteroh(){}{}": {
-      "snippet": "sixheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheteroh(){}{}[]": {
-      "snippet": "sixheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "sixheteroh()[]{}{}": {
-      "snippet": "sixheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheteroh()[]{}{}[]": {
-      "snippet": "sixheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "sixheterohi{}{}": {
       "snippet": "sixheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -481,18 +397,6 @@
     "sixheterohi[]{}{}[]": {
       "snippet": "sixheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "sixheterohi(){}{}": {
-      "snippet": "sixheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheterohi(){}{}[]": {
-      "snippet": "sixheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "sixheterohi()[]{}{}": {
-      "snippet": "sixheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "sixheterohi()[]{}{}[]": {
-      "snippet": "sixheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "thiiraneh{}": {
       "snippet": "thiiraneh{${1:subslist}}"
     },
@@ -529,18 +433,6 @@
     "threeheteroh[]{}{}[]": {
       "snippet": "threeheteroh[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "threeheteroh(){}{}": {
-      "snippet": "threeheteroh(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheteroh(){}{}[]": {
-      "snippet": "threeheteroh(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "threeheteroh()[]{}{}": {
-      "snippet": "threeheteroh(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheteroh()[]{}{}[]": {
-      "snippet": "threeheteroh(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "threeheterohi{}{}": {
       "snippet": "threeheterohi{${1:atomlist}}{${2:subslist}}"
     },
@@ -553,18 +445,6 @@
     "threeheterohi[]{}{}[]": {
       "snippet": "threeheterohi[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
     },
-    "threeheterohi(){}{}": {
-      "snippet": "threeheterohi(${3:skelbdlist}){${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheterohi(){}{}[]": {
-      "snippet": "threeheterohi(${4:skelbdlist}){${1:atomlist}}{${2:subslist}}[${3:delbdlist}]"
-    },
-    "threeheterohi()[]{}{}": {
-      "snippet": "threeheterohi(${4:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}"
-    },
-    "threeheterohi()[]{}{}[]": {
-      "snippet": "threeheterohi(${5:skelbdlist})[${3:bondlist}]{${1:atomlist}}{${2:subslist}}[${4:delbdlist}]"
-    },
     "triazineh{}": {
       "snippet": "triazineh{${1:subslist}}"
     },
diff --git a/dev/packages/hf-tikz.json b/dev/packages/hf-tikz.json
index b87973d20..f4f54993d 100644
--- a/dev/packages/hf-tikz.json
+++ b/dev/packages/hf-tikz.json
@@ -8,9 +8,6 @@
     "tikzmarkin{}": {
       "snippet": "tikzmarkin{${1:marker-id}}"
     },
-    "tikzmarkin{}()()": {
-      "snippet": "tikzmarkin{${1:marker-id}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
     "tikzmarkin[]{}": {
       "snippet": "tikzmarkin[${2:options}]{${1:marker-id}}",
       "keyvalindex": 0,
diff --git a/dev/packages/hgbbib.json b/dev/packages/hgbbib.json
index be7e4255d..f91cec7cf 100644
--- a/dev/packages/hgbbib.json
+++ b/dev/packages/hgbbib.json
@@ -77,18 +77,6 @@
       "snippet": "nptextcites{${1:bibid}}{${2:bibid}}",
       "option": "apa"
     },
-    "nptextcites(){}{}": {
-      "snippet": "nptextcites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()(){}{}": {
-      "snippet": "nptextcites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "apa"
-    },
-    "nptextcites()()[]{}[]{}": {
-      "snippet": "nptextcites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "apa"
-    },
     "nptextcites[]{}[]{}": {
       "snippet": "nptextcites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "apa"
@@ -97,10 +85,6 @@
       "snippet": "nptextcites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "apa"
     },
-    "nptextcites()()[][]{}[][]{}": {
-      "snippet": "nptextcites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "apa"
-    },
     "AddBibFile{}": {
       "snippet": "AddBibFile{${1:bib file}}"
     },
@@ -108,24 +92,12 @@
     "mcite{}{}": {
       "snippet": "mcite{${1:bibid}}{${2:bibid}}"
     },
-    "mcite(){}{}": {
-      "snippet": "mcite(${3:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "mcite()(){}{}": {
-      "snippet": "mcite(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}"
-    },
-    "mcite()()[]{}[]{}": {
-      "snippet": "mcite(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
-    },
     "mcite[]{}[]{}": {
       "snippet": "mcite[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}"
     },
     "mcite[][]{}[][]{}": {
       "snippet": "mcite[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
     },
-    "mcite()()[][]{}[][]{}": {
-      "snippet": "mcite(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}"
-    },
     "citenobr{}": {
       "snippet": "citenobr{${1:bibid}}"
     },
diff --git a/dev/packages/hlist.json b/dev/packages/hlist.json
index 8100ae303..a5b59bcf7 100644
--- a/dev/packages/hlist.json
+++ b/dev/packages/hlist.json
@@ -7,9 +7,6 @@
     "hitem>": {},
     "hitem*": {},
     "hitem*>": {},
-    "hitem()": {
-      "snippet": "hitem(${1:num})"
-    },
     "sethlist{}": {
       "snippet": "sethlist{${1:keyvals}}",
       "keyvalindex": 0,
diff --git a/dev/packages/hsetup.json b/dev/packages/hsetup.json
deleted file mode 100644
index 79719b60c..000000000
--- a/dev/packages/hsetup.json
+++ /dev/null
@@ -1,367 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "graphicx": [],
-    "class-letter": [],
-    "babel": []
-  },
-  "macros": {
-    "addressA{}": {
-      "snippet": "addressA{${1:text}}"
-    },
-    "addressB{}": {
-      "snippet": "addressB{${1:text}}"
-    },
-    "addressC{}": {
-      "snippet": "addressC{${1:text}}"
-    },
-    "border[]{}{}": {
-      "snippet": "border[${3:voffset}]{${1:height}}{${2:imagefile}}"
-    },
-    "border{}{}": {
-      "snippet": "border{${1:height}}{${2:imagefile}}"
-    },
-    "bottomC{}": {
-      "snippet": "bottomC{${1:text}}"
-    },
-    "bottomL{}": {
-      "snippet": "bottomL{${1:text}}"
-    },
-    "bottomR{}": {
-      "snippet": "bottomR{${1:text}}"
-    },
-    "centreA{}": {
-      "snippet": "centreA{${1:text}}"
-    },
-    "centreB{}": {
-      "snippet": "centreB{${1:text}}"
-    },
-    "centreC{}": {
-      "snippet": "centreC{${1:text}}"
-    },
-    "centreD{}": {
-      "snippet": "centreD{${1:text}}"
-    },
-    "centreE{}": {
-      "snippet": "centreE{${1:text}}"
-    },
-    "centreF{}": {
-      "snippet": "centreF{${1:text}}"
-    },
-    "centrepos{}": {
-      "snippet": "centrepos{${1:offset}}"
-    },
-    "extraA{}": {
-      "snippet": "extraA{${1:text}}"
-    },
-    "extraB{}": {
-      "snippet": "extraB{${1:text}}"
-    },
-    "extraC{}": {
-      "snippet": "extraC{${1:text}}"
-    },
-    "logo[]{}": {
-      "snippet": "logo[${2:height}]{${1:imagefile}}"
-    },
-    "logo{}": {
-      "snippet": "logo{${1:imagefile}}"
-    },
-    "newfa": {},
-    "newfb": {},
-    "newfc": {},
-    "newoption{}{}": {
-      "snippet": "newoption{${1:name}}{${2:number}}"
-    },
-    "addrbox": {},
-    "centreoffset": {},
-    "cmda{}": {
-      "snippet": "cmda{${1:arg}}"
-    },
-    "cmdb{}": {
-      "snippet": "cmdb{${1:arg}}"
-    },
-    "dohead{}{}{}{}": {
-      "snippet": "dohead{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "dotoadd{}": {
-      "snippet": "dotoadd{${1:arg}}"
-    },
-    "draftfalse": {},
-    "drafttrue": {},
-    "hlangcnt": {},
-    "hltype": {},
-    "ifdraft": {},
-    "logoheight": {},
-    "logoname": {},
-    "myc": {},
-    "oldbls": {},
-    "pindt": {},
-    "sealbx": {},
-    "settoadd{}": {
-      "snippet": "settoadd{${1:arg}}"
-    },
-    "tmpdima": {},
-    "tmpdimb": {},
-    "frenchsetup{}": {
-      "snippet": "frenchsetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "frenchbsetup{}": {
-      "snippet": "frenchbsetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "AddThinSpaceBeforeFootnotes": {},
-    "alsoname": {},
-    "at": {},
-    "bibname": {},
-    "AutoSpaceBeforeFDP": {},
-    "boi": {},
-    "bname{}": {
-      "snippet": "bname{${1:text}}"
-    },
-    "bsc{}": {
-      "snippet": "bsc{${1:text}}"
-    },
-    "CaptionSeparator": {},
-    "captionsfrench": {},
-    "ccname": {},
-    "chaptername": {},
-    "circonflexe": {},
-    "dateacadian": {},
-    "datefrench": {},
-    "DecimalMathComma": {},
-    "degre": {},
-    "degres": {},
-    "descindentFB": {},
-    "dotFFN": {},
-    "enclname": {},
-    "extrasfrench": {},
-    "FBcolonspace": {},
-    "FBdatebox": {},
-    "FBdatespace": {},
-    "FBeverylineguill": {},
-    "FBfigtabshape": {},
-    "FBfnindent": {},
-    "FBFrenchFootnotesfalse": {},
-    "FBFrenchFootnotestrue": {},
-    "FBFrenchSuperscriptstrue": {},
-    "FBGlobalLayoutFrenchtrue": {},
-    "FBgspchar": {},
-    "FBguillopen": {},
-    "FBguillspace": {},
-    "FBInnerGuillSinglefalse": {},
-    "FBInnerGuillSingletrue": {},
-    "FBListItemsAsParfalse": {},
-    "FBListItemsAsPartrue": {},
-    "FBLowercaseSuperscriptstrue": {},
-    "FBmedkern": {},
-    "FBPartNameFulltrue": {},
-    "FBsetspaces[]{}{}{}{}": {
-      "snippet": "FBsetspaces[${5:language}]{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}"
-    },
-    "FBsetspaces{}{}{}{}": {
-      "snippet": "FBsetspaces{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}"
-    },
-    "FBSmallCapsFigTabCaptionstrue": {},
-    "FBStandardEnumerateEnvtrue": {},
-    "FBStandardItemizeEnvtrue": {},
-    "FBStandardItemLabelstrue": {},
-    "FBStandardLayouttrue": {},
-    "FBStandardListSpacingtrue": {},
-    "FBStandardListstrue": {},
-    "FBsupR": {},
-    "FBsupS": {},
-    "FBtextellipsis": {},
-    "FBthickkern": {},
-    "FBthinspace": {},
-    "FBthousandsep": {},
-    "FBWarning{}": {
-      "snippet": "FBWarning{${1:message}}"
-    },
-    "fg": {},
-    "fgi": {},
-    "fgii": {},
-    "fprimo)": {},
-    "frenchdate{}{}{}": {
-      "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
-    },
-    "FrenchEnumerate{}": {
-      "snippet": "FrenchEnumerate{${1:arg}}"
-    },
-    "FrenchFootnotes": {},
-    "FrenchLabelItem": {},
-    "frenchpartfirst": {},
-    "frenchpartsecond": {},
-    "FrenchPopularEnumerate{}": {
-      "snippet": "FrenchPopularEnumerate{${1:arg}}"
-    },
-    "frenchtoday": {},
-    "Frlabelitemi": {},
-    "Frlabelitemii": {},
-    "Frlabelitemiii": {},
-    "Frlabelitemiv": {},
-    "frquote{}": {
-      "snippet": "frquote{${1:text}}"
-    },
-    "fup{}": {
-      "snippet": "fup{${1:text}}"
-    },
-    "glossaryname": {},
-    "headtoname": {},
-    "ieme": {},
-    "iemes": {},
-    "ier": {},
-    "iere": {},
-    "ieres": {},
-    "iers": {},
-    "ifFBAutoSpaceFootnotes": {},
-    "ifFBCompactItemize": {},
-    "ifFBCustomiseFigTabCaptions": {},
-    "ifFBfrench": {},
-    "ifFBFrenchFootnotes": {},
-    "ifFBFrenchSuperscripts": {},
-    "ifFBGlobalLayoutFrench": {},
-    "ifFBIndentFirst": {},
-    "ifFBINGuillSpace": {},
-    "ifFBListItemsAsPar": {},
-    "ifFBListOldLayout": {},
-    "ifFBLowercaseSuperscripts": {},
-    "ifFBLuaTeX": {},
-    "ifFBOldFigTabCaptions": {},
-    "ifFBOriginalTypewriter": {},
-    "ifFBPartNameFull": {},
-    "ifFBReduceListSpacing": {},
-    "ifFBShowOptions": {},
-    "ifFBSmallCapsFigTabCaptions": {},
-    "ifFBStandardEnumerateEnv": {},
-    "ifFBStandardItemizeEnv": {},
-    "ifFBStandardItemLabels": {},
-    "ifFBStandardLayout": {},
-    "ifFBStandardLists": {},
-    "ifFBStandardListSpacing": {},
-    "ifFBSuppressWarning": {},
-    "ifFBThinColonSpace": {},
-    "ifFBThinSpaceInFrenchNumbers": {},
-    "ifFBunicode": {},
-    "ifFBXeTeX": {},
-    "ifLaTeXe": {},
-    "kernFFN": {},
-    "labelindentFB": {},
-    "labelwidthFB": {},
-    "leftmarginFB": {},
-    "listfigurename": {},
-    "listindentFB": {},
-    "No": {},
-    "no": {},
-    "NoAutoSpaceBeforeFDP": {},
-    "NoAutoSpacing": {},
-    "NoEveryParQuote": {},
-    "noextrasfrench": {},
-    "nombre{}": {
-      "snippet": "nombre{${1:arg}}"
-    },
-    "nos": {},
-    "Nos": {},
-    "og": {},
-    "ogi": {},
-    "ogii": {},
-    "parindentFFN": {},
-    "partfirst": {},
-    "partnameord": {},
-    "partsecond": {},
-    "prefacename": {},
-    "primo": {},
-    "proofname": {},
-    "quarto": {},
-    "rmfamilyFB": {},
-    "secundo": {},
-    "seename": {},
-    "sffamilyFB": {},
-    "StandardFootnotes": {},
-    "StandardMathComma": {},
-    "tertio": {},
-    "tild": {},
-    "ttfamilyFB": {},
-    "up{}": {
-      "snippet": "up{${1:text}}"
-    },
-    "xspace": {},
-    "captionsgerman": {},
-    "dategerman": {},
-    "extrasgerman": {},
-    "noextrasgerman": {},
-    "dq": {},
-    "tosstrue": {},
-    "tossfalse": {},
-    "mdqon": {},
-    "mdqoff": {},
-    "ck": {},
-    "captionsbritish": {},
-    "datebritish": {},
-    "extrasbritish": {},
-    "noextrasbritish": {},
-    "captionsenglish": {},
-    "dateenglish": {},
-    "extrasenglish": {},
-    "noextrasenglish": {},
-    "englishhyphenmins": {},
-    "britishhyphenmins": {},
-    "americanhyphenmins": {}
-  },
-  "envs": {
-    "descriptionFB": {},
-    "enumerateFB": {},
-    "itemizeFB": {},
-    "listFB{}": {
-      "name": "listFB",
-      "snippet": "{${1:symbol}}"
-    },
-    "listORI{}": {
-      "name": "listORI",
-      "snippet": "{${1:symbol}}"
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "ShowOptions",
-      "StandardLayout",
-      "GlobalLayoutFrench",
-      "IndentFirst",
-      "PartNameFull",
-      "ListItemsAsPar",
-      "StandardListSpacing",
-      "StandardItemizeEnv",
-      "StandardEnumerateEnv",
-      "StandardItemLabels",
-      "ItemLabels=",
-      "ItemLabeli=",
-      "ItemLabelii=",
-      "ItemLabeliii=",
-      "ItemLabeliv=",
-      "StandardLists",
-      "ListOldLayout",
-      "FrenchFootnotes",
-      "AutoSpaceFootnotes",
-      "AutoSpacePunctuation",
-      "ThinColonSpace",
-      "OriginalTypewriter",
-      "UnicodeNoBreakSpaces",
-      "og=",
-      "fg=",
-      "INGuillSpace",
-      "EveryParGuill=",
-      "EveryLineGuill=",
-      "InnerGuillSingle",
-      "ThinSpaceInFrenchNumbers",
-      "SmallCapsFigTabCaptions",
-      "CustomiseFigTabCaptions",
-      "OldFigTabCaptions",
-      "FrenchSuperscripts",
-      "LowercaseSuperscripts",
-      "SuppressWarning"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/hvlogos.json b/dev/packages/hvlogos.json
index 9f17d2208..6bf875464 100644
--- a/dev/packages/hvlogos.json
+++ b/dev/packages/hvlogos.json
@@ -117,10 +117,10 @@
       "snippet": "hvLaTeXTeX[${1:(-La kern}][${2:L-a kern}]"
     },
     "hvLaTeXTeX[][][]": {
-      "snippet": "hvLaTeXTeX[${1:(${4:-La kern}][${2:L-a kern}][${3:a-}) kern}]"
+      "snippet": "hvLaTeXTeX[${1:(-La kern}][${2:L-a kern}][${3:a-) kern}]"
     },
     "hvLaTeXTeX[][][][]": {
-      "snippet": "hvLaTeXTeX[${1:(${5:-La kern}][${2:L-a kern}][${3:a-}) kern}][${4:)-TeX kern}]"
+      "snippet": "hvLaTeXTeX[${1:(-La kern}][${2:L-a kern}][${3:a-) kern}][${4:)-TeX kern}]"
     }
   },
   "envs": {},
diff --git a/dev/packages/hvpygmentex.json b/dev/packages/hvpygmentex.json
index 4551f308c..0666a8c69 100644
--- a/dev/packages/hvpygmentex.json
+++ b/dev/packages/hvpygmentex.json
@@ -37,9 +37,6 @@
       "keyvalindex": 2,
       "keyvalpos": 0
     },
-    "widest(){}{}": {
-      "snippet": "widest(${3:string list}){${1:code}}{${2:cmd}}"
-    },
     "VerbatimOutAppend": {},
     "remainingglobaloptions": {},
     "remaininguseroptions": {},
diff --git a/dev/packages/hvqrurl.json b/dev/packages/hvqrurl.json
index a617f843a..9e3b3d052 100644
--- a/dev/packages/hvqrurl.json
+++ b/dev/packages/hvqrurl.json
@@ -30,8 +30,7 @@
   },
   "envs": {},
   "options": [
-    "nohyperref",
-    "forget"
+    "nohyperref"
   ],
   "keyvals": [
     [
diff --git a/dev/packages/hypbmsec.json b/dev/packages/hypbmsec.json
index 923cc31f8..060f8b76a 100644
--- a/dev/packages/hypbmsec.json
+++ b/dev/packages/hypbmsec.json
@@ -4,65 +4,23 @@
     "part[][]{}": {
       "snippet": "part[${2:short title}][${3:outline entry}]{${1:title}}"
     },
-    "part[](){}": {
-      "snippet": "part[${2:short title}](${3:pdf outline entry}){${1:title}}"
-    },
-    "part(){}": {
-      "snippet": "part(${2:pdf outline entry}){${1:title}}"
-    },
     "section[][]{}": {
       "snippet": "section[${2:short title}][${3:outline entry}]{${1:title}}"
     },
-    "section[](){}": {
-      "snippet": "section[${2:short title}](${3:pdf outline entry}){${1:title}}"
-    },
-    "section(){}": {
-      "snippet": "section(${2:pdf outline entry}){${1:title}}"
-    },
     "subsection[][]{}": {
       "snippet": "subsection[${2:short title}][${3:outline entry}]{${1:title}}"
     },
-    "subsection[](){}": {
-      "snippet": "subsection[${2:short title}](${3:pdf outline entry}){${1:title}}"
-    },
-    "subsection(){}": {
-      "snippet": "subsection(${2:pdf outline entry}){${1:title}}"
-    },
     "subsubsection[][]{}": {
       "snippet": "subsubsection[${2:short title}][${3:outline entry}]{${1:title}}"
     },
-    "subsubsection[](){}": {
-      "snippet": "subsubsection[${2:short title}](${3:pdf outline entry}){${1:title}}"
-    },
-    "subsubsection(){}": {
-      "snippet": "subsubsection(${2:pdf outline entry}){${1:title}}"
-    },
     "paragraph[][]{}": {
       "snippet": "paragraph[${2:short title}][${3:outline entry}]{${1:title}}"
     },
-    "paragraph[](){}": {
-      "snippet": "paragraph[${2:short title}](${3:pdf outline entry}){${1:title}}"
-    },
-    "paragraph(){}": {
-      "snippet": "paragraph(${2:pdf outline entry}){${1:title}}"
-    },
     "subparagraph[][]{}": {
       "snippet": "subparagraph[${2:short title}][${3:outline entry}]{${1:title}}"
     },
-    "subparagraph[](){}": {
-      "snippet": "subparagraph[${2:short title}](${3:pdf outline entry}){${1:title}}"
-    },
-    "subparagraph(){}": {
-      "snippet": "subparagraph(${2:pdf outline entry}){${1:title}}"
-    },
     "chapter[][]{}": {
       "snippet": "chapter[${2:short title}][${3:outline entry}]{${1:title}}"
-    },
-    "chapter[](){}": {
-      "snippet": "chapter[${2:short title}](${3:pdf outline entry}){${1:title}}"
-    },
-    "chapter(){}": {
-      "snippet": "chapter(${2:pdf outline entry}){${1:title}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/hyperref.json b/dev/packages/hyperref.json
deleted file mode 100644
index fe966b0a7..000000000
--- a/dev/packages/hyperref.json
+++ /dev/null
@@ -1,479 +0,0 @@
-{
-  "includes": {
-    "iftex": [],
-    "keyval": [],
-    "kvsetkeys": [],
-    "kvdefinekeys": [],
-    "pdfescape": [],
-    "hycolor": [],
-    "kvoptions": [],
-    "intcalc": [],
-    "url": [],
-    "bitset": [],
-    "bigintcalc": [],
-    "atbegshi": [],
-    "atveryend": [],
-    "rerunfilecheck": [],
-    "nameref": [],
-    "etoolbox": [],
-    "stringenc": [],
-    "backref": [
-      "backref",
-      "backref=section",
-      "backref=slide",
-      "backref=page",
-      "pagebackref",
-      "pagebackref=true"
-    ],
-    "color": [
-      "colorlinks",
-      "colorlinks=true"
-    ]
-  },
-  "macros": {
-    "HyperDestRename{}{}": {
-      "snippet": "HyperDestRename{${1:destination}}{${2:newname}}",
-      "option": "destlabel=true"
-    },
-    "hyperindexformat{}{}": {
-      "snippet": "hyperindexformat{${1:arg1}}{${2:arg2}}",
-      "option": "hyperindex=true"
-    },
-    "hypersetup{}": {
-      "snippet": "hypersetup{${1:keyvals}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "href[]{}{}": {
-      "snippet": "href[${3:options}]{${1:URL}}{${2:text}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "href{}{}": {
-      "snippet": "href{${1:URL}}{${2:text}}"
-    },
-    "AddToDocumentProperties{}{}": {
-      "snippet": "AddToDocumentProperties{${1:property}}{${2:value}}"
-    },
-    "AddToDocumentProperties[]{}{}": {
-      "snippet": "AddToDocumentProperties[${3:category}]{${1:property}}{${2:value}}"
-    },
-    "GetDocumentProperties{}": {
-      "snippet": "GetDocumentProperties{${1:property}}"
-    },
-    "SetLinkTargetFilter{}": {
-      "snippet": "SetLinkTargetFilter{${1:filter code}}"
-    },
-    "url{}": {
-      "snippet": "url{${1:URL}}"
-    },
-    "nolinkurl{}": {
-      "snippet": "nolinkurl{${1:URL}}"
-    },
-    "hyperbaseurl{}": {
-      "snippet": "hyperbaseurl{${1:URL}}"
-    },
-    "hyperimage{}{}": {
-      "snippet": "hyperimage{${1:imageURL}}{${2:text}}"
-    },
-    "hyperdef{}{}{}": {
-      "snippet": "hyperdef{${1:category}}{${2:name}}{${3:text}}"
-    },
-    "hyperref{}{}{}{}": {
-      "snippet": "hyperref{${1:URL}}{${2:category}}{${3:name}}{${4:text}}"
-    },
-    "hyperref[]{}{}{}{}": {
-      "snippet": "hyperref[${5:label}]{${1:URL}}{${2:category}}{${3:name}}{${4:text}}"
-    },
-    "hyperref[]{}": {
-      "snippet": "hyperref[${2:label}]{${1:text}}"
-    },
-    "hyperref{}": {
-      "snippet": "hyperref{${1:text}}"
-    },
-    "hyperlink{}{}": {
-      "snippet": "hyperlink{${1:target name}}{${2:link text}}"
-    },
-    "hypertarget{}{}": {
-      "snippet": "hypertarget{${1:target name}}{${2:anchor text}}"
-    },
-    "phantomsection": {},
-    "hyperget{}{}": {
-      "snippet": "hyperget{${1:anchor}}{${2:label}}"
-    },
-    "autopageref{}": {
-      "snippet": "autopageref{${1:label}}"
-    },
-    "autopageref*{}": {
-      "snippet": "autopageref*{${1:label}}"
-    },
-    "autoref{}": {
-      "snippet": "autoref{${1:label}}"
-    },
-    "autoref*{}": {
-      "snippet": "autoref*{${1:label}}"
-    },
-    "thispdfpagelabel": {},
-    "pdfstringdef{}{}": {
-      "snippet": "pdfstringdef{${1:macroname}}{${2:TeXstring}}"
-    },
-    "pdfbookmark{}{}": {
-      "snippet": "pdfbookmark{${1:text}}{${2:name}}"
-    },
-    "pdfbookmark[]{}{}": {
-      "snippet": "pdfbookmark[${3:level}]{${1:text}}{${2:name}}"
-    },
-    "currentpdfbookmark{}{}": {
-      "snippet": "currentpdfbookmark{${1:text}}{${2:name}}"
-    },
-    "subpdfbookmark{}{}": {
-      "snippet": "subpdfbookmark{${1:text}}{${2:name}}"
-    },
-    "belowpdfbookmark{}{}": {
-      "snippet": "belowpdfbookmark{${1:text}}{${2:name}}"
-    },
-    "texorpdfstring{}{}": {
-      "snippet": "texorpdfstring{${1:TEXstring}}{${2:PDFstring}}"
-    },
-    "pdfstringdefDisableCommands{}": {
-      "snippet": "pdfstringdefDisableCommands{${1:hooks}}"
-    },
-    "hypercalcbp{}": {
-      "snippet": "hypercalcbp{${1:dimen specification}}"
-    },
-    "Acrobatmenu{}{}": {
-      "snippet": "Acrobatmenu{${1:menuoption}}{${2:text}}"
-    },
-    "TextField{}": {
-      "snippet": "TextField{${1:label}}"
-    },
-    "TextField[]{}": {
-      "snippet": "TextField[${2:parameters}]{${1:label}}"
-    },
-    "CheckBox{}": {
-      "snippet": "CheckBox{${1:label}}"
-    },
-    "CheckBox[]{}": {
-      "snippet": "CheckBox[${2:parameters}]{${1:label}}"
-    },
-    "ChoiceMenu{}{}": {
-      "snippet": "ChoiceMenu{${1:label}}{${2:choices}}"
-    },
-    "ChoiceMenu[]{}{}": {
-      "snippet": "ChoiceMenu[${3:parameters}]{${1:label}}{${2:choices}}"
-    },
-    "PushButton{}": {
-      "snippet": "PushButton{${1:label}}"
-    },
-    "PushButton[]{}": {
-      "snippet": "PushButton[${2:parameters}]{${1:label}}"
-    },
-    "Submit{}": {
-      "snippet": "Submit{${1:label}}"
-    },
-    "Submit[]{}": {
-      "snippet": "Submit[${2:parameters}]{${1:label}}"
-    },
-    "Reset{}": {
-      "snippet": "Reset{${1:label}}"
-    },
-    "Reset[]{}": {
-      "snippet": "Reset[${2:parameters}]{${1:label}}"
-    },
-    "LayoutTextField{}{}": {
-      "snippet": "LayoutTextField{${1:label}}{${2:field}}"
-    },
-    "LayoutChoiceField{}{}": {
-      "snippet": "LayoutChoiceField{${1:label}}{${2:field}}"
-    },
-    "LayoutCheckField{}{}": {
-      "snippet": "LayoutCheckField{${1:label}}{${2:field}}"
-    },
-    "MakeRadioField{}{}": {
-      "snippet": "MakeRadioField{${1:width}}{${2:height}}"
-    },
-    "MakeCheckField{}{}": {
-      "snippet": "MakeCheckField{${1:width}}{${2:height}}"
-    },
-    "MakeTextField{}{}": {
-      "snippet": "MakeTextField{${1:width}}{${2:height}}"
-    },
-    "MakeChoiceField{}{}": {
-      "snippet": "MakeChoiceField{${1:width}}{${2:height}}"
-    },
-    "MakeButtonField{}": {
-      "snippet": "MakeButtonField{${1:text}}"
-    },
-    "DefaultHeightofSubmit": {},
-    "DefaultWidthofSubmit": {},
-    "DefaultHeightofReset": {},
-    "DefaultWidthofReset": {},
-    "DefaultHeightofCheckBox": {},
-    "DefaultWidthofCheckBox": {},
-    "DefaultHeightofChoiceMenu": {},
-    "DefaultWidthofChoiceMenu": {},
-    "DefaultHeightofText": {},
-    "DefaultHeightofTextMultiline": {},
-    "DefaultWidthofText": {},
-    "DefaultOptionsofSubmit": {},
-    "DefaultOptionsofReset": {},
-    "DefaultOptionsofPushButton": {},
-    "DefaultOptionsofCheckBox": {},
-    "DefaultOptionsofText": {},
-    "DefaultOptionsofListBox": {},
-    "DefaultOptionsofComboBox": {},
-    "DefaultOptionsofPopdownBox": {},
-    "DefaultOptionsofRadio": {},
-    "AfterBeginDocument{}": {
-      "snippet": "AfterBeginDocument{${1:code}}"
-    },
-    "AMSautorefname": {},
-    "appendixautorefname": {},
-    "chapterautorefname": {},
-    "equationautorefname": {},
-    "FancyVerbLineautorefname": {},
-    "figureautorefname": {},
-    "footnoteautorefname": {},
-    "Hfootnoteautorefname": {},
-    "Hurl{}": {
-      "snippet": "Hurl{${1:URL}}"
-    },
-    "HyperDestLabelReplace{}": {
-      "snippet": "HyperDestLabelReplace{${1:dest}}"
-    },
-    "HyperDestNameFilter{}": {
-      "snippet": "HyperDestNameFilter{${1:arg}}"
-    },
-    "hypergetpageref{}": {
-      "snippet": "hypergetpageref{${1:label}}"
-    },
-    "hypergetref{}": {
-      "snippet": "hypergetref{${1:label}}"
-    },
-    "hyperlinkfileprefix{}": {
-      "snippet": "hyperlinkfileprefix{${1:prefix}}"
-    },
-    "hyperpage{}": {
-      "snippet": "hyperpage{${1:arg}}"
-    },
-    "HyperRaiseLinkDefault": {},
-    "HyperRaiseLinkHook": {},
-    "IfHyperBoolean{}{}{}": {
-      "snippet": "IfHyperBoolean{${1:options}}{${2:true}}{${3:false}}"
-    },
-    "IfHyperBooleanExists{}{}{}": {
-      "snippet": "IfHyperBooleanExists{${1:option}}{${2:true}}{${3:false}}"
-    },
-    "ifpdfstringunicode{}{}": {
-      "snippet": "ifpdfstringunicode{${1:unicode chars}}{${2:chars}}"
-    },
-    "Itemautorefname": {},
-    "itemautorefname": {},
-    "MakeLowercaseUnsupportedInPdfStrings{}": {
-      "snippet": "MakeLowercaseUnsupportedInPdfStrings{${1:text}}"
-    },
-    "MakeUppercaseUnsupportedInPdfStrings{}": {
-      "snippet": "MakeUppercaseUnsupportedInPdfStrings{${1:text}}"
-    },
-    "MaybeStopEarly": {},
-    "MaybeStopNow": {},
-    "nohyperpage{}": {
-      "snippet": "nohyperpage{${1:arg}}"
-    },
-    "pageautorefname": {},
-    "paragraphautorefname": {},
-    "partautorefname": {},
-    "pdfstringdefPostHook": {},
-    "pdfstringdefPreHook": {},
-    "pdfstringdefWarn{}": {
-      "snippet": "pdfstringdefWarn{${1:arg}}"
-    },
-    "sectionautorefname": {},
-    "setpdflinkmargin{}": {
-      "snippet": "setpdflinkmargin{${1:length}}"
-    },
-    "subparagraphautorefname": {},
-    "subsectionautorefname": {},
-    "subsubsectionautorefname": {},
-    "tableautorefname": {},
-    "theHchapter": {},
-    "theHenumi": {},
-    "theHenumii": {},
-    "theHenumiii": {},
-    "theHenumiv": {},
-    "theHequation": {},
-    "theHfigure": {},
-    "theHHfootnote": {},
-    "theHHmpfootnote": {},
-    "theHItem": {},
-    "theHmpfootnote": {},
-    "theHparagraph": {},
-    "theHpart": {},
-    "theHsection": {},
-    "theHsubparagraph": {},
-    "theHsubsection": {},
-    "theHsubsubsection": {},
-    "theHtable": {},
-    "theHtheorem": {},
-    "theHthm": {},
-    "theoremautorefname": {},
-    "unichar{}": {
-      "snippet": "unichar{${1:char num}}"
-    },
-    "XeTeXLinkBox{}": {
-      "snippet": "XeTeXLinkBox{${1:contents}}"
-    },
-    "XeTeXLinkMargin": {}
-  },
-  "envs": {
-    "NoHyper": {},
-    "Form": {},
-    "Form[]": {
-      "name": "Form",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "addtopdfcreator=${1:text}",
-      "allbordercolors=",
-      "allcolors=",
-      "anchorcolor=",
-      "backref=",
-      "baseurl=${1:URL}",
-      "bookmarks",
-      "bookmarksdepth",
-      "bookmarksdepth=${1:number}",
-      "bookmarksnumbered",
-      "bookmarksopen",
-      "bookmarksopenlevel=${1:level}",
-      "bookmarkstype=",
-      "breaklinks",
-      "citebordercolor=",
-      "citecolor=",
-      "CJKbookmarks",
-      "colorlinks",
-      "customdriver=${1:file}",
-      "debug",
-      "destlabel",
-      "draft",
-      "driverfallback=${1:driver}",
-      "dvipdfm",
-      "dvipdfmx",
-      "dvipdfmx-outline-open",
-      "dvips",
-      "dvipsone",
-      "dviwindo",
-      "encap=${1:character}",
-      "extension=${1:file ext}",
-      "filebordercolor=",
-      "filecolor=",
-      "final",
-      "frenchlinks",
-      "hidelinks",
-      "hitex",
-      "hyperfigures",
-      "hyperfootnotes",
-      "hyperindex",
-      "hypertex",
-      "hypertexnames",
-      "implicit",
-      "linkbordercolor=",
-      "linkcolor=",
-      "linkfileprefix=${1:prefix}",
-      "linktoc=",
-      "linktocpage",
-      "luatex",
-      "menubordercolor=",
-      "menucolor=",
-      "nativepdf",
-      "naturalnames",
-      "nesting",
-      "next-anchor=${1:anchor name}",
-      "ocgcolorlinks",
-      "pageanchor",
-      "pagebackref",
-      "pdfa",
-      "pdfauthor=${1:author}",
-      "pdfborder=",
-      "pdfborderstyle=",
-      "pdfcenterwindow",
-      "pdfcreationdate=${1:date}",
-      "pdfcreator=${1:creator}",
-      "pdfdirection=",
-      "pdfdisplaydoctitle",
-      "pdfduplex=",
-      "pdfencoding=",
-      "pdfescapeform",
-      "pdffitwindow",
-      "pdfhighlight=",
-      "pdfinfo={${1:info keys}}",
-      "pdfkeywords={${1:keyword list}}",
-      "pdflang=${1:lang id}",
-      "pdflinkmargin=",
-      "pdfmark",
-      "pdfmenubar",
-      "pdfmoddate=${1:date}",
-      "pdfnewwindow",
-      "pdfnonfullscreenpagemode",
-      "pdfnumcopies=${1:integer}",
-      "pdfpageduration=",
-      "pdfpagelabels",
-      "pdfpagelayout=",
-      "pdfpagemode=",
-      "pdfpagescrop=${1:n1 n2 n3 n4}",
-      "pdfpagetransition=",
-      "pdfpicktraybypdfsize",
-      "pdfprintarea=",
-      "pdfprintclip=",
-      "pdfprintpagerange=${1:n1 n2}",
-      "pdfprintscaling=",
-      "pdfproducer=${1:producer}",
-      "pdfremotestartview=",
-      "pdfstartpage=${1:page number}",
-      "pdfstartview=",
-      "pdfsubject=${1:subject}",
-      "pdftex",
-      "pdftitle=${1:title}",
-      "pdftoolbar",
-      "pdftrapped=",
-      "pdfusetitle",
-      "pdfversion=${1:version}",
-      "pdfview=",
-      "pdfviewarea=",
-      "pdfviewclip=",
-      "pdfwindowui",
-      "plainpages",
-      "ps2pdf",
-      "psdextra",
-      "raiselinks",
-      "runbordercolor=",
-      "runcolor=",
-      "setpagesize",
-      "tex4ht",
-      "textures",
-      "unicode",
-      "urlbordercolor=",
-      "urlcolor=",
-      "verbose",
-      "vtex",
-      "vtexpdfmark",
-      "xetex"
-    ],
-    [
-      "pdfremotestartview=",
-      "pdfnewwindow",
-      "page=${1:number}",
-      "ismap",
-      "nextactionraw={${1:PDF code}}"
-    ],
-    [
-      "action=${1:URL}",
-      "encoding=${1:encoding}",
-      "method="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/icite.json b/dev/packages/icite.json
deleted file mode 100644
index d8fb95785..000000000
--- a/dev/packages/icite.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "includes": {
-    "xkeyval": [],
-    "datatool": [],
-    "usebib": []
-  },
-  "macros": {
-    "SetTitleStyle{}": {
-      "snippet": "SetTitleStyle{${1:style code}}"
-    },
-    "AuthorTitleDelim{}": {
-      "snippet": "AuthorTitleDelim{${1:delim}}"
-    },
-    "TitlePageDelim{}": {
-      "snippet": "TitlePageDelim{${1:delim}}"
-    },
-    "icite{}": {
-      "snippet": "icite{${1:bibid}}"
-    },
-    "icite[]{}": {
-      "snippet": "icite[${2:pre}]{${1:bibid}}"
-    },
-    "icite[][]{}": {
-      "snippet": "icite[${2:pre}][${3:post}]{${1:bibid}}"
-    },
-    "icite[][]{}[]": {
-      "snippet": "icite[${2:pre}][${3:post}]{${1:bibid}}[${4:csname}]"
-    },
-    "IndexSubtypeAs{}{}": {
-      "snippet": "IndexSubtypeAs{${1:subtype}}{${2:index name}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/iffont.json b/dev/packages/iffont.json
index 7663051e7..d29ab74ba 100644
--- a/dev/packages/iffont.json
+++ b/dev/packages/iffont.json
@@ -5,7 +5,7 @@
   },
   "macros": {
     "settofirstfound{}{}": {
-      "snippet": "settofirstfound{${1:font cmd}}{${2:font1,${3:font2},...}}"
+      "snippet": "settofirstfound{${1:font cmd}}{${2:font1,font2,...}}"
     },
     "iffontsexist{}{}{}": {
       "snippet": "iffontsexist{${1:font list}}{${2:true}}{${3:false}}"
diff --git a/dev/packages/ifoption.json b/dev/packages/ifoption.json
index 96745e200..4be75557c 100644
--- a/dev/packages/ifoption.json
+++ b/dev/packages/ifoption.json
@@ -13,7 +13,7 @@
       "snippet": "IfClassOption{${1:class}}{${2:option}}{${3:true}}{${4:false}}"
     },
     "DeclareExclusiveOptions{}": {
-      "snippet": "DeclareExclusiveOptions{${1:name1,${2:name2},...}}"
+      "snippet": "DeclareExclusiveOptions{${1:name1,name2,...}}"
     },
     "ProcessExclusiveOptions": {},
     "DeclareBooleanOption{}": {
diff --git a/dev/packages/ifthen.json b/dev/packages/ifthen.json
deleted file mode 100644
index 16e2a06fc..000000000
--- a/dev/packages/ifthen.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "ifthenelse{}{}{}": {
-      "snippet": "ifthenelse{${1:test}}{${2:then clause}}{${3:else clause}}"
-    },
-    "isodd{}": {
-      "snippet": "isodd{${1:number}}"
-    },
-    "isundefined{}": {
-      "snippet": "isundefined{${1:command}}"
-    },
-    "equal{}{}": {
-      "snippet": "equal{${1:string}}{${2:string}}"
-    },
-    "AND": {},
-    "OR": {},
-    "NOT": {},
-    "lengthtest{}": {
-      "snippet": "lengthtest{${1:dimen operator dimen}}"
-    },
-    "boolean{}": {
-      "snippet": "boolean{${1:name}}"
-    },
-    "newboolean{}": {
-      "snippet": "newboolean{${1:name}}"
-    },
-    "provideboolean{}": {
-      "snippet": "provideboolean{${1:name}}"
-    },
-    "setboolean{}{}": {
-      "snippet": "setboolean{${1:name}}{${2:truth value}}"
-    },
-    "whiledo{}{}": {
-      "snippet": "whiledo{${1:test}}{${2:while clause}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/igo.json b/dev/packages/igo.json
deleted file mode 100644
index 5357da2b0..000000000
--- a/dev/packages/igo.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "black[]{}": {
-      "snippet": "black[${2:glyph}]{${1:intersection-list}}"
-    },
-    "black{}": {
-      "snippet": "black{${1:intersection-list}}"
-    },
-    "blackstone": {},
-    "blackstone[]": {
-      "snippet": "blackstone[${1:glyph}]"
-    },
-    "clear{}": {
-      "snippet": "clear{${1:intersection-list}}"
-    },
-    "cleargoban": {},
-    "cleargoban[]": {
-      "snippet": "cleargoban[${1:intersection-pair}]"
-    },
-    "cleargobansymbols": {},
-    "copyfromgoban{}": {
-      "snippet": "copyfromgoban{${1:n}}"
-    },
-    "copygoban{}": {
-      "snippet": "copygoban{${1:n}}"
-    },
-    "copytogoban{}": {
-      "snippet": "copytogoban{${1:n}}"
-    },
-    "gobansize{}": {
-      "snippet": "gobansize{${1:n}}"
-    },
-    "gobansymbol{}{}": {
-      "snippet": "gobansymbol{${1:intersection-list}}{${2:symbol}}"
-    },
-    "gobansymbols{}{}": {
-      "snippet": "gobansymbols{${1:intersection-list}}{${2:symbol}}"
-    },
-    "hflipgoban": {},
-    "igobreakafterdiagram": {},
-    "igocircle": {},
-    "igocross": {},
-    "igofontsize{}": {
-      "snippet": "igofontsize{${1:n}}"
-    },
-    "igonone": {},
-    "igosquare": {},
-    "igotriangle": {},
-    "largegoban": {},
-    "mirrorgoban": {},
-    "normalgoban": {},
-    "rotategoban": {},
-    "rotategobanleft": {},
-    "rotategobanright": {},
-    "showfullgoban": {},
-    "showgoban": {},
-    "showgoban[]": {
-      "snippet": "showgoban[${1:intersection-pair}]"
-    },
-    "smallgoban": {},
-    "stonesize": {},
-    "usegoban{}": {
-      "snippet": "usegoban{${1:n}}"
-    },
-    "vflipgoban": {},
-    "white[]{}": {
-      "snippet": "white[${2:glyph}]{${1:intersection-list}}"
-    },
-    "white{}": {
-      "snippet": "white{${1:intersection-list}}"
-    },
-    "whitestone": {},
-    "whitestone[]": {
-      "snippet": "whitestone[${1:glyph}]"
-    },
-    "breakrepeat": {},
-    "by{}": {
-      "snippet": "by{${1:step}}"
-    },
-    "csprotect": {},
-    "downto{}": {
-      "snippet": "downto{${1:end}}"
-    },
-    "endrepeat": {},
-    "for{}": {
-      "snippet": "for{${1:var}}"
-    },
-    "from{}": {
-      "snippet": "from{${1:start}}"
-    },
-    "REPcomp": {},
-    "REPcsarg{}{}": {
-      "snippet": "REPcsarg{${1:arg1}}{${2:arg2}}"
-    },
-    "REPcsargrom{}{}": {
-      "snippet": "REPcsargrom{${1:arg1}}{${2:arg2}}"
-    },
-    "REPcsrom{}": {
-      "snippet": "REPcsrom{${1:arg}}"
-    },
-    "REPdepth": {},
-    "REPdxbody": {},
-    "REPsetup{}": {
-      "snippet": "REPsetup{${1:arg}}"
-    },
-    "REPsign": {},
-    "REPtmp": {},
-    "REPtraceexit": {},
-    "REPtraceinit": {},
-    "REPzero": {},
-    "to{}": {
-      "snippet": "to{${1:end}}"
-    },
-    "until{}": {
-      "snippet": "until{${1:cond}}"
-    },
-    "while{}": {
-      "snippet": "while{${1:cond}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/imsart.json b/dev/packages/imsart.json
deleted file mode 100644
index 94728afec..000000000
--- a/dev/packages/imsart.json
+++ /dev/null
@@ -1,576 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "keyval": [],
-    "ifpdf": [],
-    "fontenc": [],
-    "amsmath": [
-      "amsmath",
-      "bj"
-    ],
-    "amsthm": [
-      "amsthm",
-      "bj"
-    ],
-    "natbib": [
-      "natbib",
-      "bj"
-    ],
-    "rotating": [
-      "rotating"
-    ],
-    "lmodern": [
-      "ba",
-      "ps",
-      "ss",
-      "ejs"
-    ],
-    "times": [
-      "aap",
-      "aop",
-      "aos",
-      "aoas",
-      "aihp",
-      "bjps"
-    ],
-    "helvet": [
-      "aap",
-      "aop",
-      "aos",
-      "aoas",
-      "bj",
-      "aihp",
-      "bjps"
-    ],
-    "textcase": [
-      "aap",
-      "aop",
-      "aos",
-      "aoas"
-    ],
-    "newtxmath": [
-      "bj"
-    ],
-    "graphicx": [
-      "bj"
-    ],
-    "letterspace": [
-      "bj"
-    ],
-    "enumitem": [
-      "bj"
-    ],
-    "hyperref": [
-      "bj"
-    ],
-    "amssymb": [
-      "bj"
-    ],
-    "mathrsfs": [
-      "bj"
-    ],
-    "bm": [
-      "bj"
-    ],
-    "color": [
-      "bj",
-      "showframe"
-    ]
-  },
-  "macros": {
-    "DH": {},
-    "dh": {},
-    "dj": {},
-    "DJ": {},
-    "guillemetleft": {},
-    "guillemetright": {},
-    "guillemotleft": {},
-    "guillemotright": {},
-    "guilsinglleft": {},
-    "guilsinglright": {},
-    "Hwithstroke": {},
-    "hwithstroke": {},
-    "k{}": {
-      "snippet": "k{${1:arg}}"
-    },
-    "NG": {},
-    "ng": {},
-    "quotedblbase": {},
-    "quotesinglbase": {},
-    "textogonekcentered{}": {
-      "snippet": "textogonekcentered{${1:arg}}"
-    },
-    "textquotedbl": {},
-    "th": {},
-    "TH": {},
-    "savehline": {
-      "option": "bjps"
-    },
-    "thline": {
-      "option": "bjps"
-    },
-    "setlstracking{}": {
-      "snippet": "setlstracking{${1:value}}",
-      "option": "bj"
-    },
-    "texttracking{}{}": {
-      "snippet": "texttracking{${1:value}}{${2:text}}",
-      "option": "bj"
-    },
-    "accepted{}": {
-      "snippet": "accepted{${1:date}}"
-    },
-    "acknowledgementsname": {},
-    "address[]{}": {
-      "snippet": "address[${2:id}]{${1:address}}"
-    },
-    "address{}": {
-      "snippet": "address{${1:address}}"
-    },
-    "AND": {},
-    "articletitle": {},
-    "arxiv{}": {
-      "snippet": "arxiv{${1:arxiv}}"
-    },
-    "atltitle{}": {
-      "snippet": "atltitle{${1:text}}"
-    },
-    "author[]{}": {
-      "snippet": "author[${2:id}]{${1:name}}"
-    },
-    "baddress": {},
-    "banumber": {},
-    "barticle": {},
-    "bauthor": {},
-    "bbook": {},
-    "bbooklet": {},
-    "bchapter": {},
-    "bdoi{}": {
-      "snippet": "bdoi{${1:DOI}}"
-    },
-    "bedition": {},
-    "beditor": {},
-    "betal": {},
-    "bfnm": {},
-    "bhowpublished": {},
-    "bid{}": {
-      "snippet": "bid{${1:keyvals}}"
-    },
-    "binbook": {},
-    "bincollection": {},
-    "binits": {},
-    "binproceedings": {},
-    "binstitution": {},
-    "bisbn": {},
-    "blocation": {},
-    "bmanual": {},
-    "bmastersthesis": {},
-    "bmisc": {},
-    "bmrnumber": {},
-    "bnote": {},
-    "bnumber": {},
-    "borganization": {},
-    "bpages": {},
-    "bparticle": {},
-    "bphdthesis": {},
-    "bproceedings": {},
-    "bptok{}": {
-      "snippet": "bptok{${1:arg}}"
-    },
-    "bpublisher": {},
-    "bschool": {},
-    "bsnm": {},
-    "bsuffix": {},
-    "btechreport": {},
-    "btype": {},
-    "bunpublished": {},
-    "byear": {},
-    "citefix": {},
-    "contributor{}{}": {
-      "snippet": "contributor{${1:name}}{${2:university}}"
-    },
-    "copyrightowner{}": {
-      "snippet": "copyrightowner{${1:text}}"
-    },
-    "correctionnote{}": {
-      "snippet": "correctionnote{${1:text}}"
-    },
-    "corref{}": {
-      "snippet": "corref{${1:id}}"
-    },
-    "dedicated{}": {
-      "snippet": "dedicated{${1:text}}"
-    },
-    "degs{}": {
-      "snippet": "degs{${1:text}}"
-    },
-    "dochead{}": {
-      "snippet": "dochead{${1:arg}}"
-    },
-    "doi{}": {
-      "snippet": "doi{${1:DOI}}"
-    },
-    "doublespacing": {},
-    "ead[]{}": {
-      "snippet": "ead[${2:options}]{${1:email}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ead{}": {
-      "snippet": "ead{${1:email}}"
-    },
-    "endlocaldefs": {},
-    "firstpage{}": {
-      "snippet": "firstpage{${1:number}}"
-    },
-    "fnms{}": {
-      "snippet": "fnms{${1:first name}}"
-    },
-    "fundingname": {},
-    "getitemvalue{}{}": {
-      "snippet": "getitemvalue{${1:list name}}{${2:index}}"
-    },
-    "getpkgattr{}{}": {
-      "snippet": "getpkgattr{${1:type}}{${2:name}}"
-    },
-    "inits{}": {
-      "snippet": "inits{${1:initials}}"
-    },
-    "issue{}": {
-      "snippet": "issue{${1:number}}"
-    },
-    "journalurl{}": {
-      "snippet": "journalurl{${1:URL}}"
-    },
-    "kwd[]{}": {
-      "snippet": "kwd[${2:pre text}]{${1:keyword}}"
-    },
-    "kwd{}": {
-      "snippet": "kwd{${1:keyword}}"
-    },
-    "labellonglist": {},
-    "lastpage{}": {
-      "snippet": "lastpage{${1:number}}"
-    },
-    "legend{}": {
-      "snippet": "legend{${1:text}}"
-    },
-    "loadhyperrefoptions": {},
-    "MR{}": {
-      "snippet": "MR{${1:number}}"
-    },
-    "MRfixed{}": {
-      "snippet": "MRfixed{${1:arg}}"
-    },
-    "newpseudoenvironment{}{}{}": {
-      "snippet": "newpseudoenvironment{${1:name}}{${2:begdef}}{${3:enddef}}"
-    },
-    "nocontentsline": {},
-    "nohyphen": {},
-    "normaltext": {},
-    "orcid{}": {
-      "snippet": "orcid{${1:ORCID}}"
-    },
-    "paperno{}": {
-      "snippet": "paperno{${1:number}}"
-    },
-    "paperurl{}": {
-      "snippet": "paperurl{${1:URL}}"
-    },
-    "pdfauthor{}": {
-      "snippet": "pdfauthor{${1:name}}"
-    },
-    "pdfkeywords{}": {
-      "snippet": "pdfkeywords{${1:text}}"
-    },
-    "pdfsubject{}": {
-      "snippet": "pdfsubject{${1:text}}"
-    },
-    "pdftitle{}": {
-      "snippet": "pdftitle{${1:text}}"
-    },
-    "printaddresses": {},
-    "printaddressnum{}": {
-      "snippet": "printaddressnum{${1:arg}}"
-    },
-    "printead[]{}": {
-      "snippet": "printead[${2:options}]{${1:label1,${3:label2},...}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "printead{}": {
-      "snippet": "printead{${1:label1,${2:label2},...}}"
-    },
-    "printorcid": {},
-    "pubonline{}": {
-      "snippet": "pubonline{${1:date}}"
-    },
-    "pubyear{}": {
-      "snippet": "pubyear{${1:year}}"
-    },
-    "qq{}": {
-      "snippet": "qq{${1:text}}"
-    },
-    "received{}": {
-      "snippet": "received{${1:date}}"
-    },
-    "relateddoi[]{}{}": {
-      "snippet": "relateddoi[${3:opt}]{${1:arg}}{${2:DOI}}"
-    },
-    "relateddoi{}{}": {
-      "snippet": "relateddoi{${1:arg}}{${2:DOI}}"
-    },
-    "relateddois[]{}{}": {
-      "snippet": "relateddois[${3:mark}]{${1:id}}{${2:DOI}}"
-    },
-    "relateddois{}{}": {
-      "snippet": "relateddois{${1:id}}{${2:DOI}}"
-    },
-    "restorethankscounter": {},
-    "revised{}": {
-      "snippet": "revised{${1:date}}"
-    },
-    "roles{}": {
-      "snippet": "roles{${1:text}}"
-    },
-    "runauthor{}": {
-      "snippet": "runauthor{${1:names}}"
-    },
-    "runtitle{}": {
-      "snippet": "runtitle{${1:text}}"
-    },
-    "safelabel{}": {
-      "snippet": "safelabel{${1:label}}"
-    },
-    "saferef{}": {
-      "snippet": "saferef{${1:label}}"
-    },
-    "sdatatype{}": {
-      "snippet": "sdatatype{${1:.ext}}"
-    },
-    "sday{}": {
-      "snippet": "sday{${1:day}}"
-    },
-    "sdescription{}": {
-      "snippet": "sdescription{${1:text}}"
-    },
-    "sep": {},
-    "setpkgattr{}{}{}": {
-      "snippet": "setpkgattr{${1:type}}{${2:name}}{${3:code}}"
-    },
-    "setvaluelist{}{}": {
-      "snippet": "setvaluelist{${1:name}}{${2:item1,${3:item2},...}}"
-    },
-    "sfilename{}": {
-      "snippet": "sfilename{${1:file}}"
-    },
-    "singlespacing": {},
-    "slink[]{}": {
-      "snippet": "slink[${2:options}]{${1:URL}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "slink{}": {
-      "snippet": "slink{${1:URL}}"
-    },
-    "smonth{}": {
-      "snippet": "smonth{${1:month}}"
-    },
-    "sname{}": {
-      "snippet": "sname{${1:text}}"
-    },
-    "snm{}": {
-      "snippet": "snm{${1:surname}}"
-    },
-    "specialsection*{}": {
-      "snippet": "specialsection*{${1:title}}"
-    },
-    "specialsection[]{}": {
-      "snippet": "specialsection[${2:short title}]{${1:title}}"
-    },
-    "specialsection{}": {
-      "snippet": "specialsection{${1:title}}"
-    },
-    "startlocaldefs": {},
-    "stitle{}": {
-      "snippet": "stitle{${1:text}}"
-    },
-    "stitlepost{}": {
-      "snippet": "stitlepost{${1:text}}"
-    },
-    "support{}": {
-      "snippet": "support{${1:text}}"
-    },
-    "syear{}": {
-      "snippet": "syear{${1:year}}"
-    },
-    "tablewidth": {},
-    "tabnoteref{}": {
-      "snippet": "tabnoteref{${1:id}}"
-    },
-    "tabnotestoks": {},
-    "tabnotetext[]{}": {
-      "snippet": "tabnotetext[${2:options}]{${1:text}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "tabnotetext{}": {
-      "snippet": "tabnotetext{${1:text}}"
-    },
-    "thankslabel[]{}": {
-      "snippet": "thankslabel[${2:mark}]{${1:id}}"
-    },
-    "thankslabel{}": {
-      "snippet": "thankslabel{${1:id}}"
-    },
-    "thanksmark[]{}": {
-      "snippet": "thanksmark[${2:mark}]{${1:id}}"
-    },
-    "thanksmark{}": {
-      "snippet": "thanksmark{${1:id}}"
-    },
-    "thanksnewlabel": {},
-    "thanksref[]{}": {
-      "snippet": "thanksref[${2:mark}]{${1:id}}"
-    },
-    "thanksref{}": {
-      "snippet": "thanksref{${1:id}}"
-    },
-    "thankstext[]{}{}": {
-      "snippet": "thankstext[${3:mark}]{${1:id}}{${2:text}}"
-    },
-    "thankstext{}{}": {
-      "snippet": "thankstext{${1:id}}{${2:text}}"
-    },
-    "theaddress": {},
-    "theaddressref": {},
-    "theauthor": {},
-    "theemailref": {},
-    "thefirstpage": {},
-    "thelastpage": {},
-    "thelonglist": {},
-    "thesuppdoi{}": {
-      "snippet": "thesuppdoi{${1:id}}"
-    },
-    "thetabnote": {},
-    "thethanks": {},
-    "usethankscounter{}": {
-      "snippet": "usethankscounter{${1:counter}}"
-    },
-    "volume{}": {
-      "snippet": "volume{${1:number}}"
-    },
-    "volumetitle{}": {
-      "snippet": "volumetitle{${1:text}}"
-    },
-    "woMR{}": {
-      "snippet": "woMR{${1:arg}}"
-    }
-  },
-  "envs": {
-    "proof[]": {
-      "name": "proof",
-      "snippet": "[${1:heading}]",
-      "option": "amsthm"
-    },
-    "abstract[]": {
-      "name": "abstract",
-      "snippet": "[${1:language=language}]"
-    },
-    "acks": {},
-    "acks[]": {
-      "name": "acks",
-      "snippet": "[${1:title}]"
-    },
-    "appendix": {},
-    "aug": {},
-    "em": {},
-    "frontmatter": {},
-    "funding": {},
-    "funding[]": {
-      "name": "funding",
-      "snippet": "[${1:title}]"
-    },
-    "keyword": {},
-    "keyword[]": {
-      "name": "keyword",
-      "snippet": "[${1:class=class}]"
-    },
-    "longlist": {},
-    "longlist[]": {
-      "name": "longlist",
-      "snippet": "[${1:widest label}]"
-    },
-    "supplement": {},
-    "supplement[]": {
-      "name": "supplement",
-      "snippet": "[${1:id=id}]"
-    },
-    "tabnotes": {}
-  },
-  "options": [
-    "printbiddoi",
-    "keywordsasfootnote",
-    "historyasfootnote",
-    "addressasfootnote",
-    "addressatend",
-    "autosecdot",
-    "noautosecdot",
-    "noundefthanksref",
-    "frontback",
-    "amsmath",
-    "amsthm",
-    "seceqn",
-    "natbib",
-    "linksfromyear",
-    "numbers",
-    "nameyear",
-    "authoryear",
-    "rotating",
-    "ba",
-    "ps",
-    "ss",
-    "ejs",
-    "aap",
-    "aop",
-    "aos",
-    "aoas",
-    "sts",
-    "bj",
-    "aihp",
-    "bjps",
-    "doublespacing",
-    "singlespacing",
-    "noinfoline",
-    "infoline",
-    "linenumbers",
-    "nolinenumbers",
-    "showframe",
-    "noshowframe",
-    "submission",
-    "preedit",
-    "preprint"
-  ],
-  "keyvals": [
-    [
-      "email",
-      "url",
-      "label=${1:label}",
-      "text=${1:text}",
-      "nopdflink"
-    ],
-    [
-      "text=${1:text}",
-      "presep=${1:separator}"
-    ],
-    [
-      "text=${1:text}",
-      "doi",
-      "url"
-    ],
-    [
-      "id=${1:id}",
-      "mark=${1:mark}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/index.json b/dev/packages/index.json
deleted file mode 100644
index 1e7619fdb..000000000
--- a/dev/packages/index.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "newindex{}{}{}{}": {
-      "snippet": "newindex{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
-    },
-    "newindex[]{}{}{}{}": {
-      "snippet": "newindex[${5:number cmd}]{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
-    },
-    "renewindex{}{}{}{}": {
-      "snippet": "renewindex{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
-    },
-    "renewindex[]{}{}{}{}": {
-      "snippet": "renewindex[${5:number cmd}]{${1:author tag}}{${2:output ext}}{${3:input ext}}{${4:title}}"
-    },
-    "printindex": {},
-    "printindex[]": {
-      "snippet": "printindex[${1:tag}]"
-    },
-    "index*{}": {
-      "snippet": "index*{${1:entry}}"
-    },
-    "index[]{}": {
-      "snippet": "index[${2:tag}]{${1:entry}}"
-    },
-    "shortindexingon": {},
-    "shortindexingoff": {},
-    "proofmodetrue": {},
-    "proofmodefalse": {},
-    "indexproofstyle{}": {
-      "snippet": "indexproofstyle{${1:code}}"
-    },
-    "disableindex": {},
-    "seename": {},
-    "see{}{}": {
-      "snippet": "see{${1:text}}{${2:page number}}"
-    }
-  },
-  "envs": {
-    "shortindexingon": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/inputenc.json b/dev/packages/inputenc.json
deleted file mode 100644
index 30db4361f..000000000
--- a/dev/packages/inputenc.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "includes": {
-    "ucs": [
-      "utf8x"
-    ]
-  },
-  "macros": {
-    "DeclareInputMath{}{}": {
-      "snippet": "DeclareInputMath{${1:slot}}{${2:text}}"
-    },
-    "DeclareInputText{}{}": {
-      "snippet": "DeclareInputText{${1:slot}}{${2:math}}"
-    },
-    "DeclareUnicodeCharacter{}{}": {
-      "snippet": "DeclareUnicodeCharacter{${1:slot}}{${2:text}}"
-    },
-    "inputencodingname": {},
-    "inputencoding{}": {
-      "snippet": "inputencoding{${1:encoding name}}"
-    },
-    "IeC{}": {
-      "snippet": "IeC{${1:arg}}"
-    },
-    "definearmew{}": {
-      "snippet": "definearmew{${1:character}}",
-      "option": "armscii8"
-    }
-  },
-  "envs": {},
-  "options": [
-    "ascii",
-    "latin1",
-    "latin2",
-    "latin3",
-    "latin4",
-    "latin5",
-    "latin9",
-    "latin10",
-    "decmulti",
-    "cp850",
-    "cp852",
-    "cp858",
-    "cp437",
-    "cp437de",
-    "cp865",
-    "applemac",
-    "macce",
-    "next",
-    "cp1250",
-    "cp1252",
-    "cp1257",
-    "ansinew",
-    "utf8",
-    "utf8x",
-    "armscii8"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/intcalc.json b/dev/packages/intcalc.json
deleted file mode 100644
index 5597e6c9c..000000000
--- a/dev/packages/intcalc.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "intcalcNum{}": {
-      "snippet": "intcalcNum{${1:number}}"
-    },
-    "intcalcInv{}": {
-      "snippet": "intcalcInv{${1:number}}"
-    },
-    "intcalcAbs{}": {
-      "snippet": "intcalcAbs{${1:number}}"
-    },
-    "intcalcSgn{}": {
-      "snippet": "intcalcSgn{${1:number}}"
-    },
-    "intcalcMin{}{}": {
-      "snippet": "intcalcMin{${1:num1}}{${2:num2}}"
-    },
-    "intcalcMax{}{}": {
-      "snippet": "intcalcMax{${1:num1}}{${2:num2}}"
-    },
-    "intcalcCmp{}{}": {
-      "snippet": "intcalcCmp{${1:num1}}{${2:num2}}"
-    },
-    "intcalcInc{}": {
-      "snippet": "intcalcInc{${1:number}}"
-    },
-    "intcalcDec{}": {
-      "snippet": "intcalcDec{${1:number}}"
-    },
-    "intcalcAdd{}{}": {
-      "snippet": "intcalcAdd{${1:num1}}{${2:num2}}"
-    },
-    "intcalcSub{}{}": {
-      "snippet": "intcalcSub{${1:num1}}{${2:num2}}"
-    },
-    "intcalcShl{}": {
-      "snippet": "intcalcShl{${1:number}}"
-    },
-    "intcalcShr{}": {
-      "snippet": "intcalcShr{${1:number}}"
-    },
-    "intcalcMul{}{}": {
-      "snippet": "intcalcMul{${1:num1}}{${2:num2}}"
-    },
-    "intcalcSqr{}": {
-      "snippet": "intcalcSqr{${1:number}}"
-    },
-    "intcalcFac{}": {
-      "snippet": "intcalcFac{${1:number}}"
-    },
-    "intcalcPow{}{}": {
-      "snippet": "intcalcPow{${1:num1}}{${2:num2}}"
-    },
-    "intcalcDiv{}{}": {
-      "snippet": "intcalcDiv{${1:num1}}{${2:num2}}"
-    },
-    "intcalcMod{}{}": {
-      "snippet": "intcalcMod{${1:num1}}{${2:num2}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/interactiveanimation.json b/dev/packages/interactiveanimation.json
index 3e0645d3e..21ee829f9 100644
--- a/dev/packages/interactiveanimation.json
+++ b/dev/packages/interactiveanimation.json
@@ -10,9 +10,9 @@
       "keyvalpos": 2
     },
     "controlbutton[]{}{}{}": {
-      "snippet": "controlbutton[${4:sequence file,${5:start page},end page}]{${1:caption}}{${2:target frame}}{${3:options}}",
+      "snippet": "controlbutton[${4:sequence file,start page,end page}]{${1:caption}}{${2:target frame}}{${3:options}}",
       "keyvalindex": 0,
-      "keyvalpos": 2
+      "keyvalpos": 3
     }
   },
   "envs": {
diff --git a/dev/packages/interval.json b/dev/packages/interval.json
deleted file mode 100644
index 1577cb684..000000000
--- a/dev/packages/interval.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "includes": {
-    "pgfkeys": []
-  },
-  "macros": {
-    "interval{}{}": {
-      "snippet": "interval{${1:start}}{${2:end}}"
-    },
-    "interval[]{}{}": {
-      "snippet": "interval[${3:options}]{${1:start}}{${2:end}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ointerval[]{}{}": {
-      "snippet": "ointerval[${3:options}]{${1:start}}{${2:end}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "linterval[]{}{}": {
-      "snippet": "linterval[${3:options}]{${1:start}}{${2:end}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "rinterval[]{}{}": {
-      "snippet": "rinterval[${3:options}]{${1:start}}{${2:end}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "intervalconfig{}": {
-      "snippet": "intervalconfig{${1:options}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "INTVversion": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "open",
-      "open left",
-      "open right",
-      "scaled",
-      "scaled=${1:scale command}"
-    ],
-    [
-      "scaled",
-      "scaled=${1:scale command}"
-    ],
-    [
-      "separator symbol=${1:symbol}",
-      "left open fence=${1:symbol}",
-      "left closed fence=${1:symbol}",
-      "right open fence=${1:symbol}",
-      "right closed fence=${1:symbol}",
-      "soft open fences",
-      "colorize=${1:color commands}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/invoice.json b/dev/packages/invoice.json
deleted file mode 100644
index debbf2f35..000000000
--- a/dev/packages/invoice.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "longtable": [],
-    "calc": [],
-    "siunitx": [],
-    "fp": []
-  },
-  "macros": {
-    "ProjectTitle{}": {
-      "snippet": "ProjectTitle{${1:text}}"
-    },
-    "Fee{}{}{}": {
-      "snippet": "Fee{${1:contents}}{${2:rate/unit}}{${3:count}}"
-    },
-    "STFee": {},
-    "EBC{}{}": {
-      "snippet": "EBC{${1:contents}}{${2:amount}}"
-    },
-    "EFC{}{}{}{}{}": {
-      "snippet": "EFC{${1:contents}}{${2:foreign currency}}{${3:amount}}{${4:conversion rate}}{${5:base currency result}}"
-    },
-    "EBCi{}{}": {
-      "snippet": "EBCi{${1:contents}}{${2:amount}}"
-    },
-    "EFCi{}{}{}{}{}": {
-      "snippet": "EFCi{${1:contents}}{${2:foreign currency}}{${3:amount}}{${4:conversion rate}}{${5:base currency result}}"
-    },
-    "STExpenses": {},
-    "Discount{}{}": {
-      "snippet": "Discount{${1:contents}}{${2:amount}}"
-    },
-    "STProject": {},
-    "BC": {},
-    "commafalse": {},
-    "commatrue": {},
-    "Flag": {},
-    "ifcomma": {},
-    "ifVATnonzero": {},
-    "invoiceno{}": {
-      "snippet": "invoiceno{${1:arg}}"
-    },
-    "InvoiceVersion": {},
-    "Null": {},
-    "Project": {},
-    "theDiscount": {},
-    "theExpenses": {},
-    "theFee": {},
-    "theProject": {},
-    "theTotal": {},
-    "theVAT": {},
-    "VATnonzerofalse": {},
-    "VATnonzerotrue": {},
-    "Activity": {},
-    "Amount": {},
-    "Count": {},
-    "Currency": {},
-    "Error": {},
-    "Expense": {},
-    "Expenses": {},
-    "Factor": {},
-    "FeeBeforeExpense": {},
-    "FeeSTExists": {},
-    "Fees": {},
-    "InternalError": {},
-    "InvoiceCompleted": {},
-    "InvoiceCompletedNoExpense": {},
-    "InvoiceCompletedNoFee": {},
-    "InvoiceCompletedNoFeeST": {},
-    "InvoiceCompletedNoProject": {},
-    "InvoiceCompletedNoProjectST": {},
-    "KOMA": {},
-    "MissingFee": {},
-    "MissingInputData": {},
-    "MissingOpening": {},
-    "MissingProject": {},
-    "NoInvoiceNesting": {},
-    "NoProjectNesting": {},
-    "ProjectCompletedNoExpense": {},
-    "ProjectCompletedNoFee": {},
-    "ProjectEmpty": {},
-    "ProjectSTExists": {},
-    "SubtotalExpenses": {},
-    "SubtotalFee": {},
-    "SubtotalProject": {},
-    "SumExpenses": {},
-    "SumFees": {},
-    "SumVAT": {},
-    "Total": {},
-    "UnitRate": {},
-    "VAT": {},
-    "Warning": {}
-  },
-  "envs": {
-    "invoice{}{}": {
-      "name": "invoice",
-      "snippet": "{${1:base currency}}{${2:VAT}}"
-    }
-  },
-  "options": [
-    "afrikaans",
-    "dutch",
-    "english",
-    "estonian",
-    "finnish",
-    "french",
-    "german",
-    "italian",
-    "spanish",
-    "spanishe",
-    "spanishv",
-    "swedish",
-    "comma"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ipa.json b/dev/packages/ipa.json
deleted file mode 100644
index 347e78ea6..000000000
--- a/dev/packages/ipa.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "ain": {},
-    "babygamma": {},
-    "barb": {},
-    "bard": {},
-    "bari": {},
-    "barl": {},
-    "baro": {},
-    "barp": {},
-    "barsci": {},
-    "barscu": {},
-    "baru": {},
-    "clickb": {},
-    "clickc": {},
-    "clickt": {},
-    "closedniomega": {},
-    "closedrevepsilon": {},
-    "corner": {},
-    "crossb": {},
-    "crossd": {},
-    "crossh": {},
-    "crossnilambda": {},
-    "curlyc": {},
-    "curlyesh": {},
-    "curlyyogh": {},
-    "curlyz": {},
-    "dlbari": {},
-    "downp": {},
-    "downt": {},
-    "dz": {},
-    "ejective": {},
-    "eng": {},
-    "er": {},
-    "esh": {},
-    "eth": {
-      "detail": "ð",
-      "documentation": "eth"
-    },
-    "flapr": {},
-    "glotstop": {},
-    "halflength": {},
-    "hookb": {},
-    "hookd": {},
-    "hookg": {},
-    "hookh": {},
-    "hookheng": {},
-    "hookrevepsilon": {},
-    "hv": {},
-    "inva": {},
-    "invf": {},
-    "invglotstop": {},
-    "invh": {},
-    "invlegr": {},
-    "invm": {},
-    "invr": {},
-    "invscr": {},
-    "invscripta": {},
-    "invv": {},
-    "invw": {},
-    "invy": {},
-    "ipagamma": {},
-    "labdentalnas": {},
-    "latfric": {},
-    "leftp": {},
-    "leftt": {},
-    "legm": {},
-    "legr": {},
-    "length": {},
-    "lz": {},
-    "midtilde": {},
-    "nialpha": {},
-    "nibeta": {},
-    "nichi": {},
-    "niepsilon": {},
-    "nigamma": {},
-    "niiota": {},
-    "nilambda": {},
-    "niomega": {},
-    "niphi": {},
-    "nisigma": {},
-    "nitheta": {},
-    "niupsilon": {},
-    "nj": {},
-    "oo": {},
-    "open": {},
-    "openo": {},
-    "overring": {},
-    "polishhook": {},
-    "reve": {},
-    "reveject": {},
-    "revepsilon": {},
-    "revglotstop": {},
-    "rightp": {},
-    "rightt": {},
-    "scd": {},
-    "scg": {},
-    "schwa": {},
-    "sci": {},
-    "scn": {},
-    "scr": {},
-    "scripta": {},
-    "scriptg": {},
-    "scriptv": {},
-    "scu": {},
-    "scy": {},
-    "secstress": {},
-    "slashb": {},
-    "slashc": {},
-    "slashd": {},
-    "slashu": {},
-    "stress": {},
-    "syllabic": {},
-    "taild": {},
-    "tailinvr": {},
-    "taill": {},
-    "tailn": {},
-    "tailr": {},
-    "tails": {},
-    "tailt": {},
-    "tailz": {},
-    "tesh": {},
-    "thorn": {},
-    "tildel": {},
-    "underdots": {},
-    "underring": {},
-    "undertilde": {},
-    "underwedge": {},
-    "upp": {},
-    "upt": {},
-    "yogh": {},
-    "dental{}": {
-      "snippet": "dental{${1:character}}"
-    },
-    "underarch{}": {
-      "snippet": "underarch{${1:character}}"
-    },
-    "diatop[]": {
-      "snippet": "diatop[${1:diacritics|character}]"
-    },
-    "diaunder[]": {
-      "snippet": "diaunder[${1:diacritics|character}]"
-    },
-    "ipa": {},
-    "fileversion": {},
-    "filedate": {},
-    "docdate": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ipsum.json b/dev/packages/ipsum.json
deleted file mode 100644
index da0c3a4f8..000000000
--- a/dev/packages/ipsum.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "includes": {
-    "xstring": [],
-    "xintexpr": [],
-    "simplekv": []
-  },
-  "macros": {
-    "ipsum": {},
-    "ipsum[]": {
-      "snippet": "ipsum[${1:range}]"
-    },
-    "ipsum<>": {
-      "snippet": "ipsum<${1:keyvals}>",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ipsum<>[]": {
-      "snippet": "ipsum<${2:keyvals}>[${1:range}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "Lang=",
-      "Type="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/isomath.json b/dev/packages/isomath.json
deleted file mode 100644
index 32b28a61c..000000000
--- a/dev/packages/isomath.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "includes": {
-    "fixmath": [],
-    "kvoptions": []
-  },
-  "macros": {
-    "mathbfit{}": {
-      "snippet": "mathbfit{${1:text}}"
-    },
-    "mathsfbfit{}": {
-      "snippet": "mathsfbfit{${1:text}}"
-    },
-    "mathbold{}": {
-      "snippet": "mathbold{${1:text}}"
-    },
-    "mathboldsans{}": {
-      "snippet": "mathboldsans{${1:text}}"
-    },
-    "mathsfit{}": {
-      "snippet": "mathsfit{${1:text}}",
-      "option": "OMLmathsfit=true"
-    },
-    "mathsans{}": {
-      "snippet": "mathsans{${1:text}}",
-      "option": "OMLmathsfit=true"
-    },
-    "vectorsym{}": {
-      "snippet": "vectorsym{${1:symbol}}"
-    },
-    "matrixsym{}": {
-      "snippet": "matrixsym{${1:symbol}}"
-    },
-    "tensorsym{}": {
-      "snippet": "tensorsym{${1:symbol}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "rmdefault=${1:font family}",
-    "sfdefault=",
-    "scaled=${1:factor}",
-    "reuseMathAlphabets",
-    "OMLmathrm",
-    "OMLmathbf",
-    "OMLmathsf",
-    "OMLmathsfit",
-    "OMLmathtt",
-    "OMLmathsans"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/joinbox.json b/dev/packages/joinbox.json
index 83d6efa3e..99f1bc907 100644
--- a/dev/packages/joinbox.json
+++ b/dev/packages/joinbox.json
@@ -20,34 +20,34 @@
       "keyvalpos": 0
     },
     "joinboxes{}": {
-      "snippet": "joinboxes{${1:content1,${2:content2},...}}"
+      "snippet": "joinboxes{${1:content1,content2,...}}"
     },
     "joinboxes[]{}": {
-      "snippet": "joinboxes[${2:options}]{${1:content1,${3:content2},...}}",
+      "snippet": "joinboxes[${2:options}]{${1:content1,content2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "joinboxes*{}": {
-      "snippet": "joinboxes*{${1:content1,${2:content2},...}}"
+      "snippet": "joinboxes*{${1:content1,content2,...}}"
     },
     "joinboxes*[]{}": {
-      "snippet": "joinboxes*[${2:options}]{${1:content1,${3:content2},...}}",
+      "snippet": "joinboxes*[${2:options}]{${1:content1,content2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "joinfigs{}": {
-      "snippet": "joinfigs{${1:imagefile1,${2:imagefile2},...}}"
+      "snippet": "joinfigs{${1:imagefile1,imagefile2,...}}"
     },
     "joinfigs[]{}": {
-      "snippet": "joinfigs[${2:options}]{${1:imagefile1,${3:imagefile2},...}}",
+      "snippet": "joinfigs[${2:options}]{${1:imagefile1,imagefile2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "joinfigs*{}": {
-      "snippet": "joinfigs*{${1:imagefile1,${2:imagefile2},...}}"
+      "snippet": "joinfigs*{${1:imagefile1,imagefile2,...}}"
     },
     "joinfigs*[]{}": {
-      "snippet": "joinfigs*[${2:options}]{${1:imagefile1,${3:imagefile2},...}}",
+      "snippet": "joinfigs*[${2:options}]{${1:imagefile1,imagefile2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/junicode.json b/dev/packages/junicode.json
index 441861133..479d312b0 100644
--- a/dev/packages/junicode.json
+++ b/dev/packages/junicode.json
@@ -271,6 +271,7 @@
   },
   "envs": {},
   "options": [
+    "fonttype=",
     "light",
     "medium",
     "semibold",
diff --git a/dev/packages/jurabib.json b/dev/packages/jurabib.json
index f844586c0..2ac6aeb22 100644
--- a/dev/packages/jurabib.json
+++ b/dev/packages/jurabib.json
@@ -25,7 +25,7 @@
       "snippet": "citefield[${3:page-range}]{${1:field}}{${2:bibid}}"
     },
     "citenotitlefortype{}": {
-      "snippet": "citenotitlefortype{${1:article,${2:book},…}}"
+      "snippet": "citenotitlefortype{${1:article,book,…}}"
     },
     "citeswithoutentry{}": {
       "snippet": "citeswithoutentry{${1:keylist}}"
@@ -37,7 +37,7 @@
       "snippet": "citetitle[${2:Annotator/See}][${3:page-range}]{${1:bibid}}"
     },
     "citetitlefortype{}": {
-      "snippet": "citetitlefortype{${1:article,${2:book},…}}"
+      "snippet": "citetitlefortype{${1:article,book,…}}"
     },
     "footcite[]{}": {
       "snippet": "footcite[${2:page-range}]{${1:bibid}}"
@@ -99,13 +99,13 @@
       "snippet": "pageadd{${1:text}}"
     },
     "formatpages{}{}{}": {
-      "snippet": "formatpages{${1:article,${4:book},…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}]{${1:article,${5:book},…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "formatpages[][]{}{}{}": {
-      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,${6:book},…}}{${2:left-delim}}{${3:right-delim}}"
+      "snippet": "formatpages[${4:after-separator}][${5:before-separator}]{${1:article,book,…}}{${2:left-delim}}{${3:right-delim}}"
     },
     "citealp[]{}": {
       "snippet": "citealp[${2:postfix}]{${1:keylist}}"
diff --git a/dev/packages/kanbun.json b/dev/packages/kanbun.json
deleted file mode 100644
index df4db0a8f..000000000
--- a/dev/packages/kanbun.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": [],
-    "ifluatex": []
-  },
-  "macros": {
-    "setkanbun{}": {
-      "snippet": "setkanbun{${1:options}}"
-    },
-    "kanjiunit{}{}{}{}{}{}": {
-      "snippet": "kanjiunit{${1:}}{${2:left punct}}{${3:kanji}}{${4:other punct}}{${5:kaeriten}}{${6:}}"
-    },
-    "furiokuri{}{}": {
-      "snippet": "furiokuri{${1:furigana}}{${2:okurigana}}"
-    },
-    "kanbunfont": {},
-    "multifuriokuri{}{}": {
-      "snippet": "multifuriokuri{${1:furigana}}{${2:okurigana}}"
-    },
-    "multifuriokuri[]{}{}": {
-      "snippet": "multifuriokuri[${3:raise}]{${1:furigana}}{${2:okurigana}}"
-    },
-    "Kanbun": {},
-    "EndKanbun": {},
-    "printkanbun": {},
-    "printkanbuncode": {},
-    "printkanbunnopar": {},
-    "printkanbunnoparcode": {},
-    "createcatcodes": {},
-    "kaeriten{}": {
-      "snippet": "kaeriten{${1:arg}}"
-    },
-    "matchkana{}": {
-      "snippet": "matchkana{${1:arg}}"
-    },
-    "Space": {}
-  },
-  "envs": {
-    "kanjipar": {}
-  },
-  "options": [
-    "scale=${1:ratio}",
-    "fontcmd=${1:font command}",
-    "rubyfontcmd=${1:font command}",
-    "unit=",
-    "yokoaki=${1:ratio}",
-    "tateaki=${1:ratio}",
-    "okuriintrusion=${1:ratio}",
-    "kumi=",
-    "aki",
-    "beta"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/keyval.json b/dev/packages/keyval.json
deleted file mode 100644
index 5a2bff750..000000000
--- a/dev/packages/keyval.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "setkeys{}{}": {
-      "snippet": "setkeys{${1:family}}{${2:keyvals}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "unknownkeysallowed",
-    "unknownkeyserror"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/keyvaltable.json b/dev/packages/keyvaltable.json
index 982840756..371e80ac9 100644
--- a/dev/packages/keyvaltable.json
+++ b/dev/packages/keyvaltable.json
@@ -150,12 +150,6 @@
     "kvtRuleCMid{}{}{}": {
       "snippet": "kvtRuleCMid{${1:a-b}}{${2:color}}{${3:color}}"
     },
-    "kvtRuleCMid(){}{}{}": {
-      "snippet": "kvtRuleCMid(${4:trim}){${1:a-b}}{${2:color}}{${3:color}}"
-    },
-    "kvtRuleCMid[](){}{}{}": {
-      "snippet": "kvtRuleCMid[${4:width}](${5:trim}){${1:a-b}}{${2:color}}{${3:color}}"
-    },
     "kvtRulesCMid{}{}{}": {
       "snippet": "kvtRulesCMid{${1:rlist}}{${2:color}}{${3:color}}"
     },
diff --git a/dev/packages/knowledge.json b/dev/packages/knowledge.json
index db9d49d45..5493d6ce3 100644
--- a/dev/packages/knowledge.json
+++ b/dev/packages/knowledge.json
@@ -63,15 +63,9 @@
     "kl{}": {
       "snippet": "kl{${1:text}}"
     },
-    "kl(){}": {
-      "snippet": "kl(${2:scope}){${1:text}}"
-    },
     "kl[]{}": {
       "snippet": "kl[${2:knowledge name}]{${1:text}}"
     },
-    "kl()[]{}": {
-      "snippet": "kl(${3:scope})[${2:knowledge name}]{${1:text}}"
-    },
     "knowledgenewvariant{}{}": {
       "snippet": "knowledgenewvariant{${1:command}}{${2:directives}}"
     },
@@ -85,12 +79,12 @@
       "snippet": "knowledgescope{${1:scope name}}"
     },
     "knowledgeimport{}": {
-      "snippet": "knowledgeimport{${1:scope1,${2:scope2},...}}"
+      "snippet": "knowledgeimport{${1:scope1,scope2,...}}"
     },
     "knowledgeconfigureenvironment{}{}": {
-      "snippet": "knowledgeconfigureenvironment{${1:env1,${3:env2},...}}{${2:keyvals}}",
+      "snippet": "knowledgeconfigureenvironment{${1:env1,env2,...}}{${2:keyvals}}",
       "keyvalindex": 1,
-      "keyvalpos": 0
+      "keyvalpos": 1
     },
     "intro{}": {
       "snippet": "intro{${1:knowledge}}"
@@ -107,9 +101,6 @@
     "phantomintro{}": {
       "snippet": "phantomintro{${1:knowledge}}"
     },
-    "phantomintro(){}": {
-      "snippet": "phantomintro(${2:label}){${1:knowledge}}"
-    },
     "nointro{}": {
       "snippet": "nointro{${1:knowledge}}"
     },
@@ -128,15 +119,9 @@
     "rekl{}": {
       "snippet": "rekl{${1:text}}"
     },
-    "rekl(){}": {
-      "snippet": "rekl(${2:scope}){${1:text}}"
-    },
     "rekl[]{}": {
       "snippet": "rekl[${2:knowledge name}]{${1:text}}"
     },
-    "rekl()[]{}": {
-      "snippet": "rekl(${3:scope})[${2:knowledge name}]{${1:text}}"
-    },
     "AP": {},
     "itemAP": {},
     "knowledgeIntroIndexStyle": {
@@ -454,7 +439,7 @@
       "snippet": "KAuxScopeTag{${1:arg1}}{${2:arg2}}"
     },
     "KnowledgeConfigureEnvironment{}{}": {
-      "snippet": "KnowledgeConfigureEnvironment{${1:env1,${3:env2},...}}{${2:keyvals}}"
+      "snippet": "KnowledgeConfigureEnvironment{${1:env1,env2,...}}{${2:keyvals}}"
     },
     "ScopeHackEnvironments": {},
     "ScopeActivate": {},
diff --git a/dev/packages/knufakelogo.json b/dev/packages/knufakelogo.json
index b37df425b..1c1ddd4c1 100644
--- a/dev/packages/knufakelogo.json
+++ b/dev/packages/knufakelogo.json
@@ -14,9 +14,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "KNUfakelogo*[]{}()()": {
-      "snippet": "KNUfakelogo*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
-    },
     "KNUfakelogoBlue{}": {
       "snippet": "KNUfakelogoBlue{${1:scale}}"
     },
@@ -25,9 +22,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "KNUfakelogoBlue*[]{}()()": {
-      "snippet": "KNUfakelogoBlue*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
-    },
     "KNUfakelogoGreen{}": {
       "snippet": "KNUfakelogoGreen{${1:scale}}"
     },
@@ -36,9 +30,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "KNUfakelogoGreen*[]{}()()": {
-      "snippet": "KNUfakelogoGreen*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
-    },
     "KNUfakelogoBlack{}": {
       "snippet": "KNUfakelogoBlack{${1:scale}}"
     },
@@ -47,9 +38,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "KNUfakelogoBlack*[]{}()()": {
-      "snippet": "KNUfakelogoBlack*[${2:options}]{${1:scale}}(${3:SW coor})(${4:NE coor})"
-    },
     "KNUfakelogoColor{}{}{}": {
       "snippet": "KNUfakelogoColor{${1:scale}}{${2:inner circ colour}}{${3:outer ring colour}}"
     },
@@ -58,9 +46,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "KNUfakelogoColor*[]{}{}[][]()()": {
-      "snippet": "KNUfakelogoColor*[${3:options}]{${1:scale}}{${2:bg and inner colour}}[${4:inner text  colour}][${5:outer text/ring colour}](${6:SW coordinate})(${7:NE coordinate})"
-    },
     "KBOX": {},
     "KCIRCLE": {},
     "KFILL": {},
diff --git a/dev/packages/l3sys-query.json b/dev/packages/l3sys-query.json
deleted file mode 100644
index 533777667..000000000
--- a/dev/packages/l3sys-query.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "QueryWorkingDirectory{}": {
-      "snippet": "QueryWorkingDirectory{${1:result cmd}}"
-    },
-    "QueryFiles{}{}": {
-      "snippet": "QueryFiles{${1:spec}}{${2:function}}"
-    },
-    "QueryFiles[]{}{}": {
-      "snippet": "QueryFiles[${3:options}]{${1:spec}}{${2:function}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "QueryFilesTF{}{}{}{}": {
-      "snippet": "QueryFilesTF{${1:spec}}{${2:function}}{${3:pre code}}{${4:empty list code}}"
-    },
-    "QueryFilesTF[]{}{}{}{}": {
-      "snippet": "QueryFilesTF[${5:options}]{${1:spec}}{${2:function}}{${3:pre code}}{${4:empty list code}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "recursive",
-      "ignore-case",
-      "reverse",
-      "pattern",
-      "sort=",
-      "type=",
-      "exclude=${1:Lua pattern}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/la.json b/dev/packages/la.json
deleted file mode 100644
index 17075c490..000000000
--- a/dev/packages/la.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "la": {},
-    "textla{}": {
-      "snippet": "textla{${1:text}}"
-    },
-    "lla": {},
-    "textlla{}": {
-      "snippet": "textlla{${1:text}}"
-    },
-    "llafill": {},
-    "llaline{}": {
-      "snippet": "llaline{${1:text}}"
-    },
-    "filename": {},
-    "fileversion": {},
-    "filedate": {},
-    "docversion": {},
-    "docdate": {}
-  },
-  "envs": {
-    "llapar": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/labels.json b/dev/packages/labels.json
deleted file mode 100644
index 1d9bcdc7c..000000000
--- a/dev/packages/labels.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "BottomLabelBorder": {
-      "option": "newdimens"
-    },
-    "BottomPageMargin": {
-      "option": "newdimens"
-    },
-    "InterLabelColumn": {
-      "option": "newdimens"
-    },
-    "InterLabelRow": {
-      "option": "newdimens"
-    },
-    "LeftLabelBorder": {
-      "option": "newdimens"
-    },
-    "LeftPageMargin": {
-      "option": "newdimens"
-    },
-    "RightLabelBorder": {
-      "option": "newdimens"
-    },
-    "RightPageMargin": {
-      "option": "newdimens"
-    },
-    "TopLabelBorder": {
-      "option": "newdimens"
-    },
-    "TopPageMargin": {
-      "option": "newdimens"
-    },
-    "addresslabel[]{}": {
-      "snippet": "addresslabel[${2:font commands}]{${1:text}}"
-    },
-    "addresslabel{}": {
-      "snippet": "addresslabel{${1:text}}"
-    },
-    "BottomBorder": {},
-    "boxedaddresslabel[]{}": {
-      "snippet": "boxedaddresslabel[${2:font commands}]{${1:text}}"
-    },
-    "boxedaddresslabel{}": {
-      "snippet": "boxedaddresslabel{${1:text}}"
-    },
-    "genericlabel{}": {
-      "snippet": "genericlabel{${1:text}}"
-    },
-    "ifLabelGrid": {},
-    "ifLabelInfo": {},
-    "LabelCols": {},
-    "labelfile{}": {
-      "snippet": "labelfile{${1:file}}"
-    },
-    "LabelGridfalse": {},
-    "LabelGridtrue": {},
-    "LabelInfofalse": {},
-    "LabelInfotrue": {},
-    "LabelRows": {},
-    "LabelSetup": {},
-    "LeftBorder": {},
-    "numberoflabels": {},
-    "promptlabels": {},
-    "RightBorder": {},
-    "skiplabels{}": {
-      "snippet": "skiplabels{${1:integer}}"
-    },
-    "TopBorder": {},
-    "isitapar": {},
-    "LabelTotal": {},
-    "LabTmp": {},
-    "PkgBlurb{}{}": {
-      "snippet": "PkgBlurb{${1:arg1}}{${2:arg2}}"
-    },
-    "ToMilli{}": {
-      "snippet": "ToMilli{${1:arg}}"
-    },
-    "TypeoutBlurb{}{}": {
-      "snippet": "TypeoutBlurb{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {
-    "labels": {}
-  },
-  "options": [
-    "newdimens"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/labyrinth.json b/dev/packages/labyrinth.json
index 20f706cbe..9d4a32c8d 100644
--- a/dev/packages/labyrinth.json
+++ b/dev/packages/labyrinth.json
@@ -14,9 +14,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "putsymbol(){}": {
-      "snippet": "putsymbol(${2:x},${3:y}){${1:symbol}}"
-    },
     "plus": {
       "detail": "+",
       "documentation": "PLUS SIGN"
@@ -29,27 +26,11 @@
       "detail": "∗",
       "documentation": "ASTERISK OPERATOR (Hodge star operator)"
     },
-    "labyrinthsolution(){}": {
-      "snippet": "labyrinthsolution(${2:x},${3:y}){${1:solution code}}"
-    },
-    "labyrinthsolution[](){}": {
-      "snippet": "labyrinthsolution[${2:options}](${3:x},${4:y}){${1:solution code}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "solutionset{}": {
       "snippet": "solutionset{${1:options}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
-    "autosolution()(){}": {
-      "snippet": "autosolution(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:first direction}}"
-    },
-    "autosolution[]()(){}": {
-      "snippet": "autosolution[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:first direction}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "solutionpath": {},
     "truncdiv{}{}": {
       "snippet": "truncdiv{${1:num1}}{${2:num2}}"
diff --git a/dev/packages/ladder.json b/dev/packages/ladder.json
deleted file mode 100644
index a8d7fcfe3..000000000
--- a/dev/packages/ladder.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "includes": {
-    "calc": [],
-    "ifthen": [],
-    "tikz": []
-  },
-  "macros": {
-    "ladderLine": {},
-    "startParallel": {},
-    "setParallel": {},
-    "unsetParallel": {},
-    "ladderNO{}{}": {
-      "snippet": "ladderNO{${1:name}}{${2:mnemonic}}"
-    },
-    "ladderNO[]{}{}": {
-      "snippet": "ladderNO[${3:type}]{${1:name}}{${2:mnemonic}}"
-    },
-    "ladderNC{}{}": {
-      "snippet": "ladderNC{${1:name}}{${2:mnemonic}}"
-    },
-    "ladderNC[]{}{}": {
-      "snippet": "ladderNC[${3:type}]{${1:name}}{${2:mnemonic}}"
-    },
-    "ladderC{}{}": {
-      "snippet": "ladderC{${1:name}}{${2:mnemonic}}"
-    },
-    "ladderC[]{}{}": {
-      "snippet": "ladderC[${3:type}]{${1:name}}{${2:mnemonic}}"
-    },
-    "ladderText{}{}": {
-      "snippet": "ladderText{${1:name}}{${2:mnemonic}}"
-    },
-    "ladderText[]{}{}": {
-      "snippet": "ladderText[${3:type}]{${1:name}}{${2:mnemonic}}"
-    },
-    "thecurrentX": {},
-    "thecurrentY": {},
-    "thememCurrentX": {},
-    "thememCurrentY": {},
-    "thenextX": {},
-    "thenextY": {},
-    "thenextYPar": {},
-    "thestartPar": {},
-    "thestopPar": {},
-    "thetempCurrentY": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lapdf.json b/dev/packages/lapdf.json
index bf4931ad5..80fcd351b 100644
--- a/dev/packages/lapdf.json
+++ b/dev/packages/lapdf.json
@@ -3,348 +3,39 @@
     "calc": []
   },
   "macros": {
-    "Abs()": {
-      "snippet": "Abs(${1:num})"
-    },
-    "Acos()": {
-      "snippet": "Acos(${1:num},${2:cmd})"
-    },
-    "Acosh()": {
-      "snippet": "Acosh(${1:num},${2:cmd})"
-    },
-    "Add()": {
-      "snippet": "Add(${1:num1},${2:num2})"
-    },
     "Affine": {},
-    "Arc()()()()": {
-      "snippet": "Arc(${1:n})(${2:x},${3:y})(${4:direction},${5:angle})(${6:radius})"
-    },
-    "Arcto()()()()": {
-      "snippet": "Arcto(${1:n})(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:radius})"
-    },
-    "Asin()": {
-      "snippet": "Asin(${1:num},${2:cmd})"
-    },
-    "Asinh()": {
-      "snippet": "Asinh(${1:num},${2:cmd})"
-    },
-    "Atan()": {
-      "snippet": "Atan(${1:num},${2:cmd})"
-    },
-    "Atanh()": {
-      "snippet": "Atanh(${1:num},${2:cmd})"
-    },
-    "Bezier()": {
-      "snippet": "Bezier(${1:val1},${2:val2},${3:val3},${4:val4},${5:val5},${6:val6})"
-    },
     "Black": {},
     "Blue": {},
-    "Circle()()": {
-      "snippet": "Circle(${1:n})(${2:x},${3:y},${4:radius})"
-    },
     "Closepath": {},
     "Colval": {},
-    "Concat()": {
-      "snippet": "Concat(${1:val1},${2:val2},${3:val3},${4:val4},${5:val5},${6:val6})"
-    },
-    "Cos()": {
-      "snippet": "Cos(${1:angle},${2:cmd})"
-    },
-    "Cosh()": {
-      "snippet": "Cosh(${1:angle},${2:cmd})"
-    },
-    "Crnd()": {
-      "snippet": "Crnd(${1:num})"
-    },
     "Cyan": {},
-    "Dabs()": {
-      "snippet": "Dabs(${1:dimen})"
-    },
-    "Dadd()": {
-      "snippet": "Dadd(${1:dimen1},${2:dimen2})"
-    },
-    "Dash()": {
-      "snippet": "Dash(${1:n})"
-    },
     "Dblue": {},
     "Dcyan": {},
-    "Ddiv()": {
-      "snippet": "Ddiv(${1:dimen1},${2:dimen2})"
-    },
-    "Defdim()": {
-      "snippet": "Defdim(${1:cmd},${2:val})"
-    },
-    "Defnum()": {
-      "snippet": "Defnum(${1:cmd},${2:val})"
-    },
-    "Deg()": {
-      "snippet": "Deg(${1:num},${2:cmd})"
-    },
-    "Df()": {
-      "snippet": "Df(${1:x},${2:cmd})"
-    },
     "Dgray": {},
     "Dgreen": {},
-    "Dint()": {
-      "snippet": "Dint(${1:dimen})"
-    },
-    "Direc()()()": {
-      "snippet": "Direc(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:cmd})"
-    },
-    "Div()": {
-      "snippet": "Div(${1:num1},${2:num2})"
-    },
     "Dmagenta": {},
-    "Dmod()": {
-      "snippet": "Dmod(${1:dimen1},${2:dimen2})"
-    },
-    "Dmul()": {
-      "snippet": "Dmul(${1:dimen1},${2:dimen2})"
-    },
-    "Dpoly()": {
-      "snippet": "Dpoly(${1:x},${2:cmd})"
-    },
-    "Dpx()": {
-      "snippet": "Dpx(${1:angle},${2:cmd})"
-    },
-    "Dpy()": {
-      "snippet": "Dpy(${1:angle},${2:cmd})"
-    },
     "Dred": {},
-    "Dset()": {
-      "snippet": "Dset(${1:num},${2:cmd})"
-    },
-    "Dsig()": {
-      "snippet": "Dsig(${1:dimen1},${2:dimen2})"
-    },
-    "Dsub()": {
-      "snippet": "Dsub(${1:dimen1},${2:dimen2})"
-    },
-    "Dtp()": {
-      "snippet": "Dtp(${1:angle},${2:cmd})"
-    },
-    "Dtt()": {
-      "snippet": "Dtt(${1:t},${2:cmd})"
-    },
-    "Dtx()": {
-      "snippet": "Dtx(${1:t},${2:cmd})"
-    },
-    "Dty()": {
-      "snippet": "Dty(${1:t},${2:cmd})"
-    },
     "Dyellow": {},
-    "Ellipse()()()": {
-      "snippet": "Ellipse(${1:n})(${2:x},${3:y})(${4:a},${5:b},${6:angle})"
-    },
-    "Epolygon()()()": {
-      "snippet": "Epolygon(${1:n})(${2:x},${3:y})(${4:radius},${5:angle})"
-    },
-    "Euclid()": {
-      "snippet": "Euclid(${1:x},${2:y})"
-    },
-    "Exp()": {
-      "snippet": "Exp(${1:num},${2:cmd})"
-    },
-    "Fill()": {
-      "snippet": "Fill(${1:r},${2:g},${3:b})"
-    },
-    "Fplot()()": {
-      "snippet": "Fplot(${1:n})(${2:x},${3:y})"
-    },
-    "Fpoly()": {
-      "snippet": "Fpoly(${1:x},${2:cmd})"
-    },
-    "Gfill()": {
-      "snippet": "Gfill(${1:gray val})"
-    },
     "Gray": {},
     "Green": {},
     "Grestore": {},
     "Gsave": {},
-    "Homogen()": {
-      "snippet": "Homogen(${1:px},${2:py},${3:w})"
-    },
-    "Hypot()": {
-      "snippet": "Hypot(${1:leg1},${2:leg2},${3:cmd})"
-    },
     "Lapdf": {},
-    "Len()()()": {
-      "snippet": "Len(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:cmd})"
-    },
-    "Line()()": {
-      "snippet": "Line(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "Lineto()": {
-      "snippet": "Lineto(${1:x},${2:y})"
-    },
-    "Lingrid()()()()": {
-      "snippet": "Lingrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
-    },
-    "Ln()": {
-      "snippet": "Ln(${1:num},${2:cmd})"
-    },
-    "Log()": {
-      "snippet": "Log(${1:base},${2:num},${3:cmd})"
-    },
-    "Logxgrid()()()()": {
-      "snippet": "Logxgrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
-    },
-    "Logxygrid()()()()": {
-      "snippet": "Logxygrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
-    },
-    "Logygrid()()()()": {
-      "snippet": "Logygrid(${1:n})(${2:g},${3:a})(${4:xmin},${5:xmax})(${6:ymin},${7:ymax})"
-    },
     "Magenta": {},
-    "Mod()": {
-      "snippet": "Mod(${1:num1},${2:num2})"
-    },
-    "Moveto()": {
-      "snippet": "Moveto(${1:x},${2:y})"
-    },
-    "Mul()": {
-      "snippet": "Mul(${1:num1},${2:num2})"
-    },
-    "Nextcol()": {
-      "snippet": "Nextcol(${1:num1},${2:num2})"
-    },
     "Np{}": {
       "snippet": "Np{${1:length}}"
     },
     "PDF{}": {
       "snippet": "PDF{${1:pdf special}}"
     },
-    "Point()()": {
-      "snippet": "Point(${1:gray val})(${2:x},${3:y})"
-    },
-    "Polgrid()()": {
-      "snippet": "Polgrid(${1:g},${2:a})(${3:radius})"
-    },
-    "Polynom()()": {
-      "snippet": "Polynom(${1:x},${2:y})(${3:a},${4:b},${5:c},${6:d})"
-    },
-    "Pot()": {
-      "snippet": "Pot(${1:base},${2:power},${3:cmd})"
-    },
-    "Pow()": {
-      "snippet": "Pow(${1:base},${2:power},${3:cmd})"
-    },
-    "Pplot()()": {
-      "snippet": "Pplot(${1:n})(${2:angle1},${3:angle2})"
-    },
-    "Pxy()": {
-      "snippet": "Pxy(${1:angle},${2:x},${3:y})"
-    },
-    "Rad()": {
-      "snippet": "Rad(${1:num},${2:cmd})"
-    },
-    "Rect()": {
-      "snippet": "Rect(${1:val1},${2:val2},${3:val3},${4:val4})"
-    },
-    "Rectangle()()()": {
-      "snippet": "Rectangle(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:angle})"
-    },
     "Red": {},
     "Resetcol": {},
-    "Rmoveto()": {
-      "snippet": "Rmoveto(${1:x},${2:y},${3:z})"
-    },
-    "Root()": {
-      "snippet": "Root(${1:num},${2:root},${3:cmd})"
-    },
-    "Rotate()": {
-      "snippet": "Rotate(${1:angle})"
-    },
-    "Rotpoint()()()": {
-      "snippet": "Rotpoint(${1:angle})(${2:xy},${3:y1})(${4:x2},${5:y2})"
-    },
-    "Scale()": {
-      "snippet": "Scale(${1:val1},${2:val2})"
-    },
-    "Sector()()()()": {
-      "snippet": "Sector(${1:n})(${2:x},${3:y})(${4:direction},${5:angle})(${6:radius})"
-    },
-    "Set()": {
-      "snippet": "Set(${1:dimen},${2:val})"
-    },
-    "Setcap()": {
-      "snippet": "Setcap(${1:value})"
-    },
     "Setclip": {},
-    "Setcol()": {
-      "snippet": "Setcol(${1:r},${2:g},${3:b})"
-    },
-    "Setdash()": {
-      "snippet": "Setdash(${1:value})"
-    },
-    "Setflat()": {
-      "snippet": "Setflat(${1:value})"
-    },
-    "Setgray()": {
-      "snippet": "Setgray(${1:gray val})"
-    },
-    "Setjoin()": {
-      "snippet": "Setjoin(${1:value})"
-    },
-    "Setmiter()": {
-      "snippet": "Setmiter(${1:value})"
-    },
-    "Setwidth()": {
-      "snippet": "Setwidth(${1:value})"
-    },
     "Sfill": {},
-    "Sig()": {
-      "snippet": "Sig(${1:num1},${2:num2})"
-    },
-    "Sin()": {
-      "snippet": "Sin(${1:angle},${2:cmd})"
-    },
-    "Sinh()": {
-      "snippet": "Sinh(${1:angle},${2:cmd})"
-    },
-    "Sqrt()": {
-      "snippet": "Sqrt(${1:num},${2:cmd})"
-    },
-    "Stepcol()": {
-      "snippet": "Stepcol(${1:num1},${2:num2},${3:cmd})"
-    },
     "Stroke": {},
-    "Sub()": {
-      "snippet": "Sub(${1:num1},${2:num2})"
-    },
-    "Tan()": {
-      "snippet": "Tan(${1:angle},${2:cmd})"
-    },
-    "Tangent()()()": {
-      "snippet": "Tangent(${1:x})(${2:x1},${3:x2})(${4:a},${5:b},${6:c},${7:d})"
-    },
-    "Tanh()": {
-      "snippet": "Tanh(${1:angle},${2:cmd})"
-    },
-    "Text(){}": {
-      "snippet": "Text(${2:x},${3:y},${4:pos}){${1:text}}"
-    },
     "Thick": {},
     "Thin": {},
-    "Tplot()()": {
-      "snippet": "Tplot(${1:n})(${2:t1},${3:t2})"
-    },
-    "Translate()": {
-      "snippet": "Translate(${1:val1},${2:val2})"
-    },
-    "Triangle()()()()": {
-      "snippet": "Triangle(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})(${7:angle})"
-    },
     "Ul": {},
-    "Varc()()()()": {
-      "snippet": "Varc(${1:n})(${2:x},${3:y})(${4:direction},${5:angle})(${6:radius})"
-    },
-    "Vect()()": {
-      "snippet": "Vect(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "Vecto()": {
-      "snippet": "Vecto(${1:x},${2:y})"
-    },
     "Whiledim{}{}": {
       "snippet": "Whiledim{${1:dimen condition}}{${2:commands}}"
     },
@@ -358,18 +49,11 @@
       "snippet": "nP{${1:length}}"
     },
     "pdfTeX": {},
-    "lapdf()()": {
-      "snippet": "lapdf(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
     "endlapdf": {},
     "pdf": {},
     "endpdf": {}
   },
   "envs": {
-    "lapdf(x1,y1)(x2,y2)": {
-      "name": "lapdf",
-      "snippet": "(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
     "pdf": {}
   },
   "options": [
diff --git a/dev/packages/latex-dev.json b/dev/packages/latex-dev.json
index 915177450..fd323f985 100644
--- a/dev/packages/latex-dev.json
+++ b/dev/packages/latex-dev.json
@@ -34,7 +34,6 @@
     "AssignSocketPlug{}{}": {
       "snippet": "AssignSocketPlug{${1:socket}}{${2:socket plug}}"
     },
-    "AssignTemplateKeys": {},
     "AtBeginDocument[]{}": {
       "snippet": "AtBeginDocument[${2:label}]{${1:code}}"
     },
@@ -143,8 +142,6 @@
     "DebugShipoutsOn": {},
     "DebugSocketsOff": {},
     "DebugSocketsOn": {},
-    "DebugTablesOff": {},
-    "DebugTablesOn": {},
     "DeclareCaseChangeEquivalent{}{}": {
       "snippet": "DeclareCaseChangeEquivalent{${1:cmd}}{${2:replacement text}}"
     },
@@ -214,12 +211,6 @@
     "DeclareHookRule{}{}{}{}": {
       "snippet": "DeclareHookRule{${1:hook}}{${2:label1}}{${3:relation}}{${4:label2}}"
     },
-    "DeclareInstance{}{}{}{}": {
-      "snippet": "DeclareInstance{${1:type}}{${2:instance}}{${3:template}}{${4:parameters}}"
-    },
-    "DeclareInstanceCopy{}{}{}": {
-      "snippet": "DeclareInstanceCopy{${1:type}}{${2:instance2}}{${3:instance1}}"
-    },
     "DeclareKeys[]{}": {
       "snippet": "DeclareKeys[${2:family}]{${1:declarations}}"
     },
@@ -298,15 +289,6 @@
     "DeclareSymbolFontAlphabet{}{}": {
       "snippet": "DeclareSymbolFontAlphabet{${1:math-alph}}{${2:sym-font}}"
     },
-    "DeclareTemplateCode{}{}{}{}{}": {
-      "snippet": "DeclareTemplateCode{${1:type}}{${2:template}}{${3:no. of args}}{${4:key bindings}}{${5:code}}"
-    },
-    "DeclareTemplateCopy{}{}{}": {
-      "snippet": "DeclareTemplateCopy{${1:type}}{${2:template2}}{${3:template1}}"
-    },
-    "DeclareTemplateInterface{}{}{}{}": {
-      "snippet": "DeclareTemplateInterface{${1:type}}{${2:template}}{${3:no. of args}}{${4:key list}}"
-    },
     "DeclareTextAccent{}{}{}": {
       "snippet": "DeclareTextAccent{${1:cmd}}{${2:encoding}}{${3:slot}}"
     },
@@ -368,12 +350,6 @@
       "snippet": "DisableHook{${1:hook}}"
     },
     "DiscardShipoutBox": {},
-    "EditInstance{}{}{}": {
-      "snippet": "EditInstance{${1:type}}{${2:instance}}{${3:new values}}"
-    },
-    "EditTemplateDefaults{}{}{}": {
-      "snippet": "EditTemplateDefaults{${1:type}}{${2:template}}{${3:new defaults}}"
-    },
     "EndIncludeInRelease": {},
     "EndModuleRelease": {},
     "ExecuteOptions{}": {
@@ -417,89 +393,35 @@
     "IfBooleanTF{}{}{}": {
       "snippet": "IfBooleanTF{${1:arg}}{${2:true code}}{${3:false code}}"
     },
-    "IfClassAtLeastF{}{}{}": {
-      "snippet": "IfClassAtLeastF{${1:class}}{${2:date}}{${3:false code}}"
-    },
-    "IfClassAtLeastT{}{}{}": {
-      "snippet": "IfClassAtLeastT{${1:class}}{${2:date}}{${3:true code}}"
-    },
     "IfClassAtLeastTF{}{}{}{}": {
       "snippet": "IfClassAtLeastTF{${1:class}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
-    "IfClassLoadedF{}{}": {
-      "snippet": "IfClassLoadedF{${1:class}}{${2:false code}}"
-    },
-    "IfClassLoadedT{}{}": {
-      "snippet": "IfClassLoadedT{${1:class}}{${2:true code}}"
-    },
     "IfClassLoadedTF{}{}{}": {
       "snippet": "IfClassLoadedTF{${1:class}}{${2:true code}}{${3:false code}}"
     },
-    "IfClassLoadedWithOptionsF{}{}{}": {
-      "snippet": "IfClassLoadedWithOptionsF{${1:class}}{${2:options}}{${3:false code}}"
-    },
-    "IfClassLoadedWithOptionsT{}{}{}": {
-      "snippet": "IfClassLoadedWithOptionsT{${1:class}}{${2:options}}{${3:true code}}"
-    },
     "IfClassLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfClassLoadedWithOptionsTF{${1:class}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfExplAtLeastTF{}{}{}": {
       "snippet": "IfExplAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
-    "IfFileAtLeastF{}{}{}": {
-      "snippet": "IfFileAtLeastF{${1:file}}{${2:date}}{${3:false code}}"
-    },
-    "IfFileAtLeastT{}{}{}": {
-      "snippet": "IfFileAtLeastT{${1:file}}{${2:date}}{${3:true code}}"
-    },
     "IfFileAtLeastTF{}{}{}{}": {
       "snippet": "IfFileAtLeastTF{${1:file}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
     "IfFileExists{}{}{}": {
       "snippet": "IfFileExists{${1:file}}{${2:true code}}{${3:false code}}"
     },
-    "IfFileLoadedF{}{}": {
-      "snippet": "IfFileLoadedF{${1:file}}{${2:false code}}"
-    },
-    "IfFileLoadedT{}{}": {
-      "snippet": "IfFileLoadedT{${1:file}}{${2:true code}}"
-    },
-    "IfFileLoadedTF{}{}{}": {
-      "snippet": "IfFileLoadedTF{${1:file}}{${2:true code}}{${3:false code}}"
-    },
     "IfFontSeriesContextTF{}{}{}": {
       "snippet": "IfFontSeriesContextTF{${1:face}}{${2:true code}}{${3:false code}}"
     },
-    "IfFormatAtLeastF{}{}": {
-      "snippet": "IfFormatAtLeastF{${1:date}}{${2:false code}}"
-    },
-    "IfFormatAtLeastT{}{}": {
-      "snippet": "IfFormatAtLeastT{${1:date}}{${2:true code}}"
-    },
     "IfFormatAtLeastTF{}{}{}": {
       "snippet": "IfFormatAtLeastTF{${1:date}}{${2:true code}}{${3:false code}}"
     },
     "IfHookEmptyTF{}{}{}": {
       "snippet": "IfHookEmptyTF{${1:hook}}{${2:true code}}{${3:false code}}"
     },
-    "IfInstanceExistsF{}{}{}{}": {
-      "snippet": "IfInstanceExistsF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
-    },
-    "IfInstanceExistsT{}{}{}{}": {
-      "snippet": "IfInstanceExistsT{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
-    },
-    "IfInstanceExistsTF{}{}{}{}": {
-      "snippet": "IfInstanceExistsTF{${1:type}}{${2:instance}}{${3:true}}{${4:false}}"
-    },
-    "IfLabelExistsF{}{}": {
-      "snippet": "IfLabelExistsF{${1:label}}{${2:false code}}"
-    },
-    "IfLabelExistsT{}{}": {
-      "snippet": "IfLabelExistsT{${1:label}}{${2:true code}}"
-    },
-    "IfLabelExistsTF{}{}{}": {
-      "snippet": "IfLabelExistsTF{${1:label}}{${2:true code}}{${3:false code}}"
+    "IfLabelExistTF{}{}{}": {
+      "snippet": "IfLabelExistTF{${1:label}}{${2:true code}}{${3:false code}}"
     },
     "IfMarksEqualTF[]{}{}{}{}{}": {
       "snippet": "IfMarksEqualTF[${6:region}]{${1:class}}{${2:pos1}}{${3:pos2}}{${4:true code}}{${5:false code}}"
@@ -516,44 +438,20 @@
     "IfNoValueTF{}{}{}": {
       "snippet": "IfNoValueTF{${1:arg}}{${2:-NoValue-Code}}{${3:ValueCode}}"
     },
-    "IfPackageAtLeastF{}{}{}": {
-      "snippet": "IfPackageAtLeastF{${1:package}}{${2:date}}{${3:false code}}"
-    },
-    "IfPackageAtLeastT{}{}{}": {
-      "snippet": "IfPackageAtLeastT{${1:package}}{${2:date}}{${3:true code}}"
-    },
     "IfPackageAtLeastTF{}{}{}{}": {
       "snippet": "IfPackageAtLeastTF{${1:package}}{${2:date}}{${3:true code}}{${4:false code}}"
     },
-    "IfPackageLoadedF{}{}": {
-      "snippet": "IfPackageLoadedF{${1:package}}{${2:false code}}"
-    },
-    "IfPackageLoadedT{}{}": {
-      "snippet": "IfPackageLoadedT{${1:package}}{${2:true code}}"
-    },
     "IfPackageLoadedTF{}{}{}": {
       "snippet": "IfPackageLoadedTF{${1:package}}{${2:true code}}{${3:false code}}"
     },
-    "IfPackageLoadedWithOptionsF{}{}{}": {
-      "snippet": "IfPackageLoadedWithOptionsF{${1:package}}{${2:options}}{${3:false code}}"
-    },
-    "IfPackageLoadedWithOptionsT{}{}{}": {
-      "snippet": "IfPackageLoadedWithOptionsT{${1:package}}{${2:options}}{${3:true code}}"
-    },
     "IfPackageLoadedWithOptionsTF{}{}{}{}": {
       "snippet": "IfPackageLoadedWithOptionsTF{${1:package}}{${2:options}}{${3:true code}}{${4:false code}}"
     },
     "IfPDFManagementActiveTF{}{}": {
       "snippet": "IfPDFManagementActiveTF{${1:true code}}{${2:false code}}"
     },
-    "IfPropertyExistsF{}{}": {
-      "snippet": "IfPropertyExistsF{${1:property}}{${2:false code}}"
-    },
-    "IfPropertyExistsT{}{}": {
-      "snippet": "IfPropertyExistsT{${1:property}}{${2:true code}}"
-    },
-    "IfPropertyExistsTF{}{}{}": {
-      "snippet": "IfPropertyExistsTF{${1:property}}{${2:true code}}{${3:false code}}"
+    "IfPropertyExistTF{}{}{}": {
+      "snippet": "IfPropertyExistTF{${1:property}}{${2:true code}}{${3:false code}}"
     },
     "IfPropertyRecordedTF{}{}{}{}": {
       "snippet": "IfPropertyRecordedTF{${1:label}}{${2:property}}{${3:true code}}{${4:false code}}"
@@ -580,9 +478,6 @@
     "InsertMark{}{}": {
       "snippet": "InsertMark{${1:class}}{${2:text}}"
     },
-    "KeyValue{}": {
-      "snippet": "KeyValue{${1:key name}}"
-    },
     "LastDeclaredEncoding": {},
     "LastMark[]{}": {
       "snippet": "LastMark[${2:region}]{${1:class}}"
@@ -687,14 +582,13 @@
     "NewSocketPlug{}{}{}": {
       "snippet": "NewSocketPlug{${1:socket}}{${2:socket plug}}{${3:code}}"
     },
-    "NewTemplateType{}{}": {
-      "snippet": "NewTemplateType{${1:template type}}{${2:no. of args}}"
-    },
     "NextLinkTarget{}": {
       "snippet": "NextLinkTarget{${1:target name}}"
     },
     "OmitIndent": {},
     "OptionNotUsed": {},
+    "obeyedline": {},
+    "obeyedspace": {},
     "PackageError{}{}{}": {
       "snippet": "PackageError{${1:package name}}{${2:error text}}{${3:help text}}"
     },
@@ -838,9 +732,6 @@
     "RequirePackageWithOptions{}[]": {
       "snippet": "RequirePackageWithOptions{${1:package}}[${2:release}]"
     },
-    "ResumeTagging{}": {
-      "snippet": "ResumeTagging{${1:string}}"
-    },
     "ReverseBoolean": {},
     "SetDefaultHookLabel{}": {
       "snippet": "SetDefaultHookLabel{${1:default label}}"
@@ -860,9 +751,6 @@
     "SetSymbolFont{}{}{}{}{}{}": {
       "snippet": "SetSymbolFont{${1:sym-font}}{${2:version}}{${3:encoding}}{${4:family}}{${5:series}}{${6:shape}}"
     },
-    "SetTemplateKeys{}{}{}": {
-      "snippet": "SetTemplateKeys{${1:type}}{${2:template}}{${3:keyvals}}"
-    },
     "ShipoutBox": {},
     "ShipoutBoxDepth": {},
     "ShipoutBoxHeight": {},
@@ -879,36 +767,15 @@
     "ShowHook{}": {
       "snippet": "ShowHook{${1:hook}}"
     },
-    "ShowInstanceValues{}{}": {
-      "snippet": "ShowInstanceValues{${1:type}}{${2:instance}}"
-    },
-    "ShowMarksAt{}": {
-      "snippet": "ShowMarksAt{${1:text}}"
-    },
     "ShowSocket{}": {
       "snippet": "ShowSocket{${1:socket}}"
     },
-    "ShowTemplateCode{}{}": {
-      "snippet": "ShowTemplateCode{${1:type}}{${2:template}}"
-    },
-    "ShowTemplateDefaults{}{}": {
-      "snippet": "ShowTemplateDefaults{${1:type}}{${2:template}}"
-    },
-    "ShowTemplateInterface{}{}": {
-      "snippet": "ShowTemplateInterface{${1:type}}{${2:template}}"
-    },
-    "ShowTemplateVariables{}{}": {
-      "snippet": "ShowTemplateVariables{${1:type}}{${2:template}}"
-    },
     "SplitArgument{}{}": {
       "snippet": "SplitArgument{${1:number}}{${2:tokens}}"
     },
     "SplitList{}": {
       "snippet": "SplitList{${1:tokens}}"
     },
-    "SuspendTagging{}": {
-      "snippet": "SuspendTagging{${1:string}}"
-    },
     "TextSymbolUnavailable{}": {
       "snippet": "TextSymbolUnavailable{${1:arg}}"
     },
@@ -925,9 +792,6 @@
     "UseHook{}": {
       "snippet": "UseHook{${1:hook}}"
     },
-    "UseInstance{}{}": {
-      "snippet": "UseInstance{${1:type}}{${2:instance}}"
-    },
     "UseLegacyTextSymbols": {},
     "UseName{}": {
       "snippet": "UseName{${1:csname}}"
@@ -937,13 +801,7 @@
     },
     "UseRawInputEncoding": {},
     "UseSocket{}": {
-      "snippet": "UseSocket{${1:socket name}}"
-    },
-    "UseTaggingSocket{}": {
-      "snippet": "UseTaggingSocket{${1:socket}}"
-    },
-    "UseTemplate{}{}{}": {
-      "snippet": "UseTemplate{${1:type}}{${2:template}}{${3:settings}}"
+      "snippet": "UseSocket{${1:socket}}"
     },
     "UseTextAccent{}{}{}": {
       "snippet": "UseTextAccent{${1:encoding}}{${2:cmd}}{${3:text}}"
@@ -1387,6 +1245,26 @@
     "itdefault": {},
     "loggingall": {},
     "loggingoutput": {},
+    "ltcmddate": {},
+    "ltcmdhooksdate": {},
+    "ltcmdhooksversion": {},
+    "ltcmdversion": {},
+    "ltfilehookdate": {},
+    "ltfilehookversion": {},
+    "lthooksdate": {},
+    "lthooksversion": {},
+    "ltmarksdate": {},
+    "ltmarksversion": {},
+    "ltmetadate": {},
+    "ltmetaversion": {},
+    "ltparadate": {},
+    "ltparaversion": {},
+    "ltpropertiesdate": {},
+    "ltpropertiesversion": {},
+    "ltshipoutdate": {},
+    "ltshipoutversion": {},
+    "ltsocketsdate": {},
+    "ltsocketsversion": {},
     "mathalpha": {},
     "mathgroup": {},
     "mathhexbox": {},
@@ -1397,8 +1275,6 @@
     "numberline{}": {
       "snippet": "numberline{${1:number}}"
     },
-    "obeyedline": {},
-    "obeyedspace": {},
     "poptabs": {},
     "pushtabs": {},
     "requestedLaTeXdate": {},
diff --git a/dev/packages/latex-document.json b/dev/packages/latex-document.json
index 696a6c964..be4a24017 100644
--- a/dev/packages/latex-document.json
+++ b/dev/packages/latex-document.json
@@ -13,22 +13,13 @@
     },
     "and": {},
     "asciispace": {},
-    "bezier{}()()()": {
-      "snippet": "bezier{${1:n}}(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
-    },
     "bfseries": {},
     "bibindent": {},
     "Bigg": {},
-    "Bigg(": {
-      "snippet": "Bigg(${2:${1}\\Bigg})"
-    },
     "Bigg[": {
       "snippet": "Bigg[${1}\\Bigg]"
     },
     "bigg": {},
-    "bigg(": {
-      "snippet": "bigg(${2:${1}\\bigg})"
-    },
     "bigg[": {
       "snippet": "bigg[${1}\\bigg]"
     },
@@ -49,12 +40,6 @@
       "snippet": "contentsline{${1:type}}{${2:text}}{${3:page}}{${4:Href}}"
     },
     "contentsname": {},
-    "dashbox{}()[]{}": {
-      "snippet": "dashbox{${1:dashlength}}(${4:width},${5:height})[${2:position}]{${3:text}}"
-    },
-    "dashbox{}(){}": {
-      "snippet": "dashbox{${1:dashlength}}(${3:width},${4:height}){${2:text}}"
-    },
     "date{}": {
       "snippet": "date{${1:text}}"
     },
@@ -106,12 +91,6 @@
     "fpeval{}": {
       "snippet": "fpeval{${1:fp expression}}"
     },
-    "framebox()[]{}": {
-      "snippet": "framebox(${3:xdimen},${4:ydimen})[${2:position}]{${1:text}}"
-    },
-    "framebox(){}": {
-      "snippet": "framebox(${2:xdimen},${3:ydimen}){${1:text}}"
-    },
     "frame{}": {
       "snippet": "frame{${1:text}}"
     },
@@ -157,35 +136,21 @@
       "snippet": "legacyoldstylenums{${1:text}}"
     },
     "lhook": {},
-    "line(){}": {
-      "snippet": "line(${2:xslope},${3:yslope}){${1:length}}"
-    },
     "linethickness{}": {
       "snippet": "linethickness{${1:dimension}}"
     },
     "linewidth": {},
     "listfigurename": {},
     "listfiles": {},
-    "listfiles[]": {
-      "snippet": "listfiles[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "listparindent": {},
     "listtablename": {},
-    "makebox()[]{}": {
-      "snippet": "makebox(${3:width},${4:height})[${2:position}]{${1:text}}"
-    },
-    "makebox(){}": {
-      "snippet": "makebox(${2:width},${3:height}){${1:text}}"
-    },
     "makelabel": {},
     "MakeLowercase{}": {
       "snippet": "MakeLowercase{${1:text}}"
     },
     "MakeLowercase[]{}": {
       "snippet": "MakeLowercase[${2:options}]{${1:text}}",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "MakeTitlecase{}": {
@@ -193,7 +158,7 @@
     },
     "MakeTitlecase[]{}": {
       "snippet": "MakeTitlecase[${2:options}]{${1:text}}",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "MakeUppercase{}": {
@@ -201,7 +166,7 @@
     },
     "MakeUppercase[]{}": {
       "snippet": "MakeUppercase[${2:options}]{${1:text}}",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "mapstochar": {},
@@ -230,9 +195,6 @@
       "documentation": "MEDIUM MATHEMATICAL SPACE, four-eighteenths of an em"
     },
     "mdseries": {},
-    "multiput()(){}{}": {
-      "snippet": "multiput(${3:xcoord},${4:ycoord})(${5:xdelta},${6:ydelta}){${1:copies}}{${2:object}}"
-    },
     "negmedspace": {},
     "negthickspace": {},
     "newblock": {},
@@ -264,12 +226,6 @@
       "snippet": "oldstylenums{${1:text}}"
     },
     "onecolumn": {},
-    "oval()": {
-      "snippet": "oval(${1:width},${2:height})"
-    },
-    "oval()[]": {
-      "snippet": "oval(${2:width},${3:height})[${1:portion}]"
-    },
     "pageref*{}": {
       "snippet": "pageref*{${1:label}}"
     },
@@ -290,15 +246,6 @@
     },
     "protect": {},
     "pushtabs": {},
-    "put(){}": {
-      "snippet": "put(${2:xcoord},${3:ycoord}){${1:text}}"
-    },
-    "qbezier()()()": {
-      "snippet": "qbezier(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
-    "qbezier[]()()()": {
-      "snippet": "qbezier[${1:n}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
-    },
     "qbeziermax": {},
     "r{}": {
       "snippet": "r{${1:letter}}"
@@ -475,9 +422,6 @@
       "detail": "⋮",
       "documentation": "VERTICAL ELLIPSIS"
     },
-    "vector(){}": {
-      "snippet": "vector(${2:xslope},${3:yslope}){${1:length}}"
-    },
     "verb": {
       "snippet": "verb|${1:text}|"
     },
@@ -573,7 +517,7 @@
     "filecontents[]{}": {
       "name": "filecontents",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "filecontents*{}": {
@@ -583,7 +527,7 @@
     "filecontents*[]{}": {
       "name": "filecontents*",
       "snippet": "[${2:options}]{${1:file}}",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "flushleft": {},
@@ -622,14 +566,6 @@
       "snippet": "{${1:width}}"
     },
     "normalsize": {},
-    "picture(width,height)": {
-      "name": "picture",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "picture(width,height)(xoffset,yoffset)": {
-      "name": "picture",
-      "snippet": "(${1:width},${2:height})(${3:xoffset},${4:yoffset})"
-    },
     "pmatrix": {},
     "quotation": {},
     "quote": {},
@@ -699,10 +635,6 @@
     "openbib"
   ],
   "keyvals": [
-    [
-      "hashes",
-      "sizes"
-    ],
     [
       "locale=${1:BCP-47 tag}",
       "lang=${1:BCP-47 tag}"
diff --git a/dev/packages/latex2pydata.json b/dev/packages/latex2pydata.json
index 6d02196b0..2fe4728c6 100644
--- a/dev/packages/latex2pydata.json
+++ b/dev/packages/latex2pydata.json
@@ -36,9 +36,6 @@
     "pydatawritevalue{}": {
       "snippet": "pydatawritevalue{${1:value}}"
     },
-    "pydatawritekeyedefvalue{}{}": {
-      "snippet": "pydatawritekeyedefvalue{${1:key}}{${2:value}}"
-    },
     "pydatawritekeyvalue{}{}": {
       "snippet": "pydatawritekeyvalue{${1:key}}{${2:value}}"
     },
@@ -56,9 +53,6 @@
     "pydatabuffervalue{}": {
       "snippet": "pydatabuffervalue{${1:value}}"
     },
-    "pydatabufferkeyedefvalue{}{}": {
-      "snippet": "pydatabufferkeyedefvalue{${1:key}}{${2:value}}"
-    },
     "pydatabufferkeyvalue{}{}": {
       "snippet": "pydatabufferkeyvalue{${1:key}}{${2:value}}"
     },
diff --git a/dev/packages/latexscreenshooter.json b/dev/packages/latexscreenshooter.json
deleted file mode 100644
index ccd16cc66..000000000
--- a/dev/packages/latexscreenshooter.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "includes": {
-    "graphicx": [],
-    "catchfile": []
-  },
-  "macros": {
-    "screenshooter{}{}{}{}{}": {
-      "snippet": "screenshooter{${1:URL}}{${2:width}}{${3:height}}{${4:file name}}{${5:path}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/layout.json b/dev/packages/layout.json
deleted file mode 100644
index 7c12a6335..000000000
--- a/dev/packages/layout.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "layout": {},
-    "layout*": {},
-    "Headertext": {},
-    "Bodytext": {},
-    "Footertext": {},
-    "MarginNotestext": {},
-    "oneinchtext": {},
-    "notshown": {},
-    "LayOuttype{}": {
-      "snippet": "LayOuttype{${1:arg}}"
-    },
-    "LayOutbs": {},
-    "ConvertToCount{}{}": {
-      "snippet": "ConvertToCount{${1:arg1}}{${2:arg2}}"
-    },
-    "SetToHalf{}{}": {
-      "snippet": "SetToHalf{${1:arg1}}{${2:arg2}}"
-    },
-    "SetToQuart{}{}": {
-      "snippet": "SetToQuart{${1:arg1}}{${2:arg2}}"
-    },
-    "Identify{}": {
-      "snippet": "Identify{${1:arg}}"
-    },
-    "InsideHArrow{}": {
-      "snippet": "InsideHArrow{${1:width}}"
-    },
-    "InsideVArrow{}": {
-      "snippet": "InsideVArrow{${1:height}}"
-    },
-    "OutsideHArrow{}{}{}": {
-      "snippet": "OutsideHArrow{${1:right arrow pos}}{${2:length}}{${3:arrow length}}"
-    },
-    "OutsideVArrow{}{}{}": {
-      "snippet": "OutsideVArrow{${1:lower arrow pos}}{${2:length}}{${3:arrow length}}"
-    },
-    "Show{}{}": {
-      "snippet": "Show{${1:arg1}}{${2:arg2}}"
-    },
-    "Type{}{}": {
-      "snippet": "Type{${1:arg1}}{${2:arg2}}"
-    },
-    "oneinch": {},
-    "fheight": {},
-    "Interval": {},
-    "ExtraYPos": {},
-    "PositionX": {},
-    "PositionY": {},
-    "ArrowLength": {}
-  },
-  "envs": {},
-  "options": [
-    "dutch",
-    "german",
-    "ngerman",
-    "english",
-    "french",
-    "francais",
-    "spanish",
-    "portuguese",
-    "brazilian",
-    "italian",
-    "romanian",
-    "japanese",
-    "verbose",
-    "silent",
-    "integers",
-    "reals"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lazylist.json b/dev/packages/lazylist.json
index 6fb0aa5f7..203d580d5 100644
--- a/dev/packages/lazylist.json
+++ b/dev/packages/lazylist.json
@@ -99,7 +99,7 @@
       "snippet": "Commaize{${1:arg1}}{${2:arg2}}"
     },
     "Listize[]": {
-      "snippet": "Listize[${1:a,${2:b},${3:c},...}]"
+      "snippet": "Listize[${1:a,b,c,...}]"
     },
     "Show": {}
   },
diff --git a/dev/packages/lcd.json b/dev/packages/lcd.json
deleted file mode 100644
index 94d3da136..000000000
--- a/dev/packages/lcd.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "DefineLCDchar{}{}": {
-      "snippet": "DefineLCDchar{${1:name}}{${2:binary code}}"
-    },
-    "LCDcolors{}{}": {
-      "snippet": "LCDcolors{${1:textcolor}}{${2:bgcolor}}"
-    },
-    "LCDcolors[]{}{}": {
-      "snippet": "LCDcolors[${3:color}]{${1:color}}{${2:color}}"
-    },
-    "LCDframe": {},
-    "LCDnoframe": {},
-    "textLCD{}": {
-      "snippet": "textLCD{${1:num of chars}}|${2:text}|"
-    },
-    "textLCD[]{}": {
-      "snippet": "textLCD[${2:shift}]{${1:num of chars}}|${3:text}|"
-    },
-    "textLCDcorr": {},
-    "LCDunitlength": {},
-    "filedate": {},
-    "fileversion": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/leading.json b/dev/packages/leading.json
deleted file mode 100644
index 52549b763..000000000
--- a/dev/packages/leading.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "includes": {
-    "calc": []
-  },
-  "macros": {
-    "leading{}": {
-      "snippet": "leading{${1:length}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lhelp.json b/dev/packages/lhelp.json
index c56a40d8d..72b8c546d 100644
--- a/dev/packages/lhelp.json
+++ b/dev/packages/lhelp.json
@@ -238,27 +238,9 @@
     "fparbox{}": {
       "snippet": "fparbox{${1:text}}"
     },
-    "fparbox([]){}": {
-      "snippet": "fparbox(${3:[${2:pos}]}){${1:text}}"
-    },
-    "fparbox([][]){}": {
-      "snippet": "fparbox(${4:[${2:pos}][${3:height}]}){${1:text}}"
-    },
-    "fparbox([][][]){}": {
-      "snippet": "fparbox(${5:[${2:pos}][${3:height}][${4:inner-pos}]}){${1:text}}"
-    },
     "fparbox[]{}": {
       "snippet": "fparbox[${2:width}]{${1:text}}"
     },
-    "fparbox[]([]){}": {
-      "snippet": "fparbox[${2:width}](${4:[${3:pos}]}){${1:text}}"
-    },
-    "fparbox[]([][]){}": {
-      "snippet": "fparbox[${2:width}](${5:[${3:pos}][${4:height}]}){${1:text}}"
-    },
-    "fparbox[]([][][]){}": {
-      "snippet": "fparbox[${2:width}](${6:[${3:pos}][${4:height}][${5:inner-pos}]}){${1:text}}"
-    },
     "xyfparbox{}{}{}": {
       "snippet": "xyfparbox{${1:width}}{${2:height}}{${3:text}}"
     },
diff --git a/dev/packages/lie-hasse.json b/dev/packages/lie-hasse.json
index 8d2949a75..a2d39e748 100644
--- a/dev/packages/lie-hasse.json
+++ b/dev/packages/lie-hasse.json
@@ -2,7 +2,6 @@
   "includes": {
     "xcolor": [],
     "dynkin-diagrams": [],
-    "contour": [],
     "tikzlibrarypositioning": [],
     "tikzlibraryfadings": [],
     "tikzlibraryquotes": []
@@ -46,11 +45,8 @@
     "drawRootAsDynkinSum{}{}": {
       "snippet": "drawRootAsDynkinSum{${1:arg1}}{${2:arg2}}"
     },
-    "edgeQuote{}": {
-      "snippet": "edgeQuote{${1:arg}}"
-    },
-    "forAllPositiveRoots{}": {
-      "snippet": "forAllPositiveRoots{${1:command}}"
+    "forAllPositiveRootsInHasseDiagram{}": {
+      "snippet": "forAllPositiveRootsInHasseDiagram{${1:command}}"
     },
     "studyHasseDiagramOfRootSystem{}{}": {
       "snippet": "studyHasseDiagramOfRootSystem{${1:letter}}{${2:rank}}"
@@ -64,12 +60,21 @@
     "drawRootDecomp{}{}": {
       "snippet": "drawRootDecomp{${1:first-pos}}{${2:second-pos}}"
     },
-    "hasseAttachGtwo": {},
+    "backwardsGtwo": {},
     "attachDynkin": {},
     "doHasseDiagram{}": {
       "snippet": "doHasseDiagram{${1:arg}}"
     },
-    "forscsvlist": {}
+    "forscsvlist": {},
+    "drpo": {},
+    "drmo": {},
+    "tdrpt": {},
+    "maxy": {},
+    "lbl": {},
+    "drmt": {},
+    "iD": {},
+    "xxD": {},
+    "maxxD": {}
   },
   "envs": {},
   "options": [],
@@ -77,7 +82,6 @@
     [
       "edge length=",
       "edge/.style={${1:TikZ options}}",
-      "edge length=",
       "edge quotes/.style={${1:TikZ options}}",
       "compact edge/.style={${1:TikZ options}}",
       "noncompact edge/.style={${1:TikZ options}}",
@@ -90,9 +94,7 @@
       "show ordering",
       "show name",
       "show widths",
-      "show height",
-      "show Levi",
-      "show unipotent radical"
+      "show height"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/liftarm.json b/dev/packages/liftarm.json
index 324948a9b..19b7dec0a 100644
--- a/dev/packages/liftarm.json
+++ b/dev/packages/liftarm.json
@@ -1,5 +1,6 @@
 {
   "includes": {
+    "etoolbox": [],
     "xcolor": [],
     "tikz": [],
     "tikzlibrarycalc": []
@@ -13,26 +14,34 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "liftarmconstruct{}": {
-      "snippet": "liftarmconstruct{${1:commands}}"
+    "liftarmconnect{}{}{}{}": {
+      "snippet": "liftarmconnect{${1:point1}}{${2:length1}}{${3:point2}}{${4:length2}}"
+    },
+    "liftarmconnect[]{}{}{}{}": {
+      "snippet": "liftarmconnect[${5:options}]{${1:point1}}{${2:length1}}{${3:point2}}{${4:length2}}",
+      "keyvalindex": 1,
+      "keyvalpos": 0
+    },
+    "liftarmconstruct{}{}": {
+      "snippet": "liftarmconstruct{${1:text}}{${2:commands}}"
+    },
+    "liftarmconstruct[]{}{}": {
+      "snippet": "liftarmconstruct[${3:TikZ options}]{${1:text}}{${2:commands}}"
     },
-    "liftarmconstructclear": {},
     "liftarmanimate{}{}{}": {
       "snippet": "liftarmanimate{${1:frame rate}}{${2:list}}{${3:commands}}"
     },
     "liftarmanimate[]{}{}{}": {
       "snippet": "liftarmanimate[${4:options}]{${1:frame rate}}{${2:list}}{${3:commands}}",
-      "keyvalindex": 1,
+      "keyvalindex": 2,
       "keyvalpos": 0
     }
   },
   "envs": {
-    "liftarmconnect": {},
-    "liftarmconnect[]": {
-      "name": "liftarmconnect",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
+    "liftarmconstruction": {},
+    "liftarmconstruction[]": {
+      "name": "liftarmconstruction",
+      "snippet": "[${1:TikZ options}]"
     }
   },
   "options": [],
@@ -40,25 +49,58 @@
     [
       "axle holes={${1:values}}",
       "brick",
-      "color={${1:number}}{${2:color}}",
-      "color modulo=${1:number}",
+      "color=",
+      "${1:color}",
+      "color 0=",
+      "color 1=",
+      "color 2=",
+      "color 3=",
+      "color 4=",
+      "color 5=",
+      "color 6=",
+      "color 7=",
+      "color modulo=${1:integer}",
       "contour",
-      "contour style={${1:options}}",
       "coordinate={${1:num1/name1,num2/name2/...}}",
       "hole radius=${1:number}",
-      "liftarm style={${1:options}}",
       "liftarm thickness=${1:number}",
+      "mark color=",
       "mark holes={${1:values}}",
-      "mark radius=${1:factor}",
-      "mark style={${1:options}}",
       "origin=${1:number}",
       "scalefactor=${1:factor}",
-      "screw angle=${1:degrees}",
+      "screw color=",
       "screw holes={${1:values}}",
-      "screw radius=${1:factor}",
-      "screw style={${1:options}}",
-      "trace={${1:num1/numframes1/code1,...}}",
-      "type="
+      "screw holes angle=${1:degrees}"
+    ],
+    [
+      "axle holes={${1:values}}",
+      "brick",
+      "color=",
+      "${1:color}",
+      "color 0=",
+      "color 1=",
+      "color 2=",
+      "color 3=",
+      "color 4=",
+      "color 5=",
+      "color 6=",
+      "color 7=",
+      "color modulo=${1:integer}",
+      "contour",
+      "coordinate={${1:num1/name1,num2/name2/...}}",
+      "hole radius=${1:number}",
+      "liftarm thickness=${1:number}",
+      "mark color=",
+      "mark holes={${1:values}}",
+      "origin=${1:number}",
+      "scalefactor=${1:factor}",
+      "screw color=",
+      "screw holes={${1:values}}",
+      "screw holes angle=${1:degrees}",
+      "connect coordinate=${1:name}",
+      "connect reverse",
+      "liftarm 1={${1:options}}",
+      "liftarm 2={${1:options}}"
     ],
     [
       "label=${1:label}",
@@ -99,30 +141,6 @@
       "begin={${1:begin code}}",
       "end={${1:end code}}",
       "timeline=${1:file}"
-    ],
-    [
-      "axle holes={${1:values}}",
-      "brick",
-      "color={${1:number}}{${2:color}}",
-      "color modulo=${1:number}",
-      "contour",
-      "contour style={${1:options}}",
-      "coordinate={${1:num1/name1,num2/name2/...}}",
-      "hole radius=${1:number}",
-      "liftarm style={${1:options}}",
-      "liftarm thickness=${1:number}",
-      "mark holes={${1:values}}",
-      "mark radius=${1:factor}",
-      "mark style={${1:options}}",
-      "origin=${1:number}",
-      "scalefactor=${1:factor}",
-      "screw angle=${1:degrees}",
-      "screw holes={${1:values}}",
-      "screw radius=${1:factor}",
-      "screw style={${1:options}}",
-      "trace={${1:num1/numframes1/code1,...}}",
-      "type=",
-      "connect stop="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/limap.json b/dev/packages/limap.json
deleted file mode 100644
index ab67f3ae7..000000000
--- a/dev/packages/limap.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "includes": {
-    "longtable": [],
-    "etoolbox": [],
-    "booktabs": []
-  },
-  "macros": {
-    "Block{}": {
-      "snippet": "Block{${1:title}}"
-    },
-    "MapBlockLabelFont": {},
-    "MapParskip": {},
-    "MapTitleFraction": {},
-    "MapTextFraction": {},
-    "MapRuleWidth": {},
-    "MapRuleStart": {},
-    "WideBlock{}": {
-      "snippet": "WideBlock{${1:content}}"
-    },
-    "MapFont": {},
-    "MapTitleFont": {},
-    "MapContinued": {},
-    "MapContinuing": {},
-    "MapTitleContinuedFont": {},
-    "MapNewpage": {},
-    "MapTOC{}": {
-      "snippet": "MapTOC{${1:text}}"
-    },
-    "MapTableOfContents": {},
-    "MapTableOfContentsStyle": {},
-    "MapBlockStartHook{}": {
-      "snippet": "MapBlockStartHook{${1:code}}"
-    },
-    "MapBlockTOC{}": {
-      "snippet": "MapBlockTOC{${1:text}}"
-    },
-    "MapTabularFraction": {},
-    "MapTOCname": {},
-    "MapTOCpage": {},
-    "filename": {},
-    "fileversion": {},
-    "filedate": {},
-    "docversion": {},
-    "docdate": {},
-    "defineLimapLanguage{}{}{}{}{}": {
-      "snippet": "defineLimapLanguage{${1:name}}{${2:continued}}{${3:continuing}}{${4:TOCname}}{${5:TOCpage}}"
-    },
-    "MapContinuingFormat{}": {
-      "snippet": "MapContinuingFormat{${1:text}}"
-    },
-    "MapContinuedFormat{}": {
-      "snippet": "MapContinuedFormat{${1:text}}"
-    },
-    "MapTOCheadfont": {},
-    "MakeTitle": {}
-  },
-  "envs": {
-    "Map{}": {
-      "name": "Map",
-      "snippet": "{${1:title}}"
-    },
-    "MapTabular{}": {
-      "name": "MapTabular",
-      "snippet": "{${1:preamble}}"
-    },
-    "Abstract": {}
-  },
-  "options": [
-    "austrian",
-    "german",
-    "french",
-    "english",
-    "USenglish",
-    "nonstrict",
-    "nolines"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/linearregression.json b/dev/packages/linearregression.json
deleted file mode 100644
index 174263bcc..000000000
--- a/dev/packages/linearregression.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "includes": {
-    "pict2e": []
-  },
-  "macros": {
-    "lrfilename{}": {
-      "snippet": "lrfilename{${1:file}}"
-    },
-    "lraskfilename": {},
-    "lrcomputation": {},
-    "lrprint": {},
-    "lrplot{}{}{}{}{}": {
-      "snippet": "lrplot{${1:width}}{${2:key1}}{${3:key2}}{${4:key3}}{${5:key4}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lineno.json b/dev/packages/lineno.json
deleted file mode 100644
index ca1ab3d15..000000000
--- a/dev/packages/lineno.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "kvoptions": [],
-    "vplref": [
-      "addpageno"
-    ],
-    "ednmath0": [
-      "mathrefs"
-    ],
-    "edtable": [
-      "edtable",
-      "longtable",
-      "nolongtablepatch"
-    ],
-    "longtable": [
-      "longtable",
-      "nolongtablepatch"
-    ],
-    "ltabptch": [
-      "longtable"
-    ]
-  },
-  "macros": {
-    "linenumbers": {},
-    "linenumbers*": {},
-    "linenumbers[]": {
-      "snippet": "linenumbers[${1:number}]"
-    },
-    "nolinenumbers": {},
-    "resetlinenumber": {},
-    "resetlinenumber[]": {
-      "snippet": "resetlinenumber[${1:number}]"
-    },
-    "setrunninglinenumbers": {},
-    "runninglinenumbers": {},
-    "runninglinenumbers*": {},
-    "runninglinenumbers[]": {
-      "snippet": "runninglinenumbers[${1:number}]"
-    },
-    "setpagewiselinenumbers": {},
-    "pagewiselinenumbers": {},
-    "switchlinenumbers": {},
-    "switchlinenumbers*": {},
-    "runningpagewiselinenumbers": {},
-    "realpagewiselinenumbers": {},
-    "leftlinenumbers": {},
-    "rightlinenumbers": {},
-    "leftlinenumbers*": {},
-    "rightlinenumbers*": {},
-    "modulolinenumbers": {},
-    "modulolinenumbers*": {},
-    "modulolinenumbers[]": {
-      "snippet": "modulolinenumbers[${1:n}]"
-    },
-    "linenumberfont": {},
-    "linenumbersep": {},
-    "linenumberwidth": {},
-    "thelinenumber": {},
-    "makeLineNumber": {},
-    "LineNumber": {},
-    "makeLineNumberRunning": {},
-    "makeLineNumberOdd": {},
-    "makeLineNumberEven": {},
-    "makeLineNumberLeft": {},
-    "makeLineNumberRight": {},
-    "linelabel{}": {
-      "snippet": "linelabel{${1:label}}"
-    },
-    "lineref{}": {
-      "snippet": "lineref{${1:label}}"
-    },
-    "lineref[]{}": {
-      "snippet": "lineref[${2:offset}]{${1:label}}"
-    },
-    "linerefr{}": {
-      "snippet": "linerefr{${1:label}}"
-    },
-    "linerefr[]{}": {
-      "snippet": "linerefr[${2:offset}]{${1:label}}"
-    },
-    "linerefp{}": {
-      "snippet": "linerefp{${1:label}}"
-    },
-    "linerefp[]{}": {
-      "snippet": "linerefp[${2:offset}]{${1:label}}"
-    },
-    "quotelinenumbers": {},
-    "quotelinenumbersep": {},
-    "quotelinenumberfont": {},
-    "numquotelist": {},
-    "internallinenumbers": {},
-    "bframesep": {},
-    "bframerule": {},
-    "bframebox": {},
-    "stepLineNumber": {},
-    "linenopenalty": {},
-    "linenopenaltypar": {},
-    "LineNoTest": {},
-    "LineNoLaTeXOutput": {},
-    "MakeLineNo": {},
-    "WriteLineNo": {},
-    "PassVadjustList": {},
-    "linenoprevgraf": {},
-    "linenumberpar": {},
-    "ifLineNumbers": {},
-    "LineNumbersfalse": {},
-    "LineNumberstrue": {},
-    "endrunninglinenumbers": {},
-    "endpagewiselinenumbers": {},
-    "endnolinenumbers": {},
-    "linenomath": {},
-    "linenomathNonumbers": {},
-    "linenomathWithnumbers": {},
-    "linenumberdisplaymath": {},
-    "nolinenumberdisplaymath": {},
-    "endlinenomath": {},
-    "theLineNumber": {},
-    "setmakelinenumbers{}": {
-      "snippet": "setmakelinenumbers{${1:arg}}"
-    },
-    "logtheLineNumber": {},
-    "LastNumberedPage": {},
-    "lastLN": {},
-    "firstLN": {},
-    "pageLN": {},
-    "nextLN": {},
-    "NumberedPageCache": {},
-    "testLastNumberedPage{}": {
-      "snippet": "testLastNumberedPage{${1:arg}}"
-    },
-    "testFirstNumberedPage{}": {
-      "snippet": "testFirstNumberedPage{${1:arg}}"
-    },
-    "testNumberedPage": {},
-    "testNextNumberedPage{}": {
-      "snippet": "testNextNumberedPage{${1:arg}}"
-    },
-    "getLineNumber": {},
-    "ifoddNumberedPage": {},
-    "oddNumberedPagetrue": {},
-    "oddNumberedPagefalse": {},
-    "ifcolumnwiselinenumbers": {},
-    "columnwiselinenumberstrue": {},
-    "columnwiselinenumbersfalse": {},
-    "gotNumberedPage{}{}{}{}": {
-      "snippet": "gotNumberedPage{${1:first line in col}}{${2:page num}}{${3:col num}}{${4:first line in page}}"
-    },
-    "subtractlinenumberoffset{}": {
-      "snippet": "subtractlinenumberoffset{${1:arg}}"
-    },
-    "thePagewiseLineNumber": {},
-    "makePagewiseLineNumber": {},
-    "getpagewiselinenumber{}": {
-      "snippet": "getpagewiselinenumber{${1:arg}}"
-    },
-    "themodulolinenumber": {},
-    "firstlinenumber{}": {
-      "snippet": "firstlinenumber{${1:number}}"
-    },
-    "endinternallinenumbers": {},
-    "internallinenumberpar": {},
-    "makeinternalLinenumbers": {},
-    "PostponeVadjust{}": {
-      "snippet": "PostponeVadjust{${1:arg}}"
-    }
-  },
-  "envs": {
-    "linenumbers": {},
-    "linenumbers[]": {
-      "name": "linenumbers",
-      "snippet": "[${1:number}]"
-    },
-    "linenumbers*": {},
-    "runninglinenumbers": {},
-    "runninglinenumbers[]": {
-      "name": "runninglinenumbers",
-      "snippet": "[${1:number}]"
-    },
-    "runninglinenumbers*": {},
-    "pagewiselinenumbers": {},
-    "linenomath": {},
-    "linenomath*": {},
-    "numquote": {},
-    "numquote*": {},
-    "numquotation": {},
-    "numquotation*": {},
-    "bframe": {},
-    "internallinenumbers": {},
-    "internallinenumbers*": {}
-  },
-  "options": [
-    "addpageno",
-    "mathrefs",
-    "edtable",
-    "longtable",
-    "nolongtablepatch",
-    "left",
-    "right",
-    "switch",
-    "switch*",
-    "columnwise",
-    "pagewise",
-    "running",
-    "modulo",
-    "modulo*",
-    "mathlines",
-    "sep=",
-    "width="
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lipsum.json b/dev/packages/lipsum.json
deleted file mode 100644
index b2b362285..000000000
--- a/dev/packages/lipsum.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": []
-  },
-  "macros": {
-    "lipsum": {},
-    "lipsum[]": {
-      "snippet": "lipsum[${1:num-num}]"
-    },
-    "lipsum[][]": {
-      "snippet": "lipsum[${1:num-num}][${2:num-num}]"
-    },
-    "lipsum*": {},
-    "lipsum*[]": {
-      "snippet": "lipsum*[${1:num-num}]"
-    },
-    "lipsum*[][]": {
-      "snippet": "lipsum*[${1:num-num}][${2:num-num}]"
-    },
-    "unpacklipsum": {},
-    "unpacklipsum[]": {
-      "snippet": "unpacklipsum[${1:num}]"
-    },
-    "unpacklipsum*": {},
-    "unpacklipsum*[]": {
-      "snippet": "unpacklipsum*[${1:num}]"
-    },
-    "lipsumexp": {},
-    "setlipsum{}": {
-      "snippet": "setlipsum{${1:keyvals}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "SetLipsumText{}": {
-      "snippet": "SetLipsumText{${1:lipsum text definition filename}}"
-    },
-    "SetLipsumDefault{}": {
-      "snippet": "SetLipsumDefault{${1:num-num}}"
-    },
-    "LipsumPar{}": {
-      "snippet": "LipsumPar{${1:num}}"
-    },
-    "SetLipsumParListStart{}": {
-      "snippet": "SetLipsumParListStart{${1:tokens}}"
-    },
-    "SetLipsumParListStart*{}": {
-      "snippet": "SetLipsumParListStart*{${1:tokens}}"
-    },
-    "SetLipsumParListEnd{}": {
-      "snippet": "SetLipsumParListEnd{${1:tokens}}"
-    },
-    "SetLipsumParListEnd*{}": {
-      "snippet": "SetLipsumParListEnd*{${1:tokens}}"
-    },
-    "SetLipsumSentenceListStart{}": {
-      "snippet": "SetLipsumSentenceListStart{${1:tokens}}"
-    },
-    "SetLipsumSentenceListStart*{}": {
-      "snippet": "SetLipsumSentenceListStart*{${1:tokens}}"
-    },
-    "SetLipsumSentenceListEnd{}": {
-      "snippet": "SetLipsumSentenceListEnd{${1:tokens}}"
-    },
-    "SetLipsumSentenceListEnd*{}": {
-      "snippet": "SetLipsumSentenceListEnd*{${1:tokens}}"
-    },
-    "SetLipsumParListSurrounders{}{}": {
-      "snippet": "SetLipsumParListSurrounders{${1:start}}{${2:end}}"
-    },
-    "SetLipsumParListSurrounders*{}{}": {
-      "snippet": "SetLipsumParListSurrounders*{${1:start}}{${2:end}}"
-    },
-    "SetLipsumSentenceListSurrounders{}{}": {
-      "snippet": "SetLipsumSentenceListSurrounders{${1:start}}{${2:end}}"
-    },
-    "SetLipsumSentenceListSurrounders*{}{}": {
-      "snippet": "SetLipsumSentenceListSurrounders*{${1:start}}{${2:end}}"
-    },
-    "SetLipsumParListItemStart{}": {
-      "snippet": "SetLipsumParListItemStart{${1:tokens}}"
-    },
-    "SetLipsumParListItemStart*{}": {
-      "snippet": "SetLipsumParListItemStart*{${1:tokens}}"
-    },
-    "SetLipsumParListItemEnd{}": {
-      "snippet": "SetLipsumParListItemEnd{${1:tokens}}"
-    },
-    "SetLipsumParListItemEnd*{}": {
-      "snippet": "SetLipsumParListItemEnd*{${1:tokens}}"
-    },
-    "SetLipsumSentenceListItemStart{}": {
-      "snippet": "SetLipsumSentenceListItemStart{${1:tokens}}"
-    },
-    "SetLipsumSentenceListItemStart*{}": {
-      "snippet": "SetLipsumSentenceListItemStart*{${1:tokens}}"
-    },
-    "SetLipsumSentenceListItemEnd{}": {
-      "snippet": "SetLipsumSentenceListItemEnd{${1:tokens}}"
-    },
-    "SetLipsumSentenceListItemEnd*{}": {
-      "snippet": "SetLipsumSentenceListItemEnd*{${1:tokens}}"
-    },
-    "SetLipsumParListItemSurrounders{}{}": {
-      "snippet": "SetLipsumParListItemSurrounders{${1:start}}{${2:end}}"
-    },
-    "SetLipsumParListItemSurrounders*{}{}": {
-      "snippet": "SetLipsumParListItemSurrounders*{${1:start}}{${2:end}}"
-    },
-    "SetLipsumSentenceListItemSurrounders{}{}": {
-      "snippet": "SetLipsumSentenceListItemSurrounders{${1:start}}{${2:end}}"
-    },
-    "SetLipsumSentenceListItemSurrounders*{}{}": {
-      "snippet": "SetLipsumSentenceListItemSurrounders*{${1:start}}{${2:end}}"
-    },
-    "SetLipsumParListItemSeparator{}": {
-      "snippet": "SetLipsumParListItemSeparator{${1:tokens}}"
-    },
-    "SetLipsumParListItemSeparator*{}": {
-      "snippet": "SetLipsumParListItemSeparator*{${1:tokens}}"
-    },
-    "SetLipsumSentenceListItemSeparator{}": {
-      "snippet": "SetLipsumSentenceListItemSeparator{${1:tokens}}"
-    },
-    "SetLipsumSentenceListItemSeparator*{}": {
-      "snippet": "SetLipsumSentenceListItemSeparator*{${1:tokens}}"
-    },
-    "LipsumProtect{}": {
-      "snippet": "LipsumProtect{${1:tokens}}"
-    },
-    "LipsumRestoreParList": {},
-    "LipsumRestoreSentenceList": {},
-    "LipsumRestoreAll": {},
-    "NewLipsumPar{}": {
-      "snippet": "NewLipsumPar{${1:paragrph}}"
-    },
-    "SetLipsumLanguage{}": {
-      "snippet": "SetLipsumLanguage{${1:language}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "nopar",
-      "text=",
-      "language=${1:language}",
-      "auto-lang",
-      "default-range=${1:i-j}",
-      "par-before=${1:tokens}",
-      "par-begin=${1:tokens}",
-      "par-sep=${1:tokens}",
-      "par-end=${1:tokens}",
-      "par-after=${1:tokens}",
-      "sentence-before=${1:tokens}",
-      "sentence-begin=${1:tokens}",
-      "sentence-sep=${1:tokens}",
-      "sentence-end=${1:tokens}",
-      "sentence-after=${1:tokens}",
-      "par-before*=${1:tokens}",
-      "par-begin*=${1:tokens}",
-      "par-sep*=${1:tokens}",
-      "par-end*=${1:tokens}",
-      "par-after*=${1:tokens}",
-      "sentence-before*=${1:tokens}",
-      "sentence-begin*=${1:tokens}",
-      "sentence-sep*=${1:tokens}",
-      "sentence-end*=${1:tokens}",
-      "sentence-after*=${1:tokens}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/listing.json b/dev/packages/listing.json
deleted file mode 100644
index 4b07bc579..000000000
--- a/dev/packages/listing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "listoflistings": {},
-    "listingname": {},
-    "listlistingname": {},
-    "thelisting": {},
-    "filename": {},
-    "fileversion": {},
-    "filedate": {}
-  },
-  "envs": {
-    "listing": {}
-  },
-  "options": [
-    "bigcaptions"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/listings.json b/dev/packages/listings.json
deleted file mode 100644
index a41539139..000000000
--- a/dev/packages/listings.json
+++ /dev/null
@@ -1,344 +0,0 @@
-{
-  "includes": {
-    "keyval": []
-  },
-  "macros": {
-    "lstloadlanguages{}": {
-      "snippet": "lstloadlanguages{${1:lang1,${2:lang2},...}}"
-    },
-    "lstset{}": {
-      "snippet": "lstset{${1:keyvals}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "lstinline": {
-      "snippet": "lstinline|${1:code}|"
-    },
-    "lstinline[]": {
-      "snippet": "lstinline[${1:options}]|${2:code}|",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "lstinline[]{}": {
-      "snippet": "lstinline[${2:options}]{${1:verbatimSymbol}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "lstinputlisting{}": {
-      "snippet": "lstinputlisting{${1:file}}"
-    },
-    "lstinputlisting[]{}": {
-      "snippet": "lstinputlisting[${2:options}]{${1:file}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "lstdefinestyle{}{}": {
-      "snippet": "lstdefinestyle{${1:style name}}{${2:keyvals}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "thelstnumber": {},
-    "theHlstnumber": {},
-    "thelstlabel": {},
-    "lstlistoflistings": {},
-    "lstlistlistingname": {},
-    "lstlistingname": {},
-    "lstlistingnamestyle": {},
-    "thelstlisting": {},
-    "lstname": {},
-    "lstindexmacro{}": {
-      "snippet": "lstindexmacro{${1:arg}}"
-    },
-    "lstnewenvironment{}[][]{}{}": {
-      "snippet": "lstnewenvironment{${1:envname}}[${2:args}][${3:default}]{${4:begdef}}{${5:enddef}}"
-    },
-    "lstnewenvironment{}[]{}{}": {
-      "snippet": "lstnewenvironment{${1:envname}}[${2:args}]{${3:begdef}}{${4:enddef}}"
-    },
-    "lstnewenvironment{}{}{}": {
-      "snippet": "lstnewenvironment{${1:envname}}{${2:begdef}}{${3:enddef}}"
-    },
-    "lstdefinelanguage{}{}": {
-      "snippet": "lstdefinelanguage{${1:language name}}{${2:keyvals}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "lstdefinelanguage{}{}[]": {
-      "snippet": "lstdefinelanguage{${1:language name}}{${2:keyvals}}[${3:required aspects}]",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "lstdefinelanguage[]{}{}": {
-      "snippet": "lstdefinelanguage[${3:dialect}]{${1:language name}}{${2:keyvals}}",
-      "keyvalindex": 1,
-      "keyvalpos": 2
-    },
-    "lstdefinelanguage[]{}{}[]": {
-      "snippet": "lstdefinelanguage[${3:dialect}]{${1:language name}}{${2:keyvals}}[${4:required aspects}]",
-      "keyvalindex": 1,
-      "keyvalpos": 2
-    },
-    "lstdefinelanguage[]{}[]{}{}[]": {
-      "snippet": "lstdefinelanguage[${4:dialect}]{${1:language name}}[${5:base dialect}]{${2:base language}}{${3:keyvals}}[${6:required aspects}]",
-      "keyvalindex": 1,
-      "keyvalpos": 4
-    },
-    "lstalias{}{}": {
-      "snippet": "lstalias{${1:alias}}{${2:language}}"
-    },
-    "lstaspectfiles": {},
-    "lstlanguagefiles": {},
-    "lstloadaspects{}": {
-      "snippet": "lstloadaspects{${1:aspects}}"
-    },
-    "lststylefiles": {},
-    "theHlstlisting": {},
-    "lstlgrindeffile": {
-      "option": "lgrind"
-    },
-    "lstdefineformat{}{}": {
-      "snippet": "lstdefineformat{${1:name}}{${2:format}}",
-      "option": "formats"
-    },
-    "lstformatfiles": {
-      "option": "formats"
-    }
-  },
-  "envs": {
-    "lstlisting": {},
-    "lstlisting[]": {
-      "name": "lstlisting",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [
-    "draft",
-    "final",
-    "savemem",
-    "noaspects",
-    "lgrind",
-    "procnames",
-    "hyper",
-    "formats",
-    "0.21"
-  ],
-  "keyvals": [
-    [
-      "inputpath=${1:path}",
-      "aboveskip=",
-      "belowskip=",
-      "lineskip=",
-      "boxpos=",
-      "print",
-      "showlines",
-      "emptylines=${1:number}",
-      "emptylines=*${1:number}",
-      "gobble=${1:number}",
-      "style=${1:style name}",
-      "language=${1:language}",
-      "language=[${1:dialect}]${2:language}",
-      "alsolanguage=${1:language}",
-      "alsolanguage=[${1:dialect}]${2:language}",
-      "defaultdialect=[${1:dialect}]${2:language}",
-      "printpod",
-      "usekeywordsintag",
-      "tagstyle=${1:style}",
-      "markfirstintag=${1:style}",
-      "makemacrouse",
-      "basicstyle=${1:style}",
-      "identifierstyle=${1:style}",
-      "commentstyle=${1:style}",
-      "stringstyle=${1:style}",
-      "keywordstyle=${1:style}",
-      "keywordstyle=*${1:style}",
-      "keywordstyle=[${1:number}]${2:style}",
-      "keywordstyle=[${1:number}]*${2:style}",
-      "ndkeywordstyle=${1:style}",
-      "classoffset=${1:number}",
-      "texcsstyle=${1:style}",
-      "texcsstyle=*${1:style}",
-      "texcsstyle=[${1:class number}]${2:style}",
-      "texcsstyle=*[${1:class number}]${2:style}",
-      "directivestyle=${1:style}",
-      "emph={${1:identifier list}}",
-      "emph=[${1:number}]{${2:identifier list}}",
-      "moreemph={${1:identifier list}}",
-      "moreemph=[${1:number}]{${2:identifier list}}",
-      "deleteemph={${1:identifier list}}",
-      "deleteemph=[${1:number}]{${2:identifier list}}",
-      "emphstyle={${1:style}}",
-      "emphstyle=[${1:number}]{${2:style}}",
-      "delim=[${1:type}][${2:style}]${3:delimiters}",
-      "delim=*[${1:type}][${2:style}]${3:delimiters}",
-      "delim=**[${1:type}][${2:style}]${3:delimiters}",
-      "moredelim=[${1:type}][${2:style}]${3:delimiters}",
-      "moredelim=*[${1:type}][${2:style}]${3:delimiters}",
-      "moredelim=**[${1:type}][${2:style}]${3:delimiters}",
-      "deletedelim=[${1:type}][${2:style}]${3:delimiters}",
-      "deletedelim=*[${1:type}][${2:style}]${3:delimiters}",
-      "deletedelim=**[${1:type}][${2:style}]${3:delimiters}",
-      "extendedchars",
-      "inputencoding=${1:encoding}",
-      "upquote",
-      "tabsize=${1:number}",
-      "showtabs",
-      "tab=${1:tokens}",
-      "showspaces",
-      "showstringspaces",
-      "formfeed=${1:tokens}",
-      "numbers=",
-      "stepnumber=${1:number}",
-      "numberfirstline",
-      "numberstyle=${1:style}",
-      "numbersep=",
-      "numberblanklines",
-      "firstnumber=${1:auto|last|<number>}",
-      "name=${1:name}",
-      "title=${1:title text}",
-      "caption={${1:caption text}}",
-      "caption={[${1:short}]${2:caption text}}",
-      "label=",
-      "nolol",
-      "numberbychapter",
-      "captionpos=${1:subset of tb}",
-      "abovecaptionskip=",
-      "belowcaptionskip=",
-      "linewidth=",
-      "xleftmargin=",
-      "xrightmargin=",
-      "resetmargins",
-      "breaklines",
-      "breakatwhitespace",
-      "prebreak=${1:tokens}",
-      "postbreak=${1:tokens}",
-      "breakindent=",
-      "breakautoindent",
-      "frame=${1:type}",
-      "frameround=",
-      "framesep=",
-      "rulesep=",
-      "framerule=",
-      "framexleftmargin=",
-      "framexrightmargin=",
-      "framextopmargin=",
-      "framexbottommargin=",
-      "backgroundcolor=",
-      "rulecolor=",
-      "fillcolor=",
-      "rulesepcolor=",
-      "frameshape={${1:top shape}}{${2:left shape}}{${3:right shape}}{${4:bottom shape}}",
-      "index={${1:identifiers}}",
-      "index=[${1:number}]{${2:identifiers}}",
-      "index=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
-      "moreindex={${1:identifiers}}",
-      "moreindex=[${1:number}]{${2:identifiers}}",
-      "moreindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
-      "deleteindex={${1:identifiers}}",
-      "deleteindex=[${1:number}]{${2:identifiers}}",
-      "deleteindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
-      "indexstyle=${1:one-parameter macro}",
-      "indexstyle=[${1:number}]${2:one-parameter macro}",
-      "columns=${1:alignment}",
-      "columns=[${1:c|l|r}]${2:alignment}",
-      "flexiblecolumns",
-      "keepspaces",
-      "basewidth=",
-      "fontadjust",
-      "texcl",
-      "mathescape",
-      "escapechar=${1:character}",
-      "escapeinside=${1:<char1><char2>}",
-      "escapebegin=${1:tokens}",
-      "escapeend=${1:tokens}",
-      "fancyvrb",
-      "fvcmdparams=${1:<cmd1> <num1> ...}",
-      "morefvcmdparams=${1:<cmd1> <num1> ...}",
-      "literate={${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
-      "literate=*{${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
-      "rangebeginprefix=${1:prefix}",
-      "rangebeginsuffix=${1:suffix}",
-      "rangeendprefix=${1:prefix}",
-      "rangeendsuffix=${1:suffix}",
-      "rangeprefix=${1:prefix}",
-      "rangesuffix=${1:suffix}",
-      "includerangemarker",
-      "multicols=${1:number}",
-      "float",
-      "float=${1:subset of tbph}",
-      "float=*${1:subset of tbph}",
-      "floatplacement=${1:place specifiers}",
-      "firstline=${1:number}",
-      "lastline=${1:number}",
-      "linerange={${1:first1-last1,first2-last2,...}}",
-      "consecutivenumbers",
-      "keywordsprefix=${1:prefix}",
-      "keywords={${1:list of keywords}}",
-      "keywords=[${1:number}]{${2:list of keywords}}",
-      "morekeywords={${1:list of keywords}}",
-      "morekeywords=[${1:number}]{${2:list of keywords}}",
-      "deletekeywords={${1:list of keywords}}",
-      "deletekeywords=[${1:number}]{${2:list of keywords}}",
-      "ndkeywords={${1:list of keywords}}",
-      "moreendkeywords={${1:list of keywords}}",
-      "deleteendkeywords={${1:list of keywords}}",
-      "texcs={${1:list of csnames}}",
-      "texcs=[${1:class number}]{${2:list of csnames}}",
-      "moretexcs={${1:list of csnames}}",
-      "moretexcs=[${1:class number}]{${2:list of csnames}}",
-      "deletetexcs={${1:list of csnames}}",
-      "deletetexcs=[${1:class number}]{${2:list of csnames}}",
-      "directives={${1:list of compiler directives}}",
-      "moredirectives={${1:list of compiler directives}}",
-      "deletedirectives={${1:list of compiler directives}}",
-      "sensitive",
-      "alsoletter={${1:character sequence}}",
-      "alsodigit={${1:character sequence}}",
-      "alsoother={${1:character sequence}}",
-      "otherkeywords={${1:keywords}}",
-      "tag=${1:<char1><char2>}",
-      "string=${1:delimiter}",
-      "string=[${1:b|d|m|bd|s}]${2:delimiter}",
-      "morestring=${1:delimiter}",
-      "morestring=[${1:b|d|m|bd|s}]${2:delimiter}",
-      "deletestring=${1:delimiter}",
-      "deletestring=[${1:b|d|m|bd|s}]${2:delimiter}",
-      "comment=${1:delimiter(s)}",
-      "comment=[${1:type}]${2:delimiter(s)}",
-      "morecomment=${1:delimiter(s)}",
-      "morecomment=[${1:type}]${2:delimiter(s)}",
-      "deletecomment=${1:delimiter(s)}",
-      "deletecomment=[${1:type}]${2:delimiter(s)}",
-      "keywordcomment={${1:keywords}}",
-      "morekeywordcomment={${1:keywords}}",
-      "deletekeywordcomment={${1:keywords}}",
-      "keywordcommentsemicolon={${1:keywords}}{${2:keywords}}{${3:keywords}}",
-      "podcomment",
-      "procnamekeys={${1:keywords}}",
-      "moreprocnamekeys={${1:keywords}}",
-      "deleteprocnamekeys={${1:keywords}}",
-      "procnamestyle=${1:style}",
-      "indexprocnames",
-      "hyperref={${1:identifiers}}",
-      "morehyperref={${1:identifiers}}",
-      "deletehyperref={${1:identifiers}}",
-      "hyperanchor=${1:two-parameter macro}",
-      "hyperlink=${1:two-parameter macro}",
-      "lgrindef=${1:language}"
-    ],
-    [
-      "procnamekeys={${1:keywords}}",
-      "moreprocnamekeys={${1:keywords}}",
-      "deleteprocnamekeys={${1:keywords}}",
-      "procnamestyle=${1:style}",
-      "indexprocnames",
-      "hyperref={${1:identifiers}}",
-      "morehyperref={${1:identifiers}}",
-      "deletehyperref={${1:identifiers}}",
-      "hyperanchor=${1:two-parameter macro}",
-      "hyperlink=${1:two-parameter macro}",
-      "lgrindef=${1:language}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/listingsutf8.json b/dev/packages/listingsutf8.json
deleted file mode 100644
index 2b4d4ce94..000000000
--- a/dev/packages/listingsutf8.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "includes": {
-    "listings": [],
-    "inputenc": [],
-    "pdftexcmds": [],
-    "stringenc": []
-  },
-  "macros": {
-    "lstlgrindeffile": {
-      "option": "lgrind"
-    },
-    "lstdefineformat{}{}": {
-      "snippet": "lstdefineformat{${1:name}}{${2:format}}",
-      "option": "formats"
-    }
-  },
-  "envs": {},
-  "options": [
-    "draft",
-    "final",
-    "savemem",
-    "noaspects",
-    "lgrind",
-    "procnames",
-    "hyper",
-    "formats",
-    "0.21"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lltjext.json b/dev/packages/lltjext.json
index 9df86a778..92c203673 100644
--- a/dev/packages/lltjext.json
+++ b/dev/packages/lltjext.json
@@ -46,15 +46,6 @@
     "layoutfloat[]{}": {
       "snippet": "layoutfloat[${2:pos}]{${1:content}}"
     },
-    "layoutfloat(){}": {
-      "snippet": "layoutfloat(${2:x},${3:y}){${1:content}}"
-    },
-    "layoutfloat()[]{}": {
-      "snippet": "layoutfloat(${3:x},${4:y})[${2:pos}]{${1:content}}"
-    },
-    "DeclareLayoutCaption{}<>()[]": {
-      "snippet": "DeclareLayoutCaption{${1:floatname}}<${3:dir}>(${4:width})[${2:pos1pos2}]"
-    },
     "layoutcaption": {},
     "pcaption{}": {
       "snippet": "pcaption{${1:caption}}"
@@ -130,14 +121,6 @@
     "minipage<>[][][]{}": {
       "name": "minipage",
       "snippet": "<${5:dir}>[${2:position}][${3:height}][${4:inner pos}]{${1:width}}"
-    },
-    "picture<>(width,height)": {
-      "name": "picture",
-      "snippet": "<${1:dir}>(${2:width},${3:height})"
-    },
-    "picture<>(width,height)(xoffset,yoffset)": {
-      "name": "picture",
-      "snippet": "<${1:dir}>(${2:width},${3:height})(${4:xoffset},${5:yoffset})"
     }
   },
   "options": [],
diff --git a/dev/packages/lmodern.json b/dev/packages/lmodern.json
deleted file mode 100644
index 0dcc79111..000000000
--- a/dev/packages/lmodern.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {},
-  "options": [
-    "nomath",
-    "variablett",
-    "lighttt"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/logicpuzzle.json b/dev/packages/logicpuzzle.json
index 1f2cfdeec..0b295ad85 100644
--- a/dev/packages/logicpuzzle.json
+++ b/dev/packages/logicpuzzle.json
@@ -20,7 +20,7 @@
       "snippet": "setcell{${1:column}}{${2:row}}{${3:element}}"
     },
     "setcells{}{}": {
-      "snippet": "setcells{${1:col1/row1,${3:col2/row2},...}}{${2:element}}"
+      "snippet": "setcells{${1:col1/row1,col2/row2,...}}{${2:element}}"
     },
     "setbigcell{}{}{}": {
       "snippet": "setbigcell{${1:column}}{${2:row}}{${3:element}}"
@@ -73,7 +73,7 @@
       "snippet": "tikzpath{${1:column}}{${2:row}}{${3:direction list}}"
     },
     "xtikzpath{}{}{}": {
-      "snippet": "xtikzpath{${1:column}}{${2:row}}{${3:dir1/len1,${4:dir2/len2},...}}"
+      "snippet": "xtikzpath{${1:column}}{${2:row}}{${3:dir1/len1,dir2/len2,...}}"
     },
     "titleformat{}": {
       "snippet": "titleformat{${1:format}}"
@@ -298,16 +298,16 @@
       "snippet": "magnetsV{${1:number list}}"
     },
     "PMH{}": {
-      "snippet": "PMH{${1:col1/row1,${2:col2/row2},...}}"
+      "snippet": "PMH{${1:col1/row1,col2/row2,...}}"
     },
     "MPH{}": {
-      "snippet": "MPH{${1:col1/row1,${2:col2/row2},...}}"
+      "snippet": "MPH{${1:col1/row1,col2/row2,...}}"
     },
     "PMV{}": {
-      "snippet": "PMV{${1:col1/row1,${2:col2/row2},...}}"
+      "snippet": "PMV{${1:col1/row1,col2/row2,...}}"
     },
     "MPV{}": {
-      "snippet": "MPV{${1:col1/row1,${2:col2/row2},...}}"
+      "snippet": "MPV{${1:col1/row1,col2/row2,...}}"
     },
     "magnetssetup{}": {
       "snippet": "magnetssetup{${1:options}}",
@@ -334,10 +334,10 @@
       "keyvalpos": 0
     },
     "nonogramrow{}{}": {
-      "snippet": "nonogramrow{${1:row}}{${2:col1/len1,${3:col2/len2},...}}"
+      "snippet": "nonogramrow{${1:row}}{${2:col1/len1,col2/len2,...}}"
     },
     "nonogramcolumn{}{}": {
-      "snippet": "nonogramcolumn{${1:column}}{${2:row1/len1,${3:row2/len2},...}}"
+      "snippet": "nonogramcolumn{${1:column}}{${2:row1/len1,row2/len2,...}}"
     },
     "nonogramV{}": {
       "snippet": "nonogramV{${1:csv list}}"
diff --git a/dev/packages/logpap.json b/dev/packages/logpap.json
index 9d97971f1..18441b4c4 100644
--- a/dev/packages/logpap.json
+++ b/dev/packages/logpap.json
@@ -9,42 +9,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "loglinpap()(){}{}": {
-      "snippet": "loglinpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
-    },
-    "loglinpap()(){}{}[]": {
-      "snippet": "loglinpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
-    },
-    "loglinpap()(){}{}[][]": {
-      "snippet": "loglinpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
-    },
-    "linlogpap()(){}{}": {
-      "snippet": "linlogpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
-    },
-    "linlogpap()(){}{}[]": {
-      "snippet": "linlogpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
-    },
-    "linlogpap()(){}{}[][]": {
-      "snippet": "linlogpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
-    },
-    "loglogpap()(){}{}": {
-      "snippet": "loglogpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
-    },
-    "loglogpap()(){}{}[]": {
-      "snippet": "loglogpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
-    },
-    "loglogpap()(){}{}[][]": {
-      "snippet": "loglogpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
-    },
-    "linlinpap()(){}{}": {
-      "snippet": "linlinpap(${3:width},${4:height})(${5:x-decs},${6:y-decs}){${1:log-start}}{${2:y-shift,y-step}}"
-    },
-    "linlinpap()(){}{}[]": {
-      "snippet": "linlinpap(${4:width},${5:height})(${6:x-decs},${7:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}]"
-    },
-    "linlinpap()(){}{}[][]": {
-      "snippet": "linlinpap(${5:width},${6:height})(${7:x-decs},${8:y-decs}){${1:log-start}}{${2:y-shift,y-step}}[${3:x-name}][${4:y-name}]"
-    },
     "DefineLPLabelColor{}": {
       "snippet": "DefineLPLabelColor{${1:color command}}"
     },
diff --git a/dev/packages/logsys.json b/dev/packages/logsys.json
index c82c7867b..e109b42f8 100644
--- a/dev/packages/logsys.json
+++ b/dev/packages/logsys.json
@@ -27,114 +27,6 @@
     "vlogline*[]{}{}": {
       "snippet": "vlogline*[${3:spacing}]{${1:from}}{${2:to}}"
     },
-    "logsys()()": {
-      "snippet": "logsys(${1:lower-left})(${2:upper-right})"
-    },
-    "logsys[]()()": {
-      "snippet": "logsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logsys[][]()()": {
-      "snippet": "logsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "logsys*()()": {
-      "snippet": "logsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "logsys*[]()()": {
-      "snippet": "logsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logsys*[][]()()": {
-      "snippet": "logsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semilogsys()()": {
-      "snippet": "semilogsys(${1:lower-left})(${2:upper-right})"
-    },
-    "semilogsys[]()()": {
-      "snippet": "semilogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semilogsys[][]()()": {
-      "snippet": "semilogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semilogsys*()()": {
-      "snippet": "semilogsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "semilogsys*[]()()": {
-      "snippet": "semilogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semilogsys*[][]()()": {
-      "snippet": "semilogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loglogsys()()": {
-      "snippet": "loglogsys(${1:lower-left})(${2:upper-right})"
-    },
-    "loglogsys[]()()": {
-      "snippet": "loglogsys[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loglogsys[][]()()": {
-      "snippet": "loglogsys[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loglogsys*()()": {
-      "snippet": "loglogsys*(${1:lower-left})(${2:upper-right})"
-    },
-    "loglogsys*[]()()": {
-      "snippet": "loglogsys*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loglogsys*[][]()()": {
-      "snippet": "loglogsys*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loggrid()()": {
-      "snippet": "loggrid(${1:lower-left})(${2:upper-right})"
-    },
-    "loggrid[]()()": {
-      "snippet": "loggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loggrid[][]()()": {
-      "snippet": "loggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "loggrid*()()": {
-      "snippet": "loggrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "loggrid*[]()()": {
-      "snippet": "loggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "loggrid*[][]()()": {
-      "snippet": "loggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semiloggrid()()": {
-      "snippet": "semiloggrid(${1:lower-left})(${2:upper-right})"
-    },
-    "semiloggrid[]()()": {
-      "snippet": "semiloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semiloggrid[][]()()": {
-      "snippet": "semiloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "semiloggrid*()()": {
-      "snippet": "semiloggrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "semiloggrid*[]()()": {
-      "snippet": "semiloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "semiloggrid*[][]()()": {
-      "snippet": "semiloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "logloggrid()()": {
-      "snippet": "logloggrid(${1:lower-left})(${2:upper-right})"
-    },
-    "logloggrid[]()()": {
-      "snippet": "logloggrid[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logloggrid[][]()()": {
-      "snippet": "logloggrid[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
-    "logloggrid*()()": {
-      "snippet": "logloggrid*(${1:lower-left})(${2:upper-right})"
-    },
-    "logloggrid*[]()()": {
-      "snippet": "logloggrid*[${1:h-spacing}](${2:lower-left})(${3:upper-right})"
-    },
-    "logloggrid*[][]()()": {
-      "snippet": "logloggrid*[${1:h-spacing}][${2:v-spacing}](${3:lower-left})(${4:upper-right})"
-    },
     "interval": {},
     "intervalthickness{}": {
       "snippet": "intervalthickness{${1:width}}"
diff --git a/dev/packages/longtable.json b/dev/packages/longtable.json
deleted file mode 100644
index 8a7b4f73b..000000000
--- a/dev/packages/longtable.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "caption*{}": {
-      "snippet": "caption*{${1:text}}"
-    },
-    "endfirstfoot": {},
-    "endlastfoot": {},
-    "endfirsthead": {},
-    "endfoot": {},
-    "endhead": {},
-    "LTchunksize": {},
-    "LTcapwidth": {},
-    "LTleft": {},
-    "LTpost": {},
-    "LTpre": {},
-    "LTright": {},
-    "setlongtables": {},
-    "tabularnewline": {}
-  },
-  "envs": {
-    "longtable[]{}": {
-      "name": "longtable",
-      "snippet": "[${2:alignment}]{${1:preamble}}"
-    },
-    "longtable{}": {
-      "name": "longtable",
-      "snippet": "{${1:preamble}}"
-    }
-  },
-  "options": [
-    "errorshow",
-    "pausing",
-    "set",
-    "final"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lpic.json b/dev/packages/lpic.json
index 02429d811..26e782f9a 100644
--- a/dev/packages/lpic.json
+++ b/dev/packages/lpic.json
@@ -29,11 +29,11 @@
   "envs": {
     "lpic{}": {
       "name": "lpic",
-      "snippet": "{${1:filename(${2:x},${3:y})}}"
+      "snippet": "{${1:filename(${2:x,y})}}"
     },
     "lpic[]{}": {
       "name": "lpic",
-      "snippet": "[${2:options}]{${1:filename(${3:x},${4:y})}}",
+      "snippet": "[${2:options}]{${1:filename(${3:x,y})}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     }
diff --git a/dev/packages/lscape.json b/dev/packages/lscape.json
deleted file mode 100644
index a9ac7f6b3..000000000
--- a/dev/packages/lscape.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "includes": {
-    "graphics": []
-  },
-  "macros": {},
-  "envs": {
-    "landscape": {}
-  },
-  "options": [
-    "pdftex"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lstdoc.json b/dev/packages/lstdoc.json
index 295d6f393..c08bcb48d 100644
--- a/dev/packages/lstdoc.json
+++ b/dev/packages/lstdoc.json
@@ -34,7 +34,7 @@
     "syntaxbreak": {},
     "syntaxfill": {},
     "alternative{}": {
-      "snippet": "alternative{${1:item1,${2:item2},...}}"
+      "snippet": "alternative{${1:item1,item2,...}}"
     },
     "newdocenvironment{}{}{}{}": {
       "snippet": "newdocenvironment{${1:envname}}{${2:typename}}{${3:begdef}}{${4:enddef}}"
diff --git a/dev/packages/ltugcomn.json b/dev/packages/ltugcomn.json
index 9320b5728..9e0ee4c13 100644
--- a/dev/packages/ltugcomn.json
+++ b/dev/packages/ltugcomn.json
@@ -349,9 +349,6 @@
     "tubhideheight{}": {
       "snippet": "tubhideheight{${1:height}}"
     },
-    "tubissue{}()": {
-      "snippet": "tubissue{${1:volume}}(${2:issue})"
-    },
     "tubjustifiedpar": {},
     "tubline{}": {
       "snippet": "tubline{${1:text}}"
diff --git a/dev/packages/ltxdockit.json b/dev/packages/ltxdockit.json
deleted file mode 100644
index 214b97068..000000000
--- a/dev/packages/ltxdockit.json
+++ /dev/null
@@ -1,348 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "listings": [],
-    "color": [],
-    "xspace": [],
-    "ifpdf": [],
-    "hyperref": []
-  },
-  "macros": {
-    "marglistwidth": {},
-    "marglistsep": {},
-    "marglistfont": {},
-    "margnotefont": {},
-    "optionlistfont": {},
-    "ltxsyntaxfont": {},
-    "ltxsyntaxlabelfont": {},
-    "changelogfont": {},
-    "changeloglabelfont": {},
-    "verbatimfont": {},
-    "displayverbfont": {},
-    "defaultcolor": {},
-    "spotcolor": {},
-    "cs{}": {
-      "snippet": "cs{${1:csname}}"
-    },
-    "cmd{}": {
-      "snippet": "cmd{${1:csname}}"
-    },
-    "env{}": {
-      "snippet": "env{${1:envname}}"
-    },
-    "len{}": {
-      "snippet": "len{${1:length}}"
-    },
-    "cnt{}": {
-      "snippet": "cnt{${1:counter}}"
-    },
-    "prm{}": {
-      "snippet": "prm{${1:arg}}"
-    },
-    "mprm{}": {
-      "snippet": "mprm{${1:arg}}"
-    },
-    "oprm{}": {
-      "snippet": "oprm{${1:arg}}"
-    },
-    "opt{}": {
-      "snippet": "opt{${1:arg}}"
-    },
-    "kvopt{}{}": {
-      "snippet": "kvopt{${1:key}}{${2:value}}"
-    },
-    "file{}": {
-      "snippet": "file{${1:filename}}"
-    },
-    "sty{}": {
-      "snippet": "sty{${1:arg}}"
-    },
-    "bin{}": {
-      "snippet": "bin{${1:arg}}"
-    },
-    "acr{}": {
-      "snippet": "acr{${1:arg}}"
-    },
-    "keyval": {},
-    "refs{}{}{}": {
-      "snippet": "refs{${1:sing name}}{${2:plural name}}{${3:label}}"
-    },
-    "secref{}": {
-      "snippet": "secref{${1:label}}"
-    },
-    "Secref{}": {
-      "snippet": "Secref{${1:label}}"
-    },
-    "apxref{}": {
-      "snippet": "apxref{${1:label}}"
-    },
-    "Apxref{}": {
-      "snippet": "Apxref{${1:label}}"
-    },
-    "tabref{}": {
-      "snippet": "tabref{${1:label}}"
-    },
-    "Tabref{}": {
-      "snippet": "Tabref{${1:label}}"
-    },
-    "csitem{}": {
-      "snippet": "csitem{${1:csname}}"
-    },
-    "cmditem{}": {
-      "snippet": "cmditem{${1:csname}}"
-    },
-    "cmditem{}[]": {
-      "snippet": "cmditem{${1:csname}}[${2:options}]"
-    },
-    "cmditem{}[]{}": {
-      "snippet": "cmditem{${1:csname}}[${2:options}]{${3:arg}}"
-    },
-    "envitem{}": {
-      "snippet": "envitem{${1:envname}}"
-    },
-    "lenitem{}": {
-      "snippet": "lenitem{${1:length}}"
-    },
-    "boolitem{}": {
-      "snippet": "boolitem{${1:key}}"
-    },
-    "boolitem[]{}": {
-      "snippet": "boolitem[${2:true or false}]{${1:key}}"
-    },
-    "cntitem{}": {
-      "snippet": "cntitem{${1:counter}}"
-    },
-    "optitem{}": {
-      "snippet": "optitem{${1:option}}"
-    },
-    "varitem{}": {
-      "snippet": "varitem{${1:variable}}"
-    },
-    "valitem{}": {
-      "snippet": "valitem{${1:value}}"
-    },
-    "choitem{}{}": {
-      "snippet": "choitem{${1:key}}{${2:values}}"
-    },
-    "choitem[]{}{}": {
-      "snippet": "choitem[${3:opt}]{${1:key}}{${2:values}}"
-    },
-    "intitem{}": {
-      "snippet": "intitem{${1:key}}"
-    },
-    "intitem[]{}": {
-      "snippet": "intitem[${2:integer}]{${1:key}}"
-    },
-    "legitem{}": {
-      "snippet": "legitem{${1:arg}}"
-    },
-    "see{}": {
-      "snippet": "see{${1:label}}"
-    },
-    "lstenvsep": {}
-  },
-  "envs": {
-    "marglist": {},
-    "keymarglist": {},
-    "ltxsyntax": {},
-    "optionlist": {},
-    "optionlist*": {},
-    "valuelist": {},
-    "valuelist[]": {
-      "name": "valuelist",
-      "snippet": "[${1:opt}]"
-    },
-    "valuelist*": {},
-    "argumentlist{}": {
-      "name": "argumentlist",
-      "snippet": "{${1:arg}}"
-    },
-    "changelog": {},
-    "release{}{}": {
-      "name": "release",
-      "snippet": "{${1:version}}{${2:date}}"
-    },
-    "ltxcode": {},
-    "ltxcode[]": {
-      "name": "ltxcode",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ltxexample": {},
-    "ltxexample[]": {
-      "name": "ltxexample",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "inputpath=${1:path}",
-      "aboveskip=",
-      "belowskip=",
-      "lineskip=",
-      "boxpos=",
-      "print",
-      "showlines",
-      "emptylines=${1:number}",
-      "emptylines=*${1:number}",
-      "gobble=${1:number}",
-      "style=${1:style name}",
-      "language=${1:language}",
-      "language=[${1:dialect}]${2:language}",
-      "alsolanguage=${1:language}",
-      "alsolanguage=[${1:dialect}]${2:language}",
-      "defaultdialect=[${1:dialect}]${2:language}",
-      "printpod",
-      "usekeywordsintag",
-      "tagstyle=${1:style}",
-      "markfirstintag=${1:style}",
-      "makemacrouse",
-      "basicstyle=${1:style}",
-      "identifierstyle=${1:style}",
-      "commentstyle=${1:style}",
-      "stringstyle=${1:style}",
-      "keywordstyle=${1:style}",
-      "keywordstyle=[${1:number}]${2:style}",
-      "keywordstyle=[${1:number}]*${2:style}",
-      "ndkeywordstyle=${1:style}",
-      "classoffset=${1:number}",
-      "texcsstyle=${1:style}",
-      "texcsstyle=[${1:class number}]${2:style}",
-      "texcsstyle=*[${1:class number}]${2:style}",
-      "directivestyle=${1:style}",
-      "emph={${1:identifier list}}",
-      "emph=[${1:number}]{${2:identifier list}}",
-      "moreemph={${1:identifier list}}",
-      "moreemph=[${1:number}]{${2:identifier list}}",
-      "deleteemph={${1:identifier list}}",
-      "deleteemph=[${1:number}]{${2:identifier list}}",
-      "emphstyle={${1:style}}",
-      "emphstyle=[${1:number}]{${2:style}}",
-      "delim=",
-      "moredelim=",
-      "deletedelim=",
-      "extendedchars",
-      "inputencoding=${1:encoding}",
-      "upquote",
-      "tabsize=${1:number}",
-      "showtabs",
-      "tab=${1:tokens}",
-      "showspaces",
-      "showstringspaces",
-      "formfeed=${1:tokens}",
-      "numbers=",
-      "stepnumber=${1:number}",
-      "numberfirstline",
-      "numberstyle=${1:style}",
-      "numbersep=",
-      "numberblanklines",
-      "firstnumber=",
-      "name=${1:name}",
-      "title=${1:title text}",
-      "caption={${1:caption text}}",
-      "caption={[${1:short}]${2:caption text}}",
-      "label=",
-      "nolol",
-      "numberbychapter",
-      "captionpos=${1:subset of tb}",
-      "abovecaptionskip=",
-      "belowcaptionskip=",
-      "linewidth=",
-      "xleftmargin=",
-      "xrightmargin=",
-      "resetmargins",
-      "breaklines",
-      "breakatwhitespace",
-      "prebreak=${1:tokens}",
-      "postbreak=${1:tokens}",
-      "breakindent=",
-      "breakautoindent",
-      "frame=",
-      "frameround=",
-      "framesep=",
-      "rulesep=",
-      "framerule=",
-      "framexleftmargin=",
-      "framexrightmargin=",
-      "framextopmargin=",
-      "framexbottommargin=",
-      "backgroundcolor=",
-      "rulecolor=",
-      "fillcolor=",
-      "rulesepcolor=",
-      "frameshape={${1:top shape}}{${2:left shape}}{${3:right shape}}{${4:bottom shape}}",
-      "index=",
-      "moreindex=",
-      "deleteindex=",
-      "indexstyle=",
-      "columns=",
-      "flexiblecolumns",
-      "keepspaces",
-      "basewidth=",
-      "fontadjust",
-      "texcl",
-      "mathescape",
-      "escapechar=${1:character}",
-      "escapeinside=",
-      "escapebegin=${1:tokens}",
-      "escapeend=${1:tokens}",
-      "fancyvrb",
-      "fvcmdparams=",
-      "morefvcmdparams=",
-      "literate=",
-      "rangebeginprefix=",
-      "rangebeginsuffix=",
-      "rangeendprefix=",
-      "rangeendsuffix=",
-      "rangeprefix=",
-      "rangesuffix=",
-      "includerangemarker",
-      "multicols=${1:number}",
-      "float",
-      "float=${1:subset of tbph}",
-      "float=*${1:subset of tbph}",
-      "floatplacement=",
-      "firstline=${1:number}",
-      "lastline=${1:number}",
-      "linerange={${1:first1-last1,first2-last2,...}}",
-      "consecutivenumbers",
-      "keywordsprefix=${1:prefix}",
-      "keywords={${1:list of keywords}}",
-      "keywords=[${1:number}]{${2:list of keywords}}",
-      "morekeywords={${1:list of keywords}}",
-      "morekeywords=[${1:number}]{${2:list of keywords}}",
-      "deletekeywords={${1:list of keywords}}",
-      "deletekeywords=[${1:number}]{${2:list of keywords}}",
-      "ndkeywords={${1:list of keywords}}",
-      "moreendkeywords={${1:list of keywords}}",
-      "deleteendkeywords={${1:list of keywords}}",
-      "texcs=",
-      "moretexcs=",
-      "deletetxcs=",
-      "directives=",
-      "moredirectives=",
-      "deletedirectives=",
-      "sensitive",
-      "alsoletter={${1:character sequence}}",
-      "alsodigit={${1:character sequence}}",
-      "alsoother={${1:character sequence}}",
-      "otherkeywords={${1:keywords}}",
-      "tag=",
-      "string=",
-      "morestring=",
-      "deletestring=",
-      "comment=",
-      "morecomment=",
-      "deletecomment=",
-      "keywordcomment={${1:keywords}}",
-      "morekeywordcomment={${1:keywords}}",
-      "deletekeywordcomment={${1:keywords}}",
-      "keywordcommentsemicolon={${1:keywords}}{${2:keywords}}{${3:keywords}}",
-      "podcomment"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/luagcd.json b/dev/packages/luagcd.json
index efe7a1a63..9dce667cc 100644
--- a/dev/packages/luagcd.json
+++ b/dev/packages/luagcd.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "luagcd{}": {
-      "snippet": "luagcd{${1:int1,${2:int2},...}}"
+      "snippet": "luagcd{${1:int1,int2,...}}"
     },
     "luagcdwithsteps{}{}": {
       "snippet": "luagcdwithsteps{${1:int1}}{${2:int2}}"
diff --git a/dev/packages/luahttp.json b/dev/packages/luahttp.json
index 79ecafed8..cf5ea736b 100644
--- a/dev/packages/luahttp.json
+++ b/dev/packages/luahttp.json
@@ -9,16 +9,16 @@
       "snippet": "fetchJson{${1:URL}}"
     },
     "fetchJson{}[]": {
-      "snippet": "fetchJson{${1:URL}}[${2:key1,${3:key2},...}]"
+      "snippet": "fetchJson{${1:URL}}[${2:key1,key2,...}]"
     },
     "fetchJsonUsingFile{}": {
       "snippet": "fetchJsonUsingFile{${1:JSON file}}"
     },
     "fetchJsonUsingFile{}[]": {
-      "snippet": "fetchJsonUsingFile{${1:JSON file}}[${2:key1,${3:key2},...}]"
+      "snippet": "fetchJsonUsingFile{${1:JSON file}}[${2:key1,key2,...}]"
     },
     "fetchJsonUsingQuery{}{}": {
-      "snippet": "fetchJsonUsingQuery{${1:URL}}{${2:key1,${3:key2},...}}"
+      "snippet": "fetchJsonUsingQuery{${1:URL}}{${2:key1,key2,...}}"
     },
     "fetchRss{}{}": {
       "snippet": "fetchRss{${1:URL}}{${2:limit}}"
@@ -27,7 +27,7 @@
       "snippet": "fetchRss{${1:URL}}{${2:limit}}[${3:feedinfokey1,...}]"
     },
     "fetchRss{}{}[][]": {
-      "snippet": "fetchRss{${1:URL}}{${2:limit}}[${3:feedinfokey1,${5:...}][${4:entrykey1},...}]"
+      "snippet": "fetchRss{${1:URL}}{${2:limit}}[${3:feedinfokey1,...}][${4:entrykey1,...}]"
     },
     "fetchImage{}": {
       "snippet": "fetchImage{${1:URL}}"
diff --git a/dev/packages/luamaths.json b/dev/packages/luamaths.json
index 4807d9e6a..58756ec10 100644
--- a/dev/packages/luamaths.json
+++ b/dev/packages/luamaths.json
@@ -37,10 +37,10 @@
       "snippet": "mathLog{${1:number}}"
     },
     "mathMax{}": {
-      "snippet": "mathMax{${1:num1,${2:num2},...}}"
+      "snippet": "mathMax{${1:num1,num2,...}}"
     },
     "mathMin{}": {
-      "snippet": "mathMin{${1:num1,${2:num2},...}}"
+      "snippet": "mathMin{${1:num1,num2,...}}"
     },
     "mathPi": {},
     "mathRandom{}": {
diff --git a/dev/packages/luamplib.json b/dev/packages/luamplib.json
index a9dab8dfb..5ce61e177 100644
--- a/dev/packages/luamplib.json
+++ b/dev/packages/luamplib.json
@@ -45,10 +45,10 @@
       "snippet": "mplibnumbersystem{${1:type}}"
     },
     "mplibmakenocache{}": {
-      "snippet": "mplibmakenocache{${1:file1,${2:file2},...}}"
+      "snippet": "mplibmakenocache{${1:file1,file2,...}}"
     },
     "mplibcancelnocache{}": {
-      "snippet": "mplibcancelnocache{${1:file1,${2:file2},...}}"
+      "snippet": "mplibcancelnocache{${1:file1,file2,...}}"
     },
     "mplibcachedir{}": {
       "snippet": "mplibcachedir{${1:directory path}}"
@@ -69,13 +69,6 @@
     "mplibshowlog{}": {
       "snippet": "mplibshowlog{${1:choice}}"
     },
-    "mppattern{}": {
-      "snippet": "mppattern{${1:name}}"
-    },
-    "mppattern{}[]": {
-      "snippet": "mppattern{${1:name}}[${2:options}]"
-    },
-    "endmppattern": {},
     "mplibsetformat{}": {
       "snippet": "mplibsetformat{${1:format name}}"
     },
@@ -110,12 +103,6 @@
     "mplibdoprempfig": {},
     "mplibmainmpfig": {},
     "mplibmpfigbranch": {},
-    "mplibpatternbranch": {},
-    "mplibpatterngetnexttok": {},
-    "mplibpatternmain": {},
-    "mplibpatternname": {},
-    "mplibpatternopts": {},
-    "mplibpatternskipspace": {},
     "mplibprempfig{}": {
       "snippet": "mplibprempfig{${1:arg}}"
     },
@@ -143,29 +130,8 @@
     "mplibcode[]": {
       "name": "mplibcode",
       "snippet": "[${1:instance name}]"
-    },
-    "mppattern{}": {
-      "name": "mppattern",
-      "snippet": "{${1:name}}"
-    },
-    "mppattern{}[]": {
-      "name": "mppattern",
-      "snippet": "{${1:name}}[${2:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 1
     }
   },
   "options": [],
-  "keyvals": [
-    [
-      "xstep=${1:number}",
-      "ystep=${1:number}",
-      "xshift=${1:number}",
-      "yshift=${1:number}",
-      "bbox=\"${1:llx lly urx ury}\"",
-      "matrix=\"${1:xx xy yx yy}\"",
-      "resources=${1:PDF resources}",
-      "colored"
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/luatex.json b/dev/packages/luatex.json
deleted file mode 100644
index 956d90c3f..000000000
--- a/dev/packages/luatex.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "luatexbanner": {},
-    "luatexversion": {},
-    "luatexrevision": {},
-    "formatname": {},
-    "attributedef{}": {
-      "snippet": "attributedef{${1:cmd}}"
-    },
-    "directlua{}": {
-      "snippet": "directlua{${1:lua code}}"
-    },
-    "latelua{}": {
-      "snippet": "latelua{${1:lua code}}"
-    },
-    "luaescapestring{}": {
-      "snippet": "luaescapestring{${1:TeX code}}"
-    },
-    "luadef{}": {
-      "snippet": "luadef{${1:cmd}}"
-    },
-    "fontid": {},
-    "setfontid": {},
-    "nospaces": {},
-    "scantextokens": {},
-    "csstring": {},
-    "begincsname": {},
-    "lastnamedcs": {},
-    "alignmark": {},
-    "aligntab": {},
-    "glet{}": {
-      "snippet": "glet{${1:cmd}}"
-    },
-    "immediateassignment": {},
-    "immediateassigned": {},
-    "ifcondition": {},
-    "vpack": {},
-    "hpack": {},
-    "tpack": {},
-    "saveboxresource": {},
-    "saveimageresource": {},
-    "useboxresource": {},
-    "useimageresource": {},
-    "lastsavedboxresourceindex": {},
-    "lastsavedimageresourceindex": {},
-    "lastsavedimageresourcepages": {},
-    "nohrule": {},
-    "novrule": {},
-    "gleaders": {},
-    "boundary": {},
-    "noboundary": {},
-    "protrusionboundary": {},
-    "wordboundary": {},
-    "pagebottomoffset": {},
-    "pagetopoffset": {},
-    "pagerightoffset": {},
-    "pageleftoffset": {},
-    "partokencontext": {},
-    "partokenname": {},
-    "showstream": {},
-    "eTeXgluestretchorder": {},
-    "eTeXglueshrinkorder": {},
-    "deferred": {},
-    "pagewidth": {},
-    "pageheight": {},
-    "adjustspacing": {},
-    "protrudechars": {},
-    "ignoreligaturesinfont": {},
-    "expandglyphsinfont": {},
-    "copyfont": {},
-    "savepos": {},
-    "lastxpos": {},
-    "lastypos": {},
-    "pxdimen": {},
-    "insertht": {},
-    "normaldeviate": {},
-    "uniformdeviate": {},
-    "setrandomseed": {},
-    "randomseed": {},
-    "primitive": {},
-    "ifprimitive": {},
-    "ifabsnum": {},
-    "ifabsdim": {},
-    "textdir": {},
-    "linedir": {},
-    "pardir": {},
-    "pagedir": {},
-    "bodydir": {},
-    "mathdir": {},
-    "boxdir": {},
-    "hjcode": {},
-    "hyphenationbounds": {},
-    "explicitdiscretionary": {},
-    "automaticdiscretionary": {},
-    "leftghost": {},
-    "rightghost": {},
-    "hyphenpenaltymode": {},
-    "automatichyphenpenalty": {},
-    "explicithyphenpenalty": {},
-    "exceptionpenalty": {},
-    "Umathchardef": {},
-    "Umathchardef{}": {
-      "snippet": "Umathchardef{${1:cmd}}"
-    },
-    "Umathcharnumdef": {},
-    "Umathcharnumdef{}": {
-      "snippet": "Umathcharnumdef{${1:cmd}}"
-    },
-    "Umathcode": {},
-    "Udelcode": {},
-    "Umathchar": {},
-    "Umathaccent": {},
-    "Udelimiter": {},
-    "Uradical": {},
-    "Umathcharnum": {},
-    "Umathcodenum": {},
-    "Udelcodenum": {},
-    "Uroot": {},
-    "Uoverdelimiter": {},
-    "Uunderdelimiter": {},
-    "Udelimiterover": {},
-    "Udelimiterunder": {},
-    "variablefam": {},
-    "mathstyle": {},
-    "Ustack": {},
-    "crampeddisplaystyle": {},
-    "crampedtextstyle": {},
-    "crampedscriptstyle": {},
-    "crampedscriptscriptstyle": {},
-    "Umathquad": {},
-    "Umathaxis": {},
-    "Umathoperatorsize": {},
-    "Umathoverbarkern": {},
-    "Umathoverbarrule": {},
-    "Umathoverbarvgap": {},
-    "Umathunderbarkern": {},
-    "Umathunderbarrule": {},
-    "Umathunderbarvgap": {},
-    "Umathradicalkern": {},
-    "Umathradicalrule": {},
-    "Umathradicalvgap": {},
-    "Umathradicaldegreebefore": {},
-    "Umathradicaldegreeafter": {},
-    "Umathradicaldegreeraise": {},
-    "Umathstackvgap": {},
-    "Umathstacknumup": {},
-    "Umathstackdenomdown": {},
-    "Umathfractionrule": {},
-    "Umathfractionnumvgap": {},
-    "Umathfractionnumup": {},
-    "Umathfractiondenomvgap": {},
-    "Umathfractiondenomdown": {},
-    "Umathfractiondelsize": {},
-    "Umathlimitabovevgap": {},
-    "Umathlimitabovebgap": {},
-    "Umathlimitabovekern": {},
-    "Umathlimitbelowvgap": {},
-    "Umathlimitbelowbgap": {},
-    "Umathlimitbelowkern": {},
-    "Umathoverdelimitervgap": {},
-    "Umathoverdelimiterbgap": {},
-    "Umathunderdelimitervgap": {},
-    "Umathunderdelimiterbgap": {},
-    "Umathsubshiftdrop": {},
-    "Umathsubshiftdown": {},
-    "Umathsupshiftdrop": {},
-    "Umathsupshiftup": {},
-    "Umathsubsupshiftdown": {},
-    "Umathsubtopmax": {},
-    "Umathsupbottommin": {},
-    "Umathsupsubbottommax": {},
-    "Umathsubsupvgap": {},
-    "Umathspaceafterscript": {},
-    "Umathconnectoroverlapmin": {},
-    "Umathskewedfractionhgap": {},
-    "Umathskewedfractionvgap": {},
-    "Umathordordspacing": {},
-    "Umathordopspacing": {},
-    "Umathordbinspacing": {},
-    "Umathordrelspacing": {},
-    "Umathordopenspacing": {},
-    "Umathordclosespacing": {},
-    "Umathordpunctspacing": {},
-    "Umathordinnerspacing": {},
-    "Umathopordspacing": {},
-    "Umathopopspacing": {},
-    "Umathopbinspacing": {},
-    "Umathoprelspacing": {},
-    "Umathopopenspacing": {},
-    "Umathopclosespacing": {},
-    "Umathoppunctspacing": {},
-    "Umathopinnerspacing": {},
-    "Umathbinordspacing": {},
-    "Umathbinopspacing": {},
-    "Umathbinbinspacing": {},
-    "Umathbinrelspacing": {},
-    "Umathbinopenspacing": {},
-    "Umathbinclosespacing": {},
-    "Umathbinpunctspacing": {},
-    "Umathbininnerspacing": {},
-    "Umathrelordspacing": {},
-    "Umathrelopspacing": {},
-    "Umathrelbinspacing": {},
-    "Umathrelrelspacing": {},
-    "Umathrelopenspacing": {},
-    "Umathrelclosespacing": {},
-    "Umathrelpunctspacing": {},
-    "Umathrelinnerspacing": {},
-    "Umathopenordspacing": {},
-    "Umathopenopspacing": {},
-    "Umathopenbinspacing": {},
-    "Umathopenrelspacing": {},
-    "Umathopenopenspacing": {},
-    "Umathopenclosespacing": {},
-    "Umathopenpunctspacing": {},
-    "Umathopeninnerspacing": {},
-    "Umathcloseordspacing": {},
-    "Umathcloseopspacing": {},
-    "Umathclosebinspacing": {},
-    "Umathcloserelspacing": {},
-    "Umathcloseopenspacing": {},
-    "Umathcloseclosespacing": {},
-    "Umathclosepunctspacing": {},
-    "Umathcloseinnerspacing": {},
-    "Umathpunctordspacing": {},
-    "Umathpunctopspacing": {},
-    "Umathpunctbinspacing": {},
-    "Umathpunctrelspacing": {},
-    "Umathpunctopenspacing": {},
-    "Umathpunctclosespacing": {},
-    "Umathpunctpunctspacing": {},
-    "Umathpunctinnerspacing": {},
-    "Umathinnerordspacing": {},
-    "Umathinneropspacing": {},
-    "Umathinnerbinspacing": {},
-    "Umathinnerrelspacing": {},
-    "Umathinneropenspacing": {},
-    "Umathinnerclosespacing": {},
-    "Umathinnerpunctspacing": {},
-    "Umathinnerinnerspacing": {},
-    "Umathnolimitsupfactor": {},
-    "Umathnolimitsubfactor": {},
-    "Uhextensible": {},
-    "Uvextensible": {},
-    "Uskewed": {},
-    "Uskewedwithdelims": {},
-    "Uleft": {},
-    "Umiddle": {},
-    "Uright": {},
-    "Usuperscript": {},
-    "Usubscript": {},
-    "Ustartmath": {},
-    "Ustopmath": {},
-    "Ustartdisplaymath": {},
-    "Ustopdisplaymath": {},
-    "Unosuperscript{}": {
-      "snippet": "Unosuperscript{${1:text}}"
-    },
-    "Unosubscript{}": {
-      "snippet": "Unosubscript{${1:text}}"
-    },
-    "mathoption": {},
-    "localinterlinepenalty": {},
-    "localbrokenpenalty": {},
-    "localleftbox": {},
-    "localrightbox": {},
-    "compoundhyphenmode": {},
-    "dviextension": {},
-    "dvifeedback": {},
-    "dvivariable": {},
-    "endlocalcontrol": {},
-    "eTeXminorversion": {},
-    "eTeXVersion": {},
-    "fixupboxesmode": {},
-    "luacopyinputnodes": {},
-    "mathrulesfam": {},
-    "mathrulesmode": {},
-    "mathrulethicknessmode": {},
-    "newattribute{}": {
-      "snippet": "newattribute{${1:attribute}}"
-    },
-    "newcatcodetable{}": {
-      "snippet": "newcatcodetable{${1:catcodetable}}"
-    },
-    "newluafunction{}": {
-      "snippet": "newluafunction{${1:function}}"
-    },
-    "newluacmd{}": {
-      "snippet": "newluacmd{${1:cmd}}"
-    },
-    "newprotectedluacmd{}": {
-      "snippet": "newprotectedluacmd{${1:cmd}}"
-    },
-    "newwhatsit{}": {
-      "snippet": "newwhatsit{${1:whatsit}}"
-    },
-    "newluabytecode{}": {
-      "snippet": "newluabytecode{${1:bytecode}}"
-    },
-    "newluachunkname{}": {
-      "snippet": "newluachunkname{${1:chunkname}}"
-    },
-    "setattribute{}{}": {
-      "snippet": "setattribute{${1:attribute}}{${2:value}}"
-    },
-    "unsetattribute{}": {
-      "snippet": "unsetattribute{${1:attribute}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/luatexja-fontspec.json b/dev/packages/luatexja-fontspec.json
index f5cbae931..62d131a11 100644
--- a/dev/packages/luatexja-fontspec.json
+++ b/dev/packages/luatexja-fontspec.json
@@ -48,36 +48,12 @@
     "setjfontfamily{}[]{}": {
       "snippet": "setjfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
     },
-    "providejfontfamily{}{}": {
-      "snippet": "providejfontfamily{${1:cmd}}{${2:font}}"
-    },
-    "providejfontfamily{}[]{}": {
-      "snippet": "providejfontfamily{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
     "newjfontface{}{}": {
       "snippet": "newjfontface{${1:cmd}}{${2:font}}"
     },
     "newjfontface{}[]{}": {
       "snippet": "newjfontface{${1:cmd}}[${2:font features}]{${3:font}}"
     },
-    "renewjfontface{}{}": {
-      "snippet": "renewjfontface{${1:cmd}}{${2:font}}"
-    },
-    "renewjfontface{}[]{}": {
-      "snippet": "renewjfontface{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "setjfontface{}{}": {
-      "snippet": "setjfontface{${1:cmd}}{${2:font}}"
-    },
-    "setjfontface{}[]{}": {
-      "snippet": "setjfontface{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
-    "providejfontface{}{}": {
-      "snippet": "providejfontface{${1:cmd}}{${2:font}}"
-    },
-    "providejfontface{}[]{}": {
-      "snippet": "providejfontface{${1:cmd}}[${2:font features}]{${3:font}}"
-    },
     "defaultjfontfeatures{}": {
       "snippet": "defaultjfontfeatures{${1:font features}}"
     },
diff --git a/dev/packages/luatexko.json b/dev/packages/luatexko.json
index 9f52bb457..abb826952 100644
--- a/dev/packages/luatexko.json
+++ b/dev/packages/luatexko.json
@@ -153,22 +153,22 @@
       "snippet": "adhocfallbackfont[${2:font features}]{${1:font name}}"
     },
     "registerpunctuations{}": {
-      "snippet": "registerpunctuations{${1:code1,${2:code2},...}}"
+      "snippet": "registerpunctuations{${1:code1,code2,...}}"
     },
     "registerhangulpunctuations{}": {
-      "snippet": "registerhangulpunctuations{${1:code1,${2:code2},...}}"
+      "snippet": "registerhangulpunctuations{${1:code1,code2,...}}"
     },
     "unregisterpunctuations{}": {
-      "snippet": "unregisterpunctuations{${1:code1,${2:code2},...}}"
+      "snippet": "unregisterpunctuations{${1:code1,code2,...}}"
     },
     "unregisterhangulpunctuations{}": {
-      "snippet": "unregisterhangulpunctuations{${1:code1,${2:code2},...}}"
+      "snippet": "unregisterhangulpunctuations{${1:code1,code2,...}}"
     },
     "registerbreakableafter{}": {
-      "snippet": "registerbreakableafter{${1:code1,${2:code2},...}}"
+      "snippet": "registerbreakableafter{${1:code1,code2,...}}"
     },
     "registerbreakablebefore{}": {
-      "snippet": "registerbreakablebefore{${1:code1,${2:code2},...}}"
+      "snippet": "registerbreakablebefore{${1:code1,code2,...}}"
     },
     "typesetclassic": {},
     "typesetmodern": {},
diff --git a/dev/packages/luatruthtable.json b/dev/packages/luatruthtable.json
index 5271703bc..6eaccdfad 100644
--- a/dev/packages/luatruthtable.json
+++ b/dev/packages/luatruthtable.json
@@ -6,10 +6,10 @@
   },
   "macros": {
     "luaTruthTable{}{}": {
-      "snippet": "luaTruthTable{${1:var1,${3:var2},${4:...}}{${2:expr1},${5:expr2},...}}"
+      "snippet": "luaTruthTable{${1:var1,var2,...}}{${2:expr1,expr2,...}}"
     },
     "luaTruthTable[]{}{}": {
-      "snippet": "luaTruthTable[${3:options}]{${1:var1,${4:var2},${5:...}}{${2:expr1},${6:expr2},...}}",
+      "snippet": "luaTruthTable[${3:options}]{${1:var1,var2,...}}{${2:expr1,expr2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     }
diff --git a/dev/packages/lutabulartools.json b/dev/packages/lutabulartools.json
index 08ea4bba9..d9f11f973 100644
--- a/dev/packages/lutabulartools.json
+++ b/dev/packages/lutabulartools.json
@@ -50,32 +50,20 @@
       "snippet": "addMCsicol{${1:column}}"
     },
     "midrulesat{}": {
-      "snippet": "midrulesat{${1:row1,${2:row2},...}}"
+      "snippet": "midrulesat{${1:row1,row2,...}}"
     },
     "gmidrule{}": {
       "snippet": "gmidrule{${1:colspecs}}"
     },
-    "gmidrule(){}": {
-      "snippet": "gmidrule(${2:trim}){${1:colspecs}}"
-    },
     "gcmidrule{}": {
       "snippet": "gcmidrule{${1:colspecs}}"
     },
-    "gcmidrule(){}": {
-      "snippet": "gcmidrule(${2:trim}){${1:colspecs}}"
-    },
     "gcmidrules{}": {
       "snippet": "gcmidrules{${1:colspecs}}"
     },
-    "gcmidrules(){}": {
-      "snippet": "gcmidrules(${2:trim}){${1:colspecs}}"
-    },
     "cmidrules{}": {
       "snippet": "cmidrules{${1:colspecs}}"
     },
-    "cmidrules(){}": {
-      "snippet": "cmidrules(${2:trim}){${1:colspecs}}"
-    },
     "midruleX{}": {
       "snippet": "midruleX{${1:keyvals}}",
       "keyvalindex": 1,
diff --git a/dev/packages/luwiantype.json b/dev/packages/luwiantype.json
deleted file mode 100644
index 6c41b356f..000000000
--- a/dev/packages/luwiantype.json
+++ /dev/null
@@ -1,780 +0,0 @@
-{
-  "includes": {
-    "fontspec": [],
-    "graphicx": [],
-    "stackengine": [],
-    "moresize": []
-  },
-  "macros": {
-    "A": {
-      "detail": "𝐴",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
-    },
-    "A[]": {
-      "snippet": "A[${1:number}]"
-    },
-    "ADORARE": {},
-    "AEDIFICARE": {},
-    "AEDIFICIUM": {},
-    "AEDIFICIUMMINUS": {},
-    "AEDIFICIUMPONERE": {},
-    "ALA": {},
-    "AMPLECTI": {},
-    "ANIMAL": {},
-    "ANNUS": {},
-    "ANNUSANNUS": {},
-    "APER": {},
-    "AQUILA": {},
-    "ARAI": {},
-    "ARGENTUM": {},
-    "ARHA": {},
-    "ASCIA": {},
-    "ASINUS": {},
-    "ASINUS[]": {
-      "snippet": "ASINUS[${1:number}]"
-    },
-    "ASINUSIIA": {},
-    "ATAII": {},
-    "AUDIRE": {},
-    "AURIGA": {},
-    "AURIGA[]": {
-      "snippet": "AURIGA[${1:number}]"
-    },
-    "AVIS": {},
-    "AVIS[]": {
-      "snippet": "AVIS[${1:number}]"
-    },
-    "AVISX": {},
-    "AVUS": {},
-    "AX": {},
-    "badeq": {},
-    "BESTIA": {},
-    "BIBERE": {},
-    "BONUS": {},
-    "BONUS[]": {
-      "snippet": "BONUS[${1:number}]"
-    },
-    "BOS": {},
-    "BOS[]": {
-      "snippet": "BOS[${1:number}]"
-    },
-    "BOSIIMI": {},
-    "BOSMI": {},
-    "boust{}": {
-      "snippet": "boust{${1:text}}"
-    },
-    "BRACCHIUM": {},
-    "CAELUM": {},
-    "CANIS": {},
-    "CANIS[]": {
-      "snippet": "CANIS[${1:number}]"
-    },
-    "CAPERE": {},
-    "CAPERE[]": {
-      "snippet": "CAPERE[${1:number}]"
-    },
-    "CAPEREIICAPEREII": {},
-    "CAPERESCALPRUM": {},
-    "CAPRA": {},
-    "CAPRA[]": {
-      "snippet": "CAPRA[${1:number}]"
-    },
-    "CAPRAIIA": {},
-    "CAPUT": {},
-    "CAPUTSCALPRUM": {},
-    "CASTRUM": {},
-    "CENTUM": {},
-    "CERVUS": {},
-    "CERVUS[]": {
-      "snippet": "CERVUS[${1:number}]"
-    },
-    "CONTRACTUS": {},
-    "CORNU": {},
-    "CORNUCAPUT": {},
-    "CRUS": {},
-    "CRUS[]": {
-      "snippet": "CRUS[${1:number}]"
-    },
-    "CRUSCRUS": {},
-    "CRUSFLUMEN": {},
-    "CRUX": {},
-    "CRUX[]": {
-      "snippet": "CRUX[${1:number}]"
-    },
-    "CUBITUM": {},
-    "CULTER": {},
-    "CUM": {},
-    "CURRERE": {},
-    "CURRUS": {},
-    "DARE": {},
-    "DAREDARE": {},
-    "DECEM": {},
-    "DELERE": {},
-    "DEUS": {},
-    "DEUSDOMUS": {},
-    "DEUSMONSMENSA": {},
-    "DEUSMONSSARPA": {},
-    "DEUSVIATERRA": {},
-    "DIES": {},
-    "DOMINA": {},
-    "DOMINUS": {},
-    "DOMUS": {},
-    "DOMUSMINUS": {},
-    "DOMUSSCALA": {},
-    "DOMUSX": {},
-    "EDERE": {},
-    "EGO": {},
-    "EGO[]": {
-      "snippet": "EGO[${1:number}]"
-    },
-    "EIGHT": {},
-    "ENSIS": {},
-    "EQUUS": {},
-    "EUNUCHUS": {},
-    "EUNUCHUS[]": {
-      "snippet": "EUNUCHUS[${1:number}]"
-    },
-    "EXERCITUS": {},
-    "FALX": {},
-    "FEMINA": {},
-    "FILIA": {},
-    "FILIUS": {},
-    "FINES": {},
-    "FINESHA": {},
-    "FIVE": {},
-    "FLAMMAE": {},
-    "FLUMEN": {},
-    "FONS": {},
-    "FORTIS": {},
-    "FOUR": {},
-    "FRATER": {},
-    "FRATER[]": {
-      "snippet": "FRATER[${1:number}]"
-    },
-    "FRONS": {},
-    "FULGUR": {},
-    "FUSUS": {},
-    "GCXCV": {},
-    "GENUFLECTERE": {},
-    "GRYLLUS": {},
-    "HA": {},
-    "HA[]": {
-      "snippet": "HA[${1:number}]"
-    },
-    "HAIILI": {},
-    "HALAI": {},
-    "HANA": {},
-    "HARAI": {},
-    "HASTARIUS": {},
-    "HATTI": {},
-    "HATTILI": {},
-    "HATTUSILI": {},
-    "HAX": {},
-    "HEROS": {},
-    "HI": {},
-    "HI[]": {
-      "snippet": "HI[${1:number}]"
-    },
-    "hl": {},
-    "HORDEUM": {},
-    "HORREUM": {},
-    "hr": {},
-    "HU": {},
-    "HU[]": {
-      "snippet": "HU[${1:number}]"
-    },
-    "HUNDRED": {},
-    "HURU": {},
-    "HWIA": {},
-    "HWIX": {},
-    "I": {
-      "detail": "𝐼",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL I"
-    },
-    "I[]": {
-      "snippet": "I[${1:number}]"
-    },
-    "IA": {},
-    "IA[]": {
-      "snippet": "IA[${1:number}]"
-    },
-    "IACULUM": {},
-    "INFANS": {},
-    "INFRA": {},
-    "IRAI": {},
-    "ISHUWA": {},
-    "IUDEX": {},
-    "IUDEXLA": {},
-    "IUDEXRAI": {},
-    "IUSTITIA": {},
-    "JANUS": {},
-    "KA": {},
-    "KA[]": {
-      "snippet": "KA[${1:number}]"
-    },
-    "KAR": {},
-    "KI": {},
-    "KIX": {},
-    "KU": {},
-    "KWIA": {},
-    "LA": {},
-    "LAI": {},
-    "LAI[]": {
-      "snippet": "LAI[${1:number}]"
-    },
-    "LAIU": {},
-    "LALA": {},
-    "LAPIS": {},
-    "LAPISSCALPRUM": {},
-    "LARAA": {},
-    "Lat": {},
-    "LAX": {},
-    "LCCCII": {},
-    "LCCCL": {},
-    "LCCCLI": {},
-    "LCCCLII": {},
-    "LCCCLIII": {},
-    "LCCCLIV": {},
-    "LCCCLIX": {},
-    "LCCCLIXA": {},
-    "LCCCLVI": {},
-    "LCCCLVII": {},
-    "LCCCLXI": {},
-    "LCCCLXV": {},
-    "LCCCLXXIII": {},
-    "LCCCLXXIV": {},
-    "LCCCLXXV": {},
-    "LCCCVIII": {},
-    "LCCCX": {},
-    "LCCCXCIV": {},
-    "LCCCXCVI": {},
-    "LCCCXCVIII": {},
-    "LCCCXI": {},
-    "LCCCXII": {},
-    "LCCCXLII": {},
-    "LCCCXLIX": {},
-    "LCCCXLVIII": {},
-    "LCCCXVII": {},
-    "LCCCXX": {},
-    "LCCCXXI": {},
-    "LCCCXXIII": {},
-    "LCCCXXIV": {},
-    "LCCCXXIXA": {},
-    "LCCCXXXIII": {},
-    "LCCCXXXIX": {},
-    "LCCIII": {},
-    "LCCLII": {},
-    "LCCLIX": {},
-    "LCCLVI": {},
-    "LCCLVIII": {},
-    "LCCLX": {},
-    "LCCLXI": {},
-    "LCCLXII": {},
-    "LCCLXIII": {},
-    "LCCLXV": {},
-    "LCCLXX": {},
-    "LCCLXXI": {},
-    "LCCLXXIII": {},
-    "LCCLXXIV": {},
-    "LCCLXXIX": {},
-    "LCCLXXXII": {},
-    "LCCLXXXIV": {},
-    "LCCLXXXVII": {},
-    "LCCV": {},
-    "LCCVI": {},
-    "LCCVIII": {},
-    "LCCXCIII": {},
-    "LCCXCVII": {},
-    "LCCXI": {},
-    "LCCXIII": {},
-    "LCCXIX": {},
-    "LCCXL": {},
-    "LCCXLII": {},
-    "LCCXVII": {},
-    "LCCXVIII": {},
-    "LCCXX": {},
-    "LCCXXII": {},
-    "LCCXXIV": {},
-    "LCCXXX": {},
-    "LCCXXXII": {},
-    "LCCXXXIII": {},
-    "LCCXXXIV": {},
-    "LCCXXXV": {},
-    "LCCXXXVI": {},
-    "LCCXXXVIII": {},
-    "LCDI": {},
-    "LCDIII": {},
-    "LCDIX": {},
-    "LCDLII": {},
-    "LCDLIII": {},
-    "LCDLIV": {},
-    "LCDLIX": {},
-    "LCDLVII": {},
-    "LCDLVIIA": {},
-    "LCDLVIII": {},
-    "LCDLX": {},
-    "LCDLXI": {},
-    "LCDLXIII": {},
-    "LCDLXIV": {},
-    "LCDLXIX": {},
-    "LCDLXV": {},
-    "LCDLXVI": {},
-    "LCDLXVII": {},
-    "LCDLXVIII": {},
-    "LCDLXXI": {},
-    "LCDLXXII": {},
-    "LCDLXXIII": {},
-    "LCDLXXIX": {},
-    "LCDLXXV": {},
-    "LCDLXXVI": {},
-    "LCDLXXVIII": {},
-    "LCDLXXX": {},
-    "LCDLXXXI": {},
-    "LCDLXXXII": {},
-    "LCDLXXXIV": {},
-    "LCDLXXXIX": {},
-    "LCDLXXXV": {},
-    "LCDLXXXVII": {},
-    "LCDV": {},
-    "LCDVI": {},
-    "LCDVII": {},
-    "LCDVIII": {},
-    "LCDX": {},
-    "LCDXA": {},
-    "LCDXC": {},
-    "LCDXCI": {},
-    "LCDXCII": {},
-    "LCDXCIII": {},
-    "LCDXCIV": {},
-    "LCDXCV": {},
-    "LCDXCVI": {},
-    "LCDXCVII": {},
-    "LCDXIV": {},
-    "LCDXL": {},
-    "LCDXLI": {},
-    "LCDXLII": {},
-    "LCDXLIII": {},
-    "LCDXLIV": {},
-    "LCDXLIX": {},
-    "LCDXVI": {},
-    "LCDXVIII": {},
-    "LCDXX": {},
-    "LCDXXIV": {},
-    "LCDXXV": {},
-    "LCDXXVI": {},
-    "LCDXXVII": {},
-    "LCDXXVIII": {},
-    "LCDXXXI": {},
-    "LCDXXXII": {},
-    "LCDXXXIII": {},
-    "LCDXXXVI": {},
-    "LCDXXXVII": {},
-    "LCL": {},
-    "LCLII": {},
-    "LCLIV": {},
-    "LCLIX": {},
-    "LCLV": {},
-    "LCLVI": {},
-    "LCLVII": {},
-    "LCLVIII": {},
-    "LCLXI": {},
-    "LCLXII": {},
-    "LCLXIII": {},
-    "LCLXIV": {},
-    "LCLXIX": {},
-    "LCLXVII": {},
-    "LCLXVIII": {},
-    "LCLXX": {},
-    "LCLXXI": {},
-    "LCLXXX": {},
-    "LCLXXXIII": {},
-    "LCLXXXIV": {},
-    "LCLXXXIX": {},
-    "LCLXXXV": {},
-    "LCLXXXVI": {},
-    "LCLXXXVII": {},
-    "LCLXXXVIII": {},
-    "LCVI": {},
-    "LCXCIV": {},
-    "LCXCV": {},
-    "LCXCVIII": {},
-    "LCXIII": {},
-    "LCXIX": {},
-    "LCXL": {},
-    "LCXLI": {},
-    "LCXLIII": {},
-    "LCXLIV": {},
-    "LCXLIX": {},
-    "LCXLV": {},
-    "LCXLVI": {},
-    "LCXLVII": {},
-    "LCXVI": {},
-    "LCXVII": {},
-    "LCXVIII": {},
-    "LCXXII": {},
-    "LCXXIII": {},
-    "LCXXIV": {},
-    "LCXXIX": {},
-    "LCXXVI": {},
-    "LCXXVII": {},
-    "LCXXXIX": {},
-    "LCXXXVA": {},
-    "LCXXXVI": {},
-    "LDI": {},
-    "LDII": {},
-    "LDIII": {},
-    "LDIV": {},
-    "LDIX": {},
-    "LDV": {},
-    "LDVII": {},
-    "LDXI": {},
-    "LDXII": {},
-    "LDXIII": {},
-    "LDXIV": {},
-    "LDXIX": {},
-    "LDXV": {},
-    "LDXVI": {},
-    "LDXVII": {},
-    "LDXVIII": {},
-    "LDXX": {},
-    "LDXXI": {},
-    "LDXXII": {},
-    "LDXXIII": {},
-    "LDXXX": {},
-    "LECTUS": {},
-    "LEO": {},
-    "LEO[]": {
-      "snippet": "LEO[${1:number}]"
-    },
-    "LEOMONSTULEO": {},
-    "LEPUS": {},
-    "LEPUS[]": {
-      "snippet": "LEPUS[${1:number}]"
-    },
-    "LI": {},
-    "LI[]": {
-      "snippet": "LI[${1:number}]"
-    },
-    "LIBARE": {},
-    "LIBATIO": {},
-    "LIGARE": {},
-    "LIGNUM": {},
-    "LIII": {},
-    "LINGERE": {},
-    "LINGUA": {},
-    "LINGUACLAVUS": {},
-    "LINGUAX": {},
-    "LIS": {},
-    "LITUUS": {},
-    "LITUUSNA": {},
-    "LITUUSU": {},
-    "LL": {},
-    "LLI": {},
-    "LLIV": {},
-    "LLX": {},
-    "LLXI": {},
-    "LLXIII": {},
-    "LLXIV": {},
-    "LLXIX": {},
-    "LLXVII": {},
-    "LLXVIII": {},
-    "LLXXI": {},
-    "LLXXII": {},
-    "LLXXIV": {},
-    "LLXXV": {},
-    "LLXXVI": {},
-    "LLXXVII": {},
-    "LLXXXVII": {},
-    "LLXXXVIII": {},
-    "LOCUS": {},
-    "LOGE": {},
-    "LOGS": {},
-    "LONGUS": {},
-    "LOQUI": {},
-    "LUNA": {},
-    "Luwian": {},
-    "LV": {},
-    "LXCII": {},
-    "LXCIV": {},
-    "LXCLII": {},
-    "LXI": {},
-    "LXIII": {},
-    "LXL": {},
-    "LXLIV": {},
-    "LXLVII": {},
-    "LXLVIII": {},
-    "LXX": {},
-    "LXXIII": {},
-    "LXXX": {},
-    "LXXXIII": {},
-    "LXXXVII": {},
-    "LXXXVIII": {},
-    "MA": {},
-    "MA[]": {
-      "snippet": "MA[${1:number}]"
-    },
-    "MAGNUS": {},
-    "MAGNUSDOMINA": {},
-    "MAGNUSDOMUS": {},
-    "MAGNUSFILIA": {},
-    "MAGNUSREX": {},
-    "MALLEUS": {},
-    "MALUS": {},
-    "MALUS[]": {
-      "snippet": "MALUS[${1:number}]"
-    },
-    "MANDARE": {},
-    "MANDARE[]": {
-      "snippet": "MANDARE[${1:number}]"
-    },
-    "MANUS": {},
-    "MANUSCULTER": {},
-    "MATER": {},
-    "MAX": {},
-    "MENSA": {},
-    "MENSA[]": {
-      "snippet": "MENSA[${1:number}]"
-    },
-    "MI": {},
-    "MI[]": {
-      "snippet": "MI[${1:number}]"
-    },
-    "MIIIREGIO": {},
-    "MILLE": {},
-    "MINUS": {},
-    "MONS": {},
-    "MONS[]": {
-      "snippet": "MONS[${1:number}]"
-    },
-    "MORI": {},
-    "MU": {},
-    "MUA": {},
-    "MURSILI": {},
-    "MURUS": {},
-    "MUWA": {},
-    "NA": {},
-    "NA[]": {
-      "snippet": "NA[${1:number}]"
-    },
-    "NEG": {},
-    "NEG[]": {
-      "snippet": "NEG[${1:number}]"
-    },
-    "NEPOS": {},
-    "NI": {},
-    "NI[]": {
-      "snippet": "NI[${1:number}]"
-    },
-    "NINE": {},
-    "NIX": {},
-    "NU": {},
-    "NU[]": {
-      "snippet": "NU[${1:number}]"
-    },
-    "OCCIDENS": {},
-    "OCULUS": {},
-    "OMNIS": {},
-    "OMNIS[]": {
-      "snippet": "OMNIS[${1:number}]"
-    },
-    "OMNISMI": {},
-    "ONE": {},
-    "ORIENS": {},
-    "OVIS": {},
-    "OVIS[]": {
-      "snippet": "OVIS[${1:number}]"
-    },
-    "PA": {},
-    "PANIS": {},
-    "PANISSCUTELLA": {},
-    "PARI": {},
-    "PASTOR": {},
-    "PAX": {},
-    "PERS": {},
-    "PES": {},
-    "PES[]": {
-      "snippet": "PES[${1:number}]"
-    },
-    "PESIIPES": {},
-    "PESIIPESII": {},
-    "PESREGIO": {},
-    "PESSCALAROTAE": {},
-    "PI": {},
-    "PI[]": {
-      "snippet": "PI[${1:number}]"
-    },
-    "PISCIS": {},
-    "PITHOS": {},
-    "PITHOSA": {},
-    "PITHOSSCUTELLA": {},
-    "POCULUM": {},
-    "PODIUM": {},
-    "PONERE": {},
-    "PORTA": {},
-    "PORTA[]": {
-      "snippet": "PORTA[${1:number}]"
-    },
-    "POST": {},
-    "PRAE": {},
-    "PRINCEPS": {},
-    "PROPHETA": {},
-    "PU": {},
-    "PU[]": {
-      "snippet": "PU[${1:number}]"
-    },
-    "PUGNUS": {},
-    "PUGNUSPUGNUS": {},
-    "PUGNUSX": {},
-    "PURUS": {},
-    "RAA": {},
-    "RAI": {},
-    "REGIO": {},
-    "REL": {},
-    "REX": {},
-    "REXFILIA": {},
-    "REXFILIUS": {},
-    "REXINFANS": {},
-    "RII": {},
-    "ROTA": {},
-    "RU": {},
-    "RU[]": {
-      "snippet": "RU[${1:number}]"
-    },
-    "SA": {},
-    "SA[]": {
-      "snippet": "SA[${1:number}]"
-    },
-    "SACERDOS": {},
-    "SACERDOS[]": {
-      "snippet": "SACERDOS[${1:number}]"
-    },
-    "SARAI": {},
-    "SARMA": {},
-    "SARMA[]": {
-      "snippet": "SARMA[${1:number}]"
-    },
-    "SARPA": {},
-    "SAX": {},
-    "SCALPRUM": {},
-    "SCRIBA": {},
-    "SCUTELLA": {},
-    "SCUTUM": {},
-    "SERVUS": {},
-    "SI": {},
-    "SI[]": {
-      "snippet": "SI[${1:number}]"
-    },
-    "SIGILLUM": {},
-    "SOL": {},
-    "SOL[]": {
-      "snippet": "SOL[${1:number}]"
-    },
-    "SOLIIMENSA": {},
-    "SOLIITHRONUS": {},
-    "SOLIUM": {},
-    "SPHINX": {},
-    "STATUA": {},
-    "STELE": {},
-    "SU": {},
-    "SU[]": {
-      "snippet": "SU[${1:number}]"
-    },
-    "SUB": {},
-    "SUPER": {},
-    "TA": {},
-    "TA[]": {
-      "snippet": "TA[${1:number}]"
-    },
-    "TAI": {},
-    "TAI[]": {
-      "snippet": "TAI[${1:number}]"
-    },
-    "TALA": {},
-    "TANA": {},
-    "TAPA": {},
-    "TARAI": {},
-    "TARAIX": {},
-    "TELIPINU": {},
-    "TEN": {},
-    "TERRA": {},
-    "TESHUB": {},
-    "THOUSAND": {},
-    "THREE": {},
-    "THRONUS": {},
-    "THRONUS[]": {
-      "snippet": "THRONUS[${1:number}]"
-    },
-    "TI": {},
-    "TI[]": {
-      "snippet": "TI[${1:number}]"
-    },
-    "TONITRUS": {},
-    "tsub{}": {
-      "snippet": "tsub{${1:text}}"
-    },
-    "tsup{}": {
-      "snippet": "tsup{${1:text}}"
-    },
-    "TU": {},
-    "TU[]": {
-      "snippet": "TU[${1:number}]"
-    },
-    "TURRIS": {},
-    "TUZZI": {},
-    "TWELVE": {},
-    "TWO": {},
-    "U": {
-      "detail": "𝑈",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL U"
-    },
-    "UA": {},
-    "UNGULA": {},
-    "UNUS": {},
-    "UR": {},
-    "URBS": {},
-    "URBSLI": {},
-    "URBSRAILI": {},
-    "URCEUS": {},
-    "URHI": {},
-    "US": {},
-    "VACUUS": {},
-    "VAS": {},
-    "VERSUS": {},
-    "VIA": {},
-    "VIATERRAPLUSSCALPRUM": {},
-    "VIATERRASCALPRUM": {},
-    "VIR": {},
-    "VIR[]": {
-      "snippet": "VIR[${1:number}]"
-    },
-    "VIRIIA": {},
-    "VIRIIMINUS": {},
-    "VITA": {},
-    "VITELLUS": {},
-    "VITIS": {},
-    "WAI": {},
-    "WAI[]": {
-      "snippet": "WAI[${1:number}]"
-    },
-    "WIYA": {},
-    "WORD": {},
-    "ZA": {},
-    "ZA[]": {
-      "snippet": "ZA[${1:number}]"
-    },
-    "ZAX": {},
-    "ZI": {},
-    "ZI[]": {
-      "snippet": "ZI[${1:number}]"
-    },
-    "ZIA": {},
-    "ZU": {},
-    "ZU[]": {
-      "snippet": "ZU[${1:number}]"
-    },
-    "ZUWA": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/lwarp.json b/dev/packages/lwarp.json
index 3980ff7be..75a62130a 100644
--- a/dev/packages/lwarp.json
+++ b/dev/packages/lwarp.json
@@ -116,12 +116,6 @@
     "InlineClass[]{}{}": {
       "snippet": "InlineClass[${3:web css style}]{${1:css class}}{${2:text}}"
     },
-    "InlineClass(){}{}": {
-      "snippet": "InlineClass(${3:wp css style}){${1:css class}}{${2:text}}"
-    },
-    "InlineClass()[]{}{}": {
-      "snippet": "InlineClass(${4:wp css style})[${3:web css style}]{${1:css class}}{${2:text}}"
-    },
     "marginparBlock{}": {
       "snippet": "marginparBlock{${1:right}}"
     },
diff --git a/dev/packages/mafr.json b/dev/packages/mafr.json
index d7f5bd7e1..c3a1b3b88 100644
--- a/dev/packages/mafr.json
+++ b/dev/packages/mafr.json
@@ -184,7 +184,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/mailmerge.json b/dev/packages/mailmerge.json
index 8f6d677ba..ab0045fbe 100644
--- a/dev/packages/mailmerge.json
+++ b/dev/packages/mailmerge.json
@@ -4,7 +4,7 @@
   },
   "macros": {
     "mailfields{}": {
-      "snippet": "mailfields{${1:name1,${2:name2},...}}"
+      "snippet": "mailfields{${1:name1,name2,...}}"
     },
     "mailrepeat{}": {
       "snippet": "mailrepeat{${1:text}}"
@@ -16,7 +16,7 @@
     "numberofentries": {},
     "entrynumber": {},
     "mailentry{}": {
-      "snippet": "mailentry{${1:value1,${2:value2},...}}"
+      "snippet": "mailentry{${1:value1,value2,...}}"
     },
     "mailnewdata": {},
     "MAILMcurrtag": {},
diff --git a/dev/packages/makecell.json b/dev/packages/makecell.json
index cbaa9d8b7..5202a9ac8 100644
--- a/dev/packages/makecell.json
+++ b/dev/packages/makecell.json
@@ -10,9 +10,6 @@
     "cellgape": {},
     "cellrotangle": {},
     "cellset": {},
-    "diaghead(){}{}{}": {
-      "snippet": "diaghead(${4:Hratio},${5:Vratio}){${1:text for width}}{${2:head1}}{${3:head2}}"
-    },
     "diaghead{}{}{}": {
       "snippet": "diaghead{${1:text for width}}{${2:head1}}{${3:head2}}"
     },
diff --git a/dev/packages/makeidx.json b/dev/packages/makeidx.json
deleted file mode 100644
index 80a76bc71..000000000
--- a/dev/packages/makeidx.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "see{}{}": {
-      "snippet": "see{${1:text}}{${2:page number}}"
-    },
-    "seealso{}{}": {
-      "snippet": "seealso{${1:text}}{${2:page number}}"
-    },
-    "seename": {},
-    "alsoname": {},
-    "printindex": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/makeplot.json b/dev/packages/makeplot.json
index 60a82a3e9..f21637258 100644
--- a/dev/packages/makeplot.json
+++ b/dev/packages/makeplot.json
@@ -33,12 +33,6 @@
     "plotFile[]{}": {
       "snippet": "plotFile[${2:options}]{${1:file}}"
     },
-    "legendXY(){}{}": {
-      "snippet": "legendXY(${3:x},${4:y}){${1:number of lines}}{${2:width in mm}}"
-    },
-    "legendXY[](){}{}": {
-      "snippet": "legendXY[${3:options}](${4:x},${5:y}){${1:number of lines}}{${2:width in mm}}"
-    },
     "legendDL{}{}": {
       "snippet": "legendDL{${1:number of lines}}{${2:width in mm}}"
     },
diff --git a/dev/packages/mandi.json b/dev/packages/mandi.json
index 45db20311..4584f3b9d 100644
--- a/dev/packages/mandi.json
+++ b/dev/packages/mandi.json
@@ -15,10 +15,10 @@
       "snippet": "momentum{${1:magnitude}}"
     },
     "momentumvector{}": {
-      "snippet": "momentumvector{${1:c1,${2:c2},...}}"
+      "snippet": "momentumvector{${1:c1,c2,...}}"
     },
     "vectormomentum{}": {
-      "snippet": "vectormomentum{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentum{${1:c1,c2,...}}"
     },
     "momentumvalue{}": {
       "snippet": "momentumvalue{${1:magnitude}}"
@@ -36,28 +36,28 @@
     "momentumonlyderivedunits": {},
     "momentumonlyalternateunits": {},
     "momentumvectorvalue{}": {
-      "snippet": "momentumvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "momentumvectorvalue{${1:c1,c2,...}}"
     },
     "vectormomentumvalue{}": {
-      "snippet": "vectormomentumvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumvalue{${1:c1,c2,...}}"
     },
     "momentumvectorbaseunits{}": {
-      "snippet": "momentumvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "momentumvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectormomentumbaseunits{}": {
-      "snippet": "vectormomentumbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumbaseunits{${1:c1,c2,...}}"
     },
     "momentumvectorderivedunits{}": {
-      "snippet": "momentumvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "momentumvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectormomentumderivedunits{}": {
-      "snippet": "vectormomentumderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumderivedunits{${1:c1,c2,...}}"
     },
     "momentumvectoralternateunits{}": {
-      "snippet": "momentumvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "momentumvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectormomentumalternateunits{}": {
-      "snippet": "vectormomentumalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumalternateunits{${1:c1,c2,...}}"
     },
     "momentumvectoronlybaseunits": {},
     "vectormomentumonlybaseunits": {},
@@ -72,10 +72,10 @@
       "snippet": "acceleration{${1:magnitude}}"
     },
     "accelerationvector{}": {
-      "snippet": "accelerationvector{${1:c1,${2:c2},...}}"
+      "snippet": "accelerationvector{${1:c1,c2,...}}"
     },
     "vectoracceleration{}": {
-      "snippet": "vectoracceleration{${1:c1,${2:c2},...}}"
+      "snippet": "vectoracceleration{${1:c1,c2,...}}"
     },
     "accelerationvalue{}": {
       "snippet": "accelerationvalue{${1:magnitude}}"
@@ -93,28 +93,28 @@
     "accelerationonlyderivedunits": {},
     "accelerationonlyalternateunits": {},
     "accelerationvectorvalue{}": {
-      "snippet": "accelerationvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "accelerationvectorvalue{${1:c1,c2,...}}"
     },
     "vectoraccelerationvalue{}": {
-      "snippet": "vectoraccelerationvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectoraccelerationvalue{${1:c1,c2,...}}"
     },
     "accelerationvectorbaseunits{}": {
-      "snippet": "accelerationvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "accelerationvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectoraccelerationbaseunits{}": {
-      "snippet": "vectoraccelerationbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectoraccelerationbaseunits{${1:c1,c2,...}}"
     },
     "accelerationvectorderivedunits{}": {
-      "snippet": "accelerationvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "accelerationvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectoraccelerationderivedunits{}": {
-      "snippet": "vectoraccelerationderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectoraccelerationderivedunits{${1:c1,c2,...}}"
     },
     "accelerationvectoralternateunits{}": {
-      "snippet": "accelerationvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "accelerationvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectoraccelerationalternateunits{}": {
-      "snippet": "vectoraccelerationalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectoraccelerationalternateunits{${1:c1,c2,...}}"
     },
     "accelerationvectoronlybaseunits": {},
     "vectoraccelerationonlybaseunits": {},
@@ -144,10 +144,10 @@
       "snippet": "angularacceleration{${1:magnitude}}"
     },
     "angularaccelerationvector{}": {
-      "snippet": "angularaccelerationvector{${1:c1,${2:c2},...}}"
+      "snippet": "angularaccelerationvector{${1:c1,c2,...}}"
     },
     "vectorangularacceleration{}": {
-      "snippet": "vectorangularacceleration{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularacceleration{${1:c1,c2,...}}"
     },
     "angularaccelerationvalue{}": {
       "snippet": "angularaccelerationvalue{${1:magnitude}}"
@@ -165,28 +165,28 @@
     "angularaccelerationonlyderivedunits": {},
     "angularaccelerationonlyalternateunits": {},
     "angularaccelerationvectorvalue{}": {
-      "snippet": "angularaccelerationvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "angularaccelerationvectorvalue{${1:c1,c2,...}}"
     },
     "vectorangularaccelerationvalue{}": {
-      "snippet": "vectorangularaccelerationvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularaccelerationvalue{${1:c1,c2,...}}"
     },
     "angularaccelerationvectorbaseunits{}": {
-      "snippet": "angularaccelerationvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularaccelerationvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorangularaccelerationbaseunits{}": {
-      "snippet": "vectorangularaccelerationbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularaccelerationbaseunits{${1:c1,c2,...}}"
     },
     "angularaccelerationvectorderivedunits{}": {
-      "snippet": "angularaccelerationvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularaccelerationvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorangularaccelerationderivedunits{}": {
-      "snippet": "vectorangularaccelerationderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularaccelerationderivedunits{${1:c1,c2,...}}"
     },
     "angularaccelerationvectoralternateunits{}": {
-      "snippet": "angularaccelerationvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularaccelerationvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorangularaccelerationalternateunits{}": {
-      "snippet": "vectorangularaccelerationalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularaccelerationalternateunits{${1:c1,c2,...}}"
     },
     "angularaccelerationvectoronlybaseunits": {},
     "vectorangularaccelerationonlybaseunits": {},
@@ -216,10 +216,10 @@
       "snippet": "angularimpulse{${1:magnitude}}"
     },
     "angularimpulsevector{}": {
-      "snippet": "angularimpulsevector{${1:c1,${2:c2},...}}"
+      "snippet": "angularimpulsevector{${1:c1,c2,...}}"
     },
     "vectorangularimpulse{}": {
-      "snippet": "vectorangularimpulse{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularimpulse{${1:c1,c2,...}}"
     },
     "angularimpulsevalue{}": {
       "snippet": "angularimpulsevalue{${1:magnitude}}"
@@ -237,28 +237,28 @@
     "angularimpulseonlyderivedunits": {},
     "angularimpulseonlyalternateunits": {},
     "angularimpulsevectorvalue{}": {
-      "snippet": "angularimpulsevectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "angularimpulsevectorvalue{${1:c1,c2,...}}"
     },
     "vectorangularimpulsevalue{}": {
-      "snippet": "vectorangularimpulsevalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularimpulsevalue{${1:c1,c2,...}}"
     },
     "angularimpulsevectorbaseunits{}": {
-      "snippet": "angularimpulsevectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularimpulsevectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorangularimpulsebaseunits{}": {
-      "snippet": "vectorangularimpulsebaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularimpulsebaseunits{${1:c1,c2,...}}"
     },
     "angularimpulsevectorderivedunits{}": {
-      "snippet": "angularimpulsevectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularimpulsevectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorangularimpulsederivedunits{}": {
-      "snippet": "vectorangularimpulsederivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularimpulsederivedunits{${1:c1,c2,...}}"
     },
     "angularimpulsevectoralternateunits{}": {
-      "snippet": "angularimpulsevectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularimpulsevectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorangularimpulsealternateunits{}": {
-      "snippet": "vectorangularimpulsealternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularimpulsealternateunits{${1:c1,c2,...}}"
     },
     "angularimpulsevectoronlybaseunits": {},
     "vectorangularimpulseonlybaseunits": {},
@@ -270,10 +270,10 @@
       "snippet": "angularmomentum{${1:magnitude}}"
     },
     "angularmomentumvector{}": {
-      "snippet": "angularmomentumvector{${1:c1,${2:c2},...}}"
+      "snippet": "angularmomentumvector{${1:c1,c2,...}}"
     },
     "vectorangularmomentum{}": {
-      "snippet": "vectorangularmomentum{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularmomentum{${1:c1,c2,...}}"
     },
     "angularmomentumvalue{}": {
       "snippet": "angularmomentumvalue{${1:magnitude}}"
@@ -291,28 +291,28 @@
     "angularmomentumonlyderivedunits": {},
     "angularmomentumonlyalternateunits": {},
     "angularmomentumvectorvalue{}": {
-      "snippet": "angularmomentumvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "angularmomentumvectorvalue{${1:c1,c2,...}}"
     },
     "vectorangularmomentumvalue{}": {
-      "snippet": "vectorangularmomentumvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularmomentumvalue{${1:c1,c2,...}}"
     },
     "angularmomentumvectorbaseunits{}": {
-      "snippet": "angularmomentumvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularmomentumvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorangularmomentumbaseunits{}": {
-      "snippet": "vectorangularmomentumbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularmomentumbaseunits{${1:c1,c2,...}}"
     },
     "angularmomentumvectorderivedunits{}": {
-      "snippet": "angularmomentumvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularmomentumvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorangularmomentumderivedunits{}": {
-      "snippet": "vectorangularmomentumderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularmomentumderivedunits{${1:c1,c2,...}}"
     },
     "angularmomentumvectoralternateunits{}": {
-      "snippet": "angularmomentumvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularmomentumvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorangularmomentumalternateunits{}": {
-      "snippet": "vectorangularmomentumalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularmomentumalternateunits{${1:c1,c2,...}}"
     },
     "angularmomentumvectoronlybaseunits": {},
     "vectorangularmomentumonlybaseunits": {},
@@ -324,10 +324,10 @@
       "snippet": "angularvelocity{${1:magnitude}}"
     },
     "angularvelocityvector{}": {
-      "snippet": "angularvelocityvector{${1:c1,${2:c2},...}}"
+      "snippet": "angularvelocityvector{${1:c1,c2,...}}"
     },
     "vectorangularvelocity{}": {
-      "snippet": "vectorangularvelocity{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularvelocity{${1:c1,c2,...}}"
     },
     "angularvelocityvalue{}": {
       "snippet": "angularvelocityvalue{${1:magnitude}}"
@@ -345,28 +345,28 @@
     "angularvelocityonlyderivedunits": {},
     "angularvelocityonlyalternateunits": {},
     "angularvelocityvectorvalue{}": {
-      "snippet": "angularvelocityvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "angularvelocityvectorvalue{${1:c1,c2,...}}"
     },
     "vectorangularvelocityvalue{}": {
-      "snippet": "vectorangularvelocityvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularvelocityvalue{${1:c1,c2,...}}"
     },
     "angularvelocityvectorbaseunits{}": {
-      "snippet": "angularvelocityvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularvelocityvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorangularvelocitybaseunits{}": {
-      "snippet": "vectorangularvelocitybaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularvelocitybaseunits{${1:c1,c2,...}}"
     },
     "angularvelocityvectorderivedunits{}": {
-      "snippet": "angularvelocityvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularvelocityvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorangularvelocityderivedunits{}": {
-      "snippet": "vectorangularvelocityderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularvelocityderivedunits{${1:c1,c2,...}}"
     },
     "angularvelocityvectoralternateunits{}": {
-      "snippet": "angularvelocityvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "angularvelocityvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorangularvelocityalternateunits{}": {
-      "snippet": "vectorangularvelocityalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorangularvelocityalternateunits{${1:c1,c2,...}}"
     },
     "angularvelocityvectoronlybaseunits": {},
     "vectorangularvelocityonlybaseunits": {},
@@ -378,10 +378,10 @@
       "snippet": "cmagneticfield{${1:magnitude}}"
     },
     "cmagneticfieldvector{}": {
-      "snippet": "cmagneticfieldvector{${1:c1,${2:c2},...}}"
+      "snippet": "cmagneticfieldvector{${1:c1,c2,...}}"
     },
     "vectorcmagneticfield{}": {
-      "snippet": "vectorcmagneticfield{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcmagneticfield{${1:c1,c2,...}}"
     },
     "cmagneticfieldvalue{}": {
       "snippet": "cmagneticfieldvalue{${1:magnitude}}"
@@ -399,28 +399,28 @@
     "cmagneticfieldonlyderivedunits": {},
     "cmagneticfieldonlyalternateunits": {},
     "cmagneticfieldvectorvalue{}": {
-      "snippet": "cmagneticfieldvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "cmagneticfieldvectorvalue{${1:c1,c2,...}}"
     },
     "vectorcmagneticfieldvalue{}": {
-      "snippet": "vectorcmagneticfieldvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcmagneticfieldvalue{${1:c1,c2,...}}"
     },
     "cmagneticfieldvectorbaseunits{}": {
-      "snippet": "cmagneticfieldvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "cmagneticfieldvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorcmagneticfieldbaseunits{}": {
-      "snippet": "vectorcmagneticfieldbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcmagneticfieldbaseunits{${1:c1,c2,...}}"
     },
     "cmagneticfieldvectorderivedunits{}": {
-      "snippet": "cmagneticfieldvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "cmagneticfieldvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorcmagneticfieldderivedunits{}": {
-      "snippet": "vectorcmagneticfieldderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcmagneticfieldderivedunits{${1:c1,c2,...}}"
     },
     "cmagneticfieldvectoralternateunits{}": {
-      "snippet": "cmagneticfieldvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "cmagneticfieldvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorcmagneticfieldalternateunits{}": {
-      "snippet": "vectorcmagneticfieldalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcmagneticfieldalternateunits{${1:c1,c2,...}}"
     },
     "cmagneticfieldvectoronlybaseunits": {},
     "vectorcmagneticfieldonlybaseunits": {},
@@ -432,10 +432,10 @@
       "snippet": "currentdensity{${1:magnitude}}"
     },
     "currentdensityvector{}": {
-      "snippet": "currentdensityvector{${1:c1,${2:c2},...}}"
+      "snippet": "currentdensityvector{${1:c1,c2,...}}"
     },
     "vectorcurrentdensity{}": {
-      "snippet": "vectorcurrentdensity{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcurrentdensity{${1:c1,c2,...}}"
     },
     "currentdensityvalue{}": {
       "snippet": "currentdensityvalue{${1:magnitude}}"
@@ -453,28 +453,28 @@
     "currentdensityonlyderivedunits": {},
     "currentdensityonlyalternateunits": {},
     "currentdensityvectorvalue{}": {
-      "snippet": "currentdensityvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "currentdensityvectorvalue{${1:c1,c2,...}}"
     },
     "vectorcurrentdensityvalue{}": {
-      "snippet": "vectorcurrentdensityvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcurrentdensityvalue{${1:c1,c2,...}}"
     },
     "currentdensityvectorbaseunits{}": {
-      "snippet": "currentdensityvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "currentdensityvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorcurrentdensitybaseunits{}": {
-      "snippet": "vectorcurrentdensitybaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcurrentdensitybaseunits{${1:c1,c2,...}}"
     },
     "currentdensityvectorderivedunits{}": {
-      "snippet": "currentdensityvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "currentdensityvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorcurrentdensityderivedunits{}": {
-      "snippet": "vectorcurrentdensityderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcurrentdensityderivedunits{${1:c1,c2,...}}"
     },
     "currentdensityvectoralternateunits{}": {
-      "snippet": "currentdensityvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "currentdensityvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorcurrentdensityalternateunits{}": {
-      "snippet": "vectorcurrentdensityalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorcurrentdensityalternateunits{${1:c1,c2,...}}"
     },
     "currentdensityvectoronlybaseunits": {},
     "vectorcurrentdensityonlybaseunits": {},
@@ -486,10 +486,10 @@
       "snippet": "direction{${1:magnitude}}"
     },
     "directionvector{}": {
-      "snippet": "directionvector{${1:c1,${2:c2},...}}"
+      "snippet": "directionvector{${1:c1,c2,...}}"
     },
     "vectordirection{}": {
-      "snippet": "vectordirection{${1:c1,${2:c2},...}}"
+      "snippet": "vectordirection{${1:c1,c2,...}}"
     },
     "directionvalue{}": {
       "snippet": "directionvalue{${1:magnitude}}"
@@ -507,28 +507,28 @@
     "directiononlyderivedunits": {},
     "directiononlyalternateunits": {},
     "directionvectorvalue{}": {
-      "snippet": "directionvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "directionvectorvalue{${1:c1,c2,...}}"
     },
     "vectordirectionvalue{}": {
-      "snippet": "vectordirectionvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectordirectionvalue{${1:c1,c2,...}}"
     },
     "directionvectorbaseunits{}": {
-      "snippet": "directionvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "directionvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectordirectionbaseunits{}": {
-      "snippet": "vectordirectionbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectordirectionbaseunits{${1:c1,c2,...}}"
     },
     "directionvectorderivedunits{}": {
-      "snippet": "directionvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "directionvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectordirectionderivedunits{}": {
-      "snippet": "vectordirectionderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectordirectionderivedunits{${1:c1,c2,...}}"
     },
     "directionvectoralternateunits{}": {
-      "snippet": "directionvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "directionvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectordirectionalternateunits{}": {
-      "snippet": "vectordirectionalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectordirectionalternateunits{${1:c1,c2,...}}"
     },
     "directionvectoronlybaseunits": {},
     "vectordirectiononlybaseunits": {},
@@ -540,10 +540,10 @@
       "snippet": "displacement{${1:magnitude}}"
     },
     "displacementvector{}": {
-      "snippet": "displacementvector{${1:c1,${2:c2},...}}"
+      "snippet": "displacementvector{${1:c1,c2,...}}"
     },
     "vectordisplacement{}": {
-      "snippet": "vectordisplacement{${1:c1,${2:c2},...}}"
+      "snippet": "vectordisplacement{${1:c1,c2,...}}"
     },
     "displacementvalue{}": {
       "snippet": "displacementvalue{${1:magnitude}}"
@@ -561,28 +561,28 @@
     "displacementonlyderivedunits": {},
     "displacementonlyalternateunits": {},
     "displacementvectorvalue{}": {
-      "snippet": "displacementvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "displacementvectorvalue{${1:c1,c2,...}}"
     },
     "vectordisplacementvalue{}": {
-      "snippet": "vectordisplacementvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectordisplacementvalue{${1:c1,c2,...}}"
     },
     "displacementvectorbaseunits{}": {
-      "snippet": "displacementvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "displacementvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectordisplacementbaseunits{}": {
-      "snippet": "vectordisplacementbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectordisplacementbaseunits{${1:c1,c2,...}}"
     },
     "displacementvectorderivedunits{}": {
-      "snippet": "displacementvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "displacementvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectordisplacementderivedunits{}": {
-      "snippet": "vectordisplacementderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectordisplacementderivedunits{${1:c1,c2,...}}"
     },
     "displacementvectoralternateunits{}": {
-      "snippet": "displacementvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "displacementvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectordisplacementalternateunits{}": {
-      "snippet": "vectordisplacementalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectordisplacementalternateunits{${1:c1,c2,...}}"
     },
     "displacementvectoronlybaseunits": {},
     "vectordisplacementonlybaseunits": {},
@@ -594,10 +594,10 @@
       "snippet": "electricdipolemoment{${1:magnitude}}"
     },
     "electricdipolemomentvector{}": {
-      "snippet": "electricdipolemomentvector{${1:c1,${2:c2},...}}"
+      "snippet": "electricdipolemomentvector{${1:c1,c2,...}}"
     },
     "vectorelectricdipolemoment{}": {
-      "snippet": "vectorelectricdipolemoment{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricdipolemoment{${1:c1,c2,...}}"
     },
     "electricdipolemomentvalue{}": {
       "snippet": "electricdipolemomentvalue{${1:magnitude}}"
@@ -615,28 +615,28 @@
     "electricdipolemomentonlyderivedunits": {},
     "electricdipolemomentonlyalternateunits": {},
     "electricdipolemomentvectorvalue{}": {
-      "snippet": "electricdipolemomentvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "electricdipolemomentvectorvalue{${1:c1,c2,...}}"
     },
     "vectorelectricdipolemomentvalue{}": {
-      "snippet": "vectorelectricdipolemomentvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricdipolemomentvalue{${1:c1,c2,...}}"
     },
     "electricdipolemomentvectorbaseunits{}": {
-      "snippet": "electricdipolemomentvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "electricdipolemomentvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorelectricdipolemomentbaseunits{}": {
-      "snippet": "vectorelectricdipolemomentbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricdipolemomentbaseunits{${1:c1,c2,...}}"
     },
     "electricdipolemomentvectorderivedunits{}": {
-      "snippet": "electricdipolemomentvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "electricdipolemomentvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorelectricdipolemomentderivedunits{}": {
-      "snippet": "vectorelectricdipolemomentderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricdipolemomentderivedunits{${1:c1,c2,...}}"
     },
     "electricdipolemomentvectoralternateunits{}": {
-      "snippet": "electricdipolemomentvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "electricdipolemomentvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorelectricdipolemomentalternateunits{}": {
-      "snippet": "vectorelectricdipolemomentalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricdipolemomentalternateunits{${1:c1,c2,...}}"
     },
     "electricdipolemomentvectoronlybaseunits": {},
     "vectorelectricdipolemomentonlybaseunits": {},
@@ -648,10 +648,10 @@
       "snippet": "electricfield{${1:magnitude}}"
     },
     "electricfieldvector{}": {
-      "snippet": "electricfieldvector{${1:c1,${2:c2},...}}"
+      "snippet": "electricfieldvector{${1:c1,c2,...}}"
     },
     "vectorelectricfield{}": {
-      "snippet": "vectorelectricfield{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricfield{${1:c1,c2,...}}"
     },
     "electricfieldvalue{}": {
       "snippet": "electricfieldvalue{${1:magnitude}}"
@@ -669,28 +669,28 @@
     "electricfieldonlyderivedunits": {},
     "electricfieldonlyalternateunits": {},
     "electricfieldvectorvalue{}": {
-      "snippet": "electricfieldvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "electricfieldvectorvalue{${1:c1,c2,...}}"
     },
     "vectorelectricfieldvalue{}": {
-      "snippet": "vectorelectricfieldvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricfieldvalue{${1:c1,c2,...}}"
     },
     "electricfieldvectorbaseunits{}": {
-      "snippet": "electricfieldvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "electricfieldvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorelectricfieldbaseunits{}": {
-      "snippet": "vectorelectricfieldbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricfieldbaseunits{${1:c1,c2,...}}"
     },
     "electricfieldvectorderivedunits{}": {
-      "snippet": "electricfieldvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "electricfieldvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorelectricfieldderivedunits{}": {
-      "snippet": "vectorelectricfieldderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricfieldderivedunits{${1:c1,c2,...}}"
     },
     "electricfieldvectoralternateunits{}": {
-      "snippet": "electricfieldvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "electricfieldvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorelectricfieldalternateunits{}": {
-      "snippet": "vectorelectricfieldalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorelectricfieldalternateunits{${1:c1,c2,...}}"
     },
     "electricfieldvectoronlybaseunits": {},
     "vectorelectricfieldonlybaseunits": {},
@@ -702,10 +702,10 @@
       "snippet": "energyflux{${1:magnitude}}"
     },
     "energyfluxvector{}": {
-      "snippet": "energyfluxvector{${1:c1,${2:c2},...}}"
+      "snippet": "energyfluxvector{${1:c1,c2,...}}"
     },
     "vectorenergyflux{}": {
-      "snippet": "vectorenergyflux{${1:c1,${2:c2},...}}"
+      "snippet": "vectorenergyflux{${1:c1,c2,...}}"
     },
     "energyfluxvalue{}": {
       "snippet": "energyfluxvalue{${1:magnitude}}"
@@ -723,28 +723,28 @@
     "energyfluxonlyderivedunits": {},
     "energyfluxonlyalternateunits": {},
     "energyfluxvectorvalue{}": {
-      "snippet": "energyfluxvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "energyfluxvectorvalue{${1:c1,c2,...}}"
     },
     "vectorenergyfluxvalue{}": {
-      "snippet": "vectorenergyfluxvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorenergyfluxvalue{${1:c1,c2,...}}"
     },
     "energyfluxvectorbaseunits{}": {
-      "snippet": "energyfluxvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "energyfluxvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorenergyfluxbaseunits{}": {
-      "snippet": "vectorenergyfluxbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorenergyfluxbaseunits{${1:c1,c2,...}}"
     },
     "energyfluxvectorderivedunits{}": {
-      "snippet": "energyfluxvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "energyfluxvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorenergyfluxderivedunits{}": {
-      "snippet": "vectorenergyfluxderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorenergyfluxderivedunits{${1:c1,c2,...}}"
     },
     "energyfluxvectoralternateunits{}": {
-      "snippet": "energyfluxvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "energyfluxvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorenergyfluxalternateunits{}": {
-      "snippet": "vectorenergyfluxalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorenergyfluxalternateunits{${1:c1,c2,...}}"
     },
     "energyfluxvectoronlybaseunits": {},
     "vectorenergyfluxonlybaseunits": {},
@@ -756,10 +756,10 @@
       "snippet": "force{${1:magnitude}}"
     },
     "forcevector{}": {
-      "snippet": "forcevector{${1:c1,${2:c2},...}}"
+      "snippet": "forcevector{${1:c1,c2,...}}"
     },
     "vectorforce{}": {
-      "snippet": "vectorforce{${1:c1,${2:c2},...}}"
+      "snippet": "vectorforce{${1:c1,c2,...}}"
     },
     "forcevalue{}": {
       "snippet": "forcevalue{${1:magnitude}}"
@@ -777,28 +777,28 @@
     "forceonlyderivedunits": {},
     "forceonlyalternateunits": {},
     "forcevectorvalue{}": {
-      "snippet": "forcevectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "forcevectorvalue{${1:c1,c2,...}}"
     },
     "vectorforcevalue{}": {
-      "snippet": "vectorforcevalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorforcevalue{${1:c1,c2,...}}"
     },
     "forcevectorbaseunits{}": {
-      "snippet": "forcevectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "forcevectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorforcebaseunits{}": {
-      "snippet": "vectorforcebaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorforcebaseunits{${1:c1,c2,...}}"
     },
     "forcevectorderivedunits{}": {
-      "snippet": "forcevectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "forcevectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorforcederivedunits{}": {
-      "snippet": "vectorforcederivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorforcederivedunits{${1:c1,c2,...}}"
     },
     "forcevectoralternateunits{}": {
-      "snippet": "forcevectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "forcevectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorforcealternateunits{}": {
-      "snippet": "vectorforcealternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorforcealternateunits{${1:c1,c2,...}}"
     },
     "forcevectoronlybaseunits": {},
     "vectorforceonlybaseunits": {},
@@ -810,10 +810,10 @@
       "snippet": "gravitationalfield{${1:magnitude}}"
     },
     "gravitationalfieldvector{}": {
-      "snippet": "gravitationalfieldvector{${1:c1,${2:c2},...}}"
+      "snippet": "gravitationalfieldvector{${1:c1,c2,...}}"
     },
     "vectorgravitationalfield{}": {
-      "snippet": "vectorgravitationalfield{${1:c1,${2:c2},...}}"
+      "snippet": "vectorgravitationalfield{${1:c1,c2,...}}"
     },
     "gravitationalfieldvalue{}": {
       "snippet": "gravitationalfieldvalue{${1:magnitude}}"
@@ -831,28 +831,28 @@
     "gravitationalfieldonlyderivedunits": {},
     "gravitationalfieldonlyalternateunits": {},
     "gravitationalfieldvectorvalue{}": {
-      "snippet": "gravitationalfieldvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "gravitationalfieldvectorvalue{${1:c1,c2,...}}"
     },
     "vectorgravitationalfieldvalue{}": {
-      "snippet": "vectorgravitationalfieldvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorgravitationalfieldvalue{${1:c1,c2,...}}"
     },
     "gravitationalfieldvectorbaseunits{}": {
-      "snippet": "gravitationalfieldvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "gravitationalfieldvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorgravitationalfieldbaseunits{}": {
-      "snippet": "vectorgravitationalfieldbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorgravitationalfieldbaseunits{${1:c1,c2,...}}"
     },
     "gravitationalfieldvectorderivedunits{}": {
-      "snippet": "gravitationalfieldvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "gravitationalfieldvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorgravitationalfieldderivedunits{}": {
-      "snippet": "vectorgravitationalfieldderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorgravitationalfieldderivedunits{${1:c1,c2,...}}"
     },
     "gravitationalfieldvectoralternateunits{}": {
-      "snippet": "gravitationalfieldvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "gravitationalfieldvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorgravitationalfieldalternateunits{}": {
-      "snippet": "vectorgravitationalfieldalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorgravitationalfieldalternateunits{${1:c1,c2,...}}"
     },
     "gravitationalfieldvectoronlybaseunits": {},
     "vectorgravitationalfieldonlybaseunits": {},
@@ -864,10 +864,10 @@
       "snippet": "impulse{${1:magnitude}}"
     },
     "impulsevector{}": {
-      "snippet": "impulsevector{${1:c1,${2:c2},...}}"
+      "snippet": "impulsevector{${1:c1,c2,...}}"
     },
     "vectorimpulse{}": {
-      "snippet": "vectorimpulse{${1:c1,${2:c2},...}}"
+      "snippet": "vectorimpulse{${1:c1,c2,...}}"
     },
     "impulsevalue{}": {
       "snippet": "impulsevalue{${1:magnitude}}"
@@ -885,28 +885,28 @@
     "impulseonlyderivedunits": {},
     "impulseonlyalternateunits": {},
     "impulsevectorvalue{}": {
-      "snippet": "impulsevectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "impulsevectorvalue{${1:c1,c2,...}}"
     },
     "vectorimpulsevalue{}": {
-      "snippet": "vectorimpulsevalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorimpulsevalue{${1:c1,c2,...}}"
     },
     "impulsevectorbaseunits{}": {
-      "snippet": "impulsevectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "impulsevectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorimpulsebaseunits{}": {
-      "snippet": "vectorimpulsebaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorimpulsebaseunits{${1:c1,c2,...}}"
     },
     "impulsevectorderivedunits{}": {
-      "snippet": "impulsevectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "impulsevectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorimpulsederivedunits{}": {
-      "snippet": "vectorimpulsederivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorimpulsederivedunits{${1:c1,c2,...}}"
     },
     "impulsevectoralternateunits{}": {
-      "snippet": "impulsevectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "impulsevectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorimpulsealternateunits{}": {
-      "snippet": "vectorimpulsealternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorimpulsealternateunits{${1:c1,c2,...}}"
     },
     "impulsevectoronlybaseunits": {},
     "vectorimpulseonlybaseunits": {},
@@ -918,10 +918,10 @@
       "snippet": "magneticdipolemoment{${1:magnitude}}"
     },
     "magneticdipolemomentvector{}": {
-      "snippet": "magneticdipolemomentvector{${1:c1,${2:c2},...}}"
+      "snippet": "magneticdipolemomentvector{${1:c1,c2,...}}"
     },
     "vectormagneticdipolemoment{}": {
-      "snippet": "vectormagneticdipolemoment{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticdipolemoment{${1:c1,c2,...}}"
     },
     "magneticdipolemomentvalue{}": {
       "snippet": "magneticdipolemomentvalue{${1:magnitude}}"
@@ -939,28 +939,28 @@
     "magneticdipolemomentonlyderivedunits": {},
     "magneticdipolemomentonlyalternateunits": {},
     "magneticdipolemomentvectorvalue{}": {
-      "snippet": "magneticdipolemomentvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "magneticdipolemomentvectorvalue{${1:c1,c2,...}}"
     },
     "vectormagneticdipolemomentvalue{}": {
-      "snippet": "vectormagneticdipolemomentvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticdipolemomentvalue{${1:c1,c2,...}}"
     },
     "magneticdipolemomentvectorbaseunits{}": {
-      "snippet": "magneticdipolemomentvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "magneticdipolemomentvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectormagneticdipolemomentbaseunits{}": {
-      "snippet": "vectormagneticdipolemomentbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticdipolemomentbaseunits{${1:c1,c2,...}}"
     },
     "magneticdipolemomentvectorderivedunits{}": {
-      "snippet": "magneticdipolemomentvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "magneticdipolemomentvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectormagneticdipolemomentderivedunits{}": {
-      "snippet": "vectormagneticdipolemomentderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticdipolemomentderivedunits{${1:c1,c2,...}}"
     },
     "magneticdipolemomentvectoralternateunits{}": {
-      "snippet": "magneticdipolemomentvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "magneticdipolemomentvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectormagneticdipolemomentalternateunits{}": {
-      "snippet": "vectormagneticdipolemomentalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticdipolemomentalternateunits{${1:c1,c2,...}}"
     },
     "magneticdipolemomentvectoronlybaseunits": {},
     "vectormagneticdipolemomentonlybaseunits": {},
@@ -972,10 +972,10 @@
       "snippet": "magneticfield{${1:magnitude}}"
     },
     "magneticfieldvector{}": {
-      "snippet": "magneticfieldvector{${1:c1,${2:c2},...}}"
+      "snippet": "magneticfieldvector{${1:c1,c2,...}}"
     },
     "vectormagneticfield{}": {
-      "snippet": "vectormagneticfield{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticfield{${1:c1,c2,...}}"
     },
     "magneticfieldvalue{}": {
       "snippet": "magneticfieldvalue{${1:magnitude}}"
@@ -993,28 +993,28 @@
     "magneticfieldonlyderivedunits": {},
     "magneticfieldonlyalternateunits": {},
     "magneticfieldvectorvalue{}": {
-      "snippet": "magneticfieldvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "magneticfieldvectorvalue{${1:c1,c2,...}}"
     },
     "vectormagneticfieldvalue{}": {
-      "snippet": "vectormagneticfieldvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticfieldvalue{${1:c1,c2,...}}"
     },
     "magneticfieldvectorbaseunits{}": {
-      "snippet": "magneticfieldvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "magneticfieldvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectormagneticfieldbaseunits{}": {
-      "snippet": "vectormagneticfieldbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticfieldbaseunits{${1:c1,c2,...}}"
     },
     "magneticfieldvectorderivedunits{}": {
-      "snippet": "magneticfieldvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "magneticfieldvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectormagneticfieldderivedunits{}": {
-      "snippet": "vectormagneticfieldderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticfieldderivedunits{${1:c1,c2,...}}"
     },
     "magneticfieldvectoralternateunits{}": {
-      "snippet": "magneticfieldvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "magneticfieldvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectormagneticfieldalternateunits{}": {
-      "snippet": "vectormagneticfieldalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormagneticfieldalternateunits{${1:c1,c2,...}}"
     },
     "magneticfieldvectoronlybaseunits": {},
     "vectormagneticfieldonlybaseunits": {},
@@ -1026,10 +1026,10 @@
       "snippet": "momentumflux{${1:magnitude}}"
     },
     "momentumfluxvector{}": {
-      "snippet": "momentumfluxvector{${1:c1,${2:c2},...}}"
+      "snippet": "momentumfluxvector{${1:c1,c2,...}}"
     },
     "vectormomentumflux{}": {
-      "snippet": "vectormomentumflux{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumflux{${1:c1,c2,...}}"
     },
     "momentumfluxvalue{}": {
       "snippet": "momentumfluxvalue{${1:magnitude}}"
@@ -1047,28 +1047,28 @@
     "momentumfluxonlyderivedunits": {},
     "momentumfluxonlyalternateunits": {},
     "momentumfluxvectorvalue{}": {
-      "snippet": "momentumfluxvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "momentumfluxvectorvalue{${1:c1,c2,...}}"
     },
     "vectormomentumfluxvalue{}": {
-      "snippet": "vectormomentumfluxvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumfluxvalue{${1:c1,c2,...}}"
     },
     "momentumfluxvectorbaseunits{}": {
-      "snippet": "momentumfluxvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "momentumfluxvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectormomentumfluxbaseunits{}": {
-      "snippet": "vectormomentumfluxbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumfluxbaseunits{${1:c1,c2,...}}"
     },
     "momentumfluxvectorderivedunits{}": {
-      "snippet": "momentumfluxvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "momentumfluxvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectormomentumfluxderivedunits{}": {
-      "snippet": "vectormomentumfluxderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumfluxderivedunits{${1:c1,c2,...}}"
     },
     "momentumfluxvectoralternateunits{}": {
-      "snippet": "momentumfluxvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "momentumfluxvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectormomentumfluxalternateunits{}": {
-      "snippet": "vectormomentumfluxalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectormomentumfluxalternateunits{${1:c1,c2,...}}"
     },
     "momentumfluxvectoronlybaseunits": {},
     "vectormomentumfluxonlybaseunits": {},
@@ -1080,10 +1080,10 @@
       "snippet": "poynting{${1:magnitude}}"
     },
     "poyntingvector{}": {
-      "snippet": "poyntingvector{${1:c1,${2:c2},...}}"
+      "snippet": "poyntingvector{${1:c1,c2,...}}"
     },
     "vectorpoynting{}": {
-      "snippet": "vectorpoynting{${1:c1,${2:c2},...}}"
+      "snippet": "vectorpoynting{${1:c1,c2,...}}"
     },
     "poyntingvalue{}": {
       "snippet": "poyntingvalue{${1:magnitude}}"
@@ -1101,28 +1101,28 @@
     "poyntingonlyderivedunits": {},
     "poyntingonlyalternateunits": {},
     "poyntingvectorvalue{}": {
-      "snippet": "poyntingvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "poyntingvectorvalue{${1:c1,c2,...}}"
     },
     "vectorpoyntingvalue{}": {
-      "snippet": "vectorpoyntingvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorpoyntingvalue{${1:c1,c2,...}}"
     },
     "poyntingvectorbaseunits{}": {
-      "snippet": "poyntingvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "poyntingvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorpoyntingbaseunits{}": {
-      "snippet": "vectorpoyntingbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorpoyntingbaseunits{${1:c1,c2,...}}"
     },
     "poyntingvectorderivedunits{}": {
-      "snippet": "poyntingvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "poyntingvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorpoyntingderivedunits{}": {
-      "snippet": "vectorpoyntingderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorpoyntingderivedunits{${1:c1,c2,...}}"
     },
     "poyntingvectoralternateunits{}": {
-      "snippet": "poyntingvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "poyntingvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorpoyntingalternateunits{}": {
-      "snippet": "vectorpoyntingalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorpoyntingalternateunits{${1:c1,c2,...}}"
     },
     "poyntingvectoronlybaseunits": {},
     "vectorpoyntingonlybaseunits": {},
@@ -1134,10 +1134,10 @@
       "snippet": "torque{${1:magnitude}}"
     },
     "torquevector{}": {
-      "snippet": "torquevector{${1:c1,${2:c2},...}}"
+      "snippet": "torquevector{${1:c1,c2,...}}"
     },
     "vectortorque{}": {
-      "snippet": "vectortorque{${1:c1,${2:c2},...}}"
+      "snippet": "vectortorque{${1:c1,c2,...}}"
     },
     "torquevalue{}": {
       "snippet": "torquevalue{${1:magnitude}}"
@@ -1155,28 +1155,28 @@
     "torqueonlyderivedunits": {},
     "torqueonlyalternateunits": {},
     "torquevectorvalue{}": {
-      "snippet": "torquevectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "torquevectorvalue{${1:c1,c2,...}}"
     },
     "vectortorquevalue{}": {
-      "snippet": "vectortorquevalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectortorquevalue{${1:c1,c2,...}}"
     },
     "torquevectorbaseunits{}": {
-      "snippet": "torquevectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "torquevectorbaseunits{${1:c1,c2,...}}"
     },
     "vectortorquebaseunits{}": {
-      "snippet": "vectortorquebaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectortorquebaseunits{${1:c1,c2,...}}"
     },
     "torquevectorderivedunits{}": {
-      "snippet": "torquevectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "torquevectorderivedunits{${1:c1,c2,...}}"
     },
     "vectortorquederivedunits{}": {
-      "snippet": "vectortorquederivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectortorquederivedunits{${1:c1,c2,...}}"
     },
     "torquevectoralternateunits{}": {
-      "snippet": "torquevectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "torquevectoralternateunits{${1:c1,c2,...}}"
     },
     "vectortorquealternateunits{}": {
-      "snippet": "vectortorquealternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectortorquealternateunits{${1:c1,c2,...}}"
     },
     "torquevectoronlybaseunits": {},
     "vectortorqueonlybaseunits": {},
@@ -1188,10 +1188,10 @@
       "snippet": "velocity{${1:magnitude}}"
     },
     "velocityvector{}": {
-      "snippet": "velocityvector{${1:c1,${2:c2},...}}"
+      "snippet": "velocityvector{${1:c1,c2,...}}"
     },
     "vectorvelocity{}": {
-      "snippet": "vectorvelocity{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocity{${1:c1,c2,...}}"
     },
     "velocityvalue{}": {
       "snippet": "velocityvalue{${1:magnitude}}"
@@ -1209,28 +1209,28 @@
     "velocityonlyderivedunits": {},
     "velocityonlyalternateunits": {},
     "velocityvectorvalue{}": {
-      "snippet": "velocityvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "velocityvectorvalue{${1:c1,c2,...}}"
     },
     "vectorvelocityvalue{}": {
-      "snippet": "vectorvelocityvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocityvalue{${1:c1,c2,...}}"
     },
     "velocityvectorbaseunits{}": {
-      "snippet": "velocityvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "velocityvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorvelocitybaseunits{}": {
-      "snippet": "vectorvelocitybaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocitybaseunits{${1:c1,c2,...}}"
     },
     "velocityvectorderivedunits{}": {
-      "snippet": "velocityvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "velocityvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorvelocityderivedunits{}": {
-      "snippet": "vectorvelocityderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocityderivedunits{${1:c1,c2,...}}"
     },
     "velocityvectoralternateunits{}": {
-      "snippet": "velocityvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "velocityvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorvelocityalternateunits{}": {
-      "snippet": "vectorvelocityalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocityalternateunits{${1:c1,c2,...}}"
     },
     "velocityvectoronlybaseunits": {},
     "vectorvelocityonlybaseunits": {},
@@ -1242,10 +1242,10 @@
       "snippet": "velocityc{${1:magnitude}}"
     },
     "velocitycvector{}": {
-      "snippet": "velocitycvector{${1:c1,${2:c2},...}}"
+      "snippet": "velocitycvector{${1:c1,c2,...}}"
     },
     "vectorvelocityc{}": {
-      "snippet": "vectorvelocityc{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocityc{${1:c1,c2,...}}"
     },
     "velocitycvalue{}": {
       "snippet": "velocitycvalue{${1:magnitude}}"
@@ -1263,28 +1263,28 @@
     "velocityconlyderivedunits": {},
     "velocityconlyalternateunits": {},
     "velocitycvectorvalue{}": {
-      "snippet": "velocitycvectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "velocitycvectorvalue{${1:c1,c2,...}}"
     },
     "vectorvelocitycvalue{}": {
-      "snippet": "vectorvelocitycvalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocitycvalue{${1:c1,c2,...}}"
     },
     "velocitycvectorbaseunits{}": {
-      "snippet": "velocitycvectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "velocitycvectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorvelocitycbaseunits{}": {
-      "snippet": "vectorvelocitycbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocitycbaseunits{${1:c1,c2,...}}"
     },
     "velocitycvectorderivedunits{}": {
-      "snippet": "velocitycvectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "velocitycvectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorvelocitycderivedunits{}": {
-      "snippet": "vectorvelocitycderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocitycderivedunits{${1:c1,c2,...}}"
     },
     "velocitycvectoralternateunits{}": {
-      "snippet": "velocitycvectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "velocitycvectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorvelocitycalternateunits{}": {
-      "snippet": "vectorvelocitycalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorvelocitycalternateunits{${1:c1,c2,...}}"
     },
     "velocitycvectoronlybaseunits": {},
     "vectorvelocityconlybaseunits": {},
@@ -1296,10 +1296,10 @@
       "snippet": "wavenumber{${1:magnitude}}"
     },
     "wavenumbervector{}": {
-      "snippet": "wavenumbervector{${1:c1,${2:c2},...}}"
+      "snippet": "wavenumbervector{${1:c1,c2,...}}"
     },
     "vectorwavenumber{}": {
-      "snippet": "vectorwavenumber{${1:c1,${2:c2},...}}"
+      "snippet": "vectorwavenumber{${1:c1,c2,...}}"
     },
     "wavenumbervalue{}": {
       "snippet": "wavenumbervalue{${1:magnitude}}"
@@ -1317,28 +1317,28 @@
     "wavenumberonlyderivedunits": {},
     "wavenumberonlyalternateunits": {},
     "wavenumbervectorvalue{}": {
-      "snippet": "wavenumbervectorvalue{${1:c1,${2:c2},...}}"
+      "snippet": "wavenumbervectorvalue{${1:c1,c2,...}}"
     },
     "vectorwavenumbervalue{}": {
-      "snippet": "vectorwavenumbervalue{${1:c1,${2:c2},...}}"
+      "snippet": "vectorwavenumbervalue{${1:c1,c2,...}}"
     },
     "wavenumbervectorbaseunits{}": {
-      "snippet": "wavenumbervectorbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "wavenumbervectorbaseunits{${1:c1,c2,...}}"
     },
     "vectorwavenumberbaseunits{}": {
-      "snippet": "vectorwavenumberbaseunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorwavenumberbaseunits{${1:c1,c2,...}}"
     },
     "wavenumbervectorderivedunits{}": {
-      "snippet": "wavenumbervectorderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "wavenumbervectorderivedunits{${1:c1,c2,...}}"
     },
     "vectorwavenumberderivedunits{}": {
-      "snippet": "vectorwavenumberderivedunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorwavenumberderivedunits{${1:c1,c2,...}}"
     },
     "wavenumbervectoralternateunits{}": {
-      "snippet": "wavenumbervectoralternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "wavenumbervectoralternateunits{${1:c1,c2,...}}"
     },
     "vectorwavenumberalternateunits{}": {
-      "snippet": "vectorwavenumberalternateunits{${1:c1,${2:c2},...}}"
+      "snippet": "vectorwavenumberalternateunits{${1:c1,c2,...}}"
     },
     "wavenumbervectoronlybaseunits": {},
     "vectorwavenumberonlybaseunits": {},
@@ -2933,16 +2933,16 @@
       "snippet": "xtento{${1:number}}"
     },
     "mivector{}": {
-      "snippet": "mivector{${1:c1,${2:c2},...}}"
+      "snippet": "mivector{${1:c1,c2,...}}"
     },
     "mivector[]{}": {
-      "snippet": "mivector[${2:delimiter}]{${1:c1,${3:c2},...}}"
+      "snippet": "mivector[${2:delimiter}]{${1:c1,c2,...}}"
     },
     "mivector{}[]": {
-      "snippet": "mivector{${1:c1,${3:c2},...}}[${2:units}]"
+      "snippet": "mivector{${1:c1,c2,...}}[${2:units}]"
     },
     "mivector[]{}[]": {
-      "snippet": "mivector[${2:delimiter}]{${1:c1,${4:c2},...}}[${3:units}]"
+      "snippet": "mivector[${2:delimiter}]{${1:c1,c2,...}}[${3:units}]"
     }
   },
   "envs": {
diff --git a/dev/packages/mandistudent.json b/dev/packages/mandistudent.json
index 3b24464be..f31d8e604 100644
--- a/dev/packages/mandistudent.json
+++ b/dev/packages/mandistudent.json
@@ -169,16 +169,16 @@
       "keyvalpos": 0
     },
     "colvec{}": {
-      "snippet": "colvec{${1:c1,${2:c2},...}}"
+      "snippet": "colvec{${1:c1,c2,...}}"
     },
     "colvec[]{}": {
-      "snippet": "colvec[${2:delimiter}]{${1:c1,${3:c2},...}}"
+      "snippet": "colvec[${2:delimiter}]{${1:c1,c2,...}}"
     },
     "rowvec{}": {
-      "snippet": "rowvec{${1:c1,${2:c2},...}}"
+      "snippet": "rowvec{${1:c1,c2,...}}"
     },
     "rowvec[]{}": {
-      "snippet": "rowvec[${2:delimiter}]{${1:c1,${3:c2},...}}"
+      "snippet": "rowvec[${2:delimiter}]{${1:c1,c2,...}}"
     },
     "veccomp{}": {
       "snippet": "veccomp{${1:symbol}}"
@@ -217,15 +217,9 @@
     "vpythonfile{}{}": {
       "snippet": "vpythonfile{${1:file}}{${2:caption}}"
     },
-    "vpythonfile(){}{}": {
-      "snippet": "vpythonfile(${3:link}){${1:file}}{${2:caption}}"
-    },
     "vpythonfile[]{}{}": {
       "snippet": "vpythonfile[${3:options}]{${1:file}}{${2:caption}}"
     },
-    "vpythonfile[](){}{}": {
-      "snippet": "vpythonfile[${3:options}](${4:link}){${1:file}}{${2:caption}}"
-    },
     "webvpythoninline{}": {
       "snippet": "webvpythoninline{${1:Web VPython code}}"
     },
@@ -335,22 +329,6 @@
     "parts": {},
     "physicssolution": {},
     "physicssolution*": {},
-    "webvpythonblock(link){}": {
-      "name": "webvpythonblock",
-      "snippet": "(${2:link}){${1:caption}}"
-    },
-    "webvpythonblock[](link){}": {
-      "name": "webvpythonblock",
-      "snippet": "[${2:options}](${3:link}){${1:caption}}"
-    },
-    "webvpythonblock*(link){}": {
-      "name": "webvpythonblock*",
-      "snippet": "(${2:link}){${1:caption}}"
-    },
-    "webvpythonblock*[](link){}": {
-      "name": "webvpythonblock*",
-      "snippet": "[${2:options}](${3:link}){${1:caption}}"
-    },
     "enumerate*": {},
     "enumerate*[]": {
       "name": "enumerate*",
diff --git a/dev/packages/mathsemantics-manifolds.json b/dev/packages/mathsemantics-manifolds.json
index a4f1d3d1a..9b96167c0 100644
--- a/dev/packages/mathsemantics-manifolds.json
+++ b/dev/packages/mathsemantics-manifolds.json
@@ -45,73 +45,37 @@
     "exponential{}": {
       "snippet": "exponential{${1:base}}"
     },
-    "exponential{}()": {
-      "snippet": "exponential{${1:base}}(${2:arg})"
-    },
     "exponential[]{}": {
       "snippet": "exponential[${2:scale}]{${1:base}}"
     },
-    "exponential[]{}()": {
-      "snippet": "exponential[${2:scale}]{${1:base}}(${3:arg})"
-    },
-    "geodesic<>()": {
-      "snippet": "geodesic<${1:s}>(${2:eval point})"
-    },
     "geodesic<>[]": {
       "snippet": "geodesic<${2:s}>[${1:scale}]"
     },
-    "geodesic<>[]()": {
-      "snippet": "geodesic<${2:s}>[${1:scale}](${3:eval point})"
-    },
     "geodesic<>{}{}": {
       "snippet": "geodesic<${3:style}>{${1:t0}}{${2:t1}}"
     },
-    "geodesic<>{}{}()": {
-      "snippet": "geodesic<${3:style}>{${1:t0}}{${2:t1}}(${4:eval point})"
-    },
     "geodesic<>[]{}{}": {
       "snippet": "geodesic<${4:style}>[${3:scale}]{${1:t0}}{${2:t1}}"
     },
-    "geodesic<>[]{}{}()": {
-      "snippet": "geodesic<${4:style}>[${3:scale}]{${1:t0}}{${2:t1}}(${5:eval point})"
-    },
     "geodesic{}{}": {
       "snippet": "geodesic|${3:symbol}|{${1:t0}}{${2:t1}}"
     },
-    "geodesic{}{}()": {
-      "snippet": "geodesic|${4:symbol}|{${1:t0}}{${2:t1}}(${3:eval point})"
-    },
     "geodesic[]{}{}": {
       "snippet": "geodesic|${4:symbol}|[${3:scale}]{${1:t0}}{${2:t1}}"
     },
-    "geodesic[]{}{}()": {
-      "snippet": "geodesic|${5:symbol}|[${3:scale}]{${1:t0}}{${2:t1}}(${4:eval point})"
-    },
     "logOp": {},
     "logarithm{}": {
       "snippet": "logarithm{${1:base}}"
     },
-    "logarithm{}()": {
-      "snippet": "logarithm{${1:base}}(${2:arg})"
-    },
     "logarithm[]{}": {
       "snippet": "logarithm[${2:scale}]{${1:base}}"
     },
-    "logarithm[]{}()": {
-      "snippet": "logarithm[${2:scale}]{${1:base}}(${3:arg})"
-    },
     "inverseRetract{}": {
       "snippet": "inverseRetract{${1:base}}"
     },
-    "inverseRetract{}()": {
-      "snippet": "inverseRetract{${1:base}}(${2:arg})"
-    },
     "inverseRetract[]{}": {
       "snippet": "inverseRetract[${2:scale}]{${1:base}}"
     },
-    "inverseRetract[]{}()": {
-      "snippet": "inverseRetract[${2:scale}]{${1:base}}(${3:arg})"
-    },
     "lie{}{}": {
       "snippet": "lie{${1:arg1}}{${2:arg2}}"
     },
@@ -121,63 +85,33 @@
     "parallelTransport{}{}": {
       "snippet": "parallelTransport{${1:start}}{${2:end}}"
     },
-    "parallelTransport{}{}()": {
-      "snippet": "parallelTransport{${1:start}}{${2:end}}(${3:arg})"
-    },
     "parallelTransport{}{}[]": {
       "snippet": "parallelTransport{${1:start}}{${2:end}}[${3:sup}]"
     },
-    "parallelTransport{}{}()[]": {
-      "snippet": "parallelTransport{${1:start}}{${2:end}}(${4:arg})[${3:sup}]"
-    },
     "parallelTransport[]{}{}": {
       "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}"
     },
-    "parallelTransport[]{}{}()": {
-      "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}(${4:arg})"
-    },
     "parallelTransport[]{}{}[]": {
       "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}[${4:sup}]"
     },
-    "parallelTransport[]{}{}()[]": {
-      "snippet": "parallelTransport[${3:scale}]{${1:start}}{${2:end}}(${5:arg})[${4:sup}]"
-    },
     "parallelTransportDir{}{}": {
       "snippet": "parallelTransportDir{${1:start}}{${2:dir}}"
     },
-    "parallelTransportDir{}{}()": {
-      "snippet": "parallelTransportDir{${1:start}}{${2:dir}}(${3:arg})"
-    },
     "parallelTransportDir{}{}[]": {
       "snippet": "parallelTransportDir{${1:start}}{${2:dir}}[${3:sup}]"
     },
-    "parallelTransportDir{}{}()[]": {
-      "snippet": "parallelTransportDir{${1:start}}{${2:dir}}(${4:arg})[${3:sup}]"
-    },
     "parallelTransportDir[]{}{}": {
       "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}"
     },
-    "parallelTransportDir[]{}{}()": {
-      "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${4:arg})"
-    },
     "parallelTransportDir[]{}{}[]": {
       "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}[${4:sup}]"
     },
-    "parallelTransportDir[]{}{}()[]": {
-      "snippet": "parallelTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${5:arg})[${4:sup}]"
-    },
     "retract{}": {
       "snippet": "retract{${1:base}}"
     },
-    "retract{}()": {
-      "snippet": "retract{${1:base}}(${2:arg})"
-    },
     "retract[]{}": {
       "snippet": "retract[${2:scale}]{${1:base}}"
     },
-    "retract[]{}()": {
-      "snippet": "retract[${2:scale}]{${1:base}}(${3:arg})"
-    },
     "riemannian{}{}": {
       "snippet": "riemannian{${1:arg1}}{${2:arg2}}"
     },
@@ -233,50 +167,26 @@
     "vectorTransport{}{}": {
       "snippet": "vectorTransport{${1:start}}{${2:end}}"
     },
-    "vectorTransport{}{}()": {
-      "snippet": "vectorTransport{${1:start}}{${2:end}}(${3:arg})"
-    },
     "vectorTransport{}{}[]": {
       "snippet": "vectorTransport{${1:start}}{${2:end}}[${3:sup}]"
     },
-    "vectorTransport{}{}()[]": {
-      "snippet": "vectorTransport{${1:start}}{${2:end}}(${4:arg})[${3:sup}]"
-    },
     "vectorTransport[]{}{}": {
       "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}"
     },
-    "vectorTransport[]{}{}()": {
-      "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}(${4:arg})"
-    },
     "vectorTransport[]{}{}[]": {
       "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}[${4:sup}]"
     },
-    "vectorTransport[]{}{}()[]": {
-      "snippet": "vectorTransport[${3:scale}]{${1:start}}{${2:end}}(${5:arg})[${4:sup}]"
-    },
     "vectorTransportDir{}{}": {
       "snippet": "vectorTransportDir{${1:start}}{${2:dir}}"
     },
-    "vectorTransportDir{}{}()": {
-      "snippet": "vectorTransportDir{${1:start}}{${2:dir}}(${3:arg})"
-    },
     "vectorTransportDir{}{}[]": {
       "snippet": "vectorTransportDir{${1:start}}{${2:dir}}[${3:sup}]"
     },
-    "vectorTransportDir{}{}()[]": {
-      "snippet": "vectorTransportDir{${1:start}}{${2:dir}}(${4:arg})[${3:sup}]"
-    },
     "vectorTransportDir[]{}{}": {
       "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}"
     },
-    "vectorTransportDir[]{}{}()": {
-      "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${4:arg})"
-    },
     "vectorTransportDir[]{}{}[]": {
       "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}[${4:sup}]"
-    },
-    "vectorTransportDir[]{}{}()[]": {
-      "snippet": "vectorTransportDir[${3:scale}]{${1:start}}{${2:dir}}(${5:arg})[${4:sup}]"
     }
   },
   "envs": {},
diff --git a/dev/packages/mathsemantics-semantic.json b/dev/packages/mathsemantics-semantic.json
index 1ad04c289..777018ed2 100644
--- a/dev/packages/mathsemantics-semantic.json
+++ b/dev/packages/mathsemantics-semantic.json
@@ -87,35 +87,23 @@
     "proj{}": {
       "snippet": "proj{${1:sub}}"
     },
-    "proj{}()": {
-      "snippet": "proj{${1:sub}}(${2:arg})"
-    },
     "proj[]": {
       "snippet": "proj[${1:scale}]"
     },
     "proj[]{}": {
       "snippet": "proj[${2:scale}]{${1:sub}}"
     },
-    "proj[]{}()": {
-      "snippet": "proj[${2:scale}]{${1:sub}}(${3:arg})"
-    },
     "proxOp": {},
     "prox": {},
     "prox{}": {
       "snippet": "prox{${1:sub}}"
     },
-    "prox{}()": {
-      "snippet": "prox{${1:sub}}(${2:arg})"
-    },
     "prox[]": {
       "snippet": "prox[${1:scale}]"
     },
     "prox[]{}": {
       "snippet": "prox[${2:scale}]{${1:sub}}"
     },
-    "prox[]{}()": {
-      "snippet": "prox[${2:scale}]{${1:sub}}(${3:arg})"
-    },
     "aff": {},
     "arcosh": {},
     "arcoth": {},
diff --git a/dev/packages/mathspec.json b/dev/packages/mathspec.json
index 53cf5a422..630eca74d 100644
--- a/dev/packages/mathspec.json
+++ b/dev/packages/mathspec.json
@@ -11,18 +11,6 @@
     ]
   },
   "macros": {
-    "setmathsfont(){}": {
-      "snippet": "setmathsfont(${2:sets}){${1:font name}}"
-    },
-    "setmathsfont()[]{}": {
-      "snippet": "setmathsfont(${3:sets})[${2:font features}]{${1:font name}}"
-    },
-    "setmathfont(){}": {
-      "snippet": "setmathfont(${2:sets}){${1:font name}}"
-    },
-    "setmathfont()[]{}": {
-      "snippet": "setmathfont(${3:sets})[${2:font features}]{${1:font name}}"
-    },
     "setmathrm{}": {
       "snippet": "setmathrm{${1:font name}}"
     },
@@ -59,12 +47,6 @@
     "setmathfrak[]{}": {
       "snippet": "setmathfrak[${2:font features}]{${1:font name}}"
     },
-    "setallmainfonts(){}": {
-      "snippet": "setallmainfonts(${2:sets}){${1:font name}}"
-    },
-    "setallmainfonts()[]{}": {
-      "snippet": "setallmainfonts(${3:sets})[${2:font features}]{${1:font name}}"
-    },
     "setprimaryfont{}": {
       "snippet": "setprimaryfont{${1:font name}}"
     },
diff --git a/dev/packages/mathtools.json b/dev/packages/mathtools.json
deleted file mode 100644
index 2b225ffbc..000000000
--- a/dev/packages/mathtools.json
+++ /dev/null
@@ -1,521 +0,0 @@
-{
-  "includes": {
-    "keyval": [],
-    "calc": [],
-    "mhsetup": [],
-    "amsmath": [],
-    "graphicx": []
-  },
-  "macros": {
-    "mathtoolsset{}": {
-      "snippet": "mathtoolsset{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mathllap[]{}": {
-      "snippet": "mathllap[${2:mathstyle}]{${1:math}}"
-    },
-    "mathllap{}": {
-      "snippet": "mathllap{${1:math}}"
-    },
-    "mathrlap[]{}": {
-      "snippet": "mathrlap[${2:mathstyle}]{${1:math}}"
-    },
-    "mathrlap{}": {
-      "snippet": "mathrlap{${1:math}}"
-    },
-    "mathmbox{}": {
-      "snippet": "mathmbox{${1:math}}"
-    },
-    "mathclap[]{}": {
-      "snippet": "mathclap[${2:mathstyle}]{${1:math}}"
-    },
-    "mathclap{}": {
-      "snippet": "mathclap{${1:math}}"
-    },
-    "clap{}": {
-      "snippet": "clap{${1:text}}"
-    },
-    "mathmakebox[][]{}": {
-      "snippet": "mathmakebox[${2:width}][${3:pos}]{${1:math}}"
-    },
-    "mathmakebox[]{}": {
-      "snippet": "mathmakebox[${2:width}]{${1:math}}"
-    },
-    "mathmakebox{}": {
-      "snippet": "mathmakebox{${1:math}}"
-    },
-    "cramped[]{}": {
-      "snippet": "cramped[${2:mathstyle}]{${1:math}}"
-    },
-    "cramped{}": {
-      "snippet": "cramped{${1:math}}"
-    },
-    "crampedllap[]{}": {
-      "snippet": "crampedllap[${2:mathstyle}]{${1:math}}"
-    },
-    "crampedllap{}": {
-      "snippet": "crampedllap{${1:math}}"
-    },
-    "crampedrlap[]{}": {
-      "snippet": "crampedrlap[${2:mathstyle}]{${1:math}}"
-    },
-    "crampedrlap{}": {
-      "snippet": "crampedrlap{${1:math}}"
-    },
-    "crampedclap[]{}": {
-      "snippet": "crampedclap[${2:mathstyle}]{${1:math}}"
-    },
-    "crampedclap{}": {
-      "snippet": "crampedclap{${1:math}}"
-    },
-    "crampedsubstack{}": {
-      "snippet": "crampedsubstack{${1:arg}}"
-    },
-    "smashoperator[]{}": {
-      "snippet": "smashoperator[${2:pos}]{${1:operator with limits}}"
-    },
-    "smashoperator{}": {
-      "snippet": "smashoperator{${1:operator with limits}}"
-    },
-    "adjustlimits{}_{}{}_{}": {
-      "snippet": "adjustlimits{${1:operator1}}_{${2:limit1}}{${3:operator2}}_{${4:limit2}}"
-    },
-    "SwapAboveDisplaySkip": {},
-    "newtagform{}[]{}{}": {
-      "snippet": "newtagform{${1:name}}[${2:inner format}]{${3:left}}{${4:right}}"
-    },
-    "newtagform{}{}{}": {
-      "snippet": "newtagform{${1:name}}{${2:left}}{${3:right}}"
-    },
-    "renewtagform{}[]{}{}": {
-      "snippet": "renewtagform{${1:name}}[${2:inner format}]{${3:left}}{${4:right}}"
-    },
-    "renewtagform{}{}{}": {
-      "snippet": "renewtagform{${1:name}}{${2:left}}{${3:right}}"
-    },
-    "usetagform{}": {
-      "snippet": "usetagform{${1:name}}"
-    },
-    "refeq{}": {
-      "snippet": "refeq{${1:label}}"
-    },
-    "noeqref{}": {
-      "snippet": "noeqref{${1:labellist}}"
-    },
-    "xleftrightarrow{}": {
-      "snippet": "xleftrightarrow{${1:sup}}"
-    },
-    "xleftrightarrow[]{}": {
-      "snippet": "xleftrightarrow[${2:sub}]{${1:sup}}"
-    },
-    "xLeftarrow{}": {
-      "snippet": "xLeftarrow{${1:sup}}"
-    },
-    "xLeftarrow[]{}": {
-      "snippet": "xLeftarrow[${2:sub}]{${1:sup}}"
-    },
-    "xhookleftarrow{}": {
-      "snippet": "xhookleftarrow{${1:sup}}"
-    },
-    "xhookleftarrow[]{}": {
-      "snippet": "xhookleftarrow[${2:sub}]{${1:sup}}"
-    },
-    "xmapsto{}": {
-      "snippet": "xmapsto{${1:sup}}"
-    },
-    "xmapsto[]{}": {
-      "snippet": "xmapsto[${2:sub}]{${1:sup}}"
-    },
-    "xRightarrow{}": {
-      "snippet": "xRightarrow{${1:sup}}"
-    },
-    "xRightarrow[]{}": {
-      "snippet": "xRightarrow[${2:sub}]{${1:sup}}"
-    },
-    "xLeftrightarrow{}": {
-      "snippet": "xLeftrightarrow{${1:sup}}"
-    },
-    "xLeftrightarrow[]{}": {
-      "snippet": "xLeftrightarrow[${2:sub}]{${1:sup}}"
-    },
-    "xhookrightarrow{}": {
-      "snippet": "xhookrightarrow{${1:sup}}"
-    },
-    "xhookrightarrow[]{}": {
-      "snippet": "xhookrightarrow[${2:sub}]{${1:sup}}"
-    },
-    "xrightharpoondown{}": {
-      "snippet": "xrightharpoondown{${1:sup}}"
-    },
-    "xrightharpoondown[]{}": {
-      "snippet": "xrightharpoondown[${2:sub}]{${1:sup}}"
-    },
-    "xleftharpoondown{}": {
-      "snippet": "xleftharpoondown{${1:sup}}"
-    },
-    "xleftharpoondown[]{}": {
-      "snippet": "xleftharpoondown[${2:sub}]{${1:sup}}"
-    },
-    "xrightleftharpoons{}": {
-      "snippet": "xrightleftharpoons{${1:sup}}"
-    },
-    "xrightleftharpoons[]{}": {
-      "snippet": "xrightleftharpoons[${2:sub}]{${1:sup}}"
-    },
-    "xrightharpoonup{}": {
-      "snippet": "xrightharpoonup{${1:sup}}"
-    },
-    "xrightharpoonup[]{}": {
-      "snippet": "xrightharpoonup[${2:sub}]{${1:sup}}"
-    },
-    "xleftharpoonup{}": {
-      "snippet": "xleftharpoonup{${1:sup}}"
-    },
-    "xleftharpoonup[]{}": {
-      "snippet": "xleftharpoonup[${2:sub}]{${1:sup}}"
-    },
-    "xleftrightharpoons{}": {
-      "snippet": "xleftrightharpoons{${1:sup}}"
-    },
-    "xleftrightharpoons[]{}": {
-      "snippet": "xleftrightharpoons[${2:sub}]{${1:sup}}"
-    },
-    "xlongrightarrow{}": {
-      "snippet": "xlongrightarrow{${1:sup}}"
-    },
-    "xlongrightarrow[]{}": {
-      "snippet": "xlongrightarrow[${2:sub}]{${1:sup}}"
-    },
-    "xLongrightarrow{}": {
-      "snippet": "xLongrightarrow{${1:sup}}"
-    },
-    "xLongrightarrow[]{}": {
-      "snippet": "xLongrightarrow[${2:sub}]{${1:sup}}"
-    },
-    "xlongleftarrow{}": {
-      "snippet": "xlongleftarrow{${1:sup}}"
-    },
-    "xlongleftarrow[]{}": {
-      "snippet": "xlongleftarrow[${2:sub}]{${1:sup}}"
-    },
-    "xLongleftarrow{}": {
-      "snippet": "xLongleftarrow{${1:sup}}"
-    },
-    "xLongleftarrow[]{}": {
-      "snippet": "xLongleftarrow[${2:sub}]{${1:sup}}"
-    },
-    "underbracket[][]{}": {
-      "snippet": "underbracket[${2:rule thickness}][${3:bracket height}]{${1:arg}}"
-    },
-    "underbracket[]{}": {
-      "snippet": "underbracket[${2:rule thickness}]{${1:arg}}"
-    },
-    "underbracket{}": {
-      "snippet": "underbracket{${1:arg}}"
-    },
-    "overbracket[][]{}": {
-      "snippet": "overbracket[${2:rule thickness}][${3:bracket height}]{${1:arg}}"
-    },
-    "overbracket[]{}": {
-      "snippet": "overbracket[${2:rule thickness}]{${1:arg}}"
-    },
-    "overbracket{}": {
-      "snippet": "overbracket{${1:arg}}"
-    },
-    "LaTeXunderbrace{}": {
-      "snippet": "LaTeXunderbrace{${1:arg}}"
-    },
-    "LaTeXoverbrace{}": {
-      "snippet": "LaTeXoverbrace{${1:arg}}"
-    },
-    "newgathered{}{}{}{}": {
-      "snippet": "newgathered{${1:envname}}{${2:pre line}}{${3:post line}}{${4:after}}"
-    },
-    "renewgathered{}{}{}{}": {
-      "snippet": "renewgathered{${1:envname}}{${2:pre line}}{${3:post line}}{${4:after}}"
-    },
-    "MultlinedHook": {},
-    "shoveleft{}": {
-      "snippet": "shoveleft{${1:arg}}"
-    },
-    "shoveleft[]{}": {
-      "snippet": "shoveleft[${2:dimen}]{${1:arg}}"
-    },
-    "shoveright{}": {
-      "snippet": "shoveright{${1:arg}}"
-    },
-    "shoveright[]{}": {
-      "snippet": "shoveright[${2:dimen}]{${1:arg}}"
-    },
-    "MoveEqLeft": {},
-    "MoveEqLeft[]": {
-      "snippet": "MoveEqLeft[${1:number}]"
-    },
-    "Aboxed{}": {
-      "snippet": "Aboxed{${1:left hand side & right hand side}}"
-    },
-    "MakeAboxedCommand{}": {
-      "snippet": "MakeAboxedCommand{${1:cmd}}"
-    },
-    "ArrowBetweenLines": {},
-    "ArrowBetweenLines[]": {
-      "snippet": "ArrowBetweenLines[${1:symbol}]"
-    },
-    "ArrowBetweenLines*": {},
-    "ArrowBetweenLines*[]": {
-      "snippet": "ArrowBetweenLines*[${1:symbol}]"
-    },
-    "vdotswithin{}": {
-      "snippet": "vdotswithin{${1:symbol}}"
-    },
-    "shortvdotswithin{}": {
-      "snippet": "shortvdotswithin{${1:symbol}}"
-    },
-    "shortvdotswithin*{}": {
-      "snippet": "shortvdotswithin*{${1:symbol}}"
-    },
-    "MTFlushSpaceAbove": {},
-    "MTFlushSpaceBelow": {},
-    "origjot": {},
-    "shortintertext{}": {
-      "snippet": "shortintertext{${1:text}}"
-    },
-    "intertext{}": {
-      "snippet": "intertext{${1:text}}"
-    },
-    "DeclarePairedDelimiter{}{}{}": {
-      "snippet": "DeclarePairedDelimiter{${1:cmd}}{${2:left delim}}{${3:right delim}}"
-    },
-    "DeclarePairedDelimiterX{}[]{}{}{}": {
-      "snippet": "DeclarePairedDelimiterX{${1:cmd}}[${2:args}]{${3:left delim}}{${4:right delim}}{${5:body}}"
-    },
-    "DeclarePairedDelimiterXPP{}[]{}{}{}{}{}": {
-      "snippet": "DeclarePairedDelimiterXPP{${1:cmd}}[${2:args}]{${3:pre code}}{${4:left delim}}{${5:right delim}}{${6:post code}}{${7:body}}"
-    },
-    "reDeclarePairedDelimiterInnerWrapper{}{}{}": {
-      "snippet": "reDeclarePairedDelimiterInnerWrapper{${1:cmd}}{${2:star option}}{${3:code}}"
-    },
-    "lparen": {
-      "detail": "(",
-      "documentation": "LEFT PARENTHESIS"
-    },
-    "rparen": {
-      "detail": ")",
-      "documentation": "RIGHT PARENTHESIS"
-    },
-    "vcentcolon": {},
-    "ordinarycolon": {},
-    "coloneqq": {
-      "detail": "≔",
-      "documentation": "# : equals"
-    },
-    "eqqcolon": {
-      "detail": "≕",
-      "documentation": "equals, colon"
-    },
-    "colonapprox": {},
-    "dblcolon": {},
-    "Coloneqq": {
-      "detail": "⩴",
-      "documentation": "DOUBLE COLON EQUAL"
-    },
-    "Eqqcolon": {},
-    "Colonapprox": {},
-    "coloneq": {
-      "detail": "≔",
-      "documentation": "# : equals"
-    },
-    "eqcolon": {
-      "detail": "≕",
-      "documentation": "equals, colon"
-    },
-    "colonsim": {},
-    "Coloneq": {
-      "detail": "⩴",
-      "documentation": "DOUBLE COLON EQUAL"
-    },
-    "Eqcolon": {},
-    "Colonsim": {},
-    "approxcolon": {},
-    "Approxcolon": {},
-    "simcolon": {},
-    "Simcolon": {},
-    "colondash": {},
-    "Colondash": {},
-    "dashcolon": {
-      "detail": "∹",
-      "documentation": "EXCESS"
-    },
-    "Dashcolon": {},
-    "nuparrow": {},
-    "ndownarrow": {},
-    "bigtimes": {
-      "detail": "⨉",
-      "documentation": "N-ARY TIMES OPERATOR"
-    },
-    "prescript{}{}{}": {
-      "snippet": "prescript{${1:sup}}{${2:sub}}{${3:arg}}"
-    },
-    "splitfrac{}{}": {
-      "snippet": "splitfrac{${1:numer}}{${2:denom}}"
-    },
-    "splitdfrac{}{}": {
-      "snippet": "splitdfrac{${1:numer}}{${2:denom}}"
-    },
-    "xmathstrut{}": {
-      "snippet": "xmathstrut{${1:increase}}"
-    },
-    "xmathstrut[]{}": {
-      "snippet": "xmathstrut[${2:depth increase}]{${1:increase}}"
-    },
-    "newcases{}{}{}{}{}": {
-      "snippet": "newcases{${1:envname}}{${2:sep}}{${3:preamble}}{${4:left}}{${5:right}}"
-    },
-    "renewcases{}{}{}{}{}": {
-      "snippet": "renewcases{${1:envname}}{${2:sep}}{${3:preamble}}{${4:left}}{${5:right}}"
-    },
-    "upbracketfill{}{}": {
-      "snippet": "upbracketfill{${1:arg1}}{${2:arg2}}"
-    },
-    "upbracketend{}{}": {
-      "snippet": "upbracketend{${1:arg1}}{${2:arg2}}"
-    },
-    "downbracketfill{}{}": {
-      "snippet": "downbracketfill{${1:arg1}}{${2:arg2}}"
-    },
-    "downbracketend{}{}": {
-      "snippet": "downbracketend{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {
-    "crampedsubarray{}": {
-      "name": "crampedsubarray",
-      "snippet": "{${1:col}}"
-    },
-    "dcases": {},
-    "dcases*": {},
-    "rcases": {},
-    "rcases*": {},
-    "drcases": {},
-    "drcases*": {},
-    "cases*": {},
-    "matrix*[]": {
-      "name": "matrix*",
-      "snippet": "[${1:col}]"
-    },
-    "pmatrix*[]": {
-      "name": "pmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "bmatrix*[]": {
-      "name": "bmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "Bmatrix*[]": {
-      "name": "Bmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "vmatrix*[]": {
-      "name": "vmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "Vmatrix*[]": {
-      "name": "Vmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "smallmatrix*[]": {
-      "name": "smallmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "psmallmatrix": {},
-    "psmallmatrix*[]": {
-      "name": "psmallmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "bsmallmatrix": {},
-    "bsmallmatrix*[]": {
-      "name": "bsmallmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "Bsmallmatrix": {},
-    "Bsmallmatrix*[]": {
-      "name": "Bsmallmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "vsmallmatrix": {},
-    "vsmallmatrix*[]": {
-      "name": "vsmallmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "Vsmallmatrix": {},
-    "Vsmallmatrix*[]": {
-      "name": "Vsmallmatrix*",
-      "snippet": "[${1:col}]"
-    },
-    "spreadlines{}": {
-      "name": "spreadlines",
-      "snippet": "{${1:dimen}}"
-    },
-    "lgathered[]": {
-      "name": "lgathered",
-      "snippet": "[${1:pos}]"
-    },
-    "rgathered[]": {
-      "name": "rgathered",
-      "snippet": "[${1:pos}]"
-    },
-    "multlined": {},
-    "multlined[][]": {
-      "name": "multlined",
-      "snippet": "[${1:pos}][${2:width}]"
-    }
-  },
-  "options": [
-    "fixamsmath",
-    "donotfixamsmathbugs",
-    "allowspaces",
-    "disallowspaces",
-    "legacycolonsymbols",
-    "intlimits",
-    "nointlimits",
-    "sumlimits",
-    "nosumlimits",
-    "namelimits",
-    "nonamelimits",
-    "leqno",
-    "reqno",
-    "centertags",
-    "tbtags",
-    "cmex10",
-    "fleqn",
-    "alignedleftspaceyes",
-    "alignedleftspaceno",
-    "alignedleftspaceyesifneg"
-  ],
-  "keyvals": [
-    [
-      "showonlyrefs",
-      "showmanualtags",
-      "original-intertext",
-      "original-shortintertext",
-      "mathic",
-      "above-intertext-sep=",
-      "below-intertext-sep=",
-      "above-shortintertext-sep=",
-      "below-shortintertext-sep=",
-      "smallmatrix-align=",
-      "smallmatrix-inner-space=",
-      "firstline-afterskip=",
-      "lastline-preskip=",
-      "multlined-width=",
-      "multlined-pos=",
-      "centercolon",
-      "prescript-sup-format=${1:cmd}",
-      "prescript-sub-format=${1:cmd}",
-      "prescript-arg-format=${1:cmd}",
-      "shortvdotsadjustabove=",
-      "shortvdotsadjustbelow="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/memhangul-common.json b/dev/packages/memhangul-common.json
index 3ccab7642..f4f94fdf3 100644
--- a/dev/packages/memhangul-common.json
+++ b/dev/packages/memhangul-common.json
@@ -28,7 +28,7 @@
     "oblivoirlist": {},
     "oblivoirlists": {},
     "ReleaseMacros{}": {
-      "snippet": "ReleaseMacros{${1:macro1,${2:macro2},...}}"
+      "snippet": "ReleaseMacros{${1:macro1,macro2,...}}"
     },
     "snm{}": {
       "snippet": "snm{${1:text}}"
diff --git a/dev/packages/memoize.json b/dev/packages/memoize.json
deleted file mode 100644
index e016bf412..000000000
--- a/dev/packages/memoize.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "pdftexcmds": [],
-    "advice": []
-  },
-  "macros": {
-    "mmzset{}": {
-      "snippet": "mmzset{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mmznext{}": {
-      "snippet": "mmznext{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "nommzkeys{}": {
-      "snippet": "nommzkeys{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mmz{}": {
-      "snippet": "mmz{${1:code}}"
-    },
-    "mmz[]{}": {
-      "snippet": "mmz[${2:options}]{${1:code}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "nommz{}": {
-      "snippet": "nommz{${1:code}}"
-    },
-    "nommz[]{}": {
-      "snippet": "nommz[${2:options}]{${1:code}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mmzContext": {},
-    "mmzContextExtra": {},
-    "mmzNoRef{}": {
-      "snippet": "mmzNoRef{${1:label}}"
-    },
-    "mmzForceNoRef{}": {
-      "snippet": "mmzForceNoRef{${1:label}}"
-    },
-    "mmzAbort": {},
-    "mmzUnmemoizable": {},
-    "ifmmzUnmemoizable": {},
-    "Memoize{}{}": {
-      "snippet": "Memoize{${1:key}}{${2:code}}"
-    },
-    "mmzAtBeginMemoization": {},
-    "mmzAtEndMemoization": {},
-    "mmzAtEndMemoizationExtra": {},
-    "mmzAfterMemoization": {},
-    "mmzAfterMemoizationExtra": {},
-    "mmzCMemo": {},
-    "mmzCCMemo": {},
-    "ifmemoize": {},
-    "memoizetrue": {},
-    "memoizefalse": {},
-    "ifmemoizing": {},
-    "ifinmemoize": {},
-    "mmzSingleExternDriver{}": {
-      "snippet": "mmzSingleExternDriver{${1:code}}"
-    },
-    "mmzExternalizeBox{}{}": {
-      "snippet": "mmzExternalizeBox{${1:box}}{${2:token register}}"
-    },
-    "ifmmzkeepexterns": {},
-    "mmzkeepexternstrue": {},
-    "mmzkeepexternsfalse": {},
-    "IfMemoizing{}{}{}": {
-      "snippet": "IfMemoizing{${1:name}}{${2:true code}}{${3:false code}}"
-    },
-    "IfMemoizing[]{}{}{}": {
-      "snippet": "IfMemoizing[${4:offset}]{${1:name}}{${2:true code}}{${3:false code}}"
-    },
-    "memoizinggrouplevel": {},
-    "mmzRegularPages": {},
-    "mmzExternPages": {},
-    "mmzExtraPages": {},
-    "mmzTracingOn": {},
-    "mmzTracingOff": {},
-    "mmzThisContext": {},
-    "mmzMemo": {},
-    "mmzSource": {},
-    "mmzResource{}": {
-      "snippet": "mmzResource{${1:file}}"
-    },
-    "mmzIncludeExtern{}{}{}{}{}{}{}{}{}": {
-      "snippet": "mmzIncludeExtern{${1:seq}}{${2:\\hbox|\\vbox}}{${3:width}}{${4:height}}{${5:depth}}{${6:left}}{${7:bot}}{${8:right}}{${9:top}}"
-    },
-    "mmzLabel{}{}": {
-      "snippet": "mmzLabel{${1:key}}{${2:value}}"
-    },
-    "mmzEndMemo": {},
-    "mmzOutputDirectory": {},
-    "warningtext": {},
-    "externbasepath": {},
-    "pagenumber": {},
-    "expectedwidth": {},
-    "expectedheight": {},
-    "fromdocument": {},
-    "logfile": {},
-    "warningtemplate": {},
-    "force": {},
-    "mmzpdfmajorversion": {},
-    "mmzpdfminorversion": {},
-    "mmzUsedCMemo{}": {
-      "snippet": "mmzUsedCMemo{${1:filename}}"
-    },
-    "mmzUsedCCMemo{}": {
-      "snippet": "mmzUsedCCMemo{${1:filename}}"
-    },
-    "mmzUsedExtern{}": {
-      "snippet": "mmzUsedExtern{${1:filename}}"
-    },
-    "mmzNewCMemo{}": {
-      "snippet": "mmzNewCMemo{${1:filename}}"
-    },
-    "mmzNewCCMemo{}": {
-      "snippet": "mmzNewCCMemo{${1:filename}}"
-    },
-    "mmzNewExtern{}{}{}{}": {
-      "snippet": "mmzNewExtern{${1:filename}}{${2:page num}}{${3:width}}{${4:height}}"
-    },
-    "mmzPrefix{}": {
-      "snippet": "mmzPrefix{${1:path prefix}}"
-    },
-    "mmzAutoInit": {},
-    "mmzPgfAtBeginMemoization": {},
-    "mmzPgfAtEndMemoization": {},
-    "filetotoks{}{}": {
-      "snippet": "filetotoks{${1:arg1}}{${2:arg2}}"
-    },
-    "mmzRawCollectorOptions": {},
-    "mmzDriver": {},
-    "mmzvalueof{}": {
-      "snippet": "mmzvalueof{${1:arg}}"
-    },
-    "mmzBeamerPauses": {},
-    "mmzSetBeamerOverlays{}{}": {
-      "snippet": "mmzSetBeamerOverlays{${1:arg1}}{${2:arg2}}"
-    },
-    "mmzBeamerOverlays": {}
-  },
-  "envs": {
-    "memoize": {},
-    "memoize[]": {
-      "name": "memoize",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "nomemoize": {},
-    "nomemoize[]": {
-      "name": "nomemoize",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [
-    "options={${1:options}}",
-    "enable",
-    "disable",
-    "normal",
-    "readonly",
-    "recompile"
-  ],
-  "keyvals": [
-    [
-      "verbatim",
-      "verb",
-      "no verbatim",
-      "padding left=",
-      "padding right=",
-      "padding top=",
-      "padding bottom=",
-      "padding=",
-      "context=${1:tokens}",
-      "clear context",
-      "meaning to context={${1:command/env list}}",
-      "csname meaning to context=${1:csname}",
-      "key meaning to context=${1:key path}",
-      "key value to context=${1:key path}",
-      "padding to context",
-      "per overlay",
-      "capture=",
-      "driver=${1:code}",
-      "at begin memoization=${1:code}",
-      "at end memoization=${1:code}",
-      "after memoization=${1:code}",
-      "integrated driver=${1:name}",
-      "trace",
-      "include source in cmemo",
-      "include context in ccmemo",
-      "direct ccmemo input",
-      "memo dir=${1:directory}",
-      "no memo dir",
-      "prefix=${1:prefix}",
-      "mkdir",
-      "mkdir command=${1:system command}",
-      "output-directory=${1:directory}",
-      "extract={${1:extraction method}}",
-      "perl extraction command=${1:system command}",
-      "perl extraction options=${1:options}",
-      "python extraction command=${1:system command}",
-      "python extraction options=${1:options}",
-      "tex extraction command=${1:system command}",
-      "tex extraction options=${1:options}",
-      "tex extraction script=${1:TeX code}",
-      "record=${1:record type}",
-      "no record",
-      "makefile=${1:filename}",
-      "sh=${1:filename}",
-      "bat=${1:filename}",
-      "activation=",
-      "activate deferred",
-      "activate={${1:command/env list}}",
-      "deactivate={${1:command/env list}}",
-      "activate csname=${1:csname}",
-      "deactivate csname=${1:csname}",
-      "activate key={${1:list of key names}}",
-      "deactivate key={${1:list of key names}}",
-      "try activate",
-      "force activate",
-      "auto={${1:command or env}}{${2:keylist}}",
-      "auto csname={${1:csname}}{${2:keylist}}",
-      "auto key={${1:key}}{${2:keylist}}",
-      "auto'={${1:command or env}}{${2:keylist}}",
-      "auto csname'={${1:csname}}{${2:keylist}}",
-      "auto key'={${1:key}}{${2:keylist}}",
-      "manual",
-      "ignore spaces",
-      "biblatex={${1:additional configuration}}",
-      "biblatex ccmemo cite="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/memory.json b/dev/packages/memory.json
deleted file mode 100644
index d58b0beda..000000000
--- a/dev/packages/memory.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "newdata{}": {
-      "snippet": "newdata{${1:variable}}"
-    },
-    "newdata*{}": {
-      "snippet": "newdata*{${1:variable}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/menu.json b/dev/packages/menu.json
deleted file mode 100644
index 73f27245a..000000000
--- a/dev/packages/menu.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "includes": {
-    "xspace": [],
-    "bbding": [
-      "hand"
-    ],
-    "fancybox": [
-      "framed",
-      "grey"
-    ],
-    "color": [
-      "grey"
-    ]
-  },
-  "macros": {
-    "menu{}": {
-      "snippet": "menu{${1:entry1!entry2!!...}}"
-    },
-    "menuitem{}": {
-      "snippet": "menuitem{${1:item}}"
-    },
-    "menuitem[]{}": {
-      "snippet": "menuitem[${2:length}]{${1:item}}"
-    },
-    "menuitemactive{}": {
-      "snippet": "menuitemactive{${1:item}}"
-    },
-    "menuitemactive[]{}": {
-      "snippet": "menuitemactive[${2:length}]{${1:item}}"
-    },
-    "menuseparator": {},
-    "menuseparator[]": {
-      "snippet": "menuseparator[${1:length}]"
-    },
-    "menutext{}": {
-      "snippet": "menutext{${1:text}}"
-    },
-    "menumathsymbols{}{}": {
-      "snippet": "menumathsymbols{${1:symbol1}}{${2:symbol2}}"
-    },
-    "menumathsymbols[]{}{}": {
-      "snippet": "menumathsymbols[${3:start}]{${1:symbol1}}{${2:symbol2}}"
-    },
-    "menusymbols{}{}": {
-      "snippet": "menusymbols{${1:symbol1}}{${2:symbol2}}"
-    },
-    "menusymbols[]{}{}": {
-      "snippet": "menusymbols[${3:start}]{${1:symbol1}}{${2:symbol2}}"
-    },
-    "menusymbols{}{}[]": {
-      "snippet": "menusymbols{${1:symbol1}}{${2:symbol2}}[${3:end}]"
-    },
-    "menusymbols[]{}{}[]": {
-      "snippet": "menusymbols[${3:start}]{${1:symbol1}}{${2:symbol2}}[${4:end}]"
-    },
-    "menufolderentry{}": {
-      "snippet": "menufolderentry{${1:title}}"
-    },
-    "menufolderentry[]{}": {
-      "snippet": "menufolderentry[${2:length}]{${1:title}}"
-    },
-    "menuitemactivesymbol": {},
-    "menuitemlength": {},
-    "menusep": {},
-    "ifmenuoptionhand": {},
-    "menuoptionhandtrue": {},
-    "menuoptionhandfalse": {},
-    "ifmenuoptionframed": {},
-    "menuoptionframedtrue": {},
-    "menuoptionframedfalse": {},
-    "ifmenuoptiongrey": {},
-    "menuoptiongreytrue": {},
-    "menuoptiongreyfalse": {},
-    "gt": {},
-    "filedate": {},
-    "fileversion": {}
-  },
-  "envs": {
-    "menufolder{}": {
-      "name": "menufolder",
-      "snippet": "{${1:title}}"
-    },
-    "menufolder[]{}": {
-      "name": "menufolder",
-      "snippet": "[${2:length}]{${1:title}}"
-    }
-  },
-  "options": [
-    "hand",
-    "framed",
-    "grey"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/merge.json b/dev/packages/merge.json
deleted file mode 100644
index 998c6f97b..000000000
--- a/dev/packages/merge.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {
-    "merge{}": {
-      "name": "merge",
-      "snippet": "{${1:file}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/mfpic.json b/dev/packages/mfpic.json
index 72d7cdda4..2986f5961 100644
--- a/dev/packages/mfpic.json
+++ b/dev/packages/mfpic.json
@@ -19,11 +19,11 @@
       "snippet": "applyT{${1:transformer}}"
     },
     "arc[]{}": {
-      "snippet": "arc[${2:t}]{${1:p0,${3:p1},p2}}"
+      "snippet": "arc[${2:t}]{${1:p0,p1,p2}}"
     },
     "arccomplement": {},
     "areagradient{}": {
-      "snippet": "areagradient{${1:function,${2:hdim},vdim}}"
+      "snippet": "areagradient{${1:function,hdim,vdim}}"
     },
     "arrow": {},
     "arrow*": {},
@@ -87,13 +87,13 @@
       "snippet": "backgroundcolor{${1:color spec}}"
     },
     "barchart[]{}{}": {
-      "snippet": "barchart[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "barchart[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "barchart{}{}": {
       "snippet": "barchart{${1:h or v}}{${2:list}}"
     },
     "bargraph[]{}{}": {
-      "snippet": "bargraph[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "bargraph[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "bargraph{}{}": {
       "snippet": "bargraph{${1:h or v}}{${2:list}}"
@@ -103,10 +103,10 @@
       "snippet": "bclosed[${1:tension}]"
     },
     "belowfcn[]{}{}": {
-      "snippet": "belowfcn[${3:spec}]{${1:xmin,${4:xmax},∆x}}{${2:f(${5:x})}}"
+      "snippet": "belowfcn[${3:spec}]{${1:xmin,xmax,∆x}}{${2:f(${4:x})}}"
     },
     "belowfcn{}{}": {
-      "snippet": "belowfcn{${1:xmin,${3:xmax},∆x}}{${2:f(${4:x})}}"
+      "snippet": "belowfcn{${1:xmin,xmax,∆x}}{${2:f(${3:x})}}"
     },
     "bmarks[]{}": {
       "snippet": "bmarks[${2:length}]{${1:number list}}"
@@ -122,19 +122,19 @@
       "snippet": "browniangraph{${1:num,scale}}"
     },
     "brownianmotion{}": {
-      "snippet": "brownianmotion{${1:start,${2:num},scale}}"
+      "snippet": "brownianmotion{${1:start,num,scale}}"
     },
     "btwnfcn[]{}{}{}": {
-      "snippet": "btwnfcn[${4:spec}]{${1:xmin,${5:xmax},∆x}}{${2:f(${6:x})}}{${3:g(${7:x})}}"
+      "snippet": "btwnfcn[${4:spec}]{${1:xmin,xmax,∆x}}{${2:f(${5:x})}}{${3:g(${6:x})}}"
     },
     "btwnfcn{}{}{}": {
-      "snippet": "btwnfcn{${1:xmin,${4:xmax},∆x}}{${2:f(${5:x})}}{${3:g(${6:x})}}"
+      "snippet": "btwnfcn{${1:xmin,xmax,∆x}}{${2:f(${4:x})}}{${3:g(${5:x})}}"
     },
     "btwnplrfcn[]{}{}{}": {
-      "snippet": "btwnplrfcn[${4:spec}]{${1:θmin,${5:θmax},∆θ}}{${2:f(${6:θ})}}{${3:g(${7:θ})}}"
+      "snippet": "btwnplrfcn[${4:spec}]{${1:θmin,θmax,∆θ}}{${2:f(${5:θ})}}{${3:g(${6:θ})}}"
     },
     "btwnplrfcn{}{}{}": {
-      "snippet": "btwnplrfcn{${1:θmin,${4:θmax},∆θ}}{${2:f(${5:θ})}}{${3:g(${6:θ})}}"
+      "snippet": "btwnplrfcn{${1:θmin,θmax,∆θ}}{${2:f(${4:θ})}}{${3:g(${5:θ})}}"
     },
     "cbclosed": {},
     "cbeziers{}": {
@@ -144,7 +144,7 @@
       "snippet": "chartbar{${1:number}}"
     },
     "circle[]{}": {
-      "snippet": "circle[${2:t}]{${1:p1,${3:p2},p3}}"
+      "snippet": "circle[${2:t}]{${1:p1,p2,p3}}"
     },
     "clearsymbols": {},
     "clipmfpic": {},
@@ -155,19 +155,19 @@
       "snippet": "closedcomputedspline{${1:list}}"
     },
     "closedconvexcurve[]{}": {
-      "snippet": "closedconvexcurve[${2:tension}]{${1:p0,${3:p1},...}}"
+      "snippet": "closedconvexcurve[${2:tension}]{${1:p0,p1,...}}"
     },
     "closedconvexcurve{}": {
-      "snippet": "closedconvexcurve{${1:p0,${2:p1},...}}"
+      "snippet": "closedconvexcurve{${1:p0,p1,...}}"
     },
     "closedcspline{}": {
       "snippet": "closedcspline{${1:list}}"
     },
     "closedcurve[]{}": {
-      "snippet": "closedcurve[${2:tension}]{${1:p0,${3:p1},...}}"
+      "snippet": "closedcurve[${2:tension}]{${1:p0,p1,...}}"
     },
     "closedcurve{}": {
-      "snippet": "closedcurve{${1:p0,${2:p1},...}}"
+      "snippet": "closedcurve{${1:p0,p1,...}}"
     },
     "closedmfbezier[]{}": {
       "snippet": "closedmfbezier[${2:tension}]{${1:list}}"
@@ -176,7 +176,7 @@
       "snippet": "closedmfbezier{${1:list}}"
     },
     "closedpolyline{}": {
-      "snippet": "closedpolyline{${1:p0,${2:p1},...}}"
+      "snippet": "closedpolyline{${1:p0,p1,...}}"
     },
     "closedqbeziers{}": {
       "snippet": "closedqbeziers{${1:list}}"
@@ -189,10 +189,10 @@
       "snippet": "cmykcolorarray{${1:var}}{${2:list of cmykcolors}}"
     },
     "coil[]{}": {
-      "snippet": "coil[${2:tension}]{${1:start,${3:end},${4:wl},amp}}"
+      "snippet": "coil[${2:tension}]{${1:start,end,wl,amp}}"
     },
     "coil{}": {
-      "snippet": "coil{${1:start,${2:end},${3:wl},amp}}"
+      "snippet": "coil{${1:start,end,wl,amp}}"
     },
     "colorarray{}{}": {
       "snippet": "colorarray{${1:var}}{${2:list of colors}}"
@@ -203,32 +203,32 @@
     },
     "connect": {},
     "convexcurve[]{}": {
-      "snippet": "convexcurve[${2:tension}]{${1:p0,${3:p1},...}}"
+      "snippet": "convexcurve[${2:tension}]{${1:p0,p1,...}}"
     },
     "convexcurve{}": {
-      "snippet": "convexcurve{${1:p0,${2:p1},...}}"
+      "snippet": "convexcurve{${1:p0,p1,...}}"
     },
     "convexcyclic[]{}": {
-      "snippet": "convexcyclic[${2:tension}]{${1:p0,${3:p1},...}}"
+      "snippet": "convexcyclic[${2:tension}]{${1:p0,p1,...}}"
     },
     "convexcyclic{}": {
-      "snippet": "convexcyclic{${1:p0,${2:p1},...}}"
+      "snippet": "convexcyclic{${1:p0,p1,...}}"
     },
     "coords": {},
     "corkscrew[]{}": {
-      "snippet": "corkscrew[${2:tension}]{${1:start,${3:end},${4:wl},amp}}"
+      "snippet": "corkscrew[${2:tension}]{${1:start,end,wl,amp}}"
     },
     "corkscrew{}": {
-      "snippet": "corkscrew{${1:start,${2:end},${3:wl},amp}}"
+      "snippet": "corkscrew{${1:start,end,wl,amp}}"
     },
     "cspline{}": {
       "snippet": "cspline{${1:list}}"
     },
     "curve[]{}": {
-      "snippet": "curve[${2:tension}]{${1:p0,${3:p1},...}}"
+      "snippet": "curve[${2:tension}]{${1:p0,p1,...}}"
     },
     "curve{}": {
-      "snippet": "curve{${1:p0,${2:p1},...}}"
+      "snippet": "curve{${1:p0,p1,...}}"
     },
     "cutoffafter{}": {
       "snippet": "cutoffafter{${1:object}}"
@@ -237,10 +237,10 @@
       "snippet": "cutoffbefore{${1:object}}"
     },
     "cyclic[]{}": {
-      "snippet": "cyclic[${2:tension}]{${1:p0,${3:p1},...}}"
+      "snippet": "cyclic[${2:tension}]{${1:p0,p1,...}}"
     },
     "cyclic{}": {
-      "snippet": "cyclic{${1:p0,${2:p1},...}}"
+      "snippet": "cyclic{${1:p0,p1,...}}"
     },
     "darkershade": {},
     "dashed[]": {
@@ -250,7 +250,7 @@
     "dashlen": {},
     "dashlineset": {},
     "dashpattern{}{}": {
-      "snippet": "dashpattern{${1:name}}{${2:len1,${3:...},len2k}}"
+      "snippet": "dashpattern{${1:name}}{${2:len1,...,len2k}}"
     },
     "dashspace": {},
     "datafile[]{}": {
@@ -264,13 +264,13 @@
       "snippet": "defaultplot{${1:method}}"
     },
     "DEgraph[]{}{}": {
-      "snippet": "DEgraph[${3:spec}]{${1:x0,${4:y0},${5:∆s},N}}{${2:f(${6:x},${7:y})}}"
+      "snippet": "DEgraph[${3:spec}]{${1:x0,y0,∆s,N}}{${2:f(${4:x,y})}}"
     },
     "DEgraph{}{}": {
-      "snippet": "DEgraph{${1:x0,${3:y0},${4:∆s},N}}{${2:f(${5:x},${6:y})}}"
+      "snippet": "DEgraph{${1:x0,y0,∆s,N}}{${2:f(${3:x,y})}}"
     },
     "DEtrajectory{}{}": {
-      "snippet": "DEtrajectory{${1:p0,${3:∆s},N}}{${2:F(${4:x},${5:y},${6:t})}}"
+      "snippet": "DEtrajectory{${1:p0,∆s,N}}{${2:F(${3:x,y,t})}}"
     },
     "doaxes[]{}": {
       "snippet": "doaxes[${2:length}]{${1:axis list}}"
@@ -306,10 +306,10 @@
       "snippet": "drawpen{${1:size}}"
     },
     "ellipse[]{}": {
-      "snippet": "ellipse[${2:θ}]{${1:c,${3:rx},ry}}"
+      "snippet": "ellipse[${2:θ}]{${1:c,rx,ry}}"
     },
     "ellipse{}": {
-      "snippet": "ellipse{${1:c,${2:rx},ry}}"
+      "snippet": "ellipse{${1:c,rx,ry}}"
     },
     "endconnect": {},
     "endcoords": {},
@@ -331,16 +331,16 @@
       "snippet": "everytlabel{${1:TeX code}}"
     },
     "fcncurve[]{}": {
-      "snippet": "fcncurve[${2:tension}]{${1:(${3:x0},${4:y0}),(${5:x1},${6:y1}),...}}"
+      "snippet": "fcncurve[${2:tension}]{${1:(${3:x0,y0}),(${4:x1,y1}),...}}"
     },
     "fcncurve{}": {
-      "snippet": "fcncurve{${1:(${2:x0},${3:y0}),(${4:x1},${5:y1}),...}}"
+      "snippet": "fcncurve{${1:(${2:x0,y0}),(${3:x1,y1}),...}}"
     },
     "fcnspline{}": {
       "snippet": "fcnspline{${1:list}}"
     },
     "fdef{}{}{}": {
-      "snippet": "fdef{${1:function}}{${2:param1,${4:param2},...}}{${3:MF expr}}"
+      "snippet": "fdef{${1:function}}{${2:param1,param2,...}}{${3:MF expr}}"
     },
     "fillcolor[]{}": {
       "snippet": "fillcolor[${2:model}]{${1:color spec}}"
@@ -349,16 +349,16 @@
       "snippet": "fillcolor{${1:color spec}}"
     },
     "fullellipse{}": {
-      "snippet": "fullellipse{${1:C,${2:M1},M2}}"
+      "snippet": "fullellipse{${1:C,M1,M2}}"
     },
     "function[]{}{}": {
-      "snippet": "function[${3:spec}]{${1:xmin,${4:xmax},∆x}}{${2:f(${5:x})}}"
+      "snippet": "function[${3:spec}]{${1:xmin,xmax,∆x}}{${2:f(${4:x})}}"
     },
     "function{}{}": {
-      "snippet": "function{${1:xmin,${3:xmax},∆x}}{${2:f(${4:x})}}"
+      "snippet": "function{${1:xmin,xmax,∆x}}{${2:f(${3:x})}}"
     },
     "gantt[]{}{}": {
-      "snippet": "gantt[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "gantt[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "gantt{}{}": {
       "snippet": "gantt{${1:h or v}}{${2:list}}"
@@ -367,7 +367,7 @@
       "snippet": "ganttbar{${1:number}}"
     },
     "gbrace{}": {
-      "snippet": "gbrace{${1:z1,${2:C},z2}}"
+      "snippet": "gbrace{${1:z1,C,z2}}"
     },
     "gclear": {},
     "gclip": {},
@@ -394,7 +394,7 @@
       "snippet": "globalsetmpvariable{${1:type}}{${2:name}}{${3:value}}"
     },
     "gradient{}": {
-      "snippet": "gradient{${1:function,${2:width},angle}}"
+      "snippet": "gradient{${1:function,width,angle}}"
     },
     "graphbar{}": {
       "snippet": "graphbar{${1:number}}"
@@ -422,7 +422,7 @@
       "snippet": "gridrays{${1:anglesep}}"
     },
     "halfellipse{}": {
-      "snippet": "halfellipse{${1:M1,${2:M2},M3}}"
+      "snippet": "halfellipse{${1:M1,M2,M3}}"
     },
     "hashlen": {},
     "hatch": {},
@@ -459,7 +459,7 @@
       "snippet": "histobar{${1:number}}"
     },
     "histogram[]{}{}": {
-      "snippet": "histogram[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "histogram[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "histogram{}{}": {
       "snippet": "histogram{${1:h or v}}{${2:list}}"
@@ -497,7 +497,7 @@
     },
     "lightershade": {},
     "lines{}": {
-      "snippet": "lines{${1:p0,${2:p1},...}}"
+      "snippet": "lines{${1:p0,p1,...}}"
     },
     "lmarks[]{}": {
       "snippet": "lmarks[${2:length}]{${1:number list}}"
@@ -527,13 +527,13 @@
       "snippet": "mfobj{${1:path expr}}"
     },
     "mfpbarchart[]{}{}": {
-      "snippet": "mfpbarchart[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfpbarchart[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "mfpbarchart{}{}": {
       "snippet": "mfpbarchart{${1:h or v}}{${2:list}}"
     },
     "mfpbargraph[]{}{}": {
-      "snippet": "mfpbargraph[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfpbargraph[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "mfpbargraph{}{}": {
       "snippet": "mfpbargraph{${1:h or v}}{${2:list}}"
@@ -559,13 +559,13 @@
       "snippet": "mfpframed{${1:content}}"
     },
     "mfpgantt[]{}{}": {
-      "snippet": "mfpgantt[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfpgantt[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "mfpgantt{}{}": {
       "snippet": "mfpgantt{${1:h or v}}{${2:list}}"
     },
     "mfphistogram[]{}{}": {
-      "snippet": "mfphistogram[${3:start,${4:sep},r}]{${1:h or v}}{${2:list}}"
+      "snippet": "mfphistogram[${3:start,sep,r}]{${1:h or v}}{${2:list}}"
     },
     "mfphistogram{}{}": {
       "snippet": "mfphistogram{${1:h or v}}{${2:list}}"
@@ -671,10 +671,10 @@
       "snippet": "pairarray{${1:var}}{${2:list of points}}"
     },
     "parafcn[]{}{}": {
-      "snippet": "parafcn[${3:spec}]{${1:tmin,${4:tmax},∆t}}{${2:(x(${5:t}),y(${6:t}))}}"
+      "snippet": "parafcn[${3:spec}]{${1:tmin,tmax,∆t}}{${2:(x(${4:t}),y(${5:t}))}}"
     },
     "parafcn{}{}": {
-      "snippet": "parafcn{${1:tmin,${3:tmax},∆t}}{${2:(x(${4:t}),y(${5:t}))}}"
+      "snippet": "parafcn{${1:tmin,tmax,∆t}}{${2:(x(${3:t}),y(${4:t}))}}"
     },
     "parallelpath{}": {
       "snippet": "parallelpath{${1:distance}}"
@@ -725,22 +725,22 @@
       "snippet": "plotnodes{${1:symbol}}"
     },
     "plotsymbol[]{}{}": {
-      "snippet": "plotsymbol[${3:size}]{${1:symbol}}{${2:p0,${4:p1},...}}"
+      "snippet": "plotsymbol[${3:size}]{${1:symbol}}{${2:p0,p1,...}}"
     },
     "plotsymbol{}{}": {
-      "snippet": "plotsymbol{${1:symbol}}{${2:p0,${3:p1},...}}"
+      "snippet": "plotsymbol{${1:symbol}}{${2:p0,p1,...}}"
     },
     "plottext{}{}": {
-      "snippet": "plottext{${1:text}}{${2:(${3:x0},${4:y0}),(${5:x1},${6:y1}),...}}"
+      "snippet": "plottext{${1:text}}{${2:(${3:x0,y0}),(${4:x1,y1}),...}}"
     },
     "plr{}": {
-      "snippet": "plr{${1:(${2:r0},${3:θ0}),(${4:r1},${5:θ1}),...}}"
+      "snippet": "plr{${1:(${2:r0,θ0}),(${3:r1,θ1}),...}}"
     },
     "plrfcn[]{}{}": {
-      "snippet": "plrfcn[${3:spec}]{${1:θmin,${4:θmax},∆θ}}{${2:f(${5:θ})}}"
+      "snippet": "plrfcn[${3:spec}]{${1:θmin,θmax,∆θ}}{${2:f(${4:θ})}}"
     },
     "plrfcn{}{}": {
-      "snippet": "plrfcn{${1:θmin,${3:θmax},∆θ}}{${2:f(${4:θ})}}"
+      "snippet": "plrfcn{${1:θmin,θmax,∆θ}}{${2:f(${3:θ})}}"
     },
     "plrgrid{}": {
       "snippet": "plrgrid{${1:rsep,anglesep}}"
@@ -752,13 +752,13 @@
       "snippet": "plrgridpoints{${1:rsep,anglesep}}"
     },
     "plrpatch{}": {
-      "snippet": "plrpatch{${1:rmin,${2:rmax},${3:rsep},${4:tmin},${5:tmax},tsep}}"
+      "snippet": "plrpatch{${1:rmin,rmax,rsep,tmin,tmax,tsep}}"
     },
     "plrregion[]{}{}": {
-      "snippet": "plrregion[${3:spec}]{${1:θmin,${4:θmax},∆θ}}{${2:f(${5:θ})}}"
+      "snippet": "plrregion[${3:spec}]{${1:θmin,θmax,∆θ}}{${2:f(${4:θ})}}"
     },
     "plrregion{}{}": {
-      "snippet": "plrregion{${1:θmin,${3:θmax},∆θ}}{${2:f(${4:θ})}}"
+      "snippet": "plrregion{${1:θmin,θmax,∆θ}}{${2:f(${3:θ})}}"
     },
     "plrvectorfield[]{}{}{}": {
       "snippet": "plrvectorfield[${4:length}]{${1:rsep,tsep}}{${2:formula}}{${3:restriction}}"
@@ -767,10 +767,10 @@
       "snippet": "plrvectorfield{${1:rsep,tsep}}{${2:formula}}{${3:restriction}}"
     },
     "point[]{}": {
-      "snippet": "point[${2:size}]{${1:p0,${3:p1},...}}"
+      "snippet": "point[${2:size}]{${1:p0,p1,...}}"
     },
     "point{}": {
-      "snippet": "point{${1:p0,${2:p1},...}}"
+      "snippet": "point{${1:p0,p1,...}}"
     },
     "pointcolor[]{}": {
       "snippet": "pointcolor[${2:model}]{${1:color spec}}"
@@ -778,9 +778,6 @@
     "pointcolor{}": {
       "snippet": "pointcolor{${1:color spec}}"
     },
-    "pointdef{}()": {
-      "snippet": "pointdef{${1:name}}(${2:x},${3:y})"
-    },
     "pointedlines": {},
     "pointfillfalse": {},
     "pointfilltrue": {},
@@ -794,10 +791,10 @@
       "snippet": "polkadotwd{${1:diameter}}"
     },
     "polygon{}": {
-      "snippet": "polygon{${1:p0,${2:p1},...}}"
+      "snippet": "polygon{${1:p0,p1,...}}"
     },
     "polyline{}": {
-      "snippet": "polyline{${1:p0,${2:p1},...}}"
+      "snippet": "polyline{${1:p0,p1,...}}"
     },
     "pshcircle*{}": {
       "snippet": "pshcircle*{${1:center,radius}}"
@@ -816,10 +813,10 @@
       "snippet": "qspline{${1:list}}"
     },
     "quarterellipse{}": {
-      "snippet": "quarterellipse{${1:M1,${2:A},M2}}"
+      "snippet": "quarterellipse{${1:M1,A,M2}}"
     },
     "radialgradient{}": {
-      "snippet": "radialgradient{${1:clr function,${2:width},center}}"
+      "snippet": "radialgradient{${1:clr function,width,center}}"
     },
     "randomizepath{}": {
       "snippet": "randomizepath{${1:maxshift,weirdness}}"
@@ -828,7 +825,7 @@
       "snippet": "randomlines{${1:maxshift}}"
     },
     "randomwalk{}": {
-      "snippet": "randomwalk{${1:start,${2:num},scale}}"
+      "snippet": "randomwalk{${1:start,num,scale}}"
     },
     "reconfigureplot{}{}": {
       "snippet": "reconfigureplot{${1:method}}{${2:list}}"
@@ -887,7 +884,7 @@
       "snippet": "sclosed[${1:tension}]"
     },
     "sector{}": {
-      "snippet": "sector{${1:c,${2:r},${3:θ1},θ2}}"
+      "snippet": "sector{${1:c,r,θ1,θ2}}"
     },
     "sequence": {},
     "setallaxismargins{}": {
@@ -960,10 +957,10 @@
     },
     "sideheadlen": {},
     "sinewave[]{}": {
-      "snippet": "sinewave[${2:tension}]{${1:start,${3:end},${4:wl},amp}}"
+      "snippet": "sinewave[${2:tension}]{${1:start,end,wl,amp}}"
     },
     "sinewave{}": {
-      "snippet": "sinewave{${1:start,${2:end},${3:wl},amp}}"
+      "snippet": "sinewave{${1:start,end,wl,amp}}"
     },
     "slantpath{}": {
       "snippet": "slantpath{${1:y,factor}}"
@@ -999,13 +996,7 @@
       "snippet": "thatch[${1:space,angle}][${2:color}]"
     },
     "tile{}": {
-      "snippet": "tile{${1:tilename,${2:unit},${3:width},${4:height},clip}}"
-    },
-    "tlabel(){}": {
-      "snippet": "tlabel(${2:x},${3:y}){${1:label text}}"
-    },
-    "tlabel[](){}": {
-      "snippet": "tlabel[${2:just}](${3:x},${4:y}){${1:label text}}"
+      "snippet": "tile{${1:tilename,unit,width,height,clip}}"
     },
     "tlabel[]{}{}": {
       "snippet": "tlabel[${3:just}]{${1:pair list}}{${2:label text}}"
@@ -1013,84 +1004,18 @@
     "tlabel{}{}": {
       "snippet": "tlabel{${1:pair list}}{${2:label text}}"
     },
-    "tlabelcircle(){}": {
-      "snippet": "tlabelcircle(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabelcircle*(){}": {
-      "snippet": "tlabelcircle*(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabelcircle*[](){}": {
-      "snippet": "tlabelcircle*[${2:just}](${3:x},${4:y}){${1:text}}"
-    },
-    "tlabelcircle[](){}": {
-      "snippet": "tlabelcircle[${2:just}](${3:x},${4:y}){${1:text}}"
-    },
     "tlabelcolor[]{}": {
       "snippet": "tlabelcolor[${2:model}]{${1:color spec}}"
     },
     "tlabelcolor{}": {
       "snippet": "tlabelcolor{${1:color spec}}"
     },
-    "tlabelellipse(){}": {
-      "snippet": "tlabelellipse(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabelellipse*(){}": {
-      "snippet": "tlabelellipse*(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabelellipse*[](){}": {
-      "snippet": "tlabelellipse*[${2:ratio}](${3:x},${4:y}){${1:text}}"
-    },
-    "tlabelellipse*[][](){}": {
-      "snippet": "tlabelellipse*[${2:ratio}][${3:just}](${4:x},${5:y}){${1:text}}"
-    },
-    "tlabelellipse[](){}": {
-      "snippet": "tlabelellipse[${2:ratio}](${3:x},${4:y}){${1:text}}"
-    },
-    "tlabelellipse[][](){}": {
-      "snippet": "tlabelellipse[${2:ratio}][${3:just}](${4:x},${5:y}){${1:text}}"
-    },
     "tlabeljustify{}": {
       "snippet": "tlabeljustify{${1:just}}"
     },
     "tlabeloffset{}{}": {
       "snippet": "tlabeloffset{${1:hlength}}{${2:vlength}}"
     },
-    "tlabeloval(){}": {
-      "snippet": "tlabeloval(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabeloval*(){}": {
-      "snippet": "tlabeloval*(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabeloval*[](){}": {
-      "snippet": "tlabeloval*[${2:mult}](${3:x},${4:y}){${1:text}}"
-    },
-    "tlabeloval*[][](){}": {
-      "snippet": "tlabeloval*[${2:mult}][${3:just}](${4:x},${5:y}){${1:text}}"
-    },
-    "tlabeloval[](){}": {
-      "snippet": "tlabeloval[${2:mult}](${3:x},${4:y}){${1:text}}"
-    },
-    "tlabeloval[][](){}": {
-      "snippet": "tlabeloval[${2:mult}][${3:just}](${4:x},${5:y}){${1:text}}"
-    },
-    "tlabelrect(){}": {
-      "snippet": "tlabelrect(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabelrect*(){}": {
-      "snippet": "tlabelrect*(${2:x},${3:y}){${1:text}}"
-    },
-    "tlabelrect*[](){}": {
-      "snippet": "tlabelrect*[${2:radius}](${3:x},${4:y}){${1:text}}"
-    },
-    "tlabelrect*[][](){}": {
-      "snippet": "tlabelrect*[${2:radius}][${3:just}](${4:x},${5:y}){${1:text}}"
-    },
-    "tlabelrect[](){}": {
-      "snippet": "tlabelrect[${2:radius}](${3:x},${4:y}){${1:text}}"
-    },
-    "tlabelrect[][](){}": {
-      "snippet": "tlabelrect[${2:radius}][${3:just}](${4:x},${5:y}){${1:text}}"
-    },
     "tlabels{}": {
       "snippet": "tlabels{${1:params1 params2 ...}}"
     },
@@ -1128,7 +1053,7 @@
       "snippet": "turn{${1:degrees}}"
     },
     "turtle{}": {
-      "snippet": "turtle{${1:p0,${2:v1},${3:v2},...}}"
+      "snippet": "turtle{${1:p0,v1,v2,...}}"
     },
     "unsmoothdata": {},
     "usecenteredcaptions": {},
@@ -1214,7 +1139,7 @@
       "snippet": "yslantpath{${1:x,factor}}"
     },
     "zigzag{}": {
-      "snippet": "zigzag{${1:start,${2:end},${3:wl},amp}}"
+      "snippet": "zigzag{${1:start,end,wl,amp}}"
     },
     "zscale{}": {
       "snippet": "zscale{${1:v}}"
@@ -1274,7 +1199,7 @@
     },
     "tile{}": {
       "name": "tile",
-      "snippet": "{${1:tilename,${2:unit},${3:width},${4:height},clip}}"
+      "snippet": "{${1:tilename,unit,width,height,clip}}"
     }
   },
   "options": [
diff --git a/dev/packages/mfpic4ode.json b/dev/packages/mfpic4ode.json
index a666e5fda..536a7ec2a 100644
--- a/dev/packages/mfpic4ode.json
+++ b/dev/packages/mfpic4ode.json
@@ -5,7 +5,7 @@
     "colorODEarrowtrue": {},
     "colorODEarrowfalse": {},
     "ODEdefineequation{}": {
-      "snippet": "ODEdefineequation{${1:f(${2:x},${3:y})}}"
+      "snippet": "ODEdefineequation{${1:f(${2:x,y})}}"
     },
     "trajectory{}{}": {
       "snippet": "trajectory{${1:x0}}{${2:y0}}"
@@ -17,7 +17,7 @@
       "snippet": "trajectoryRKF{${1:x0}}{${2:y0}}"
     },
     "trajectories{}": {
-      "snippet": "trajectories{${1:x1,${2:y1;x2},y2;...}}"
+      "snippet": "trajectories{${1:x1,y1;x2,y2;...}}"
     },
     "ODEarrow{}{}": {
       "snippet": "ODEarrow{${1:x}}{${2:y}}"
@@ -29,10 +29,10 @@
       "snippet": "ODEvarrow{${1:x}}"
     },
     "ODEarrows{}": {
-      "snippet": "ODEarrows{${1:x1,${2:y1;x2},y2;...}}"
+      "snippet": "ODEarrows{${1:x1,y1;x2,y2;...}}"
     },
     "ASdefineequations{}{}": {
-      "snippet": "ASdefineequations{${1:f(${3:x},${4:y})}}{${2:g(${5:x},${6:y})}}"
+      "snippet": "ASdefineequations{${1:f(${3:x,y})}}{${2:g(${4:x,y})}}"
     },
     "AStrajectory{}{}": {
       "snippet": "AStrajectory{${1:x0}}{${2:y0}}"
@@ -41,13 +41,13 @@
       "snippet": "AStrajectoryRKF{${1:x0}}{${2:y0}}"
     },
     "AStrajectories{}": {
-      "snippet": "AStrajectories{${1:x1,${2:y1;x2},y2;...}}"
+      "snippet": "AStrajectories{${1:x1,y1;x2,y2;...}}"
     },
     "ASarrow{}{}": {
       "snippet": "ASarrow{${1:x}}{${2:y}}"
     },
     "ASarrows{}": {
-      "snippet": "ASarrows{${1:x1,${2:y1;x2},y2;...}}"
+      "snippet": "ASarrows{${1:x1,y1;x2,y2;...}}"
     },
     "ODEline{}{}": {
       "snippet": "ODEline{${1:p0}}{${2:p1}}"
diff --git a/dev/packages/miller.json b/dev/packages/miller.json
index 84ef9e47d..33434dcfd 100644
--- a/dev/packages/miller.json
+++ b/dev/packages/miller.json
@@ -7,9 +7,6 @@
     "hkl<>": {
       "snippet": "hkl<${1:indices}>"
     },
-    "hkl()": {
-      "snippet": "hkl(${1:indices})"
-    },
     "hkl{}": {
       "snippet": "hkl{${1:indices}}"
     },
diff --git a/dev/packages/milsymb.json b/dev/packages/milsymb.json
index 90e82211a..1c85421bd 100644
--- a/dev/packages/milsymb.json
+++ b/dev/packages/milsymb.json
@@ -17,111 +17,39 @@
     "MilAir[]": {
       "snippet": "MilAir[${1:options}]"
     },
-    "MilAir[]()": {
-      "snippet": "MilAir[${1:options}](${2:location})"
-    },
-    "MilAir[]()(){}": {
-      "snippet": "MilAir[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilMissile[]": {
       "snippet": "MilMissile[${1:options}]"
     },
-    "MilMissile[]()": {
-      "snippet": "MilMissile[${1:options}](${2:location})"
-    },
-    "MilMissile[]()(){}": {
-      "snippet": "MilMissile[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilLand[]": {
       "snippet": "MilLand[${1:options}]"
     },
-    "MilLand[]()": {
-      "snippet": "MilLand[${1:options}](${2:location})"
-    },
-    "MilLand[]()(){}": {
-      "snippet": "MilLand[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilEquipment[]": {
       "snippet": "MilEquipment[${1:options}]"
     },
-    "MilEquipment[]()": {
-      "snippet": "MilEquipment[${1:options}](${2:location})"
-    },
-    "MilEquipment[]()(){}": {
-      "snippet": "MilEquipment[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilInstallation[]": {
       "snippet": "MilInstallation[${1:options}]"
     },
-    "MilInstallation[]()": {
-      "snippet": "MilInstallation[${1:options}](${2:location})"
-    },
-    "MilInstallation[]()(){}": {
-      "snippet": "MilInstallation[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilSeaSurface[]": {
       "snippet": "MilSeaSurface[${1:options}]"
     },
-    "MilSeaSurface[]()": {
-      "snippet": "MilSeaSurface[${1:options}](${2:location})"
-    },
-    "MilSeaSurface[]()(){}": {
-      "snippet": "MilSeaSurface[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilSeaSubsurface[]": {
       "snippet": "MilSeaSubsurface[${1:options}]"
     },
-    "MilSeaSubsurface[]()": {
-      "snippet": "MilSeaSubsurface[${1:options}](${2:location})"
-    },
-    "MilSeaSubsurface[]()(){}": {
-      "snippet": "MilSeaSubsurface[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilMine[]": {
       "snippet": "MilMine[${1:options}]"
     },
-    "MilMine[]()": {
-      "snippet": "MilMine[${1:options}](${2:location})"
-    },
-    "MilMine[]()(){}": {
-      "snippet": "MilMine[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilSpace[]": {
       "snippet": "MilSpace[${1:options}]"
     },
-    "MilSpace[]()": {
-      "snippet": "MilSpace[${1:options}](${2:location})"
-    },
-    "MilSpace[]()(){}": {
-      "snippet": "MilSpace[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilActivity[]": {
       "snippet": "MilActivity[${1:options}]"
     },
-    "MilActivity[]()": {
-      "snippet": "MilActivity[${1:options}](${2:location})"
-    },
-    "MilActivity[]()(){}": {
-      "snippet": "MilActivity[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "MilDebris[]": {
       "snippet": "MilDebris[${1:options}]"
     },
-    "MilDebris[]()": {
-      "snippet": "MilDebris[${1:options}](${2:location})"
-    },
-    "MilDebris[]()(){}": {
-      "snippet": "MilDebris[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "OwnShip[]": {
       "snippet": "OwnShip[${1:options}]"
     },
-    "OwnShip[]()": {
-      "snippet": "OwnShip[${1:options}](${2:location})"
-    },
-    "OwnShip[]()(){}": {
-      "snippet": "OwnShip[${2:options}](${3:location})(${4:name}){${1:label}}"
-    },
     "clipfriendly": {},
     "cliphostile": {},
     "clipneutral": {},
diff --git a/dev/packages/minted.json b/dev/packages/minted.json
deleted file mode 100644
index 131d4eed6..000000000
--- a/dev/packages/minted.json
+++ /dev/null
@@ -1,297 +0,0 @@
-{
-  "includes": {
-    "keyval": [],
-    "kvoptions": [],
-    "fvextra": [],
-    "ifthen": [],
-    "shellesc": [],
-    "ifplatform": [],
-    "pdftexcmds": [],
-    "etoolbox": [],
-    "xstring": [],
-    "lineno": [],
-    "framed": [],
-    "catchfile": [],
-    "xcolor": [],
-    "float": [],
-    "newfloat": [
-      "newfloat",
-      "newfloat=true"
-    ]
-  },
-  "macros": {
-    "mint[]{}{}": {
-      "snippet": "mint[${3:keys}]{${1:language}}{${2:verbatimSymbol}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mint{}": {
-      "snippet": "mint{${1:language}}|${2:code}|"
-    },
-    "mint[]{}": {
-      "snippet": "mint[${2:options}]{${1:language}}|${3:code}|",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mintinline[]{}{}": {
-      "snippet": "mintinline[${3:keys}]{${1:language}}{${2:verbatimSymbol}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mintinline{}": {
-      "snippet": "mintinline{${1:language}}|${2:code}|"
-    },
-    "mintinline[]{}": {
-      "snippet": "mintinline[${2:options}]{${1:language}}|${3:code}|",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "inputminted{}{}": {
-      "snippet": "inputminted{${1:language}}{${2:file}}"
-    },
-    "inputminted[]{}{}": {
-      "snippet": "inputminted[${3:options}]{${1:language}}{${2:file}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "usemintedstyle{}": {
-      "snippet": "usemintedstyle{${1:pygments style}}"
-    },
-    "usemintedstyle[]{}": {
-      "snippet": "usemintedstyle[${2:language}]{${1:pygments style}}"
-    },
-    "setminted{}": {
-      "snippet": "setminted{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "setminted[]{}": {
-      "snippet": "setminted[${2:language}]{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "setmintedinline{}": {
-      "snippet": "setmintedinline{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "setmintedinline[]{}": {
-      "snippet": "setmintedinline[${2:language}]{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "listoflistings": {},
-    "listingscaption": {},
-    "listoflistingscaption": {},
-    "newminted{}{}": {
-      "snippet": "newminted{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "newminted[]{}{}": {
-      "snippet": "newminted[${3:envname}]{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "newmint{}{}": {
-      "snippet": "newmint{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "newmint[]{}{}": {
-      "snippet": "newmint[${3:macro name}]{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "newmintinline{}{}": {
-      "snippet": "newmintinline{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "newmintinline[]{}{}": {
-      "snippet": "newmintinline[${3:macro name}]{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "newmintedfile{}{}": {
-      "snippet": "newmintedfile{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "newmintedfile[]{}{}": {
-      "snippet": "newmintedfile[${3:macro name}]{${1:language}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "DeleteFile{}": {
-      "snippet": "DeleteFile{${1:file}}"
-    },
-    "DeleteFile[]{}": {
-      "snippet": "DeleteFile[${2:directory}]{${1:file}}"
-    },
-    "ProvideDirectory{}": {
-      "snippet": "ProvideDirectory{${1:directory}}"
-    },
-    "ifAppExists": {},
-    "TestAppExists{}": {
-      "snippet": "TestAppExists{${1:application}}"
-    },
-    "MintedPygmentize": {},
-    "MintedPython": {},
-    "PYG": {},
-    "PYGZsq": {},
-    "PYGZhy": {},
-    "RobustMintInline{}": {
-      "snippet": "RobustMintInline{${1:arg}}"
-    },
-    "RobustMintInline[]{}": {
-      "snippet": "RobustMintInline[${2:opt}]{${1:arg}}"
-    },
-    "RobustMintInlineProcess{}{}{}": {
-      "snippet": "RobustMintInlineProcess{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "RobustMint{}": {
-      "snippet": "RobustMint{${1:arg}}"
-    },
-    "RobustMint[]{}": {
-      "snippet": "RobustMint[${2:opt}]{${1:arg}}"
-    },
-    "RobustMintProcess{}{}{}": {
-      "snippet": "RobustMintProcess{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "RobustNewMint": {},
-    "RobustNewMintInline": {}
-  },
-  "envs": {
-    "minted[]": {
-      "name": "minted",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "minted{}": {
-      "name": "minted",
-      "snippet": "{${1:language}}"
-    },
-    "minted[]{}": {
-      "name": "minted",
-      "snippet": "[${2:options}]{${1:language}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "listing": {},
-    "listing[]": {
-      "name": "listing",
-      "snippet": "[${1:placement}]"
-    }
-  },
-  "options": [
-    "chapter",
-    "section",
-    "cache",
-    "cachedir=${1:directory}",
-    "finalizecache",
-    "fontencoding=${1:encoding}",
-    "frozencache",
-    "draft",
-    "final",
-    "inputlanglinenos",
-    "kpsewhich",
-    "langlinenos",
-    "newfloat",
-    "outputdir=${1:directory}"
-  ],
-  "keyvals": [
-    [
-      "autogobble",
-      "baselinestretch=",
-      "beameroverlays",
-      "breakbytoken",
-      "breakbytokenanywhere",
-      "breaklines",
-      "bgcolor=",
-      "codetagify=${1:string list}",
-      "curlyquotes",
-      "encoding=${1:encoding}",
-      "escapeinside=${1:two chars}",
-      "firstline=${1:int}",
-      "firstnumber=",
-      "fontfamily=${1:family name}",
-      "fontseries=${1:series name}",
-      "fontsize=${1:size command}",
-      "fontshape=${1:shape name}",
-      "formatcom=${1:command}",
-      "frame=",
-      "framerule=",
-      "framesep=",
-      "funcnamehighlighting",
-      "gobble=${1:int}",
-      "highlightcolor=",
-      "highlightlines=${1:list of lineno ranges}",
-      "ignorelexererrors",
-      "keywordcase=",
-      "label=${1:string}",
-      "labelposition=",
-      "lastline=${1:int}",
-      "linenos",
-      "numberfirstline",
-      "numbers=",
-      "mathescape",
-      "numberblanklines",
-      "numbersep=",
-      "obeytabs",
-      "outencoding=${1:encoding}",
-      "python3",
-      "resetmargins",
-      "rulecolor=",
-      "samepage",
-      "showspaces",
-      "showtabs",
-      "space=${1:command}",
-      "spacecolor=",
-      "startinline",
-      "style=${1:pytments style}",
-      "stepnumber=${1:int}",
-      "stepnumberfromfirst",
-      "stepnumberoffsetvalues",
-      "stripall",
-      "stripnl",
-      "tab=${1:commnd}",
-      "tabcolor=",
-      "tabsize=${1:int}",
-      "texcl",
-      "texcomments",
-      "xleftmargin=",
-      "xrightmargin=",
-      "breakafter=${1:string}",
-      "breakafterinrun",
-      "breakaftersymbolpre=${1:string}",
-      "breakaftersymbolpost=${1:string}",
-      "breakanywhere",
-      "breakanywheresymbolpre=${1:string}",
-      "breakanywheresymbolpost=${1:string}",
-      "breakautoindent",
-      "breakbefore=${1:string}",
-      "breakbeforeinrun",
-      "breakbeforesymbolpre=${1:string}",
-      "breakbeforesymbolpost=${1:string}",
-      "breakindent=",
-      "breakindentnchars=${1:int}",
-      "breaksymbol=${1:string}",
-      "breaksymbolleft=${1:string}",
-      "breaksymbolright=${1:string}",
-      "breaksymbolindent=",
-      "breaksymbolindentnchars=${1:int}",
-      "breaksymbolindentleft=",
-      "breaksymbolindentleftnchars=${1:int}",
-      "breaksymbolindentritht=",
-      "breaksymbolindentrightnchars=${1:int}",
-      "breaksymbolsep=",
-      "breaksymbolsepnchars=${1:int}",
-      "breaksymbolsepleft=",
-      "breaksymbolsepleftnchars=${1:int}",
-      "breaksymbolsepright=",
-      "breaksymbolseprightnchars=${1:int}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/minutes.json b/dev/packages/minutes.json
index 7671a1540..b2ff604a6 100644
--- a/dev/packages/minutes.json
+++ b/dev/packages/minutes.json
@@ -28,10 +28,10 @@
       "snippet": "minutetaker{${1:name}}"
     },
     "participant{}": {
-      "snippet": "participant{${1:name1,${2:name2},...}}"
+      "snippet": "participant{${1:name1,name2,...}}"
     },
     "guest{}": {
-      "snippet": "guest{${1:name1,${2:name2},...}}"
+      "snippet": "guest{${1:name1,name2,...}}"
     },
     "minutesdate{}": {
       "snippet": "minutesdate{${1:date}}"
@@ -46,16 +46,16 @@
       "snippet": "location{${1:location}}"
     },
     "cc{}": {
-      "snippet": "cc{${1:name1,${2:name2},...}}"
+      "snippet": "cc{${1:name1,name2,...}}"
     },
     "missing[]{}": {
-      "snippet": "missing[${2:no excuse name}]{${1:excused name1,${3:excused name2},...}}"
+      "snippet": "missing[${2:no excuse name}]{${1:excused name1,excused name2,...}}"
     },
     "missingExcused{}": {
-      "snippet": "missingExcused{${1:name1,${2:name2},...}}"
+      "snippet": "missingExcused{${1:name1,name2,...}}"
     },
     "missingNoExcuse{}": {
-      "snippet": "missingNoExcuse{${1:name1,${2:name2},...}}"
+      "snippet": "missingNoExcuse{${1:name1,name2,...}}"
     },
     "topic{}": {
       "snippet": "topic{${1:title}}"
@@ -191,10 +191,10 @@
       "snippet": "protokollant{${1:name}}"
     },
     "teilnehmer{}": {
-      "snippet": "teilnehmer{${1:name1,${2:name2},...}}"
+      "snippet": "teilnehmer{${1:name1,name2,...}}"
     },
     "gaeste{}": {
-      "snippet": "gaeste{${1:name1,${2:name2},...}}"
+      "snippet": "gaeste{${1:name1,name2,...}}"
     },
     "sitzungsdatum{}": {
       "snippet": "sitzungsdatum{${1:date}}"
@@ -209,16 +209,16 @@
       "snippet": "sitzungsort{${1:location}}"
     },
     "verteiler{}": {
-      "snippet": "verteiler{${1:name1,${2:name2},...}}"
+      "snippet": "verteiler{${1:name1,name2,...}}"
     },
     "fehlend[]{}": {
-      "snippet": "fehlend[${2:no excuse name}]{${1:excused name1,${3:excused name2},...}}"
+      "snippet": "fehlend[${2:no excuse name}]{${1:excused name1,excused name2,...}}"
     },
     "fehlendEntschuldigt{}": {
-      "snippet": "fehlendEntschuldigt{${1:name1,${2:name2},...}}"
+      "snippet": "fehlendEntschuldigt{${1:name1,name2,...}}"
     },
     "fehlendUnentschuldigt{}": {
-      "snippet": "fehlendUnentschuldigt{${1:name1,${2:name2},...}}"
+      "snippet": "fehlendUnentschuldigt{${1:name1,name2,...}}"
     },
     "zusatztopic{}": {
       "snippet": "zusatztopic{${1:title}}"
@@ -329,10 +329,10 @@
       "snippet": "notulist{${1:name}}"
     },
     "deelnemer{}": {
-      "snippet": "deelnemer{${1:name1,${2:name2},...}}"
+      "snippet": "deelnemer{${1:name1,name2,...}}"
     },
     "gast{}": {
-      "snippet": "gast{${1:name1,${2:name2},...}}"
+      "snippet": "gast{${1:name1,name2,...}}"
     },
     "bijeenkomstdatum{}": {
       "snippet": "bijeenkomstdatum{${1:date}}"
@@ -347,13 +347,13 @@
       "snippet": "locatie{${1:location}}"
     },
     "afwezig[]{}": {
-      "snippet": "afwezig[${2:no excuse name}]{${1:excused name1,${3:excused name2},...}}"
+      "snippet": "afwezig[${2:no excuse name}]{${1:excused name1,excused name2,...}}"
     },
     "afwezigBericht{}": {
-      "snippet": "afwezigBericht{${1:name1,${2:name2},...}}"
+      "snippet": "afwezigBericht{${1:name1,name2,...}}"
     },
     "afwezigZonderBericht{}": {
-      "snippet": "afwezigZonderBericht{${1:name1,${2:name2},...}}"
+      "snippet": "afwezigZonderBericht{${1:name1,name2,...}}"
     },
     "extrapunt{}": {
       "snippet": "extrapunt{${1:title}}"
diff --git a/dev/packages/mismath.json b/dev/packages/mismath.json
index ac5603fdd..d19f31f57 100644
--- a/dev/packages/mismath.json
+++ b/dev/packages/mismath.json
@@ -3,7 +3,6 @@
     "amsmath": [],
     "mathtools": [],
     "esvect": [],
-    "mleftright": [],
     "ifthen": [],
     "xspace": [],
     "iftex": [],
@@ -210,12 +209,6 @@
     "systemstretch": {},
     "changecol": {},
     "bslash": {},
-    "upDelta": {
-      "detail": "Δ",
-      "documentation": "capital del greek"
-    },
-    "opDelta": {},
-    "opdelta": {},
     "enumber": {},
     "inumber": {},
     "jnumber": {},
diff --git a/dev/packages/mkstmp_pro.json b/dev/packages/mkstmp_pro.json
index 90a28da67..94c2ab647 100644
--- a/dev/packages/mkstmp_pro.json
+++ b/dev/packages/mkstmp_pro.json
@@ -8,7 +8,7 @@
       "snippet": "setStampPath{${1:path}}"
     },
     "makeStamps{{}{}": {
-      "snippet": "makeStamps{{${1:name=name1,${3:page=page1}}{${2:name=name2},page=page2}...}}"
+      "snippet": "makeStamps{{${1:name=name1,page=page1}}{${2:name=name2,page=page2}...}}"
     },
     "definePath{}{}": {
       "snippet": "definePath{${1:cmd}}{${2:path}}"
diff --git a/dev/packages/mlist.json b/dev/packages/mlist.json
deleted file mode 100644
index 5933d3db1..000000000
--- a/dev/packages/mlist.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "includes": {
-    "ifmtarg": [],
-    "xkeyval": []
-  },
-  "macros": {
-    "newvect{}{}": {
-      "snippet": "newvect{${1:macro}}{${2:text}}"
-    },
-    "newvect{}{}[]": {
-      "snippet": "newvect{${1:macro}}{${2:text}}[${3:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "newmatr{}{}": {
-      "snippet": "newmatr{${1:macro}}{${2:text}}"
-    },
-    "newmatr{}{}[]": {
-      "snippet": "newmatr{${1:macro}}{${2:text}}[${3:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "newfunc{}{}": {
-      "snippet": "newfunc{${1:macro}}{${2:text}}"
-    },
-    "newfunc{}{}[]": {
-      "snippet": "newfunc{${1:macro}}{${2:text}}[${3:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "newmset{}{}": {
-      "snippet": "newmset{${1:macro}}{${2:text}}"
-    },
-    "newmset{}{}[]": {
-      "snippet": "newmset{${1:macro}}{${2:text}}[${3:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 2
-    },
-    "setR": {},
-    "setC": {},
-    "setN": {},
-    "setZ": {},
-    "vect{}": {
-      "snippet": "vect{${1:text}}"
-    },
-    "vect{}{}": {
-      "snippet": "vect{${1:text}}{${2:indices}}"
-    },
-    "matr{}": {
-      "snippet": "matr{${1:text}}"
-    },
-    "matr{}{}": {
-      "snippet": "matr{${1:text}}{${2:entries}}"
-    },
-    "func{}": {
-      "snippet": "func{${1:text}}"
-    },
-    "func{}{}": {
-      "snippet": "func{${1:text}}{${2:arg}}"
-    },
-    "mset{}": {
-      "snippet": "mset{${1:text}}"
-    },
-    "mset{}{}": {
-      "snippet": "mset{${1:text}}{${2:dims}}"
-    },
-    "MID": {},
-    "LAST": {},
-    "newmlist{}": {
-      "snippet": "newmlist{${1:macro}}"
-    },
-    "newmlist{}[]": {
-      "snippet": "newmlist{${1:macro}}[${2:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "renewmlist{}": {
-      "snippet": "renewmlist{${1:macro}}"
-    },
-    "renewmlist{}[]": {
-      "snippet": "renewmlist{${1:macro}}[${2:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "mlistsetup{}": {
-      "snippet": "mlistsetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mlistsub{}{}": {
-      "snippet": "mlistsub{${1:arg}}{${2:sub}}"
-    },
-    "mlistsup{}{}": {
-      "snippet": "mlistsup{${1:arg}}{${2:sup}}"
-    },
-    "mlistelem{}{}": {
-      "snippet": "mlistelem{${1:arg1}}{${2:arg2}}"
-    },
-    "mlisthead{}": {
-      "snippet": "mlisthead{${1:arg}}"
-    },
-    "mlistnowrap{}{}": {
-      "snippet": "mlistnowrap{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistparen{}{}": {
-      "snippet": "mlistparen{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistbrack{}{}": {
-      "snippet": "mlistbrack{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistbrace{}{}": {
-      "snippet": "mlistbrace{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistangle{}{}": {
-      "snippet": "mlistangle{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistheadparen{}{}": {
-      "snippet": "mlistheadparen{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistheadbrack{}{}": {
-      "snippet": "mlistheadbrack{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistheadbrace{}{}": {
-      "snippet": "mlistheadbrace{${1:arg1}}{${2:arg2}}"
-    },
-    "mlistheadangle{}{}": {
-      "snippet": "mlistheadangle{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "headcmd=${1:macro}",
-      "elemcmd=${1:macro}",
-      "headhook=${1:code}",
-      "wrap={${1:open}}{${2:close}}",
-      "wrapone",
-      "wrapone={${1:open}}{${2:close}}",
-      "wrapcmd=${1:macro}",
-      "wraponecmd=${1:macro}",
-      "sep=${1:code}",
-      "sepsep=${1:code}",
-      "symbol=${1:symbol}",
-      "index={${1:indeices}}",
-      "elem={${1:args}}",
-      "dot=${1:code}",
-      "dots=${1:code}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/modiagram.json b/dev/packages/modiagram.json
index bc00c55e0..841efa414 100644
--- a/dev/packages/modiagram.json
+++ b/dev/packages/modiagram.json
@@ -22,29 +22,13 @@
     "molecule[]{}": {
       "snippet": "molecule[${2:name}]{${1:MO-spec}}"
     },
-    "AO(){}{}": {
-      "snippet": "AO(${3:xshift}){${1:type}}{${2:energy; el-spec}}"
-    },
-    "AO(){}[]{}": {
-      "snippet": "AO(${4:xshift}){${1:type}}[${2:options}]{${3:energy; el-spec}}",
-      "keyvalindex": 1,
-      "keyvalpos": 2
-    },
-    "AO[](){}{}": {
-      "snippet": "AO[${3:name}](${4:xshift}){${1:type}}{${2:energy; el-spec}}"
-    },
-    "AO[](){}[]{}": {
-      "snippet": "AO[${3:name}](${5:xshift}){${1:type}}[${4:options}]{${2:energy; el-spec}}",
-      "keyvalindex": 1,
-      "keyvalpos": 3
-    },
     "connect{}": {
       "snippet": "connect{${1:AO-connect}}"
     },
     "EnergyAxis": {},
     "EnergyAxis[]": {
       "snippet": "EnergyAxis[${1:options}]",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     }
   },
@@ -74,24 +58,6 @@
       "labels-fs=${1:cmd}",
       "labels-style={${1:TikZ}}"
     ],
-    [
-      "label=",
-      "label[x]=",
-      "label[y]=",
-      "label[z]=",
-      "color=",
-      "color[x]=",
-      "color[y]=",
-      "color[z]=",
-      "up-el-pos=${1:number}",
-      "up-el-pos[x]=${1:number}",
-      "up-el-pos[y]=${1:number}",
-      "up-el-pos[z]=${1:number}",
-      "down-el-pos=${1:number}",
-      "down-el-pos[x]=${1:number}",
-      "down-el-pos[y]=${1:number}",
-      "down-el-pos[z]=${1:number}"
-    ],
     [
       "title=",
       "head=${1:TikZ arrow head}"
diff --git a/dev/packages/msc.json b/dev/packages/msc.json
index c184b6d92..036643b91 100644
--- a/dev/packages/msc.json
+++ b/dev/packages/msc.json
@@ -399,86 +399,43 @@
     "hmscstartsymbol{}": {
       "snippet": "hmscstartsymbol{${1:nickname}}"
     },
-    "hmscstartsymbol{}()": {
-      "snippet": "hmscstartsymbol{${1:nickname}}(${2:x},${3:y})"
-    },
     "hmscstartsymbol[]{}": {
       "snippet": "hmscstartsymbol[${2:options}]{${1:nickname}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "hmscstartsymbol[]{}()": {
-      "snippet": "hmscstartsymbol[${2:options}]{${1:nickname}}(${3:x},${4:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "hmscendsymbol{}": {
       "snippet": "hmscendsymbol{${1:nickname}}"
     },
-    "hmscendsymbol{}()": {
-      "snippet": "hmscendsymbol{${1:nickname}}(${2:x},${3:y})"
-    },
     "hmscendsymbol[]{}": {
       "snippet": "hmscendsymbol[${2:options}]{${1:nickname}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "hmscendsymbol[]{}()": {
-      "snippet": "hmscendsymbol[${2:options}]{${1:nickname}}(${3:x},${4:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "hmscreference{}{}": {
       "snippet": "hmscreference{${1:nickname}}{${2:text}}"
     },
-    "hmscreference{}{}()": {
-      "snippet": "hmscreference{${1:nickname}}{${2:text}}(${3:x},${4:y})"
-    },
     "hmscreference[]{}{}": {
       "snippet": "hmscreference[${3:options}]{${1:nickname}}{${2:text}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "hmscreference[]{}{}()": {
-      "snippet": "hmscreference[${3:options}]{${1:nickname}}{${2:text}}(${4:x},${5:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "hmsccondition{}{}": {
       "snippet": "hmsccondition{${1:nickname}}{${2:text}}"
     },
-    "hmsccondition{}{}()": {
-      "snippet": "hmsccondition{${1:nickname}}{${2:text}}(${3:x},${4:y})"
-    },
     "hmsccondition[]{}{}": {
       "snippet": "hmsccondition[${3:options}]{${1:nickname}}{${2:text}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "hmsccondition[]{}{}()": {
-      "snippet": "hmsccondition[${3:options}]{${1:nickname}}{${2:text}}(${4:x},${5:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "hmscconnection{}": {
       "snippet": "hmscconnection{${1:nickname}}"
     },
-    "hmscconnection{}()": {
-      "snippet": "hmscconnection{${1:nickname}}(${2:x},${3:y})"
-    },
     "hmscconnection[]{}": {
       "snippet": "hmscconnection[${2:options}]{${1:nickname}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "hmscconnection[]{}()": {
-      "snippet": "hmscconnection[${2:options}]{${1:nickname}}(${3:x},${4:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "reference{}()": {
-      "snippet": "reference{${1:text}}(${2:x},${3:y})"
-    },
     "separator{}": {
       "snippet": "separator{${1:y}}"
     },
@@ -606,29 +563,11 @@
       "name": "hmsc",
       "snippet": "{${1:name}}"
     },
-    "hmsc{}(llx,lly)(urx,ury)": {
-      "name": "hmsc",
-      "snippet": "{${1:name}}(${2:llx},${3:lly})(${4:urx},${5:ury})"
-    },
     "hmsc[]{}": {
       "name": "hmsc",
       "snippet": "[${2:options}]{${1:name}}",
       "keyvalindex": 0,
       "keyvalpos": 0
-    },
-    "hmsc[]{}(llx,lly)(urx,ury)": {
-      "name": "hmsc",
-      "snippet": "[${2:options}]{${1:name}}(${3:llx},${4:lly})(${5:urx},${6:ury})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "mscdoc{}(llx,lly)(urx,ury)": {
-      "name": "mscdoc",
-      "snippet": "{${1:name}}(${2:llx},${3:lly})(${4:urx},${5:ury})"
-    },
-    "mscdoc[]{}(llx,lly)(urx,ury)": {
-      "name": "mscdoc",
-      "snippet": "[${2:headerpos}]{${1:name}}(${3:llx},${4:lly})(${5:urx},${6:ury})"
     }
   },
   "options": [],
diff --git a/dev/packages/multibib.json b/dev/packages/multibib.json
index 921355399..e8b7f52a3 100644
--- a/dev/packages/multibib.json
+++ b/dev/packages/multibib.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "newcites{}{}": {
-      "snippet": "newcites{${1:suffix1,${3:suffix2},${4:...}}{${2:title1},${5:title2},...}}"
+      "snippet": "newcites{${1:suffix1,suffix2,...}}{${2:title1,title2,...}}"
     },
     "setbiblabelwidth{}": {
       "snippet": "setbiblabelwidth{${1:number}}"
diff --git a/dev/packages/multicol.json b/dev/packages/multicol.json
deleted file mode 100644
index 54f0faa8e..000000000
--- a/dev/packages/multicol.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "columnbreak": {},
-    "columnseprulecolor": {},
-    "docolaction{}{}{}": {
-      "snippet": "docolaction{${1:first}}{${2:middle}}{${3:last}}"
-    },
-    "flushcolumns": {},
-    "LRmulticolcolumns": {},
-    "maxbalancingoverflow": {},
-    "multicolbaselineskip": {},
-    "multicolmindepthstring": {},
-    "multicolpretolerance": {},
-    "multicolsep": {},
-    "multicoltolerance": {},
-    "newcolumn": {},
-    "postmulticols": {},
-    "premulticols": {},
-    "raggedcolumns": {},
-    "RLmulticolcolumns": {},
-    "setemergencystretch{}{}": {
-      "snippet": "setemergencystretch{${1:num of cols}}{${2:hsize}}"
-    },
-    "vfilmaxdepth": {}
-  },
-  "envs": {
-    "multicols*{}": {
-      "name": "multicols*",
-      "snippet": "{${1:n}}"
-    },
-    "multicols*{}[]": {
-      "name": "multicols*",
-      "snippet": "{${1:n}}[${2:preface}]"
-    },
-    "multicols*{}[][]": {
-      "name": "multicols*",
-      "snippet": "{${1:n}}[${2:preface}][${3:skip}]"
-    },
-    "multicols{}": {
-      "name": "multicols",
-      "snippet": "{${1:n}}"
-    },
-    "multicols{}[]": {
-      "name": "multicols",
-      "snippet": "{${1:n}}[${2:preface}]"
-    },
-    "multicols{}[][]": {
-      "name": "multicols",
-      "snippet": "{${1:n}}[${2:preface}][${3:skip}]"
-    }
-  },
-  "options": [
-    "errorshow",
-    "infoshow",
-    "balancingshow",
-    "markshow",
-    "debugshow",
-    "grid",
-    "colaction"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/multienv.json b/dev/packages/multienv.json
index b9e839ee3..5231e4098 100644
--- a/dev/packages/multienv.json
+++ b/dev/packages/multienv.json
@@ -2,41 +2,41 @@
   "includes": {},
   "macros": {
     "newmultienvironment{}{}": {
-      "snippet": "newmultienvironment{${1:envname}}{${2:env,${3:env=arg},...}}"
+      "snippet": "newmultienvironment{${1:envname}}{${2:env,env=arg,...}}"
     },
     "newmultienvironment{}[]{}": {
-      "snippet": "newmultienvironment{${1:envname}}[${2:args}]{${3:env,${4:env=arg},...}}"
+      "snippet": "newmultienvironment{${1:envname}}[${2:args}]{${3:env,env=arg,...}}"
     },
     "newmultienvironment{}[][]{}": {
-      "snippet": "newmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,${5:env=arg},...}}"
+      "snippet": "newmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,env=arg,...}}"
     },
     "renewmultienvironment{}{}": {
-      "snippet": "renewmultienvironment{${1:envname}}{${2:env,${3:env=arg},...}}"
+      "snippet": "renewmultienvironment{${1:envname}}{${2:env,env=arg,...}}"
     },
     "renewmultienvironment{}[]{}": {
-      "snippet": "renewmultienvironment{${1:envname}}[${2:args}]{${3:env,${4:env=arg},...}}"
+      "snippet": "renewmultienvironment{${1:envname}}[${2:args}]{${3:env,env=arg,...}}"
     },
     "renewmultienvironment{}[][]{}": {
-      "snippet": "renewmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,${5:env=arg},...}}"
+      "snippet": "renewmultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,env=arg,...}}"
     },
     "providemultienvironment{}{}": {
-      "snippet": "providemultienvironment{${1:envname}}{${2:env,${3:env=arg},...}}"
+      "snippet": "providemultienvironment{${1:envname}}{${2:env,env=arg,...}}"
     },
     "providemultienvironment{}[]{}": {
-      "snippet": "providemultienvironment{${1:envname}}[${2:args}]{${3:env,${4:env=arg},...}}"
+      "snippet": "providemultienvironment{${1:envname}}[${2:args}]{${3:env,env=arg,...}}"
     },
     "providemultienvironment{}[][]{}": {
-      "snippet": "providemultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,${5:env=arg},...}}"
+      "snippet": "providemultienvironment{${1:envname}}[${2:args}][${3:default}]{${4:env,env=arg,...}}"
     }
   },
   "envs": {
     "multienv{}": {
       "name": "multienv",
-      "snippet": "{${1:env,${2:env=arg},${3:key=value},...}}"
+      "snippet": "{${1:env,env=arg,key=value,...}}"
     },
     "multienv*{}": {
       "name": "multienv*",
-      "snippet": "{${1:env,${2:env=arg},${3:key=value},...}}"
+      "snippet": "{${1:env,env=arg,key=value,...}}"
     }
   },
   "options": [],
diff --git a/dev/packages/multilang.json b/dev/packages/multilang.json
deleted file mode 100644
index 797bab554..000000000
--- a/dev/packages/multilang.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "includes": {
-    "environ": [],
-    "etoolbox": [],
-    "pgfkeys": [],
-    "pgfopts": []
-  },
-  "macros": {
-    "NewMultilangCmd{}{}": {
-      "snippet": "NewMultilangCmd{${1:command}}{${2:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "NewMultilangEnv{}{}": {
-      "snippet": "NewMultilangEnv{${1:envname}}{${2:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "NewMultilangType{}{}": {
-      "snippet": "NewMultilangType{${1:type name}}{${2:format}}"
-    },
-    "NewMultilangType[]{}{}": {
-      "snippet": "NewMultilangType[${3:arg count}]{${1:type name}}{${2:format}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "languages={${1:lang1,lang2,...}}"
-  ],
-  "keyvals": [
-    [
-      "command=${1:command}",
-      "margs={${1:arg1,arg2,...}}",
-      "oargs={${1:arg1,arg2,...}}",
-      "starred",
-      "disablable",
-      "defaults={${1:arg1=val1,arg2=val2,...}}",
-      "alias/${1:name}={${2:arg1,arg2,...}}"
-    ],
-    [
-      "environment=${1:environment}",
-      "margs={${1:arg1,arg2,...}}",
-      "oargs={${1:arg1,arg2,...}}",
-      "disablable",
-      "defaults={${1:arg1=val1,arg2=val2,...}}",
-      "alias/${1:name}={${2:arg1,arg2,...}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/na-position.json b/dev/packages/na-position.json
index 6cd82bda0..6907d51d5 100644
--- a/dev/packages/na-position.json
+++ b/dev/packages/na-position.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "tkzTabPos{}": {
-      "snippet": "tkzTabPos{${1:symbol1/expr1,${2:symbol2/expr2},...}}"
+      "snippet": "tkzTabPos{${1:symbol1/expr1,symbol2/expr2,...}}"
     },
     "tkzTabPos[]{}": {
-      "snippet": "tkzTabPos[${2:options}]{${1:symbol1/expr1,${3:symbol2/expr2},...}}",
+      "snippet": "tkzTabPos[${2:options}]{${1:symbol1/expr1,symbol2/expr2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/nameauth.json b/dev/packages/nameauth.json
index 0c4f9f6d7..457a57861 100644
--- a/dev/packages/nameauth.json
+++ b/dev/packages/nameauth.json
@@ -21,7 +21,7 @@
       "snippet": "AKA*[${3:forename}]{${1:surname}}{${2:xref surname}}"
     },
     "AKA*{}{}": {
-      "snippet": "AKA*{${1:surname,${3:affix}}{${2:xref surname},affix}}"
+      "snippet": "AKA*{${1:surname,affix}}{${2:xref surname,affix}}"
     },
     "AKA[]{}[]{}": {
       "snippet": "AKA[${3:forename}]{${1:surname}}[${4:xref forename}]{${2:xref surname}}"
@@ -33,7 +33,7 @@
       "snippet": "AKA[${3:forename}]{${1:surname}}{${2:xref surname}}"
     },
     "AKA{}{}": {
-      "snippet": "AKA{${1:surname,${3:affix}}{${2:xref surname},affix}}"
+      "snippet": "AKA{${1:surname,affix}}{${2:xref surname,affix}}"
     },
     "AllCapsActive": {},
     "AllCapsInactive": {},
@@ -213,7 +213,7 @@
       "snippet": "PName*[${3:forename}]{${1:surname}}{${2:xref surname}}"
     },
     "PName*{}{}": {
-      "snippet": "PName*{${1:surname,${3:affix}}{${2:xref surname},affix}}"
+      "snippet": "PName*{${1:surname,affix}}{${2:xref surname,affix}}"
     },
     "PName[]{}[]{}": {
       "snippet": "PName[${3:forename}]{${1:surname}}[${4:xref forename}]{${2:xref surname}}"
diff --git a/dev/packages/nameref.json b/dev/packages/nameref.json
deleted file mode 100644
index 4a98e54c9..000000000
--- a/dev/packages/nameref.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "includes": {
-    "refcount": [],
-    "gettitlestring": []
-  },
-  "macros": {
-    "nameref{}": {
-      "snippet": "nameref{${1:label}}"
-    },
-    "nameref*{}": {
-      "snippet": "nameref*{${1:label}}"
-    },
-    "Nameref{}": {
-      "snippet": "Nameref{${1:label}}"
-    },
-    "Sectionformat{}{}": {
-      "snippet": "Sectionformat{${1:arg1}}{${2:arg2}}"
-    },
-    "vnameref{}": {
-      "snippet": "vnameref{${1:label}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/nccfloats.json b/dev/packages/nccfloats.json
index 827d58c18..e3d1c6f83 100644
--- a/dev/packages/nccfloats.json
+++ b/dev/packages/nccfloats.json
@@ -40,48 +40,24 @@
     "sidefig[]{}{}": {
       "snippet": "sidefig[${3:pos}]{${1:figure}}{${2:text}}"
     },
-    "sidefig()(){}{}": {
-      "snippet": "sidefig(${3:figwidth})(${4:textwidth}){${1:figure}}{${2:text}}"
-    },
-    "sidefig[]()(){}{}": {
-      "snippet": "sidefig[${3:pos}](${4:figwidth})(${5:textwidth}){${1:figure}}{${2:text}}"
-    },
     "sidefig*{}{}": {
       "snippet": "sidefig*{${1:figure}}{${2:text}}"
     },
     "sidefig*[]{}{}": {
       "snippet": "sidefig*[${3:pos}]{${1:figure}}{${2:text}}"
     },
-    "sidefig*()(){}{}": {
-      "snippet": "sidefig*(${3:figwidth})(${4:textwidth}){${1:figure}}{${2:text}}"
-    },
-    "sidefig*[]()(){}{}": {
-      "snippet": "sidefig*[${3:pos}](${4:figwidth})(${5:textwidth}){${1:figure}}{${2:text}}"
-    },
     "sidetabl{}{}": {
       "snippet": "sidetabl{${1:table}}{${2:text}}"
     },
     "sidetabl[]{}{}": {
       "snippet": "sidetabl[${3:pos}]{${1:table}}{${2:text}}"
     },
-    "sidetabl()(){}{}": {
-      "snippet": "sidetabl(${3:tablewidth})(${4:textwidth}){${1:table}}{${2:text}}"
-    },
-    "sidetabl[]()(){}{}": {
-      "snippet": "sidetabl[${3:pos}](${4:tablewidth})(${5:textwidth}){${1:table}}{${2:text}}"
-    },
     "sidetabl*{}{}": {
       "snippet": "sidetabl*{${1:table}}{${2:text}}"
     },
     "sidetabl*[]{}{}": {
       "snippet": "sidetabl*[${3:pos}]{${1:table}}{${2:text}}"
     },
-    "sidetabl*()(){}{}": {
-      "snippet": "sidetabl*(${3:tablewidth})(${4:textwidth}){${1:table}}{${2:text}}"
-    },
-    "sidetabl*[]()(){}{}": {
-      "snippet": "sidetabl*[${3:pos}](${4:tablewidth})(${5:textwidth}){${1:table}}{${2:text}}"
-    },
     "ifleftsidefloat{}{": {
       "snippet": "ifleftsidefloat{${1:left clause}}{${2:right clause}}"
     },
@@ -91,96 +67,48 @@
     "fig[]{}": {
       "snippet": "fig[${2:placement}]{${1:body}}"
     },
-    "fig(){}": {
-      "snippet": "fig(${2:width}){${1:body}}"
-    },
-    "fig[](){}": {
-      "snippet": "fig[${2:placement}](${3:width}){${1:body}}"
-    },
     "fig*{}": {
       "snippet": "fig*{${1:body}}"
     },
     "fig*[]{}": {
       "snippet": "fig*[${2:placement}]{${1:body}}"
     },
-    "fig*(){}": {
-      "snippet": "fig*(${2:width}){${1:body}}"
-    },
-    "fig*[](){}": {
-      "snippet": "fig*[${2:placement}](${3:width}){${1:body}}"
-    },
     "tabl{}": {
       "snippet": "tabl{${1:body}}"
     },
     "tabl[]{}": {
       "snippet": "tabl[${2:placement}]{${1:body}}"
     },
-    "tabl(){}": {
-      "snippet": "tabl(${2:width}){${1:body}}"
-    },
-    "tabl[](){}": {
-      "snippet": "tabl[${2:placement}](${3:width}){${1:body}}"
-    },
     "tabl*{}": {
       "snippet": "tabl*{${1:body}}"
     },
     "tabl*[]{}": {
       "snippet": "tabl*[${2:placement}]{${1:body}}"
     },
-    "tabl*(){}": {
-      "snippet": "tabl*(${2:width}){${1:body}}"
-    },
-    "tabl*[](){}": {
-      "snippet": "tabl*[${2:placement}](${3:width}){${1:body}}"
-    },
     "figs{}{}": {
       "snippet": "figs{${1:body1}}{${2:body2}}"
     },
     "figs[]{}{}": {
       "snippet": "figs[${3:placement}]{${1:body1}}{${2:body2}}"
     },
-    "figs()(){}{}": {
-      "snippet": "figs(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
-    },
-    "figs[]()(){}{}": {
-      "snippet": "figs[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
-    },
     "figs*{}{}": {
       "snippet": "figs*{${1:body1}}{${2:body2}}"
     },
     "figs*[]{}{}": {
       "snippet": "figs*[${3:placement}]{${1:body1}}{${2:body2}}"
     },
-    "figs*()(){}{}": {
-      "snippet": "figs*(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
-    },
-    "figs*[]()(){}{}": {
-      "snippet": "figs*[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
-    },
     "tabls{}{}": {
       "snippet": "tabls{${1:body1}}{${2:body2}}"
     },
     "tabls[]{}{}": {
       "snippet": "tabls[${3:placement}]{${1:body1}}{${2:body2}}"
     },
-    "tabls()(){}{}": {
-      "snippet": "tabls(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
-    },
-    "tabls[]()(){}{}": {
-      "snippet": "tabls[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
-    },
     "tabls*{}{}": {
       "snippet": "tabls*{${1:body1}}{${2:body2}}"
     },
     "tabls*[]{}{}": {
       "snippet": "tabls*[${3:placement}]{${1:body1}}{${2:body2}}"
     },
-    "tabls*()(){}{}": {
-      "snippet": "tabls*(${3:width1})(${4:width2}){${1:body1}}{${2:body2}}"
-    },
-    "tabls*[]()(){}{}": {
-      "snippet": "tabls*[${3:placement}](${4:width1})(${5:width2}){${1:body1}}{${2:body2}}"
-    },
     "newminifloat{}{}{}{}": {
       "snippet": "newminifloat{${1:gen}}{${2:type}}{${3:placement}}{${4:pos}}"
     }
diff --git a/dev/packages/nccpic.json b/dev/packages/nccpic.json
index aeba6a877..5de2df9fe 100644
--- a/dev/packages/nccpic.json
+++ b/dev/packages/nccpic.json
@@ -8,19 +8,7 @@
       "snippet": "ipic{${1:imagefile}}"
     },
     "draftgraphics": {},
-    "finalgraphics": {},
-    "putimage(){}": {
-      "snippet": "putimage(${2:x},${3:y}){${1:imagefile}}"
-    },
-    "putimage()[]{}": {
-      "snippet": "putimage(${3:x},${4:y})[${2:width,height}]{${1:imagefile}}"
-    },
-    "putimage()(){}": {
-      "snippet": "putimage(${2:x},${3:y})(${4:xshift},${5:yshift}){${1:imagefile}}"
-    },
-    "putimage()[](){}": {
-      "snippet": "putimage(${3:x},${4:y})[${2:width,height}](${5:xshift},${6:yshift}){${1:imagefile}}"
-    }
+    "finalgraphics": {}
   },
   "envs": {},
   "options": [
diff --git a/dev/packages/newtx.json b/dev/packages/newtx.json
index 9c142fa17..fdd1166a0 100644
--- a/dev/packages/newtx.json
+++ b/dev/packages/newtx.json
@@ -285,7 +285,6 @@
     "baskervaldx",
     "heuristica",
     "erewhon",
-    "gelasio",
     "xcharter",
     "stix2",
     "nc",
diff --git a/dev/packages/newtxmath.json b/dev/packages/newtxmath.json
index 50a6643fa..539e081aa 100644
--- a/dev/packages/newtxmath.json
+++ b/dev/packages/newtxmath.json
@@ -2204,7 +2204,6 @@
     "utopia",
     "heuristica",
     "erewhon",
-    "gelasio",
     "xcharter",
     "cmintegrals",
     "cmbraces",
diff --git a/dev/packages/nextpage.json b/dev/packages/nextpage.json
deleted file mode 100644
index 970f5aeb8..000000000
--- a/dev/packages/nextpage.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "cleartoevenpage": {},
-    "cleartoevenpage[]": {
-      "snippet": "cleartoevenpage[${1:code}]"
-    },
-    "movetoevenpage": {},
-    "movetoevenpage[]": {
-      "snippet": "movetoevenpage[${1:code}]"
-    },
-    "cleartooddpage": {},
-    "cleartooddpage[]": {
-      "snippet": "cleartooddpage[${1:code}]"
-    },
-    "movetooddpage": {},
-    "movetooddpage[]": {
-      "snippet": "movetooddpage[${1:code}]"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/nicematrix.json b/dev/packages/nicematrix.json
index 773728533..b9ff0e345 100644
--- a/dev/packages/nicematrix.json
+++ b/dev/packages/nicematrix.json
@@ -56,10 +56,10 @@
     },
     "Body": {},
     "cellcolor{}{}": {
-      "snippet": "cellcolor{${1:color}}{${2:i-j,${3:k-l},...}}"
+      "snippet": "cellcolor{${1:color}}{${2:i-j,k-l,...}}"
     },
     "cellcolor[]{}{}": {
-      "snippet": "cellcolor[${3:color_model}]{${1:color}}{${2:i-j,${4:k-l},...}}"
+      "snippet": "cellcolor[${3:color_model}]{${1:color}}{${2:i-j,k-l,...}}"
     },
     "rectanglecolor{}{}{}": {
       "snippet": "rectanglecolor{${1:color}}{${2:i-j}}{${3:k-l}}"
@@ -80,16 +80,16 @@
       "snippet": "chessboardcolors[${3:color_model}]{${1:color1}}{${2:color2}}"
     },
     "rowcolor{}{}": {
-      "snippet": "rowcolor{${1:color}}{${2:i,${3:j-k},${4:l-},...}}"
+      "snippet": "rowcolor{${1:color}}{${2:i,j-k,l-,...}}"
     },
     "rowcolor[]{}{}": {
-      "snippet": "rowcolor[${3:color_model}]{${1:color}}{${2:i,${4:j-k},${5:l-},...}}"
+      "snippet": "rowcolor[${3:color_model}]{${1:color}}{${2:i,j-k,l-,...}}"
     },
     "columncolor{}{}": {
-      "snippet": "columncolor{${1:color}}{${2:i,${3:j-k},${4:l-},...}}"
+      "snippet": "columncolor{${1:color}}{${2:i,j-k,l-,...}}"
     },
     "columncolor[]{}{}": {
-      "snippet": "columncolor[${3:color_model}]{${1:color}}{${2:i,${4:j-k},${5:l-},...}}"
+      "snippet": "columncolor[${3:color_model}]{${1:color}}{${2:i,j-k,l-,...}}"
     },
     "rowcolors{}{}{}": {
       "snippet": "rowcolors{${1:row}}{${2:color1}}{${3:color2}}"
@@ -100,10 +100,10 @@
       "keyvalpos": 4
     },
     "rowlistcolors{}{}": {
-      "snippet": "rowlistcolors{${1:row}}{${2:color1,${3:color2},...}}"
+      "snippet": "rowlistcolors{${1:row}}{${2:color1,color2,...}}"
     },
     "rowlistcolors[]{}{}": {
-      "snippet": "rowlistcolors[${3:color model}]{${1:row}}{${2:color1,${4:color2},...}}"
+      "snippet": "rowlistcolors[${3:color model}]{${1:row}}{${2:color1,color2,...}}"
     },
     "RowStyle{}": {
       "snippet": "RowStyle{${1:code}}"
@@ -537,8 +537,6 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
-      "ampersand-in-blocks",
-      "&-in-blocks",
       "width=",
       "notes={${1:specs}}",
       "notes/style=",
@@ -588,8 +586,6 @@
       "borders={${1:borders options}}",
       "hvlines",
       "v-center",
-      "p",
-      "j",
       "m",
       "t",
       "b",
@@ -813,8 +809,6 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
-      "ampersand-in-blocks",
-      "&-in-blocks",
       "width=",
       "caption=${1:text}",
       "short-caption=${1:text}",
@@ -899,8 +893,6 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
-      "ampersand-in-blocks",
-      "&-in-blocks",
       "caption=${1:text}",
       "short-caption=${1:text}",
       "label=",
@@ -984,8 +976,6 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
-      "ampersand-in-blocks",
-      "&-in-blocks",
       "delimiters/color=",
       "sub-matrix/left-xshift=",
       "sub-matrix/right-xshift=",
@@ -1066,8 +1056,6 @@
       "rounded-corners",
       "rounded-corners=",
       "no-cell-nodes",
-      "ampersand-in-blocks",
-      "&-in-blocks",
       "l",
       "c",
       "r",
diff --git a/dev/packages/nlctuserguide.json b/dev/packages/nlctuserguide.json
index a128264d6..5503e45ae 100644
--- a/dev/packages/nlctuserguide.json
+++ b/dev/packages/nlctuserguide.json
@@ -796,7 +796,7 @@
       "snippet": "margm{${1:arg}}"
     },
     "menu{}": {
-      "snippet": "menu{${1:item1,${2:item2},...}}"
+      "snippet": "menu{${1:item1,item2,...}}"
     },
     "meta{}": {
       "snippet": "meta{${1:arg}}"
diff --git a/dev/packages/nth.json b/dev/packages/nth.json
deleted file mode 100644
index bf316db75..000000000
--- a/dev/packages/nth.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "nth{}": {
-      "snippet": "nth{${1:number}}"
-    },
-    "ordinal{}": {
-      "snippet": "ordinal{${1:counter}}"
-    },
-    "nthM{}": {
-      "snippet": "nthM{${1:arg}}"
-    },
-    "nthSuff{}{}{}": {
-      "snippet": "nthSuff{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "nthscript{}": {
-      "snippet": "nthscript{${1:arg}}"
-    },
-    "nthtest": {}
-  },
-  "envs": {},
-  "options": [
-    "super",
-    "negative"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ntheorem.json b/dev/packages/ntheorem.json
index fbc785bc5..7bc618b2e 100644
--- a/dev/packages/ntheorem.json
+++ b/dev/packages/ntheorem.json
@@ -145,7 +145,7 @@
     "theoreminframepostskipamount": {},
     "theoremrightindent": {},
     "listtheorems{}": {
-      "snippet": "listtheorems{${1:thmset1,${2:thmset2},...}}"
+      "snippet": "listtheorems{${1:thmset1,thmset2,...}}"
     },
     "theoremlisttype{}": {
       "snippet": "theoremlisttype{${1:type}}"
diff --git a/dev/packages/numerica.json b/dev/packages/numerica.json
index a11bf1f66..5a6010ee5 100644
--- a/dev/packages/numerica.json
+++ b/dev/packages/numerica.json
@@ -224,28 +224,28 @@
       "snippet": "nmcMacros*[${2:settings}]{${1:command list}}[${3:vv-list}]"
     },
     "constants{}": {
-      "snippet": "constants{${1:name1=val1,${2:name2=val2},...}}"
+      "snippet": "constants{${1:name1=val1,name2=val2,...}}"
     },
     "constants[]{}": {
-      "snippet": "constants[${2:settings}]{${1:name1=val1,${3:name2=val2},...}}"
+      "snippet": "constants[${2:settings}]{${1:name1=val1,name2=val2,...}}"
     },
     "constants{}[]": {
-      "snippet": "constants{${1:name1=val1,${3:name2=val2},...}}[${2:vv-list}]"
+      "snippet": "constants{${1:name1=val1,name2=val2,...}}[${2:vv-list}]"
     },
     "constants[]{}[]": {
-      "snippet": "constants[${2:settings}]{${1:name1=val1,${4:name2=val2},...}}[${3:vv-list}]"
+      "snippet": "constants[${2:settings}]{${1:name1=val1,name2=val2,...}}[${3:vv-list}]"
     },
     "nmcConstants{}": {
-      "snippet": "nmcConstants{${1:name1=val1,${2:name2=val2},...}}"
+      "snippet": "nmcConstants{${1:name1=val1,name2=val2,...}}"
     },
     "nmcConstants[]{}": {
-      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,${3:name2=val2},...}}"
+      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,name2=val2,...}}"
     },
     "nmcConstants{}[]": {
-      "snippet": "nmcConstants{${1:name1=val1,${3:name2=val2},...}}[${2:vv-list}]"
+      "snippet": "nmcConstants{${1:name1=val1,name2=val2,...}}[${2:vv-list}]"
     },
     "nmcConstants[]{}[]": {
-      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,${4:name2=val2},...}}[${3:vv-list}]"
+      "snippet": "nmcConstants[${2:settings}]{${1:name1=val1,name2=val2,...}}[${3:vv-list}]"
     },
     "reuse{}": {
       "snippet": "reuse{${1:csname}}"
diff --git a/dev/packages/numprint.json b/dev/packages/numprint.json
deleted file mode 100644
index cbf5971e2..000000000
--- a/dev/packages/numprint.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "includes": {
-    "array": []
-  },
-  "macros": {
-    "numprint{}": {
-      "snippet": "numprint{${1:number}}"
-    },
-    "numprint[]{}": {
-      "snippet": "numprint[${2:unit}]{${1:number}}"
-    },
-    "np{}": {
-      "snippet": "np{${1:number}}",
-      "option": "np"
-    },
-    "np[]{}": {
-      "snippet": "np[${2:unit}]{${1:number}}",
-      "option": "np"
-    },
-    "cntprint{}": {
-      "snippet": "cntprint{${1:counter}}"
-    },
-    "cntprint[]{}": {
-      "snippet": "cntprint[${2:unit}]{${1:counter}}"
-    },
-    "lenprint{}": {
-      "snippet": "lenprint{${1:length}}"
-    },
-    "lenprint[]{}": {
-      "snippet": "lenprint[${2:unit}]{${1:length}}"
-    },
-    "npfourdigitsep": {},
-    "npfourdigitnosep": {},
-    "npaddmissingzero": {},
-    "npnoaddmissingzero": {},
-    "npaddplus": {},
-    "npnoaddplus": {},
-    "npaddplusexponent": {},
-    "npnoaddplusexponent": {},
-    "nprounddigits{}": {
-      "snippet": "nprounddigits{${1:digits}}"
-    },
-    "nproundexpdigits{}": {
-      "snippet": "nproundexpdigits{${1:digits}}"
-    },
-    "npnoround": {},
-    "npnoroundexp": {},
-    "nplpadding{}": {
-      "snippet": "nplpadding{${1:digits}}"
-    },
-    "nplpadding[]{}": {
-      "snippet": "nplpadding[${2:character}]{${1:digits}}"
-    },
-    "npnolpadding": {},
-    "npreplacenull{}": {
-      "snippet": "npreplacenull{${1:replacement}}"
-    },
-    "npprintnull": {},
-    "npunitcommand{}": {
-      "snippet": "npunitcommand{${1:arg}}"
-    },
-    "npdefunit{}{}{}": {
-      "snippet": "npdefunit{${1:unitname}}{${2:unit}}{${3:scale}}"
-    },
-    "selectlanguage{}": {
-      "snippet": "selectlanguage{${1:language}}"
-    },
-    "npmakebox{}": {
-      "snippet": "npmakebox{${1:text}}"
-    },
-    "npmakebox[][]{}": {
-      "snippet": "npmakebox[${2:dummy text}][${3:justification}]{${1:text}}"
-    },
-    "npboldmath": {
-      "option": "boldmath"
-    },
-    "npafternum{}": {
-      "snippet": "npafternum{${1:arg}}"
-    },
-    "npunit{}": {
-      "snippet": "npunit{${1:unit}}"
-    },
-    "npdigits{}{}": {
-      "snippet": "npdigits{${1:before}}{${2:after}}"
-    },
-    "npexponentdigits{}": {
-      "snippet": "npexponentdigits{${1:before}}"
-    },
-    "npexponentdigits[]{}": {
-      "snippet": "npexponentdigits[${2:after}]{${1:before}}"
-    },
-    "npnodigits": {},
-    "npnoexponentdigits": {},
-    "npthousandsep{}": {
-      "snippet": "npthousandsep{${1:separator}}"
-    },
-    "npthousandthpartsep{}": {
-      "snippet": "npthousandthpartsep{${1:separator}}"
-    },
-    "npdecimalsign{}": {
-      "snippet": "npdecimalsign{${1:sign}}"
-    },
-    "npproductsign{}": {
-      "snippet": "npproductsign{${1:sign}}"
-    },
-    "npunitseparator{}": {
-      "snippet": "npunitseparator{${1:separator}}"
-    },
-    "npdegreeseparator{}": {
-      "snippet": "npdegreeseparator{${1:separator}}"
-    },
-    "npcelsiusseparator{}": {
-      "snippet": "npcelsiusseparator{${1:separator}}"
-    },
-    "nppercentseparator{}": {
-      "snippet": "nppercentseparator{${1:separator}}"
-    },
-    "npstyledefault": {},
-    "npstyleenglish": {},
-    "npstylegerman": {},
-    "npstylefrench": {},
-    "npstyleportuguese": {},
-    "npstyledutch": {},
-    "npaddtolanguage{}{}": {
-      "snippet": "npaddtolanguage{${1:lang1}}{${2:lang2}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "nosepfour",
-    "sepfour",
-    "noaddmissingzero",
-    "addmissingzero",
-    "noaddplus",
-    "addplus",
-    "noaddplusexponent",
-    "addplusexponent",
-    "noautolanguage",
-    "autolanguage",
-    "np",
-    "oldcolumntypes",
-    "newcolumntypes",
-    "boldmath",
-    "warning",
-    "error",
-    "debug"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ocgx.json b/dev/packages/ocgx.json
deleted file mode 100644
index 3f569e4e0..000000000
--- a/dev/packages/ocgx.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "includes": {
-    "ocg-p": []
-  },
-  "macros": {
-    "switchocg{}{}": {
-      "snippet": "switchocg{${1:ocg1 ocg2 ...}}{${2:display}}"
-    },
-    "showocg{}{}": {
-      "snippet": "showocg{${1:ocg1 ocg2 ...}}{${2:display}}"
-    },
-    "hideocg{}{}": {
-      "snippet": "hideocg{${1:ocg1 ocg2 ...}}{${2:display}}"
-    },
-    "actionsocg{}{}{}{}": {
-      "snippet": "actionsocg{${1:switchocg1 ...}}{${2:showocg1 ...}}{${3:hideocg1 ...}}{${4:display}}"
-    },
-    "ocgxversion": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ocgx2.json b/dev/packages/ocgx2.json
index 3ca694638..ad306a7b3 100644
--- a/dev/packages/ocgx2.json
+++ b/dev/packages/ocgx2.json
@@ -12,73 +12,73 @@
   },
   "macros": {
     "AllOn{}": {
-      "snippet": "AllOn{${1:ocg1,${2:ocg2},...}}"
+      "snippet": "AllOn{${1:ocg1,ocg2,...}}"
     },
     "AnyOn{}": {
-      "snippet": "AnyOn{${1:ocg1,${2:ocg2},...}}"
+      "snippet": "AnyOn{${1:ocg1,ocg2,...}}"
     },
     "AnyOff{}": {
-      "snippet": "AnyOff{${1:ocg1,${2:ocg2},...}}"
+      "snippet": "AnyOff{${1:ocg1,ocg2,...}}"
     },
     "AllOff{}": {
-      "snippet": "AllOff{${1:ocg1,${2:ocg2},...}}"
+      "snippet": "AllOff{${1:ocg1,ocg2,...}}"
     },
     "Not{}": {
       "snippet": "Not{${1:item}}"
     },
     "And{}": {
-      "snippet": "And{${1:item1,${2:item2},...}}"
+      "snippet": "And{${1:item1,item2,...}}"
     },
     "Or{}": {
-      "snippet": "Or{${1:item1,${2:item2},...}}"
+      "snippet": "Or{${1:item1,item2,...}}"
     },
     "switchocg{}{}": {
-      "snippet": "switchocg{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
+      "snippet": "switchocg{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "switchocg[]{}{}": {
-      "snippet": "switchocg[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
+      "snippet": "switchocg[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "switchocg*{}{}": {
-      "snippet": "switchocg*{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
+      "snippet": "switchocg*{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "switchocg*[]{}{}": {
-      "snippet": "switchocg*[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
+      "snippet": "switchocg*[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "showocg{}{}": {
-      "snippet": "showocg{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
+      "snippet": "showocg{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "showocg[]{}{}": {
-      "snippet": "showocg[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
+      "snippet": "showocg[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "showocg*{}{}": {
-      "snippet": "showocg*{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
+      "snippet": "showocg*{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "showocg*[]{}{}": {
-      "snippet": "showocg*[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
+      "snippet": "showocg*[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "hideocg{}{}": {
-      "snippet": "hideocg{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
+      "snippet": "hideocg{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "hideocg[]{}{}": {
-      "snippet": "hideocg[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
+      "snippet": "hideocg[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "hideocg*{}{}": {
-      "snippet": "hideocg*{${1:ocg1,${3:ocg2},...}}{${2:link text}}"
+      "snippet": "hideocg*{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "hideocg*[]{}{}": {
-      "snippet": "hideocg*[${3:trigger}]{${1:ocg1,${4:ocg2},...}}{${2:link text}}"
+      "snippet": "hideocg*[${3:trigger}]{${1:ocg1,ocg2,...}}{${2:link text}}"
     },
     "actionsocg{}{}{}{}": {
-      "snippet": "actionsocg{${1:switchocg1,${5:...}}{${2:showocg1},${6:...}}{${3:hideocg1},...}}{${4:link text}}"
+      "snippet": "actionsocg{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
     },
     "actionsocg[]{}{}{}{}": {
-      "snippet": "actionsocg[${5:trigger}]{${1:switchocg1,${6:...}}{${2:showocg1},${7:...}}{${3:hideocg1},...}}{${4:link text}}"
+      "snippet": "actionsocg[${5:trigger}]{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
     },
     "actionsocg*{}{}{}{}": {
-      "snippet": "actionsocg*{${1:switchocg1,${5:...}}{${2:showocg1},${6:...}}{${3:hideocg1},...}}{${4:link text}}"
+      "snippet": "actionsocg*{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
     },
     "actionsocg*[]{}{}{}{}": {
-      "snippet": "actionsocg*[${5:trigger}]{${1:switchocg1,${6:...}}{${2:showocg1},${7:...}}{${3:hideocg1},...}}{${4:link text}}"
+      "snippet": "actionsocg*[${5:trigger}]{${1:switchocg1,...}}{${2:showocg1,...}}{${3:hideocg1,...}}{${4:link text}}"
     },
     "ocglinkprotect{}": {
       "snippet": "ocglinkprotect{${1:text}}"
diff --git a/dev/packages/onedown.json b/dev/packages/onedown.json
index 66de718a5..58b81b80e 100644
--- a/dev/packages/onedown.json
+++ b/dev/packages/onedown.json
@@ -143,42 +143,18 @@
     "showNS[]": {
       "snippet": "showNS[${1:pos}]"
     },
-    "showNS()": {
-      "snippet": "showNS(${1:N/S})"
-    },
-    "showNS[]()": {
-      "snippet": "showNS[${1:pos}](${2:N/S})"
-    },
     "showNS*": {},
     "showNS*[]": {
       "snippet": "showNS*[${1:pos}]"
     },
-    "showNS*()": {
-      "snippet": "showNS*(${1:N/S})"
-    },
-    "showNS*[]()": {
-      "snippet": "showNS*[${1:pos}](${2:N/S})"
-    },
     "showEW": {},
     "showEW[]": {
       "snippet": "showEW[${1:pos}]"
     },
-    "showEW()": {
-      "snippet": "showEW(${1:E/W})"
-    },
-    "showEW[]()": {
-      "snippet": "showEW[${1:pos}](${2:E/W})"
-    },
     "showEW*": {},
     "showEW*[]": {
       "snippet": "showEW*[${1:pos}]"
     },
-    "showEW*()": {
-      "snippet": "showEW*(${1:E/W})"
-    },
-    "showEW*[]()": {
-      "snippet": "showEW*[${1:pos}](${2:E/W})"
-    },
     "showNE": {},
     "showNE[]": {
       "snippet": "showNE[${1:pos}]"
diff --git a/dev/packages/optex.json b/dev/packages/optex.json
index 71f394fd3..fb998b937 100644
--- a/dev/packages/optex.json
+++ b/dev/packages/optex.json
@@ -844,20 +844,13 @@
     "scriptspaces{}{}{}{}": {
       "snippet": "scriptspaces{${1:s-rel}}{${2:s-bin}}{${3:ss-rel}}{${4:ss-bin}}"
     },
-    "interval": {},
-    "rmsbsp": {},
     "bfserif": {},
-    "flexipa": {},
-    "partialsymbolvars": {},
-    "mrmpartial": {},
     "rmchars{}": {
       "snippet": "rmchars{${1:list}}"
     },
     "vargreek{}": {
       "snippet": "vargreek{${1:list}}"
     },
-    "enablefic": {},
-    "finalitalcorr": {},
     "textvariables": {},
     "textdigits": {},
     "textmoremath": {},
@@ -10940,17 +10933,13 @@
   "keyvals": [
     [
       "dots",
-      "interval",
       "vert",
-      "rmsbsp",
       "bfserif",
-      "flexipa",
-      "rmchars={${1:list}}",
+      "rmchar={${1:list}}",
       "vargreek={${1:list}}",
       "text={${1:list}}",
       "mstyle=${1:style}",
-      "bstyle=${1:style}",
-      "enablefic"
+      "bstyle=${1:style}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/optional.json b/dev/packages/optional.json
deleted file mode 100644
index b5097bc94..000000000
--- a/dev/packages/optional.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "opt{}{}": {
-      "snippet": "opt{${1:option}}{${2:content}}"
-    },
-    "optv{}{}": {
-      "snippet": "optv{${1:option}}{${2:content}}"
-    },
-    "AskOption": {},
-    "UseOption": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/options.json b/dev/packages/options.json
deleted file mode 100644
index 5899588ff..000000000
--- a/dev/packages/options.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "xcolor": []
-  },
-  "macros": {
-    "options{}": {
-      "snippet": "options{${1:options}}"
-    },
-    "optionsalso{}": {
-      "snippet": "optionsalso{${1:options}}"
-    },
-    "optionswithremaining{}": {
-      "snippet": "optionswithremaining{${1:options}}"
-    },
-    "option{}": {
-      "snippet": "option{${1:option}}"
-    },
-    "letoption{}{}": {
-      "snippet": "letoption{${1:option}}{${2:macro}}"
-    },
-    "edefoption{}{}": {
-      "snippet": "edefoption{${1:option}}{${2:macro}}"
-    },
-    "ifoptiondefined{}{}{}": {
-      "snippet": "ifoptiondefined{${1:option}}{${2:true}}{${3:false}}"
-    },
-    "ifoptionvoid{}{}{}": {
-      "snippet": "ifoptionvoid{${1:option}}{${2:true}}{${3:false}}"
-    },
-    "ifoptionblank{}{}{}": {
-      "snippet": "ifoptionblank{${1:option}}{${2:true}}{${3:false}}"
-    },
-    "ifoptionequal{}{}{}{}": {
-      "snippet": "ifoptionequal{${1:option}}{${2:value}}{${3:true}}{${4:false}}"
-    },
-    "ifoptionanyof{}{}{}{}": {
-      "snippet": "ifoptionanyof{${1:option}}{${2:list}}{${3:true}}{${4:false}}"
-    },
-    "ifoptiontype{}{}{}{}": {
-      "snippet": "ifoptiontype{${1:option}}{${2:type}}{${3:true}}{${4:false}}"
-    },
-    "ifoptionnil{}{}{}": {
-      "snippet": "ifoptionnil{${1:list option}}{${2:true}}{${3:false}}"
-    },
-    "ifoptioniscode{}{}{}": {
-      "snippet": "ifoptioniscode{${1:option}}{${2:true}}{${3:false}}"
-    },
-    "optionlistdo{}{}": {
-      "snippet": "optionlistdo{${1:list option}}{${2:action}}"
-    },
-    "letoptionlist{}{}": {
-      "snippet": "letoptionlist{${1:list option}}{${2:macro}}"
-    },
-    "ifoptioncontains{}{}{}": {
-      "snippet": "ifoptioncontains{${1:list option}}{${2:true}}{${3:false}}"
-    },
-    "optionshow{}": {
-      "snippet": "optionshow{${1:option}}"
-    },
-    "optionshowall": {},
-    "optionshowall[]": {
-      "snippet": "optionshowall[${1:bool}]"
-    },
-    "optionshowpath{}": {
-      "snippet": "optionshowpath{${1:option}}"
-    },
-    "optionerror{}{}": {
-      "snippet": "optionerror{${1:option}}{${2:message}}"
-    },
-    "optionwarning{}{}": {
-      "snippet": "optionwarning{${1:option}}{${2:message}}"
-    },
-    "letoptiontype{}{}": {
-      "snippet": "letoptiontype{${1:option}}{${2:type}}"
-    },
-    "optionname{}": {
-      "snippet": "optionname{${1:option}}"
-    },
-    "optionprependcode{}{}": {
-      "snippet": "optionprependcode{${1:option}}{${2:code}}"
-    },
-    "optionnewcode{}{}": {
-      "snippet": "optionnewcode{${1:option}}{${2:code}}"
-    },
-    "optionnewcode*{}{}": {
-      "snippet": "optionnewcode*{${1:option}}{${2:code}}"
-    },
-    "optionnewhandler{}{}": {
-      "snippet": "optionnewhandler{${1:option}}{${2:code}}"
-    },
-    "optionnewhandler*{}{}": {
-      "snippet": "optionnewhandler*{${1:option}}{${2:code}}"
-    },
-    "optionvalue": {},
-    "optionnovalue": {},
-    "eifblank{}{}{}": {
-      "snippet": "eifblank{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "eifstrequal{}{}{}": {
-      "snippet": "eifstrequal{${1:string}}{${2:true}}{${3:false}}"
-    },
-    "expandnextcmds{}{}": {
-      "snippet": "expandnextcmds{${1:arg1}}{${2:arg2}}"
-    },
-    "expandnextsingle{}{}": {
-      "snippet": "expandnextsingle{${1:arg1}}{${2:arg2}}"
-    },
-    "expandnext{}{}": {
-      "snippet": "expandnext{${1:arg1}}{${2:arg2}}"
-    },
-    "ifoptioncmd{}{}{}": {
-      "snippet": "ifoptioncmd{${1:option}}{${2:true}}{${3:false}}"
-    },
-    "ifoptioncolortransparent{}{}{}": {
-      "snippet": "ifoptioncolortransparent{${1:color}}{${2:true}}{${3:false}}"
-    },
-    "ifoptionisabsolute{}{}{}": {
-      "snippet": "ifoptionisabsolute{${1:option}}{${2:true}}{${3:false}}"
-    },
-    "letoptionchoices{}{}": {
-      "snippet": "letoptionchoices{${1:option}}{${2:macro}}"
-    },
-    "ontoggle{}{}": {
-      "snippet": "ontoggle{${1:toggle name}}{${2:true}}"
-    },
-    "optioncolorbox{}{}": {
-      "snippet": "optioncolorbox{${1:color}}{${2:code}}"
-    },
-    "optioncolor{}": {
-      "snippet": "optioncolor{${1:color}}"
-    },
-    "optionlist{}": {
-      "snippet": "optionlist{${1:list option}}"
-    },
-    "optionparamcount{}": {
-      "snippet": "optionparamcount{${1:option}}"
-    },
-    "optionshowtype{}": {
-      "snippet": "optionshowtype{${1:option}}"
-    },
-    "optiontextcolor{}{}": {
-      "snippet": "optiontextcolor{${1:color}}{${2:code}}"
-    },
-    "optiontypeout{}": {
-      "snippet": "optiontypeout{${1:option}}"
-    },
-    "optionunit{}": {
-      "snippet": "optionunit{${1:option}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "debug"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/orcidlink.json b/dev/packages/orcidlink.json
index 15be019fc..6f77420b9 100644
--- a/dev/packages/orcidlink.json
+++ b/dev/packages/orcidlink.json
@@ -7,19 +7,6 @@
   "macros": {
     "orcidlink{}": {
       "snippet": "orcidlink{${1:orcid}}"
-    },
-    "orcidlogo": {},
-    "orcidlinkf{}": {
-      "snippet": "orcidlinkf{${1:orcid}}"
-    },
-    "orcidlinkc{}": {
-      "snippet": "orcidlinkc{${1:orcid}}"
-    },
-    "orcidlinki{}{}": {
-      "snippet": "orcidlinki{${1:name}}{${2:orcid}}"
-    },
-    "orcidlinkX{}{}{}": {
-      "snippet": "orcidlinkX{${1:before}}{${2:orcid}}{${3:after}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/otf.json b/dev/packages/otf.json
deleted file mode 100644
index f431272f9..000000000
--- a/dev/packages/otf.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "includes": {
-    "platex": [],
-    "keyval": [],
-    "ajmacros": [],
-    "mlutf": [
-      "multi"
-    ],
-    "mlcid": [
-      "multi"
-    ],
-    "uplatex": [
-      "uplatex"
-    ]
-  },
-  "macros": {
-    "rubydefault": {
-      "option": "expert"
-    },
-    "rubyfamily": {
-      "option": "expert"
-    },
-    "rubykatuji": {
-      "option": "expert"
-    },
-    "mgdefault": {
-      "option": "deluxe"
-    },
-    "propdefault": {
-      "option": "deluxe"
-    },
-    "ebdefault": {
-      "option": "deluxe"
-    },
-    "ltdefault": {
-      "option": "deluxe"
-    },
-    "mathmg{}": {
-      "snippet": "mathmg{${1:text}}",
-      "option": "deluxe"
-    },
-    "mgfamily": {
-      "option": "deluxe"
-    },
-    "textmg{}": {
-      "snippet": "textmg{${1:text}}",
-      "option": "deluxe"
-    },
-    "propshape": {
-      "option": "deluxe"
-    },
-    "ebseries": {
-      "option": "deluxe"
-    },
-    "ltseries": {
-      "option": "deluxe"
-    },
-    "UTF{}": {
-      "snippet": "UTF{${1:hex number}}"
-    },
-    "CID{}": {
-      "snippet": "CID{${1:number}}"
-    },
-    "ajKunoji": {},
-    "ajKunojiwithBou": {},
-    "ajDKunoji": {},
-    "ajDKunojiwithBou": {},
-    "ajNinoji": {},
-    "ajvarNinoji": {},
-    "ajYusuriten": {},
-    "ajMasu": {},
-    "ajYori": {},
-    "ajKoto": {},
-    "ajUta": {},
-    "ajCommandKey": {},
-    "ajReturnKey": {},
-    "ajCheckmark": {},
-    "ajVisibleSpace": {},
-    "ajSenteMark": {},
-    "ajGoteMark": {},
-    "ajClub": {},
-    "ajHeart": {},
-    "ajSpade": {},
-    "ajDiamond": {},
-    "ajvarClub": {},
-    "ajvarHeart": {},
-    "ajvarSpade": {},
-    "ajvarDiamond": {},
-    "ajPhone": {},
-    "ajPostal": {},
-    "ajvarPostal": {},
-    "ajSun": {},
-    "ajCloud": {},
-    "ajUmbrella": {},
-    "ajSnowman": {},
-    "ajJIS": {},
-    "ajJAS": {},
-    "ajBall": {},
-    "ajHotSpring": {},
-    "ajWhiteSesame": {},
-    "ajBlackSesame": {},
-    "ajWhiteFlorette": {},
-    "ajBlackFlorette": {},
-    "ajRightBArrow": {},
-    "ajLeftBArrow": {},
-    "ajUpBArrow": {},
-    "ajDownBArrow": {},
-    "ajRightHand": {},
-    "ajLeftHand": {},
-    "ajUpHand": {},
-    "ajDownHand": {},
-    "ajRightScissors": {},
-    "ajLeftScissors": {},
-    "ajUpScissors": {},
-    "ajDownScissors": {},
-    "ajRightWArrow": {},
-    "ajLeftWArrow": {},
-    "ajUpWArrow": {},
-    "ajDownWArrow": {},
-    "ajRightDownArrow": {},
-    "ajLeftDownArrow": {},
-    "ajLeftUpArrow": {},
-    "ajRightUpArrow": {}
-  },
-  "envs": {},
-  "options": [
-    "nomacros",
-    "noreplace",
-    "noruby",
-    "bold",
-    "expert",
-    "deluxe",
-    "multi",
-    "burasage",
-    "platex",
-    "uplatex",
-    "autodetect",
-    "jis2004",
-    "scale=${1:factor}"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/overarrows.json b/dev/packages/overarrows.json
index aace0e5bf..3243e77bd 100644
--- a/dev/packages/overarrows.json
+++ b/dev/packages/overarrows.json
@@ -10,9 +10,6 @@
     "tikz": [
       "tikz"
     ],
-    "pstricks-add": [
-      "pstricks"
-    ],
     "pict2e": [
       "pstarrows"
     ]
@@ -259,56 +256,56 @@
       "option": "allcommands"
     },
     "NewOverArrowCommand{}{}": {
-      "snippet": "NewOverArrowCommand{${1:command}}{${2:keyvals}}",
+      "snippet": "NewOverArrowCommand{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "NewOverArrowCommand[]{}{}": {
-      "snippet": "NewOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
+      "snippet": "NewOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "RenewOverArrowCommand{}{}": {
-      "snippet": "RenewOverArrowCommand{${1:command}}{${2:keyvals}}",
+      "snippet": "RenewOverArrowCommand{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "RenewOverArrowCommand[]{}{}": {
-      "snippet": "RenewOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
+      "snippet": "RenewOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "ProvideOverArrowCommand{}{}": {
-      "snippet": "ProvideOverArrowCommand{${1:command}}{${2:keyvals}}",
+      "snippet": "ProvideOverArrowCommand{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "ProvideOverArrowCommand[]{}{}": {
-      "snippet": "ProvideOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
+      "snippet": "ProvideOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "DeclareOverArrowCommand{}{}": {
-      "snippet": "DeclareOverArrowCommand{${1:command}}{${2:keyvals}}",
+      "snippet": "DeclareOverArrowCommand{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 1
     },
     "DeclareOverArrowCommand[]{}{}": {
-      "snippet": "DeclareOverArrowCommand[${3:method}]{${1:command}}{${2:keyvals}}",
+      "snippet": "DeclareOverArrowCommand[${3:method}]{${1:name}}{${2:keyvals}}",
       "keyvalindex": 0,
       "keyvalpos": 2
     },
     "TestOverArrow{}": {
-      "snippet": "TestOverArrow{${1:arrow command}}"
+      "snippet": "TestOverArrow{${1:name}}"
     },
     "TestOverArrow[]{}": {
-      "snippet": "TestOverArrow[${2:pattern}]{${1:arrow command}}"
+      "snippet": "TestOverArrow[${2:pattern}]{${1:name}}"
     },
     "TestOverArrow*{}": {
-      "snippet": "TestOverArrow*{${1:arrow command}}"
+      "snippet": "TestOverArrow*{${1:name}}"
     },
     "TestOverArrow*[]{}": {
-      "snippet": "TestOverArrow*[${2:pattern}]{${1:arrow command}}"
+      "snippet": "TestOverArrow*[${2:pattern}]{${1:name}}"
     },
     "xjoinrel": {},
     "xjoinrel[]": {
@@ -360,7 +357,6 @@
     "esvecth",
     "old-arrows",
     "tikz",
-    "pstricks",
     "pstarrows",
     "subscripts",
     "subother",
@@ -424,9 +420,6 @@
       "line thickness=",
       "thinner",
       "tikz command={${1:TikZ command}}",
-      "pstricks command={${1:pstricks command}}",
-      "arrow={${1:arrow}}",
-      "psset={${1:pstricks options}}",
       "picture command={${1:picture command}}",
       "geometry={${1:picture geometry spec}}",
       "stack macro={${1:stack definition}}",
diff --git a/dev/packages/pagegrid.json b/dev/packages/pagegrid.json
deleted file mode 100644
index c2151f306..000000000
--- a/dev/packages/pagegrid.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "atbegshi": [],
-    "kvoptions": []
-  },
-  "macros": {
-    "pagegridsetup{}": {
-      "snippet": "pagegridsetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "pagegridShipoutDoubleBegin": {},
-    "pagegridShipoutDoubleEnd": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "enable",
-      "disable",
-      "left-top",
-      "lt",
-      "top-left",
-      "tl",
-      "tr",
-      "top-right",
-      "rt",
-      "right-top",
-      "left-bottom",
-      "lb",
-      "bottom-left",
-      "bl",
-      "br",
-      "bottom-right",
-      "rb",
-      "right-bottom",
-      "step=",
-      "firstcolor=",
-      "secondcolor=",
-      "arrows",
-      "arrowlength=",
-      "double=",
-      "foreground"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/paracol.json b/dev/packages/paracol.json
index 0ded80be5..85b063636 100644
--- a/dev/packages/paracol.json
+++ b/dev/packages/paracol.json
@@ -19,16 +19,16 @@
       "snippet": "ensurevspace{${1:length}}"
     },
     "columnratio{}": {
-      "snippet": "columnratio{${1:ratio 0,${2:...},ratio k}}"
+      "snippet": "columnratio{${1:ratio 0,...,ratio k}}"
     },
     "columnratio{}[]": {
-      "snippet": "columnratio{${1:ratio 0,${3:...},${4:ratio k}}[${2:ratio' 0},${5:...},ratio' k}]"
+      "snippet": "columnratio{${1:ratio 0,...,ratio k}}[${2:ratio' 0,...,ratio' k}]"
     },
     "setcolumnwidth{}": {
-      "snippet": "setcolumnwidth{${1:gap 0,${2:...},gap k}}"
+      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}"
     },
     "setcolumnwidth{}[]": {
-      "snippet": "setcolumnwidth{${1:gap 0,${3:...},${4:gap k}}[${2:gap' 0},${5:...},gap' k}]"
+      "snippet": "setcolumnwidth{${1:gap 0,...,gap k}}[${2:gap' 0,...,gap' k}]"
     },
     "twosided": {},
     "twosided[]": {
diff --git a/dev/packages/parallel.json b/dev/packages/parallel.json
deleted file mode 100644
index 2df4e79fb..000000000
--- a/dev/packages/parallel.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "ParallelLText{}": {
-      "snippet": "ParallelLText{${1:text}}"
-    },
-    "ParallelRText{}": {
-      "snippet": "ParallelRText{${1:text}}"
-    },
-    "ParallelPar": {},
-    "ParallelLWidth": {},
-    "ParallelRWidth": {},
-    "ParallelTextWidth": {},
-    "ParallelLeftMargin": {},
-    "ParallelUserMidSkip": {},
-    "ParallelMainMidSkip": {},
-    "ParallelLBox": {},
-    "ParallelRBox": {},
-    "ParallelBoxVar": {},
-    "ParallelLTok": {},
-    "ParallelRTok": {},
-    "ParallelBoolVar": {},
-    "ParallelBoolMid": {},
-    "ParallelWhichBox": {},
-    "ParallelMainMode": {},
-    "ParallelFNMode": {},
-    "ParallelLFNCounter": {},
-    "ParallelRFNCounter": {},
-    "ParallelMaxFN": {},
-    "ParallelFNNumMode": {},
-    "ParallelMessage{}": {
-      "snippet": "ParallelMessage{${1:text}}"
-    },
-    "ParallelLFootnote{}": {
-      "snippet": "ParallelLFootnote{${1:text}}"
-    },
-    "ParallelRFootnote{}": {
-      "snippet": "ParallelRFootnote{${1:text}}"
-    },
-    "ParallelShowFNList": {},
-    "ParallelParOnePage": {},
-    "ParallelParTwoPages": {},
-    "ParallelAfterText": {},
-    "ParallelCheckOpenBrace": {},
-    "ParallelAtEnd": {},
-    "ParallelDot": {}
-  },
-  "envs": {
-    "Parallel{}{}": {
-      "name": "Parallel",
-      "snippet": "{${1:left-width}}{${2:right-width}}"
-    },
-    "Parallel[]{}{}": {
-      "name": "Parallel",
-      "snippet": "[${3:options}]{${1:left-width}}{${2:right-width}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ParallelFNEnviron": {}
-  },
-  "options": [
-    "Verbose",
-    "OldStyleNums",
-    "RaiseNums",
-    "ItalicNums",
-    "RomanNums",
-    "SeparatedFootnotes"
-  ],
-  "keyvals": [
-    [
-      "c",
-      "v",
-      "p"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/parcolumns.json b/dev/packages/parcolumns.json
deleted file mode 100644
index 82dffd14f..000000000
--- a/dev/packages/parcolumns.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "includes": {
-    "processkv": []
-  },
-  "macros": {
-    "colchunk{}": {
-      "snippet": "colchunk{${1:chunk}}"
-    },
-    "colchunk[]{}": {
-      "snippet": "colchunk[${2:column}]{${1:chunk}}"
-    },
-    "colplacechunks": {}
-  },
-  "envs": {
-    "parcolumns{}": {
-      "name": "parcolumns",
-      "snippet": "{${1:number of cols}}"
-    },
-    "parcolumns[]{}": {
-      "name": "parcolumns",
-      "snippet": "[${2:options}]{${1:number of cols}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "colwidths={${1:col=width,...}}",
-      "distance=",
-      "rulebetween",
-      "nofirstindent",
-      "sloppy",
-      "sloppyspaces"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/parskip.json b/dev/packages/parskip.json
deleted file mode 100644
index 72b05d245..000000000
--- a/dev/packages/parskip.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {},
-  "options": [
-    "skip",
-    "skip=",
-    "tocskip",
-    "tocskip=",
-    "indent",
-    "indent=",
-    "parfill",
-    "parfill="
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/pas-crosswords.json b/dev/packages/pas-crosswords.json
index f0267a9a9..672ae9284 100644
--- a/dev/packages/pas-crosswords.json
+++ b/dev/packages/pas-crosswords.json
@@ -11,7 +11,7 @@
       "snippet": "blackcase{${1:x}}{${2:y}}"
     },
     "blackcases{}": {
-      "snippet": "blackcases{${1:x1/y1,${2:x2/y2},...}}"
+      "snippet": "blackcases{${1:x1/y1,x2/y2,...}}"
     },
     "word{}{}{}": {
       "snippet": "word{${1:x}}{${2:y}}{${3:MOT}}"
@@ -22,15 +22,15 @@
       "keyvalpos": 0
     },
     "words{}": {
-      "snippet": "words{${1:x1/y1/MOT1,${2:x2/y2.MOT2},...}}"
+      "snippet": "words{${1:x1/y1/MOT1,x2/y2.MOT2,...}}"
     },
     "words[]{}": {
-      "snippet": "words[${2:options}]{${1:x1/y1/MOT1,${3:x2/y2.MOT2},...}}",
+      "snippet": "words[${2:options}]{${1:x1/y1/MOT1,x2/y2.MOT2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "gridcross{}": {
-      "snippet": "gridcross{${1:MOT1*MOT2,${2:MOT3*MOT4},...}}"
+      "snippet": "gridcross{${1:MOT1*MOT2,MOT3*MOT4,...}}"
     },
     "printDef{}{}": {
       "snippet": "printDef{${1:h|v}}{${2:la définition}}"
diff --git a/dev/packages/pas-tableur.json b/dev/packages/pas-tableur.json
index ce24dd7e2..1fda59b43 100644
--- a/dev/packages/pas-tableur.json
+++ b/dev/packages/pas-tableur.json
@@ -13,10 +13,10 @@
       "snippet": "tableur[${2:nombre de lignes}]{${1:colonnes}}"
     },
     "tableur*{}": {
-      "snippet": "tableur*{${1:col1/dim1,${2:col2/dim2},...}}"
+      "snippet": "tableur*{${1:col1/dim1,col2/dim2,...}}"
     },
     "tableur*[]{}": {
-      "snippet": "tableur*[${2:nombre de lignes}]{${1:col1/dim1,${3:col2/dim2},...}}"
+      "snippet": "tableur*[${2:nombre de lignes}]{${1:col1/dim1,col2/dim2,...}}"
     },
     "tabcolwidth{}": {
       "snippet": "tabcolwidth{${1:width}}"
diff --git a/dev/packages/passopt.json b/dev/packages/passopt.json
deleted file mode 100644
index 241eef8fc..000000000
--- a/dev/packages/passopt.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "SetOptionsToPackage{}{}": {
-      "snippet": "SetOptionsToPackage{${1:options list}}{${2:package}}"
-    },
-    "SetOptionsToPackage*{}{}": {
-      "snippet": "SetOptionsToPackage*{${1:options list}}{${2:package}}"
-    },
-    "SetOptionsToClass{}{}": {
-      "snippet": "SetOptionsToClass{${1:options list}}{${2:class}}"
-    },
-    "SetOptionsToClass*{}{}": {
-      "snippet": "SetOptionsToClass*{${1:options list}}{${2:class}}"
-    },
-    "ClearPackageOptions{}": {
-      "snippet": "ClearPackageOptions{${1:package}}"
-    },
-    "ClearClassOptions{}": {
-      "snippet": "ClearClassOptions{${1:class}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/path.json b/dev/packages/path.json
deleted file mode 100644
index 3c40f49d8..000000000
--- a/dev/packages/path.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "path": {
-      "snippet": "path|${1:text}|"
-    },
-    "path{}": {
-      "snippet": "path{${1:verbatimSymbol}}"
-    },
-    "pathafterhook": {},
-    "ifspecialpathdelimiters": {},
-    "specialpathdelimiterstrue": {},
-    "specialpathdelimitersfalse": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/pbox.json b/dev/packages/pbox.json
deleted file mode 100644
index 6ba163253..000000000
--- a/dev/packages/pbox.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "includes": {
-    "calc": []
-  },
-  "macros": {
-    "pbox{}{}": {
-      "snippet": "pbox{${1:width}}{${2:contents}}"
-    },
-    "pbox[]{}{}": {
-      "snippet": "pbox[${3:position}]{${1:width}}{${2:contents}}"
-    },
-    "pbox[][]{}{}": {
-      "snippet": "pbox[${3:position}][${4:height}]{${1:width}}{${2:contents}}"
-    },
-    "pbox[][][]{}{}": {
-      "snippet": "pbox[${3:position}][${4:height}][${5:inner-pos}]{${1:width}}{${2:contents}}"
-    },
-    "settominwidth{}{}": {
-      "snippet": "settominwidth{${1:cmd}}{${2:text}}"
-    },
-    "settominwidth[]{}{}": {
-      "snippet": "settominwidth[${3:max-width}]{${1:cmd}}{${2:text}}"
-    },
-    "widthofpbox{}": {
-      "snippet": "widthofpbox{${1:text}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/pdfx.json b/dev/packages/pdfx.json
index acf979c17..e90f4a8e8 100644
--- a/dev/packages/pdfx.json
+++ b/dev/packages/pdfx.json
@@ -376,7 +376,6 @@
     "pdf15",
     "pdf16",
     "pdf17",
-    "pdf20",
     "nocharset",
     "usecharset",
     "latxmp",
diff --git a/dev/packages/perpage.json b/dev/packages/perpage.json
deleted file mode 100644
index af38c8797..000000000
--- a/dev/packages/perpage.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "MakePerPage{}": {
-      "snippet": "MakePerPage{${1:counter}}"
-    },
-    "MakePerPage[]{}": {
-      "snippet": "MakePerPage[${2:value}]{${1:counter}}"
-    },
-    "theperpage": {},
-    "theabspage": {},
-    "MakeSorted{}": {
-      "snippet": "MakeSorted{${1:counter}}"
-    },
-    "MakeSortedPerPage{}": {
-      "snippet": "MakeSortedPerPage{${1:counter}}"
-    },
-    "MakeSortedPerPage[]{}": {
-      "snippet": "MakeSortedPerPage[${2:value}]{${1:counter}}"
-    },
-    "AddAbsoluteCounter{}": {
-      "snippet": "AddAbsoluteCounter{${1:name}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/pgf-PeriodicTable.json b/dev/packages/pgf-PeriodicTable.json
index 3101035c1..10744554c 100644
--- a/dev/packages/pgf-PeriodicTable.json
+++ b/dev/packages/pgf-PeriodicTable.json
@@ -44,13 +44,7 @@
       "keyvalpos": 0
     },
     "pgfPTresetstyle": {},
-    "pgfPTbuildcell()[]": {
-      "snippet": "pgfPTbuildcell(${2:rows},${3:columns})[${1:entries}]"
-    },
     "pgfPTresetcell": {},
-    "pgfPTbuildcellstyle{}()[]": {
-      "snippet": "pgfPTbuildcellstyle{${1:name}}(${3:rows},${4:columns})[${2:entries}]"
-    },
     "pgfPTpreviewcell": {},
     "pgfPTpreviewcell[]": {
       "snippet": "pgfPTpreviewcell[${1:scale}]"
@@ -62,10 +56,10 @@
       "snippet": "pgfPTpreviewcellstyle[${2:scale}]{${1:name}}"
     },
     "pgfPTnewColorScheme{}{}": {
-      "snippet": "pgfPTnewColorScheme{${1:name}}{${2:r1/g1/b1,${3:r2/g2/b2},...}}"
+      "snippet": "pgfPTnewColorScheme{${1:name}}{${2:r1/g1/b1,r2/g2/b2,...}}"
     },
     "pgfPTnewColorScheme[]{}{}": {
-      "snippet": "pgfPTnewColorScheme[${3:r/g/b}]{${1:name}}{${2:r1/g1/b1,${4:r2/g2/b2},...}}"
+      "snippet": "pgfPTnewColorScheme[${3:r/g/b}]{${1:name}}{${2:r1/g1/b1,r2/g2/b2,...}}"
     },
     "pgfPTnewZlist{}{}": {
       "snippet": "pgfPTnewZlist{${1:name}}{${2:list}}"
@@ -96,10 +90,10 @@
       "keyvalpos": 2
     },
     "pgfPTCScombine{}": {
-      "snippet": "pgfPTCScombine{${1:colorscheme1,${2:colorscheme2},new colorscheme name}}"
+      "snippet": "pgfPTCScombine{${1:colorscheme1,colorscheme2,new colorscheme name}}"
     },
     "pgfPTCScombine[]{}": {
-      "snippet": "pgfPTCScombine[${2:proportion,${3:mode}]{${1:colorscheme1},${4:colorscheme2},new colorscheme name}}"
+      "snippet": "pgfPTCScombine[${2:proportion,mode}]{${1:colorscheme1,colorscheme2,new colorscheme name}}"
     },
     "pgfPTCSwrite{}": {
       "snippet": "pgfPTCSwrite{${1:list of colorschemes}}"
@@ -224,7 +218,6 @@
     "pgfPTglobalfont": {},
     "pgfPTgrlabelsfalse": {},
     "pgfPTgrlabelstrue": {},
-    "pgfPTgrnum": {},
     "pgfPTiblockcolor": {},
     "pgfPTiblockfontcolor": {},
     "pgfPTiblocklinewidth": {},
@@ -348,10 +341,7 @@
     "pgfPTZspace": {},
     "pgfZuseboxwidthfalse": {},
     "pgfZuseboxwidthtrue": {},
-    "thetinysize": {},
-    "ifpgfPTORoman": {},
-    "pgfPTORomantrue": {},
-    "pgfPTORomanfalse": {}
+    "thetinysize": {}
   },
   "envs": {},
   "options": [
@@ -420,10 +410,8 @@
       "legend={${1:keyvals}}",
       "show period numbers",
       "show group numbers",
-      "group numbers=",
       "period label color=",
       "group label color=",
-      "Roman label color=",
       "label font=${1:font commands}",
       "per={${1:keyvals}}",
       "gr={${1:keyvals}}",
@@ -520,7 +508,6 @@
       "Ar label=",
       "Ar precision=${1:integer}",
       "Ar={${1:keyvals}}",
-      "O Roman",
       "d color=",
       "d font=${1:font commands}",
       "d unit=",
diff --git a/dev/packages/pgf-pie.json b/dev/packages/pgf-pie.json
index c404ff99a..fc1042cba 100644
--- a/dev/packages/pgf-pie.json
+++ b/dev/packages/pgf-pie.json
@@ -5,10 +5,10 @@
   },
   "macros": {
     "pie{}": {
-      "snippet": "pie{${1:num1/text1,${2:num2/text2},...}}"
+      "snippet": "pie{${1:num1/text1,num2/text2,...}}"
     },
     "pie[]{}": {
-      "snippet": "pie[${2:options}]{${1:num1/text1,${3:num2/text2},...}}",
+      "snippet": "pie[${2:options}]{${1:num1/text1,num2/text2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     }
diff --git a/dev/packages/pgf-spectra.json b/dev/packages/pgf-spectra.json
index a804b18e3..2a912e97a 100644
--- a/dev/packages/pgf-spectra.json
+++ b/dev/packages/pgf-spectra.json
@@ -18,12 +18,6 @@
       "keyvalpos": 0
     },
     "pgfspectraStyleReset": {},
-    "pgfspectrashade(){}": {
-      "snippet": "pgfspectrashade(${2:start},${3:end}){${1:name}}"
-    },
-    "pgfspectrashade[](){}": {
-      "snippet": "pgfspectrashade[${2:h|v}](${3:start},${4:end}){${1:name}}"
-    },
     "usepgfspectralibrary{}": {
       "snippet": "usepgfspectralibrary{${1:libraries}}"
     },
@@ -81,16 +75,6 @@
     "pgfspectrarainbow{}": {
       "snippet": "pgfspectrarainbow{${1:radius}}"
     },
-    "pgfspectrarainbow(){}": {
-      "snippet": "pgfspectrarainbow(${2:options}){${1:radius}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "pgfspectrarainbow[](){}": {
-      "snippet": "pgfspectrarainbow[${2:TikZ options}](${3:options}){${1:radius}}",
-      "keyvalindex": 4,
-      "keyvalpos": 1
-    },
     "wldez": {},
     "wlquatromil": {}
   },
@@ -166,13 +150,6 @@
       "shade opacity=${1:factor}",
       "shade opacity color=",
       "logarithmic"
-    ],
-    [
-      "rainbow start=${1:fraction}",
-      "rainbow knock out=${1:value}",
-      "rainbow fade=${1:fading}",
-      "rainbow transparency=${1:factor}",
-      "rainbow background="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pgfcore.json b/dev/packages/pgfcore.json
index 8634f1142..602c3d2be 100644
--- a/dev/packages/pgfcore.json
+++ b/dev/packages/pgfcore.json
@@ -2157,9 +2157,6 @@
     "pgfooclass{}{}": {
       "snippet": "pgfooclass{${1:class}}{${2:body}}"
     },
-    "pgfooclass(){}{}": {
-      "snippet": "pgfooclass(${3:list of superclasses}){${1:class}}{${2:body}}"
-    },
     "attribute": {},
     "method": {},
     "pgfoovalueof{}": {
diff --git a/dev/packages/pgfmanual.json b/dev/packages/pgfmanual.json
index 6197544c1..bea89f0f7 100644
--- a/dev/packages/pgfmanual.json
+++ b/dev/packages/pgfmanual.json
@@ -148,7 +148,7 @@
     "firstchoicetrue": {},
     "firstchoicefalse": {},
     "mchoice{}": {
-      "snippet": "mchoice{${1:choice1,${2:choice2},...}}"
+      "snippet": "mchoice{${1:choice1,choice2,...}}"
     },
     "insertpathifneeded{}{}": {
       "snippet": "insertpathifneeded{${1:path/key}}{${2:default path}}"
@@ -181,12 +181,6 @@
     "indexkey{}": {
       "snippet": "indexkey{${1:/path/key}}"
     },
-    "extractpredefinedmethod{}()": {
-      "snippet": "extractpredefinedmethod{${1:arg1}}(${2:arg2})"
-    },
-    "extractmethod{}()": {
-      "snippet": "extractmethod{${1:arg1}}(${2:arg2})"
-    },
     "extractattribute{}": {
       "snippet": "extractattribute{${1:arg}}"
     },
@@ -238,9 +232,6 @@
     "itemcalendaroption{}": {
       "snippet": "itemcalendaroption{${1:option}}"
     },
-    "extractclass{}()": {
-      "snippet": "extractclass{${1:arg1}}(${2:arg2})"
-    },
     "noindexing": {},
     "processaction{}": {
       "snippet": "processaction{${1:arg}}"
@@ -381,15 +372,15 @@
     "parameterdescription": {},
     "commandlist{}": {
       "name": "commandlist",
-      "snippet": "{${1:cmd1,${2:cmd2},...}}"
+      "snippet": "{${1:cmd1,cmd2,...}}"
     },
     "internallist{}": {
       "name": "internallist",
-      "snippet": "{${1:cmd1,${2:cmd2},...}}"
+      "snippet": "{${1:cmd1,cmd2,...}}"
     },
     "internallist[]{}": {
       "name": "internallist",
-      "snippet": "[${2:type}]{${1:cmd1,${3:cmd2},...}}"
+      "snippet": "[${2:type}]{${1:cmd1,cmd2,...}}"
     },
     "environment{{}": {
       "name": "environment",
@@ -445,11 +436,11 @@
     },
     "keylist{}": {
       "name": "keylist",
-      "snippet": "{${1:path1/key1=value1,${2:path2/key2=value2},...}}"
+      "snippet": "{${1:path1/key1=value1,path2/key2=value2,...}}"
     },
     "keylist[]{}": {
       "name": "keylist",
-      "snippet": "[${2:default path}]{${1:path1/key1=value1,${3:path2/key2=value2},...}}"
+      "snippet": "[${2:default path}]{${1:path1/key1=value1,path2/key2=value2,...}}"
     },
     "predefinedmethod{}": {
       "name": "predefinedmethod",
diff --git a/dev/packages/pgfmath.json b/dev/packages/pgfmath.json
deleted file mode 100644
index 8a436a8cb..000000000
--- a/dev/packages/pgfmath.json
+++ /dev/null
@@ -1,491 +0,0 @@
-{
-  "includes": {
-    "pgfrcs": [],
-    "pgfkeys": []
-  },
-  "macros": {
-    "pgfmathloaded": {},
-    "pgfmathsetlength{}{}": {
-      "snippet": "pgfmathsetlength{${1:length register}}{${2:math expression}}"
-    },
-    "pgfmathaddtolength{}{}": {
-      "snippet": "pgfmathaddtolength{${1:length register}}{${2:math expression}}"
-    },
-    "pgfmathsetcount{}{}": {
-      "snippet": "pgfmathsetcount{${1:count register}}{${2:math expression}}"
-    },
-    "pgfmathaddtocount{}{}": {
-      "snippet": "pgfmathaddtocount{${1:count register}}{${2:math expression}}"
-    },
-    "pgfmathsetcounter{}{}": {
-      "snippet": "pgfmathsetcounter{${1:counter}}{${2:math expression}}"
-    },
-    "pgfmathaddtocounter{}{}": {
-      "snippet": "pgfmathaddtocounter{${1:counter}}{${2:math expression}}"
-    },
-    "pgfmathsetmacro{}{}": {
-      "snippet": "pgfmathsetmacro{${1:cmd}}{${2:math expression}}"
-    },
-    "pgfmathsetlengthmacro{}{}": {
-      "snippet": "pgfmathsetlengthmacro{${1:cmd}}{${2:math expression}}"
-    },
-    "pgfmathtruncatemacro{}{}": {
-      "snippet": "pgfmathtruncatemacro{${1:cmd}}{${2:math expression}}"
-    },
-    "pgfmathnewcounter{}": {
-      "snippet": "pgfmathnewcounter{${1:counter}}"
-    },
-    "pgfmathmakecounterglobal{}": {
-      "snippet": "pgfmathmakecounterglobal{${1:counter}}"
-    },
-    "pgfmathanglebetweenpoints{}{}": {
-      "snippet": "pgfmathanglebetweenpoints{${1:point 1}}{${2:point 2}}"
-    },
-    "pgfmathanglebetweenlines{}{}{}{}": {
-      "snippet": "pgfmathanglebetweenlines{${1:line 1 start}}{${2:line 1 end}}{${3:line 2 start}}{${4:line 2 end}}"
-    },
-    "pgfmathrotatepointaround{}{}{}": {
-      "snippet": "pgfmathrotatepointaround{${1:point}}{${2:rotate center}}{${3:degree}}"
-    },
-    "pgfmathreflectpointalongaxis{}{}{}": {
-      "snippet": "pgfmathreflectpointalongaxis{${1:point}}{${2:point on axis}}{${3:axis angle}}"
-    },
-    "pgfmathpointintersectionoflineandarc{}{}{}{}{}{}": {
-      "snippet": "pgfmathpointintersectionoflineandarc{${1:point 1}}{${2:point 2}}{${3:arc center}}{${4:start angle}}{${5:end angle}}{${6:radii}}"
-    },
-    "pgfmathangleonellipse{}{}": {
-      "snippet": "pgfmathangleonellipse{${1:point on ellipse}}{${2:radii}}"
-    },
-    "pgfmathincluded": {},
-    "ifpgfmathcontinueloop": {},
-    "pgfmathcontinuelooptrue": {},
-    "pgfmathcontinueloopfalse": {},
-    "repeatpgfmathloop": {},
-    "pgfmathbreakloop": {},
-    "pgfmathreturn": {},
-    "pgfmathcounter": {},
-    "ifpgfmathfloat": {},
-    "pgfmathfloattrue": {},
-    "pgfmathfloatfalse": {},
-    "ifpgfmathunitsdeclared": {},
-    "pgfmathunitsdeclaredtrue": {},
-    "pgfmathunitsdeclaredfalse": {},
-    "ifpgfmathmathunitsdeclared": {},
-    "pgfmathmathunitsdeclaredtrue": {},
-    "pgfmathmathunitsdeclaredfalse": {},
-    "ifpgfmathignoreunitscale": {},
-    "pgfmathignoreunitscaletrue": {},
-    "pgfmathignoreunitscalefalse": {},
-    "pgfmathprint{}": {
-      "snippet": "pgfmathprint{${1:real number}}"
-    },
-    "pgfmathparse{}": {
-      "snippet": "pgfmathparse{${1:math expression}}"
-    },
-    "pgfmathqparse{}": {
-      "snippet": "pgfmathqparse{${1:math expression}}"
-    },
-    "pgfmathpostparse": {},
-    "pgfmathscaleresult": {},
-    "pgfmathsetresultunitscale{}": {
-      "snippet": "pgfmathsetresultunitscale{${1:scale value}}"
-    },
-    "pgfmathresultunitscale": {},
-    "pgfmathifexpression{}{}{}": {
-      "snippet": "pgfmathifexpression{${1:math expression}}{${2:true}}{${3:false}}"
-    },
-    "pgfmathdeclareoperator{}{}{}{}{}": {
-      "snippet": "pgfmathdeclareoperator{${1:op}}{${2:op name}}{${3:arity}}{${4:type}}{${5:precedence}}"
-    },
-    "pgfmathdeclarefunction{}{}{}": {
-      "snippet": "pgfmathdeclarefunction{${1:name}}{${2:num of args}}{${3:code}}"
-    },
-    "pgfmathdeclarefunction*{}{}{}": {
-      "snippet": "pgfmathdeclarefunction*{${1:name}}{${2:num of args}}{${3:code}}"
-    },
-    "pgfmathredeclarefunction{}{}": {
-      "snippet": "pgfmathredeclarefunction{${1:name}}{${2:code}}"
-    },
-    "pgfmathnotifynewdeclarefunction{}{}{}": {
-      "snippet": "pgfmathnotifynewdeclarefunction{${1:name}}{${2:num of args}}{${3:code}}"
-    },
-    "pgfmathdeclarepseudoconstant{}{}": {
-      "snippet": "pgfmathdeclarepseudoconstant{${1:name}}{${2:code}}"
-    },
-    "pgfmathredeclarepseudoconstant{}{}": {
-      "snippet": "pgfmathredeclarepseudoconstant{${1:name}}{${2:code}}"
-    },
-    "pgfmathadd{}{}": {
-      "snippet": "pgfmathadd{${1:x}}{${2:y}}"
-    },
-    "pgfmathsubtract{}{}": {
-      "snippet": "pgfmathsubtract{${1:x}}{${2:y}}"
-    },
-    "pgfmathneg{}": {
-      "snippet": "pgfmathneg{${1:x}}"
-    },
-    "pgfmathmultiply{}{}": {
-      "snippet": "pgfmathmultiply{${1:x}}{${2:y}}"
-    },
-    "pgfmathdivide{}{}": {
-      "snippet": "pgfmathdivide{${1:x}}{${2:y}}"
-    },
-    "pgfmathreciprocal{}": {
-      "snippet": "pgfmathreciprocal{${1:x}}"
-    },
-    "pgfmathdiv{}": {
-      "snippet": "pgfmathdiv{${1:x}}"
-    },
-    "pgfmathmod{}{}": {
-      "snippet": "pgfmathmod{${1:x}}{${2:y}}"
-    },
-    "pgfmathMod{}{}": {
-      "snippet": "pgfmathMod{${1:x}}{${2:y}}"
-    },
-    "pgfmathabs{}": {
-      "snippet": "pgfmathabs{${1:x}}"
-    },
-    "pgfmathsign{}": {
-      "snippet": "pgfmathsign{${1:x}}"
-    },
-    "pgfmathe": {},
-    "pgfmathln{}": {
-      "snippet": "pgfmathln{${1:x}}"
-    },
-    "pgfmathlogten{}": {
-      "snippet": "pgfmathlogten{${1:x}}"
-    },
-    "pgfmathlogtwo{}": {
-      "snippet": "pgfmathlogtwo{${1:x}}"
-    },
-    "pgfmathexp{}": {
-      "snippet": "pgfmathexp{${1:x}}"
-    },
-    "pgfmathsqrt{}": {
-      "snippet": "pgfmathsqrt{${1:x}}"
-    },
-    "pgfmathpow{}{}": {
-      "snippet": "pgfmathpow{${1:x}}{${2:power}}"
-    },
-    "pgfmathfactorial{}": {
-      "snippet": "pgfmathfactorial{${1:x}}"
-    },
-    "pgfmathpi": {},
-    "pgfmathiftrigonometricusesdeg{}{}": {
-      "snippet": "pgfmathiftrigonometricusesdeg{${1:true}}{${2:false}}"
-    },
-    "pgfmathradians{}": {
-      "snippet": "pgfmathradians{${1:x in radians}} "
-    },
-    "pgfmathdeg{}": {
-      "snippet": "pgfmathdeg{${1:x in radians}}"
-    },
-    "pgfmathrad{}": {
-      "snippet": "pgfmathrad{${1:x in degrees}}"
-    },
-    "pgfmathsin{}": {
-      "snippet": "pgfmathsin{${1:x in degrees}}"
-    },
-    "pgfmathcos{}": {
-      "snippet": "pgfmathcos{${1:x in degrees}}"
-    },
-    "pgfmathsincos{}": {
-      "snippet": "pgfmathsincos{${1:num in degress}}"
-    },
-    "pgfmathtan{}": {
-      "snippet": "pgfmathtan{${1:x in degrees}}"
-    },
-    "pgfmathcosec{}": {
-      "snippet": "pgfmathcosec{${1:x in degrees}}"
-    },
-    "pgfmathsec{}": {
-      "snippet": "pgfmathsec{${1:x in degrees}}"
-    },
-    "pgfmathcot{}": {
-      "snippet": "pgfmathcot{${1:x in degrees}}"
-    },
-    "pgfmathasin{}": {
-      "snippet": "pgfmathasin{${1:x in degrees}}"
-    },
-    "pgfmathacos{}": {
-      "snippet": "pgfmathacos{${1:x in degrees}}"
-    },
-    "pgfmathatan{}": {
-      "snippet": "pgfmathatan{${1:x in degrees}}"
-    },
-    "pgfmathatantwo{}{}": {
-      "snippet": "pgfmathatantwo{${1:y in degrees}}{${2:x in degrees}}"
-    },
-    "pgfmathsetseed{}": {
-      "snippet": "pgfmathsetseed{${1:integer}}"
-    },
-    "pgfmathgeneratepseudorandomnumber": {},
-    "pgfmathrnd": {},
-    "pgfmathrand": {},
-    "pgfmathrandominteger{}{}{}": {
-      "snippet": "pgfmathrandominteger{${1:cmd}}{${2:min}}{${3:max}}"
-    },
-    "pgfmathdeclarerandomlist{}{}": {
-      "snippet": "pgfmathdeclarerandomlist{${1:list name}}{${2:list of items}}"
-    },
-    "pgfmathrandomitem{}{}": {
-      "snippet": "pgfmathrandomitem{${1:cmd}}{${2:list name}}"
-    },
-    "pgfmathgreater{}{}": {
-      "snippet": "pgfmathgreater{${1:x}}{${2:y}}"
-    },
-    "pgfmathgreaterthan{}{}": {
-      "snippet": "pgfmathgreaterthan{${1:x}}{${2:y}}"
-    },
-    "pgfmathless{}{}": {
-      "snippet": "pgfmathless{${1:x}}{${2:y}}"
-    },
-    "pgfmathlessthan{}{}": {
-      "snippet": "pgfmathlessthan{${1:x}}{${2:y}}"
-    },
-    "pgfmathequal{}{}": {
-      "snippet": "pgfmathequal{${1:x}}{${2:y}}"
-    },
-    "pgfmathequalto{}{}": {
-      "snippet": "pgfmathequalto{${1:x}}{${2:y}}"
-    },
-    "ifpgfmathcomparison": {},
-    "pgfmathcomparisontrue": {},
-    "pgfmathcomparisonfalse": {},
-    "pgfmathapproxequalto{}{}": {
-      "snippet": "pgfmathapproxequalto{${1:x}}{${2:y}}"
-    },
-    "pgfmathifthenelse{}{}{}": {
-      "snippet": "pgfmathifthenelse{${1:x}}{${2:true}}{${3:false}}"
-    },
-    "pgfmathnotequal{}{}": {
-      "snippet": "pgfmathnotequal{${1:x}}{${2:y}}"
-    },
-    "pgfmathnotless{}{}": {
-      "snippet": "pgfmathnotless{${1:x}}{${2:y}}"
-    },
-    "pgfmathnotgreater{}{}": {
-      "snippet": "pgfmathnotgreater{${1:x}}{${2:y}}"
-    },
-    "pgfmathand{}{}": {
-      "snippet": "pgfmathand{${1:x}}{${2:y}}"
-    },
-    "pgfmathor{}{}": {
-      "snippet": "pgfmathor{${1:x}}{${2:y}}"
-    },
-    "pgfmathnot{}": {
-      "snippet": "pgfmathnot{${1:x}}"
-    },
-    "pgfmathtrue": {},
-    "pgfmathfalse": {},
-    "pgfmathbin{}": {
-      "snippet": "pgfmathbin{${1:x in base 10}}"
-    },
-    "pgfmathhex{}": {
-      "snippet": "pgfmathhex{${1:x in base 10}}"
-    },
-    "pgfmathHex{}": {
-      "snippet": "pgfmathHex{${1:x in base 10}}"
-    },
-    "pgfmathoct{}": {
-      "snippet": "pgfmathoct{${1:x in base 10}}"
-    },
-    "pgfmathbasetodec{}{}{}": {
-      "snippet": "pgfmathbasetodec{${1:cmd}}{${2:number}}{${3:base}}"
-    },
-    "pgfmathdectobase{}{}{}": {
-      "snippet": "pgfmathdectobase{${1:cmd}}{${2:number}}{${3:base}}"
-    },
-    "pgfmathdectoBase{}{}{}": {
-      "snippet": "pgfmathdectoBase{${1:cmd}}{${2:number}}{${3:base}}"
-    },
-    "pgfmathbasetobase{}{}{}{}": {
-      "snippet": "pgfmathbasetobase{${1:cmd}}{${2:number}}{${3:base1}}{${4:base2}}"
-    },
-    "pgfmathbasetoBase{}{}{}{}": {
-      "snippet": "pgfmathbasetoBase{${1:cmd}}{${2:number}}{${3:base1}}{${4:base2}}"
-    },
-    "pgfmathsetbasenumberlength{}": {
-      "snippet": "pgfmathsetbasenumberlength{${1:integer}}"
-    },
-    "pgfmathtodigitlist{}{}": {
-      "snippet": "pgfmathtodigitlist{${1:cmd}}{${2:number}}"
-    },
-    "pgfmathround{}": {
-      "snippet": "pgfmathround{${1:x}}"
-    },
-    "pgfmathfloor{}": {
-      "snippet": "pgfmathfloor{${1:x}}"
-    },
-    "pgfmathceil{}": {
-      "snippet": "pgfmathceil{${1:x}}"
-    },
-    "pgfmathint{}": {
-      "snippet": "pgfmathint{${1:x}}"
-    },
-    "pgfmathfrac{}": {
-      "snippet": "pgfmathfrac{${1:x}}"
-    },
-    "pgfmathreal{}": {
-      "snippet": "pgfmathreal{${1:x}}"
-    },
-    "pgfmathveclen{}{}": {
-      "snippet": "pgfmathveclen{${1:x coordinate}}{${2:y coordinate}}"
-    },
-    "pgfmathcosh{}": {
-      "snippet": "pgfmathcosh{${1:x in degree}}"
-    },
-    "pgfmathsinh{}": {
-      "snippet": "pgfmathsinh{${1:x in degree}}"
-    },
-    "pgfmathtanh{}": {
-      "snippet": "pgfmathtanh{${1:x in degree}}"
-    },
-    "pgfmathscientific{}{}": {
-      "snippet": "pgfmathscientific{${1:mantissa}}{${2:exponent}}"
-    },
-    "pgfmathwidth{}": {
-      "snippet": "pgfmathwidth{${1:\"text\"}}"
-    },
-    "pgfmathheight{}": {
-      "snippet": "pgfmathheight{${1:\"text\"}}"
-    },
-    "pgfmathdepth{}": {
-      "snippet": "pgfmathdepth{${1:\"text\"}}"
-    },
-    "pgfmatharray{}{}": {
-      "snippet": "pgfmatharray{${1:array}}{${2:index}}"
-    },
-    "pgfmathdim{}": {
-      "snippet": "pgfmathdim{${1:array}}"
-    },
-    "pgfmathmax{}{}": {
-      "snippet": "pgfmathmax{${1:num list}}{${2:num list}}"
-    },
-    "pgfmathmin{}{}": {
-      "snippet": "pgfmathmin{${1:num list}}{${2:num list}}"
-    },
-    "pgfmathscalar{}": {
-      "snippet": "pgfmathscalar{${1:value}}"
-    },
-    "pgfmathgcd{}{}": {
-      "snippet": "pgfmathgcd{${1:x}}{${2:y}}"
-    },
-    "pgfmathisprime{}": {
-      "snippet": "pgfmathisprime{${1:x}}"
-    },
-    "pgfmathisodd{}": {
-      "snippet": "pgfmathisodd{${1:x}}"
-    },
-    "pgfmathiseven{}": {
-      "snippet": "pgfmathiseven{${1:x}}"
-    },
-    "ifpgfmathfloatcomparison": {},
-    "pgfmathfloatcomparisontrue": {},
-    "pgfmathfloatcomparisonfalse": {},
-    "ifpgfmathfloatroundhasperiod": {},
-    "pgfmathfloatroundhasperiodtrue": {},
-    "pgfmathfloatroundhasperiodfalse": {},
-    "ifpgfmathprintnumberskipzeroperiod": {},
-    "pgfmathprintnumberskipzeroperiodtrue": {},
-    "pgfmathprintnumberskipzeroperiodfalse": {},
-    "ifpgfmathfloatroundmayneedrenormalize": {},
-    "pgfmathfloatroundmayneedrenormalizetrue": {},
-    "pgfmathfloatroundmayneedrenormalizefalse": {},
-    "pgfmathfloatparsenumber{}": {
-      "snippet": "pgfmathfloatparsenumber{${1:number}}"
-    },
-    "pgfmathfloatqparsenumber{}": {
-      "snippet": "pgfmathfloatqparsenumber{${1:number}}"
-    },
-    "pgfmathfloattomacro{}{}{}{}": {
-      "snippet": "pgfmathfloattomacro{${1:number}}{${2:flags macro}}{${3:mantissa macro}}{${4:exponent macro}}"
-    },
-    "pgfmathfloattoregisters{}{}{}{}": {
-      "snippet": "pgfmathfloattoregisters{${1:number}}{${2:flags count}}{${3:mantissa dimen}}{${4:exponent count}}"
-    },
-    "pgfmathfloattoregisterstok{}{}{}{}": {
-      "snippet": "pgfmathfloattoregisterstok{${1:number}}{${2:flags count}}{${3:mantissa toks}}{${4:exponent count}}"
-    },
-    "pgfmathfloatgetflags{}{}": {
-      "snippet": "pgfmathfloatgetflags{${1:number}}{${2:flags count}}"
-    },
-    "pgfmathfloatgetflagstomacro{}{}": {
-      "snippet": "pgfmathfloatgetflagstomacro{${1:number}}{${2:flags macro}}"
-    },
-    "pgfmathfloatgetmantissa{}{}": {
-      "snippet": "pgfmathfloatgetmantissa{${1:number}}{${2:mantissa dimen}}"
-    },
-    "pgfmathfloatgetmantisse{}{}": {
-      "snippet": "pgfmathfloatgetmantisse{${1:number}}{${2:mantissa dimen}}"
-    },
-    "pgfmathfloatgetmantissatok{}{}": {
-      "snippet": "pgfmathfloatgetmantissatok{${1:number}}{${2:mantissa toks}}"
-    },
-    "pgfmathfloatgetmantissetok{}{}": {
-      "snippet": "pgfmathfloatgetmantissetok{${1:number}}{${2:mantissa toks}}"
-    },
-    "pgfmathfloatgetexponent{}{}": {
-      "snippet": "pgfmathfloatgetexponent{${1:number}}{${2:exponent count}}"
-    },
-    "pgfmathfloatcreate{}{}{}": {
-      "snippet": "pgfmathfloatcreate{${1:flags}}{${2:mantissa}}{${3:exponent}}"
-    },
-    "pgfmathfloattofixed{}": {
-      "snippet": "pgfmathfloattofixed{${1:float}}"
-    },
-    "pgfmathfloattoint{}": {
-      "snippet": "pgfmathfloattoint{${1:float}}"
-    },
-    "pgfmathfloattosci{}": {
-      "snippet": "pgfmathfloattosci{${1:float}}"
-    },
-    "pgfmathfloatvalueof{}": {
-      "snippet": "pgfmathfloatvalueof{${1:float}}"
-    },
-    "pgfmathroundto{}": {
-      "snippet": "pgfmathroundto{${1:fixed point number}}"
-    },
-    "pgfmathroundtozerofill{}": {
-      "snippet": "pgfmathroundtozerofill{${1:fixed point number}}"
-    },
-    "pgfmathfloatround{}": {
-      "snippet": "pgfmathfloatround{${1:float}}"
-    },
-    "pgfmathfloatroundzerofill{}": {
-      "snippet": "pgfmathfloatroundzerofill{${1:float}}"
-    },
-    "pgfmathfloatrounddisplaystyle{}{}{}": {
-      "snippet": "pgfmathfloatrounddisplaystyle{${1:flags}}{${2:mantissa}}{${3:exponent}}"
-    },
-    "pgfmathfloatgetfrac{}": {
-      "snippet": "pgfmathfloatgetfrac{${1:number}}"
-    },
-    "pgfmathgreatestcommondivisor{}{}": {
-      "snippet": "pgfmathgreatestcommondivisor{${1:int 1}}{${2:int 2}}"
-    },
-    "pgfmathifisint{}{}{}": {
-      "snippet": "pgfmathifisint{${1:number constant}}{${2:true}}{${3:false}}"
-    },
-    "pgfmathprintnumber{}": {
-      "snippet": "pgfmathprintnumber{${1:number}}"
-    },
-    "pgfmathprintnumberto{}{}": {
-      "snippet": "pgfmathprintnumberto{${1:number}}{${2:cmd}}"
-    },
-    "ifpgfmathfloatparsenumberpendingperiod": {},
-    "pgfmathfloatparsenumberpendingperiodtrue": {},
-    "pgfmathfloatparsenumberpendingperiodfalse": {},
-    "pgfretval": {},
-    "pgfmathresult": {},
-    "pgfmathresulty": {},
-    "pgfmathresultx": {},
-    "pgfmathresultdenom": {},
-    "pgfmathresultfractional": {},
-    "pgfmathresultnumerator": {},
-    "pgfmathresultX": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/pgfplots.json b/dev/packages/pgfplots.json
index e27c2719b..d4093d1a3 100644
--- a/dev/packages/pgfplots.json
+++ b/dev/packages/pgfplots.json
@@ -365,46 +365,46 @@
       "snippet": "pgfplotsutilsortfour{${1:macro1}}{${2:macro2}}{${3:macro3}}{${4:macro4}}"
     },
     "pgfplotsmathvectortostring{}{}": {
-      "snippet": "pgfplotsmathvectortostring{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectortostring{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorfromstring{}{}": {
-      "snippet": "pgfplotsmathvectorfromstring{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorfromstring{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorsubtract{}{}{}": {
-      "snippet": "pgfplotsmathvectorsubtract{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorsubtract{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectoradd{}{}{}": {
-      "snippet": "pgfplotsmathvectoradd{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectoradd{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorcompwise{}{}{}{}": {
-      "snippet": "pgfplotsmathvectorcompwise{${1:x1,${5:y1},${6:z1}}{${2:x2},${7:y2},z2}}{${3:operation}}{${4:arg}}"
+      "snippet": "pgfplotsmathvectorcompwise{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:operation}}{${4:arg}}"
     },
     "pgfplotsmathvectorsum{}{}": {
-      "snippet": "pgfplotsmathvectorsum{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorsum{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscalarproduct{}{}{}": {
-      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscalarproduct{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectortocomponents{}{}{}": {
-      "snippet": "pgfplotsmathvectortocomponents{${1:x,${4:y},z}}{${2:string}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectortocomponents{${1:x,y,z}}{${2:string}}{${3:arg}}"
     },
     "pgfplotsmathvectorcrossprod{}{}{}": {
-      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorcrossprod{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotsmathvectorscaleindividually{}{}{}": {
-      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,${4:y1},${5:z1}}{${2:x2},${6:y2},z2}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscaleindividually{${1:x1,y1,z1}}{${2:x2,y2,z2}}{${3:arg}}"
     },
     "pgfplotspointfromcsvvector{}{}": {
-      "snippet": "pgfplotspointfromcsvvector{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotspointfromcsvvector{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorlength{}{}": {
-      "snippet": "pgfplotsmathvectorlength{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectorlength{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsmathvectorscale{}{}{}": {
-      "snippet": "pgfplotsmathvectorscale{${1:x,${4:y},z}}{${2:scale}}{${3:arg}}"
+      "snippet": "pgfplotsmathvectorscale{${1:x,y,z}}{${2:scale}}{${3:arg}}"
     },
     "pgfplotsmathvectordatascaletrafoinverse{}{}": {
-      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,${3:y},z}}{${2:arg}}"
+      "snippet": "pgfplotsmathvectordatascaletrafoinverse{${1:x,y,z}}{${2:arg}}"
     },
     "pgfplotsDQ": {},
     "pgfplotsVERTBAR": {},
@@ -980,9 +980,6 @@
     "rangea": {},
     "rangeb": {},
     "factor": {},
-    "simplecoordinate()": {
-      "snippet": "simplecoordinate(${1:x},${2:y},${3:z})"
-    },
     "curelem": {},
     "pgfplotssetaxesfromazel{}{}{}": {
       "snippet": "pgfplotssetaxesfromazel{${1:azimuth}}{${2:elevation}}{${3:macro}}"
@@ -1193,7 +1190,7 @@
     },
     "pgfplotsaxisvisphasepreparedatapoint": {},
     "pgfplotsaxisvisphasetransformcoordinateentry{}{}": {
-      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x,${3: y}, or z}}{${2:input}}"
+      "snippet": "pgfplotsaxisvisphasetransformcoordinateentry{${1:x, y, or z}}{${2:input}}"
     },
     "pgfplotstransformplotattime{}": {
       "snippet": "pgfplotstransformplotattime{${1:fraction}}"
@@ -1209,16 +1206,13 @@
       "snippet": "pgfplotspointplotattime{${1:fraction}}"
     },
     "pgfplotsplothandlergraphics": {},
-    "pgfplotsplothandlergraphicspointmappoint()()": {
-      "snippet": "pgfplotsplothandlergraphicspointmappoint(${1:x},${2:y},${3:z})(${4:a},${5:b})"
-    },
     "pgfplotsplothandlergraphicspointmapcomputerequiredview": {},
     "pgfplotsE": {},
     "pgfplotsmathfloatviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathfloatviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
     },
     "pgfplotsmathvectorviewdepth{}": {
-      "snippet": "pgfplotsmathvectorviewdepth{${1:x,${2:y},z}}"
+      "snippet": "pgfplotsmathvectorviewdepth{${1:x,y,z}}"
     },
     "pgfplotsmathviewdepthxyz{}{}{}": {
       "snippet": "pgfplotsmathviewdepthxyz{${1:x}}{${2:y}}{${3:z}}"
@@ -1233,22 +1227,22 @@
     "tick": {},
     "nexttick": {},
     "pgfplotsvalueoflargesttickdimen{}": {
-      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x,${2: y}, or z}}"
+      "snippet": "pgfplotsvalueoflargesttickdimen{${1:x, y, or z}}"
     },
     "pgfplotsqpointoutsideofticklabelaxis{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxis{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxisrel{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxisrel{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsqpointoutsideofticklabelaxistransformed{}{}{}": {
-      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x,${4: y}, or z}}{${2:coord}}{${3:dimen}}"
+      "snippet": "pgfplotsqpointoutsideofticklabelaxistransformed{${1:x, y, or z}}{${2:coord}}{${3:dimen}}"
     },
     "pgfplotsticklabelaxisspec{}": {
-      "snippet": "pgfplotsticklabelaxisspec{${1:x,${2: y}, or z}}"
+      "snippet": "pgfplotsticklabelaxisspec{${1:x, y, or z}}"
     },
     "pgfplotspointouternormalvectorofticklabelaxis{}": {
-      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x,${2: y}, or z}}"
+      "snippet": "pgfplotspointouternormalvectorofticklabelaxis{${1:x, y, or z}}"
     },
     "Hmacro": {},
     "Hmacrobaseten": {},
diff --git a/dev/packages/phfparen.json b/dev/packages/phfparen.json
index 60deaf235..187151d2a 100644
--- a/dev/packages/phfparen.json
+++ b/dev/packages/phfparen.json
@@ -7,12 +7,6 @@
     "xstring": []
   },
   "macros": {
-    "paren()": {
-      "snippet": "paren(${1:expression in parenthesis})"
-    },
-    "paren*()": {
-      "snippet": "paren*(${1:expression in parenthesis})"
-    },
     "paren[]": {
       "snippet": "paren[${1:expression in brackets}]"
     },
diff --git a/dev/packages/phfqit.json b/dev/packages/phfqit.json
index 0d76918e1..40c1931c4 100644
--- a/dev/packages/phfqit.json
+++ b/dev/packages/phfqit.json
@@ -43,27 +43,6 @@
     "CNOT": {},
     "NOT": {},
     "NOOP": {},
-    "uu()": {
-      "snippet": "uu(${1:arg})"
-    },
-    "UU()": {
-      "snippet": "UU(${1:arg})"
-    },
-    "su()": {
-      "snippet": "su(${1:arg})"
-    },
-    "SU()": {
-      "snippet": "SU(${1:arg})"
-    },
-    "so()": {
-      "snippet": "so(${1:arg})"
-    },
-    "SO()": {
-      "snippet": "SO(${1:arg})"
-    },
-    "SN()": {
-      "snippet": "SN(${1:arg})"
-    },
     "ket{}": {
       "snippet": "ket{${1:arg}}"
     },
@@ -251,15 +230,6 @@
     "Hbase{}{}[][]{}[]": {
       "snippet": "Hbase{${1:Hsym}}{${2:subscript}}[${3:state}][${4:epsilon}]{${5:target sys}}[${6:cond sys}]"
     },
-    "Hfn()": {
-      "snippet": "Hfn(${1:arg})"
-    },
-    "Hfunc()": {
-      "snippet": "Hfunc(${1:arg})"
-    },
-    "Hfnbase{}{}{}()": {
-      "snippet": "Hfnbase{${1:Hsym}}{${2:sub}}{${3:sup}}(${4:arg})"
-    },
     "DD{}{}": {
       "snippet": "DD{${1:state}}{${2:relative-to state}}"
     },
diff --git a/dev/packages/physics.json b/dev/packages/physics.json
index bb72bca82..6dfcaa9e3 100644
--- a/dev/packages/physics.json
+++ b/dev/packages/physics.json
@@ -15,9 +15,6 @@
     "Pmqty{}": {
       "snippet": "Pmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
-    "Pr()": {
-      "snippet": "Pr(${1:expression})"
-    },
     "Probability": {},
     "Res[]": {
       "snippet": "Res[${1:expression}]"
@@ -46,102 +43,30 @@
     "acommutator{}{}": {
       "snippet": "acommutator{${1:expression1}}{${2:expression2}}"
     },
-    "acos()": {
-      "snippet": "acos(${1:expression})"
-    },
-    "acos[]()": {
-      "snippet": "acos[${1:power}](${2:expression})"
-    },
     "acosecant": {},
     "acosine": {},
-    "acot()": {
-      "snippet": "acot(${1:expression})"
-    },
-    "acot[]()": {
-      "snippet": "acot[${1:power}](${2:expression})"
-    },
     "acotangent": {},
-    "acsc()": {
-      "snippet": "acsc(${1:expression})"
-    },
-    "acsc[]()": {
-      "snippet": "acsc[${1:power}](${2:expression})"
-    },
     "admat{}": {
-      "snippet": "admat{${1:matrix element 1,${2:matrix element 2},...}}"
+      "snippet": "admat{${1:matrix element 1,matrix element 2,...}}"
     },
     "anticommutator{}{}": {
       "snippet": "anticommutator{${1:expression1}}{${2:expression2}}"
     },
     "antidiagonalmatrix{}": {
-      "snippet": "antidiagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
-    },
-    "arccos()": {
-      "snippet": "arccos(${1:expression})"
-    },
-    "arccos[]()": {
-      "snippet": "arccos[${1:power}](${2:expression})"
+      "snippet": "antidiagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
     },
     "arccosecant": {},
     "arccosine": {},
-    "arccot()": {
-      "snippet": "arccot(${1:expression})"
-    },
-    "arccot[]()": {
-      "snippet": "arccot[${1:power}](${2:expression})"
-    },
     "arccotangent": {},
-    "arccsc()": {
-      "snippet": "arccsc(${1:expression})"
-    },
-    "arccsc[]()": {
-      "snippet": "arccsc[${1:power}](${2:expression})"
-    },
-    "arcsec()": {
-      "snippet": "arcsec(${1:expression})"
-    },
-    "arcsec[]()": {
-      "snippet": "arcsec[${1:power}](${2:expression})"
-    },
     "arcsecant": {},
-    "arcsin()": {
-      "snippet": "arcsin(${1:expression})"
-    },
-    "arcsin[]()": {
-      "snippet": "arcsin[${1:power}](${2:expression})"
-    },
     "arcsine": {},
-    "arctan()": {
-      "snippet": "arctan(${1:expression})"
-    },
-    "arctan[]()": {
-      "snippet": "arctan[${1:power}](${2:expression})"
-    },
     "arctangent": {},
     "argclose": {},
     "argclose*": {},
     "argopen": {},
     "argopen*": {},
-    "asec()": {
-      "snippet": "asec(${1:expression})"
-    },
-    "asec[]()": {
-      "snippet": "asec[${1:power}](${2:expression})"
-    },
     "asecant": {},
-    "asin()": {
-      "snippet": "asin(${1:expression})"
-    },
-    "asin[]()": {
-      "snippet": "asin[${1:power}](${2:expression})"
-    },
     "asine": {},
-    "atan()": {
-      "snippet": "atan(${1:expression})"
-    },
-    "atan[]()": {
-      "snippet": "atan[${1:power}](${2:expression})"
-    },
     "atangent": {},
     "bmqty{}": {
       "snippet": "bmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
@@ -177,55 +102,13 @@
     "commutator{}{}": {
       "snippet": "commutator{${1:expression1}}{${2:expression2}}"
     },
-    "cos()": {
-      "snippet": "cos(${1:expression})"
-    },
-    "cos[]()": {
-      "snippet": "cos[${1:power}](${2:expression})"
-    },
     "cosecant": {},
-    "cosh()": {
-      "snippet": "cosh(${1:expression})"
-    },
-    "cosh[]()": {
-      "snippet": "cosh[${1:power}](${2:expression})"
-    },
     "cosine": {},
-    "cot()": {
-      "snippet": "cot(${1:expression})"
-    },
-    "cot[]()": {
-      "snippet": "cot[${1:power}](${2:expression})"
-    },
     "cotangent": {},
-    "coth()": {
-      "snippet": "coth(${1:expression})"
-    },
-    "coth[]()": {
-      "snippet": "coth[${1:power}](${2:expression})"
-    },
     "cp": {},
     "cross": {},
     "crossproduct": {},
-    "csc()": {
-      "snippet": "csc(${1:expression})"
-    },
-    "csc[]()": {
-      "snippet": "csc[${1:power}](${2:expression})"
-    },
-    "csch()": {
-      "snippet": "csch(${1:expression})"
-    },
-    "csch[]()": {
-      "snippet": "csch[${1:power}](${2:expression})"
-    },
     "curl": {},
-    "curl()": {
-      "snippet": "curl(${1:expression})"
-    },
-    "curl*()": {
-      "snippet": "curl*(${1:expression})"
-    },
     "curl*[]": {
       "snippet": "curl*[${1:expression}]"
     },
@@ -239,9 +122,6 @@
       "detail": "ⅆ",
       "documentation": "DOUBLE-STRUCK ITALIC SMALL D"
     },
-    "dd()": {
-      "snippet": "dd(${1:expression})"
-    },
     "dd[]{}": {
       "snippet": "dd[${2:power}]{${1:expression}}"
     },
@@ -251,20 +131,11 @@
     "derivative{}{}": {
       "snippet": "derivative{${1:function}}{${2:expression}}"
     },
-    "det()": {
-      "snippet": "det(${1:expression})"
-    },
     "determinant": {},
     "diagonalmatrix{}": {
-      "snippet": "diagonalmatrix{${1:matrix element 1,${2:matrix element 2},...}}"
+      "snippet": "diagonalmatrix{${1:matrix element 1,matrix element 2,...}}"
     },
     "differential": {},
-    "div()": {
-      "snippet": "div(${1:expression})"
-    },
-    "div*()": {
-      "snippet": "div*(${1:expression})"
-    },
     "div*[]": {
       "snippet": "div*[${1:expression}]"
     },
@@ -280,7 +151,7 @@
     },
     "divisionsymbol": {},
     "dmat{}": {
-      "snippet": "dmat{${1:matrix element 1,${2:matrix element 2},...}}"
+      "snippet": "dmat{${1:matrix element 1,matrix element 2,...}}"
     },
     "dotproduct": {},
     "dv*{}{}": {
@@ -292,9 +163,6 @@
     "dv{}": {
       "snippet": "dv{${1:expression}}"
     },
-    "dv{}()": {
-      "snippet": "dv{${1:expression1}}(${2:expression2})"
-    },
     "dv{}{}": {
       "snippet": "dv{${1:function}}{${2:expression}}"
     },
@@ -307,9 +175,6 @@
     "dyad{}{}": {
       "snippet": "dyad{${1:expression1}}{${2:expression2}}"
     },
-    "erf()": {
-      "snippet": "erf(${1:expression})"
-    },
     "ev**{}{}": {
       "snippet": "ev**{${1:expression1}}{${2:expression2}}"
     },
@@ -331,9 +196,6 @@
     "evaluated{}_{}^{}": {
       "snippet": "evaluated{${1:expression}}_{${2:limit1}}^{${3:limit2}}"
     },
-    "exp()": {
-      "snippet": "exp(${1:expression})"
-    },
     "expectationvalue{}{}": {
       "snippet": "expectationvalue{${1:expression1}}{${2:expression2}}"
     },
@@ -359,25 +221,13 @@
     "fdv{}": {
       "snippet": "fdv{${1:expression}}"
     },
-    "fdv{}()": {
-      "snippet": "fdv{${1:expression}}(${2:function})"
-    },
     "fdv{}{}": {
       "snippet": "fdv{${1:function}}{${2:expression}}"
     },
-    "flatfrac{}()": {
-      "snippet": "flatfrac{${1:expression1}}(${2:expression2})"
-    },
     "functionalderivative{}{}": {
       "snippet": "functionalderivative{${1:function}}{${2:expression}}"
     },
     "grad": {},
-    "grad()": {
-      "snippet": "grad(${1:expression})"
-    },
-    "grad*()": {
-      "snippet": "grad*(${1:expression})"
-    },
     "grad*[]": {
       "snippet": "grad*[${1:expression}]"
     },
@@ -427,12 +277,6 @@
       "snippet": "ketbra{${1:expression1}}{${2:expression2}}"
     },
     "laplacian": {},
-    "laplacian()": {
-      "snippet": "laplacian(${1:expression})"
-    },
-    "laplacian*()": {
-      "snippet": "laplacian*(${1:expression})"
-    },
     "laplacian*[]": {
       "snippet": "laplacian*[${1:expression}]"
     },
@@ -442,12 +286,6 @@
     "laplacian{}": {
       "snippet": "laplacian{${1:expression}}"
     },
-    "ln()": {
-      "snippet": "ln(${1:expression})"
-    },
-    "log()": {
-      "snippet": "log(${1:expression})"
-    },
     "logarithm": {},
     "lparen": {
       "detail": "(",
@@ -468,9 +306,6 @@
     "matrixelement{}{}{}": {
       "snippet": "matrixelement{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
-    "matrixquantity()": {
-      "snippet": "matrixquantity(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
-    },
     "matrixquantity{}": {
       "snippet": "matrixquantity{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -487,12 +322,6 @@
     "mel{}{}{}": {
       "snippet": "mel{${1:expression1}}{${2:expression2}}{${3:expression3}}"
     },
-    "mqty()": {
-      "snippet": "mqty(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
-    },
-    "mqty*()": {
-      "snippet": "mqty*(${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4})"
-    },
     "mqty[]": {
       "snippet": "mqty[${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}]"
     },
@@ -515,9 +344,6 @@
     "op{}{}": {
       "snippet": "op{${1:expression1}}{${2:expression2}}"
     },
-    "opbraces{}()": {
-      "snippet": "opbraces{${1:operator}}(${2:expression})"
-    },
     "order*{}": {
       "snippet": "order*{${1:expression}}"
     },
@@ -634,9 +460,6 @@
     "qsince*": {},
     "qthen": {},
     "qthen*": {},
-    "qty()": {
-      "snippet": "qty(${1:expression})"
-    },
     "qty[]": {
       "snippet": "qty[${1:expression}]"
     },
@@ -661,32 +484,8 @@
     "sbmqty{}": {
       "snippet": "sbmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
-    "sec()": {
-      "snippet": "sec(${1:expression})"
-    },
-    "sec[]()": {
-      "snippet": "sec[${1:power}](${2:expression})"
-    },
     "secant": {},
-    "sech()": {
-      "snippet": "sech(${1:expression})"
-    },
-    "sech[]()": {
-      "snippet": "sech[${1:power}](${2:expression})"
-    },
-    "sin()": {
-      "snippet": "sin(${1:expression})"
-    },
-    "sin[]()": {
-      "snippet": "sin[${1:power}](${2:expression})"
-    },
     "sine": {},
-    "sinh()": {
-      "snippet": "sinh(${1:expression})"
-    },
-    "sinh[]()": {
-      "snippet": "sinh[${1:power}](${2:expression})"
-    },
     "smallmatrixdeterminant{}": {
       "snippet": "smallmatrixdeterminant{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
@@ -696,12 +495,6 @@
     "smdet{}": {
       "snippet": "smdet{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element}}"
     },
-    "smqty({})": {
-      "snippet": "smqty(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
-    },
-    "smqty*({})": {
-      "snippet": "smqty*(${2:{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}})"
-    },
     "smqty[{]": {
       "snippet": "smqty[{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}]"
     },
@@ -720,27 +513,9 @@
     "svmqty{}": {
       "snippet": "svmqty{${1:matrix element 1 & matrix element 2  \\\\ matrix element 3 & matrix element 4}}"
     },
-    "tan()": {
-      "snippet": "tan(${1:expression})"
-    },
-    "tan[]()": {
-      "snippet": "tan[${1:power}](${2:expression})"
-    },
     "tangent": {},
-    "tanh()": {
-      "snippet": "tanh(${1:expression})"
-    },
-    "tanh[]()": {
-      "snippet": "tanh[${1:power}](${2:expression})"
-    },
     "tr": {},
-    "tr()": {
-      "snippet": "tr(${1:expression})"
-    },
     "trace": {},
-    "trigbraces{}()": {
-      "snippet": "trigbraces{${1:operator}}(${2:expression})"
-    },
     "trigopt": {},
     "va*{}": {
       "snippet": "va*{${1:expression}}"
@@ -748,9 +523,6 @@
     "va{}": {
       "snippet": "va{${1:expression}}"
     },
-    "var()": {
-      "snippet": "var(${1:expression})"
-    },
     "var{}": {
       "snippet": "var{${1:expression}}"
     },
diff --git a/dev/packages/physics2.json b/dev/packages/physics2.json
index 05a055b1a..36533ab9b 100644
--- a/dev/packages/physics2.json
+++ b/dev/packages/physics2.json
@@ -73,40 +73,40 @@
       "snippet": "ketbra*|subformula1>${1:optional}<subformula2|"
     },
     "diagmat{}": {
-      "snippet": "diagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "diagmat{${1:entry1,entry2,...}}"
     },
     "diagmat[]{}": {
-      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "diagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "pdiagmat{}": {
-      "snippet": "pdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "pdiagmat{${1:entry1,entry2,...}}"
     },
     "pdiagmat[]{}": {
-      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "pdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "bdiagmat{}": {
-      "snippet": "bdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "bdiagmat{${1:entry1,entry2,...}}"
     },
     "bdiagmat[]{}": {
-      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "Bdiagmat{}": {
-      "snippet": "Bdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "Bdiagmat{${1:entry1,entry2,...}}"
     },
     "Bdiagmat[]{}": {
-      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "Bdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "vdiagmat{}": {
-      "snippet": "vdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "vdiagmat{${1:entry1,entry2,...}}"
     },
     "vdiagmat[]{}": {
-      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "Vdiagmat{}": {
-      "snippet": "Vdiagmat{${1:entry1,${2:entry2},...}}"
+      "snippet": "Vdiagmat{${1:entry1,entry2,...}}"
     },
     "Vdiagmat[]{}": {
-      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,${3:entry2},...}}"
+      "snippet": "Vdiagmat[${2:empty=entry}]{${1:entry1,entry2,...}}"
     },
     "doublecross": {},
     "doubledot": {},
diff --git a/dev/packages/piano.json b/dev/packages/piano.json
deleted file mode 100644
index b2c263a3f..000000000
--- a/dev/packages/piano.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "includes": {
-    "color": [],
-    "ifthen": [],
-    "xargs": []
-  },
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/picinpar.json b/dev/packages/picinpar.json
index adbb82be6..f42f4d5f6 100644
--- a/dev/packages/picinpar.json
+++ b/dev/packages/picinpar.json
@@ -67,17 +67,17 @@
     "window": {},
     "window[]": {
       "name": "window",
-      "snippet": "[${1:lines,${2:pos},${3:graphics},caption}]"
+      "snippet": "[${1:lines,pos,graphics,caption}]"
     },
     "figwindow": {},
     "figwindow[]": {
       "name": "figwindow",
-      "snippet": "[${1:lines,${2:pos},${3:graphics},caption}]"
+      "snippet": "[${1:lines,pos,graphics,caption}]"
     },
     "tabwindow": {},
     "tabwindow[]": {
       "name": "tabwindow",
-      "snippet": "[${1:lines,${2:pos},${3:graphics},caption}]"
+      "snippet": "[${1:lines,pos,graphics,caption}]"
     }
   },
   "options": [],
diff --git a/dev/packages/picins.json b/dev/packages/picins.json
index f8993ae72..3ad7ec299 100644
--- a/dev/packages/picins.json
+++ b/dev/packages/picins.json
@@ -4,45 +4,9 @@
     "parpic{}": {
       "snippet": "parpic{${1:graphics}}"
     },
-    "parpic(){}": {
-      "snippet": "parpic(${2:width},${3:height}){${1:graphics}}"
-    },
-    "parpic()[]{}": {
-      "snippet": "parpic(${3:width},${4:height})[${2:opts}]{${1:graphics}}"
-    },
-    "parpic()[][]{}": {
-      "snippet": "parpic(${4:width},${5:height})[${2:opts}][${3:pos}]{${1:graphics}}"
-    },
-    "parpic()(){}": {
-      "snippet": "parpic(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics}}"
-    },
-    "parpic()()[]{}": {
-      "snippet": "parpic(${3:width},${4:height})(${5:xoffset},${6:yoffset})[${2:opts}]{${1:graphics}}"
-    },
-    "parpic()()[][]{}": {
-      "snippet": "parpic(${4:width},${5:height})(${6:xoffset},${7:yoffset})[${2:opts}][${3:pos}]{${1:graphics}}"
-    },
     "hpic{}": {
       "snippet": "hpic{${1:graphics}}"
     },
-    "hpic(){}": {
-      "snippet": "hpic(${2:width},${3:height}){${1:graphics}}"
-    },
-    "hpic()[]{}": {
-      "snippet": "hpic(${3:width},${4:height})[${2:opts}]{${1:graphics}}"
-    },
-    "hpic()[][]{}": {
-      "snippet": "hpic(${4:width},${5:height})[${2:opts}][${3:pos}]{${1:graphics}}"
-    },
-    "hpic()(){}": {
-      "snippet": "hpic(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics}}"
-    },
-    "hpic()()[]{}": {
-      "snippet": "hpic(${3:width},${4:height})(${5:xoffset},${6:yoffset})[${2:opts}]{${1:graphics}}"
-    },
-    "hpic()()[][]{}": {
-      "snippet": "hpic(${4:width},${5:height})(${6:xoffset},${7:yoffset})[${2:opts}][${3:pos}]{${1:graphics}}"
-    },
     "picskip{}": {
       "snippet": "picskip{${1:n}}"
     },
@@ -85,22 +49,7 @@
     "ihpic": {},
     "iihpic": {},
     "iiihpic": {},
-    "ivhpic": {},
-    "Rahmen(){}": {
-      "snippet": "Rahmen(${2:x},${3:y}){${1:arg}}"
-    },
-    "Schatten(){}": {
-      "snippet": "Schatten(${2:x},${3:y}){${1:arg}}"
-    },
-    "Oval(){}": {
-      "snippet": "Oval(${2:x},${3:y}){${1:arg}}"
-    },
-    "Strich(){}": {
-      "snippet": "Strich(${2:x},${3:y}){${1:arg}}"
-    },
-    "Kasten(){}": {
-      "snippet": "Kasten(${2:x},${3:y}){${1:arg}}"
-    }
+    "ivhpic": {}
   },
   "envs": {
     "frameenv": {},
diff --git a/dev/packages/pict2e.json b/dev/packages/pict2e.json
deleted file mode 100644
index 6565b4e55..000000000
--- a/dev/packages/pict2e.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "includes": {
-    "trig": []
-  },
-  "macros": {
-    "line(){}": {
-      "snippet": "line(${2:x},${3:y}){${1:length}}"
-    },
-    "vector(){}": {
-      "snippet": "vector(${2:x},${3:y}){${1:length}}"
-    },
-    "circle{}": {
-      "snippet": "circle{${1:diameter}}"
-    },
-    "circle*{}": {
-      "snippet": "circle*{${1:diameter}}"
-    },
-    "oval()": {
-      "snippet": "oval(${1:x},${2:y})"
-    },
-    "oval[]()": {
-      "snippet": "oval[${1:radius}](${2:x},${3:y})"
-    },
-    "oval()[]": {
-      "snippet": "oval(${2:x},${3:y})[${1:pos}]"
-    },
-    "oval[]()[]": {
-      "snippet": "oval[${1:radius}](${3:x},${4:y})[${2:pos}]"
-    },
-    "maxovalrad": {},
-    "bezier{}()()()": {
-      "snippet": "bezier{${1:n}}(${2:ax},${3:ay})(${4:bx},${5:by})(${6:cx},${7:cy})"
-    },
-    "qbezier()()()": {
-      "snippet": "qbezier(${1:ax},${2:ay})(${3:bx},${4:by})(${5:cx},${6:cy})"
-    },
-    "qbezier[]()()()": {
-      "snippet": "qbezier[${1:n}](${2:ax},${3:ay})(${4:bx},${5:by})(${6:cx},${7:cy})"
-    },
-    "cbezier()()()()": {
-      "snippet": "cbezier(${1:ax},${2:ay})(${3:bx},${4:by})(${5:cx},${6:cy})(${7:dx},${8:dy})"
-    },
-    "cbezier[]()()()()": {
-      "snippet": "cbezier[${1:n}](${2:ax},${3:ay})(${4:bx},${5:by})(${6:cx},${7:cy})(${8:dx},${9:dy})"
-    },
-    "qbeziermax": {},
-    "arc{}": {
-      "snippet": "arc{${1:radius}}"
-    },
-    "arc[]{}": {
-      "snippet": "arc[${2:angle1,angle2}]{${1:radius}}"
-    },
-    "arc*{}": {
-      "snippet": "arc*{${1:radius}}"
-    },
-    "arc*[]{}": {
-      "snippet": "arc*[${2:angle1,angle2}]{${1:radius}}"
-    },
-    "Line()()": {
-      "snippet": "Line(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "Vector()()": {
-      "snippet": "Vector(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "moveto()": {
-      "snippet": "moveto(${1:x},${2:y})"
-    },
-    "lineto()": {
-      "snippet": "lineto(${1:x},${2:y})"
-    },
-    "curveto()()()": {
-      "snippet": "curveto(${1:x2},${2:y2})(${3:x3},${4:y3})(${5:x4},${6:y4})"
-    },
-    "circlearc{}{}{}{}{}": {
-      "snippet": "circlearc{${1:x}}{${2:y}}{${3:radius}}{${4:angle1}}{${5:angle2}}"
-    },
-    "circlearc[]{}{}{}{}{}": {
-      "snippet": "circlearc[${6:n}]{${1:x}}{${2:y}}{${3:radius}}{${4:angle1}}{${5:angle2}}"
-    },
-    "closepath": {},
-    "strokepath": {},
-    "fillpath": {},
-    "buttcap": {},
-    "roundcap": {},
-    "squarecap": {},
-    "miterjoin": {},
-    "roundjoin": {},
-    "beveljoin": {},
-    "thicklines": {},
-    "thinlines": {},
-    "ltxarrows": {},
-    "pstarrows": {},
-    "OriginalPictureCmds": {}
-  },
-  "envs": {},
-  "options": [
-    "dvips",
-    "xdvi",
-    "dvipdf",
-    "dvipdfm",
-    "dvipdfmx",
-    "pdftex",
-    "luatex",
-    "xetex",
-    "dvipsone",
-    "dviwindo",
-    "oztex",
-    "textures",
-    "pctexps",
-    "pctex32",
-    "vtex",
-    "original",
-    "ltxarrows",
-    "pstarrows",
-    "debug",
-    "hide"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/picture.json b/dev/packages/picture.json
deleted file mode 100644
index 9b3eb1204..000000000
--- a/dev/packages/picture.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "includes": {
-    "calc": [
-      "calc"
-    ]
-  },
-  "macros": {},
-  "envs": {},
-  "options": [
-    "plain",
-    "etex",
-    "calc"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/pinoutikz.json b/dev/packages/pinoutikz.json
index df2bead75..b08166d9d 100644
--- a/dev/packages/pinoutikz.json
+++ b/dev/packages/pinoutikz.json
@@ -15,39 +15,12 @@
     "tikzlibraryshapes.geometric": []
   },
   "macros": {
-    "PDIP(){}": {
-      "snippet": "PDIP(${2:pincount}){${1:pinarray}}"
-    },
-    "pctPDIP(){}": {
-      "snippet": "pctPDIP(${2:pincount}){${1:pinarray}}"
-    },
-    "TQFP(){}": {
-      "snippet": "TQFP(${2:pincount}){${1:pinarray}}"
-    },
-    "pctTQFP(){}": {
-      "snippet": "pctTQFP(${2:pincount}){${1:pinarray}}"
-    },
-    "PLCC(){}": {
-      "snippet": "PLCC(${2:pincount}){${1:pinarray}}"
-    },
-    "pctPLCC(){}": {
-      "snippet": "pctPLCC(${2:pincount}){${1:pinarray}}"
-    },
     "pinoutikzname": {},
     "pinoutikzversion": {},
     "pinoutikzdate": {},
     "FormatPinLabel{}": {
       "snippet": "FormatPinLabel{${1:arg}}"
     },
-    "CASE(){}": {
-      "snippet": "CASE(${2:arg1}){${1:arg2}}"
-    },
-    "PIN[](){}{}": {
-      "snippet": "PIN[${3:arg1}](${4:arg2}){${1:arg3}}{${2:arg4}}"
-    },
-    "GENFOUREDGE(){}{}{}": {
-      "snippet": "GENFOUREDGE(${4:arg1}){${1:arg2}}{${2:arg3}}{${3:arg4}}"
-    },
     "pardefault": {},
     "neverindent": {},
     "autoindent": {}
diff --git a/dev/packages/pinyin.json b/dev/packages/pinyin.json
deleted file mode 100644
index 9501ad08d..000000000
--- a/dev/packages/pinyin.json
+++ /dev/null
@@ -1,892 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "PYactivate": {},
-    "PYdeactivate": {},
-    "a": {
-      "detail": "𝑎",
-      "documentation": "MATHEMATICAL ITALIC SMALL A"
-    },
-    "A": {
-      "detail": "𝐴",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
-    },
-    "ai": {},
-    "Ai": {},
-    "an": {},
-    "An": {},
-    "ang": {},
-    "Ang": {},
-    "ao": {},
-    "Ao": {},
-    "ba": {},
-    "Ba": {},
-    "bai": {},
-    "Bai": {},
-    "ban": {},
-    "Ban": {},
-    "bang": {},
-    "Bang": {},
-    "bao": {},
-    "Bao": {},
-    "bei": {},
-    "Bei": {},
-    "ben": {},
-    "Ben": {},
-    "beng": {},
-    "Beng": {},
-    "bi": {},
-    "Bi": {},
-    "bian": {},
-    "Bian": {},
-    "biao": {},
-    "Biao": {},
-    "bie": {},
-    "Bie": {},
-    "bin": {},
-    "Bin": {},
-    "bing": {},
-    "Bing": {},
-    "bo": {},
-    "Bo": {},
-    "bu": {},
-    "Bu": {},
-    "ca": {},
-    "Ca": {},
-    "cai": {},
-    "Cai": {},
-    "can": {},
-    "Can": {},
-    "cang": {},
-    "Cang": {},
-    "cao": {},
-    "Cao": {},
-    "ce": {},
-    "Ce": {},
-    "cen": {},
-    "Cen": {},
-    "ceng": {},
-    "Ceng": {},
-    "cha": {},
-    "Cha": {},
-    "chai": {},
-    "Chai": {},
-    "chan": {},
-    "Chan": {},
-    "chang": {},
-    "Chang": {},
-    "chao": {},
-    "Chao": {},
-    "che": {},
-    "Che": {},
-    "chen": {},
-    "Chen": {},
-    "cheng": {},
-    "Cheng": {},
-    "Chi": {},
-    "chong": {},
-    "Chong": {},
-    "chou": {},
-    "Chou": {},
-    "chu": {},
-    "Chu": {},
-    "chua": {},
-    "chuai": {},
-    "Chuai": {},
-    "chuan": {},
-    "Chuan": {},
-    "chuang": {},
-    "Chuang": {},
-    "chui": {},
-    "Chui": {},
-    "chun": {},
-    "Chun": {},
-    "chuo": {},
-    "Chuo": {},
-    "ci": {},
-    "Ci": {},
-    "cong": {
-      "detail": "≅",
-      "documentation": "congruent with"
-    },
-    "Cong": {},
-    "cou": {},
-    "Cou": {},
-    "cu": {},
-    "Cu": {},
-    "cuan": {},
-    "Cuan": {},
-    "cui": {},
-    "Cui": {},
-    "cun": {},
-    "Cun": {},
-    "cuo": {},
-    "Cuo": {},
-    "da": {},
-    "Da": {},
-    "dai": {},
-    "Dai": {},
-    "dan": {},
-    "Dan": {},
-    "dang": {},
-    "Dang": {},
-    "dao": {},
-    "Dao": {},
-    "de": {},
-    "De": {},
-    "dei": {},
-    "Dei": {},
-    "den": {},
-    "deng": {},
-    "Deng": {},
-    "di": {},
-    "Di": {},
-    "dian": {},
-    "Dian": {},
-    "diao": {},
-    "Diao": {},
-    "die": {},
-    "Die": {},
-    "ding": {},
-    "Ding": {},
-    "diu": {},
-    "Diu": {},
-    "dong": {},
-    "Dong": {},
-    "dou": {},
-    "Dou": {},
-    "du": {},
-    "Du": {},
-    "duan": {},
-    "Duan": {},
-    "dui": {},
-    "Dui": {},
-    "dun": {},
-    "Dun": {},
-    "duo": {},
-    "Duo": {},
-    "e": {
-      "detail": "𝑒",
-      "documentation": "MATHEMATICAL ITALIC SMALL E"
-    },
-    "E": {
-      "detail": "𝐸",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL E"
-    },
-    "ei": {},
-    "Ei": {},
-    "en": {},
-    "En": {},
-    "eng": {},
-    "Eng": {},
-    "er": {},
-    "Er": {},
-    "fa": {},
-    "Fa": {},
-    "fan": {},
-    "Fan": {},
-    "fang": {},
-    "Fang": {},
-    "fei": {},
-    "Fei": {},
-    "fen": {},
-    "Fen": {},
-    "feng": {},
-    "Feng": {},
-    "fiao": {},
-    "Fiao": {},
-    "fo": {},
-    "Fo": {},
-    "fou": {},
-    "Fou": {},
-    "fu": {},
-    "Fu": {},
-    "ga": {},
-    "Ga": {},
-    "gai": {},
-    "Gai": {},
-    "gan": {},
-    "Gan": {},
-    "gang": {},
-    "Gang": {},
-    "gao": {},
-    "Gao": {},
-    "ge": {
-      "detail": "≥",
-      "documentation": "r: greater-than-or-equal"
-    },
-    "Ge": {},
-    "gei": {},
-    "Gei": {},
-    "gen": {},
-    "Gen": {},
-    "geng": {},
-    "Geng": {},
-    "gong": {},
-    "Gong": {},
-    "gou": {},
-    "Gou": {},
-    "gu": {},
-    "Gu": {},
-    "gua": {},
-    "Gua": {},
-    "guai": {},
-    "Guai": {},
-    "guan": {},
-    "Guan": {},
-    "guang": {},
-    "Guang": {},
-    "gui": {},
-    "Gui": {},
-    "gun": {},
-    "Gun": {},
-    "guo": {},
-    "Guo": {},
-    "ha": {},
-    "Ha": {},
-    "hai": {},
-    "Hai": {},
-    "han": {},
-    "Han": {},
-    "hang": {},
-    "Hang": {},
-    "hao": {},
-    "Hao": {},
-    "he": {},
-    "He": {},
-    "hei": {},
-    "Hei": {},
-    "hen": {},
-    "Hen": {},
-    "heng": {},
-    "Heng": {},
-    "hong": {},
-    "Hong": {},
-    "hou": {},
-    "Hou": {},
-    "hu": {},
-    "Hu": {},
-    "hua": {},
-    "Hua": {},
-    "huai": {},
-    "Huai": {},
-    "huan": {},
-    "Huan": {},
-    "huang": {},
-    "Huang": {},
-    "hui": {},
-    "Hui": {},
-    "hun": {},
-    "Hun": {},
-    "huo": {},
-    "Huo": {},
-    "ji": {},
-    "Ji": {},
-    "jia": {},
-    "Jia": {},
-    "jian": {},
-    "Jian": {},
-    "jiang": {},
-    "Jiang": {},
-    "jiao": {},
-    "Jiao": {},
-    "jie": {},
-    "Jie": {},
-    "jin": {},
-    "Jin": {},
-    "jing": {},
-    "Jing": {},
-    "jiong": {},
-    "Jiong": {},
-    "jiu": {},
-    "Jiu": {},
-    "ju": {},
-    "Ju": {},
-    "juan": {},
-    "Juan": {},
-    "jue": {},
-    "Jue": {},
-    "jun": {},
-    "Jun": {},
-    "ka": {},
-    "Ka": {},
-    "kai": {},
-    "Kai": {},
-    "kan": {},
-    "Kan": {},
-    "kang": {},
-    "Kang": {},
-    "kao": {},
-    "Kao": {},
-    "ke": {},
-    "Ke": {},
-    "kei": {},
-    "Kei": {},
-    "ken": {},
-    "Ken": {},
-    "keng": {},
-    "Keng": {},
-    "kong": {},
-    "Kong": {},
-    "kou": {},
-    "Kou": {},
-    "ku": {},
-    "Ku": {},
-    "kua": {},
-    "Kua": {},
-    "kuai": {},
-    "Kuai": {},
-    "kuan": {},
-    "Kuan": {},
-    "kuang": {},
-    "Kuang": {},
-    "kui": {},
-    "Kui": {},
-    "kun": {},
-    "Kun": {},
-    "kuo": {},
-    "Kuo": {},
-    "la": {},
-    "La": {},
-    "lai": {},
-    "Lai": {},
-    "lan": {},
-    "Lan": {},
-    "lang": {
-      "detail": "⟪",
-      "documentation": "MATHEMATICAL LEFT DOUBLE ANGLE BRACKET, z notation left chevron bracket"
-    },
-    "Lang": {},
-    "lao": {},
-    "Lao": {},
-    "le": {
-      "detail": "≤",
-      "documentation": "r: less-than-or-equal"
-    },
-    "Le": {},
-    "lei": {},
-    "Lei": {},
-    "leng": {},
-    "Leng": {},
-    "li": {},
-    "Li": {},
-    "lia": {},
-    "Lia": {},
-    "lian": {},
-    "Lian": {},
-    "liang": {},
-    "Liang": {},
-    "liao": {},
-    "Liao": {},
-    "lie": {},
-    "Lie": {},
-    "lin": {},
-    "Lin": {},
-    "ling": {},
-    "Ling": {},
-    "liu": {},
-    "Liu": {},
-    "Long": {},
-    "LONG": {},
-    "lou": {},
-    "Lou": {},
-    "lu": {},
-    "Lu": {},
-    "luan": {},
-    "Luan": {},
-    "lun": {},
-    "Lun": {},
-    "luo": {},
-    "Luo": {},
-    "lv": {},
-    "Lv": {},
-    "lve": {},
-    "Lve": {},
-    "ma": {},
-    "Ma": {},
-    "mai": {},
-    "Mai": {},
-    "man": {},
-    "Man": {},
-    "mang": {},
-    "Mang": {},
-    "mao": {},
-    "Mao": {},
-    "me": {},
-    "mei": {},
-    "Mei": {},
-    "men": {},
-    "Men": {},
-    "meng": {},
-    "Meng": {},
-    "mi": {},
-    "Mi": {},
-    "mian": {},
-    "Mian": {},
-    "miao": {},
-    "Miao": {},
-    "mie": {},
-    "Mie": {},
-    "min": {},
-    "Min": {},
-    "ming": {},
-    "Ming": {},
-    "miu": {},
-    "Miu": {},
-    "mo": {},
-    "Mo": {},
-    "mou": {},
-    "Mou": {},
-    "Mu": {},
-    "na": {},
-    "Na": {},
-    "nai": {},
-    "Nai": {},
-    "nan": {},
-    "Nan": {},
-    "nang": {},
-    "Nang": {},
-    "nao": {},
-    "Nao": {},
-    "ne": {
-      "detail": "≠",
-      "documentation": "r: not equal"
-    },
-    "Ne": {},
-    "nei": {},
-    "Nei": {},
-    "nen": {},
-    "Nen": {},
-    "neng": {},
-    "Neng": {},
-    "ni": {
-      "detail": "∋",
-      "documentation": "con variant"
-    },
-    "Ni": {},
-    "nian": {},
-    "Nian": {},
-    "niang": {},
-    "Niang": {},
-    "niao": {},
-    "Niao": {},
-    "nie": {},
-    "Nie": {},
-    "nin": {
-      "detail": "∉",
-      "documentation": "negated set membership"
-    },
-    "Nin": {},
-    "ning": {},
-    "Ning": {},
-    "niu": {},
-    "Niu": {},
-    "nong": {},
-    "Nong": {},
-    "nou": {},
-    "Nou": {},
-    "Nu": {},
-    "nuan": {},
-    "Nuan": {},
-    "nuo": {},
-    "Nuo": {},
-    "nv": {},
-    "Nv": {},
-    "nve": {},
-    "Nve": {},
-    "o": {
-      "detail": "𝑜",
-      "documentation": "MATHEMATICAL ITALIC SMALL O"
-    },
-    "O": {
-      "detail": "𝑂",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL O"
-    },
-    "ou": {},
-    "Ou": {},
-    "pa": {},
-    "Pa": {},
-    "pai": {},
-    "Pai": {},
-    "pan": {},
-    "Pan": {},
-    "pang": {},
-    "Pang": {},
-    "pao": {},
-    "Pao": {},
-    "pei": {},
-    "Pei": {},
-    "pen": {},
-    "Pen": {},
-    "peng": {},
-    "Peng": {},
-    "pian": {},
-    "Pian": {},
-    "piao": {},
-    "Piao": {},
-    "pie": {},
-    "Pie": {},
-    "pin": {},
-    "Pin": {},
-    "ping": {},
-    "Ping": {},
-    "po": {},
-    "Po": {},
-    "pou": {},
-    "Pou": {},
-    "pu": {},
-    "Pu": {},
-    "qi": {},
-    "Qi": {},
-    "qia": {},
-    "Qia": {},
-    "qian": {},
-    "Qian": {},
-    "qiang": {},
-    "Qiang": {},
-    "qiao": {},
-    "Qiao": {},
-    "qie": {},
-    "Qie": {},
-    "qin": {},
-    "Qin": {},
-    "qing": {},
-    "Qing": {},
-    "qiong": {},
-    "Qiong": {},
-    "qiu": {},
-    "Qiu": {},
-    "qu": {},
-    "Qu": {},
-    "quan": {},
-    "Quan": {},
-    "que": {},
-    "Que": {},
-    "qun": {},
-    "Qun": {},
-    "ran": {},
-    "Ran": {},
-    "rang": {
-      "detail": "⟫",
-      "documentation": "MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET, z notation right chevron bracket"
-    },
-    "Rang": {},
-    "rao": {},
-    "Rao": {},
-    "Re": {
-      "detail": "ℜ",
-      "documentation": "real part"
-    },
-    "re": {},
-    "ren": {},
-    "Ren": {},
-    "reng": {},
-    "Reng": {},
-    "ri": {},
-    "Ri": {},
-    "rong": {},
-    "Rong": {},
-    "rou": {},
-    "Rou": {},
-    "ru": {},
-    "Ru": {},
-    "rua": {},
-    "ruan": {},
-    "Ruan": {},
-    "rui": {},
-    "Rui": {},
-    "run": {},
-    "Run": {},
-    "ruo": {},
-    "Ruo": {},
-    "sa": {},
-    "Sa": {},
-    "sai": {},
-    "Sai": {},
-    "san": {},
-    "San": {},
-    "sang": {},
-    "Sang": {},
-    "sao": {},
-    "Sao": {},
-    "se": {},
-    "Se": {},
-    "sen": {},
-    "Sen": {},
-    "seng": {},
-    "Seng": {},
-    "sha": {},
-    "Sha": {},
-    "shai": {},
-    "Shai": {},
-    "shan": {},
-    "Shan": {},
-    "shang": {},
-    "Shang": {},
-    "shao": {},
-    "Shao": {},
-    "she": {},
-    "She": {},
-    "shei": {},
-    "Shei": {},
-    "shen": {},
-    "Shen": {},
-    "sheng": {},
-    "Sheng": {},
-    "shi": {},
-    "Shi": {},
-    "shou": {},
-    "Shou": {},
-    "shu": {},
-    "Shu": {},
-    "shua": {},
-    "Shua": {},
-    "shuai": {},
-    "Shuai": {},
-    "shuan": {},
-    "Shuan": {},
-    "shuang": {},
-    "Shuang": {},
-    "shui": {},
-    "Shui": {},
-    "shun": {},
-    "Shun": {},
-    "shuo": {},
-    "Shuo": {},
-    "si": {},
-    "Si": {},
-    "song": {},
-    "Song": {},
-    "sou": {},
-    "Sou": {},
-    "su": {},
-    "Su": {},
-    "suan": {},
-    "Suan": {},
-    "sui": {},
-    "Sui": {},
-    "sun": {
-      "detail": "☼",
-      "documentation": "WHITE SUN WITH RAYS"
-    },
-    "Sun": {
-      "detail": "☉",
-      "documentation": "SUN"
-    },
-    "suo": {},
-    "Suo": {},
-    "ta": {},
-    "Ta": {},
-    "tai": {},
-    "Tai": {},
-    "tan": {},
-    "Tan": {},
-    "tang": {},
-    "Tang": {},
-    "tao": {},
-    "Tao": {},
-    "te": {},
-    "Te": {},
-    "tei": {},
-    "Tei": {},
-    "teng": {},
-    "Teng": {},
-    "ti": {},
-    "Ti": {},
-    "tian": {},
-    "Tian": {},
-    "tiao": {},
-    "Tiao": {},
-    "tie": {},
-    "Tie": {},
-    "ting": {},
-    "Ting": {},
-    "tong": {},
-    "Tong": {},
-    "tou": {},
-    "Tou": {},
-    "tu": {},
-    "Tu": {},
-    "tuan": {},
-    "Tuan": {},
-    "tui": {},
-    "Tui": {},
-    "tun": {},
-    "Tun": {},
-    "tuo": {},
-    "Tuo": {},
-    "wa": {},
-    "Wa": {},
-    "wai": {},
-    "Wai": {},
-    "wan": {},
-    "Wan": {},
-    "wang": {},
-    "Wang": {},
-    "wei": {},
-    "Wei": {},
-    "wen": {},
-    "Wen": {},
-    "weng": {},
-    "Weng": {},
-    "wo": {},
-    "Wo": {},
-    "wu": {},
-    "Wu": {},
-    "xia": {},
-    "Xia": {},
-    "xian": {},
-    "Xian": {},
-    "xiang": {},
-    "Xiang": {},
-    "xiao": {},
-    "Xiao": {},
-    "xie": {},
-    "Xie": {},
-    "xin": {},
-    "Xin": {},
-    "xing": {},
-    "Xing": {},
-    "xiong": {},
-    "Xiong": {},
-    "xiu": {},
-    "Xiu": {},
-    "xu": {},
-    "Xu": {},
-    "xuan": {},
-    "Xuan": {},
-    "xue": {},
-    "Xue": {},
-    "xun": {},
-    "Xun": {},
-    "ya": {},
-    "Ya": {},
-    "yan": {},
-    "Yan": {},
-    "yang": {},
-    "Yang": {},
-    "yao": {},
-    "Yao": {},
-    "ye": {},
-    "Ye": {},
-    "yi": {},
-    "Yi": {},
-    "yin": {},
-    "Yin": {},
-    "ying": {},
-    "Ying": {},
-    "yo": {},
-    "Yo": {},
-    "yong": {},
-    "Yong": {},
-    "you": {},
-    "You": {},
-    "yu": {},
-    "Yu": {},
-    "yuan": {},
-    "Yuan": {},
-    "yue": {},
-    "Yue": {},
-    "yun": {},
-    "Yun": {},
-    "za": {},
-    "Za": {},
-    "zai": {},
-    "Zai": {},
-    "zan": {},
-    "Zan": {},
-    "zang": {},
-    "Zang": {},
-    "zao": {},
-    "Zao": {},
-    "ze": {},
-    "Ze": {},
-    "zei": {},
-    "Zei": {},
-    "zen": {},
-    "Zen": {},
-    "zeng": {},
-    "Zeng": {},
-    "zha": {},
-    "Zha": {},
-    "zhai": {},
-    "Zhai": {},
-    "zhan": {},
-    "Zhan": {},
-    "zhang": {},
-    "Zhang": {},
-    "zhao": {},
-    "Zhao": {},
-    "zhe": {},
-    "Zhe": {},
-    "zhei": {},
-    "Zhei": {},
-    "zhen": {},
-    "Zhen": {},
-    "zheng": {},
-    "Zheng": {},
-    "zhi": {},
-    "Zhi": {},
-    "zhong": {},
-    "Zhong": {},
-    "zhou": {},
-    "Zhou": {},
-    "zhu": {},
-    "Zhu": {},
-    "zhua": {},
-    "Zhua": {},
-    "zhuai": {},
-    "Zhuai": {},
-    "zhuan": {},
-    "Zhuan": {},
-    "zhuang": {},
-    "Zhuang": {},
-    "zhui": {},
-    "Zhui": {},
-    "zhun": {},
-    "Zhun": {},
-    "zhuo": {},
-    "Zhuo": {},
-    "zi": {},
-    "Zi": {},
-    "zong": {},
-    "Zong": {},
-    "zou": {},
-    "Zou": {},
-    "zu": {},
-    "Zu": {},
-    "zuan": {},
-    "Zuan": {},
-    "zui": {},
-    "Zui": {},
-    "zun": {},
-    "Zun": {},
-    "zuo": {},
-    "Zuo": {},
-    "PYa": {},
-    "PYchi": {},
-    "PYcong": {},
-    "PYding": {},
-    "PYge": {},
-    "PYhang": {},
-    "PYle": {},
-    "PYmin": {},
-    "PYmu": {},
-    "PYne": {},
-    "PYni": {},
-    "PYnu": {},
-    "PYo": {},
-    "PYO": {},
-    "PYpi": {},
-    "PYPi": {},
-    "PYRe": {},
-    "PYtan": {},
-    "PYxi": {},
-    "PYXi": {}
-  },
-  "envs": {},
-  "options": [
-    "useCMmacron"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/piton.json b/dev/packages/piton.json
index 11d340b57..153159e69 100644
--- a/dev/packages/piton.json
+++ b/dev/packages/piton.json
@@ -112,10 +112,10 @@
       "keyvalpos": 1
     },
     "SetPitonIdentifier{}{}": {
-      "snippet": "SetPitonIdentifier{${1:id1,${3:id2},...}}{${2:code}}"
+      "snippet": "SetPitonIdentifier{${1:id1,id2,...}}{${2:code}}"
     },
     "SetPitonIdentifier[]{}{}": {
-      "snippet": "SetPitonIdentifier[${3:language}]{${1:id1,${4:id2},...}}{${2:code}}"
+      "snippet": "SetPitonIdentifier[${3:language}]{${1:id1,id2,...}}{${2:code}}"
     },
     "PitonFileVersion": {},
     "PitonFileDate": {}
@@ -253,8 +253,7 @@
       "moredirectives={${1:list of compiler directives}}",
       "tag=${1:<char1><char2>}",
       "alsodigit={${1:character sequence}}",
-      "alsoletter={${1:character sequence}}",
-      "alsoother={${1:character sequence}}"
+      "alsoletter={${1:character sequence}}"
     ],
     [
       "line-numbers/start",
diff --git a/dev/packages/placeat.json b/dev/packages/placeat.json
index c7b88e724..15ea35e81 100644
--- a/dev/packages/placeat.json
+++ b/dev/packages/placeat.json
@@ -5,18 +5,6 @@
     "atbegshi": []
   },
   "macros": {
-    "placeat(){}": {
-      "snippet": "placeat(${2:x},${3:y}){${1:content}}"
-    },
-    "placeat(){}[]": {
-      "snippet": "placeat(${3:x},${4:y}){${1:content}}[${2:name}]"
-    },
-    "placeat()[]{}": {
-      "snippet": "placeat(${3:x},${4:y})[${2:content-left}]{${1:content}}"
-    },
-    "placeat()[]{}[]": {
-      "snippet": "placeat(${4:x},${5:y})[${2:content-left}]{${1:content}}[${3:name}]"
-    },
     "placeat{}{}{}": {
       "snippet": "placeat{${1:x}}{${2:y}}{${3:content}}"
     },
@@ -29,12 +17,6 @@
     "placeat{}{}[]{}[]": {
       "snippet": "placeat{${1:x}}{${2:y}}[${3:content-left}]{${4:content}}[${5:name}]"
     },
-    "placerelto[](){}": {
-      "snippet": "placerelto[${2:name}](${3:x},${4:y}){${1:content}}"
-    },
-    "placerelto[](){}[]": {
-      "snippet": "placerelto[${2:name}](${4:x},${5:y}){${1:content}}[${3:name}]"
-    },
     "placerelto[]{}{}{}": {
       "snippet": "placerelto[${4:name}]{${1:x}}{${2:y}}{${3:content}}"
     },
@@ -52,60 +34,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "placelineat()()": {
-      "snippet": "placelineat(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "placelineat[]()()": {
-      "snippet": "placelineat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "placearrowat()()": {
-      "snippet": "placearrowat(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "placearrowat[]()()": {
-      "snippet": "placearrowat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "placecircleat(){}": {
-      "snippet": "placecircleat(${2:x},${3:y}){${1:r}}"
-    },
-    "placecircleat[](){}": {
-      "snippet": "placecircleat[${2:color}](${3:x},${4:y}){${1:r}}"
-    },
-    "placefilledcircleat(){}": {
-      "snippet": "placefilledcircleat(${2:x},${3:y}){${1:r}}"
-    },
-    "placefilledcircleat[](){}": {
-      "snippet": "placefilledcircleat[${2:color}](${3:x},${4:y}){${1:r}}"
-    },
-    "placesquareat(){}": {
-      "snippet": "placesquareat(${2:x},${3:y}){${1:r}}"
-    },
-    "placesquareat[](){}": {
-      "snippet": "placesquareat[${2:color}](${3:x},${4:y}){${1:r}}"
-    },
-    "placerectangleat()()": {
-      "snippet": "placerectangleat(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "placerectangleat[]()()": {
-      "snippet": "placerectangleat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "placefilledrectangleat()()": {
-      "snippet": "placefilledrectangleat(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "placefilledrectangleat[]()()": {
-      "snippet": "placefilledrectangleat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "placecurveat()()()()": {
-      "snippet": "placecurveat(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})(${7:x4},${8:y4})"
-    },
-    "placecurveat[]()()()()": {
-      "snippet": "placecurveat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})(${8:x4},${9:y4})"
-    },
-    "placeroundedat()()": {
-      "snippet": "placeroundedat(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "placeroundedat[]()()": {
-      "snippet": "placeroundedat[${1:color}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
     "placeatthreenumbers{}{}{}": {
       "snippet": "placeatthreenumbers{${1:arg1}}{${2:arg2}}{${3:arg3}}"
     },
diff --git a/dev/packages/plaintex.json b/dev/packages/plaintex.json
index 7d24d9387..75c6d62ae 100644
--- a/dev/packages/plaintex.json
+++ b/dev/packages/plaintex.json
@@ -1298,45 +1298,24 @@
       "detail": ">",
       "documentation": "GREATER-THAN SIGN r:"
     },
-    "big(": {
-      "snippet": "big(${2:${1}\\big})"
-    },
     "big[": {
       "snippet": "big[${1}\\big]"
     },
-    "Big(": {
-      "snippet": "Big(${2:${1}\\Big})"
-    },
     "Big[": {
       "snippet": "Big[${1}\\Big]"
     },
-    "bigl(": {
-      "snippet": "bigl(${2:${1}\\bigr})"
-    },
     "bigl[": {
       "snippet": "bigl[${1}\\bigr]"
     },
-    "Bigl(": {
-      "snippet": "Bigl(${2:${1}\\Bigr})"
-    },
     "Bigl[": {
       "snippet": "Bigl[${1}\\Bigr]"
     },
-    "biggl(": {
-      "snippet": "biggl(${2:${1}\\biggr})"
-    },
     "biggl[": {
       "snippet": "biggl[${1}\\biggr]"
     },
-    "Biggl(": {
-      "snippet": "Biggl(${2:${1}\\Biggr})"
-    },
     "Biggl[": {
       "snippet": "Biggl[${1}\\Biggr]"
     },
-    "left(": {
-      "snippet": "left(${2:${1}\\right})"
-    },
     "left[": {
       "snippet": "left[${1}\\right]"
     },
diff --git a/dev/packages/platex.json b/dev/packages/platex.json
deleted file mode 100644
index 308c72609..000000000
--- a/dev/packages/platex.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "includes": {
-    "ptex": [],
-    "latex-document": [],
-    "latex-dev": []
-  },
-  "macros": {
-    "pfmtname": {},
-    "pfmtversion": {},
-    "plIncludeInRelease{}{}{}": {
-      "snippet": "plIncludeInRelease{${1:date}}{${2:command}}{${3:description}}"
-    },
-    "plEndIncludeInRelease": {},
-    "Cht": {},
-    "cht": {},
-    "Cdp": {},
-    "cdp": {},
-    "Cwd": {},
-    "cwd": {},
-    "Cvs": {},
-    "cvs": {},
-    "Chs": {},
-    "chs": {},
-    "cHT": {},
-    "afont": {},
-    "tstrutbox": {},
-    "zstrutbox": {},
-    "ystrutbox": {},
-    "tstrut": {},
-    "zstrut": {},
-    "ystrut": {},
-    "DeclareYokoKanjiEncoding{}{}{}": {
-      "snippet": "DeclareYokoKanjiEncoding{${1:encoding}}{${2:text-settings}}{${3:math-settings}}"
-    },
-    "DeclareTateKanjiEncoding{}{}{}": {
-      "snippet": "DeclareTateKanjiEncoding{${1:encoding}}{${2:text-settings}}{${3:math-settings}}"
-    },
-    "DeclareKanjiEncodingDefaults{}{}": {
-      "snippet": "DeclareKanjiEncodingDefaults{${1:text-settings}}{${2:math-settings}}"
-    },
-    "KanjiEncodingPair{}{}": {
-      "snippet": "KanjiEncodingPair{${1:encoding1}}{${2:encoding2}}"
-    },
-    "DeclareKanjiFamily{}{}{}": {
-      "snippet": "DeclareKanjiFamily{${1:encoding}}{${2:family}}{${3:loading-settings}}"
-    },
-    "DeclareKanjiSubstitution{}{}{}{}": {
-      "snippet": "DeclareKanjiSubstitution{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
-    },
-    "DeclareErrorKanjiFont{}{}{}{}{}": {
-      "snippet": "DeclareErrorKanjiFont{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}{${5:size}}"
-    },
-    "reDeclareMathAlphabet{}{}{}": {
-      "snippet": "reDeclareMathAlphabet{${1:math-alph}}{${2:latin-math-alph}}{${3:japanese-math-alph}}"
-    },
-    "DeclareRelationFont{}{}{}{}{}{}{}{}": {
-      "snippet": "DeclareRelationFont{${1:enc1}}{${2:fam1}}{${3:series1}}{${4:shape1}}{${5:enc2}}{${6:fam2}}{${7:series2}}{${8:shape2}}"
-    },
-    "SetRelationFont{}{}{}{}{}{}{}{}": {
-      "snippet": "SetRelationFont{${1:enc1}}{${2:fam1}}{${3:series1}}{${4:shape1}}{${5:enc2}}{${6:fam2}}{${7:series2}}{${8:shape2}}"
-    },
-    "userelfont": {},
-    "adjustbaseline": {},
-    "romanencoding{}": {
-      "snippet": "romanencoding{${1:encoding}}"
-    },
-    "kanjiencoding{}": {
-      "snippet": "kanjiencoding{${1:encoding}}"
-    },
-    "romanfamily{}": {
-      "snippet": "romanfamily{${1:family}}"
-    },
-    "kanjifamily{}": {
-      "snippet": "kanjifamily{${1:family}}"
-    },
-    "romanseries{}": {
-      "snippet": "romanseries{${1:series}}"
-    },
-    "kanjiseries{}": {
-      "snippet": "kanjiseries{${1:series}}"
-    },
-    "romanseriesforce{}": {
-      "snippet": "romanseriesforce{${1:series}}"
-    },
-    "kanjiseriesforce{}": {
-      "snippet": "kanjiseriesforce{${1:series}}"
-    },
-    "romanshape{}": {
-      "snippet": "romanshape{${1:shape}}"
-    },
-    "kanjishape{}": {
-      "snippet": "kanjishape{${1:shape}}"
-    },
-    "romanshapeforce{}": {
-      "snippet": "romanshapeforce{${1:shape}}"
-    },
-    "kanjishapeforce{}": {
-      "snippet": "kanjishapeforce{${1:shape}}"
-    },
-    "usekanji{}{}{}{}": {
-      "snippet": "usekanji{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
-    },
-    "useroman{}{}{}{}": {
-      "snippet": "useroman{${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}"
-    },
-    "kanjiseriesdefault": {},
-    "mcfamily": {},
-    "gtfamily": {},
-    "mathmc{}": {
-      "snippet": "mathmc{${1:text}}"
-    },
-    "mathgt{}": {
-      "snippet": "mathgt{${1:text}}"
-    },
-    "textmc{}": {
-      "snippet": "textmc{${1:text}}"
-    },
-    "textgt{}": {
-      "snippet": "textgt{${1:text}}"
-    },
-    "fixcompositeaccent": {},
-    "nofixcompositeaccent": {},
-    "<": {
-      "detail": "<",
-      "documentation": "LESS-THAN SIGN r:"
-    },
-    "removejfmglue": {},
-    "iftombow": {},
-    "tombowfalse": {},
-    "tombowtrue": {},
-    "iftombowdate": {},
-    "tombowdatetrue": {},
-    "tombowdatefalse": {},
-    "maketombowbox": {},
-    "printglossary": {},
-    "hour": {},
-    "minute": {},
-    "DeclareKanjiEncoding{}{}{}": {
-      "snippet": "DeclareKanjiEncoding{${1:encoding}}{${2:text-settings}}{${3:math-settings}}"
-    },
-    "mcdefault": {},
-    "gtdefault": {},
-    "kanjiencodingdefault": {},
-    "kanjifamilydefault": {},
-    "kanjishapedefault": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/plext.json b/dev/packages/plext.json
index d87a04550..bd354ec98 100644
--- a/dev/packages/plext.json
+++ b/dev/packages/plext.json
@@ -16,18 +16,6 @@
     "layoutfloat[]{}": {
       "snippet": "layoutfloat[${2:pos}]{${1:content}}"
     },
-    "layoutfloat(){}": {
-      "snippet": "layoutfloat(${2:width},${3:height}){${1:content}}"
-    },
-    "layoutfloat()[]{}": {
-      "snippet": "layoutfloat(${3:width},${4:height})[${2:pos}]{${1:content}}"
-    },
-    "DeclareLayoutCaption{}<>()[]": {
-      "snippet": "DeclareLayoutCaption{${1:type}}<${3:dir}>(${4:width})[${2:⟨pos1⟩⟨pos2⟩}]"
-    },
-    "layoutcaption<>()[]": {
-      "snippet": "layoutcaption<${2:dir}>(${3:width})[${1:pos}]"
-    },
     "pcaption{}": {
       "snippet": "pcaption{${1:text}}"
     },
diff --git a/dev/packages/pm-isomath.json b/dev/packages/pm-isomath.json
index bde543e16..87683ebff 100644
--- a/dev/packages/pm-isomath.json
+++ b/dev/packages/pm-isomath.json
@@ -15,9 +15,6 @@
     "MathLatin{}{}[]": {
       "snippet": "MathLatin{${1:letter}}{${2:family}}[${3:series}]"
     },
-    "MathLatin{}{}[]()": {
-      "snippet": "MathLatin{${1:letter}}{${2:family}}[${3:series}](${4:shape})"
-    },
     "MathGreek{}": {
       "snippet": "MathGreek{${1:letter}}"
     },
@@ -27,275 +24,158 @@
     "MathGreek{}{}[]": {
       "snippet": "MathGreek{${1:letter}}{${2:family}}[${3:series}]"
     },
-    "MathGreek{}{}[]()": {
-      "snippet": "MathGreek{${1:letter}}{${2:family}}[${3:series}](${4:shape})"
-    },
     "ISOalpha": {},
     "ISOalpha{}": {
       "snippet": "ISOalpha{${1:family}}"
     },
-    "ISOalpha{}[]()": {
-      "snippet": "ISOalpha{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISObeta": {},
     "ISObeta{}": {
       "snippet": "ISObeta{${1:family}}"
     },
-    "ISObeta{}[]()": {
-      "snippet": "ISObeta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOgamma": {},
     "ISOgamma{}": {
       "snippet": "ISOgamma{${1:family}}"
     },
-    "ISOgamma{}[]()": {
-      "snippet": "ISOgamma{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOdelta": {},
     "ISOdelta{}": {
       "snippet": "ISOdelta{${1:family}}"
     },
-    "ISOdelta{}[]()": {
-      "snippet": "ISOdelta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOepsilon": {},
     "ISOepsilon{}": {
       "snippet": "ISOepsilon{${1:family}}"
     },
-    "ISOepsilon{}[]()": {
-      "snippet": "ISOepsilon{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOzeta": {},
     "ISOzeta{}": {
       "snippet": "ISOzeta{${1:family}}"
     },
-    "ISOzeta{}[]()": {
-      "snippet": "ISOzeta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOeta": {},
     "ISOeta{}": {
       "snippet": "ISOeta{${1:family}}"
     },
-    "ISOeta{}[]()": {
-      "snippet": "ISOeta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOtheta": {},
     "ISOtheta{}": {
       "snippet": "ISOtheta{${1:family}}"
     },
-    "ISOtheta{}[]()": {
-      "snippet": "ISOtheta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOiota": {},
     "ISOiota{}": {
       "snippet": "ISOiota{${1:family}}"
     },
-    "ISOiota{}[]()": {
-      "snippet": "ISOiota{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOkappa": {},
     "ISOkappa{}": {
       "snippet": "ISOkappa{${1:family}}"
     },
-    "ISOkappa{}[]()": {
-      "snippet": "ISOkappa{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOlambda": {},
     "ISOlambda{}": {
       "snippet": "ISOlambda{${1:family}}"
     },
-    "ISOlambda{}[]()": {
-      "snippet": "ISOlambda{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOmu": {},
     "ISOmu{}": {
       "snippet": "ISOmu{${1:family}}"
     },
-    "ISOmu{}[]()": {
-      "snippet": "ISOmu{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOnu": {},
     "ISOnu{}": {
       "snippet": "ISOnu{${1:family}}"
     },
-    "ISOnu{}[]()": {
-      "snippet": "ISOnu{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOxi": {},
     "ISOxi{}": {
       "snippet": "ISOxi{${1:family}}"
     },
-    "ISOxi{}[]()": {
-      "snippet": "ISOxi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOomicron": {},
     "ISOomicron{}": {
       "snippet": "ISOomicron{${1:family}}"
     },
-    "ISOomicron{}[]()": {
-      "snippet": "ISOomicron{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOpi": {},
     "ISOpi{}": {
       "snippet": "ISOpi{${1:family}}"
     },
-    "ISOpi{}[]()": {
-      "snippet": "ISOpi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOrho": {},
     "ISOrho{}": {
       "snippet": "ISOrho{${1:family}}"
     },
-    "ISOrho{}[]()": {
-      "snippet": "ISOrho{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOsigma": {},
     "ISOsigma{}": {
       "snippet": "ISOsigma{${1:family}}"
     },
-    "ISOsigma{}[]()": {
-      "snippet": "ISOsigma{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOtau": {},
     "ISOtau{}": {
       "snippet": "ISOtau{${1:family}}"
     },
-    "ISOtau{}[]()": {
-      "snippet": "ISOtau{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOupsilon": {},
     "ISOupsilon{}": {
       "snippet": "ISOupsilon{${1:family}}"
     },
-    "ISOupsilon{}[]()": {
-      "snippet": "ISOupsilon{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOphi": {},
     "ISOphi{}": {
       "snippet": "ISOphi{${1:family}}"
     },
-    "ISOphi{}[]()": {
-      "snippet": "ISOphi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOchi": {},
     "ISOchi{}": {
       "snippet": "ISOchi{${1:family}}"
     },
-    "ISOchi{}[]()": {
-      "snippet": "ISOchi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOpsi": {},
     "ISOpsi{}": {
       "snippet": "ISOpsi{${1:family}}"
     },
-    "ISOpsi{}[]()": {
-      "snippet": "ISOpsi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOomega": {},
     "ISOomega{}": {
       "snippet": "ISOomega{${1:family}}"
     },
-    "ISOomega{}[]()": {
-      "snippet": "ISOomega{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOGamma": {},
     "ISOGamma{}": {
       "snippet": "ISOGamma{${1:family}}"
     },
-    "ISOGamma{}[]()": {
-      "snippet": "ISOGamma{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISODelta": {},
     "ISODelta{}": {
       "snippet": "ISODelta{${1:family}}"
     },
-    "ISODelta{}[]()": {
-      "snippet": "ISODelta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOEta": {},
     "ISOEta{}": {
       "snippet": "ISOEta{${1:family}}"
     },
-    "ISOEta{}[]()": {
-      "snippet": "ISOEta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOTheta": {},
     "ISOTheta{}": {
       "snippet": "ISOTheta{${1:family}}"
     },
-    "ISOTheta{}[]()": {
-      "snippet": "ISOTheta{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOLambda": {},
     "ISOLambda{}": {
       "snippet": "ISOLambda{${1:family}}"
     },
-    "ISOLambda{}[]()": {
-      "snippet": "ISOLambda{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOXi": {},
     "ISOXi{}": {
       "snippet": "ISOXi{${1:family}}"
     },
-    "ISOXi{}[]()": {
-      "snippet": "ISOXi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOPi": {},
     "ISOPi{}": {
       "snippet": "ISOPi{${1:family}}"
     },
-    "ISOPi{}[]()": {
-      "snippet": "ISOPi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISORho": {},
     "ISORho{}": {
       "snippet": "ISORho{${1:family}}"
     },
-    "ISORho{}[]()": {
-      "snippet": "ISORho{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOSigma": {},
     "ISOSigma{}": {
       "snippet": "ISOSigma{${1:family}}"
     },
-    "ISOSigma{}[]()": {
-      "snippet": "ISOSigma{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOUpsilon": {},
     "ISOUpsilon{}": {
       "snippet": "ISOUpsilon{${1:family}}"
     },
-    "ISOUpsilon{}[]()": {
-      "snippet": "ISOUpsilon{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOPhi": {},
     "ISOPhi{}": {
       "snippet": "ISOPhi{${1:family}}"
     },
-    "ISOPhi{}[]()": {
-      "snippet": "ISOPhi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOChi": {},
     "ISOChi{}": {
       "snippet": "ISOChi{${1:family}}"
     },
-    "ISOChi{}[]()": {
-      "snippet": "ISOChi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOPsi": {},
     "ISOPsi{}": {
       "snippet": "ISOPsi{${1:family}}"
     },
-    "ISOPsi{}[]()": {
-      "snippet": "ISOPsi{${1:family}}[${2:series}](${3:shape})"
-    },
     "ISOOmega": {},
     "ISOOmega{}": {
       "snippet": "ISOOmega{${1:family}}"
     },
-    "ISOOmega{}[]()": {
-      "snippet": "ISOOmega{${1:family}}[${2:series}](${3:shape})"
-    },
     "vectorsymbol{}": {
       "snippet": "vectorsymbol{${1:arg}}"
     },
diff --git a/dev/packages/pmdraw.json b/dev/packages/pmdraw.json
index c5b2c0045..dd6798c6b 100644
--- a/dev/packages/pmdraw.json
+++ b/dev/packages/pmdraw.json
@@ -42,24 +42,6 @@
       "blank bottom=${1:integer}",
       "row sep=${1:integer}",
       "vertices={${1:\\draw options}}",
-      "no vertex bottom 1=${1:integer}",
-      "no vertex bottom 2=${1:integer}",
-      "no vertex bottom 3=${1:integer}",
-      "no vertex bottom 4=${1:integer}",
-      "no vertex bottom 5=${1:integer}",
-      "no vertex bottom 6=${1:integer}",
-      "no vertex bottom 7=${1:integer}",
-      "no vertex bottom 8=${1:integer}",
-      "no vertex bottom 9=${1:integer}",
-      "no vertex top 1=${1:integer}",
-      "no vertex top 2=${1:integer}",
-      "no vertex top 3=${1:integer}",
-      "no vertex top 4=${1:integer}",
-      "no vertex top 5=${1:integer}",
-      "no vertex top 6=${1:integer}",
-      "no vertex top 7=${1:integer}",
-      "no vertex top 8=${1:integer}",
-      "no vertex top 9=${1:integer}",
       "vertices options={${1:code}}",
       "labels",
       "labels top",
@@ -67,24 +49,6 @@
       "labels start=${1:integer}",
       "labels top start=${1:integer}",
       "labels bottom start=${1:integer}",
-      "no label bottom 1=${1:integer}",
-      "no label bottom 2=${1:integer}",
-      "no label bottom 3=${1:integer}",
-      "no label bottom 4=${1:integer}",
-      "no label bottom 5=${1:integer}",
-      "no label bottom 6=${1:integer}",
-      "no label bottom 7=${1:integer}",
-      "no label bottom 8=${1:integer}",
-      "no label bottom 9=${1:integer}",
-      "no label top 1=${1:integer}",
-      "no label top 2=${1:integer}",
-      "no label top 3=${1:integer}",
-      "no label top 4=${1:integer}",
-      "no label top 5=${1:integer}",
-      "no label top 6=${1:integer}",
-      "no label top 7=${1:integer}",
-      "no label top 8=${1:integer}",
-      "no label top 9=${1:integer}",
       "labels top draw={${1:\\draw options}}",
       "labels top node={${1:\\node options}}",
       "labels bottom draw={${1:\\draw options}}",
@@ -94,10 +58,6 @@
       "no dots",
       "dots draw={${1:\\draw options}}",
       "dots node={${1:\\node options}}",
-      "vertices top phantom",
-      "vertices bottom phantom",
-      "vertices top uncover={${1:overlay spec}}",
-      "vertices bottom uncover={${1:overlay spec}}",
       "levels=${1:integer}",
       "levels top=${1:integer}",
       "levels bottom=${1:integer}",
@@ -111,8 +71,6 @@
       "edges transversal={${1:\\draw options}}",
       "edges first",
       "transversals first",
-      "edges phantom",
-      "edges uncover={${1:overlay spec}}",
       "brace={${1:options}}",
       "brace draw={${1:\\draw options}}",
       "brace node={${1:\\node options}}",
@@ -136,9 +94,7 @@
       "decorate after={${1:code}}",
       "diagram sep=${1:number}",
       "vertex sep=${1:number}",
-      "edges added={${1:\\draw options}}",
-      "edges added phantom",
-      "edges added uncover={${1:overlay spec}}"
+      "edges added={${1:\\draw options}}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pmhanguljamo-frkim.json b/dev/packages/pmhanguljamo-frkim.json
index 9381b1843..4539f7d1c 100644
--- a/dev/packages/pmhanguljamo-frkim.json
+++ b/dev/packages/pmhanguljamo-frkim.json
@@ -38,12 +38,6 @@
     "jamoul{}{}": {
       "snippet": "jamoul{${1:ulem csname}}{${2:jamo text}}"
     },
-    "RenewVowels{}": {
-      "snippet": "RenewVowels{${1:vowels}}"
-    },
-    "RenewLeadingZero{}": {
-      "snippet": "RenewLeadingZero{${1:arg}}"
-    },
     "frccg": {},
     "frccG": {},
     "frccn": {},
diff --git a/dev/packages/pmhanguljamo.json b/dev/packages/pmhanguljamo.json
index 9aeb46d57..c8858ef82 100644
--- a/dev/packages/pmhanguljamo.json
+++ b/dev/packages/pmhanguljamo.json
@@ -73,15 +73,7 @@
     },
     "AddRule{}{}": {
       "snippet": "AddRule{${1:cho|jung|jong}}{${2:keyvals}}",
-      "option": "frkim"
-    },
-    "RenewVowels{}": {
-      "snippet": "RenewVowels{${1:vowels}}",
-      "option": "frkim"
-    },
-    "RenewLeadingZero{}": {
-      "snippet": "RenewLeadingZero{${1:arg}}",
-      "option": "frkim"
+      "option": "method=frkim"
     },
     "frccg": {
       "option": "frcccmds"
diff --git a/dev/packages/polyglossia.json b/dev/packages/polyglossia.json
index d24c1fcda..b51ef5473 100644
--- a/dev/packages/polyglossia.json
+++ b/dev/packages/polyglossia.json
@@ -1,6 +1,7 @@
 {
   "includes": {
     "etoolbox": [],
+    "xkeyval": [],
     "fontspec": [],
     "iftex": [],
     "bidi": [],
@@ -36,7 +37,7 @@
       "snippet": "setotherlanguage[${2:options}]{${1:language}}"
     },
     "setotherlanguages{}": {
-      "snippet": "setotherlanguages{${1:lang1,${2:lang2},...}}"
+      "snippet": "setotherlanguages{${1:lang1,lang2,...}}"
     },
     "inheritbabelshorthands{}{}": {
       "snippet": "inheritbabelshorthands{${1:source language}}{${2:target language}}"
@@ -1082,64 +1083,6 @@
     "ifxpginauxfile": {},
     "xpginauxfilefalse": {},
     "xpginauxfiletrue": {},
-    "XPGNoPatternsFallback{}": {
-      "snippet": "XPGNoPatternsFallback{${1:arg}}"
-    },
-    "XPGNoPatternsFallback[]{}": {
-      "snippet": "XPGNoPatternsFallback[${2:opt}]{${1:arg}}"
-    },
-    "PolyglossiaSetup{}{}": {
-      "snippet": "PolyglossiaSetup{${1:arg1}}{${2:arg2}}"
-    },
-    "CheckHyphenationPatterns{}": {
-      "snippet": "CheckHyphenationPatterns{${1:arg}}"
-    },
-    "SetupPolyglossiaLangPatterns{}": {
-      "snippet": "SetupPolyglossiaLangPatterns{${1:arg}}"
-    },
-    "SetupLatinPolyglossiaFont{}": {
-      "snippet": "SetupLatinPolyglossiaFont{${1:arg}}"
-    },
-    "SetupNonLatinPolyglossiaFont{}": {
-      "snippet": "SetupNonLatinPolyglossiaFont{${1:arg}}"
-    },
-    "InheritGlossFile{}": {
-      "snippet": "InheritGlossFile{${1:arg}}"
-    },
-    "SetGlossOptions{}{}": {
-      "snippet": "SetGlossOptions{${1:arg1}}{${2:arg2}}"
-    },
-    "InitializeGlossOptions{}{}": {
-      "snippet": "InitializeGlossOptions{${1:arg1}}{${2:arg2}}"
-    },
-    "SetLanguageAliasValues{}{}{}": {
-      "snippet": "SetLanguageAliasValues{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "IfMainLanguageTF{}{}{}": {
-      "snippet": "IfMainLanguageTF{${1:arg}}{${2:true}}{${3:false}}"
-    },
-    "IfMainLanguageT{}{}": {
-      "snippet": "IfMainLanguageT{${1:arg}}{${2:true}}"
-    },
-    "IfMainLanguageF{}{}": {
-      "snippet": "IfMainLanguageF{${1:arg}}{${2:false}}"
-    },
-    "IfLanguageDefinedTF{}{}{}": {
-      "snippet": "IfLanguageDefinedTF{${1:arg}}{${2:true}}{${3:false}}"
-    },
-    "IfLanguageDefinedT{}{}": {
-      "snippet": "IfLanguageDefinedT{${1:arg}}{${2:true}}"
-    },
-    "IfLanguageDefinedF{}{}": {
-      "snippet": "IfLanguageDefinedF{${1:arg}}{${2:false}}"
-    },
-    "TryPatternWithFallback{}{}": {
-      "snippet": "TryPatternWithFallback{${1:arg1}}{${2:arg2}}"
-    },
-    "setlocalhyphenmins{}{}{}": {
-      "snippet": "setlocalhyphenmins{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "InitializeBabelShorthands": {},
     "prefacename": {},
     "bibname": {},
     "chaptername": {},
diff --git a/dev/packages/polyhedra.json b/dev/packages/polyhedra.json
index 6afdb01c0..b6b4327d3 100644
--- a/dev/packages/polyhedra.json
+++ b/dev/packages/polyhedra.json
@@ -10,7 +10,7 @@
   },
   "macros": {
     "point{}{}": {
-      "snippet": "point{${1:(${3:x},${4:y},${5:z})}}{${2:name}}"
+      "snippet": "point{${1:(${3:x,y,z})}}{${2:name}}"
     },
     "axes{}": {
       "snippet": "axes{${1:keyvals}}",
diff --git a/dev/packages/polynomial.json b/dev/packages/polynomial.json
index 8ecc57ae2..4fe24e280 100644
--- a/dev/packages/polynomial.json
+++ b/dev/packages/polynomial.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "polynomial{}": {
-      "snippet": "polynomial{${1:coeff1,${2:coeff2},...}}"
+      "snippet": "polynomial{${1:coeff1,coeff2,...}}"
     },
     "polynomial[]{}": {
-      "snippet": "polynomial[${2:options}]{${1:coeff1,${3:coeff2},...}}",
+      "snippet": "polynomial[${2:options}]{${1:coeff1,coeff2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
diff --git a/dev/packages/popupmenu.json b/dev/packages/popupmenu.json
index b80b259f5..77e136195 100644
--- a/dev/packages/popupmenu.json
+++ b/dev/packages/popupmenu.json
@@ -12,12 +12,6 @@
     "puUseMenus{}": {
       "snippet": "puUseMenus{${1:menu array names}}"
     },
-    "popUpMenu()": {
-      "snippet": "popUpMenu(${1:name})"
-    },
-    "puProcessMenu()": {
-      "snippet": "puProcessMenu(${1:name})"
-    },
     "urlPath{}{}": {
       "snippet": "urlPath{${1:cmd}}{${2:path}}"
     },
diff --git a/dev/packages/poster.json b/dev/packages/poster.json
deleted file mode 100644
index 9ba0a2601..000000000
--- a/dev/packages/poster.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "poster{}": {
-      "snippet": "poster{${1:stuff}}"
-    },
-    "poster[]{}": {
-      "snippet": "poster[${2:options}]{${1:stuff}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "PosterPage": {},
-    "PosterPage[]": {
-      "snippet": "PosterPage[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "POSTERclip": {},
-    "POSTERcrop": {},
-    "POSTERhcenter": {},
-    "POSTERimageheight": {},
-    "POSTERimagewidth": {},
-    "POSTERlandscape": {},
-    "POSTERpaperheight": {},
-    "POSTERpaperwidth": {},
-    "POSTERvcenter": {},
-    "filedate": {},
-    "fileversion": {},
-    "Poster": {},
-    "endPoster": {},
-    "PosterLoaded": {},
-    "TheAtCode": {}
-  },
-  "envs": {
-    "Poster": {},
-    "Poster[]": {
-      "name": "Poster",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "paperwidth=",
-      "paperheight=",
-      "imagewidth=",
-      "imageheight=",
-      "landscape",
-      "hcenter",
-      "vcenter",
-      "crop=",
-      "clip="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/printlen.json b/dev/packages/printlen.json
deleted file mode 100644
index 250ef81a0..000000000
--- a/dev/packages/printlen.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "printlength{}": {
-      "snippet": "printlength{${1:length}}"
-    },
-    "uselengthunit{}": {
-      "snippet": "uselengthunit{${1:unit}}"
-    },
-    "unitspace": {},
-    "rndprintlength{}": {
-      "snippet": "rndprintlength{${1:length}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/probsoln.json b/dev/packages/probsoln.json
index 0eed2e27e..b42d4d40e 100644
--- a/dev/packages/probsoln.json
+++ b/dev/packages/probsoln.json
@@ -61,16 +61,16 @@
       "snippet": "loadallproblems{${1:file}}"
     },
     "loadexceptproblems[]{}{}": {
-      "snippet": "loadexceptproblems[${3:data set}]{${1:label1,${4:label2},...}}{${2:file}}"
+      "snippet": "loadexceptproblems[${3:data set}]{${1:label1,label2,...}}{${2:file}}"
     },
     "loadexceptproblems{}{}": {
-      "snippet": "loadexceptproblems{${1:label1,${3:label2},...}}{${2:file}}"
+      "snippet": "loadexceptproblems{${1:label1,label2,...}}{${2:file}}"
     },
     "loadrandomexcept[]{}{}{}": {
-      "snippet": "loadrandomexcept[${4:data set}]{${1:n}}{${2:file}}{${3:label1,${5:label2},...}}"
+      "snippet": "loadrandomexcept[${4:data set}]{${1:n}}{${2:file}}{${3:label1,label2,...}}"
     },
     "loadrandomexcept{}{}{}": {
-      "snippet": "loadrandomexcept{${1:n}}{${2:file}}{${3:label1,${4:label2},...}}"
+      "snippet": "loadrandomexcept{${1:n}}{${2:file}}{${3:label1,label2,...}}"
     },
     "loadrandomproblems[]{}{}": {
       "snippet": "loadrandomproblems[${3:data set}]{${1:n}}{${2:file}}"
@@ -79,10 +79,10 @@
       "snippet": "loadrandomproblems{${1:n}}{${2:file}}"
     },
     "loadselectedproblems[]{}{}": {
-      "snippet": "loadselectedproblems[${3:data set}]{${1:label1,${4:label2},...}}{${2:file}}"
+      "snippet": "loadselectedproblems[${3:data set}]{${1:label1,label2,...}}{${2:file}}"
     },
     "loadselectedproblems{}{}": {
-      "snippet": "loadselectedproblems{${1:label1,${3:label2},...}}{${2:file}}"
+      "snippet": "loadselectedproblems{${1:label1,label2,...}}{${2:file}}"
     },
     "moveproblem{}{}{}": {
       "snippet": "moveproblem{${1:label}}{${2:source}}{${3:target}}"
diff --git a/dev/packages/projlib-language.json b/dev/packages/projlib-language.json
index 12fb2a2cb..ecf0c9852 100644
--- a/dev/packages/projlib-language.json
+++ b/dev/packages/projlib-language.json
@@ -133,7 +133,6 @@
     "fg": {},
     "fgi": {},
     "fgii": {},
-    "fprimo)": {},
     "frenchdate{}{}{}": {
       "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}"
     },
diff --git a/dev/packages/proof.json b/dev/packages/proof.json
deleted file mode 100644
index 48afa3e46..000000000
--- a/dev/packages/proof.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "deduce{}{}": {
-      "snippet": "deduce{${1:conclusions}}{${2:premises}}"
-    },
-    "deduce[]{}{}": {
-      "snippet": "deduce[${3:label}]{${1:conclusions}}{${2:premises}}"
-    },
-    "infer{}{}": {
-      "snippet": "infer{${1:conclusions}}{${2:premises}}"
-    },
-    "infer[]{}{}": {
-      "snippet": "infer[${3:label}]{${1:conclusions}}{${2:premises}}"
-    },
-    "infer*{}{}": {
-      "snippet": "infer*{${1:conclusions}}{${2:premises}}"
-    },
-    "infer*[]{}{}": {
-      "snippet": "infer*[${3:label}]{${1:conclusions}}{${2:premises}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/pseudo.json b/dev/packages/pseudo.json
index bb5921dac..6cdcbd737 100644
--- a/dev/packages/pseudo.json
+++ b/dev/packages/pseudo.json
@@ -31,13 +31,7 @@
     "fn{}": {
       "snippet": "fn{${1:name}}"
     },
-    "fn{}()": {
-      "snippet": "fn{${1:name}}(${2:arguments})"
-    },
     "fnfont": {},
-    "hd{}()": {
-      "snippet": "hd{${1:name}}(${2:arguments})"
-    },
     "id{}": {
       "snippet": "id{${1:name}}"
     },
@@ -49,9 +43,6 @@
     "pr{}": {
       "snippet": "pr{${1:name}}"
     },
-    "pr{}()": {
-      "snippet": "pr{${1:name}}(${2:arguments})"
-    },
     "prfont": {},
     "pseudocn{}": {
       "snippet": "pseudocn{${1:name}}"
@@ -62,12 +53,6 @@
     "pseudofn{}": {
       "snippet": "pseudofn{${1:name}}"
     },
-    "pseudofn{}()": {
-      "snippet": "pseudofn{${1:name}}(${2:arguments})"
-    },
-    "pseudohd{}()": {
-      "snippet": "pseudohd{${1:name}}(${2:arguments})"
-    },
     "pseudoid{}": {
       "snippet": "pseudoid{${1:name}}"
     },
@@ -77,9 +62,6 @@
     "pseudopr{}": {
       "snippet": "pseudopr{${1:name}}"
     },
-    "pseudopr{}()": {
-      "snippet": "pseudopr{${1:name}}(${2:arguments})"
-    },
     "pseudost{}": {
       "snippet": "pseudost{${1:string}}"
     },
diff --git a/dev/packages/pseudocode.json b/dev/packages/pseudocode.json
deleted file mode 100644
index 1d2cadd78..000000000
--- a/dev/packages/pseudocode.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "includes": {
-    "fancybox": [],
-    "ifthen": []
-  },
-  "macros": {
-    "ADO": {},
-    "AND": {},
-    "BEGIN": {},
-    "BREAK": {},
-    "CALL{}{}": {
-      "snippet": "CALL{${1:procedure}}{${2:parameters}}"
-    },
-    "CASE": {},
-    "CELSE": {},
-    "COMMENT{}": {
-      "snippet": "COMMENT{${1:text}}"
-    },
-    "CTHEN": {},
-    "DO": {},
-    "DOWNTO": {},
-    "ELSE": {},
-    "ELSEIF": {},
-    "END": {},
-    "ENDCASE": {},
-    "ENDMAIN": {},
-    "ENDPROCEDURE": {},
-    "EXIT": {},
-    "EXTERNAL{}": {
-      "snippet": "EXTERNAL{${1:procedures}}"
-    },
-    "FAIL": {},
-    "FALSE": {},
-    "FOR": {},
-    "FORALL": {},
-    "FOREACH": {},
-    "GETS": {},
-    "GLOBAL{}": {
-      "snippet": "GLOBAL{${1:variables}}"
-    },
-    "GOTO": {},
-    "IF": {},
-    "LET": {},
-    "LOCAL{}": {
-      "snippet": "LOCAL{${1:variables}}"
-    },
-    "MAIN": {},
-    "NOT": {},
-    "OF": {},
-    "OR": {},
-    "OUTPUT{}": {
-      "snippet": "OUTPUT{${1:values}}"
-    },
-    "PROCEDURE{}{}": {
-      "snippet": "PROCEDURE{${1:name}}{${2:parameters}}"
-    },
-    "REPEAT": {},
-    "RETURN{}": {
-      "snippet": "RETURN{${1:values}}"
-    },
-    "STMTNUM{}{}": {
-      "snippet": "STMTNUM{${1:space}}{${2:label}}"
-    },
-    "SUCCESS": {},
-    "THEN": {},
-    "thepseudocode": {},
-    "thepseudonum": {},
-    "TO": {},
-    "TRUE": {},
-    "UNTIL": {},
-    "WHILE": {}
-  },
-  "envs": {
-    "pseudocode{}{}": {
-      "name": "pseudocode",
-      "snippet": "{${1:name}}{${2:parameters}}"
-    },
-    "pseudocode[]{}{}": {
-      "name": "pseudocode",
-      "snippet": "[${3:frame type}]{${1:name}}{${2:parameters}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/psfragx.json b/dev/packages/psfragx.json
index 63223b9ab..b18919a49 100644
--- a/dev/packages/psfragx.json
+++ b/dev/packages/psfragx.json
@@ -13,21 +13,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "includegraphicx[](){}": {
-      "snippet": "includegraphicx[${2:options}](${3:psfrags}){${1:imagefile}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "includegraphicx[]()<>{}": {
-      "snippet": "includegraphicx[${2:options}](${4:psfrags})<${3:fg overpic}>{${1:imagefile}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "includegraphicx[]()<>[]{}": {
-      "snippet": "includegraphicx[${2:options}](${5:psfrags})<${4:fg overpic}>[${3:bg overpic}]{${1:imagefile}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "iflanguage{}{}{}": {
       "snippet": "iflanguage{${1:language}}{${2:true}}{${3:false}}"
     },
diff --git a/dev/packages/psgo.json b/dev/packages/psgo.json
index d23ef4c79..212475e02 100644
--- a/dev/packages/psgo.json
+++ b/dev/packages/psgo.json
@@ -140,19 +140,19 @@
     },
     "psgopartialboard{}": {
       "name": "psgopartialboard",
-      "snippet": "{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})}}"
+      "snippet": "{${1:(${2:x1,y1})(${3:x2,y2})}}"
     },
     "psgopartialboard[]{}": {
       "name": "psgopartialboard",
-      "snippet": "[${2:size}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})}}"
+      "snippet": "[${2:size}]{${1:(${3:x1,y1})(${4:x2,y2})}}"
     },
     "psgopartialboard*{}": {
       "name": "psgopartialboard*",
-      "snippet": "{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})}}"
+      "snippet": "{${1:(${2:x1,y1})(${3:x2,y2})}}"
     },
     "psgopartialboard*[]{}": {
       "name": "psgopartialboard*",
-      "snippet": "[${2:size}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})}}"
+      "snippet": "[${2:size}]{${1:(${3:x1,y1})(${4:x2,y2})}}"
     },
     "gomoves": {}
   },
diff --git a/dev/packages/pst-2dplot.json b/dev/packages/pst-2dplot.json
index 9485e2f29..848d91f0c 100644
--- a/dev/packages/pst-2dplot.json
+++ b/dev/packages/pst-2dplot.json
@@ -21,18 +21,7 @@
       "snippet": "pstfileplot[${2:pstricks options}]{${1:file}}"
     }
   },
-  "envs": {
-    "pstgraph(x0,y0)": {
-      "name": "pstgraph",
-      "snippet": "(${1:x0},${2:y0})"
-    },
-    "pstgraph[](x0,y0)": {
-      "name": "pstgraph",
-      "snippet": "[${1:options}](${2:x0},${3:y0})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
+  "envs": {},
   "options": [],
   "keyvals": [
     [
diff --git a/dev/packages/pst-3d.json b/dev/packages/pst-3d.json
index 7d72b7c56..3e4399531 100644
--- a/dev/packages/pst-3d.json
+++ b/dev/packages/pst-3d.json
@@ -31,13 +31,7 @@
     "psTilt{}{}": {
       "snippet": "psTilt{${1:angle}}{${2:stuff}}"
     },
-    "PSTthreeDLoaded": {},
-    "ThreeDput(){}": {
-      "snippet": "ThreeDput(${2:x},${3:y},${4:z}){${1:stuff}}"
-    },
-    "ThreeDput[](){}": {
-      "snippet": "ThreeDput[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
-    }
+    "PSTthreeDLoaded": {}
   },
   "envs": {},
   "options": [],
diff --git a/dev/packages/pst-3dplot.json b/dev/packages/pst-3dplot.json
index fba04e84d..cab2c9838 100644
--- a/dev/packages/pst-3dplot.json
+++ b/dev/packages/pst-3dplot.json
@@ -17,119 +17,12 @@
     "psxyzlabel{}": {
       "snippet": "psxyzlabel{${1:text}}"
     },
-    "pstThreeDPlaneGrid()()": {
-      "snippet": "pstThreeDPlaneGrid(${1:xmin},${2:ymin})(${3:xmax},${4:ymax})"
-    },
-    "pstThreeDPlaneGrid[]()()": {
-      "snippet": "pstThreeDPlaneGrid[${1:options}](${2:xmin},${3:ymin})(${4:xmax},${5:ymax})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "pstThreeDPut(){}": {
-      "snippet": "pstThreeDPut(${2:x},${3:y},${4:z}){${1:stuff}}"
-    },
-    "pstThreeDPut[](){}": {
-      "snippet": "pstThreeDPut[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
-    },
-    "pstPlanePut(){}": {
-      "snippet": "pstPlanePut(${2:x},${3:y},${4:z}){${1:stuff}}"
-    },
-    "pstPlanePut[](){}": {
-      "snippet": "pstPlanePut[${2:options}](${3:x},${4:y},${5:z}){${1:stuff}}"
-    },
-    "pstThreeDNode(){}": {
-      "snippet": "pstThreeDNode(${2:x},${3:y},${4:z}){${1:node name}}"
-    },
-    "pstThreeDDot()": {
-      "snippet": "pstThreeDDot(${1:x},${2:y},${3:z})"
-    },
-    "pstThreeDDot[]()": {
-      "snippet": "pstThreeDDot[${1:options}](${2:x},${3:y},${4:z})"
-    },
-    "pstThreeDTriangle()()()": {
-      "snippet": "pstThreeDTriangle(${1:x1},${2:y1},${3:z1})(${4:x2},${5:y2},${6:z2})(${7:x3},${8:y3},${9:z3})"
-    },
-    "pstThreeDTriangle[]()()()": {
-      "snippet": "pstThreeDTriangle[${1:options}](${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2})(${8:x3},${9:y3},${10:z3})"
-    },
-    "pstThreeDSquare()()()": {
-      "snippet": "pstThreeDSquare(${1:x0},${2:y0},${3:z0})(${4:x1},${5:y1},${6:z1})(${7:x2},${8:y2},${9:z2})"
-    },
-    "pstThreeDSquare[]()()()": {
-      "snippet": "pstThreeDSquare[${1:options}](${2:x0},${3:y0},${4:z0})(${5:x1},${6:y1},${7:z1})(${8:x2},${9:y2},${10:z2})"
-    },
-    "pstThreeDBox()()()()": {
-      "snippet": "pstThreeDBox(${1:x0},${2:y0},${3:z0})(${4:x1},${5:y1},${6:z1})(${7:x2},${8:y2},${9:z2})(${10:x3},${11:y3},${12:z3})"
-    },
-    "pstThreeDBox[]()()()()": {
-      "snippet": "pstThreeDBox[${1:options}](${2:x0},${3:y0},${4:z0})(${5:x1},${6:y1},${7:z1})(${8:x2},${9:y2},${10:z2})(${11:x3},${12:y3},${13:z3})"
-    },
-    "psBox(){}{}{}": {
-      "snippet": "psBox(${4:x},${5:y},${6:z}){${1:width}}{${2:depth}}{${3:height}}"
-    },
-    "psBox[](){}{}{}": {
-      "snippet": "psBox[${4:options}](${5:x},${6:y},${7:z}){${1:width}}{${2:depth}}{${3:height}}"
-    },
-    "pstThreeDEllipse()()()": {
-      "snippet": "pstThreeDEllipse(${1:cx},${2:cy},${3:cz})(${4:ux},${5:uy},${6:uz})(${7:vx},${8:vy},${9:vz})"
-    },
-    "pstThreeDEllipse[]()()()": {
-      "snippet": "pstThreeDEllipse[${1:options}](${2:cx},${3:cy},${4:cz})(${5:ux},${6:uy},${7:uz})(${8:vx},${9:vy},${10:vz})"
-    },
-    "pstThreeDCircle()()()": {
-      "snippet": "pstThreeDCircle(${1:cx},${2:cy},${3:cz})(${4:ux},${5:uy},${6:uz})(${7:vx},${8:vy},${9:vz})"
-    },
-    "pstThreeDCircle[]()()()": {
-      "snippet": "pstThreeDCircle[${1:options}](${2:cx},${3:cy},${4:cz})(${5:ux},${6:uy},${7:uz})(${8:vx},${9:vy},${10:vz})"
-    },
-    "pstIIIDCylinder(){}{}": {
-      "snippet": "pstIIIDCylinder(${3:x},${4:y},${5:z}){${1:radius}}{${2:height}}"
-    },
-    "pstIIIDCylinder[](){}{}": {
-      "snippet": "pstIIIDCylinder[${3:options}](${4:x},${5:y},${6:z}){${1:radius}}{${2:height}}"
-    },
-    "psCylinder(){}{}": {
-      "snippet": "psCylinder(${3:x},${4:y},${5:z}){${1:radius}}{${2:height}}"
-    },
-    "psCylinder[](){}{}": {
-      "snippet": "psCylinder[${3:options}](${4:x},${5:y},${6:z}){${1:radius}}{${2:height}}"
-    },
     "pstParaboloid{}{}": {
       "snippet": "pstParaboloid{${1:height}}{${2:radius}}"
     },
     "pstParaboloid[]{}{}": {
       "snippet": "pstParaboloid[${3:options}]{${1:height}}{${2:radius}}"
     },
-    "pstThreeDSphere(){}": {
-      "snippet": "pstThreeDSphere(${2:x},${3:y},${4:z}){${1:radius}}"
-    },
-    "pstThreeDSphere[](){}": {
-      "snippet": "pstThreeDSphere[${2:options}](${3:x},${4:y},${5:z}){${1:radius}}"
-    },
-    "psplotThreeD()(){}": {
-      "snippet": "psplotThreeD(${2:xmin},${3:xmax})(${4:ymin},${5:ymax}){${1:function}}"
-    },
-    "psplotThreeD[]()(){}": {
-      "snippet": "psplotThreeD[${2:options}](${3:xmin},${4:xmax})(${5:ymin},${6:ymax}){${1:function}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "parametricplotThreeD()(){}": {
-      "snippet": "parametricplotThreeD(${2:t1},${3:t2})(${4:u1},${5:u2}){${1:functions x y z}}"
-    },
-    "parametricplotThreeD[]()(){}": {
-      "snippet": "parametricplotThreeD[${2:options}](${3:t1},${4:t2})(${5:u1},${6:u2}){${1:functions x y z}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "parametricplotThreeD(){}": {
-      "snippet": "parametricplotThreeD(${2:t1},${3:t2}){${1:functions x y z}}"
-    },
-    "parametricplotThreeD[](){}": {
-      "snippet": "parametricplotThreeD[${2:options}](${3:t1},${4:t2}){${1:functions x y z}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "fileplotThreeD{}": {
       "snippet": "fileplotThreeD{${1:datafile}}"
     },
@@ -149,33 +42,7 @@
       "snippet": "listplotThreeD[${2:options}]{${1:data object}}"
     },
     "ScalePointsThreeD": {},
-    "pstRotPointIIID(){}{}{}": {
-      "snippet": "pstRotPointIIID(${4:x},${5:y},${6:z}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}"
-    },
-    "pstRotPointIIID[](){}{}{}": {
-      "snippet": "pstRotPointIIID[${4:options}](${5:x},${6:y},${7:z}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "getThreeDCoor(){}": {
-      "snippet": "getThreeDCoor(${2:vector}){${1:macro}}"
-    },
-    "pstaddThreeDVec()(){}{}{}": {
-      "snippet": "pstaddThreeDVec(${4:vectorA})(${5:vectorB}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}"
-    },
-    "pstsubThreeDVec()(){}{}{}": {
-      "snippet": "pstsubThreeDVec(${4:vectorA})(${5:vectorB}){${1:xmacro}}{${2:ymacro}}{${3:zmacro}}"
-    },
     "setIIIDplotDefaults": {},
-    "ABinterCD()()()(){}": {
-      "snippet": "ABinterCD(${2:A})(${3:B})(${4:C})(${5:D}){${1:name}}"
-    },
-    "Arrows()()": {
-      "snippet": "Arrows(${1:A})(${2:B})"
-    },
-    "Arrows[]()()": {
-      "snippet": "Arrows[${1:options}](${2:A})(${3:B})"
-    },
     "CalculateCos{}": {
       "snippet": "CalculateCos{${1:angle}}"
     },
@@ -185,105 +52,33 @@
     "IIIDplotfiledate": {},
     "IIIDplotfileversion": {},
     "NormalIIIDCoor": {},
-    "Parallel()()()(){}": {
-      "snippet": "Parallel(${2:A})(${3:B})(${4:C})(${5:D}){${1:name}}"
-    },
-    "Parallel[]()()()(){}": {
-      "snippet": "Parallel[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:name}}"
-    },
     "UseCos{}": {
       "snippet": "UseCos{${1:angle}}"
     },
     "UseSin{}": {
       "snippet": "UseSin{${1:angle}}"
     },
-    "arrowLine()(){}": {
-      "snippet": "arrowLine(${2:A})(${3:B}){${1:n}}"
-    },
-    "arrowLine[]()(){}": {
-      "snippet": "arrowLine[${2:options}](${3:A})(${4:B}){${1:n}}"
-    },
     "noPT{}": {
       "snippet": "noPT{${1:arg}}"
     },
-    "nodeBetween()(){}": {
-      "snippet": "nodeBetween(${2:A})(${3:B}){${1:name}}"
-    },
-    "psBeforeLine()(){}": {
-      "snippet": "psBeforeLine(${2:A})(${3:B}){${1:name}}"
-    },
-    "psBeforeLine[]()(){}": {
-      "snippet": "psBeforeLine[${2:options}](${3:A})(${4:B}){${1:name}}"
-    },
-    "psOutLine()(){}": {
-      "snippet": "psOutLine(${2:A})(${3:B}){${1:name}}"
-    },
-    "psOutLine[]()(){}": {
-      "snippet": "psOutLine[${2:options}](${3:A})(${4:B}){${1:name}}"
-    },
-    "psplotImpIIID()(){}": {
-      "snippet": "psplotImpIIID(${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2}){${1:function}}"
-    },
-    "psplotImpIIID()()[]{}": {
-      "snippet": "psplotImpIIID(${3:x1},${4:y1},${5:z1})(${6:x2},${7:y2},${8:z2})[${2:PS code}]{${1:function}}"
-    },
     "pstAdd{}{}{}": {
       "snippet": "pstAdd{${1:num1}}{${2:num2}}{${3:macro}}"
     },
     "pstDiv{}{}{}": {
       "snippet": "pstDiv{${1:num1}}{${2:num2}}{${3:macro}}"
     },
-    "pstIIIDNode()()()()()": {
-      "snippet": "pstIIIDNode(${1:A})(${2:B})(${3:C})(${4:D})(${5:E})"
-    },
-    "pstIIIDNode[]()()()()()": {
-      "snippet": "pstIIIDNode[${1:options}](${2:A})(${3:B})(${4:C})(${5:D})(${6:E})"
-    },
     "pstMul{}{}{}": {
       "snippet": "pstMul{${1:num1}}{${2:num2}}{${3:macro}}"
     },
-    "pstRotNodeIIID()(){}": {
-      "snippet": "pstRotNodeIIID(${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2}){${1:name}}"
-    },
     "pstSinCos{}{}{}": {
       "snippet": "pstSinCos{${1:angle}}{${2:sine macro}}{${3:cosine macro}}"
     },
     "pstSub{}{}{}": {
       "snippet": "pstSub{${1:num1}}{${2:num2}}{${3:macro}}"
     },
-    "pstThreeDCone()()(){}": {
-      "snippet": "pstThreeDCone(${2:cx},${3:cy},${4:cz})(${5:ux},${6:uy},${7:uz})(${8:vx},${9:vy},${10:vz}){${1:height}}"
-    },
-    "pstThreeDCone[]()()(){}": {
-      "snippet": "pstThreeDCone[${2:options}](${3:cx},${4:cy},${5:cz})(${6:ux},${7:uy},${8:uz})(${9:vx},${10:vy},${11:vz}){${1:height}}"
-    },
     "pstThreeDPrism": {},
-    "pstThreeDmoveto()": {
-      "snippet": "pstThreeDmoveto(${1:x},${2:y},${3:z})"
-    },
-    "pstUThreeDPut(){}": {
-      "snippet": "pstUThreeDPut(${2:x},${3:y},${4:z}){${1:stuff}}"
-    },
-    "pstUThreeDPut[](){}": {
-      "snippet": "pstUThreeDPut[${2:refangle}](${3:x},${4:y},${5:z}){${1:stuff}}"
-    },
-    "rotateFrame()()()(){}": {
-      "snippet": "rotateFrame(${2:A})(${3:B})(${4:C})(${5:D}){${1:angle}}"
-    },
-    "rotateNode(){}": {
-      "snippet": "rotateNode(${2:A}){${1:angle}}"
-    },
-    "rotateTriangle()()(){}": {
-      "snippet": "rotateTriangle(${2:A})(${3:B})(${4:C}){${1:angle}}"
-    },
     "PSTThreeDplotLoaded": {},
-    "pszunit": {},
-    "pstThreeDPlotFunc()(){}": {
-      "snippet": "pstThreeDPlotFunc(${2:xmin},${3:xmax})(${4:ymin},${5:ymax}){${1:function}}"
-    },
-    "pstThreeDPlotFunc[]()(){}": {
-      "snippet": "pstThreeDPlotFunc[${2:options}](${3:xmin},${4:xmax})(${5:ymin},${6:ymax}){${1:function}}"
-    }
+    "pszunit": {}
   },
   "envs": {},
   "options": [],
@@ -333,28 +128,6 @@
       "linecolor=",
       "planecorr=",
       "linestyle=${1:style}"
-    ],
-    [
-      "planeGrid=",
-      "subticks=${1:integer}",
-      "planeGridOffset=${1:number}"
-    ],
-    [
-      "plotstyle=",
-      "showpoints",
-      "xPlotpoints=${1:number}",
-      "yPlotpoints=${1:number}",
-      "drawStyle=",
-      "hiddenLine",
-      "algebraic",
-      "linewidth=",
-      "fillstyle=${1:style}",
-      "linecolor="
-    ],
-    [
-      "RotX=${1:degrees}",
-      "RotY=${1:degrees}",
-      "RotZ=${1:degrees}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-abspos.json b/dev/packages/pst-abspos.json
index dcbd5f02d..1f1b099d5 100644
--- a/dev/packages/pst-abspos.json
+++ b/dev/packages/pst-abspos.json
@@ -5,17 +5,8 @@
     "pst-xkey": []
   },
   "macros": {
-    "pstSetRelativeOrigin()": {
-      "snippet": "pstSetRelativeOrigin(${1:x},${2:y})"
-    },
     "pstSetAbsoluteOrigin": {},
     "pstSetPostScriptOrigin": {},
-    "pstPutAbs(){}": {
-      "snippet": "pstPutAbs(${2:x},${3:y}){${1:stuff}}"
-    },
-    "pstPutAbs[](){}": {
-      "snippet": "pstPutAbs[${2:options}](${3:x},${4:y}){${1:stuff}}"
-    },
     "PSTabsposLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-arrow.json b/dev/packages/pst-arrow.json
index 3aa102670..6391af13d 100644
--- a/dev/packages/pst-arrow.json
+++ b/dev/packages/pst-arrow.json
@@ -3,12 +3,6 @@
     "pstricks": []
   },
   "macros": {
-    "psBigArrow()()": {
-      "snippet": "psBigArrow(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psBigArrow[]()()": {
-      "snippet": "psBigArrow[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
     "PSTarrowLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-bar.json b/dev/packages/pst-bar.json
index 6661acf03..00bc129c1 100644
--- a/dev/packages/pst-bar.json
+++ b/dev/packages/pst-bar.json
@@ -28,9 +28,6 @@
       "snippet": "psbarlabel{${1:label}}"
     },
     "psbarlabelsep": {},
-    "psbarscale(){}": {
-      "snippet": "psbarscale(${2:scale}){${1:PostScript code}}"
-    },
     "setbarstyle{}": {
       "snippet": "setbarstyle{${1:style}}"
     },
diff --git a/dev/packages/pst-bezier.json b/dev/packages/pst-bezier.json
index 2fbbb12f4..eaf2fb4e3 100644
--- a/dev/packages/pst-bezier.json
+++ b/dev/packages/pst-bezier.json
@@ -6,14 +6,6 @@
     "pst-node": []
   },
   "macros": {
-    "psRQBCmasse()()(){}": {
-      "snippet": "psRQBCmasse(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2}){${1:w0,${8:w1},w2}}"
-    },
-    "psRQBCmasse[]()()(){}": {
-      "snippet": "psRQBCmasse[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:w0,${9:w1},w2}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "pscalculate{}": {
       "snippet": "pscalculate{${1:expr}}"
     },
@@ -24,14 +16,5 @@
   },
   "envs": {},
   "options": [],
-  "keyvals": [
-    [
-      "autoTrace",
-      "linecolor=",
-      "linewidth=",
-      "nPoints=${1:number}",
-      "showpoints",
-      "showPolygon"
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/pst-circ.json b/dev/packages/pst-circ.json
index 134a4524f..cb0f52e7e 100644
--- a/dev/packages/pst-circ.json
+++ b/dev/packages/pst-circ.json
@@ -6,498 +6,12 @@
     "multido": []
   },
   "macros": {
-    "wire()()": {
-      "snippet": "wire(${1:A})(${2:B})"
-    },
-    "wire[]()()": {
-      "snippet": "wire[${1:options}](${2:A})(${3:B})"
-    },
-    "tension()(){}": {
-      "snippet": "tension(${2:A})(${3:B}){${1:label}}"
-    },
-    "tension[]()(){}": {
-      "snippet": "tension[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "ground()": {
-      "snippet": "ground(${1:A})"
-    },
-    "ground{}()": {
-      "snippet": "ground{${1:angle}}(${2:A})"
-    },
-    "ground[]()": {
-      "snippet": "ground[${1:options}](${2:A})"
-    },
-    "ground[]{}()": {
-      "snippet": "ground[${2:options}]{${1:angle}}(${3:A})"
-    },
-    "resistor()(){}": {
-      "snippet": "resistor(${2:A})(${3:B}){${1:label}}"
-    },
-    "resistor[]()(){}": {
-      "snippet": "resistor[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "RFLine()(){}": {
-      "snippet": "RFLine(${2:A})(${3:B}){${1:label}}"
-    },
-    "RFLine[]()(){}": {
-      "snippet": "RFLine[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "capacitor()(){}": {
-      "snippet": "capacitor(${2:A})(${3:B}){${1:label}}"
-    },
-    "capacitor[]()(){}": {
-      "snippet": "capacitor[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "battery()(){}": {
-      "snippet": "battery(${2:A})(${3:B}){${1:label}}"
-    },
-    "battery[]()(){}": {
-      "snippet": "battery[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "coil()(){}": {
-      "snippet": "coil(${2:A})(${3:B}){${1:label}}"
-    },
-    "coil[]()(){}": {
-      "snippet": "coil[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "Ucc()(){}": {
-      "snippet": "Ucc(${2:A})(${3:B}){${1:label}}"
-    },
-    "Ucc[]()(){}": {
-      "snippet": "Ucc[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "Icc()(){}": {
-      "snippet": "Icc(${2:A})(${3:B}){${1:label}}"
-    },
-    "Icc[]()(){}": {
-      "snippet": "Icc[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "switch()(){}": {
-      "snippet": "switch(${2:A})(${3:B}){${1:label}}"
-    },
-    "switch[]()(){}": {
-      "snippet": "switch[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "arrowswitch()(){}": {
-      "snippet": "arrowswitch(${2:A})(${3:B}){${1:label}}"
-    },
-    "arrowswitch[]()(){}": {
-      "snippet": "arrowswitch[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "diode()(){}": {
-      "snippet": "diode(${2:A})(${3:B}){${1:label}}"
-    },
-    "diode[]()(){}": {
-      "snippet": "diode[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "Zener()(){}": {
-      "snippet": "Zener(${2:A})(${3:B}){${1:label}}"
-    },
-    "Zener[]()(){}": {
-      "snippet": "Zener[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "lamp()(){}": {
-      "snippet": "lamp(${2:A})(${3:B}){${1:label}}"
-    },
-    "lamp[]()(){}": {
-      "snippet": "lamp[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "circledipole()(){}": {
-      "snippet": "circledipole(${2:A})(${3:B}){${1:label}}"
-    },
-    "circledipole[]()(){}": {
-      "snippet": "circledipole[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "LED()(){}": {
-      "snippet": "LED(${2:A})(${3:B}){${1:label}}"
-    },
-    "LED[]()(){}": {
-      "snippet": "LED[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "SQUID()(){}": {
-      "snippet": "SQUID(${2:A})(${3:B}){${1:label}}"
-    },
-    "SQUID[]()(){}": {
-      "snippet": "SQUID[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "RelayNOP()(){}": {
-      "snippet": "RelayNOP(${2:A})(${3:B}){${1:label}}"
-    },
-    "RelayNOP[]()(){}": {
-      "snippet": "RelayNOP[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "Suppressor()(){}": {
-      "snippet": "Suppressor(${2:A})(${3:B}){${1:label}}"
-    },
-    "Suppressor[]()(){}": {
-      "snippet": "Suppressor[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "Arrestor()(){}": {
-      "snippet": "Arrestor(${2:A})(${3:B}){${1:label}}"
-    },
-    "Arrestor[]()(){}": {
-      "snippet": "Arrestor[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "cell()(){}": {
-      "snippet": "cell(${2:A})(${3:B}){${1:label}}"
-    },
-    "cell[]()(){}": {
-      "snippet": "cell[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "igbt()(){}": {
-      "snippet": "igbt(${2:A})(${3:B}){${1:label}}"
-    },
-    "igbt[]()(){}": {
-      "snippet": "igbt[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "OA()()()": {
-      "snippet": "OA(${1:A})(${2:B})(${3:C})"
-    },
-    "OA[]()()()": {
-      "snippet": "OA[${1:options}](${2:A})(${3:B})(${4:C})"
-    },
-    "GM()()()": {
-      "snippet": "GM(${1:A})(${2:B})(${3:C})"
-    },
-    "GM[]()()()": {
-      "snippet": "GM[${1:options}](${2:A})(${3:B})(${4:C})"
-    },
-    "Tswitch()()()": {
-      "snippet": "Tswitch(${1:A})(${2:B})(${3:C})"
-    },
-    "Tswitch[]()()()": {
-      "snippet": "Tswitch[${1:options}](${2:A})(${3:B})(${4:C})"
-    },
-    "potentiometer()()()": {
-      "snippet": "potentiometer(${1:A})(${2:B})(${3:C})"
-    },
-    "potentiometer[]()()()": {
-      "snippet": "potentiometer[${1:options}](${2:A})(${3:B})(${4:C})"
-    },
-    "transistor()()()": {
-      "snippet": "transistor(${1:A})(${2:B})(${3:C})"
-    },
-    "transistor[]()()()": {
-      "snippet": "transistor[${1:options}](${2:A})(${3:B})(${4:C})"
-    },
-    "quadripole()()()(){}": {
-      "snippet": "quadripole(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
-    },
-    "quadripole[]()()()(){}": {
-      "snippet": "quadripole[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
-    },
-    "transformer()()()(){}": {
-      "snippet": "transformer(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
-    },
-    "transformer[]()()()(){}": {
-      "snippet": "transformer[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
-    },
-    "newtransformer()()()(){}": {
-      "snippet": "newtransformer(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
-    },
-    "newtransformer[]()()()(){}": {
-      "snippet": "newtransformer[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
-    },
-    "newtransformerquad()()()(){}": {
-      "snippet": "newtransformerquad(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
-    },
-    "newtransformerquad[]()()()(){}": {
-      "snippet": "newtransformerquad[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
-    },
-    "optoCoupler()()()(){}": {
-      "snippet": "optoCoupler(${2:A})(${3:B})(${4:C})(${5:D}){${1:text}}"
-    },
-    "optoCoupler[]()()()(){}": {
-      "snippet": "optoCoupler[${2:options}](${3:A})(${4:B})(${5:C})(${6:D}){${1:text}}"
-    },
-    "multidipole()()": {
-      "snippet": "multidipole(${1:A})(${2:B})"
-    },
-    "multidipole[]()()": {
-      "snippet": "multidipole[${1:options}](${2:A})(${3:B})"
-    },
-    "OpenDipol()(){}": {
-      "snippet": "OpenDipol(${2:A})(${3:B}){${1:label}}"
-    },
-    "OpenDipol[]()(){}": {
-      "snippet": "OpenDipol[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "OpenTripol()(){}": {
-      "snippet": "OpenTripol(${2:A})(${3:B}){${1:label}}"
-    },
-    "OpenTripol[]()(){}": {
-      "snippet": "OpenTripol[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "dashpot()(){}": {
-      "snippet": "dashpot(${2:A})(${3:B}){${1:label}}"
-    },
-    "dashpot[]()(){}": {
-      "snippet": "dashpot[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "newground()": {
-      "snippet": "newground(${1:A})"
-    },
-    "newground{}()": {
-      "snippet": "newground{${1:angle}}(${2:A})"
-    },
-    "newground[]()": {
-      "snippet": "newground[${1:options}](${2:A})"
-    },
-    "newground[]{}()": {
-      "snippet": "newground[${2:options}]{${1:angle}}(${3:A})"
-    },
-    "newdiode()(){}": {
-      "snippet": "newdiode(${2:A})(${3:B}){${1:label}}"
-    },
-    "newdiode[]()(){}": {
-      "snippet": "newdiode[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "newZener()(){}": {
-      "snippet": "newZener(${2:A})(${3:B}){${1:label}}"
-    },
-    "newZener[]()(){}": {
-      "snippet": "newZener[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "newLED()(){}": {
-      "snippet": "newLED(${2:A})(${3:B}){${1:label}}"
-    },
-    "newLED[]()(){}": {
-      "snippet": "newLED[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "newSwitch()(){}": {
-      "snippet": "newSwitch(${2:A})(${3:B}){${1:label}}"
-    },
-    "newSwitch[]()(){}": {
-      "snippet": "newSwitch[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "newcapacitor()(){}": {
-      "snippet": "newcapacitor(${2:A})(${3:B}){${1:label}}"
-    },
-    "newcapacitor[]()(){}": {
-      "snippet": "newcapacitor[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "newarmature()(){}": {
-      "snippet": "newarmature(${2:A})(${3:B}){${1:label}}"
-    },
-    "newarmature[]()(){}": {
-      "snippet": "newarmature[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "vdc()(){}": {
-      "snippet": "vdc(${2:A})(${3:B}){${1:label}}"
-    },
-    "vdc[]()(){}": {
-      "snippet": "vdc[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "vac()(){}": {
-      "snippet": "vac(${2:A})(${3:B}){${1:label}}"
-    },
-    "vac[]()(){}": {
-      "snippet": "vac[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "antenna()": {
-      "snippet": "antenna(${1:A})"
-    },
-    "antenna{}()": {
-      "snippet": "antenna{${1:angle}}(${2:A})"
-    },
-    "antenna[]()": {
-      "snippet": "antenna[${1:options}](${2:A})"
-    },
-    "antenna[]{}()": {
-      "snippet": "antenna[${2:options}]{${1:angle}}(${3:A})"
-    },
-    "oscillator(){}{}": {
-      "snippet": "oscillator(${3:A}){${1:label}}{${2:pstricks options}}"
-    },
-    "oscillator[](){}{}": {
-      "snippet": "oscillator[${3:options}](${4:A}){${1:label}}{${2:pstricks options}}"
-    },
-    "filter()(){}": {
-      "snippet": "filter(${2:A})(${3:B}){${1:label}}"
-    },
-    "filter[]()(){}": {
-      "snippet": "filter[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "isolator()(){}": {
-      "snippet": "isolator(${2:A})(${3:B}){${1:label}}"
-    },
-    "isolator[]()(){}": {
-      "snippet": "isolator[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "freqmult()(){}": {
-      "snippet": "freqmult(${2:A})(${3:B}){${1:label}}"
-    },
-    "freqmult[]()(){}": {
-      "snippet": "freqmult[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "phaseshifter()(){}": {
-      "snippet": "phaseshifter(${2:A})(${3:B}){${1:label}}"
-    },
-    "phaseshifter[]()(){}": {
-      "snippet": "phaseshifter[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "vco()(){}": {
-      "snippet": "vco(${2:A})(${3:B}){${1:label}}"
-    },
-    "vco[]()(){}": {
-      "snippet": "vco[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "amplifier()(){}": {
-      "snippet": "amplifier(${2:A})(${3:B}){${1:label}}"
-    },
-    "amplifier[]()(){}": {
-      "snippet": "amplifier[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "detector()(){}": {
-      "snippet": "detector(${2:A})(${3:B}){${1:label}}"
-    },
-    "detector[]()(){}": {
-      "snippet": "detector[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "attenuator()(){}": {
-      "snippet": "attenuator(${2:A})(${3:B}){${1:label}}"
-    },
-    "attenuator[]()(){}": {
-      "snippet": "attenuator[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "mixer()()(){}{}": {
-      "snippet": "mixer(${3:A})(${4:B})(${5:C}){${1:label}}{${2:pstricks options}}"
-    },
-    "mixer[]()()(){}{}": {
-      "snippet": "mixer[${3:options}](${4:A})(${5:B})(${6:C}){${1:label}}{${2:pstricks options}}"
-    },
-    "splitter()()(){}{}": {
-      "snippet": "splitter(${3:A})(${4:B})(${5:C}){${1:label}}{${2:pstricks options}}"
-    },
-    "splitter[]()()(){}{}": {
-      "snippet": "splitter[${3:options}](${4:A})(${5:B})(${6:C}){${1:label}}{${2:pstricks options}}"
-    },
-    "circulator{}()()(){}{}": {
-      "snippet": "circulator{${1:angle}}(${4:A})(${5:B})(${6:C}){${2:label}}{${3:pstricks options}}"
-    },
-    "circulator[]{}()()(){}{}": {
-      "snippet": "circulator[${4:options}]{${1:angle}}(${5:A})(${6:B})(${7:C}){${2:label}}{${3:pstricks options}}"
-    },
-    "agc()()(){}{}": {
-      "snippet": "agc(${3:A})(${4:B})(${5:C}){${1:label}}{${2:pstricks options}}"
-    },
-    "agc[]()()(){}{}": {
-      "snippet": "agc[${3:options}](${4:A})(${5:B})(${6:C}){${1:label}}{${2:pstricks options}}"
-    },
-    "coupler()()()(){}{}": {
-      "snippet": "coupler(${3:A})(${4:B})(${5:C})(${6:D}){${1:label}}{${2:pstricks options}}"
-    },
-    "coupler[]()()()(){}{}": {
-      "snippet": "coupler[${3:options}](${4:A})(${5:B})(${6:C})(${7:D}){${1:label}}{${2:pstricks options}}"
-    },
     "logic{}": {
       "snippet": "logic{${1:label}}"
     },
-    "logic(){}": {
-      "snippet": "logic(${2:x},${3:y}){${1:label}}"
-    },
     "logic[]{}": {
       "snippet": "logic[${2:options}]{${1:label}}"
     },
-    "logic[](){}": {
-      "snippet": "logic[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "logicnot(){}": {
-      "snippet": "logicnot(${2:x},${3:y}){${1:label}}"
-    },
-    "logicnot[](){}": {
-      "snippet": "logicnot[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "logicand(){}": {
-      "snippet": "logicand(${2:x},${3:y}){${1:label}}"
-    },
-    "logicand[](){}": {
-      "snippet": "logicand[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "logicor(){}": {
-      "snippet": "logicor(${2:x},${3:y}){${1:label}}"
-    },
-    "logicor[](){}": {
-      "snippet": "logicor[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "logicxor(){}": {
-      "snippet": "logicxor(${2:x},${3:y}){${1:label}}"
-    },
-    "logicxor[](){}": {
-      "snippet": "logicxor[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "logicff(){}": {
-      "snippet": "logicff(${2:x},${3:y}){${1:label}}"
-    },
-    "logicff[](){}": {
-      "snippet": "logicff[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "logicic(){}": {
-      "snippet": "logicic(${2:x},${3:y}){${1:label}}"
-    },
-    "logicic[](){}": {
-      "snippet": "logicic[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "sevensegmentdisplay(){}": {
-      "snippet": "sevensegmentdisplay(${2:x},${3:y}){${1:label}}"
-    },
-    "sevensegmentdisplay[](){}": {
-      "snippet": "sevensegmentdisplay[${2:options}](${3:x},${4:y}){${1:label}}"
-    },
-    "xic()": {
-      "snippet": "xic(${1:x},${2:y})"
-    },
-    "xic[]()": {
-      "snippet": "xic[${1:options}](${2:x},${3:y})"
-    },
-    "xio()": {
-      "snippet": "xio(${1:x},${2:y})"
-    },
-    "xio[]()": {
-      "snippet": "xio[${1:options}](${2:x},${3:y})"
-    },
-    "ote()": {
-      "snippet": "ote(${1:x},${2:y})"
-    },
-    "ote[]()": {
-      "snippet": "ote[${1:options}](${2:x},${3:y})"
-    },
-    "osr()": {
-      "snippet": "osr(${1:x},${2:y})"
-    },
-    "osr[]()": {
-      "snippet": "osr[${1:options}](${2:x},${3:y})"
-    },
-    "res()": {
-      "snippet": "res(${1:x},${2:y})"
-    },
-    "res[]()": {
-      "snippet": "res[${1:options}](${2:x},${3:y})"
-    },
-    "swpb()": {
-      "snippet": "swpb(${1:x},${2:y})"
-    },
-    "swpb[]()": {
-      "snippet": "swpb[${1:options}](${2:x},${3:y})"
-    },
-    "swtog()": {
-      "snippet": "swtog(${1:x},${2:y})"
-    },
-    "swtog[]()": {
-      "snippet": "swtog[${1:options}](${2:x},${3:y})"
-    },
-    "contact()": {
-      "snippet": "contact(${1:x},${2:y})"
-    },
-    "contact[]()": {
-      "snippet": "contact[${1:options}](${2:x},${3:y})"
-    },
-    "armature()": {
-      "snippet": "armature(${1:x},${2:y})"
-    },
-    "armature[]()": {
-      "snippet": "armature[${1:options}](${2:x},${3:y})"
-    },
     "newCircDipole{}": {
       "snippet": "newCircDipole{${1:name}}"
     },
@@ -509,33 +23,6 @@
     "icleft": {},
     "icmid": {},
     "icright": {},
-    "node()": {
-      "snippet": "node(${1:x},${2:y})"
-    },
-    "modulator()(){}": {
-      "snippet": "modulator(${2:A})(${3:B}){${1:label}}"
-    },
-    "modulator[]()(){}": {
-      "snippet": "modulator[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "plug{}()": {
-      "snippet": "plug{${1:angle}}(${2:A})"
-    },
-    "plug[]{}()": {
-      "snippet": "plug[${2:options}]{${1:angle}}(${3:A})"
-    },
-    "ampsinu()(){}": {
-      "snippet": "ampsinu(${2:A})(${3:B}){${1:label}}"
-    },
-    "ampsinu[]()(){}": {
-      "snippet": "ampsinu[${2:options}](${3:A})(${4:B}){${1:label}}"
-    },
-    "powermeter()()(){}": {
-      "snippet": "powermeter(${2:A})(${3:B})(${4:C}){${1:label}}"
-    },
-    "powermeter[]()()(){}": {
-      "snippet": "powermeter[${2:options}](${3:A})(${4:B})(${5:C}){${1:label}}"
-    },
     "PSTcircLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-coil.json b/dev/packages/pst-coil.json
index 63e6a59e3..202fee6f9 100644
--- a/dev/packages/pst-coil.json
+++ b/dev/packages/pst-coil.json
@@ -5,30 +5,6 @@
     "pst-xkey": []
   },
   "macros": {
-    "pscoil()()": {
-      "snippet": "pscoil(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pscoil{}()()": {
-      "snippet": "pscoil{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil[]()()": {
-      "snippet": "pscoil[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil[]{}()()": {
-      "snippet": "pscoil[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pscoil*()()": {
-      "snippet": "pscoil*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pscoil*{}()()": {
-      "snippet": "pscoil*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil*[]()()": {
-      "snippet": "pscoil*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pscoil*[]{}()()": {
-      "snippet": "pscoil*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
     "psCoil{}{}": {
       "snippet": "psCoil{${1:angle1}}{${2:angle2}}"
     },
@@ -41,54 +17,6 @@
     "psCoil*[]{}{}": {
       "snippet": "psCoil*[${3:options}]{${1:angle1}}{${2:angle2}}"
     },
-    "pszigzag()()": {
-      "snippet": "pszigzag(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pszigzag{}()()": {
-      "snippet": "pszigzag{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag[]()()": {
-      "snippet": "pszigzag[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag[]{}()()": {
-      "snippet": "pszigzag[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pszigzag*()()": {
-      "snippet": "pszigzag*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pszigzag*{}()()": {
-      "snippet": "pszigzag*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag*[]()()": {
-      "snippet": "pszigzag*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pszigzag*[]{}()()": {
-      "snippet": "pszigzag*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pssin()()": {
-      "snippet": "pssin(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pssin{}()()": {
-      "snippet": "pssin{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin[]()()": {
-      "snippet": "pssin[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin[]{}()()": {
-      "snippet": "pssin[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "pssin*()()": {
-      "snippet": "pssin*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pssin*{}()()": {
-      "snippet": "pssin*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin*[]()()": {
-      "snippet": "pssin*[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pssin*[]{}()()": {
-      "snippet": "pssin*[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
     "nccoil{}{}": {
       "snippet": "nccoil{${1:nodeA}}{${2:nodeB}}"
     },
diff --git a/dev/packages/pst-contourplot.json b/dev/packages/pst-contourplot.json
index eb2187dc6..19de0a24b 100644
--- a/dev/packages/pst-contourplot.json
+++ b/dev/packages/pst-contourplot.json
@@ -4,14 +4,9 @@
     "pst-xkey": []
   },
   "macros": {
-    "psContourPlot[]()()": {
-      "snippet": "psContourPlot[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "psReadData[]": {
       "snippet": "psReadData[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "PSTCONTOURPLOTLoaded": {}
@@ -19,22 +14,6 @@
   "envs": {},
   "options": [],
   "keyvals": [
-    [
-      "a=${1:side length}",
-      "ChoicePoints=${1:n1 n2 ...}",
-      "FileName=${1:file name}",
-      "grid",
-      "linecolor=",
-      "linewidth=",
-      "ReverseColors",
-      "showpoints",
-      "unit=${1:number}",
-      "algebraic",
-      "Fill",
-      "fillcolor=",
-      "function=${1:function}",
-      "WriteData"
-    ],
     [
       "a=${1:side length}",
       "ChoicePoints=${1:n1 n2 ...}",
diff --git a/dev/packages/pst-dart.json b/dev/packages/pst-dart.json
index abf782773..785bb93ec 100644
--- a/dev/packages/pst-dart.json
+++ b/dev/packages/pst-dart.json
@@ -6,26 +6,10 @@
   },
   "macros": {
     "psDartBoard": {},
-    "psDartBoard()": {
-      "snippet": "psDartBoard(${1:x},${2:y})"
-    },
     "psDartBoard[]": {
       "snippet": "psDartBoard[${1:options}]",
       "keyvalindex": 0,
       "keyvalpos": 0
-    },
-    "psDartBoard[]()": {
-      "snippet": "psDartBoard[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "psDart()": {
-      "snippet": "psDart(${1:x},${2:y})"
-    },
-    "psDart[]()": {
-      "snippet": "psDart[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
     }
   },
   "envs": {},
@@ -37,11 +21,6 @@
       "viewpoint=${1:x y z}",
       "preCode=${1:code}",
       "postCode=${1:code}"
-    ],
-    [
-      "rot=${1:degrees}",
-      "unit=${1:number}",
-      "dartcolor="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-dbicons.json b/dev/packages/pst-dbicons.json
index 223659e92..7fe959b18 100644
--- a/dev/packages/pst-dbicons.json
+++ b/dev/packages/pst-dbicons.json
@@ -76,18 +76,6 @@
     "relationshipbetween[]{}{}{}[]": {
       "snippet": "relationshipbetween[${4:property}]{${1:entity-id1}}{${2:entity-id2}}{${3:relationship-id}}[${5:relationship-name}]"
     },
-    "relationshipbetween{}()[]{}()[]{}": {
-      "snippet": "relationshipbetween{${1:entity-id1}}(${6:role1})[${2:card1}]{${3:entity-id2}}(${7:role2})[${4:card2}]{${5:relationship-id}}"
-    },
-    "relationshipbetween{}()[]{}()[]{}[]": {
-      "snippet": "relationshipbetween{${1:entity-id1}}(${7:role1})[${2:card1}]{${3:entity-id2}}(${8:role2})[${4:card2}]{${5:relationship-id}}[${6:relationship-name}]"
-    },
-    "relationshipbetween[]{}()[]{}()[]{}": {
-      "snippet": "relationshipbetween[${4:property}]{${1:entity-id1}}(${7:role1})[${5:card1}]{${2:entity-id2}}(${8:role2})[${6:card2}]{${3:relationship-id}}"
-    },
-    "relationshipbetween[]{}()[]{}()[]{}[]": {
-      "snippet": "relationshipbetween[${4:property}]{${1:entity-id1}}(${8:role1})[${5:card1}]{${2:entity-id2}}(${9:role2})[${6:card2}]{${3:relationship-id}}[${7:relationship-name}]"
-    },
     "inrelationship{}{}": {
       "snippet": "inrelationship{${1:entity-id}}{${2:relationship-id}}"
     },
@@ -100,30 +88,12 @@
     "inrelationship[]{}{}[]": {
       "snippet": "inrelationship[${3:property}]{${1:entity-id}}{${2:relationship-id}}[${4:relationship-name}]"
     },
-    "inrelationship{}()[]{}": {
-      "snippet": "inrelationship{${1:entity-id}}(${4:role})[${2:card}]{${3:relationship-id}}"
-    },
-    "inrelationship{}()[]{}[]": {
-      "snippet": "inrelationship{${1:entity-id}}(${5:role})[${2:card}]{${3:relationship-id}}[${4:relationship-name}]"
-    },
-    "inrelationship[]{}()[]{}": {
-      "snippet": "inrelationship[${3:property}]{${1:entity-id}}(${5:role})[${4:card}]{${2:relationship-id}}"
-    },
-    "inrelationship[]{}()[]{}[]": {
-      "snippet": "inrelationship[${3:property}]{${1:entity-id}}(${6:role})[${4:card}]{${2:relationship-id}}[${5:relationship-name}]"
-    },
-    "inrelationship[]{}()[]{}[]()": {
-      "snippet": "inrelationship[${3:property}]{${1:entity-id}}(${6:role})[${4:card}]{${2:relationship-id}}[${5:relationship-name}](${7:dist},${8:angle})"
-    },
     "rolepos{}": {
       "snippet": "rolepos{${1:number}}"
     },
     "cardpos{}": {
       "snippet": "cardpos{${1:number}}"
     },
-    "annote{}{}()": {
-      "snippet": "annote{${1:id}}{${2:text}}(${3:dist},${4:angle})"
-    },
     "nodeconnections{}": {
       "snippet": "nodeconnections{${1:node connections}}"
     },
diff --git a/dev/packages/pst-electricfield.json b/dev/packages/pst-electricfield.json
index 3c300c992..6b61bc1d9 100644
--- a/dev/packages/pst-electricfield.json
+++ b/dev/packages/pst-electricfield.json
@@ -11,14 +11,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "psEquipotential()()": {
-      "snippet": "psEquipotential(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psEquipotential[]()()": {
-      "snippet": "psEquipotential[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "PSTElectricFieldLoaded": {}
   },
   "envs": {},
@@ -34,16 +26,6 @@
       "posArrow=${1:factor}",
       "radius=",
       "runit=${1:number}"
-    ],
-    [
-      "Q={[${1:x1,y1,z1}][${2:x2,y2,z2}]${3:...}}",
-      "N=${1:integer}",
-      "linewidth=",
-      "linecolor=",
-      "Vmax=${1:number}",
-      "Vmin=${1:number}",
-      "stepV=${1:number}",
-      "stepFactor=${1:factor}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-eucl.json b/dev/packages/pst-eucl.json
index 47004dac1..2a51b839d 100644
--- a/dev/packages/pst-eucl.json
+++ b/dev/packages/pst-eucl.json
@@ -15,12 +15,6 @@
     "pstOrdinate{}": {
       "snippet": "pstOrdinate{${1:A}}"
     },
-    "pstMoveNode(){}{}": {
-      "snippet": "pstMoveNode(${3:dx},${4:dy}){${1:A}}{${2:B}}"
-    },
-    "pstMoveNode[](){}{}": {
-      "snippet": "pstMoveNode[${3:options}](${4:dx},${5:dy}){${1:A}}{${2:B}}"
-    },
     "pstSegmentMark{}{}": {
       "snippet": "pstSegmentMark{${1:A}}{${2:B}}"
     },
@@ -39,36 +33,6 @@
     "pstLabelAB*[]{}{}{}": {
       "snippet": "pstLabelAB*[${4:options}]{${1:A}}{${2:B}}{${3:label}}"
     },
-    "pstTriangle(){}(){}(){}": {
-      "snippet": "pstTriangle(${4:x1},${5:y1}){${1:A}}(${6:x2},${7:y2}){${2:B}}(${8:x3},${9:y3}){${3:C}}"
-    },
-    "pstTriangle[](){}(){}(){}": {
-      "snippet": "pstTriangle[${4:options}](${5:x1},${6:y1}){${1:A}}(${7:x2},${8:y2}){${2:B}}(${9:x3},${10:y3}){${3:C}}"
-    },
-    "pstTriangleSSS(){}(){}{}": {
-      "snippet": "pstTriangleSSS(${4:pos}){${1:A}}(${5:a},${6:b},${7:c}){${2:B}}{${3:C}}"
-    },
-    "pstTriangleSSS[](){}(){}{}": {
-      "snippet": "pstTriangleSSS[${4:options}](${5:pos}){${1:A}}(${6:a},${7:b},${8:c}){${2:B}}{${3:C}}"
-    },
-    "pstTriangleSAS(){}(){}{}": {
-      "snippet": "pstTriangleSAS(${4:pos}){${1:A}}(${5:b},${6:∠A},${7:c}){${2:B}}{${3:C}}"
-    },
-    "pstTriangleSAS[](){}(){}{}": {
-      "snippet": "pstTriangleSAS[${4:options}](${5:pos}){${1:A}}(${6:b},${7:∠A},${8:c}){${2:B}}{${3:C}}"
-    },
-    "pstTriangleAAS(){}(){}{}": {
-      "snippet": "pstTriangleAAS(${4:pos}){${1:A}}(${5:∠C},${6:∠A},${7:c}){${2:B}}{${3:C}}"
-    },
-    "pstTriangleAAS[](){}(){}{}": {
-      "snippet": "pstTriangleAAS[${4:options}](${5:pos}){${1:A}}(${6:∠C},${7:∠A},${8:c}){${2:B}}{${3:C}}"
-    },
-    "pstTriangleASA(){}(){}{}": {
-      "snippet": "pstTriangleASA(${4:pos}){${1:A}}(${5:∠A},${6:c},${7:∠B}){${2:B}}{${3:C}}"
-    },
-    "pstTriangleASA[](){}(){}{}": {
-      "snippet": "pstTriangleASA[${4:options}](${5:pos}){${1:A}}(${6:∠A},${7:c},${8:∠B}){${2:B}}{${3:C}}"
-    },
     "pstTriangleIC{}{}{}": {
       "snippet": "pstTriangleIC{${1:A}}{${2:B}}{${3:C}}"
     },
@@ -177,53 +141,23 @@
     "pstLine[]{}{}": {
       "snippet": "pstLine[${3:options}]{${1:A}}{${2:B}}"
     },
-    "pstLine{}()": {
-      "snippet": "pstLine{${1:A}}(${2:x},${3:y})"
-    },
-    "pstLine[]{}()": {
-      "snippet": "pstLine[${2:options}]{${1:A}}(${3:x},${4:y})"
-    },
-    "pstLine(){}": {
-      "snippet": "pstLine(${2:x},${3:y}){${1:B}}"
-    },
-    "pstLine[](){}": {
-      "snippet": "pstLine[${2:options}](${3:x},${4:y}){${1:B}}"
-    },
-    "pstLine()()": {
-      "snippet": "pstLine(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pstLine[]()()": {
-      "snippet": "pstLine[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
     "pstLineAA{}{}{}": {
       "snippet": "pstLineAA{${1:A}}{${2:angle}}{${3:B}}"
     },
     "pstLineAA[]{}{}{}": {
       "snippet": "pstLineAA[${4:options}]{${1:A}}{${2:angle}}{${3:B}}"
     },
-    "pstLineAA(){}{}": {
-      "snippet": "pstLineAA(${3:x},${4:y}){${1:angle}}{${2:B}}"
-    },
-    "pstLineAA[](){}{}": {
-      "snippet": "pstLineAA[${3:options}](${4:x},${5:y}){${1:angle}}{${2:B}}"
-    },
     "pstLineAS{}{}{}": {
       "snippet": "pstLineAS{${1:A}}{${2:gradient}}{${3:B}}"
     },
     "pstLineAS[]{}{}{}": {
       "snippet": "pstLineAS[${4:options}]{${1:A}}{${2:gradient}}{${3:B}}"
     },
-    "pstLineAS(){}{}": {
-      "snippet": "pstLineAS(${3:x},${4:y}){${1:gradient}}{${2:B}}"
-    },
-    "pstLineAS[](){}{}": {
-      "snippet": "pstLineAS[${3:options}](${4:x},${5:y}){${1:gradient}}{${2:B}}"
-    },
     "pstLineCoef{}{}{}": {
-      "snippet": "pstLineCoef{${1:a,${4:b},c}}{${2:A}}{${3:B}}"
+      "snippet": "pstLineCoef{${1:a,b,c}}{${2:A}}{${3:B}}"
     },
     "pstLineCoef[]{}{}{}": {
-      "snippet": "pstLineCoef[${4:options}]{${1:a,${5:b},c}}{${2:A}}{${3:B}}"
+      "snippet": "pstLineCoef[${4:options}]{${1:a,b,c}}{${2:A}}{${3:B}}"
     },
     "pstLineAbsNode{}{}{}{}": {
       "snippet": "pstLineAbsNode{${1:A}}{${2:B}}{${3:x}}{${4:C}}"
@@ -466,16 +400,16 @@
       "snippet": "pstSquareAB[${5:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
     },
     "pstRegularPolygonAB{}{}{}{}": {
-      "snippet": "pstRegularPolygonAB{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,${5:A3},...}}"
+      "snippet": "pstRegularPolygonAB{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,A3,...}}"
     },
     "pstRegularPolygonAB[]{}{}{}{}": {
-      "snippet": "pstRegularPolygonAB[${5:options}]{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,${6:A3},...}}"
+      "snippet": "pstRegularPolygonAB[${5:options}]{${1:A0}}{${2:A1}}{${3:n}}{${4:A2,A3,...}}"
     },
     "pstRegularPolygonOA{}{}{}{}": {
-      "snippet": "pstRegularPolygonOA{${1:O}}{${2:A0}}{${3:n}}{${4:A1,${5:A2},...}}"
+      "snippet": "pstRegularPolygonOA{${1:O}}{${2:A0}}{${3:n}}{${4:A1,A2,...}}"
     },
     "pstRegularPolygonOA[]{}{}{}{}": {
-      "snippet": "pstRegularPolygonOA[${5:options}]{${1:O}}{${2:A0}}{${3:n}}{${4:A1,${6:A2},...}}"
+      "snippet": "pstRegularPolygonOA[${5:options}]{${1:O}}{${2:A0}}{${3:n}}{${4:A1,A2,...}}"
     },
     "pstGenericCurve{}{}{}": {
       "snippet": "pstGenericCurve{${1:radical}}{${2:n1}}{${3:n2}}"
@@ -483,90 +417,6 @@
     "pstGenericCurve[]{}{}{}": {
       "snippet": "pstGenericCurve[${4:options}]{${1:radical}}{${2:n1}}{${3:n2}}"
     },
-    "pstEllipse()()": {
-      "snippet": "pstEllipse(${1:O})(${2:a},${3:b})"
-    },
-    "pstEllipse()()[][]": {
-      "snippet": "pstEllipse(${3:O})(${4:a},${5:b})[${1:angleA}][${2:angleB}]"
-    },
-    "pstEllipse[]()()": {
-      "snippet": "pstEllipse[${1:options}](${2:O})(${3:a},${4:b})"
-    },
-    "pstEllipse[]()()[][]": {
-      "snippet": "pstEllipse[${1:options}](${4:O})(${5:a},${6:b})[${2:angleA}][${3:angleB}]"
-    },
-    "pstEllipseNode()(){}{}": {
-      "snippet": "pstEllipseNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:P}}"
-    },
-    "pstEllipseNode[]()(){}{}": {
-      "snippet": "pstEllipseNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:P}}"
-    },
-    "pstEllipseRotNode()(){}": {
-      "snippet": "pstEllipseRotNode(${2:O})(${3:a},${4:b}){${1:P}}"
-    },
-    "pstEllipseRotNode[]()(){}": {
-      "snippet": "pstEllipseRotNode[${2:options}](${3:O})(${4:a},${5:b}){${1:P}}"
-    },
-    "pstEllipseAbsNode()(){}{}{}": {
-      "snippet": "pstEllipseAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstEllipseAbsNode[]()(){}{}{}": {
-      "snippet": "pstEllipseAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstEllipseOrdNode()(){}{}{}": {
-      "snippet": "pstEllipseOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstEllipseOrdNode[]()(){}{}{}": {
-      "snippet": "pstEllipseOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstEllipseFocusNode()(){}{}": {
-      "snippet": "pstEllipseFocusNode(${3:O})(${4:a},${5:b}){${1:A}}{${2:B}}"
-    },
-    "pstEllipseFocusNode[]()(){}{}": {
-      "snippet": "pstEllipseFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}"
-    },
-    "pstEllipseDirectrixLine()(){}{}{}{}": {
-      "snippet": "pstEllipseDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstEllipseDirectrixLine[]()(){}{}{}{}": {
-      "snippet": "pstEllipseDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstEllipseLineInter()(){}{}{}{}": {
-      "snippet": "pstEllipseLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstEllipseLineInter[]()(){}{}{}{}": {
-      "snippet": "pstEllipseLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstEllipsePolarNode()(){}{}{}": {
-      "snippet": "pstEllipsePolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstEllipsePolarNode[]()(){}{}{}": {
-      "snippet": "pstEllipsePolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstEllipseTangentNode()(){}{}{}": {
-      "snippet": "pstEllipseTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstEllipseTangentNode[]()(){}{}{}": {
-      "snippet": "pstEllipseTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipse()()": {
-      "snippet": "pstGeneralEllipse(${1:O})(${2:a},${3:b})"
-    },
-    "pstGeneralEllipse()()[]": {
-      "snippet": "pstGeneralEllipse(${2:O})(${3:a},${4:b})[${1:θ}]"
-    },
-    "pstGeneralEllipse()()[][][]": {
-      "snippet": "pstGeneralEllipse(${4:O})(${5:a},${6:b})[${1:θ}][${2:angleA}][${3:angleB}]"
-    },
-    "pstGeneralEllipse[]()()": {
-      "snippet": "pstGeneralEllipse[${1:options}](${2:O})(${3:a},${4:b})"
-    },
-    "pstGeneralEllipse[]()()[]": {
-      "snippet": "pstGeneralEllipse[${1:options}](${3:O})(${4:a},${5:b})[${2:θ}]"
-    },
-    "pstGeneralEllipse[]()()[][][]": {
-      "snippet": "pstGeneralEllipse[${1:options}](${5:O})(${6:a},${7:b})[${2:θ}][${3:angleA}][${4:angleB}]"
-    },
     "pstGeneralEllipseFle{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralEllipseFle{${1:F}}{${2:A}}{${3:B}}{${4:e}}{${5:O}}{${6:Rab}}{${7:θ}}"
     },
@@ -580,10 +430,10 @@
       "snippet": "pstGeneralEllipseFFN[${6:options}]{${1:F1}}{${2:F2}}{${3:O}}{${4:Rab}}{${5:θ}}"
     },
     "pstGeneralEllipseCoef{}{}{}{}": {
-      "snippet": "pstGeneralEllipseCoef{${1:a,${5:b},${6:c},${7:d},${8:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralEllipseCoef{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralEllipseCoef[]{}{}{}{}": {
-      "snippet": "pstGeneralEllipseCoef[${5:options}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralEllipseCoef[${5:options}]{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralEllipseABCDE{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralEllipseABCDE{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
@@ -591,291 +441,6 @@
     "pstGeneralEllipseABCDE[]{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralEllipseABCDE[${9:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
     },
-    "pstGeneralEllipseNode()(){}{}": {
-      "snippet": "pstGeneralEllipseNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
-    },
-    "pstGeneralEllipseNode()()[]{}{}": {
-      "snippet": "pstGeneralEllipseNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:t}}{${2:A}}"
-    },
-    "pstGeneralEllipseNode[]()(){}{}": {
-      "snippet": "pstGeneralEllipseNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
-    },
-    "pstGeneralEllipseNode[]()()[]{}{}": {
-      "snippet": "pstGeneralEllipseNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:A}}"
-    },
-    "pstGeneralEllipseRotNode()(){}": {
-      "snippet": "pstGeneralEllipseRotNode(${2:O})(${3:a},${4:b}){${1:A}}"
-    },
-    "pstGeneralEllipseRotNode()()[]{}": {
-      "snippet": "pstGeneralEllipseRotNode(${3:O})(${4:a},${5:b})[${2:θ}]{${1:A}}"
-    },
-    "pstGeneralEllipseRotNode[]()(){}": {
-      "snippet": "pstGeneralEllipseRotNode[${2:options}](${3:O})(${4:a},${5:b}){${1:A}}"
-    },
-    "pstGeneralEllipseRotNode[]()()[]{}": {
-      "snippet": "pstGeneralEllipseRotNode[${2:options}](${4:O})(${5:a},${6:b})[${3:θ}]{${1:A}}"
-    },
-    "pstGeneralEllipseAbsNode()(){}{}{}": {
-      "snippet": "pstGeneralEllipseAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseAbsNode()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseAbsNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseAbsNode[]()(){}{}{}": {
-      "snippet": "pstGeneralEllipseAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseAbsNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseAbsNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseOrdNode()(){}{}{}": {
-      "snippet": "pstGeneralEllipseOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseOrdNode()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseOrdNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseOrdNode[]()(){}{}{}": {
-      "snippet": "pstGeneralEllipseOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseOrdNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseOrdNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseFocusNode()(){}{}{}": {
-      "snippet": "pstGeneralEllipseFocusNode(${4:O})(${5:a},${6:b}){${1:t}}{${2:F1}}{${3:F2}}"
-    },
-    "pstGeneralEllipseFocusNode()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseFocusNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:F1}}{${3:F2}}"
-    },
-    "pstGeneralEllipseFocusNode[]()(){}{}{}": {
-      "snippet": "pstGeneralEllipseFocusNode[${4:options}](${5:O})(${6:a},${7:b}){${1:t}}{${2:F1}}{${3:F2}}"
-    },
-    "pstGeneralEllipseFocusNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseFocusNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:t}}{${2:F1}}{${3:F2}}"
-    },
-    "pstGeneralEllipseDirectrixLine()(){}{}{}{}": {
-      "snippet": "pstGeneralEllipseDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralEllipseDirectrixLine()()[]{}{}{}{}": {
-      "snippet": "pstGeneralEllipseDirectrixLine(${6:O})(${7:a},${8:b})[${5:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralEllipseDirectrixLine[]()(){}{}{}{}": {
-      "snippet": "pstGeneralEllipseDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralEllipseDirectrixLine[]()()[]{}{}{}{}": {
-      "snippet": "pstGeneralEllipseDirectrixLine[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralEllipseLineInter()(){}{}{}{}": {
-      "snippet": "pstGeneralEllipseLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralEllipseLineInter()()[]{}{}{}{}": {
-      "snippet": "pstGeneralEllipseLineInter(${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralEllipseLineInter[]()(){}{}{}{}": {
-      "snippet": "pstGeneralEllipseLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralEllipseLineInter[]()()[]{}{}{}{}": {
-      "snippet": "pstGeneralEllipseLineInter[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralEllipsePolarNode()(){}{}{}": {
-      "snippet": "pstGeneralEllipsePolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralEllipsePolarNode()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipsePolarNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralEllipsePolarNode[]()(){}{}{}": {
-      "snippet": "pstGeneralEllipsePolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralEllipsePolarNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipsePolarNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralEllipseTangentNode()(){}{}{}": {
-      "snippet": "pstGeneralEllipseTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseTangentNode()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseTangentNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseTangentNode[]()(){}{}{}": {
-      "snippet": "pstGeneralEllipseTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralEllipseTangentNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralEllipseTangentNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstParabola(){}{}{}": {
-      "snippet": "pstParabola(${4:O}){${1:p}}{${2:x1}}{${3:x2}}"
-    },
-    "pstParabola[](){}{}{}": {
-      "snippet": "pstParabola[${4:options}](${5:O}){${1:p}}{${2:x1}}{${3:x2}}"
-    },
-    "pstParabolaNode(){}{}{}": {
-      "snippet": "pstParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstParabolaNode[](){}{}{}": {
-      "snippet": "pstParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstParabolaAbsNode(){}{}{}": {
-      "snippet": "pstParabolaAbsNode(${4:O}){${1:p}}{${2:x}}{${3:A}}"
-    },
-    "pstParabolaAbsNode[](){}{}{}": {
-      "snippet": "pstParabolaAbsNode[${4:options}](${5:O}){${1:p}}{${2:x}}{${3:A}}"
-    },
-    "pstParabolaOrdNode(){}{}{}{}": {
-      "snippet": "pstParabolaOrdNode(${5:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
-    },
-    "pstParabolaOrdNode[](){}{}{}{}": {
-      "snippet": "pstParabolaOrdNode[${5:options}](${6:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
-    },
-    "pstParabolaFocusNode(){}{}": {
-      "snippet": "pstParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
-    },
-    "pstParabolaFocusNode[](){}{}": {
-      "snippet": "pstParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
-    },
-    "pstParabolaDirectrixLine(){}{}{}": {
-      "snippet": "pstParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstParabolaDirectrixLine[](){}{}{}": {
-      "snippet": "pstParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstParabolaLineInter(){}{}{}{}{}": {
-      "snippet": "pstParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstParabolaPolarNode(){}{}{}{}": {
-      "snippet": "pstParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstParabolaPolarNode(){}(){}{}{}": {
-      "snippet": "pstParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstParabolaPolarNode(){}()[][]{}{}{}": {
-      "snippet": "pstParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
-    },
-    "pstParabolaPolarNode[](){}{}{}{}": {
-      "snippet": "pstParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstParabolaPolarNode[](){}(){}{}{}": {
-      "snippet": "pstParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstParabolaPolarNode[](){}()[][]{}{}{}": {
-      "snippet": "pstParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstParabolaTangentNode(){}{}{}{}": {
-      "snippet": "pstParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstParabolaTangentNode[](){}{}{}{}": {
-      "snippet": "pstParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstIParabola(){}{}{}": {
-      "snippet": "pstIParabola(${4:O}){${1:p}}{${2:y1}}{${3:y2}}"
-    },
-    "pstIParabola[](){}{}{}": {
-      "snippet": "pstIParabola[${4:options}](${5:O}){${1:p}}{${2:y1}}{${3:y2}}"
-    },
-    "pstIParabolaNode(){}{}{}": {
-      "snippet": "pstIParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstIParabolaNode[](){}{}{}": {
-      "snippet": "pstIParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstIParabolaAbsNode(){}{}{}{}": {
-      "snippet": "pstIParabolaAbsNode(${5:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstIParabolaAbsNode[](){}{}{}{}": {
-      "snippet": "pstIParabolaAbsNode[${5:options}](${6:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstIParabolaOrdNode(){}{}{}": {
-      "snippet": "pstIParabolaOrdNode(${4:O}){${1:p}}{${2:y}}{${3:A}}"
-    },
-    "pstIParabolaOrdNode[](){}{}{}": {
-      "snippet": "pstIParabolaOrdNode[${4:options}](${5:O}){${1:p}}{${2:y}}{${3:A}}"
-    },
-    "pstIParabolaFocusNode(){}{}": {
-      "snippet": "pstIParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
-    },
-    "pstIParabolaFocusNode[](){}{}": {
-      "snippet": "pstIParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
-    },
-    "pstIParabolaDirectrixLine(){}{}{}": {
-      "snippet": "pstIParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstIParabolaDirectrixLine[](){}{}{}": {
-      "snippet": "pstIParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstIParabolaLineInter(){}{}{}{}{}": {
-      "snippet": "pstIParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstIParabolaLineInter[](){}{}{}{}{}": {
-      "snippet": "pstIParabolaLineInter[${6:options}](${7:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstIParabolaPolarNode(){}{}{}{}": {
-      "snippet": "pstIParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstIParabolaPolarNode(){}(){}{}{}": {
-      "snippet": "pstIParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstIParabolaPolarNode(){}()[][]{}{}{}": {
-      "snippet": "pstIParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
-    },
-    "pstIParabolaPolarNode[](){}{}{}{}": {
-      "snippet": "pstIParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstIParabolaPolarNode[](){}(){}{}{}": {
-      "snippet": "pstIParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstIParabolaPolarNode[](){}()[][]{}{}{}": {
-      "snippet": "pstIParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstIParabolaTangentNode(){}{}{}{}": {
-      "snippet": "pstIParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstIParabolaTangentNode[](){}{}{}{}": {
-      "snippet": "pstIParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabola(){}{}{}": {
-      "snippet": "pstGeneralParabola(${4:O}){${1:p}}{${2:x1}}{${3:x2}}"
-    },
-    "pstGeneralParabola(){}[]{}{}": {
-      "snippet": "pstGeneralParabola(${5:O}){${1:p}}[${2:θ}]{${3:x1}}{${4:x2}}"
-    },
-    "pstGeneralParabola[](){}{}{}": {
-      "snippet": "pstGeneralParabola[${4:options}](${5:O}){${1:p}}{${2:x1}}{${3:x2}}"
-    },
-    "pstGeneralParabola[](){}[]{}{}": {
-      "snippet": "pstGeneralParabola[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:x1}}{${3:x2}}"
-    },
-    "pstGeneralParabolaNode(){}{}{}": {
-      "snippet": "pstGeneralParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstGeneralParabolaNode(){}[]{}{}": {
-      "snippet": "pstGeneralParabolaNode(${5:O}){${1:p}}[${2:θ}]{${3:t}}{${4:A}}"
-    },
-    "pstGeneralParabolaNode[](){}{}{}": {
-      "snippet": "pstGeneralParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstGeneralParabolaNode[](){}[]{}{}": {
-      "snippet": "pstGeneralParabolaNode[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:t}}{${3:A}}"
-    },
-    "pstGeneralParabolaAbsNode(){}{}{}{}": {
-      "snippet": "pstGeneralParabolaAbsNode(${5:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabolaAbsNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaAbsNode(${6:O}){${1:p}}[${2:θ}]{${3:x}}{${4:A}}{${5:B}}"
-    },
-    "pstGeneralParabolaAbsNode[](){}{}{}{}": {
-      "snippet": "pstGeneralParabolaAbsNode[${5:options}](${6:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabolaAbsNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaAbsNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabolaOrdNode(){}{}{}{}": {
-      "snippet": "pstGeneralParabolaOrdNode(${5:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabolaOrdNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaOrdNode(${6:O}){${1:p}}[${2:θ}]{${3:y}}{${4:A}}{${5:B}}"
-    },
-    "pstGeneralParabolaOrdNode[](){}{}{}{}": {
-      "snippet": "pstGeneralParabolaOrdNode[${5:options}](${6:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabolaOrdNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaOrdNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:y}}{${3:A}}{${4:B}}"
-    },
     "pstGeneralParabolaFl{}{}{}{}{}{}": {
       "snippet": "pstGeneralParabolaFl{${1:F}}{${2:A}}{${3:B}}{${4:O}}{${5:p}}{${6:θ}}"
     },
@@ -883,10 +448,10 @@
       "snippet": "pstGeneralParabolaFl[${7:options}]{${1:F}}{${2:A}}{${3:B}}{${4:O}}{${5:p}}{${6:θ}}"
     },
     "pstGeneralParabolaCoef{}{}{}{}": {
-      "snippet": "pstGeneralParabolaCoef{${1:a,${5:b},${6:c},${7:d},${8:e},f}}{${2:O}}{${3:p}}{${4:θ}}"
+      "snippet": "pstGeneralParabolaCoef{${1:a,b,c,d,e,f}}{${2:O}}{${3:p}}{${4:θ}}"
     },
     "pstGeneralParabolaCoef[]{}{}{}{}": {
-      "snippet": "pstGeneralParabolaCoef[${5:options}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}{${2:O}}{${3:p}}{${4:θ}}"
+      "snippet": "pstGeneralParabolaCoef[${5:options}]{${1:a,b,c,d,e,f}}{${2:O}}{${3:p}}{${4:θ}}"
     },
     "pstGeneralParabolaABCDE{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralParabolaABCDE{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:p}}{${8:θ}}"
@@ -894,372 +459,6 @@
     "pstGeneralParabolaABCDE[]{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralParabolaABCDE[${9:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:p}}{${8:θ}}"
     },
-    "pstGeneralParabolaFocusNode(){}{}": {
-      "snippet": "pstGeneralParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
-    },
-    "pstGeneralParabolaFocusNode(){}[]{}": {
-      "snippet": "pstGeneralParabolaFocusNode(${4:O}){${1:p}}[${2:θ}]{${3:F}}"
-    },
-    "pstGeneralParabolaFocusNode[](){}{}": {
-      "snippet": "pstGeneralParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
-    },
-    "pstGeneralParabolaFocusNode[](){}[]{}": {
-      "snippet": "pstGeneralParabolaFocusNode[${3:options}](${5:O}){${1:p}}[${4:θ}]{${2:F}}"
-    },
-    "pstGeneralParabolaDirectrixLine(){}{}{}": {
-      "snippet": "pstGeneralParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstGeneralParabolaDirectrixLine(){}[]{}{}": {
-      "snippet": "pstGeneralParabolaDirectrixLine(${5:O}){${1:p}}[${2:θ}]{${3:Lx}}{${4:Ly}}"
-    },
-    "pstGeneralParabolaDirectrixLine[](){}{}{}": {
-      "snippet": "pstGeneralParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstGeneralParabolaDirectrixLine[](){}[]{}{}": {
-      "snippet": "pstGeneralParabolaDirectrixLine[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:Lx}}{${3:Ly}}"
-    },
-    "pstGeneralParabolaLineInter(){}{}{}{}{}": {
-      "snippet": "pstGeneralParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstGeneralParabolaLineInter(){}[]{}{}{}{}": {
-      "snippet": "pstGeneralParabolaLineInter(${7:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:C}}{${6:D}}"
-    },
-    "pstGeneralParabolaLineInter[](){}{}{}{}{}": {
-      "snippet": "pstGeneralParabolaLineInter[${6:options}](${7:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstGeneralParabolaLineInter[](){}[]{}{}{}{}": {
-      "snippet": "pstGeneralParabolaLineInter[${6:options}](${8:O}){${1:p}}[${7:θ}]{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstGeneralParabolaPolarNode(){}{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaPolarNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode(${6:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:T}}"
-    },
-    "pstGeneralParabolaPolarNode(){}(){}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaPolarNode(){}[](){}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode(${6:O}){${1:p}}[${2:θ}](${7:F}){${3:A}}{${4:B}}{${5:T}}"
-    },
-    "pstGeneralParabolaPolarNode(){}()[][]{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
-    },
-    "pstGeneralParabolaPolarNode(){}[]()[][]{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode(${8:O}){${1:p}}[${2:θ}](${9:F})[${3:Lx}][${4:Ly}]{${5:A}}{${6:B}}{${7:T}}"
-    },
-    "pstGeneralParabolaPolarNode[](){}{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaPolarNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaPolarNode[](){}(){}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaPolarNode[](){}[](){}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}](${8:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaPolarNode[](){}()[][]{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaPolarNode[](){}[]()[][]{}{}{}": {
-      "snippet": "pstGeneralParabolaPolarNode[${5:options}](${9:O}){${1:p}}[${6:θ}](${10:F})[${7:Lx}][${8:Ly}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralParabolaTangentNode(){}{}{}{}": {
-      "snippet": "pstGeneralParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabolaTangentNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaTangentNode(${6:O}){${1:p}}[${2:θ}]{${3:T}}{${4:A}}{${5:B}}"
-    },
-    "pstGeneralParabolaTangentNode[](){}{}{}{}": {
-      "snippet": "pstGeneralParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralParabolaTangentNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralParabolaTangentNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabola(){}{}{}": {
-      "snippet": "pstGeneralIParabola(${4:O}){${1:p}}{${2:y1}}{${3:y2}}"
-    },
-    "pstGeneralIParabola[](){}{}{}": {
-      "snippet": "pstGeneralIParabola[${4:options}](${5:O}){${1:p}}{${2:y1}}{${3:y2}}"
-    },
-    "pstGeneralIParabola(){}[]{}{}": {
-      "snippet": "pstGeneralIParabola(${5:O}){${1:p}}[${2:θ}]{${3:y1}}{${4:y2}}"
-    },
-    "pstGeneralIParabola[](){}[]{}{}": {
-      "snippet": "pstGeneralIParabola[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:y1}}{${3:y2}}"
-    },
-    "pstGeneralIParabolaNode(){}{}{}": {
-      "snippet": "pstGeneralIParabolaNode(${4:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstGeneralIParabolaNode[](){}{}{}": {
-      "snippet": "pstGeneralIParabolaNode[${4:options}](${5:O}){${1:p}}{${2:t}}{${3:A}}"
-    },
-    "pstGeneralIParabolaNode(){}[]{}{}": {
-      "snippet": "pstGeneralIParabolaNode(${5:O}){${1:p}}[${2:θ}]{${3:t}}{${4:A}}"
-    },
-    "pstGeneralIParabolaNode[](){}[]{}{}": {
-      "snippet": "pstGeneralIParabolaNode[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:t}}{${3:A}}"
-    },
-    "pstGeneralIParabolaAbsNode(){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaAbsNode(${5:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaAbsNode[](){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaAbsNode[${5:options}](${6:O}){${1:p}}{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaAbsNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaAbsNode(${6:O}){${1:p}}[${2:θ}]{${3:x}}{${4:A}}{${5:B}}"
-    },
-    "pstGeneralIParabolaAbsNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaAbsNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:x}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaOrdNode(){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaOrdNode(${5:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaOrdNode[](){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaOrdNode[${5:options}](${6:O}){${1:p}}{${2:y}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaOrdNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaOrdNode(${6:O}){${1:p}}[${2:θ}]{${3:y}}{${4:A}}{${5:B}}"
-    },
-    "pstGeneralIParabolaOrdNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaOrdNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:y}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaFocusNode(){}{}": {
-      "snippet": "pstGeneralIParabolaFocusNode(${3:O}){${1:p}}{${2:F}}"
-    },
-    "pstGeneralIParabolaFocusNode[](){}{}": {
-      "snippet": "pstGeneralIParabolaFocusNode[${3:options}](${4:O}){${1:p}}{${2:F}}"
-    },
-    "pstGeneralIParabolaFocusNode(){}[]{}": {
-      "snippet": "pstGeneralIParabolaFocusNode(${4:O}){${1:p}}[${2:θ}]{${3:F}}"
-    },
-    "pstGeneralIParabolaFocusNode[](){}[]{}": {
-      "snippet": "pstGeneralIParabolaFocusNode[${3:options}](${5:O}){${1:p}}[${4:θ}]{${2:F}}"
-    },
-    "pstGeneralIParabolaDirectrixLine(){}{}{}": {
-      "snippet": "pstGeneralIParabolaDirectrixLine(${4:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstGeneralIParabolaDirectrixLine[](){}{}{}": {
-      "snippet": "pstGeneralIParabolaDirectrixLine[${4:options}](${5:O}){${1:p}}{${2:Lx}}{${3:Ly}}"
-    },
-    "pstGeneralIParabolaDirectrixLine(){}[]{}{}": {
-      "snippet": "pstGeneralIParabolaDirectrixLine(${5:O}){${1:p}}[${2:θ}]{${3:Lx}}{${4:Ly}}"
-    },
-    "pstGeneralIParabolaDirectrixLine[](){}[]{}{}": {
-      "snippet": "pstGeneralIParabolaDirectrixLine[${4:options}](${6:O}){${1:p}}[${5:θ}]{${2:Lx}}{${3:Ly}}"
-    },
-    "pstGeneralIParabolaLineInter(){}{}{}{}{}": {
-      "snippet": "pstGeneralIParabolaLineInter(${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstGeneralIParabolaLineInter[](){}{}{}{}{}": {
-      "snippet": "pstGeneralIParabolaLineInter[${6:options}](${7:O}){${1:p}}{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstGeneralIParabolaLineInter(){}[]{}{}{}{}": {
-      "snippet": "pstGeneralIParabolaLineInter(${7:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:C}}{${6:D}}"
-    },
-    "pstGeneralIParabolaLineInter[](){}[]{}{}{}{}": {
-      "snippet": "pstGeneralIParabolaLineInter[${6:options}](${8:O}){${1:p}}[${7:θ}]{${2:A}}{${3:B}}{${4:C}}{${5:D}}"
-    },
-    "pstGeneralIParabolaPolarNode(){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode(${5:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaPolarNode[](){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${6:O}){${1:p}}{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaPolarNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode(${6:O}){${1:p}}[${2:θ}]{${3:A}}{${4:B}}{${5:T}}"
-    },
-    "pstGeneralIParabolaPolarNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaPolarNode(){}(){}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode(${5:O}){${1:p}}(${6:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaPolarNode[](){}(){}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${6:O}){${1:p}}(${7:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaPolarNode(){}[](){}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode(${6:O}){${1:p}}[${2:θ}](${7:F}){${3:A}}{${4:B}}{${5:T}}"
-    },
-    "pstGeneralIParabolaPolarNode[](){}[](){}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${7:O}){${1:p}}[${6:θ}](${8:F}){${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaPolarNode(){}()[][]{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode(${7:O}){${1:p}}(${8:F})[${2:Lx}][${3:Ly}]{${4:A}}{${5:B}}{${6:T}}"
-    },
-    "pstGeneralIParabolaPolarNode[](){}()[][]{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${8:O}){${1:p}}(${9:F})[${6:Lx}][${7:Ly}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaPolarNode(){}[]()[][]{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode(${8:O}){${1:p}}[${2:θ}](${9:F})[${3:Lx}][${4:Ly}]{${5:A}}{${6:B}}{${7:T}}"
-    },
-    "pstGeneralIParabolaPolarNode[](){}[]()[][]{}{}{}": {
-      "snippet": "pstGeneralIParabolaPolarNode[${5:options}](${9:O}){${1:p}}[${6:θ}](${10:F})[${7:Lx}][${8:Ly}]{${2:A}}{${3:B}}{${4:T}}"
-    },
-    "pstGeneralIParabolaTangentNode(){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaTangentNode(${5:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaTangentNode[](){}{}{}{}": {
-      "snippet": "pstGeneralIParabolaTangentNode[${5:options}](${6:O}){${1:p}}{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstGeneralIParabolaTangentNode(){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaTangentNode(${6:O}){${1:p}}[${2:θ}]{${3:T}}{${4:A}}{${5:B}}"
-    },
-    "pstGeneralIParabolaTangentNode[](){}[]{}{}{}": {
-      "snippet": "pstGeneralIParabolaTangentNode[${5:options}](${7:O}){${1:p}}[${6:θ}]{${2:T}}{${3:A}}{${4:B}}"
-    },
-    "pstHyperbola()()": {
-      "snippet": "pstHyperbola(${1:O})(${2:a},${3:b})"
-    },
-    "pstHyperbola()()[]": {
-      "snippet": "pstHyperbola(${2:O})(${3:a},${4:b})[${1:angleX}]"
-    },
-    "pstHyperbola[]()()": {
-      "snippet": "pstHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
-    },
-    "pstHyperbola[]()()[]": {
-      "snippet": "pstHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:angleX}]"
-    },
-    "pstHyperbolaNode()(){}{}": {
-      "snippet": "pstHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
-    },
-    "pstHyperbolaNode[]()(){}{}": {
-      "snippet": "pstHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
-    },
-    "pstHyperbolaAbsNode()(){}{}{}": {
-      "snippet": "pstHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstHyperbolaAbsNode[]()(){}{}{}": {
-      "snippet": "pstHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstHyperbolaOrdNode()(){}{}{}": {
-      "snippet": "pstHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstHyperbolaOrdNode[]()(){}{}{}": {
-      "snippet": "pstHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstHyperbolaFocusNode()(){}{}": {
-      "snippet": "pstHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstHyperbolaFocusNode[]()(){}{}": {
-      "snippet": "pstHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstHyperbolaDirectrixLine()(){}{}{}{}": {
-      "snippet": "pstHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstHyperbolaDirectrixLine[]()(){}{}{}{}": {
-      "snippet": "pstHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstHyperbolaAsymptoteLine()(){}{}": {
-      "snippet": "pstHyperbolaAsymptoteLine(${3:O})(${4:a},${5:b}){${1:L1}}{${2:L2}}"
-    },
-    "pstHyperbolaAsymptoteLine[]()(){}{}": {
-      "snippet": "pstHyperbolaAsymptoteLine[${3:options}](${4:O})(${5:a},${6:b}){${1:L1}}{${2:L2}}"
-    },
-    "pstHyperbolaLineInter()(){}{}{}{}": {
-      "snippet": "pstHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstHyperbolaLineInter[]()(){}{}{}{}": {
-      "snippet": "pstHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstHyperbolaPolarNode()(){}{}{}": {
-      "snippet": "pstHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstHyperbolaPolarNode[]()(){}{}{}": {
-      "snippet": "pstHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstHyperbolaTangentNode()(){}{}{}": {
-      "snippet": "pstHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstHyperbolaTangentNode[]()(){}{}{}": {
-      "snippet": "pstHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstIHyperbola()()": {
-      "snippet": "pstIHyperbola(${1:O})(${2:a},${3:b})"
-    },
-    "pstIHyperbola()()[]": {
-      "snippet": "pstIHyperbola(${2:O})(${3:a},${4:b})[${1:angleY}]"
-    },
-    "pstIHyperbola[]()()": {
-      "snippet": "pstIHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
-    },
-    "pstIHyperbola[]()()[]": {
-      "snippet": "pstIHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:angleY}]"
-    },
-    "pstIHyperbolaNode()(){}{}": {
-      "snippet": "pstIHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
-    },
-    "pstIHyperbolaNode[]()(){}{}": {
-      "snippet": "pstIHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
-    },
-    "pstIHyperbolaAbsNode()(){}{}{}": {
-      "snippet": "pstIHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstIHyperbolaAbsNode[]()(){}{}{}": {
-      "snippet": "pstIHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstIHyperbolaOrdNode()(){}{}{}": {
-      "snippet": "pstIHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstIHyperbolaOrdNode[]()(){}{}{}": {
-      "snippet": "pstIHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstIHyperbolaFocusNode()(){}{}": {
-      "snippet": "pstIHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstIHyperbolaFocusNode[]()(){}{}": {
-      "snippet": "pstIHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstIHyperbolaDirectrixLine()(){}{}{}{}": {
-      "snippet": "pstIHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstIHyperbolaDirectrixLine[]()(){}{}{}{}": {
-      "snippet": "pstIHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstIHyperbolaAsymptoteLine()(){}{}": {
-      "snippet": "pstIHyperbolaAsymptoteLine(${3:O})(${4:a},${5:b}){${1:L1}}{${2:L2}}"
-    },
-    "pstIHyperbolaAsymptoteLine[]()(){}{}": {
-      "snippet": "pstIHyperbolaAsymptoteLine[${3:options}](${4:O})(${5:a},${6:b}){${1:L1}}{${2:L2}}"
-    },
-    "pstIHyperbolaLineInter()(){}{}{}{}": {
-      "snippet": "pstIHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstIHyperbolaLineInter[]()(){}{}{}{}": {
-      "snippet": "pstIHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstIHyperbolaPolarNode()(){}{}{}": {
-      "snippet": "pstIHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstIHyperbolaPolarNode[]()(){}{}{}": {
-      "snippet": "pstIHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstIHyperbolaTangentNode()(){}{}{}": {
-      "snippet": "pstIHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstIHyperbolaTangentNode[]()(){}{}{}": {
-      "snippet": "pstIHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbola()()": {
-      "snippet": "pstGeneralHyperbola(${1:O})(${2:a},${3:b})"
-    },
-    "pstGeneralHyperbola()()[]": {
-      "snippet": "pstGeneralHyperbola(${2:O})(${3:a},${4:b})[${1:θ}]"
-    },
-    "pstGeneralHyperbola()()[][]": {
-      "snippet": "pstGeneralHyperbola(${3:O})(${4:a},${5:b})[${1:θ}][${2:angleX}]"
-    },
-    "pstGeneralHyperbola[]()()": {
-      "snippet": "pstGeneralHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
-    },
-    "pstGeneralHyperbola[]()()[]": {
-      "snippet": "pstGeneralHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:θ}]"
-    },
-    "pstGeneralHyperbola[]()()[][]": {
-      "snippet": "pstGeneralHyperbola[${1:options}](${4:O})(${5:a},${6:b})[${2:θ}][${3:angleX}]"
-    },
     "pstGeneralHyperbolaFle{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralHyperbolaFle{${1:F}}{${2:A}}{${3:B}}{${4:e}}{${5:O}}{${6:Rab}}{${7:θ}}"
     },
@@ -1273,10 +472,10 @@
       "snippet": "pstGeneralHyperbolaFFN[${6:options}]{${1:F1}}{${2:F2}}{${3:O}}{${4:Rab}}{${5:θ}}"
     },
     "pstGeneralHyperbolaCoef{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaCoef{${1:a,${5:b},${6:c},${7:d},${8:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralHyperbolaCoef{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralHyperbolaCoef[]{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaCoef[${5:options}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}{${2:O}}{${3:Rab}}{${4:θ}}"
+      "snippet": "pstGeneralHyperbolaCoef[${5:options}]{${1:a,b,c,d,e,f}}{${2:O}}{${3:Rab}}{${4:θ}}"
     },
     "pstGeneralHyperbolaABCDE{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralHyperbolaABCDE{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
@@ -1284,425 +483,113 @@
     "pstGeneralHyperbolaABCDE[]{}{}{}{}{}{}{}{}": {
       "snippet": "pstGeneralHyperbolaABCDE[${9:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:O}}{${7:Rab}}{${8:θ}}"
     },
-    "pstGeneralHyperbolaNode()(){}{}": {
-      "snippet": "pstGeneralHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
-    },
-    "pstGeneralHyperbolaNode()()[]{}{}": {
-      "snippet": "pstGeneralHyperbolaNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:t}}{${2:A}}"
-    },
-    "pstGeneralHyperbolaNode[]()(){}{}": {
-      "snippet": "pstGeneralHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
-    },
-    "pstGeneralHyperbolaNode[]()()[]{}{}": {
-      "snippet": "pstGeneralHyperbolaNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:A}}"
-    },
-    "pstGeneralHyperbolaAbsNode()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaAbsNode()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaAbsNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaAbsNode[]()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaAbsNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaAbsNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaOrdNode()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaOrdNode()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaOrdNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaOrdNode[]()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaOrdNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaOrdNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaFocusNode()(){}{}": {
-      "snippet": "pstGeneralHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralHyperbolaFocusNode()()[]{}{}": {
-      "snippet": "pstGeneralHyperbolaFocusNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralHyperbolaFocusNode[]()(){}{}": {
-      "snippet": "pstGeneralHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralHyperbolaFocusNode[]()()[]{}{}": {
-      "snippet": "pstGeneralHyperbolaFocusNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralHyperbolaVertexNode()(){}{}": {
-      "snippet": "pstGeneralHyperbolaVertexNode(${3:O})(${4:a},${5:b}){${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralHyperbolaVertexNode()()[]{}{}": {
-      "snippet": "pstGeneralHyperbolaVertexNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralHyperbolaVertexNode[]()(){}{}": {
-      "snippet": "pstGeneralHyperbolaVertexNode[${3:options}](${4:O})(${5:a},${6:b}){${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralHyperbolaVertexNode[]()()[]{}{}": {
-      "snippet": "pstGeneralHyperbolaVertexNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralHyperbolaDirectrixLine()(){}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralHyperbolaDirectrixLine()()[]{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaDirectrixLine(${6:O})(${7:a},${8:b})[${5:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralHyperbolaDirectrixLine[]()(){}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralHyperbolaDirectrixLine[]()()[]{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaDirectrixLine[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralHyperbolaLineInter()(){}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralHyperbolaLineInter()()[]{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaLineInter(${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralHyperbolaLineInter[]()(){}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralHyperbolaLineInter[]()()[]{}{}{}{}": {
-      "snippet": "pstGeneralHyperbolaLineInter[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralHyperbolaPolarNode()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralHyperbolaPolarNode()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaPolarNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralHyperbolaPolarNode[]()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralHyperbolaPolarNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaPolarNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralHyperbolaTangentNode()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaTangentNode()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaTangentNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaTangentNode[]()(){}{}{}": {
-      "snippet": "pstGeneralHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralHyperbolaTangentNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralHyperbolaTangentNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbola()()": {
-      "snippet": "pstGeneralIHyperbola(${1:O})(${2:a},${3:b})"
-    },
-    "pstGeneralIHyperbola()()[]": {
-      "snippet": "pstGeneralIHyperbola(${2:O})(${3:a},${4:b})[${1:θ}]"
-    },
-    "pstGeneralIHyperbola()()[][]": {
-      "snippet": "pstGeneralIHyperbola(${3:O})(${4:a},${5:b})[${1:θ}][${2:angleY}]"
-    },
-    "pstGeneralIHyperbola[]()()": {
-      "snippet": "pstGeneralIHyperbola[${1:options}](${2:O})(${3:a},${4:b})"
-    },
-    "pstGeneralIHyperbola[]()()[]": {
-      "snippet": "pstGeneralIHyperbola[${1:options}](${3:O})(${4:a},${5:b})[${2:θ}]"
-    },
-    "pstGeneralIHyperbola[]()()[][]": {
-      "snippet": "pstGeneralIHyperbola[${1:options}](${4:O})(${5:a},${6:b})[${2:θ}][${3:angleY}]"
-    },
-    "pstGeneralIHyperbolaNode()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaNode(${3:O})(${4:a},${5:b}){${1:t}}{${2:A}}"
-    },
-    "pstGeneralIHyperbolaNode()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:t}}{${2:A}}"
-    },
-    "pstGeneralIHyperbolaNode[]()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaNode[${3:options}](${4:O})(${5:a},${6:b}){${1:t}}{${2:A}}"
-    },
-    "pstGeneralIHyperbolaNode[]()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:t}}{${2:A}}"
-    },
-    "pstGeneralIHyperbolaAbsNode()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaAbsNode(${4:O})(${5:a},${6:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaAbsNode()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaAbsNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaAbsNode[]()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaAbsNode[${4:options}](${5:O})(${6:a},${7:b}){${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaAbsNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaAbsNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:x}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaOrdNode()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaOrdNode(${4:O})(${5:a},${6:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaOrdNode()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaOrdNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaOrdNode[]()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaOrdNode[${4:options}](${5:O})(${6:a},${7:b}){${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaOrdNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaOrdNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:y}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaFocusNode()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaFocusNode(${3:O})(${4:a},${5:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralIHyperbolaFocusNode()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaFocusNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralIHyperbolaFocusNode[]()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaFocusNode[${3:options}](${4:O})(${5:a},${6:b}){${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralIHyperbolaFocusNode[]()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaFocusNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:F1}}{${2:F2}}"
-    },
-    "pstGeneralIHyperbolaVertexNode()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaVertexNode(${3:O})(${4:a},${5:b}){${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralIHyperbolaVertexNode()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaVertexNode(${4:O})(${5:a},${6:b})[${3:θ}]{${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralIHyperbolaVertexNode[]()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaVertexNode[${3:options}](${4:O})(${5:a},${6:b}){${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralIHyperbolaVertexNode[]()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaVertexNode[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:V1}}{${2:V2}}"
-    },
-    "pstGeneralIHyperbolaDirectrixLine()(){}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaDirectrixLine(${5:O})(${6:a},${7:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralIHyperbolaDirectrixLine()()[]{}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaDirectrixLine(${6:O})(${7:a},${8:b})[${5:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralIHyperbolaDirectrixLine[]()(){}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaDirectrixLine[${5:options}](${6:O})(${7:a},${8:b}){${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralIHyperbolaDirectrixLine[]()()[]{}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaDirectrixLine[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:Lx}}{${2:Ly}}{${3:Rx}}{${4:Ry}}"
-    },
-    "pstGeneralIHyperbolaAsymptoteLine()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaAsymptoteLine(${3:O})(${4:a},${5:b}){${1:L1}}{${2:L2}}"
-    },
-    "pstGeneralIHyperbolaAsymptoteLine()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaAsymptoteLine(${4:O})(${5:a},${6:b})[${3:θ}]{${1:L1}}{${2:L2}}"
-    },
-    "pstGeneralIHyperbolaAsymptoteLine[]()(){}{}": {
-      "snippet": "pstGeneralIHyperbolaAsymptoteLine[${3:options}](${4:O})(${5:a},${6:b}){${1:L1}}{${2:L2}}"
-    },
-    "pstGeneralIHyperbolaAsymptoteLine[]()()[]{}{}": {
-      "snippet": "pstGeneralIHyperbolaAsymptoteLine[${3:options}](${5:O})(${6:a},${7:b})[${4:θ}]{${1:L1}}{${2:L2}}"
-    },
-    "pstGeneralIHyperbolaLineInter()(){}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaLineInter(${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralIHyperbolaLineInter()()[]{}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaLineInter(${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralIHyperbolaLineInter[]()(){}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaLineInter[${5:options}](${6:O})(${7:a},${8:b}){${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralIHyperbolaLineInter[]()()[]{}{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaLineInter[${5:options}](${7:O})(${8:a},${9:b})[${6:θ}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}"
-    },
-    "pstGeneralIHyperbolaPolarNode()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaPolarNode(${4:O})(${5:a},${6:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralIHyperbolaPolarNode()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaPolarNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralIHyperbolaPolarNode[]()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaPolarNode[${4:options}](${5:O})(${6:a},${7:b}){${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralIHyperbolaPolarNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaPolarNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:A}}{${2:B}}{${3:T}}"
-    },
-    "pstGeneralIHyperbolaTangentNode()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaTangentNode(${4:O})(${5:a},${6:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaTangentNode()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaTangentNode(${5:O})(${6:a},${7:b})[${4:θ}]{${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaTangentNode[]()(){}{}{}": {
-      "snippet": "pstGeneralIHyperbolaTangentNode[${4:options}](${5:O})(${6:a},${7:b}){${1:T}}{${2:A}}{${3:B}}"
-    },
-    "pstGeneralIHyperbolaTangentNode[]()()[]{}{}{}": {
-      "snippet": "pstGeneralIHyperbolaTangentNode[${4:options}](${6:O})(${7:a},${8:b})[${5:θ}]{${1:T}}{${2:A}}{${3:B}}"
-    },
     "pstGeneralConicEquation{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicEquation{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,${8:b},${9:c},${10:d},${11:e},f}}"
+      "snippet": "pstGeneralConicEquation{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,b,c,d,e,f}}"
     },
     "pstGeneralConicEquation[]{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicEquation[${8:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,${9:b},${10:c},${11:d},${12:e},f}}"
-    },
-    "pstGeneralEllipseEquation()(){}": {
-      "snippet": "pstGeneralEllipseEquation(${2:O})(${3:a},${4:b}){${1:a,${5:b},${6:c},${7:d},${8:e},f}}"
-    },
-    "pstGeneralEllipseEquation[]()(){}": {
-      "snippet": "pstGeneralEllipseEquation[${2:options}](${3:O})(${4:a},${5:b}){${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
-    },
-    "pstGeneralEllipseEquation()()[]{}": {
-      "snippet": "pstGeneralEllipseEquation(${3:O})(${4:a},${5:b})[${2:θ}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
-    },
-    "pstGeneralEllipseEquation[]()()[]{}": {
-      "snippet": "pstGeneralEllipseEquation[${2:options}](${4:O})(${5:a},${6:b})[${3:θ}]{${1:a,${7:b},${8:c},${9:d},${10:e},f}}"
-    },
-    "pstGeneralHyperbolaEquation()(){}": {
-      "snippet": "pstGeneralHyperbolaEquation(${2:O})(${3:a},${4:b}){${1:a,${5:b},${6:c},${7:d},${8:e},f}}"
-    },
-    "pstGeneralHyperbolaEquation()()[]{}": {
-      "snippet": "pstGeneralHyperbolaEquation(${3:O})(${4:a},${5:b})[${2:θ}]{${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
-    },
-    "pstGeneralHyperbolaEquation[]()(){}": {
-      "snippet": "pstGeneralHyperbolaEquation[${2:options}](${3:O})(${4:a},${5:b}){${1:a,${6:b},${7:c},${8:d},${9:e},f}}"
-    },
-    "pstGeneralHyperbolaEquation[]()()[]{}": {
-      "snippet": "pstGeneralHyperbolaEquation[${2:options}](${4:O})(${5:a},${6:b})[${3:θ}]{${1:a,${7:b},${8:c},${9:d},${10:e},f}}"
-    },
-    "pstGeneralParabolaEquation(){}{}": {
-      "snippet": "pstGeneralParabolaEquation(${3:O}){${1:p}}{${2:a,${4:b},${5:c},${6:d},${7:e},f}}"
-    },
-    "pstGeneralParabolaEquation(){}[]{}": {
-      "snippet": "pstGeneralParabolaEquation(${4:O}){${1:p}}[${2:θ}]{${3:a,${5:b},${6:c},${7:d},${8:e},f}}"
-    },
-    "pstGeneralParabolaEquation[](){}{}": {
-      "snippet": "pstGeneralParabolaEquation[${3:options}](${4:O}){${1:p}}{${2:a,${5:b},${6:c},${7:d},${8:e},f}}"
-    },
-    "pstGeneralParabolaEquation[](){}[]{}": {
-      "snippet": "pstGeneralParabolaEquation[${3:options}](${5:O}){${1:p}}[${4:θ}]{${2:a,${6:b},${7:c},${8:d},${9:e},f}}"
+      "snippet": "pstGeneralConicEquation[${8:options}]{${1:A}}{${2:B}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}{${7:a,b,c,d,e,f}}"
     },
     "pstGeneralConicLineInter{}{}{}{}{}": {
-      "snippet": "pstGeneralConicLineInter{${1:A}}{${2:B}}{${3:a,${6:b},${7:c},${8:d},${9:e},f}}{${4:C}}{${5:D}}"
+      "snippet": "pstGeneralConicLineInter{${1:A}}{${2:B}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}"
     },
     "pstGeneralConicLineInter[]{}{}{}{}{}": {
-      "snippet": "pstGeneralConicLineInter[${6:options}]{${1:A}}{${2:B}}{${3:a,${7:b},${8:c},${9:d},${10:e},f}}{${4:C}}{${5:D}}"
+      "snippet": "pstGeneralConicLineInter[${6:options}]{${1:A}}{${2:B}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}"
     },
     "pstGeneralConicCircleInter{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicCircleInter{${1:O}}{${2:A}}{${3:a,${8:b},${9:c},${10:d},${11:e},f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
+      "snippet": "pstGeneralConicCircleInter{${1:O}}{${2:A}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
     },
     "pstGeneralConicCircleInter[]{}{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicCircleInter[${8:options}]{${1:O}}{${2:A}}{${3:a,${9:b},${10:c},${11:d},${12:e},f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
-    },
-    "pstGeneralConicEllipseInter()(){}{}{}{}{}": {
-      "snippet": "pstGeneralConicEllipseInter(${6:O})(${7:m},${8:n}){${1:a,${9:b},${10:c},${11:d},${12:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
-    },
-    "pstGeneralConicEllipseInter[]()(){}{}{}{}{}": {
-      "snippet": "pstGeneralConicEllipseInter[${6:options}](${7:O})(${8:m},${9:n}){${1:a,${10:b},${11:c},${12:d},${13:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
-    },
-    "pstGeneralConicHyperbolaInter()(){}{}{}{}{}": {
-      "snippet": "pstGeneralConicHyperbolaInter(${6:O})(${7:m},${8:n}){${1:a,${9:b},${10:c},${11:d},${12:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
-    },
-    "pstGeneralConicHyperbolaInter[]()(){}{}{}{}{}": {
-      "snippet": "pstGeneralConicHyperbolaInter[${6:options}](${7:O})(${8:m},${9:n}){${1:a,${10:b},${11:c},${12:d},${13:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
-    },
-    "pstGeneralConicIHyperbolaInter()(){}{}{}{}{}": {
-      "snippet": "pstGeneralConicIHyperbolaInter(${6:O})(${7:m},${8:n}){${1:a,${9:b},${10:c},${11:d},${12:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
-    },
-    "pstGeneralConicIHyperbolaInter[]()(){}{}{}{}{}": {
-      "snippet": "pstGeneralConicIHyperbolaInter[${6:options}](${7:O})(${8:m},${9:n}){${1:a,${10:b},${11:c},${12:d},${13:e},f}}{${2:C}}{${3:D}}{${4:E}}{${5:F}}"
-    },
-    "pstGeneralConicParabolaInter(){}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicParabolaInter(${7:O}){${1:p}}{${2:a,${8:b},${9:c},${10:d},${11:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
-    },
-    "pstGeneralConicParabolaInter[](){}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicParabolaInter[${7:options}](${8:O}){${1:p}}{${2:a,${9:b},${10:c},${11:d},${12:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
-    },
-    "pstGeneralConicIParabolaInter(){}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicIParabolaInter(${7:O}){${1:p}}{${2:a,${8:b},${9:c},${10:d},${11:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
-    },
-    "pstGeneralConicIParabolaInter[](){}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicIParabolaInter[${7:options}](${8:O}){${1:p}}{${2:a,${9:b},${10:c},${11:d},${12:e},f}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
+      "snippet": "pstGeneralConicCircleInter[${8:options}]{${1:O}}{${2:A}}{${3:a,b,c,d,e,f}}{${4:C}}{${5:D}}{${6:E}}{${7:F}}"
     },
     "pstGeneralConicInter{}{}{}{}{}{}": {
-      "snippet": "pstGeneralConicInter{${1:a,${7:b},${8:c},${9:d},${10:e},${11:f}}{${2:a'},${12:b'},${13:c'},${14:d'},${15:e'},f'}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
+      "snippet": "pstGeneralConicInter{${1:a,b,c,d,e,f}}{${2:a',b',c',d',e',f'}}{${3:C}}{${4:D}}{${5:E}}{${6:F}}"
     },
     "pstGeneralConicTangentLine{}{}{}": {
-      "snippet": "pstGeneralConicTangentLine{${1:A}}{${2:a,${4:b},${5:c},${6:d},${7:e},f}}{${3:B}}"
+      "snippet": "pstGeneralConicTangentLine{${1:A}}{${2:a,b,c,d,e,f}}{${3:B}}"
     },
     "pstGeneralConicTangentLine[]{}{}{}": {
-      "snippet": "pstGeneralConicTangentLine[${4:options}]{${1:A}}{${2:a,${5:b},${6:c},${7:d},${8:e},f}}{${3:B}}"
+      "snippet": "pstGeneralConicTangentLine[${4:options}]{${1:A}}{${2:a,b,c,d,e,f}}{${3:B}}"
     },
     "pstGeneralConicTangentChord{}{}{}{}": {
-      "snippet": "pstGeneralConicTangentChord{${1:T}}{${2:a,${5:b},${6:c},${7:d},${8:e},f}}{${3:A}}{${4:B}}"
+      "snippet": "pstGeneralConicTangentChord{${1:T}}{${2:a,b,c,d,e,f}}{${3:A}}{${4:B}}"
     },
     "pstGeneralConicTangentChord[]{}{}{}{}": {
-      "snippet": "pstGeneralConicTangentChord[${5:options}]{${1:T}}{${2:a,${6:b},${7:c},${8:d},${9:e},f}}{${3:A}}{${4:B}}"
+      "snippet": "pstGeneralConicTangentChord[${5:options}]{${1:T}}{${2:a,b,c,d,e,f}}{${3:A}}{${4:B}}"
     },
     "pstSymO{}{}": {
-      "snippet": "pstSymO{${1:O}}{${2:M1,${3:...},Mn}}"
+      "snippet": "pstSymO{${1:O}}{${2:M1,...,Mn}}"
     },
     "pstSymO{}{}[]": {
-      "snippet": "pstSymO{${1:O}}{${2:M1,${4:...},${5:Mn}}[${3:M1'},${6:...},Mn'}]"
+      "snippet": "pstSymO{${1:O}}{${2:M1,...,Mn}}[${3:M1',...,Mn'}]"
     },
     "pstSymO[]{}{}": {
-      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,${4:...},Mn}}"
+      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,...,Mn}}"
     },
     "pstSymO[]{}{}[]": {
-      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
+      "snippet": "pstSymO[${3:options}]{${1:O}}{${2:M1,...,Mn}}[${4:M1',...,Mn'}]"
     },
     "pstOrtSym{}{}{}": {
-      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,${4:...},Mn}}"
+      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
     },
     "pstOrtSym{}{}{}[]": {
-      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
+      "snippet": "pstOrtSym{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${4:M1',...,Mn'}]"
     },
     "pstOrtSym[]{}{}{}": {
-      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,${5:...},Mn}}"
+      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
     },
     "pstOrtSym[]{}{}{}[]": {
-      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,${6:...},${7:Mn}}[${5:M1'},${8:...},Mn'}]"
+      "snippet": "pstOrtSym[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${5:M1',...,Mn'}]"
     },
     "pstRotation{}{}": {
-      "snippet": "pstRotation{${1:O}}{${2:M1,${3:...},Mn}}"
+      "snippet": "pstRotation{${1:O}}{${2:M1,...,Mn}}"
     },
     "pstRotation{}{}[]": {
-      "snippet": "pstRotation{${1:O}}{${2:M1,${4:...},${5:Mn}}[${3:M1'},${6:...},Mn'}]"
+      "snippet": "pstRotation{${1:O}}{${2:M1,...,Mn}}[${3:M1',...,Mn'}]"
     },
     "pstRotation[]{}{}": {
-      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,${4:...},Mn}}"
+      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,...,Mn}}"
     },
     "pstRotation[]{}{}[]": {
-      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
+      "snippet": "pstRotation[${3:options}]{${1:O}}{${2:M1,...,Mn}}[${4:M1',...,Mn'}]"
     },
     "pstAngleAOB{}{}{}": {
       "snippet": "pstAngleAOB{${1:A}}{${2:O}}{${3:B}}"
     },
     "pstTranslation{}{}{}": {
-      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,${4:...},Mn}}"
+      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
     },
     "pstTranslation{}{}{}[]": {
-      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
+      "snippet": "pstTranslation{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${4:M1',...,Mn'}]"
     },
     "pstTranslation[]{}{}{}": {
-      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,${5:...},Mn}}"
+      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
     },
     "pstTranslation[]{}{}{}[]": {
-      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,${6:...},${7:Mn}}[${5:M1'},${8:...},Mn'}]"
+      "snippet": "pstTranslation[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${5:M1',...,Mn'}]"
     },
     "pstHomO{}{}": {
-      "snippet": "pstHomO{${1:O}}{${2:M1,${3:...},Mn}}"
+      "snippet": "pstHomO{${1:O}}{${2:M1,...,Mn}}"
     },
     "pstHomO{}{}[]": {
-      "snippet": "pstHomO{${1:O}}{${2:M1,${4:...},${5:Mn}}[${3:M1'},${6:...},Mn'}]"
+      "snippet": "pstHomO{${1:O}}{${2:M1,...,Mn}}[${3:M1',...,Mn'}]"
     },
     "pstHomO[]{}{}": {
-      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,${4:...},Mn}}"
+      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,...,Mn}}"
     },
     "pstHomO[]{}{}[]": {
-      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
+      "snippet": "pstHomO[${3:options}]{${1:O}}{${2:M1,...,Mn}}[${4:M1',...,Mn'}]"
     },
     "pstProjection{}{}{}": {
-      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,${4:...},Mn}}"
+      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
     },
     "pstProjection{}{}{}[]": {
-      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,${5:...},${6:Mn}}[${4:M1'},${7:...},Mn'}]"
+      "snippet": "pstProjection{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${4:M1',...,Mn'}]"
     },
     "pstProjection[]{}{}{}": {
-      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,${5:...},Mn}}"
+      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}"
     },
     "pstProjection[]{}{}{}[]": {
-      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,${6:...},${7:Mn}}[${5:M1'},${8:...},Mn'}]"
+      "snippet": "pstProjection[${4:options}]{${1:A}}{${2:B}}{${3:M1,...,Mn}}[${5:M1',...,Mn'}]"
     },
     "pstMiddleAB{}{}{}": {
       "snippet": "pstMiddleAB{${1:A}}{${2:B}}{${3:I}}"
@@ -1776,18 +663,6 @@
     "pstInterFC[]{}{}{}{}{}": {
       "snippet": "pstInterFC[${6:options}]{${1:f}}{${2:O}}{${3:A}}{${4:x0}}{${5:M}}"
     },
-    "psGetDistanceAB()(){}": {
-      "snippet": "psGetDistanceAB(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:name}}"
-    },
-    "psGetDistanceAB[]()(){}": {
-      "snippet": "psGetDistanceAB[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:name}}"
-    },
-    "psGetAngleABC()()(){}": {
-      "snippet": "psGetAngleABC(${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3}){${1:name}}"
-    },
-    "psGetAngleABC[]()()(){}": {
-      "snippet": "psGetAngleABC[${2:options}](${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:name}}"
-    },
     "AngleMarkCirc": {},
     "AngleMarkCros": {},
     "AngleMarkCross": {},
diff --git a/dev/packages/pst-feyn.json b/dev/packages/pst-feyn.json
index 6435be708..a3e319bad 100644
--- a/dev/packages/pst-feyn.json
+++ b/dev/packages/pst-feyn.json
@@ -4,139 +4,10 @@
     "pst-xkey": []
   },
   "macros": {
-    "psArrowArc()()": {
-      "snippet": "psArrowArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
-    },
-    "psArrowArc[]()()": {
-      "snippet": "psArrowArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
-    },
-    "psArrowArcn()()": {
-      "snippet": "psArrowArcn(${1:x},${2:y})(${3:φ1},${4:φ2})"
-    },
-    "psArrowArcn[]()()": {
-      "snippet": "psArrowArcn[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
-    },
-    "psArrowLine()()": {
-      "snippet": "psArrowLine(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psArrowLine[]()()": {
-      "snippet": "psArrowLine[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "psBCirc(){}": {
-      "snippet": "psBCirc(${2:x},${3:y}){${1:radius}}"
-    },
-    "psBCirc[](){}": {
-      "snippet": "psBCirc[${2:options}](${3:x},${4:y}){${1:radius}}"
-    },
-    "psBText(){}": {
-      "snippet": "psBText(${2:x},${3:y}){${1:text}}"
-    },
-    "psBText[](){}": {
-      "snippet": "psBText[${2:options}](${3:x},${4:y}){${1:text}}"
-    },
-    "psCArc()()": {
-      "snippet": "psCArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
-    },
-    "psCArc[]()()": {
-      "snippet": "psCArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
-    },
-    "psCCirc(){}{}{}": {
-      "snippet": "psCCirc(${4:x},${5:y}){${1:radius}}{${2:color}}{${3:color}}"
-    },
-    "psCCirc[](){}{}{}": {
-      "snippet": "psCCirc[${4:options}](${5:x},${6:y}){${1:radius}}{${2:color}}{${3:color}}"
-    },
-    "psCText(){}{}{}": {
-      "snippet": "psCText(${4:x},${5:y}){${1:color}}{${2:color}}{${3:text}}"
-    },
-    "psCText[](){}{}{}": {
-      "snippet": "psCText[${4:options}](${5:x},${6:y}){${1:color}}{${2:color}}{${3:text}}"
-    },
-    "psGluonArc()()": {
-      "snippet": "psGluonArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
-    },
-    "psGluonArc[]()()": {
-      "snippet": "psGluonArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
-    },
-    "psGluon()()": {
-      "snippet": "psGluon(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psGluon[]()()": {
-      "snippet": "psGluon[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "psPhoton()()": {
-      "snippet": "psPhoton(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psPhoton[]()()": {
-      "snippet": "psPhoton[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "psPhotonArc()()": {
-      "snippet": "psPhotonArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
-    },
-    "psPhotonArc[]()()": {
-      "snippet": "psPhotonArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
-    },
-    "psPText()(){}": {
-      "snippet": "psPText(${2:x},${3:y})(${4:φ}){${1:text}}"
-    },
-    "psPText[]()(){}": {
-      "snippet": "psPText[${2:mode}](${3:x},${4:y})(${5:φ}){${1:text}}"
-    },
-    "psText(){}": {
-      "snippet": "psText(${2:x},${3:y}){${1:text}}"
-    },
-    "psText[](){}": {
-      "snippet": "psText[${2:mode}](${3:x},${4:y}){${1:text}}"
-    },
-    "psZigZag()()": {
-      "snippet": "psZigZag(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psZigZag[]()()": {
-      "snippet": "psZigZag[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "psLinAxis()()()": {
-      "snippet": "psLinAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:num_decs},${6:per_dec},${7:hashsize},${8:offset})"
-    },
-    "psLogAxis()()()": {
-      "snippet": "psLogAxis(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:num_logs},${6:hashsize},${7:offset})"
-    },
     "axoxoff": {},
     "axoyoff": {},
     "axoxo": {},
     "axoyo": {},
-    "psLongArrowArc()()": {
-      "snippet": "psLongArrowArc(${1:x},${2:y})(${3:φ1},${4:φ2})"
-    },
-    "psLongArrowArc[]()()": {
-      "snippet": "psLongArrowArc[${1:options}](${2:x},${3:y})(${4:φ1},${5:φ2})"
-    },
-    "DashArrowArc()(){}": {
-      "snippet": "DashArrowArc(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "LongArrowArcn()()": {
-      "snippet": "LongArrowArcn(${1:x},${2:y})(${3:radius},${4:start-angle},${5:end-angle})"
-    },
-    "DashArrowArcn()(){}": {
-      "snippet": "DashArrowArcn(${2:x},${3:y})(${4:radius},${5:start-angle},${6:end-angle}){${1:dashsize}}"
-    },
-    "LongArrow()()": {
-      "snippet": "LongArrow(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "DashArrowLine()(){}": {
-      "snippet": "DashArrowLine(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:dashsize}}"
-    },
-    "psGCirc(){}{}": {
-      "snippet": "psGCirc(${3:x},${4:y}){${1:radius}}{${2:gray color spec}}"
-    },
-    "psGCirc[](){}{}": {
-      "snippet": "psGCirc[${3:options}](${4:x},${5:y}){${1:radius}}{${2:gray colorspec}}"
-    },
-    "psGText(){}{}": {
-      "snippet": "psGText(${3:x},${4:y}){${1:gray colorspec}}{${2:text}}"
-    },
-    "psGText[](){}{}": {
-      "snippet": "psGText[${3:options}](${4:x},${5:y}){${1:gray colorspec}}{${2:text}}"
-    },
     "PSTFeynLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-fractal.json b/dev/packages/pst-fractal.json
index 738d2f691..8aa9cf972 100644
--- a/dev/packages/pst-fractal.json
+++ b/dev/packages/pst-fractal.json
@@ -10,109 +10,43 @@
     "psCantor[]": {
       "snippet": "psCantor[${1:options}]"
     },
-    "psSier()()()": {
-      "snippet": "psSier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "psSier(){}{}": {
-      "snippet": "psSier(${3:x0},${4:y0}){${1:base}}{${2:recursion}}"
-    },
     "psSier[]": {
       "snippet": "psSier[${1:options}]"
     },
-    "psSier[]()()()": {
-      "snippet": "psSier[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
-    "psSier[](){}{}": {
-      "snippet": "psSier[${3:options}](${4:x0},${5:y0}){${1:base}}{${2:recursion}}"
-    },
     "psSierCarpet": {},
-    "psSierCarpet()": {
-      "snippet": "psSierCarpet(${1:x},${2:y})"
-    },
     "psSierCarpet[]": {
       "snippet": "psSierCarpet[${1:options}]"
     },
-    "psSierCarpet[]()": {
-      "snippet": "psSierCarpet[${1:options}](${2:x},${3:y})"
-    },
     "psfractal": {},
     "psfractal[]": {
       "snippet": "psfractal[${1:options}]"
     },
-    "psfractal()()": {
-      "snippet": "psfractal(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psfractal[]()()": {
-      "snippet": "psfractal[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "psPhyllotaxis": {},
     "psPhyllotaxis[]": {
       "snippet": "psPhyllotaxis[${1:options}]"
     },
-    "psPhyllotaxis()": {
-      "snippet": "psPhyllotaxis(${1:x},${2:y})"
-    },
-    "psPhyllotaxis[]()": {
-      "snippet": "psPhyllotaxis[${1:options}](${2:x},${3:y})"
-    },
     "psFern": {},
     "psFern[]": {
       "snippet": "psFern[${1:options}]"
     },
-    "psFern()": {
-      "snippet": "psFern(${1:x},${2:y})"
-    },
-    "psFern[]()": {
-      "snippet": "psFern[${1:options}](${2:x},${3:y})"
-    },
     "psKochflake": {},
     "psKochflake[]": {
       "snippet": "psKochflake[${1:options}]"
     },
-    "psKochflake()": {
-      "snippet": "psKochflake(${1:x},${2:y})"
-    },
-    "psKochflake[]()": {
-      "snippet": "psKochflake[${1:options}](${2:x},${3:y})"
-    },
     "psAppolonius": {},
     "psAppolonius[]": {
       "snippet": "psAppolonius[${1:options}]"
     },
-    "psAppolonius()": {
-      "snippet": "psAppolonius(${1:x},${2:y})"
-    },
-    "psAppolonius[]()": {
-      "snippet": "psAppolonius[${1:options}](${2:x},${3:y})"
-    },
     "psPTree": {},
     "psPTree[]": {
       "snippet": "psPTree[${1:options}]"
     },
-    "psPTree()": {
-      "snippet": "psPTree(${1:x},${2:y})"
-    },
-    "psPTree[]()": {
-      "snippet": "psPTree[${1:options}](${2:x},${3:y})"
-    },
     "psFArrow{}": {
       "snippet": "psFArrow{${1:fraction}}"
     },
     "psFArrow[]{}": {
       "snippet": "psFArrow[${2:options}]{${1:fraction}}"
     },
-    "psFArrow(){}": {
-      "snippet": "psFArrow(${2:x},${3:y}){${1:fraction}}"
-    },
-    "psFArrow[](){}": {
-      "snippet": "psFArrow[${2:options}](${3:x},${4:y}){${1:fraction}}"
-    },
-    "psFibonacciWord()": {
-      "snippet": "psFibonacciWord(${1:x},${2:y})"
-    },
-    "psFibonacciWord[]()": {
-      "snippet": "psFibonacciWord[${1:options}](${2:x},${3:y})"
-    },
     "psFibonacci": {},
     "psFibonacci[]": {
       "snippet": "psFibonacci[${1:options}]"
@@ -128,21 +62,12 @@
     "pskFibonacci[]": {
       "snippet": "pskFibonacci[${1:options}]"
     },
-    "pskFibonacci[]()": {
-      "snippet": "pskFibonacci[${1:options}](${2:x},${3:y})"
-    },
     "psBiperiodicFibonacci[]": {
       "snippet": "psBiperiodicFibonacci[${1:options}]"
     },
-    "psBiperiodicFibonacci[]()": {
-      "snippet": "psBiperiodicFibonacci[${1:options}](${2:x},${3:y})"
-    },
     "psFibonacciPolyominoes[]": {
       "snippet": "psFibonacciPolyominoes[${1:options}]"
     },
-    "psFibonacciPolyominoes[]()": {
-      "snippet": "psFibonacciPolyominoes[${1:options}](${2:x},${3:y})"
-    },
     "psHilbert": {},
     "psHilbert[]": {
       "snippet": "psHilbert[${1:options}]"
@@ -155,12 +80,6 @@
     "psHugo[]": {
       "snippet": "psHugo[${1:options}]"
     },
-    "psHugo()": {
-      "snippet": "psHugo(${1:x},${2:y})"
-    },
-    "psHugo[]()": {
-      "snippet": "psHugo[${1:options}](${2:x},${3:y})"
-    },
     "psdotcolor": {},
     "pscolorF": {},
     "PSTfractalLoaded": {}
diff --git a/dev/packages/pst-fun.json b/dev/packages/pst-fun.json
index 3fbfdbd23..73e5fab64 100644
--- a/dev/packages/pst-fun.json
+++ b/dev/packages/pst-fun.json
@@ -44,12 +44,6 @@
     "psKangaroo[]{}": {
       "snippet": "psKangaroo[${2:options}]{${1:scale}}"
     },
-    "psPig()": {
-      "snippet": "psPig(${1:x},${2:y})"
-    },
-    "psPig[]()": {
-      "snippet": "psPig[${1:options}](${2:x},${3:y})"
-    },
     "PSTfunLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-func.json b/dev/packages/pst-func.json
index 4931b29db..e485b7534 100644
--- a/dev/packages/pst-func.json
+++ b/dev/packages/pst-func.json
@@ -18,42 +18,6 @@
     "psPolynomial[]{}{}": {
       "snippet": "psPolynomial[${3:options}]{${1:x start}}{${2:x end}}"
     },
-    "psBernstein()": {
-      "snippet": "psBernstein(${1:i},${2:n})"
-    },
-    "psBernstein()()": {
-      "snippet": "psBernstein(${1:t0},${2:t1})(${3:i},${4:n})"
-    },
-    "psBernstein[]()": {
-      "snippet": "psBernstein[${1:options}](${2:i},${3:n})"
-    },
-    "psBernstein[]()()": {
-      "snippet": "psBernstein[${1:options}](${2:t0},${3:t1})(${4:i},${5:n})"
-    },
-    "psLaguerre()": {
-      "snippet": "psLaguerre(${1:x0},${2:x1})"
-    },
-    "psLaguerre[]()": {
-      "snippet": "psLaguerre[${1:options}](${2:x0},${3:x1})"
-    },
-    "psLegendre()": {
-      "snippet": "psLegendre(${1:x0},${2:x1})"
-    },
-    "psLegendre[]()": {
-      "snippet": "psLegendre[${1:options}](${2:x0},${3:x1})"
-    },
-    "psZero(){}{}": {
-      "snippet": "psZero(${3:x0},${4:x1}){${1:function}}{${2:node name}}"
-    },
-    "psZero(){}[]{}": {
-      "snippet": "psZero(${4:x0},${5:x1}){${1:functionA}}[${2:functionB}]{${3:node name}}"
-    },
-    "psZero[](){}{}": {
-      "snippet": "psZero[${3:options}](${4:x0},${5:x1}){${1:function}}{${2:node name}}"
-    },
-    "psZero[](){}[]{}": {
-      "snippet": "psZero[${3:options}](${5:x0},${6:x1}){${1:functionA}}[${4:functionB}]{${2:node name}}"
-    },
     "psFourier{}{}": {
       "snippet": "psFourier{${1:x0}}{${2:x1}}"
     },
@@ -96,24 +60,12 @@
     "psci[]{}{}": {
       "snippet": "psci[${3:options}]{${1:x0}}{${2:x1}}"
     },
-    "psIntegral{}{}(){}": {
-      "snippet": "psIntegral{${1:x0}}{${2:x1}}(${4:a},${5:b}){${3:function}}"
-    },
-    "psIntegral[]{}{}(){}": {
-      "snippet": "psIntegral[${4:options}]{${1:x0}}{${2:x1}}(${5:a},${6:b}){${3:function}}"
-    },
     "psCumIntegral{}{}{}": {
       "snippet": "psCumIntegral{${1:x0}}{${2:x1}}{${3:function}}"
     },
     "psCumIntegral[]{}{}{}": {
       "snippet": "psCumIntegral[${4:options}]{${1:x0}}{${2:x1}}{${3:function}}"
     },
-    "psConv{}{}(){}{}": {
-      "snippet": "psConv{${1:x0}}{${2:x1}}(${5:a},${6:b}){${3:function f}}{${4:function g}}"
-    },
-    "psConv[]{}{}(){}{}": {
-      "snippet": "psConv[${5:options}]{${1:x0}}{${2:x1}}(${6:a},${7:b}){${3:function f}}{${4:function g}}"
-    },
     "psGauss{}{}": {
       "snippet": "psGauss{${1:x0}}{${2:x1}}"
     },
@@ -127,10 +79,10 @@
       "snippet": "psGaussI[${3:options}]{${1:x0}}{${2:x1}}"
     },
     "psBinomial{}{}": {
-      "snippet": "psBinomial{${1:<${3:N}> or <m,${4:N> or <m},${5:n},N>}}{${2:probability}}"
+      "snippet": "psBinomial{${1:<${3:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
     },
     "psBinomial[]{}{}": {
-      "snippet": "psBinomial[${3:options}]{${1:<${4:N}> or <m,${5:N> or <m},${6:n},N>}}{${2:probability}}"
+      "snippet": "psBinomial[${3:options}]{${1:<${4:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
     },
     "psBinomialC{}{}": {
       "snippet": "psBinomialC{${1:N}}{${2:probability}}"
@@ -145,16 +97,16 @@
       "snippet": "psBinomialN[${3:options}]{${1:N}}{${2:probability}}"
     },
     "psBinomialF{}{}": {
-      "snippet": "psBinomialF{${1:<${3:N}> or <m,${4:N> or <m},${5:n},N>}}{${2:probability}}"
+      "snippet": "psBinomialF{${1:<${3:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
     },
     "psBinomialF[]{}{}": {
-      "snippet": "psBinomialF[${3:options}]{${1:<${4:N}> or <m,${5:N> or <m},${6:n},N>}}{${2:probability}}"
+      "snippet": "psBinomialF[${3:options}]{${1:<${4:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
     },
     "psBinomialFS{}{}": {
-      "snippet": "psBinomialFS{${1:<${3:N}> or <m,${4:N> or <m},${5:n},N>}}{${2:probability}}"
+      "snippet": "psBinomialFS{${1:<${3:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
     },
     "psBinomialFS[]{}{}": {
-      "snippet": "psBinomialFS[${3:options}]{${1:<${4:N}> or <m,${5:N> or <m},${6:n},N>}}{${2:probability}}"
+      "snippet": "psBinomialFS[${3:options}]{${1:<${4:N}> or <m,N> or <m,n,N>}}{${2:probability}}"
     },
     "psPoisson{}{}": {
       "snippet": "psPoisson{${1:<${3:N}> or <M,N>}}{${2:lambda}}"
@@ -264,75 +216,6 @@
     "psLame[]{}": {
       "snippet": "psLame[${2:options}]{${1:r}}"
     },
-    "psThomae(){}": {
-      "snippet": "psThomae(${2:x0},${3:x1}){${1:points}}"
-    },
-    "psThomae[](){}": {
-      "snippet": "psThomae[${2:options}](${3:x0},${4:x1}){${1:points}}"
-    },
-    "psWeierstrass(){}": {
-      "snippet": "psWeierstrass(${2:x0},${3:x1}){${1:a}}"
-    },
-    "psWeierstrass()[]{}": {
-      "snippet": "psWeierstrass(${3:x0},${4:x1})[${2:a}]{${1:b}}"
-    },
-    "psWeierstrass[](){}": {
-      "snippet": "psWeierstrass[${2:options}](${3:x0},${4:x1}){${1:a}}"
-    },
-    "psWeierstrass[]()[]{}": {
-      "snippet": "psWeierstrass[${2:options}](${4:x0},${5:x1})[${3:a}]{${1:b}}"
-    },
-    "psplotImp()(){}": {
-      "snippet": "psplotImp(${2:xmin},${3:ymin})(${4:xmax},${5:ymax}){${1:function}}"
-    },
-    "psplotImp()()[]{}": {
-      "snippet": "psplotImp(${3:xmin},${4:ymin})(${5:xmax},${6:ymax})[${2:PS code}]{${1:function}}"
-    },
-    "psplotImp[]()(){}": {
-      "snippet": "psplotImp[${2:options}](${3:xmin},${4:ymin})(${5:xmax},${6:ymax}){${1:function}}"
-    },
-    "psplotImp[]()()[]{}": {
-      "snippet": "psplotImp[${2:options}](${4:xmin},${5:ymin})(${6:xmax},${7:ymax})[${3:PS code}]{${1:function}}"
-    },
-    "psVolume(){}{}": {
-      "snippet": "psVolume(${3:x0},${4:x1}){${1:steps}}{${2:function}}"
-    },
-    "psVolume[](){}{}": {
-      "snippet": "psVolume[${3:options}](${4:x0},${5:x1}){${1:steps}}{${2:function}}"
-    },
-    "psGetZeros(){}": {
-      "snippet": "psGetZeros(${2:x0},${3:x1}){${1:function}}"
-    },
-    "psLaguerreC()()": {
-      "snippet": "psLaguerreC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
-    },
-    "psLaguerreC[]()()": {
-      "snippet": "psLaguerreC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
-    },
-    "psLaguerreCC()()": {
-      "snippet": "psLaguerreCC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
-    },
-    "psLaguerreCC[]()()": {
-      "snippet": "psLaguerreCC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
-    },
-    "psLaguerreCCC()()": {
-      "snippet": "psLaguerreCCC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
-    },
-    "psLaguerreCCC[]()()": {
-      "snippet": "psLaguerreCCC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
-    },
-    "psLaguerreCCCC()()": {
-      "snippet": "psLaguerreCCCC(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
-    },
-    "psLaguerreCCCC[]()()": {
-      "snippet": "psLaguerreCCCC[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
-    },
-    "psContourLaguerre()()": {
-      "snippet": "psContourLaguerre(${1:xmin},${2:xmax})(${3:ymin},${4:ymax})"
-    },
-    "psContourLaguerre[]()()": {
-      "snippet": "psContourLaguerre[${1:options}](${2:xmin},${3:xmax})(${4:ymin},${5:ymax})"
-    },
     "cplotstyle": {},
     "psCplot{}{}{}{}": {
       "snippet": "psCplot{${1:x0}}{${2:x1}}{${3:vars}}{${4:function}}"
diff --git a/dev/packages/pst-geo.json b/dev/packages/pst-geo.json
index e6730cd7b..3775fc4e0 100644
--- a/dev/packages/pst-geo.json
+++ b/dev/packages/pst-geo.json
@@ -31,21 +31,6 @@
     },
     "psNodeLabelStyle": {},
     "TypeProjection": {},
-    "pnodeMap(){}": {
-      "snippet": "pnodeMap(${2:longitude},${3:latitude}){${1:name}}"
-    },
-    "mapput(){}": {
-      "snippet": "mapput(${2:longitude},${3:latitude}){${1:label}}"
-    },
-    "mapput()[]{}[]": {
-      "snippet": "mapput(${4:longitude},${5:latitude})[${2:node name}]{${1:label}}[${3:country}]"
-    },
-    "mapput[](){}": {
-      "snippet": "mapput[${2:angle}](${3:longitude},${4:latitude}){${1:label}}"
-    },
-    "mapput[]()[]{}[]": {
-      "snippet": "mapput[${2:angle}](${5:longitude},${6:latitude})[${3:node name}]{${1:label}}[${4:country}]"
-    },
     "psmeridiencolor": {},
     "psmapcolor": {},
     "psparallelcolor": {},
@@ -69,36 +54,12 @@
     "pswfraczonwidth": {},
     "pswmaglinwidth": {},
     "psridgewidth": {},
-    "pnodeMapIIID(){}": {
-      "snippet": "pnodeMapIIID(${2:longitude},${3:latitude}){${1:name}}"
-    },
-    "mapputIIID(){}": {
-      "snippet": "mapputIIID(${2:longitude},${3:latitude}){${1:label}}"
-    },
-    "mapputIIID()[]{}[]": {
-      "snippet": "mapputIIID(${4:longitude},${5:latitude})[${2:node name}]{${1:label}}[${3:country}]"
-    },
-    "mapputIIID[](){}": {
-      "snippet": "mapputIIID[${2:angle}](${3:longitude},${4:latitude}){${1:label}}"
-    },
-    "mapputIIID[]()[]{}[]": {
-      "snippet": "mapputIIID[${2:angle}](${5:longitude},${6:latitude})[${3:node name}]{${1:label}}[${4:country}]"
-    },
     "psmeridien{}": {
       "snippet": "psmeridien{${1:longitude}}"
     },
     "psparallel{}": {
       "snippet": "psparallel{${1:latitude}}"
     },
-    "psGlobeTellure(){}": {
-      "snippet": "psGlobeTellure(${2:longitude},${3:latitude}){${1:name}}"
-    },
-    "psGlobeTellure[](){}": {
-      "snippet": "psGlobeTellure[${2:options}](${3:longitude},${4:latitude}){${1:name}}"
-    },
-    "psepicenter(){}": {
-      "snippet": "psepicenter(${2:longitude},${3:latitude}){${1:label}}"
-    },
     "PSTGeoLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-geometrictools.json b/dev/packages/pst-geometrictools.json
index 8bea8fbd3..e0502be2c 100644
--- a/dev/packages/pst-geometrictools.json
+++ b/dev/packages/pst-geometrictools.json
@@ -5,52 +5,13 @@
     "pst-node": []
   },
   "macros": {
-    "psProtractor{}()": {
-      "snippet": "psProtractor{${1:angle}}(${2:x},${3:y})"
-    },
-    "psProtractor[]{}()": {
-      "snippet": "psProtractor[${2:options}]{${1:angle}}(${3:x},${4:y})"
-    },
     "ProLineCol": {},
     "ProFillCol": {},
-    "psPencil{}()": {
-      "snippet": "psPencil{${1:angle}}(${2:x},${3:y})"
-    },
-    "psPencil[]{}()": {
-      "snippet": "psPencil[${2:options}]{${1:angle}}(${3:x},${4:y})"
-    },
     "pencilColA": {},
     "pencilColB": {},
-    "psRuler{}()": {
-      "snippet": "psRuler{${1:angle}}(${2:x},${3:y})"
-    },
-    "psRuler[]{}()": {
-      "snippet": "psRuler[${2:options}]{${1:angle}}(${3:x},${4:y})"
-    },
     "RulerFillCol": {},
-    "psCompass{}()": {
-      "snippet": "psCompass{${1:radius}}(${2:x},${3:y})"
-    },
-    "psCompass[]{}()": {
-      "snippet": "psCompass[${2:options}]{${1:radius}}(${3:x},${4:y})"
-    },
     "PoCFillCol": {},
     "PoCMineCol": {},
-    "psDistAB()(){}": {
-      "snippet": "psDistAB(${2:A})(${3:B}){${1:name}}"
-    },
-    "psAngleAB()(){}": {
-      "snippet": "psAngleAB(${2:A})(${3:B}){${1:name}}"
-    },
-    "psAngleAOB()()(){}": {
-      "snippet": "psAngleAOB(${2:A})(${3:O})(${4:B}){${1:name}}"
-    },
-    "psParallels()()()": {
-      "snippet": "psParallels(${1:A})(${2:B})(${3:C})"
-    },
-    "psParallels[]()()()": {
-      "snippet": "psParallels[${1:options}](${2:A})(${3:B})(${4:C})"
-    },
     "PSTgeometrictoolsLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-gr3d.json b/dev/packages/pst-gr3d.json
index 8edfb1dad..a490df977 100644
--- a/dev/packages/pst-gr3d.json
+++ b/dev/packages/pst-gr3d.json
@@ -7,12 +7,6 @@
     "pst-xkey": []
   },
   "macros": {
-    "PstGridThreeD()": {
-      "snippet": "PstGridThreeD(${1:x},${2:y},${3:z})"
-    },
-    "PstGridThreeD[]()": {
-      "snippet": "PstGridThreeD[${1:options}](${2:x},${3:y},${4:z})"
-    },
     "PstGridThreeDYFace{}{}{}": {
       "snippet": "PstGridThreeDYFace{${1:arg1}}{${2:arg2}}{${3:arg3}}"
     },
diff --git a/dev/packages/pst-hsb.json b/dev/packages/pst-hsb.json
index 03b1cb96f..dc4f1a907 100644
--- a/dev/packages/pst-hsb.json
+++ b/dev/packages/pst-hsb.json
@@ -11,12 +11,6 @@
     "psparametricplotHSB[]{}{}{}": {
       "snippet": "psparametricplotHSB[${4:options}]{${1:tmin}}{${2:tmax}}{${3:function}}"
     },
-    "pslineHSB()()": {
-      "snippet": "pslineHSB(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pslineHSB[]()()": {
-      "snippet": "pslineHSB[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
     "PSThsbLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-jtree.json b/dev/packages/pst-jtree.json
index a92cc31f0..befa58788 100644
--- a/dev/packages/pst-jtree.json
+++ b/dev/packages/pst-jtree.json
@@ -10,19 +10,10 @@
       "snippet": "jtree[${1:options}]"
     },
     "endjtree": {},
-    "defbranch<>()()": {
-      "snippet": "defbranch<${1:name}>(${2:height})(${3:slope})"
-    },
-    "deftriangle<>()()()": {
-      "snippet": "deftriangle<${1:name}>(${2:height})(${3:slopeA})(${4:slopeB})"
-    },
     "triline{}": {
       "snippet": "triline{${1:text}}"
     },
     "triwd": {},
-    "defvartriangle<>()": {
-      "snippet": "defvartriangle<${1:name}>(${2:height})"
-    },
     "jtlong": {},
     "jtshort": {},
     "jtwide": {},
@@ -40,9 +31,6 @@
     },
     "multiline": {},
     "endmultiline": {},
-    "psinterpolate()(){}{}": {
-      "snippet": "psinterpolate(${3:node1})(${4:node2}){${1:num}}{${2:node name}}"
-    },
     "elc{}": {
       "snippet": "elc{${1:text}}"
     },
diff --git a/dev/packages/pst-knot.json b/dev/packages/pst-knot.json
index 8995593f9..c0bb75322 100644
--- a/dev/packages/pst-knot.json
+++ b/dev/packages/pst-knot.json
@@ -4,18 +4,6 @@
     "pst-xkey": []
   },
   "macros": {
-    "psKnot(){}": {
-      "snippet": "psKnot(${2:x},${3:y}){${1:knot type}}"
-    },
-    "psKnot[](){}": {
-      "snippet": "psKnot[${2:options}](${3:x},${4:y}){${1:knot type}}"
-    },
-    "psBorromean(){}{}": {
-      "snippet": "psBorromean(${3:x},${4:y}){${1:circle radius}}{${2:inner radius}}"
-    },
-    "psBorromean[](){}{}": {
-      "snippet": "psBorromean[${3:options}](${4:x},${5:y}){${1:circle radius}}{${2:inner radius}}"
-    },
     "PSTknotLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-labo.json b/dev/packages/pst-labo.json
index c973e620f..8fdd1e751 100644
--- a/dev/packages/pst-labo.json
+++ b/dev/packages/pst-labo.json
@@ -71,12 +71,6 @@
     "pstDosage[]": {
       "snippet": "pstDosage[${1:options}]"
     },
-    "pstDistillation()()": {
-      "snippet": "pstDistillation(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pstDistillation[]()()": {
-      "snippet": "pstDistillation[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
     "pstSeparateFunnel": {},
     "pstSeparateFunnel[]": {
       "snippet": "pstSeparateFunnel[${1:options}]"
diff --git a/dev/packages/pst-lens.json b/dev/packages/pst-lens.json
index a90e4492e..2b4436632 100644
--- a/dev/packages/pst-lens.json
+++ b/dev/packages/pst-lens.json
@@ -8,19 +8,11 @@
     "PstLens{}": {
       "snippet": "PstLens{${1:stuff}}"
     },
-    "PstLens(){}": {
-      "snippet": "PstLens(${2:x},${3:y}){${1:stuff}}"
-    },
     "PstLens[]{}": {
       "snippet": "PstLens[${2:options}]{${1:stuff}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "PstLens[](){}": {
-      "snippet": "PstLens[${2:options}](${3:x},${4:y}){${1:stuff}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "PstLensShape": {},
     "PSTLensLoaded": {}
   },
diff --git a/dev/packages/pst-lsystem.json b/dev/packages/pst-lsystem.json
index 83ab63e5b..679dc643b 100644
--- a/dev/packages/pst-lsystem.json
+++ b/dev/packages/pst-lsystem.json
@@ -4,30 +4,9 @@
     "pst-xkey": []
   },
   "macros": {
-    "pslsystem()": {
-      "snippet": "pslsystem(${1:x},${2:y})"
-    },
-    "pslsystem[]()": {
-      "snippet": "pslsystem[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "PSTlsystemLoaded": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": [
-    [
-      "F=${1:Rule F → (F)}",
-      "X=${1:Rule X → (F,X,Y)}",
-      "Y=${1:Rule Y → (F,X,Y)}",
-      "Start=${1:Startrule S → (F,X,Y)}",
-      "Angle=${1:degrees}",
-      "N=${1:number of recursive calls}",
-      "Ftype=",
-      "BaseLength=",
-      "usecolor=",
-      "linecolor="
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/pst-magneticfield.json b/dev/packages/pst-magneticfield.json
index f93ce3a5b..fcc5a145c 100644
--- a/dev/packages/pst-magneticfield.json
+++ b/dev/packages/pst-magneticfield.json
@@ -8,34 +8,10 @@
     "pst-xkey": []
   },
   "macros": {
-    "psmagneticfield()()": {
-      "snippet": "psmagneticfield(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psmagneticfield[]()()": {
-      "snippet": "psmagneticfield[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "psmagneticfieldThreeD()()": {
-      "snippet": "psmagneticfieldThreeD(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "psmagneticfieldThreeD[]()()": {
-      "snippet": "psmagneticfieldThreeD[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "psBarMagnet": {},
-    "psBarMagnet()": {
-      "snippet": "psBarMagnet(${1:x},${2:y})"
-    },
     "psBarMagnet[]": {
       "snippet": "psBarMagnet[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "psBarMagnet[]()": {
-      "snippet": "psBarMagnet[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "CalcIntermediaire": {},
@@ -45,26 +21,6 @@
   "envs": {},
   "options": [],
   "keyvals": [
-    [
-      "R=${1:number}",
-      "N=${1:number}",
-      "L=${1:number}",
-      "nL=${1:integer}",
-      "numSpires=",
-      "pointsB=${1:integer}",
-      "pointsS=${1:integer}",
-      "PasB=${1:number}",
-      "PasS=${1:number}",
-      "nS=${1:integer}",
-      "styleSpire=${1:style}",
-      "styleCourant=${1:style}",
-      "drawSelf",
-      "AntiHelmholtz",
-      "StreamDensityPlot",
-      "setgray",
-      "changeNS",
-      "linecolor="
-    ],
     [
       "rot=${1:degrees}",
       "showField",
diff --git a/dev/packages/pst-marble.json b/dev/packages/pst-marble.json
index 17c8d0d9e..ad77aadaa 100644
--- a/dev/packages/pst-marble.json
+++ b/dev/packages/pst-marble.json
@@ -4,46 +4,9 @@
     "pst-xkey": []
   },
   "macros": {
-    "psMarble()": {
-      "snippet": "psMarble(${1:width},${2:height})"
-    },
-    "psMarble()()": {
-      "snippet": "psMarble(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psMarble[]()": {
-      "snippet": "psMarble[${1:options}](${2:width},${3:height})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "psMarble[]()()": {
-      "snippet": "psMarble[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "PSTMARBLELoaded": {}
   },
   "envs": {},
   "options": [],
-  "keyvals": [
-    [
-      "actions={${1:marbling actions}}",
-      "spractions={${1:spray actions}}",
-      "shadings={${1:shading actions}}",
-      "background={[${1:r g b}]}",
-      "paper={[${1:r g b}]}",
-      "drawcontours",
-      "seed=${1:seed}",
-      "oversample=${1:number}",
-      "overscan=${1:number}",
-      "bckg",
-      "colors={[${1:r1 g1 b1}] ${2:[r2 b2 g2] ...}}",
-      "colors={(${1:RrGgBb}) ${2:(RrGgBb) ...}}",
-      "viscosity=${1:number}",
-      "linewidth=",
-      "linecolor=",
-      "blendmode=${1:mode number}",
-      "shapealpha=${1:number}",
-      "opacity=${1:factor}"
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/pst-math.json b/dev/packages/pst-math.json
index 370e8f375..e59c80a65 100644
--- a/dev/packages/pst-math.json
+++ b/dev/packages/pst-math.json
@@ -8,9 +8,6 @@
     "xkeyval": []
   },
   "macros": {
-    "defineRandIntervall(){}": {
-      "snippet": "defineRandIntervall(${2:min},${3:max}){${1:number}}"
-    },
     "makeSimpleRandomNumberList": {},
     "makeRandomNumberList": {},
     "getNumberFromList{}": {
diff --git a/dev/packages/pst-mirror.json b/dev/packages/pst-mirror.json
index 92600d52c..b3bc428b6 100644
--- a/dev/packages/pst-mirror.json
+++ b/dev/packages/pst-mirror.json
@@ -7,18 +7,9 @@
     "pst-xkey": []
   },
   "macros": {
-    "pstSphereText(){}": {
-      "snippet": "pstSphereText(${2:x},${3:y},${4:z}){${1:text}}"
-    },
-    "pstSphereText[](){}": {
-      "snippet": "pstSphereText[${2:options}](${3:x},${4:y},${5:z}){${1:text}}"
-    },
     "pstSphereCube": {},
     "pstSphereDie": {},
     "pstSphereTetraedre": {},
-    "pstSpherePoint(){}": {
-      "snippet": "pstSpherePoint(${2:x},${3:y},${4:z}){${1:node name}}"
-    },
     "NormalIIIDCoor": {},
     "pstSphereCircle{}": {
       "snippet": "pstSphereCircle{${1:radius}}"
@@ -32,18 +23,6 @@
     "pstSphereArc[]{}{}{}": {
       "snippet": "pstSphereArc[${4:options}]{${1:radius}}{${2:angle min}}{${3:angle max}}"
     },
-    "pstSphereFrame()()": {
-      "snippet": "pstSphereFrame(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pstSphereFrame[]()()": {
-      "snippet": "pstSphereFrame[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pstSphereGrid()": {
-      "snippet": "pstSphereGrid(${1:x},${2:y},${3:z})"
-    },
-    "pstSphereGrid[]()": {
-      "snippet": "pstSphereGrid[${1:options}](${2:x},${3:y},${4:z})"
-    },
     "pstMirrorSphere{}": {
       "snippet": "pstMirrorSphere{${1:radius}}"
     },
@@ -60,12 +39,6 @@
       "snippet": "pstSphereCone[${3:options}]{${1:radius}}{${2:height}}"
     },
     "pstSpherePyramide": {},
-    "pstSphereImage(){}": {
-      "snippet": "pstSphereImage(${2:x},${3:y},${4:z}){${1:imagefile}}"
-    },
-    "pstSphereImage[](){}": {
-      "snippet": "pstSphereImage[${2:options}](${3:x},${4:y},${5:z}){${1:imagefile}}"
-    },
     "parametricplotSphere{}{}{}": {
       "snippet": "parametricplotSphere{${1:x0}}{${2:x1}}{${3:function}}"
     },
diff --git a/dev/packages/pst-moire.json b/dev/packages/pst-moire.json
index 59e58b801..c9a6b1667 100644
--- a/dev/packages/pst-moire.json
+++ b/dev/packages/pst-moire.json
@@ -5,35 +5,19 @@
     "multido": []
   },
   "macros": {
-    "psmoire()": {
-      "snippet": "psmoire(${1:x},${2:y})"
-    },
-    "psmoire[]()": {
-      "snippet": "psmoire[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "addtomoirelisttype{}": {
       "snippet": "addtomoirelisttype{${1:name}}"
     },
     "psRandomDotPatterns": {},
     "psRandomDotPatterns[]": {
       "snippet": "psRandomDotPatterns[${1:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "psRandomDot()": {
-      "snippet": "psRandomDot(${1:x},${2:y})"
-    },
-    "psRandomDot[]()": {
-      "snippet": "psRandomDot[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 2,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "psGlassPattern": {},
     "psGlassPattern[]": {
       "snippet": "psGlassPattern[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "variablesMoirages": {}
@@ -41,20 +25,6 @@
   "envs": {},
   "options": [],
   "keyvals": [
-    [
-      "type=",
-      "rotate=${1:degrees}",
-      "Rmax=${1:length in cm}",
-      "scale=${1:factor}",
-      "Alpha=${1:degrees}",
-      "E=${1:distance in cm}",
-      "n=${1:number}",
-      "T=${1:distance in mm}",
-      "linewidth=",
-      "linecolor=",
-      "dotstyle=${1:style}",
-      "dotsize="
-    ],
     [
       "NumberDots=${1:integer}",
       "coefficients=${1:a b θ x0 y0}",
@@ -65,18 +35,6 @@
       "fillcolor=",
       "unit=${1:number}"
     ],
-    [
-      "hole=",
-      "r=${1:radius in pts}",
-      "p=${1:distance in pts}",
-      "rotate=${1:degrees}",
-      "k=${1:dispersion factor}",
-      "symbole=${1:digit or letter}",
-      "PSfont=${1:PS font name}",
-      "fontsize=${1:size in pts}",
-      "vadjust=${1:number}",
-      "hadjust=${1:number}"
-    ],
     [
       "function=${1:function}",
       "layers",
diff --git a/dev/packages/pst-node.json b/dev/packages/pst-node.json
index 4f4be32c9..942ece71b 100644
--- a/dev/packages/pst-node.json
+++ b/dev/packages/pst-node.json
@@ -10,15 +10,9 @@
     "algparnode{}{}{}": {
       "snippet": "algparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
-    "AplusB()(){}": {
-      "snippet": "AplusB(${2:A})(${3:B}){${1:C}}"
-    },
     "ArrowNotch{}{}{}{}": {
       "snippet": "ArrowNotch{${1:node name}}{${2:node index}}{${3:direction}}{${4:notch}}"
     },
-    "AtoB()(){}": {
-      "snippet": "AtoB(${2:A})(${3:B}){${1:C}}"
-    },
     "Circlenode*[]{}{}": {
       "snippet": "Circlenode*[${3:options}]{${1:name}}{${2:stuff}}"
     },
@@ -43,78 +37,6 @@
     "circlenode{}{}": {
       "snippet": "circlenode{${1:name}}{${2:stuff}}"
     },
-    "Cnode(){}": {
-      "snippet": "Cnode(${2:x},${3:y}){${1:name}}"
-    },
-    "cnode(){}{}": {
-      "snippet": "cnode(${3:x},${4:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnode*(){}": {
-      "snippet": "Cnode*(${2:x},${3:y}){${1:name}}"
-    },
-    "cnode*(){}{}": {
-      "snippet": "cnode*(${3:x},${4:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnode*[](){}": {
-      "snippet": "Cnode*[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "cnode*[](){}{}": {
-      "snippet": "cnode*[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnode[](){}": {
-      "snippet": "Cnode[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "cnode[](){}{}": {
-      "snippet": "cnode[${3:options}](${4:x},${5:y}){${1:radius}}{${2:name}}"
-    },
-    "Cnodeput(){}{}{}": {
-      "snippet": "Cnodeput(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput(){}{}": {
-      "snippet": "cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput(){}{}": {
-      "snippet": "Cnodeput(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*(){}{}{}": {
-      "snippet": "Cnodeput*(${4:x},${5:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput*(){}{}": {
-      "snippet": "cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*(){}{}": {
-      "snippet": "Cnodeput*(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*[](){}{}{}": {
-      "snippet": "Cnodeput*[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput*[](){}{}": {
-      "snippet": "cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput*[](){}{}": {
-      "snippet": "Cnodeput*[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "cnodeput*[]{}(){}{}": {
-      "snippet": "cnodeput*[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
-    },
-    "cnodeput*{}(){}{}": {
-      "snippet": "cnodeput*{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
-    },
-    "Cnodeput[](){}{}{}": {
-      "snippet": "Cnodeput[${4:options}](${5:x},${6:y}){${1:angle}}{${2:name}}{${3:stuff}}"
-    },
-    "cnodeput[](){}{}": {
-      "snippet": "cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "Cnodeput[](){}{}": {
-      "snippet": "Cnodeput[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "cnodeput[]{}(){}{}": {
-      "snippet": "cnodeput[${4:options}]{${1:angle}}(${5:x},${6:y}){${2:name}}{${3:stuff}}"
-    },
-    "cnodeput{}(){}{}": {
-      "snippet": "cnodeput{${1:angle}}(${4:x},${5:y}){${2:name}}{${3:stuff}}"
-    },
     "curvepnode{}{}{}": {
       "snippet": "curvepnode{${1:tval}}{${2:expr in t}}{${3:node name}}"
     },
@@ -136,32 +58,8 @@
     "dianode{}{}": {
       "snippet": "dianode{${1:name}}{${2:stuff}}"
     },
-    "dotnode(){}": {
-      "snippet": "dotnode(${2:x},${3:y}){${1:name}}"
-    },
-    "dotnode*(){}": {
-      "snippet": "dotnode*(${2:x},${3:y}){${1:name}}"
-    },
-    "dotnode*[](){}": {
-      "snippet": "dotnode*[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "dotnode[](){}": {
-      "snippet": "dotnode[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
     "endpsmatrix": {},
     "equalwhat": {},
-    "fnode(){}": {
-      "snippet": "fnode(${2:x},${3:y}){${1:name}}"
-    },
-    "fnode*(){}": {
-      "snippet": "fnode*(${2:x},${3:y}){${1:name}}"
-    },
-    "fnode*[](){}": {
-      "snippet": "fnode*[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "fnode[](){}": {
-      "snippet": "fnode[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
     "fnpnode{}{}{}": {
       "snippet": "fnpnode{${1:xval}}{${2:expr in x}}{${3:node name}}"
     },
@@ -183,9 +81,6 @@
     "MakeShortTablr{}{}{}{}": {
       "snippet": "MakeShortTablr{${1:char1}}{${2:char2}}{${3:char3}}{${4:char4}}"
     },
-    "midAB()(){}": {
-      "snippet": "midAB(${2:A})(${3:B}){${1:C}}"
-    },
     "naput*[]{}": {
       "snippet": "naput*[${2:options}]{${1:stuff}}"
     },
@@ -576,12 +471,6 @@
     "nczigzag{}{}": {
       "snippet": "nczigzag{${1:nodeA}}{${2:nodeB}}"
     },
-    "nlput()(){}{}": {
-      "snippet": "nlput(${3:A})(${4:B}){${1:distance}}{${2:text}}"
-    },
-    "nlput[]()(){}{}": {
-      "snippet": "nlput[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:text}}"
-    },
     "nodenameA": {},
     "nodenameB": {},
     "nodex{}": {
@@ -590,9 +479,6 @@
     "nodexn{}{}": {
       "snippet": "nodexn{${1:expr}}{${2:node name}}"
     },
-    "normalvec(){}": {
-      "snippet": "normalvec(${2:coords}){${1:node name}}"
-    },
     "nput*[]{}{}{}": {
       "snippet": "nput*[${4:options}]{${1:refangle}}{${2:name}}{${3:stuff}}"
     },
@@ -617,237 +503,6 @@
     "ovalnode{}{}": {
       "snippet": "ovalnode{${1:name}}{${2:stuff}}"
     },
-    "parsenodexn{}(){}": {
-      "snippet": "parsenodexn{${1:arg1}}(${3:arg2}){${2:arg3}}"
-    },
-    "pcangle()()": {
-      "snippet": "pcangle(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcangle*()()": {
-      "snippet": "pcangle*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcangle*[]()()": {
-      "snippet": "pcangle*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangle*[]{}()()": {
-      "snippet": "pcangle*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangle*{}()()": {
-      "snippet": "pcangle*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangle[]()()": {
-      "snippet": "pcangle[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangle[]{}()()": {
-      "snippet": "pcangle[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangle{}()()": {
-      "snippet": "pcangle{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles*()()": {
-      "snippet": "pcangles*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcangles*[]()()": {
-      "snippet": "pcangles*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles*[]{}()()": {
-      "snippet": "pcangles*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangles*{}()()": {
-      "snippet": "pcangles*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles[]()()": {
-      "snippet": "pcangles[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcangles[]{}()()": {
-      "snippet": "pcangles[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcangles{}()()": {
-      "snippet": "pcangles{${1:nodeA}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc()()": {
-      "snippet": "pcarc(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarc*()()": {
-      "snippet": "pcarc*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarc*[]()()": {
-      "snippet": "pcarc*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc*[]{}()()": {
-      "snippet": "pcarc*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcarc*{}()()": {
-      "snippet": "pcarc*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc[]()()": {
-      "snippet": "pcarc[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarc[]{}()()": {
-      "snippet": "pcarc[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcarc{}()()": {
-      "snippet": "pcarc{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarcbox()()": {
-      "snippet": "pcarcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarcbox*()()": {
-      "snippet": "pcarcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcarcbox*[]()()": {
-      "snippet": "pcarcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcarcbox[]()()": {
-      "snippet": "pcarcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar()()": {
-      "snippet": "pcbar(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbar*()()": {
-      "snippet": "pcbar*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbar*[]()()": {
-      "snippet": "pcbar*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar*[]{}()()": {
-      "snippet": "pcbar*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcbar*{}()()": {
-      "snippet": "pcbar*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar[]()()": {
-      "snippet": "pcbar[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbar[]{}()()": {
-      "snippet": "pcbar[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcbar{}()()": {
-      "snippet": "pcbar{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbox()()": {
-      "snippet": "pcbox(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbox*()()": {
-      "snippet": "pcbox*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcbox*[]()()": {
-      "snippet": "pcbox*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcbox[]()()": {
-      "snippet": "pcbox[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve()()": {
-      "snippet": "pccurve(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pccurve*()()": {
-      "snippet": "pccurve*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pccurve*[]()()": {
-      "snippet": "pccurve*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve*[]{}()()": {
-      "snippet": "pccurve*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pccurve*{}()()": {
-      "snippet": "pccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve[]()()": {
-      "snippet": "pccurve[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pccurve[]{}()()": {
-      "snippet": "pccurve[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pccurve{}()()": {
-      "snippet": "pccurve{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag()()": {
-      "snippet": "pcdiag(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcdiag*()()": {
-      "snippet": "pcdiag*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcdiag*[]()()": {
-      "snippet": "pcdiag*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag*[]{}()()": {
-      "snippet": "pcdiag*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcdiag*{}()()": {
-      "snippet": "pcdiag*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag[]()()": {
-      "snippet": "pcdiag[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiag[]{}()()": {
-      "snippet": "pcdiag[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcdiag{}()()": {
-      "snippet": "pcdiag{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcdiagg()()": {
-      "snippet": "pcdiagg(${1:nodeA})(${2:nodeB})"
-    },
-    "pcdiagg[]()()": {
-      "snippet": "pcdiagg[${1:options}](${2:nodeA})(${3:nodeB})"
-    },
-    "pcline()()": {
-      "snippet": "pcline(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcline*()()": {
-      "snippet": "pcline*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcline*[]()()": {
-      "snippet": "pcline*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcline*[]{}()()": {
-      "snippet": "pcline*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcline*{}()()": {
-      "snippet": "pcline*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcline[]()()": {
-      "snippet": "pcline[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcline[]{}()()": {
-      "snippet": "pcline[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcline{}()()": {
-      "snippet": "pcline{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop()()": {
-      "snippet": "pcloop(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcloop*()()": {
-      "snippet": "pcloop*(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "pcloop*[]()()": {
-      "snippet": "pcloop*[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop*[]{}()()": {
-      "snippet": "pcloop*[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcloop*{}()()": {
-      "snippet": "pcloop*{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop[]()()": {
-      "snippet": "pcloop[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pcloop[]{}()()": {
-      "snippet": "pcloop[${2:options}]{${1:arrows}}(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pcloop{}()()": {
-      "snippet": "pcloop{${1:arrows}}(${2:x1},${3:y1})(${4:x2},${5:y2})"
-    },
-    "pnode(){}": {
-      "snippet": "pnode(${2:x},${3:y}){${1:name}}"
-    },
-    "pnode[](){}": {
-      "snippet": "pnode[${2:offset}](${3:x},${4:y}){${1:name}}"
-    },
-    "polyIntersections{}{}()(){}{}": {
-      "snippet": "polyIntersections{${1:name1}}{${2:name2}}(${5:A})(${6:B}){${3:P}}{${4:number}}"
-    },
     "pscloseNodeFile": {},
     "pscolhooki": {},
     "pscolhookii": {},
@@ -887,15 +542,6 @@
     "psLCNode{}{}{}": {
       "snippet": "psLCNode{${1:val1}}{${2:val2}}{${3:node name}}"
     },
-    "psLCNodeVar()()(){}": {
-      "snippet": "psLCNodeVar(${2:nodeA})(${3:nodeB})(${4:factorA},${5:factorB}){${1:node name}}"
-    },
-    "psLDNode()(){}{}": {
-      "snippet": "psLDNode(${3:A})(${4:B}){${1:distance}}{${2:node name}}"
-    },
-    "psLDNode[]()(){}{}": {
-      "snippet": "psLDNode[${3:options}](${4:A})(${5:B}){${1:distance}}{${2:node name}}"
-    },
     "psLNode[][]{}{}": {
       "snippet": "psLNode[${3:P1}][${4:P2}]{${1:value}}{${2:node name}}"
     },
@@ -909,67 +555,10 @@
     "psmatrix[]": {
       "snippet": "psmatrix[${1:options}]"
     },
-    "psncurve(){}": {
-      "snippet": "psncurve(${2:x},${3:y}){${1:name}}"
-    },
-    "psncurve[](){}": {
-      "snippet": "psncurve[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psncurve[]{}(){}": {
-      "snippet": "psncurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psncurve{}(){}": {
-      "snippet": "psncurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
-    "psnccurve(){}": {
-      "snippet": "psnccurve(${2:x},${3:y}){${1:name}}"
-    },
-    "psnccurve[](){}": {
-      "snippet": "psnccurve[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psnccurve[]{}(){}": {
-      "snippet": "psnccurve[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psnccurve{}(){}": {
-      "snippet": "psnccurve{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
-    "psnline(){}": {
-      "snippet": "psnline(${2:x},${3:y}){${1:name}}"
-    },
-    "psnline[](){}": {
-      "snippet": "psnline[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psnline[]{}(){}": {
-      "snippet": "psnline[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psnline{}(){}": {
-      "snippet": "psnline{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
-    "psnode(){}{}": {
-      "snippet": "psnode(${3:x},${4:y}){${1:name}}{${2:stuff}}"
-    },
-    "psnode[](){}{}": {
-      "snippet": "psnode[${3:options}](${4:x},${5:y}){${1:name}}{${2:stuff}}"
-    },
-    "psnpolygon(){}": {
-      "snippet": "psnpolygon(${2:x},${3:y}){${1:name}}"
-    },
-    "psnpolygon[](){}": {
-      "snippet": "psnpolygon[${2:options}](${3:x},${4:y}){${1:name}}"
-    },
-    "psnpolygon[]{}(){}": {
-      "snippet": "psnpolygon[${3:options}]{${1:arrows}}(${4:x},${5:y}){${2:name}}"
-    },
-    "psnpolygon{}(){}": {
-      "snippet": "psnpolygon{${1:arrows}}(${3:x},${4:y}){${2:name}}"
-    },
     "psopenNodeFile": {},
     "psparnode{}{}{}": {
       "snippet": "psparnode{${1:t}}{${2:expr in t}}{${3:node name}}"
     },
-    "psRelLineVar()()(){}": {
-      "snippet": "psRelLineVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
-    },
     "psRelNode[][]{}{}": {
       "snippet": "psRelNode[${3:P0}][${4:P1}]{${1:length factor}}{${2:end node name}}"
     },
@@ -979,9 +568,6 @@
     "psRelNode{}{}": {
       "snippet": "psRelNode{${1:length factor}}{${2:end node name}}"
     },
-    "psRelNodeVar()()(){}": {
-      "snippet": "psRelNodeVar(${2:nodeA})(${3:nodeB})(${4:radius;angle}){${1:node name}}"
-    },
     "psrowhooki": {},
     "psrowhookii": {},
     "psrowhookiii": {},
@@ -1000,21 +586,6 @@
       "snippet": "pstloop{${1:arg}}"
     },
     "PSTnodesLoaded": {},
-    "psxline(){}{}": {
-      "snippet": "psxline(${3:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
-    },
-    "psxline[](){}{}": {
-      "snippet": "psxline[${3:options}](${4:basept}){${1:nodeexpr1}}{${2:nodeexpr2}}"
-    },
-    "psxline[]{}(){}{}": {
-      "snippet": "psxline[${4:options}]{${1:arrows}}(${5:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
-    },
-    "psxline{}(){}{}": {
-      "snippet": "psxline{${1:arrows}}(${4:basept}){${2:nodeexpr1}}{${3:nodeexpr2}}"
-    },
-    "rhombus{}()(){}{}": {
-      "snippet": "rhombus{${1:edge length}}(${4:A})(${5:B}){${2:C}}{${3:D}}"
-    },
     "rnode[]{}{}": {
       "snippet": "rnode[${3:refpoint}]{${1:name}}{${2:stuff}}"
     },
@@ -1027,9 +598,6 @@
     "saveDataAsNodes{}{}": {
       "snippet": "saveDataAsNodes{${1:data}}{${2:node prefix}}"
     },
-    "shownode()": {
-      "snippet": "shownode(${1:P})"
-    },
     "taput*[]{}": {
       "snippet": "taput*[${2:options}]{${1:stuff}}"
     },
@@ -1155,24 +723,6 @@
     "bput*[]{}{}": {
       "snippet": "bput*[${3:labelsep}]{${1:angle}}{${2:stuff}}"
     },
-    "Lput{}{}(){}": {
-      "snippet": "Lput{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
-    },
-    "Lput{}[]{}(){}": {
-      "snippet": "Lput{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
-    },
-    "Lput*{}{}(){}": {
-      "snippet": "Lput*{${1:labelsep}}{${2:rotation}}(${4:pos}){${3:stuff}}"
-    },
-    "Lput*{}[]{}(){}": {
-      "snippet": "Lput*{${1:labelsep}}[${2:refpoint}]{${3:rotation}}(${5:pos}){${4:stuff}}"
-    },
-    "lput(){}": {
-      "snippet": "lput(${2:pos}){${1:stuff}}"
-    },
-    "lput*(){}": {
-      "snippet": "lput*(${2:pos}){${1:stuff}}"
-    },
     "lput{}{}": {
       "snippet": "lput{${1:angle}}{${2:stuff}}"
     },
diff --git a/dev/packages/pst-optexp.json b/dev/packages/pst-optexp.json
index b43928175..b07d5ba0f 100644
--- a/dev/packages/pst-optexp.json
+++ b/dev/packages/pst-optexp.json
@@ -12,570 +12,6 @@
     "environ": []
   },
   "macros": {
-    "lens()()": {
-      "snippet": "lens(${1:in})(${2:out})"
-    },
-    "lens()(){}": {
-      "snippet": "lens(${2:in})(${3:out}){${1:label}}"
-    },
-    "lens[]()()": {
-      "snippet": "lens[${1:options}](${2:in})(${3:out})"
-    },
-    "lens[]()(){}": {
-      "snippet": "lens[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "asphericlens()()": {
-      "snippet": "asphericlens(${1:in})(${2:out})"
-    },
-    "asphericlens()(){}": {
-      "snippet": "asphericlens(${2:in})(${3:out}){${1:label}}"
-    },
-    "asphericlens[]()()": {
-      "snippet": "asphericlens[${1:options}](${2:in})(${3:out})"
-    },
-    "asphericlens[]()(){}": {
-      "snippet": "asphericlens[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optplate()()": {
-      "snippet": "optplate(${1:in})(${2:out})"
-    },
-    "optplate()(){}": {
-      "snippet": "optplate(${2:in})(${3:out}){${1:label}}"
-    },
-    "optplate[]()()": {
-      "snippet": "optplate[${1:options}](${2:in})(${3:out})"
-    },
-    "optplate[]()(){}": {
-      "snippet": "optplate[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optretplate()()": {
-      "snippet": "optretplate(${1:in})(${2:out})"
-    },
-    "optretplate()(){}": {
-      "snippet": "optretplate(${2:in})(${3:out}){${1:label}}"
-    },
-    "optretplate[]()()": {
-      "snippet": "optretplate[${1:options}](${2:in})(${3:out})"
-    },
-    "optretplate[]()(){}": {
-      "snippet": "optretplate[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "pinhole()()": {
-      "snippet": "pinhole(${1:in})(${2:out})"
-    },
-    "pinhole()(){}": {
-      "snippet": "pinhole(${2:in})(${3:out}){${1:label}}"
-    },
-    "pinhole[]()()": {
-      "snippet": "pinhole[${1:options}](${2:in})(${3:out})"
-    },
-    "pinhole[]()(){}": {
-      "snippet": "pinhole[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optbox()()": {
-      "snippet": "optbox(${1:in})(${2:out})"
-    },
-    "optbox()(){}": {
-      "snippet": "optbox(${2:in})(${3:out}){${1:label}}"
-    },
-    "optbox[]()()": {
-      "snippet": "optbox[${1:options}](${2:in})(${3:out})"
-    },
-    "optbox[]()(){}": {
-      "snippet": "optbox[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optarrowcomp()()": {
-      "snippet": "optarrowcomp(${1:in})(${2:out})"
-    },
-    "optarrowcomp()(){}": {
-      "snippet": "optarrowcomp(${2:in})(${3:out}){${1:label}}"
-    },
-    "optarrowcomp[]()()": {
-      "snippet": "optarrowcomp[${1:options}](${2:in})(${3:out})"
-    },
-    "optarrowcomp[]()(){}": {
-      "snippet": "optarrowcomp[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optbarcomp()()": {
-      "snippet": "optbarcomp(${1:in})(${2:out})"
-    },
-    "optbarcomp()(){}": {
-      "snippet": "optbarcomp(${2:in})(${3:out}){${1:label}}"
-    },
-    "optbarcomp[]()()": {
-      "snippet": "optbarcomp[${1:options}](${2:in})(${3:out})"
-    },
-    "optbarcomp[]()(){}": {
-      "snippet": "optbarcomp[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optsource()()": {
-      "snippet": "optsource(${1:in})(${2:out})"
-    },
-    "optsource()(){}": {
-      "snippet": "optsource(${2:in})(${3:out}){${1:label}}"
-    },
-    "optsource[]()()": {
-      "snippet": "optsource[${1:options}](${2:in})(${3:out})"
-    },
-    "optsource[]()(){}": {
-      "snippet": "optsource[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "crystal()()": {
-      "snippet": "crystal(${1:in})(${2:out})"
-    },
-    "crystal()(){}": {
-      "snippet": "crystal(${2:in})(${3:out}){${1:label}}"
-    },
-    "crystal[]()()": {
-      "snippet": "crystal[${1:options}](${2:in})(${3:out})"
-    },
-    "crystal[]()(){}": {
-      "snippet": "crystal[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optdiode()()": {
-      "snippet": "optdiode(${1:in})(${2:out})"
-    },
-    "optdiode()(){}": {
-      "snippet": "optdiode(${2:in})(${3:out}){${1:label}}"
-    },
-    "optdiode[]()()": {
-      "snippet": "optdiode[${1:options}](${2:in})(${3:out})"
-    },
-    "optdiode[]()(){}": {
-      "snippet": "optdiode[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "doveprism()()": {
-      "snippet": "doveprism(${1:in})(${2:out})"
-    },
-    "doveprism()(){}": {
-      "snippet": "doveprism(${2:in})(${3:out}){${1:label}}"
-    },
-    "doveprism[]()()": {
-      "snippet": "doveprism[${1:options}](${2:in})(${3:out})"
-    },
-    "doveprism[]()(){}": {
-      "snippet": "doveprism[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "glanthompson()()": {
-      "snippet": "glanthompson(${1:in})(${2:out})"
-    },
-    "glanthompson()(){}": {
-      "snippet": "glanthompson(${2:in})(${3:out}){${1:label}}"
-    },
-    "glanthompson[]()()": {
-      "snippet": "glanthompson[${1:options}](${2:in})(${3:out})"
-    },
-    "glanthompson[]()(){}": {
-      "snippet": "glanthompson[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "polarization()()": {
-      "snippet": "polarization(${1:in})(${2:out})"
-    },
-    "polarization()(){}": {
-      "snippet": "polarization(${2:in})(${3:out}){${1:label}}"
-    },
-    "polarization[]()()": {
-      "snippet": "polarization[${1:options}](${2:in})(${3:out})"
-    },
-    "polarization[]()(){}": {
-      "snippet": "polarization[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optwedge()()": {
-      "snippet": "optwedge(${1:in})(${2:out})"
-    },
-    "optwedge()(){}": {
-      "snippet": "optwedge(${2:in})(${3:out}){${1:label}}"
-    },
-    "optwedge[]()()": {
-      "snippet": "optwedge[${1:options}](${2:in})(${3:out})"
-    },
-    "optwedge[]()(){}": {
-      "snippet": "optwedge[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "axicon()()": {
-      "snippet": "axicon(${1:in})(${2:out})"
-    },
-    "axicon()(){}": {
-      "snippet": "axicon(${2:in})(${3:out}){${1:label}}"
-    },
-    "axicon[]()()": {
-      "snippet": "axicon[${1:options}](${2:in})(${3:out})"
-    },
-    "axicon[]()(){}": {
-      "snippet": "axicon[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "mirror()()()": {
-      "snippet": "mirror(${1:in})(${2:center})(${3:out})"
-    },
-    "mirror()()(){}": {
-      "snippet": "mirror(${2:in})(${3:center})(${4:out}){${1:label}}"
-    },
-    "mirror[]()()()": {
-      "snippet": "mirror[${1:options}](${2:in})(${3:center})(${4:out})"
-    },
-    "mirror[]()()(){}": {
-      "snippet": "mirror[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
-    },
-    "parabolicmirror()()": {
-      "snippet": "parabolicmirror(${1:in})(${2:out})"
-    },
-    "parabolicmirror()(){}": {
-      "snippet": "parabolicmirror(${2:in})(${3:out}){${1:label}}"
-    },
-    "parabolicmirror[]()()": {
-      "snippet": "parabolicmirror[${1:options}](${2:in})(${3:out})"
-    },
-    "parabolicmirror[]()(){}": {
-      "snippet": "parabolicmirror[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "oapmirror()()()": {
-      "snippet": "oapmirror(${1:in})(${2:center})(${3:focus})"
-    },
-    "oapmirror()()(){}": {
-      "snippet": "oapmirror(${2:in})(${3:center})(${4:focus}){${1:label}}"
-    },
-    "oapmirror[]()()()": {
-      "snippet": "oapmirror[${1:options}](${2:in})(${3:center})(${4:focus})"
-    },
-    "oapmirror[]()()(){}": {
-      "snippet": "oapmirror[${2:options}](${3:in})(${4:center})(${5:focus}){${1:label}}"
-    },
-    "beamsplitter()()()": {
-      "snippet": "beamsplitter(${1:in})(${2:center})(${3:out})"
-    },
-    "beamsplitter()()(){}": {
-      "snippet": "beamsplitter(${2:in})(${3:center})(${4:out}){${1:label}}"
-    },
-    "beamsplitter[]()()()": {
-      "snippet": "beamsplitter[${1:options}](${2:in})(${3:center})(${4:out})"
-    },
-    "beamsplitter[]()()(){}": {
-      "snippet": "beamsplitter[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
-    },
-    "optgrating()()()": {
-      "snippet": "optgrating(${1:in})(${2:center})(${3:out})"
-    },
-    "optgrating()()(){}": {
-      "snippet": "optgrating(${2:in})(${3:center})(${4:out}){${1:label}}"
-    },
-    "optgrating[]()()()": {
-      "snippet": "optgrating[${1:options}](${2:in})(${3:center})(${4:out})"
-    },
-    "optgrating[]()()(){}": {
-      "snippet": "optgrating[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
-    },
-    "transmissiongrating()()()": {
-      "snippet": "transmissiongrating(${1:in})(${2:center})(${3:out})"
-    },
-    "transmissiongrating()()(){}": {
-      "snippet": "transmissiongrating(${2:in})(${3:center})(${4:out}){${1:label}}"
-    },
-    "transmissiongrating[]()()()": {
-      "snippet": "transmissiongrating[${1:options}](${2:in})(${3:center})(${4:out})"
-    },
-    "transmissiongrating[]()()(){}": {
-      "snippet": "transmissiongrating[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
-    },
-    "optaom()()()": {
-      "snippet": "optaom(${1:in})(${2:trans})(${3:diff})"
-    },
-    "optaom()()(){}": {
-      "snippet": "optaom(${2:in})(${3:trans})(${4:diff}){${1:label}}"
-    },
-    "optaom[]()()()": {
-      "snippet": "optaom[${1:options}](${2:in})(${3:trans})(${4:diff})"
-    },
-    "optaom[]()()(){}": {
-      "snippet": "optaom[${2:options}](${3:in})(${4:trans})(${5:diff}){${1:label}}"
-    },
-    "optprism()()()": {
-      "snippet": "optprism(${1:in})(${2:center})(${3:out})"
-    },
-    "optprism()()(){}": {
-      "snippet": "optprism(${2:in})(${3:center})(${4:out}){${1:label}}"
-    },
-    "optprism[]()()()": {
-      "snippet": "optprism[${1:options}](${2:in})(${3:center})(${4:out})"
-    },
-    "optprism[]()()(){}": {
-      "snippet": "optprism[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
-    },
-    "rightangleprism()()()": {
-      "snippet": "rightangleprism(${1:in})(${2:center})(${3:out})"
-    },
-    "rightangleprism()()(){}": {
-      "snippet": "rightangleprism(${2:in})(${3:center})(${4:out}){${1:label}}"
-    },
-    "rightangleprism[]()()()": {
-      "snippet": "rightangleprism[${1:options}](${2:in})(${3:center})(${4:out})"
-    },
-    "rightangleprism[]()()(){}": {
-      "snippet": "rightangleprism[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
-    },
-    "pentaprism()()()": {
-      "snippet": "pentaprism(${1:in})(${2:center})(${3:out})"
-    },
-    "pentaprism()()(){}": {
-      "snippet": "pentaprism(${2:in})(${3:center})(${4:out}){${1:label}}"
-    },
-    "pentaprism[]()()()": {
-      "snippet": "pentaprism[${1:options}](${2:in})(${3:center})(${4:out})"
-    },
-    "pentaprism[]()()(){}": {
-      "snippet": "pentaprism[${2:options}](${3:in})(${4:center})(${5:out}){${1:label}}"
-    },
-    "optfiber()()": {
-      "snippet": "optfiber(${1:in})(${2:out})"
-    },
-    "optfiber()(){}": {
-      "snippet": "optfiber(${2:in})(${3:out}){${1:label}}"
-    },
-    "optfiber[]()()": {
-      "snippet": "optfiber[${1:options}](${2:in})(${3:out})"
-    },
-    "optfiber[]()(){}": {
-      "snippet": "optfiber[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optamp()()": {
-      "snippet": "optamp(${1:in})(${2:out})"
-    },
-    "optamp()(){}": {
-      "snippet": "optamp(${2:in})(${3:out}){${1:label}}"
-    },
-    "optamp[]()()": {
-      "snippet": "optamp[${1:options}](${2:in})(${3:out})"
-    },
-    "optamp[]()(){}": {
-      "snippet": "optamp[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optmzm()()": {
-      "snippet": "optmzm(${1:in})(${2:out})"
-    },
-    "optmzm()(){}": {
-      "snippet": "optmzm(${2:in})(${3:out}){${1:label}}"
-    },
-    "optmzm[]()()": {
-      "snippet": "optmzm[${1:options}](${2:in})(${3:out})"
-    },
-    "optmzm[]()(){}": {
-      "snippet": "optmzm[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "polcontrol()()": {
-      "snippet": "polcontrol(${1:in})(${2:out})"
-    },
-    "polcontrol()(){}": {
-      "snippet": "polcontrol(${2:in})(${3:out}){${1:label}}"
-    },
-    "polcontrol[]()()": {
-      "snippet": "polcontrol[${1:options}](${2:in})(${3:out})"
-    },
-    "polcontrol[]()(){}": {
-      "snippet": "polcontrol[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optisolator()()": {
-      "snippet": "optisolator(${1:in})(${2:out})"
-    },
-    "optisolator()(){}": {
-      "snippet": "optisolator(${2:in})(${3:out}){${1:label}}"
-    },
-    "optisolator[]()()": {
-      "snippet": "optisolator[${1:options}](${2:in})(${3:out})"
-    },
-    "optisolator[]()(){}": {
-      "snippet": "optisolator[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optswitch()()": {
-      "snippet": "optswitch(${1:in})(${2:out})"
-    },
-    "optswitch()(){}": {
-      "snippet": "optswitch(${2:in})(${3:out}){${1:label}}"
-    },
-    "optswitch[]()()": {
-      "snippet": "optswitch[${1:options}](${2:in})(${3:out})"
-    },
-    "optswitch[]()(){}": {
-      "snippet": "optswitch[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "fiberdelayline()()": {
-      "snippet": "fiberdelayline(${1:in})(${2:out})"
-    },
-    "fiberdelayline()(){}": {
-      "snippet": "fiberdelayline(${2:in})(${3:out}){${1:label}}"
-    },
-    "fiberdelayline[]()()": {
-      "snippet": "fiberdelayline[${1:options}](${2:in})(${3:out})"
-    },
-    "fiberdelayline[]()(){}": {
-      "snippet": "fiberdelayline[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optfiberpolarizer()()": {
-      "snippet": "optfiberpolarizer(${1:in})(${2:out})"
-    },
-    "optfiberpolarizer()(){}": {
-      "snippet": "optfiberpolarizer(${2:in})(${3:out}){${1:label}}"
-    },
-    "optfiberpolarizer[]()()": {
-      "snippet": "optfiberpolarizer[${1:options}](${2:in})(${3:out})"
-    },
-    "optfiberpolarizer[]()(){}": {
-      "snippet": "optfiberpolarizer[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optcirculator()()()": {
-      "snippet": "optcirculator(${1:left})(${2:right})(${3:bottom})"
-    },
-    "optcirculator()()(){}": {
-      "snippet": "optcirculator(${2:left})(${3:right})(${4:bottom}){${1:label}}"
-    },
-    "optcirculator[]()()()": {
-      "snippet": "optcirculator[${1:options}](${2:left})(${3:right})(${4:bottom})"
-    },
-    "optcirculator[]()()(){}": {
-      "snippet": "optcirculator[${2:options}](${3:left})(${4:right})(${5:bottom}){${1:label}}"
-    },
-    "optcoupler()()": {
-      "snippet": "optcoupler(${1:in})(${2:out})"
-    },
-    "optcoupler()(){}": {
-      "snippet": "optcoupler(${2:in})(${3:out}){${1:label}}"
-    },
-    "optcoupler()()()()": {
-      "snippet": "optcoupler(${1:tl})(${2:bl})(${3:tr})(${4:br})"
-    },
-    "optcoupler()()()(){}": {
-      "snippet": "optcoupler(${2:tl})(${3:bl})(${4:tr})(${5:br}){${1:label}}"
-    },
-    "optcoupler[]()()": {
-      "snippet": "optcoupler[${1:options}](${2:in})(${3:out})"
-    },
-    "optcoupler[]()(){}": {
-      "snippet": "optcoupler[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "optcoupler[]()()()()": {
-      "snippet": "optcoupler[${1:options}](${2:tl})(${3:bl})(${4:tr})(${5:br})"
-    },
-    "optcoupler[]()()()(){}": {
-      "snippet": "optcoupler[${2:options}](${3:tl})(${4:bl})(${5:tr})(${6:br}){${1:label}}"
-    },
-    "wdmcoupler()()": {
-      "snippet": "wdmcoupler(${1:in})(${2:out})"
-    },
-    "wdmcoupler()(){}": {
-      "snippet": "wdmcoupler(${2:in})(${3:out}){${1:label}}"
-    },
-    "wdmcoupler[]()()": {
-      "snippet": "wdmcoupler[${1:options}](${2:in})(${3:out})"
-    },
-    "wdmcoupler[]()(){}": {
-      "snippet": "wdmcoupler[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "wdmsplitter()()": {
-      "snippet": "wdmsplitter(${1:in})(${2:out})"
-    },
-    "wdmsplitter()(){}": {
-      "snippet": "wdmsplitter(${2:in})(${3:out}){${1:label}}"
-    },
-    "wdmsplitter[]()()": {
-      "snippet": "wdmsplitter[${1:options}](${2:in})(${3:out})"
-    },
-    "wdmsplitter[]()(){}": {
-      "snippet": "wdmsplitter[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "fiberbox()()": {
-      "snippet": "fiberbox(${1:in})(${2:out})"
-    },
-    "fiberbox()(){}": {
-      "snippet": "fiberbox(${2:in})(${3:out}){${1:label}}"
-    },
-    "fiberbox()()()()": {
-      "snippet": "fiberbox(${1:tl})(${2:bl})(${3:tr})(${4:br})"
-    },
-    "fiberbox()()()(){}": {
-      "snippet": "fiberbox(${2:tl})(${3:bl})(${4:tr})(${5:br}){${1:label}}"
-    },
-    "fiberbox[]()()": {
-      "snippet": "fiberbox[${1:options}](${2:in})(${3:out})"
-    },
-    "fiberbox[]()(){}": {
-      "snippet": "fiberbox[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "fiberbox[]()()()()": {
-      "snippet": "fiberbox[${1:options}](${2:tl})(${3:bl})(${4:tr})(${5:br})"
-    },
-    "fiberbox[]()()()(){}": {
-      "snippet": "fiberbox[${2:options}](${3:tl})(${4:bl})(${5:tr})(${6:br}){${1:label}}"
-    },
-    "eleccoupler()()()()": {
-      "snippet": "eleccoupler(${1:tl})(${2:bl})(${3:tr})(${4:br})"
-    },
-    "eleccoupler()()()(){}": {
-      "snippet": "eleccoupler(${2:tl})(${3:bl})(${4:tr})(${5:br}){${1:label}}"
-    },
-    "eleccoupler[]()()()()": {
-      "snippet": "eleccoupler[${1:options}](${2:tl})(${3:bl})(${4:tr})(${5:br})"
-    },
-    "eleccoupler[]()()()(){}": {
-      "snippet": "eleccoupler[${2:options}](${3:tl})(${4:bl})(${5:tr})(${6:br}){${1:label}}"
-    },
-    "elecsynthesizer()()": {
-      "snippet": "elecsynthesizer(${1:in})(${2:out})"
-    },
-    "elecsynthesizer()(){}": {
-      "snippet": "elecsynthesizer(${2:in})(${3:out}){${1:label}}"
-    },
-    "elecsynthesizer[]()()": {
-      "snippet": "elecsynthesizer[${1:options}](${2:in})(${3:out})"
-    },
-    "elecsynthesizer[]()(){}": {
-      "snippet": "elecsynthesizer[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "elecmixer()()()": {
-      "snippet": "elecmixer(${1:left})(${2:right})(${3:bottom})"
-    },
-    "elecmixer()()(){}": {
-      "snippet": "elecmixer(${2:left})(${3:right})(${4:bottom}){${1:label}}"
-    },
-    "elecmixer[]()()()": {
-      "snippet": "elecmixer[${1:options}](${2:left})(${3:right})(${4:bottom})"
-    },
-    "elecmixer[]()()(){}": {
-      "snippet": "elecmixer[${2:options}](${3:left})(${4:right})(${5:bottom}){${1:label}}"
-    },
-    "optfilter()()": {
-      "snippet": "optfilter(${1:in})(${2:out})"
-    },
-    "optfilter()(){}": {
-      "snippet": "optfilter(${2:in})(${3:out}){${1:label}}"
-    },
-    "optfilter[]()()": {
-      "snippet": "optfilter[${1:options}](${2:in})(${3:out})"
-    },
-    "optfilter[]()(){}": {
-      "snippet": "optfilter[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
-    "fibercollimator()()()()": {
-      "snippet": "fibercollimator(${1:in})(${2:A})(${3:B})(${4:out})"
-    },
-    "fibercollimator()()()(){}": {
-      "snippet": "fibercollimator(${2:in})(${3:A})(${4:B})(${5:out}){${1:label}}"
-    },
-    "fibercollimator[]()()()()": {
-      "snippet": "fibercollimator[${1:options}](${2:in})(${3:A})(${4:B})(${5:out})"
-    },
-    "fibercollimator[]()()()(){}": {
-      "snippet": "fibercollimator[${2:options}](${3:in})(${4:A})(${5:B})(${6:out}){${1:label}}"
-    },
-    "optdetector()()": {
-      "snippet": "optdetector(${1:in})(${2:out})"
-    },
-    "optdetector()(){}": {
-      "snippet": "optdetector(${2:in})(${3:out}){${1:label}}"
-    },
-    "optdetector[]()()": {
-      "snippet": "optdetector[${1:options}](${2:in})(${3:out})"
-    },
-    "optdetector[]()(){}": {
-      "snippet": "optdetector[${2:options}](${3:in})(${4:out}){${1:label}}"
-    },
     "oenode{}{}": {
       "snippet": "oenode{${1:node}}{${2:comp}}"
     },
@@ -636,42 +72,12 @@
     "oeBeamVecMedian{}": {
       "snippet": "oeBeamVecMedian{${1:number}}"
     },
-    "optplane()": {
-      "snippet": "optplane(${1:center})"
-    },
-    "optplane[]()": {
-      "snippet": "optplane[${1:options}](${2:center})"
-    },
     "backlayer{}": {
       "snippet": "backlayer{${1:code}}"
     },
     "frontlayer{}": {
       "snippet": "frontlayer{${1:code}}"
     },
-    "optdipole()(){}": {
-      "snippet": "optdipole(${2:in})(${3:out}){${1:comp}}"
-    },
-    "optdipole()(){}{}": {
-      "snippet": "optdipole(${3:in})(${4:out}){${1:comp}}{${2:label}}"
-    },
-    "optdipole[]()(){}": {
-      "snippet": "optdipole[${2:options}](${3:in})(${4:out}){${1:comp}}"
-    },
-    "optdipole[]()(){}{}": {
-      "snippet": "optdipole[${3:options}](${4:in})(${5:out}){${1:comp}}{${2:label}}"
-    },
-    "opttripole()()(){}": {
-      "snippet": "opttripole(${2:in})(${3:center})(${4:out}){${1:comp}}"
-    },
-    "opttripole()()(){}{}": {
-      "snippet": "opttripole(${3:in})(${4:center})(${5:out}){${1:comp}}{${2:label}}"
-    },
-    "opttripole[]()()(){}": {
-      "snippet": "opttripole[${2:options}](${3:in})(${4:center})(${5:out}){${1:comp}}"
-    },
-    "opttripole[]()()(){}{}": {
-      "snippet": "opttripole[${3:options}](${4:in})(${5:center})(${6:out}){${1:comp}}{${2:label}}"
-    },
     "newOptexpDipole{}": {
       "snippet": "newOptexpDipole{${1:name}}"
     },
diff --git a/dev/packages/pst-optic.json b/dev/packages/pst-optic.json
index eec3006b6..10b320722 100644
--- a/dev/packages/pst-optic.json
+++ b/dev/packages/pst-optic.json
@@ -18,9 +18,6 @@
     "lensCVG": {},
     "lensDVG": {},
     "Transform": {},
-    "rayInterLens()()(){}": {
-      "snippet": "rayInterLens(${2:start node})(${3:intermediate node})(${4:lens distance}){${1:lens node}}"
-    },
     "telescope": {},
     "telescope[]": {
       "snippet": "telescope[${1:options}]"
@@ -33,31 +30,10 @@
     "mirrorDVG[]": {
       "snippet": "mirrorDVG[${1:options}]"
     },
-    "mirrorCVGRay()(){}": {
-      "snippet": "mirrorCVGRay(${2:node1})(${3:node2}){${1:mirror node}}"
-    },
-    "mirrorCVGRay[]()(){}": {
-      "snippet": "mirrorCVGRay[${2:options}](${3:node1})(${4:node2}){${1:mirror node}}"
-    },
-    "mirrorDVGRay()(){}": {
-      "snippet": "mirrorDVGRay(${2:node1})(${3:node2}){${1:mirror node}}"
-    },
-    "mirrorDVGRay[]()(){}": {
-      "snippet": "mirrorDVGRay[${2:options}](${3:node1})(${4:node2}){${1:mirror node}}"
-    },
-    "planMirrorRay()()(){}": {
-      "snippet": "planMirrorRay(${2:mirror begin})(${3:mirror end})(${4:original point}){${1:new point}}"
-    },
-    "symPlan()(){}": {
-      "snippet": "symPlan(${2:node1})(${3:node2}){${1:stuff}}"
-    },
     "beamLight": {},
     "beamLight[]": {
       "snippet": "beamLight[${1:options}]"
     },
-    "refractionRay()()()(){}{}{}": {
-      "snippet": "refractionRay(${4:A})(${5:B})(${6:C})(${7:D}){${1:n1}}{${2:n2}}{${3:end node}}"
-    },
     "psprism": {},
     "psprism[]": {
       "snippet": "psprism[${1:options}]"
@@ -66,52 +42,7 @@
     "lensSPH[]": {
       "snippet": "lensSPH[${1:options}]"
     },
-    "ABinterSPHLens()()(){}": {
-      "snippet": "ABinterSPHLens(${2:A})(${3:B})(${4:center}){${1:name}}"
-    },
-    "lensSPHRay()(){}{}{}": {
-      "snippet": "lensSPHRay(${4:A})(${5:B}){${1:refractA}}{${2:refractB}}{${3:node name}}"
-    },
-    "lensSPHRay[]()(){}{}{}": {
-      "snippet": "lensSPHRay[${4:options}](${5:A})(${6:B}){${1:refractA}}{${2:refractB}}{${3:node name}}"
-    },
-    "reflectionRay()(){}": {
-      "snippet": "reflectionRay(${2:A})(${3:B}){${1:node name}}"
-    },
-    "reflectionRay[]()(){}": {
-      "snippet": "reflectionRay[${2:options}](${3:A})(${4:B}){${1:node name}}"
-    },
     "eye": {},
-    "Arrows()()": {
-      "snippet": "Arrows(${1:nodeA})(${2:nodeB})"
-    },
-    "Arrows[]()()": {
-      "snippet": "Arrows[${1:options}](${2:nodeA})(${3:nodeB})"
-    },
-    "psOutLine()(){}": {
-      "snippet": "psOutLine(${2:nodeA})(${3:nodeB}){${1:end node}}"
-    },
-    "psOutLine[]()(){}": {
-      "snippet": "psOutLine[${2:options}](${3:nodeA})(${4:nodeB}){${1:end node}}"
-    },
-    "psBeforeLine()(){}": {
-      "snippet": "psBeforeLine(${2:nodeA})(${3:nodeB}){${1:start node}}"
-    },
-    "psBeforeLine[]()(){}": {
-      "snippet": "psBeforeLine[${2:options}](${3:nodeA})(${4:nodeB}){${1:start node}}"
-    },
-    "Parallel()()(){}": {
-      "snippet": "Parallel(${2:nodeA})(${3:nodeB})(${4:start node}){${1:end node}}"
-    },
-    "Parallel[]()()(){}": {
-      "snippet": "Parallel[${2:options}](${3:nodeA})(${4:nodeB})(${5:start node}){${1:end node}}"
-    },
-    "ABinterCD()()()(){}": {
-      "snippet": "ABinterCD(${2:A})(${3:B})(${4:C})(${5:D}){${1:E}}"
-    },
-    "nodeBetween()(){}": {
-      "snippet": "nodeBetween(${2:A})(${3:B}){${1:C}}"
-    },
     "rotateNode{}{}": {
       "snippet": "rotateNode{${1:node name}}{${2:degrees}}"
     },
@@ -121,12 +52,6 @@
     "rotateFrame{}{}{}{}{}": {
       "snippet": "rotateFrame{${1:nodeA}}{${2:nodeB}}{${3:nodeC}}{${4:nodeD}}{${5:degrees}}"
     },
-    "arrowLine()(){}": {
-      "snippet": "arrowLine(${2:start})(${3:end}){${1:arrow number}}"
-    },
-    "arrowLine[]()(){}": {
-      "snippet": "arrowLine[${2:options}](${3:start})(${4:end}){${1:arrow number}}"
-    },
     "mirrorTwo": {},
     "pslensDVG{}{}": {
       "snippet": "pslensDVG{${1:width}}{${2:height}}"
diff --git a/dev/packages/pst-pad.json b/dev/packages/pst-pad.json
index eac476b3c..588a16518 100644
--- a/dev/packages/pst-pad.json
+++ b/dev/packages/pst-pad.json
@@ -6,54 +6,6 @@
     "pst-xkey": []
   },
   "macros": {
-    "PstWallToWall()": {
-      "snippet": "PstWallToWall(${1:x},${2:y})"
-    },
-    "PstWallToWall[]()": {
-      "snippet": "PstWallToWall[${1:options}](${2:x},${3:y})"
-    },
-    "PstSphereToWall()": {
-      "snippet": "PstSphereToWall(${1:x},${2:y})"
-    },
-    "PstSphereToWall[]()": {
-      "snippet": "PstSphereToWall[${1:options}](${2:x},${3:y})"
-    },
-    "PstPad()": {
-      "snippet": "PstPad(${1:x},${2:y})"
-    },
-    "PstPad[]()": {
-      "snippet": "PstPad[${1:options}](${2:x},${3:y})"
-    },
-    "PstFluid()": {
-      "snippet": "PstFluid(${1:x},${2:y})"
-    },
-    "PstFluid[]()": {
-      "snippet": "PstFluid[${1:options}](${2:x},${3:y})"
-    },
-    "PstWall()": {
-      "snippet": "PstWall(${1:x},${2:y})"
-    },
-    "PstWall[]()": {
-      "snippet": "PstWall[${1:options}](${2:x},${3:y})"
-    },
-    "PstWallRough()": {
-      "snippet": "PstWallRough(${1:x},${2:y})"
-    },
-    "PstWallRough[]()": {
-      "snippet": "PstWallRough[${1:options}](${2:x},${3:y})"
-    },
-    "PstSphere()": {
-      "snippet": "PstSphere(${1:x},${2:y})"
-    },
-    "PstSphere[]()": {
-      "snippet": "PstSphere[${1:options}](${2:x},${3:y})"
-    },
-    "PstFlattenedSphere()": {
-      "snippet": "PstFlattenedSphere(${1:x},${2:y})"
-    },
-    "PstFlattenedSphere[]()": {
-      "snippet": "PstFlattenedSphere[${1:options}](${2:x},${3:y})"
-    },
     "PSTpadLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-pdf.json b/dev/packages/pst-pdf.json
deleted file mode 100644
index a33c62193..000000000
--- a/dev/packages/pst-pdf.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "includes": {
-    "ifpdf": [],
-    "ifxetex": [],
-    "ifvtex": [],
-    "luatex85": [],
-    "graphicx": [],
-    "pstricks": [],
-    "preview": [],
-    "environ": [],
-    "pst-calculate": [
-      "useCalc"
-    ],
-    "pdfcolmk": [
-      "fixpdftex"
-    ]
-  },
-  "macros": {
-    "PDFcontainer": {},
-    "savepicture{}": {
-      "snippet": "savepicture{${1:name}}"
-    },
-    "usepicture{}": {
-      "snippet": "usepicture{${1:name}}"
-    },
-    "usepicture[]{}": {
-      "snippet": "usepicture[${2:options}]{${1:name}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "thepspicture": {}
-  },
-  "envs": {
-    "postscript": {},
-    "postscript[]": {
-      "name": "postscript",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [
-    "active",
-    "inactive",
-    "pstricks",
-    "nopstricks",
-    "draft",
-    "final",
-    "tightpage",
-    "notightpage",
-    "displaymath",
-    "noxcolor",
-    "useCalc",
-    "gsfonts",
-    "psfonts",
-    "noEngineCheck",
-    "pdf",
-    "xetex",
-    "distiller",
-    "monochrome",
-    "grayscale"
-  ],
-  "keyvals": [
-    [
-      "frame",
-      "innerframe",
-      "ignore",
-      "showname",
-      "namefont=${1:font commands}",
-      "alt={${1:alt text}}",
-      "bb=${1:llx lly urx ury}",
-      "bbllx=",
-      "bblly=",
-      "bburx=",
-      "bbury=",
-      "natwidth=",
-      "natheight=",
-      "hiresbb",
-      "pagebox=",
-      "viewport=${1:llx lly urx ury}",
-      "trim=${1:llx lly urx ury}",
-      "angle=${1:degrees}",
-      "origin=",
-      "width=",
-      "height=",
-      "totalheight=",
-      "keepaspectratio",
-      "scale=${1:factor}",
-      "clip",
-      "draft",
-      "type=${1:file type}",
-      "ext=${1:file extension}",
-      "read=${1:read-file extension}",
-      "command=",
-      "quiet",
-      "page=${1:page number}",
-      "interpolate",
-      "decodearray={${1:color array}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/pst-perspective.json b/dev/packages/pst-perspective.json
index 915f79f0c..9ef8f6644 100644
--- a/dev/packages/pst-perspective.json
+++ b/dev/packages/pst-perspective.json
@@ -5,30 +5,6 @@
     "pstricks-add": []
   },
   "macros": {
-    "pstransTS(){}{}": {
-      "snippet": "pstransTS(${3:x},${4:y}){${1:A}}{${2:A'}}"
-    },
-    "pstransTS[](){}{}": {
-      "snippet": "pstransTS[${3:options}](${4:x},${5:y}){${1:A}}{${2:A'}}"
-    },
-    "pstransTSX(){}{}": {
-      "snippet": "pstransTSX(${3:x},${4:y}){${1:A}}{${2:A'}}"
-    },
-    "pstransTSX[](){}{}": {
-      "snippet": "pstransTSX[${3:options}](${4:x},${5:y}){${1:A}}{${2:A'}}"
-    },
-    "pstransTSK(){}{}{}": {
-      "snippet": "pstransTSK(${4:x},${5:y}){${1:length}}{${2:A}}{${3:A'}}"
-    },
-    "pstransTSK[](){}{}{}": {
-      "snippet": "pstransTSK[${4:options}](${5:x},${6:y}){${1:length}}{${2:A}}{${3:A'}}"
-    },
-    "psboxTS(){}{}{}{}": {
-      "snippet": "psboxTS(${5:x},${6:y},${7:z}){${1:x length}}{${2:y width}}{${3:z height}}{${4:color}}"
-    },
-    "psboxTS[](){}{}{}{}": {
-      "snippet": "psboxTS[${5:options}](${6:x},${7:y},${8:z}){${1:x length}}{${2:y width}}{${3:z height}}{${4:color}}"
-    },
     "psCircleTS{}": {
       "snippet": "psCircleTS{${1:radius}}"
     },
diff --git a/dev/packages/pst-plot.json b/dev/packages/pst-plot.json
index edc5301fa..ad9811114 100644
--- a/dev/packages/pst-plot.json
+++ b/dev/packages/pst-plot.json
@@ -39,42 +39,12 @@
     "parametricplot{}{}{}": {
       "snippet": "parametricplot{${1:tmin}}{${2:tmax}}{${3:function}}"
     },
-    "psaxes()()()": {
-      "snippet": "psaxes(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "psaxes()()()[][]": {
-      "snippet": "psaxes(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})[${1:Xlabel,${9:Xangle}][${2:Ylabel},Yangle}]"
-    },
-    "psaxes[]()()()": {
-      "snippet": "psaxes[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
-    "psaxes[]()()()[][]": {
-      "snippet": "psaxes[${1:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
-    },
-    "psaxes[]{}()()()": {
-      "snippet": "psaxes[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})"
-    },
-    "psaxes[]{}()()()[][]": {
-      "snippet": "psaxes[${2:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2})[${3:Xlabel,${11:Xangle}][${4:Ylabel},Yangle}]"
-    },
-    "psaxes{}()()()": {
-      "snippet": "psaxes{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
-    "psaxes{}()()()[][]": {
-      "snippet": "psaxes{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2})[${2:Xlabel,${10:Xangle}][${3:Ylabel},Yangle}]"
-    },
     "psBoxplot[]{}": {
       "snippet": "psBoxplot[${2:options}]{${1:macro}}"
     },
     "psBoxplot{}": {
       "snippet": "psBoxplot{${1:macro}}"
     },
-    "psCoordinates()": {
-      "snippet": "psCoordinates(${1:x},${2:y})"
-    },
-    "psCoordinates[]()": {
-      "snippet": "psCoordinates[${1:options}](${2:x},${3:y})"
-    },
     "psdataplot[]{}": {
       "snippet": "psdataplot[${2:options}]{${1:macro}}"
     },
@@ -93,26 +63,11 @@
     "psFixpoint{}{}{}": {
       "snippet": "psFixpoint{${1:x0}}{${2:f(${4:x})}}{${3:n}}"
     },
-    "psgraph()()(){}{}": {
-      "snippet": "psgraph(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[]()()(){}{}": {
-      "snippet": "psgraph[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[]{}()()(){}{}": {
-      "snippet": "psgraph[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph{}()()(){}{}": {
-      "snippet": "psgraph{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
-    },
     "psgraphLLx": {},
     "psgraphLLy": {},
     "psgraphURx": {},
     "psgraphURy": {},
     "pshlabel": {},
-    "pslegend[](){}": {
-      "snippet": "pslegend[${2:reference}](${3:xoffset},${4:yoffset}){${1:text}}"
-    },
     "pslegend[]{}": {
       "snippet": "pslegend[${2:reference}]{${1:text}}"
     },
@@ -188,49 +143,16 @@
     "PSTplotLoaded": {},
     "pstRadUnit": {},
     "pstRadUnitInv": {},
-    "pstScalePoints(){}{}": {
-      "snippet": "pstScalePoints(${3:xscale},${4:yscale}){${1:xPS}}{${2:yPS}}"
-    },
     "pstXPSScale": {},
     "pstXScale": {},
     "pstYPSScale": {},
     "pstYScale": {},
-    "psVectorfield()(){}": {
-      "snippet": "psVectorfield(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:f'(${6:x},${7:y})}}"
-    },
-    "psVectorfield[]()(){}": {
-      "snippet": "psVectorfield[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:f'(${7:x},${8:y})}}"
-    },
     "psvlabel": {},
     "psxlabelsep": {},
     "psxsubticklinestyle": {},
-    "psxTick(){}": {
-      "snippet": "psxTick(${2:x value}){${1:label}}"
-    },
-    "psxTick[](){}": {
-      "snippet": "psxTick[${2:options}](${3:x value}){${1:label}}"
-    },
-    "psxTick[]{}(){}": {
-      "snippet": "psxTick[${3:options}]{${1:rotation}}(${4:x value}){${2:label}}"
-    },
-    "psxTick{}(){}": {
-      "snippet": "psxTick{${1:rotation}}(${3:x value}){${2:label}}"
-    },
     "psxticklinestyle": {},
     "psylabelsep": {},
     "psysubticklinestyle": {},
-    "psyTick(){}": {
-      "snippet": "psyTick(${2:y value}){${1:label}}"
-    },
-    "psyTick[](){}": {
-      "snippet": "psyTick[${2:options}](${3:y value}){${1:label}}"
-    },
-    "psyTick[]{}(){}": {
-      "snippet": "psyTick[${3:options}]{${1:rotation}}(${4:y value}){${2:label}}"
-    },
-    "psyTick{}(){}": {
-      "snippet": "psyTick{${1:rotation}}(${3:y value}){${2:label}}"
-    },
     "psyticklinestyle": {},
     "readdata{}{}": {
       "snippet": "readdata{${1:macro}}{${2:file}}"
@@ -253,40 +175,7 @@
     "SpecialLabelsDonetrue": {},
     "stripDecimals": {}
   },
-  "envs": {
-    "psgraph(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[](x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph",
-      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph*(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph*[](x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:xlength}}{${2:ylength}}"
-    },
-    "psgraph*[]{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:xlength}}{${3:ylength}}"
-    },
-    "psgraph*{}(x0,y0)(x1,y1)(x2,y2){}{}": {
-      "name": "psgraph*",
-      "snippet": "{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:xlength}}{${3:ylength}}"
-    }
-  },
+  "envs": {},
   "options": [
     "97"
   ],
diff --git a/dev/packages/pst-rputover.json b/dev/packages/pst-rputover.json
index 620e27a64..d4f0190d7 100644
--- a/dev/packages/pst-rputover.json
+++ b/dev/packages/pst-rputover.json
@@ -5,52 +5,12 @@
     "pst-xkey": []
   },
   "macros": {
-    "rputover()(){}": {
-      "snippet": "rputover(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:stuff}}"
-    },
-    "rputover{}(){}": {
-      "snippet": "rputover{${1:angle}}(${3:x0},${4:y0}){${2:stuff}}"
-    },
-    "rputover{}()(){}": {
-      "snippet": "rputover{${1:angle}}(${3:x0},${4:y0})(${5:x1},${6:y1}){${2:stuff}}"
-    },
-    "rputover[]()(){}": {
-      "snippet": "rputover[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:stuff}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "rputover[]{}(){}": {
-      "snippet": "rputover[${3:options}]{${1:angle}}(${4:x0},${5:y0}){${2:stuff}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "rputover[]{}()(){}": {
-      "snippet": "rputover[${3:options}]{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:stuff}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "coverable{}": {
       "snippet": "coverable{${1:stuff}}"
     },
     "coverable[]{}": {
       "snippet": "coverable[${2:options}]{${1:stuff}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "pclineover()(){}": {
-      "snippet": "pclineover(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:stuff}}"
-    },
-    "pclineover[]()(){}": {
-      "snippet": "pclineover[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:stuff}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "pcarrowC()(){}": {
-      "snippet": "pcarrowC(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:stuff}}"
-    },
-    "pcarrowC[]()(){}": {
-      "snippet": "pcarrowC[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:stuff}}",
-      "keyvalindex": 3,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "PSTRPUTOVERLoaded": {}
@@ -58,27 +18,8 @@
   "envs": {},
   "options": [],
   "keyvals": [
-    [
-      "autoangle",
-      "inverscl",
-      "boxpos=${1:pos}",
-      "fboxsep=",
-      "npos=${1:number}"
-    ],
     [
       "inverscl"
-    ],
-    [
-      "absnodesep=",
-      "angleadd=${1:degrees}",
-      "arrows=${1:arrows}",
-      "offset="
-    ],
-    [
-      "addbars=${1:bars}",
-      "baroffset=",
-      "Cbarwidth=",
-      "tbarsize="
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-rubans.json b/dev/packages/pst-rubans.json
index 482394439..e1aeb1735 100644
--- a/dev/packages/pst-rubans.json
+++ b/dev/packages/pst-rubans.json
@@ -8,33 +8,18 @@
     "pshelices[]": {
       "snippet": "pshelices[${1:options}]"
     },
-    "pshelices[]()": {
-      "snippet": "pshelices[${1:options}](${2:x},${3:y},${4:z})"
-    },
     "psSpiralRing[]": {
       "snippet": "psSpiralRing[${1:options}]"
     },
-    "psSpiralRing[]()": {
-      "snippet": "psSpiralRing[${1:options}](${2:x},${3:y},${4:z})"
-    },
     "psSphericalSpiral[]": {
       "snippet": "psSphericalSpiral[${1:options}]"
     },
-    "psSphericalSpiral[]()": {
-      "snippet": "psSphericalSpiral[${1:options}](${2:x},${3:y},${4:z})"
-    },
     "psSpiralParaboloid[]": {
       "snippet": "psSpiralParaboloid[${1:options}]"
     },
-    "psSpiralParaboloid[]()": {
-      "snippet": "psSpiralParaboloid[${1:options}](${2:x},${3:y},${4:z})"
-    },
     "psSpiralCone[]": {
       "snippet": "psSpiralCone[${1:options}]"
     },
-    "psSpiralCone[]()": {
-      "snippet": "psSpiralCone[${1:options}](${2:x},${3:y},${4:z})"
-    },
     "PSTRubansLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-shell.json b/dev/packages/pst-shell.json
index 71931e438..0195dfdfb 100644
--- a/dev/packages/pst-shell.json
+++ b/dev/packages/pst-shell.json
@@ -9,11 +9,6 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "psShell[]()": {
-      "snippet": "psShell[${1:options}](${2:x},${3:y},${4:z})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "PSTSHELLLoaded": {}
   },
   "envs": {},
diff --git a/dev/packages/pst-sigsys.json b/dev/packages/pst-sigsys.json
index 8df95ae5b..feb575f9a 100644
--- a/dev/packages/pst-sigsys.json
+++ b/dev/packages/pst-sigsys.json
@@ -5,168 +5,12 @@
     "pst-xkey": []
   },
   "macros": {
-    "psaxeslabels()()(){}{}": {
-      "snippet": "psaxeslabels(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:x label}}{${2:y label}}"
-    },
-    "psaxeslabels{}()()(){}{}": {
-      "snippet": "psaxeslabels{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:x label}}{${3:y label}}"
-    },
-    "psaxeslabels[]()()(){}{}": {
-      "snippet": "psaxeslabels[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:x label}}{${2:y label}}"
-    },
-    "psaxeslabels[]{}()()(){}{}": {
-      "snippet": "psaxeslabels[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:x label}}{${3:y label}}"
-    },
-    "pstick(){}": {
-      "snippet": "pstick(${2:x},${3:y}){${1:ticklength}}"
-    },
-    "pstick{}(){}": {
-      "snippet": "pstick{${1:angle}}(${3:x},${4:y}){${2:ticklength}}"
-    },
-    "pstick[](){}": {
-      "snippet": "pstick[${2:options}](${3:x},${4:y}){${1:ticklength}}"
-    },
-    "pstick[]{}(){}": {
-      "snippet": "pstick[${3:options}]{${1:angle}}(${4:x},${5:y}){${2:ticklength}}"
-    },
-    "psTick()": {
-      "snippet": "psTick(${1:x},${2:y})"
-    },
-    "psTick{}()": {
-      "snippet": "psTick{${1:angle}}(${2:x},${3:y})"
-    },
-    "psTick[]()": {
-      "snippet": "psTick[${1:options}](${2:x},${3:y})"
-    },
-    "psTick[]{}()": {
-      "snippet": "psTick[${2:options}]{${1:angle}}(${3:x},${4:y})"
-    },
-    "pssignal(){}{}": {
-      "snippet": "pssignal(${3:x},${4:y}){${1:node}}{${2:stuff}}"
-    },
-    "pssignal[](){}{}": {
-      "snippet": "pssignal[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
-    },
     "psstem{}": {
       "snippet": "psstem{${1:list}}"
     },
-    "psstem(){}": {
-      "snippet": "psstem(${2:x},${3:∆x}){${1:list}}"
-    },
     "psstem[]{}": {
       "snippet": "psstem[${2:options}]{${1:list}}"
     },
-    "psstem[](){}": {
-      "snippet": "psstem[${2:options}](${3:x},${4:∆x}){${1:list}}"
-    },
-    "pszero(){}": {
-      "snippet": "pszero(${2:x},${3:y}){${1:node}}"
-    },
-    "pszero[](){}": {
-      "snippet": "pszero[${2:options}](${3:x},${4:y}){${1:node}}"
-    },
-    "pspole(){}": {
-      "snippet": "pspole(${2:x},${3:y}){${1:node}}"
-    },
-    "pspole[](){}": {
-      "snippet": "pspole[${2:options}](${3:x},${4:y}){${1:node}}"
-    },
-    "pscircleop(){}": {
-      "snippet": "pscircleop(${2:x},${3:y}){${1:node}}"
-    },
-    "pscircleop[](){}": {
-      "snippet": "pscircleop[${2:options}](${3:x},${4:y}){${1:node}}"
-    },
-    "psframeop(){}": {
-      "snippet": "psframeop(${2:x},${3:y}){${1:node}}"
-    },
-    "psframeop[](){}": {
-      "snippet": "psframeop[${2:options}](${3:x},${4:y}){${1:node}}"
-    },
-    "psdisk(){}": {
-      "snippet": "psdisk(${2:x},${3:y}){${1:radius}}"
-    },
-    "psdisk[](){}": {
-      "snippet": "psdisk[${2:options}](${3:x},${4:y}){${1:radius}}"
-    },
-    "psring(){}{}": {
-      "snippet": "psring(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psring[](){}{}": {
-      "snippet": "psring[${3:options}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psdiskc()(){}": {
-      "snippet": "psdiskc(${2:x},${3:y})(${4:x0},${5:y0}){${1:radius}}"
-    },
-    "psdiskc[]()(){}": {
-      "snippet": "psdiskc[${2:options}](${3:x},${4:y})(${5:x0},${6:y0}){${1:radius}}"
-    },
-    "psldots()": {
-      "snippet": "psldots(${1:x},${2:y})"
-    },
-    "psldots{}()": {
-      "snippet": "psldots{${1:angle}}(${2:x},${3:y})"
-    },
-    "psldots[]()": {
-      "snippet": "psldots[${1:options}](${2:x},${3:y})"
-    },
-    "psldots[]{}()": {
-      "snippet": "psldots[${2:options}]{${1:angle}}(${3:x},${4:y})"
-    },
-    "ldotsnode(){}": {
-      "snippet": "ldotsnode(${2:x},${3:y}){${1:node}}"
-    },
-    "ldotsnode{}(){}": {
-      "snippet": "ldotsnode{${1:angle}}(${3:x},${4:y}){${2:node}}"
-    },
-    "ldotsnode[](){}": {
-      "snippet": "ldotsnode[${2:options}](${3:x},${4:y}){${1:node}}"
-    },
-    "ldotsnode[]{}(){}": {
-      "snippet": "ldotsnode[${3:options}]{${1:angle}}(${4:x},${5:y}){${2:node}}"
-    },
-    "psblock(){}{}": {
-      "snippet": "psblock(${3:x},${4:y}){${1:node}}{${2:stuff}}"
-    },
-    "psblock[](){}{}": {
-      "snippet": "psblock[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
-    },
-    "psfblock(){}{}": {
-      "snippet": "psfblock(${3:x},${4:y}){${1:node}}{${2:stuff}}"
-    },
-    "psfblock[](){}{}": {
-      "snippet": "psfblock[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
-    },
-    "psadaptive{}(){}": {
-      "snippet": "psadaptive{${1:nodeA}}(${3:x},${4:y}){${2:nodeB}}"
-    },
-    "psadaptive{}{}(){}": {
-      "snippet": "psadaptive{${1:arrows}}{${2:nodeA}}(${4:x},${5:y}){${3:nodeB}}"
-    },
-    "psadaptive[]{}(){}": {
-      "snippet": "psadaptive[${3:options}]{${1:nodeA}}(${4:x},${5:y}){${2:nodeB}}"
-    },
-    "psadaptive[]{}{}(){}": {
-      "snippet": "psadaptive[${4:options}]{${1:arrows}}{${2:nodeA}}(${5:x},${6:y}){${3:nodeB}}"
-    },
-    "psknob(){}": {
-      "snippet": "psknob(${2:x},${3:y}){${1:node}}"
-    },
-    "psknob[](){}": {
-      "snippet": "psknob[${2:options}](${3:x},${4:y}){${1:node}}"
-    },
-    "psusampler(){}{}": {
-      "snippet": "psusampler(${3:x},${4:y}){${1:node}}{${2:stuff}}"
-    },
-    "psusampler[](){}{}": {
-      "snippet": "psusampler[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
-    },
-    "psdsampler(){}{}": {
-      "snippet": "psdsampler(${3:x},${4:y}){${1:node}}{${2:stuff}}"
-    },
-    "psdsampler[](){}{}": {
-      "snippet": "psdsampler[${3:options}](${4:x},${5:y}){${1:node}}{${2:stuff}}"
-    },
     "nclist{}{}": {
       "snippet": "nclist{${1:nc csname}}{${2:list}}"
     },
@@ -215,54 +59,6 @@
     "ncstar[]{}{}[]{}{}": {
       "snippet": "ncstar[${5:options}]{${1:arrows}}{${2:nc csname}}[${6:nc label}]{${3:list}}{${4:node}}"
     },
-    "psBraceUp()(){}": {
-      "snippet": "psBraceUp(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceUp[]()(){}": {
-      "snippet": "psBraceUp[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psBraceUp*()(){}": {
-      "snippet": "psBraceUp*(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceUp*[]()(){}": {
-      "snippet": "psBraceUp*[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psBraceDown()(){}": {
-      "snippet": "psBraceDown(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceDown[]()(){}": {
-      "snippet": "psBraceDown[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psBraceDown*()(){}": {
-      "snippet": "psBraceDown*(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceDown*[]()(){}": {
-      "snippet": "psBraceDown*[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psBraceRight()(){}": {
-      "snippet": "psBraceRight(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceRight[]()(){}": {
-      "snippet": "psBraceRight[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psBraceRight*()(){}": {
-      "snippet": "psBraceRight*(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceRight*[]()(){}": {
-      "snippet": "psBraceRight*[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psBraceLeft()(){}": {
-      "snippet": "psBraceLeft(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceLeft[]()(){}": {
-      "snippet": "psBraceLeft[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psBraceLeft*()(){}": {
-      "snippet": "psBraceLeft*(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBraceLeft*[]()(){}": {
-      "snippet": "psBraceLeft*[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
     "pstsigsysFV": {},
     "pstsigsysFD": {},
     "PSTsigsysLoaded": {}
diff --git a/dev/packages/pst-slpe.json b/dev/packages/pst-slpe.json
index b47642c31..18b4a825d 100644
--- a/dev/packages/pst-slpe.json
+++ b/dev/packages/pst-slpe.json
@@ -7,15 +7,9 @@
     "psBall{}{}": {
       "snippet": "psBall{${1:color}}{${2:radius}}"
     },
-    "psBall(){}{}": {
-      "snippet": "psBall(${3:x},${4:y}){${1:color}}{${2:radius}}"
-    },
     "psBall[]{}{}": {
       "snippet": "psBall[${3:options}]{${1:color}}{${2:radius}}"
     },
-    "psBall[](){}{}": {
-      "snippet": "psBall[${3:options}](${4:x},${5:y}){${1:color}}{${2:radius}}"
-    },
     "psslopesteps": {},
     "pstslpefileversion": {},
     "pstslpefiledate": {},
diff --git a/dev/packages/pst-solides3d.json b/dev/packages/pst-solides3d.json
index e88c3884c..7529a5647 100644
--- a/dev/packages/pst-solides3d.json
+++ b/dev/packages/pst-solides3d.json
@@ -6,89 +6,25 @@
     "multido": []
   },
   "macros": {
-    "axesIIID()()": {
-      "snippet": "axesIIID(${1:x1},${2:y1},${3:z1})(${4:x2},${5:y2},${6:z2})"
-    },
-    "axesIIID[]()()": {
-      "snippet": "axesIIID[${1:options}](${2:x1},${3:y1},${4:z1})(${5:x2},${6:y2},${7:z2})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "psSolid[]": {
       "snippet": "psSolid[${1:object=name,options}]"
     },
-    "psSolid[]()": {
-      "snippet": "psSolid[${1:options}](${2:x},${3:y},${4:z})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "codejps{}": {
       "snippet": "codejps{${1:jps code}}"
     },
-    "defFunction{}(){}{}{}": {
-      "snippet": "defFunction{${1:name}}(${5:var}){${2:x}}{${3:y}}{${4:z}}"
-    },
-    "defFunction[]{}(){}{}{}": {
-      "snippet": "defFunction[${5:options}]{${1:name}}(${6:var}){${2:x}}{${3:y}}{${4:z}}"
-    },
-    "psSurface()(){}": {
-      "snippet": "psSurface(${2:xmin},${3:ymin})(${4:xmax},${5:ymax}){${1:surface definition}}"
-    },
-    "psSurface[]()(){}": {
-      "snippet": "psSurface[${2:options}](${3:xmin},${4:ymin})(${5:xmax},${6:ymax}){${1:surface definition}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "psImplicitSurface[]": {
       "snippet": "psImplicitSurface[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "psImplicitSurface[]()": {
-      "snippet": "psImplicitSurface[${1:options}](${2:x},${3:y},${4:z})",
-      "keyvalindex": 3,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "composeSolid": {},
-    "psPoint(){}": {
-      "snippet": "psPoint(${2:x},${3:y},${4:z}){${1:name}}"
-    },
-    "psTransformPoint()(){}": {
-      "snippet": "psTransformPoint(${2:x},${3:y},${4:z})(${5:vx},${6:vy},${7:vz}){${1:name}}"
-    },
-    "psTransformPoint[]()(){}": {
-      "snippet": "psTransformPoint[${2:options}](${3:x},${4:y},${5:z})(${6:vx},${7:vy},${8:vz}){${1:name}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
     "psProjection[]": {
       "snippet": "psProjection[${1:object=name,options}]"
     },
-    "psProjection[]()": {
-      "snippet": "psProjection[${1:options}](${2:x},${3:y},${4:z})",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
     "psResetSolidKeys": {},
-    "gridIIID()()": {
-      "snippet": "gridIIID(${1:x1},${2:y1})(${3:x2},${4:y2})"
-    },
-    "gridIIID[]()()": {
-      "snippet": "gridIIID[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
     "psImage[]": {
       "snippet": "psImage[${1:filename=imagefile,options}]"
     },
-    "psImage[]()": {
-      "snippet": "psImage[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "Normale()": {
-      "snippet": "Normale(${1:radius},${2:longitude},${3:latitude})"
-    },
     "addtosolideslistobject{}": {
       "snippet": "addtosolideslistobject{${1:name}}"
     },
@@ -97,135 +33,6 @@
   "envs": {},
   "options": [],
   "keyvals": [
-    [
-      "arrowinset=${1:number}",
-      "arrowsize=",
-      "axisemph=${1:font commands}",
-      "axisnames={${1:x,y,z}}",
-      "labelsep=",
-      "linecolor=",
-      "linewidth=",
-      "mathLabel",
-      "showOrigin"
-    ],
-    [
-      "object=",
-      "a=${1:length}",
-      "action=",
-      "affinage=",
-      "affinagecoeff=${1:factor}",
-      "affinagerm",
-      "args=${1:args spec}",
-      "axe=${1:x y z}",
-      "b=${1:length}",
-      "base=${1:base spec}",
-      "biface",
-      "c=${1:length}",
-      "chanfrein",
-      "chanfreincoeff=${1:factor}",
-      "color1=${1:xcolor color}",
-      "color2=${1:xcolor color}",
-      "color3=${1:xcolor color}",
-      "color4=${1:xcolor color}",
-      "deactivatecolor",
-      "decal=${1:integer}",
-      "definition=",
-      "dualreg",
-      "faces={${1:faces spec}}",
-      "fcol=${1:n1 (col1) n2 (col2) ...}",
-      "fcolor=",
-      "filename=${1:file name}",
-      "fillcolor=",
-      "fontsize=",
-      "function=",
-      "grid",
-      "h=${1:height}",
-      "hollow",
-      "hue=${1:hue spec}",
-      "incolor=",
-      "inhue=${1:hue spec}",
-      "inouthue=${1:hue spec}",
-      "intersectioncolor=${1:(color1) (color2) ...}",
-      "intersectionlinewidth=${1:w1 w2 ...}",
-      "intersectionplan={[${1:eq1}] ${2:[eq2] ...}}",
-      "intersectiontype=",
-      "lightintensity=${1:number}",
-      "lightsrc=${1:x y z}",
-      "linecolor=",
-      "linestyle=${1:style}",
-      "linewidth=",
-      "load=${1:name}",
-      "mode=",
-      "name=${1:name}",
-      "ngrid=${1:<n> or <n1 n2>}",
-      "normal=${1:x y z}",
-      "num=",
-      "numfaces=",
-      "opacity=${1:factor}",
-      "origine=${1:x y z}",
-      "phi=${1:degrees}",
-      "plangrid",
-      "planmarks",
-      "plansection={${1:plan1 plan2 ...}}",
-      "plansepare={[${1:a b c d}]}",
-      "QZ=${1:number}",
-      "R=${1:outer radius}",
-      "r=${1:radius}",
-      "r0=${1:radius0}",
-      "r1=${1:radius1}",
-      "range=${1:xmin xmax}",
-      "resolution=${1:resolution}",
-      "rm=${1:face1 face2 face3}",
-      "RotSequence=${1:sequence}",
-      "RotX=${1:degrees}",
-      "RotY=${1:degrees}",
-      "RotZ=${1:degrees}",
-      "section=",
-      "show=",
-      "showbase",
-      "showBase",
-      "sommets=${1:data}",
-      "theta=${1:degrees}",
-      "transform={${1:transform}}",
-      "trunc=",
-      "trunccoeff=${1:factor}",
-      "unit=${1:number}",
-      "visibility"
-    ],
-    [
-      "algebraic",
-      "axesboxed",
-      "base=${1:base spec}",
-      "color1=${1:xcolor color}",
-      "color2=${1:xcolor color}",
-      "color3=${1:xcolor color}",
-      "color4=${1:xcolor color}",
-      "deactivatecolor",
-      "fcol=${1:n1 (col1) n2 (col2) ...}",
-      "fillcolor=",
-      "grid",
-      "hue=${1:hue spec}",
-      "incolor=",
-      "inhue=${1:hue spec}",
-      "inouthue=${1:hue spec}",
-      "intersectionplan={[${1:eq1}] ${2:[eq2] ...}}",
-      "intersectiontype=",
-      "intersectioncolor=${1:(color1) (color2) ...}",
-      "intersectionlinewidth=${1:w1 w2 ...}",
-      "lightintensity=${1:number}",
-      "lightsrc=${1:x y z}",
-      "linecolor=",
-      "linewidth=",
-      "ngrid=${1:<n> or <n1 n2>}",
-      "opacity=${1:factor}",
-      "QZ=${1:number}",
-      "spotX=${1:pos}",
-      "spotY=${1:pos}",
-      "spotZ=${1:pos}",
-      "xytranslate=${1:x y}",
-      "Zmax=${1:number}",
-      "Zmin=${1:number}"
-    ],
     [
       "algebraic",
       "axesboxed",
@@ -263,56 +70,6 @@
       "XMinMax=${1:min max step}",
       "YMinMax=${1:min max step}",
       "ZMinMax=${1:min max step}"
-    ],
-    [
-      "RotX=${1:degrees}",
-      "RotY=${1:degrees}",
-      "RotZ=${1:degrees}"
-    ],
-    [
-      "definition=",
-      "args=${1:args spec}",
-      "fillcolor=",
-      "fillstyle=",
-      "fontsize=",
-      "function=${1:function}",
-      "hatchcolor=",
-      "isolatin",
-      "linecolor=",
-      "linestyle=${1:style}",
-      "name=${1:name}",
-      "normal=${1:x y z}",
-      "object=",
-      "path={${1:PS code}}",
-      "phi=${1:degrees}",
-      "plan=${1:plan type}",
-      "pos=${1:pos}",
-      "PSfont=${1:font name}",
-      "range=${1:xmin xmax}",
-      "resolution=${1:resolution}",
-      "text=${1:text}",
-      "visibility"
-    ],
-    [
-      "axisemph=${1:font commands}",
-      "linecolor=",
-      "spotX=${1:pos}",
-      "spotY=${1:pos}",
-      "spotZ=${1:pos}",
-      "stepX=${1:number}",
-      "stepY=${1:number}",
-      "stepZ=${1:number}",
-      "ticklength=",
-      "Zmax=${1:number}",
-      "Zmin=${1:number}"
-    ],
-    [
-      "divisions=${1:integer}",
-      "filename=${1:imagefile}",
-      "normal=${1:x y z}",
-      "origine=${1:x y z}",
-      "phi=${1:degrees}",
-      "unitPicture=${1:number}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/pst-spinner.json b/dev/packages/pst-spinner.json
index 85c9e6253..2e5796052 100644
--- a/dev/packages/pst-spinner.json
+++ b/dev/packages/pst-spinner.json
@@ -6,19 +6,11 @@
   },
   "macros": {
     "psFidgetSpinner": {},
-    "psFidgetSpinner()": {
-      "snippet": "psFidgetSpinner(${1:x},${2:y})"
-    },
     "psFidgetSpinner[]": {
       "snippet": "psFidgetSpinner[${1:options}]",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "psFidgetSpinner[]()": {
-      "snippet": "psFidgetSpinner[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "pstspinnerFV": {},
     "PSTSPINNERLoaded": {}
   },
diff --git a/dev/packages/pst-stru.json b/dev/packages/pst-stru.json
index 1bece281c..e709f1ead 100644
--- a/dev/packages/pst-stru.json
+++ b/dev/packages/pst-stru.json
@@ -8,9 +8,6 @@
   },
   "macros": {
     "arrow": {},
-    "circput()(){}{}": {
-      "snippet": "circput(${3:nodeA})(${4:nodeB}){${1:stuffA}}{${2:stuffB}}"
-    },
     "clockCouple": {},
     "debut": {},
     "fin": {},
@@ -19,18 +16,9 @@
     "hinge": {},
     "interhinge": {},
     "noclockCouple": {},
-    "node()": {
-      "snippet": "node(${1:name})"
-    },
     "nStart": {},
     "PAS": {},
     "Position": {},
-    "psArrowCivil()(){}": {
-      "snippet": "psArrowCivil(${2:nodeA})(${3:nodeB}){${1:stuff}}"
-    },
-    "psArrowCivil[]()(){}": {
-      "snippet": "psArrowCivil[${2:options}](${3:nodeA})(${4:nodeB}){${1:stuff}}"
-    },
     "roller": {},
     "Start": {},
     "triload": {},
diff --git a/dev/packages/pst-text.json b/dev/packages/pst-text.json
index a85cb983e..d4e2f18ad 100644
--- a/dev/packages/pst-text.json
+++ b/dev/packages/pst-text.json
@@ -3,12 +3,6 @@
     "pstricks": []
   },
   "macros": {
-    "pstextpath[](){}{}": {
-      "snippet": "pstextpath[${3:pos}](${4:x},${5:y}){${1:graphics object}}{${2:text}}"
-    },
-    "pstextpath(){}{}": {
-      "snippet": "pstextpath(${3:x},${4:y}){${1:graphics object}}{${2:text}}"
-    },
     "pscharpath{}": {
       "snippet": "pscharpath{${1:text}}"
     },
@@ -40,24 +34,12 @@
     "psCircleText[]{}": {
       "snippet": "psCircleText[${2:options}]{${1:text}}"
     },
-    "psCircleText(){}": {
-      "snippet": "psCircleText(${2:x},${3:y}){${1:text}}"
-    },
-    "psCircleText[](){}": {
-      "snippet": "psCircleText[${2:options}](${3:x},${4:y}){${1:text}}"
-    },
     "psWarp{}": {
       "snippet": "psWarp{${1:text}}"
     },
     "psWarp[]{}": {
       "snippet": "psWarp[${2:options}]{${1:text}}"
     },
-    "psWarp(){}": {
-      "snippet": "psWarp(${2:x},${3:y}){${1:text}}"
-    },
-    "psWarp[](){}": {
-      "snippet": "psWarp[${2:options}](${3:x},${4:y}){${1:text}}"
-    },
     "TPoffset": {},
     "PSTextPathLoaded": {}
   },
diff --git a/dev/packages/pst-turtle.json b/dev/packages/pst-turtle.json
index 3fabce086..0d5928a68 100644
--- a/dev/packages/pst-turtle.json
+++ b/dev/packages/pst-turtle.json
@@ -3,14 +3,7 @@
     "pstricks": [],
     "pst-xkey": []
   },
-  "macros": {
-    "psTurtle(){}": {
-      "snippet": "psTurtle(${2:x},${3:y}){${1:turtle code}}"
-    },
-    "psTurtle[](){}": {
-      "snippet": "psTurtle[${2:options}](${3:x},${4:y}){${1:turtle code}}"
-    }
-  },
+  "macros": {},
   "envs": {},
   "options": [],
   "keyvals": []
diff --git a/dev/packages/pst-venn.json b/dev/packages/pst-venn.json
index 9ced32fdf..0d5928a68 100644
--- a/dev/packages/pst-venn.json
+++ b/dev/packages/pst-venn.json
@@ -3,25 +3,8 @@
     "pstricks": [],
     "pst-xkey": []
   },
-  "macros": {
-    "psVenn()()(){}{}": {
-      "snippet": "psVenn(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:radius}}{${2:segments}}"
-    },
-    "psVenn[]()()(){}{}": {
-      "snippet": "psVenn[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:radius}}{${2:segments}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
+  "macros": {},
   "envs": {},
   "options": [],
-  "keyvals": [
-    [
-      "bgcircle",
-      "bgcolor=",
-      "bgradius=",
-      "fgcolor=",
-      "vennfill="
-    ]
-  ]
+  "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/pstricks-add.json b/dev/packages/pstricks-add.json
index ad48655f4..c78bd7c72 100644
--- a/dev/packages/pstricks-add.json
+++ b/dev/packages/pstricks-add.json
@@ -20,30 +20,6 @@
     },
     "EndSaveFinalState": {},
     "parseRP": {},
-    "psBrace()()": {
-      "snippet": "psBrace(${1:A})(${2:B})"
-    },
-    "psbrace()(){}": {
-      "snippet": "psbrace(${2:A})(${3:B}){${1:text}}"
-    },
-    "psBrace*()()": {
-      "snippet": "psBrace*(${1:A})(${2:B})"
-    },
-    "psBrace*[]()()": {
-      "snippet": "psBrace*[${1:options}](${2:A})(${3:B})"
-    },
-    "psBrace[]()()": {
-      "snippet": "psBrace[${1:options}](${2:A})(${3:B})"
-    },
-    "psbrace[]()(){}": {
-      "snippet": "psbrace[${2:options}](${3:A})(${4:B}){${1:text}}"
-    },
-    "psCallout(){}": {
-      "snippet": "psCallout(${2:x},${3:y}){${1:text}}"
-    },
-    "psCallout[](){}": {
-      "snippet": "psCallout[${2:options}](${3:x},${4:y}){${1:text}}"
-    },
     "psCancel*[]{}": {
       "snippet": "psCancel*[${2:options}]{${1:stuff}}"
     },
@@ -62,60 +38,6 @@
     "psChart{}{}{}": {
       "snippet": "psChart{${1:list1}}{${2:list2}}{${3:radius}}"
     },
-    "psCircleTangents()(){}": {
-      "snippet": "psCircleTangents(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:radius}}"
-    },
-    "psCircleTangents(){}(){}": {
-      "snippet": "psCircleTangents(${3:x1},${4:y1}){${1:radius1}}(${5:x2},${6:y2}){${2:radius2}}"
-    },
-    "psComment()(){}": {
-      "snippet": "psComment(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:text}}"
-    },
-    "psComment()(){}[][]": {
-      "snippet": "psComment(${4:x0},${5:y0})(${6:x1},${7:y1}){${1:text}}[${2:line macro}][${3:put macro}]"
-    },
-    "psComment*()(){}": {
-      "snippet": "psComment*(${2:x0},${3:y0})(${4:x1},${5:y1}){${1:text}}"
-    },
-    "psComment*()(){}[][]": {
-      "snippet": "psComment*(${4:x0},${5:y0})(${6:x1},${7:y1}){${1:text}}[${2:line macro}][${3:put macro}]"
-    },
-    "psComment*[]()(){}": {
-      "snippet": "psComment*[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:text}}"
-    },
-    "psComment*[]()(){}[][]": {
-      "snippet": "psComment*[${2:options}](${5:x0},${6:y0})(${7:x1},${8:y1}){${1:text}}[${3:line macro}][${4:put macro}]"
-    },
-    "psComment*[]{}()(){}": {
-      "snippet": "psComment*[${3:options}]{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:text}}"
-    },
-    "psComment*[]{}()(){}[][]": {
-      "snippet": "psComment*[${3:options}]{${1:arrows}}(${6:x0},${7:y0})(${8:x1},${9:y1}){${2:text}}[${4:line macro}][${5:put macro}]"
-    },
-    "psComment*{}()(){}": {
-      "snippet": "psComment*{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1}){${2:text}}"
-    },
-    "psComment*{}()(){}[][]": {
-      "snippet": "psComment*{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:text}}[${3:line macro}][${4:put macro}]"
-    },
-    "psComment[]()(){}": {
-      "snippet": "psComment[${2:options}](${3:x0},${4:y0})(${5:x1},${6:y1}){${1:text}}"
-    },
-    "psComment[]()(){}[][]": {
-      "snippet": "psComment[${2:options}](${5:x0},${6:y0})(${7:x1},${8:y1}){${1:text}}[${3:line macro}][${4:put macro}]"
-    },
-    "psComment[]{}()(){}": {
-      "snippet": "psComment[${3:options}]{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:text}}"
-    },
-    "psComment[]{}()(){}[][]": {
-      "snippet": "psComment[${3:options}]{${1:arrows}}(${6:x0},${7:y0})(${8:x1},${9:y1}){${2:text}}[${4:line macro}][${5:put macro}]"
-    },
-    "psComment{}()(){}": {
-      "snippet": "psComment{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1}){${2:text}}"
-    },
-    "psComment{}()(){}[][]": {
-      "snippet": "psComment{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:text}}[${3:line macro}][${4:put macro}]"
-    },
     "pscurvepoints[]{}{}{}{}": {
       "snippet": "pscurvepoints[${5:options}]{${1:tmin}}{${2:tmax}}{${3:function of t}}{${4:root}}"
     },
@@ -129,39 +51,12 @@
       "snippet": "psdice{${1:number}}"
     },
     "psDiffSumValue": {},
-    "psEllipseTangents()()()": {
-      "snippet": "psEllipseTangents(${1:x0},${2:y0})(${3:a},${4:b})(${5:xp},${6:yp})"
-    },
-    "psEllipseTangentsN()()(){}": {
-      "snippet": "psEllipseTangentsN(${2:x0},${3:y0})(${4:a},${5:b})(${6:xp},${7:yp}){${1:node name}}"
-    },
     "psFormatInt[]{}": {
       "snippet": "psFormatInt[${2:options}]{${1:integer}}"
     },
     "psFormatInt{}": {
       "snippet": "psFormatInt{${1:integer}}"
     },
-    "psGetDistance()(){}": {
-      "snippet": "psGetDistance(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:macro}}"
-    },
-    "psGetDistance[]()(){}": {
-      "snippet": "psGetDistance[${2:decimals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:macro}}"
-    },
-    "psGetSlope()(){}": {
-      "snippet": "psGetSlope(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:macro}}"
-    },
-    "psGTriangle()()(){}{}{}": {
-      "snippet": "psGTriangle(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:color1}}{${2:color2}}{${3:color3}}"
-    },
-    "psHomothetie(){}{}": {
-      "snippet": "psHomothetie(${3:x},${4:y}){${1:factor}}{${2:stuff}}"
-    },
-    "psHomothetie[](){}{}": {
-      "snippet": "psHomothetie[${3:options}](${4:x},${5:y}){${1:factor}}{${2:stuff}}"
-    },
-    "psIntersectionPoint()()()(){}": {
-      "snippet": "psIntersectionPoint(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:node name}}"
-    },
     "psKiviat[]{}{}": {
       "snippet": "psKiviat[${3:options}]{${1:number of edges}}{${2:radius}}"
     },
@@ -194,36 +89,6 @@
       "snippet": "psMatrixPlot{${1:rows}}{${2:columns}}{${3:data file}}"
     },
     "psMiddleSumValue": {},
-    "psOlympicRings()": {
-      "snippet": "psOlympicRings(${1:x},${2:y})"
-    },
-    "psOlympicRings[]()": {
-      "snippet": "psOlympicRings[${1:options}](${2:x},${3:y})"
-    },
-    "psParallelLine()()(){}{}": {
-      "snippet": "psParallelLine(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2}){${1:length}}{${2:end node name}}"
-    },
-    "psParallelLine[]()()(){}{}": {
-      "snippet": "psParallelLine[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${1:length}}{${2:end node name}}"
-    },
-    "psParallelLine[]{}()()(){}{}": {
-      "snippet": "psParallelLine[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1})(${9:x2},${10:y2}){${2:length}}{${3:end node name}}"
-    },
-    "psParallelLine{}()()(){}{}": {
-      "snippet": "psParallelLine{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1})(${8:x2},${9:y2}){${2:length}}{${3:end node name}}"
-    },
-    "psColorLine()()": {
-      "snippet": "psColorLine(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psColorLine{}()()": {
-      "snippet": "psColorLine{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psColorLine[]()()": {
-      "snippet": "psColorLine[${1:options}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psColorLine[]{}()()": {
-      "snippet": "psColorLine[${2:options}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
     "psparallelogrambox[]{}": {
       "snippet": "psparallelogrambox[${2:options}]{${1:stuff}}"
     },
@@ -231,10 +96,10 @@
       "snippet": "psparallelogrambox{${1:stuff}}"
     },
     "psplotDiffEqn[]{}{}{}{}": {
-      "snippet": "psplotDiffEqn[${5:options}]{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${6:x},${7:y},${8:y'},${9:...})}}"
+      "snippet": "psplotDiffEqn[${5:options}]{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${6:x,y,y',...})}}"
     },
     "psplotDiffEqn{}{}{}{}": {
-      "snippet": "psplotDiffEqn{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${5:x},${6:y},${7:y'},${8:...})}}"
+      "snippet": "psplotDiffEqn{${1:x0}}{${2:x1}}{${3:y0}}{${4:f(${5:x,y,y',...})}}"
     },
     "psplotTangent*[]{}{}{}": {
       "snippet": "psplotTangent*[${4:options}]{${1:x}}{${2:dx}}{${3:function}}"
@@ -254,18 +119,6 @@
     "pspolylineticks{}{}{}{}": {
       "snippet": "pspolylineticks{${1:root name}}{${2:function}}{${3:first tick}}{${4:tick count}}"
     },
-    "psRandom()(){}": {
-      "snippet": "psRandom(${2:xmin},${3:ymin})(${4:xmax},${5:ymax}){${1:clip path}}"
-    },
-    "psRandom(){}": {
-      "snippet": "psRandom(${2:xmin},${3:ymin}){${1:clip path}}"
-    },
-    "psRandom[]()(){}": {
-      "snippet": "psRandom[${2:options}](${3:xmin},${4:ymin})(${5:xmax},${6:ymax}){${1:clip path}}"
-    },
-    "psRandom[](){}": {
-      "snippet": "psRandom[${2:options}](${3:xmin},${4:ymin}){${1:clip path}}"
-    },
     "psRandom[]{}": {
       "snippet": "psRandom[${2:options}]{${1:}}"
     },
@@ -278,46 +131,7 @@
     "psRandomPointArea{}{}": {
       "snippet": "psRandomPointArea{${1:number}}{${2:function}}"
     },
-    "psRelLine()(){}{}": {
-      "snippet": "psRelLine(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:length factor}}{${2:end node name}}"
-    },
-    "psRelLine[]()(){}{}": {
-      "snippet": "psRelLine[${3:options}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:length factor}}{${2:end node name}}"
-    },
-    "psRelLine[]{}()(){}{}": {
-      "snippet": "psRelLine[${4:options}]{${1:arrows}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:length factor}}{${3:end node name}}"
-    },
-    "psRelLine{}()(){}{}": {
-      "snippet": "psRelLine{${1:arrows}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:length factor}}{${3:end node name}}"
-    },
-    "psRiemannSum(){}{}": {
-      "snippet": "psRiemannSum(${3:x0},${4:x1}){${1:n}}{${2:function}}"
-    },
     "psRightSumValue": {},
-    "psrotate(){}{}": {
-      "snippet": "psrotate(${3:x},${4:y}){${1:angle}}{${2:stuff}}"
-    },
-    "psrotate[](){}{}": {
-      "snippet": "psrotate[${3:options}](${4:x},${5:y}){${1:angle}}{${2:stuff}}"
-    },
-    "psStartPoint()": {
-      "snippet": "psStartPoint(${1:x},${2:y})"
-    },
-    "psStartPoint[]()": {
-      "snippet": "psStartPoint[${1:node basename}](${2:x},${3:y})"
-    },
-    "psStep(){}{}": {
-      "snippet": "psStep(${3:x},${4:y}){${1:n}}{${2:function}}"
-    },
-    "psStep[](){}{}": {
-      "snippet": "psStep[${3:options}](${4:x},${5:y}){${1:n}}{${2:function}}"
-    },
-    "psTangentLine()()(){}{}": {
-      "snippet": "psTangentLine(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3}){${1:x}}{${2:dx}}"
-    },
-    "psTangentLine[]()()(){}{}": {
-      "snippet": "psTangentLine[${3:options}](${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3}){${1:x}}{${2:dx}}"
-    },
     "pstContour[]{}": {
       "snippet": "pstContour[${2:options}]{${1:data file}}"
     },
@@ -329,30 +143,6 @@
     "psVectorName": {},
     "pswavelengthToGRAY": {},
     "pswavelengthToRGB": {},
-    "Put(){}": {
-      "snippet": "Put(${2:position}){${1:stuff}}"
-    },
-    "Put*(){}": {
-      "snippet": "Put*(${2:position}){${1:stuff}}"
-    },
-    "Put*[](){}": {
-      "snippet": "Put*[${2:options}](${3:position}){${1:stuff}}"
-    },
-    "Put*[]{}(){}": {
-      "snippet": "Put*[${3:options}]{${1:ref}}(${4:position}){${2:stuff}}"
-    },
-    "Put*{}(){}": {
-      "snippet": "Put*{${1:ref}}(${3:position}){${2:stuff}}"
-    },
-    "Put[](){}": {
-      "snippet": "Put[${2:options}](${3:position}){${1:stuff}}"
-    },
-    "Put[]{}(){}": {
-      "snippet": "Put[${3:options}]{${1:ref}}(${4:position}){${2:stuff}}"
-    },
-    "Put{}(){}": {
-      "snippet": "Put{${1:ref}}(${3:position}){${2:stuff}}"
-    },
     "resetOptions": {}
   },
   "envs": {},
diff --git a/dev/packages/pstricks.json b/dev/packages/pstricks.json
index 07a894c18..65c804130 100644
--- a/dev/packages/pstricks.json
+++ b/dev/packages/pstricks.json
@@ -31,8 +31,11 @@
     "black": {},
     "blue": {},
     "Cartesian": {},
-    "Cartesian()": {
-      "snippet": "Cartesian(${1:x},${2:y})"
+    "clipbox[]{}": {
+      "snippet": "clipbox[${2:dim}]{${1:stuff}}"
+    },
+    "clipbox{}": {
+      "snippet": "clipbox{${1:stuff}}"
     },
     "closedshadow": {},
     "closedshadow[]": {
@@ -42,33 +45,6 @@
     "code{}": {
       "snippet": "code{${1:code}}"
     },
-    "cput*[]{}(){}": {
-      "snippet": "cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "Cput*[]{}(){}": {
-      "snippet": "Cput*[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "cput*{}(){}": {
-      "snippet": "cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "Cput*{}(){}": {
-      "snippet": "Cput*{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "cput[]{}(){}": {
-      "snippet": "cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "Cput[]{}(){}": {
-      "snippet": "Cput[${3:keyvals}]{${1:angle}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "cput{}(){}": {
-      "snippet": "cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "Cput{}(){}": {
-      "snippet": "Cput{${1:angle}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "curveto()()()": {
-      "snippet": "curveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
     "cyan": {},
     "darkgray": {},
     "degrees": {},
@@ -103,48 +79,9 @@
     "ifshowgrid": {},
     "KillGlue": {},
     "lightgray": {},
-    "lineto()": {
-      "snippet": "lineto(${1:coor})"
-    },
     "magenta": {},
-    "movepath()": {
-      "snippet": "movepath(${1:coor})"
-    },
-    "moveto()": {
-      "snippet": "moveto(${1:coor})"
-    },
     "mrestore": {},
     "msave": {},
-    "multips()(){}{}": {
-      "snippet": "multips(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:graphics}}"
-    },
-    "multips{}()(){}{}": {
-      "snippet": "multips{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:graphics}}"
-    },
-    "multirput()(){}{}": {
-      "snippet": "multirput(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput*()(){}{}": {
-      "snippet": "multirput*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput*[]()(){}{}": {
-      "snippet": "multirput*[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput*[]{}()(){}{}": {
-      "snippet": "multirput*[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
-    },
-    "multirput*{}()(){}{}": {
-      "snippet": "multirput*{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
-    },
-    "multirput[]()(){}{}": {
-      "snippet": "multirput[${3:refpoint}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:int}}{${2:stuff}}"
-    },
-    "multirput[]{}()(){}{}": {
-      "snippet": "multirput[${4:refpoint}]{${1:angle}}(${5:x0},${6:y0})(${7:x1},${8:y1}){${2:int}}{${3:stuff}}"
-    },
-    "multirput{}()(){}{}": {
-      "snippet": "multirput{${1:angle}}(${4:x0},${5:y0})(${6:x1},${7:y1}){${2:int}}{${3:stuff}}"
-    },
     "newcmykcolor{}{}": {
       "snippet": "newcmykcolor{${1:color}}{${2:num1 num2 num3 num4}}"
     },
@@ -185,30 +122,6 @@
       "snippet": "openshadow[${1:keyvals}]"
     },
     "overlaybox": {},
-    "parabola()()": {
-      "snippet": "parabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "parabola*()()": {
-      "snippet": "parabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "parabola*[]()()": {
-      "snippet": "parabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "parabola*[]{}()()": {
-      "snippet": "parabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "parabola*{}()()": {
-      "snippet": "parabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "parabola[]()()": {
-      "snippet": "parabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "parabola[]{}()()": {
-      "snippet": "parabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "parabola{}()()": {
-      "snippet": "parabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pgfforeach": {},
     "pgfforeach{}": {
       "snippet": "pgfforeach{${1:cmd}}"
@@ -217,176 +130,8 @@
     "psaddtolength{}{}": {
       "snippet": "psaddtolength{${1:cmd}}{${2:dim}}"
     },
-    "psarc(){}{}{}": {
-      "snippet": "psarc(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc*(){}{}{}": {
-      "snippet": "psarc*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc*[](){}{}{}": {
-      "snippet": "psarc*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc*[]{}(){}{}{}": {
-      "snippet": "psarc*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarc*{}(){}{}{}": {
-      "snippet": "psarc*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarc[](){}{}{}": {
-      "snippet": "psarc[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarc[]{}(){}{}{}": {
-      "snippet": "psarc[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarc{}(){}{}{}": {
-      "snippet": "psarc{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcAB()()()": {
-      "snippet": "psarcAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
-    },
-    "psarcAB[]()()()": {
-      "snippet": "psarcAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
-    "psarcAB[]{}()()()": {
-      "snippet": "psarcAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
-    },
-    "psarcAB{}()()()": {
-      "snippet": "psarcAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
-    "psarcn(){}{}{}": {
-      "snippet": "psarcn(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn*(){}{}{}": {
-      "snippet": "psarcn*(${4:x},${5:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn*[](){}{}{}": {
-      "snippet": "psarcn*[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn*[]{}(){}{}{}": {
-      "snippet": "psarcn*[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcn*{}(){}{}{}": {
-      "snippet": "psarcn*{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcn[](){}{}{}": {
-      "snippet": "psarcn[${4:keyvals}](${5:x},${6:y}){${1:radius}}{${2:angleA}}{${3:angleB}}"
-    },
-    "psarcn[]{}(){}{}{}": {
-      "snippet": "psarcn[${5:keyvals}]{${1:arrows}}(${6:x},${7:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcn{}(){}{}{}": {
-      "snippet": "psarcn{${1:arrows}}(${5:x},${6:y}){${2:radius}}{${3:angleA}}{${4:angleB}}"
-    },
-    "psarcnAB()()()": {
-      "snippet": "psarcnAB(${1:xC},${2:yC})(${3:xA},${4:yA})(${5:xB},${6:yB})"
-    },
-    "psarcnAB[]()()()": {
-      "snippet": "psarcnAB[${1:keyvals}](${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
-    "psarcnAB[]{}()()()": {
-      "snippet": "psarcnAB[${2:keyvals}]{${1:arrows}}(${3:xC},${4:yC})(${5:xA},${6:yA})(${7:xB},${8:yB})"
-    },
-    "psarcnAB{}()()()": {
-      "snippet": "psarcnAB{${1:arrows}}(${2:xC},${3:yC})(${4:xA},${5:yA})(${6:xB},${7:yB})"
-    },
     "psarrowlinestyle": {},
-    "psbezier()()()()": {
-      "snippet": "psbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "psbezier*()()()()": {
-      "snippet": "psbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "psbezier*[]()()()()": {
-      "snippet": "psbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psbezier*[]{}()()()()": {
-      "snippet": "psbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "psbezier*{}()()()()": {
-      "snippet": "psbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psbezier[]()()()()": {
-      "snippet": "psbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psbezier[]{}()()()()": {
-      "snippet": "psbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "psbezier{}()()()()": {
-      "snippet": "psbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
     "psbordercolor": {},
-    "pscbezier()()()()": {
-      "snippet": "pscbezier(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "pscbezier*()()()()": {
-      "snippet": "pscbezier*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})(${7:x3},${8:y3})"
-    },
-    "pscbezier*[]()()()()": {
-      "snippet": "pscbezier*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "pscbezier*[]{}()()()()": {
-      "snippet": "pscbezier*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "pscbezier*{}()()()()": {
-      "snippet": "pscbezier*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "pscbezier[]()()()()": {
-      "snippet": "pscbezier[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "pscbezier[]{}()()()()": {
-      "snippet": "pscbezier[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})(${7:x2},${8:y2})(${9:x3},${10:y3})"
-    },
-    "pscbezier{}()()()()": {
-      "snippet": "pscbezier{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})(${8:x3},${9:y3})"
-    },
-    "psccurve()()": {
-      "snippet": "psccurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psccurve*()()": {
-      "snippet": "psccurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psccurve*[]()()": {
-      "snippet": "psccurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psccurve*[]{}()()": {
-      "snippet": "psccurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psccurve*{}()()": {
-      "snippet": "psccurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psccurve[]()()": {
-      "snippet": "psccurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psccurve[]{}()()": {
-      "snippet": "psccurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psccurve{}()()": {
-      "snippet": "psccurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscircle(){}": {
-      "snippet": "pscircle(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "psCircle(){}": {
-      "snippet": "psCircle(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "pscircle*(){}": {
-      "snippet": "pscircle*(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "psCircle*(){}": {
-      "snippet": "psCircle*(${2:x0},${3:y0}){${1:radius}}"
-    },
-    "pscircle*[](){}": {
-      "snippet": "pscircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
-    "psCircle*[](){}": {
-      "snippet": "psCircle*[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
-    "pscircle[](){}": {
-      "snippet": "pscircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
-    "psCircle[](){}": {
-      "snippet": "psCircle[${2:keyvals}](${3:x0},${4:y0}){${1:radius}}"
-    },
     "pscirclebox*[]{}": {
       "snippet": "pscirclebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -411,46 +156,10 @@
     "psCirclebox{}": {
       "snippet": "psCirclebox{${1:stuff}}"
     },
-    "pscircleOA()()": {
-      "snippet": "pscircleOA(${1:xO},${2:yO})(${3:xA},${4:yA})"
-    },
-    "pscircleOA[]()()": {
-      "snippet": "pscircleOA[${1:keyvals}](${2:xO},${3:yO})(${4:xA},${5:yA})"
-    },
     "psclip{}": {
       "snippet": "psclip{${1:graphics}}"
     },
-    "psclipbox[]{}": {
-      "snippet": "psclipbox[${2:dim}]{${1:stuff}}"
-    },
-    "psclipbox{}": {
-      "snippet": "psclipbox{${1:stuff}}"
-    },
     "pscoor": {},
-    "pscurve()()": {
-      "snippet": "pscurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "pscurve*()()": {
-      "snippet": "pscurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "pscurve*[]()()": {
-      "snippet": "pscurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscurve*[]{}()()": {
-      "snippet": "pscurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "pscurve*{}()()": {
-      "snippet": "pscurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscurve[]()()": {
-      "snippet": "pscurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "pscurve[]{}()()": {
-      "snippet": "pscurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "pscurve{}()()": {
-      "snippet": "pscurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
     "pscustom*[]{}": {
       "snippet": "pscustom*[${2:keyvals}]{${1:commands}}"
     },
@@ -494,128 +203,8 @@
     "psdiabox{}": {
       "snippet": "psdiabox{${1:stuff}}"
     },
-    "psdiamond()()": {
-      "snippet": "psdiamond(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psdiamond*()()": {
-      "snippet": "psdiamond*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psdiamond*[]()()": {
-      "snippet": "psdiamond*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psdiamond[]()()": {
-      "snippet": "psdiamond[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psdot()": {
-      "snippet": "psdot(${1:x1},${2:y1})"
-    },
-    "psdot*()": {
-      "snippet": "psdot*(${1:x1},${2:y1})"
-    },
-    "psdot*[]()": {
-      "snippet": "psdot*[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psdot[]()": {
-      "snippet": "psdot[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psdots()()": {
-      "snippet": "psdots(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psdots*()()": {
-      "snippet": "psdots*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psdots*[]()()": {
-      "snippet": "psdots*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psdots[]()()": {
-      "snippet": "psdots[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
     "psdoublecolor": {},
     "psdoublesep": {},
-    "psecurve()()": {
-      "snippet": "psecurve(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psecurve*()()": {
-      "snippet": "psecurve*(${1:x1},${2:y1})(${3:xn},${4:yn})"
-    },
-    "psecurve*[]()()": {
-      "snippet": "psecurve*[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psecurve*[]{}()()": {
-      "snippet": "psecurve*[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psecurve*{}()()": {
-      "snippet": "psecurve*{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psecurve[]()()": {
-      "snippet": "psecurve[${1:keyvals}](${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psecurve[]{}()()": {
-      "snippet": "psecurve[${2:keyvals}]{${1:arrows}}(${3:x1},${4:y1})(${5:xn},${6:yn})"
-    },
-    "psecurve{}()()": {
-      "snippet": "psecurve{${1:arrows}}(${2:x1},${3:y1})(${4:xn},${5:yn})"
-    },
-    "psellipse()()": {
-      "snippet": "psellipse(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psellipse*()()": {
-      "snippet": "psellipse*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psellipse*[]()()": {
-      "snippet": "psellipse*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psellipse[]()()": {
-      "snippet": "psellipse[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psellipseAB(){}": {
-      "snippet": "psellipseAB(${2:x},${3:y}){${1:half radius}}"
-    },
-    "psellipseAB*(){}": {
-      "snippet": "psellipseAB*(${2:x},${3:y}){${1:half radius}}"
-    },
-    "psellipseAB*[](){}": {
-      "snippet": "psellipseAB*[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
-    },
-    "psellipseAB[](){}": {
-      "snippet": "psellipseAB[${2:keyvals}](${3:x},${4:y}){${1:half radius}}"
-    },
-    "psellipticarc()(){}{}": {
-      "snippet": "psellipticarc(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarc*()(){}{}": {
-      "snippet": "psellipticarc*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarc*[]()(){}{}": {
-      "snippet": "psellipticarc*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarc[]()(){}{}": {
-      "snippet": "psellipticarc[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn()(){}{}": {
-      "snippet": "psellipticarcn(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn*()(){}{}": {
-      "snippet": "psellipticarcn*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn*[]()(){}{}": {
-      "snippet": "psellipticarcn*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticarcn[]()(){}{}": {
-      "snippet": "psellipticarcn[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge()(){}{}": {
-      "snippet": "psellipticwedge(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge*()(){}{}": {
-      "snippet": "psellipticwedge*(${3:x0},${4:y0})(${5:x1},${6:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge*[]()(){}{}": {
-      "snippet": "psellipticwedge*[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
-    "psellipticwedge[]()(){}{}": {
-      "snippet": "psellipticwedge[${3:keyvals}](${4:x0},${5:y0})(${6:x1},${7:y1}){${1:angle1}}{${2:angle2}}"
-    },
     "psfillcolor": {},
     "psforeach{}{}{}": {
       "snippet": "psforeach{${1:variable}}{${2:value list}}{${3:action}}"
@@ -623,18 +212,6 @@
     "psForeach{}{}{}": {
       "snippet": "psForeach{${1:variable}}{${2:value list}}{${3:action}}"
     },
-    "psframe()()": {
-      "snippet": "psframe(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psframe*()()": {
-      "snippet": "psframe*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psframe*[]()()": {
-      "snippet": "psframe*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psframe[]()()": {
-      "snippet": "psframe[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "psframebox*[]{}": {
       "snippet": "psframebox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -657,9 +234,6 @@
     "psgetRGBColorValues{}": {
       "snippet": "psgetRGBColorValues{${1:color macro}}"
     },
-    "psgrid()()()": {
-      "snippet": "psgrid(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
     "psgridcolor": {},
     "psgridlabelcolor": {},
     "pshatchcolor": {},
@@ -670,54 +244,6 @@
     },
     "pslabelsep": {},
     "pslbrace": {},
-    "psline()()": {
-      "snippet": "psline(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine()()": {
-      "snippet": "psLine(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine()": {
-      "snippet": "psLine(${1:x1},${2:y1})"
-    },
-    "psline*()()": {
-      "snippet": "psline*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine*()()": {
-      "snippet": "psLine*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psLine*()": {
-      "snippet": "psLine*(${1:x1},${2:y1})"
-    },
-    "psline*[]()()": {
-      "snippet": "psline*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine*[]()()": {
-      "snippet": "psLine*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine*[]()": {
-      "snippet": "psLine*[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psline*[]{}()()": {
-      "snippet": "psline*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psline*{}()()": {
-      "snippet": "psline*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psline[]()()": {
-      "snippet": "psline[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine[]()()": {
-      "snippet": "psLine[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psLine[]()": {
-      "snippet": "psLine[${1:keyvals}](${2:x1},${3:y1})"
-    },
-    "psline[]{}()()": {
-      "snippet": "psline[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psline{}()()": {
-      "snippet": "psline{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pslinearc": {},
     "pslinecolor": {},
     "pslinestyle": {},
@@ -747,77 +273,11 @@
     "psoverlay{}": {
       "snippet": "psoverlay{${1:string}}"
     },
-    "psparabola()()": {
-      "snippet": "psparabola(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psparabola*()()": {
-      "snippet": "psparabola*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "psparabola*[]()()": {
-      "snippet": "psparabola*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psparabola*[]{}()()": {
-      "snippet": "psparabola*[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psparabola*{}()()": {
-      "snippet": "psparabola*{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psparabola[]()()": {
-      "snippet": "psparabola[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "psparabola[]{}()()": {
-      "snippet": "psparabola[${2:keyvals}]{${1:arrows}}(${3:x0},${4:y0})(${5:x1},${6:y1})"
-    },
-    "psparabola{}()()": {
-      "snippet": "psparabola{${1:arrows}}(${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pspicture[]": {
       "snippet": "pspicture[${1:keyvals}]"
     },
-    "psPline()()()": {
-      "snippet": "psPline(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
-    "psPline[]()()()": {
-      "snippet": "psPline[${1:keyvals}](${2:x1},${3:y1})(${4:x2},${5:y2})(${6:x3},${7:y3})"
-    },
-    "pspolygon()()()": {
-      "snippet": "pspolygon(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pspolygon*()()()": {
-      "snippet": "pspolygon*(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "pspolygon*[]()()()": {
-      "snippet": "pspolygon*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
-    "pspolygon[]()()()": {
-      "snippet": "pspolygon[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})(${6:x2},${7:y2})"
-    },
     "psrbrace": {},
     "psresetColor": {},
-    "psRing()[]{}{}": {
-      "snippet": "psRing(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing(){}{}": {
-      "snippet": "psRing(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*()[]{}{}": {
-      "snippet": "psRing*(${4:x},${5:y})[${3:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*(){}{}": {
-      "snippet": "psRing*(${3:x},${4:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*[]()[]{}{}": {
-      "snippet": "psRing*[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing*[](){}{}": {
-      "snippet": "psRing*[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing[]()[]{}{}": {
-      "snippet": "psRing[${3:keyvals}](${5:x},${6:y})[${4:start,end}]{${1:inner radius}}{${2:outer radius}}"
-    },
-    "psRing[](){}{}": {
-      "snippet": "psRing[${3:keyvals}](${4:x},${5:y}){${1:inner radius}}{${2:outer radius}}"
-    },
     "psrotatedown{}": {
       "snippet": "psrotatedown{${1:stuff}}"
     },
@@ -831,9 +291,6 @@
     "psscalebox{}{}": {
       "snippet": "psscalebox{${1:num1 num2}}{${2:stuff}}"
     },
-    "psscaleboxto(){}": {
-      "snippet": "psscaleboxto(${2:x},${3:y}){${1:stuff}}"
-    },
     "pssetGrayscale": {},
     "pssetlength{}{}": {
       "snippet": "pssetlength{${1:cmd}}{${2:dim}}"
@@ -865,36 +322,12 @@
     },
     "pstcustomize": {},
     "pstdriver": {},
-    "psTextFrame()(){}": {
-      "snippet": "psTextFrame(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
-    },
-    "psTextFrame*()(){}": {
-      "snippet": "psTextFrame*(${2:x1},${3:y1})(${4:x2},${5:y2}){${1:text}}"
-    },
-    "psTextFrame*[]()(){}": {
-      "snippet": "psTextFrame*[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
-    },
-    "psTextFrame[]()(){}": {
-      "snippet": "psTextFrame[${2:keyvals}](${3:x1},${4:y1})(${5:x2},${6:y2}){${1:text}}"
-    },
     "pstheader{}": {
       "snippet": "pstheader{${1:arg}}"
     },
     "PSTlualatexfalse": {},
     "PSTlualatextrue": {},
     "pstnodescale": {},
-    "pstriangle()()": {
-      "snippet": "pstriangle(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pstriangle*()()": {
-      "snippet": "pstriangle*(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pstriangle*[]()()": {
-      "snippet": "pstriangle*[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pstriangle[]()()": {
-      "snippet": "pstriangle[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
     "pstribox*[]{}": {
       "snippet": "pstribox*[${2:keyvals}]{${1:stuff}}"
     },
@@ -923,42 +356,15 @@
     "psunit": {},
     "psverbboxfalse": {},
     "psverbboxtrue": {},
-    "pswedge(){}{}{}": {
-      "snippet": "pswedge(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
-    "pswedge*(){}{}{}": {
-      "snippet": "pswedge*(${4:x0},${5:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
-    "pswedge*[](){}{}{}": {
-      "snippet": "pswedge*[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
-    "pswedge[](){}{}{}": {
-      "snippet": "pswedge[${4:keyvals}](${5:x0},${6:y0}){${1:radius}}{${2:angle1}}{${3:angle2}}"
-    },
     "psxunit": {},
     "psyunit": {},
     "putoverlaybox{}": {
       "snippet": "putoverlaybox{${1:string}}"
     },
-    "qdisk(){}": {
-      "snippet": "qdisk(${2:coor}){${1:radius}}"
-    },
-    "qline()()": {
-      "snippet": "qline(${1:coor0})(${2:coor1})"
-    },
     "radians": {},
-    "rcurveto()()()": {
-      "snippet": "rcurveto(${1:x1},${2:y1})(${3:x2},${4:y2})(${5:x3},${6:y3})"
-    },
     "red": {},
     "resetArrowOptions": {},
     "reversepath": {},
-    "rlineto()": {
-      "snippet": "rlineto(${1:coor})"
-    },
-    "rmoveto()": {
-      "snippet": "rmoveto(${1:coor})"
-    },
     "rotate{}": {
       "snippet": "rotate{${1:angle}}"
     },
@@ -971,33 +377,6 @@
     "rotateright{}": {
       "snippet": "rotateright{${1:stuff}}"
     },
-    "rput(){}": {
-      "snippet": "rput(${2:x},${3:y}){${1:stuff}}"
-    },
-    "rput*(){}": {
-      "snippet": "rput*(${2:x},${3:y}){${1:stuff}}"
-    },
-    "rput*[](){}": {
-      "snippet": "rput*[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "rput*[]{}(){}": {
-      "snippet": "rput*[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "rput*{}(){}": {
-      "snippet": "rput*{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
-    },
-    "rput[](){}": {
-      "snippet": "rput[${2:refpoint}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "rput[]{}(){}": {
-      "snippet": "rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "Rput[]{}(){}": {
-      "snippet": "Rput[${3:refpoint}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "rput{}(){}": {
-      "snippet": "rput{${1:rotation}}(${3:x},${4:y}){${2:stuff}}"
-    },
     "scale{}": {
       "snippet": "scale{${1:num1 num2}}"
     },
@@ -1012,33 +391,6 @@
       "snippet": "stroke[${1:keyvals}]"
     },
     "swapaxes": {},
-    "translate()": {
-      "snippet": "translate(${1:coor})"
-    },
-    "uput*[](){}": {
-      "snippet": "uput*[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "uput*[]{}(){}": {
-      "snippet": "uput*[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "uput*{}[](){}": {
-      "snippet": "uput*{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
-    },
-    "uput*{}[]{}(){}": {
-      "snippet": "uput*{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
-    },
-    "uput[](){}": {
-      "snippet": "uput[${2:refangle}](${3:x},${4:y}){${1:stuff}}"
-    },
-    "uput[]{}(){}": {
-      "snippet": "uput[${3:refangle}]{${1:rotation}}(${4:x},${5:y}){${2:stuff}}"
-    },
-    "uput{}[](){}": {
-      "snippet": "uput{${1:labelsep}}[${2:refangle}](${4:x},${5:y}){${3:stuff}}"
-    },
-    "uput{}[]{}(){}": {
-      "snippet": "uput{${1:labelsep}}[${2:refangle}]{${3:rotation}}(${5:x},${6:y}){${4:stuff}}"
-    },
     "white": {},
     "yellow": {},
     "psarcOA": {},
@@ -1076,22 +428,6 @@
     "psclip{}": {
       "name": "psclip",
       "snippet": "{${1:graphics}}"
-    },
-    "pspicture*(x0,y0)(x1,y1)": {
-      "name": "pspicture*",
-      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pspicture*[](x0,y0)(x1,y1)": {
-      "name": "pspicture*",
-      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "pspicture(x0,y0)(x1,y1)": {
-      "name": "pspicture",
-      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "pspicture[](x0,y0)(x1,y1)": {
-      "name": "pspicture",
-      "snippet": "[${1:keyvals}](${2:x0},${3:y0})(${4:x1},${5:y1})"
     }
   },
   "options": [
diff --git a/dev/packages/ptex.json b/dev/packages/ptex.json
deleted file mode 100644
index 351916eca..000000000
--- a/dev/packages/ptex.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "includes": {
-    "tex": []
-  },
-  "macros": {
-    "autospacing": {},
-    "noautospacing": {},
-    "autoxspacing": {},
-    "noautoxspacing": {},
-    "showmode": {},
-    "inhibitglue": {},
-    "disinhibitglue": {},
-    "tate": {},
-    "yoko": {},
-    "dtou": {},
-    "iftdir": {},
-    "ifydir": {},
-    "ifddir": {},
-    "ifmdir": {},
-    "jfont": {},
-    "tfont": {},
-    "ptextracingfonts": {},
-    "ptexfontname": {},
-    "ptexversion": {},
-    "ptexminorversion": {},
-    "ptexrevision": {},
-    "omathchardef{}": {
-      "snippet": "omathchardef{${1:cmd}}"
-    },
-    "pagefistretch": {},
-    "hfi": {},
-    "vfi": {},
-    "pdfstrcmp{}{}": {
-      "snippet": "pdfstrcmp{${1:string1}}{${2:string2}}"
-    },
-    "pdfpagewidth": {},
-    "pdfpageheight": {},
-    "pdflastxpos": {},
-    "pdflastypos": {},
-    "pdfcreationdate": {},
-    "pdffilemoddate{}": {
-      "snippet": "pdffilemoddate{${1:file}}"
-    },
-    "pdffilesize{}": {
-      "snippet": "pdffilesize{${1:file}}"
-    },
-    "pdfshellescape": {},
-    "pdfmdfivesum{}": {
-      "snippet": "pdfmdfivesum{${1:text}}"
-    },
-    "pdfnormaldeviate": {},
-    "pdfrandomseed": {},
-    "pdfelapsedtime": {},
-    "pdfresettimer": {},
-    "expanded": {},
-    "ifincsname": {},
-    "epTeXversion": {},
-    "lastnodechar": {},
-    "lastnodefont": {},
-    "lastnodesubtype": {},
-    "epTeXinputencoding": {},
-    "readpapersizespecial": {},
-    "currentspacingmode": {},
-    "currentxspacingmode": {},
-    "suppresslongerror": {},
-    "suppressoutererror": {},
-    "suppressmathparerror": {},
-    "tracingstacklevels": {},
-    "partokencontext": {},
-    "showstream": {},
-    "synctex": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/puyotikz.json b/dev/packages/puyotikz.json
index 3506e48b2..0a1fa00b2 100644
--- a/dev/packages/puyotikz.json
+++ b/dev/packages/puyotikz.json
@@ -27,7 +27,7 @@
       "keyvalpos": 0
     },
     "puyocolor{}{}": {
-      "snippet": "puyocolor{${1:name}}{${2:r,${3:g},b}}"
+      "snippet": "puyocolor{${1:name}}{${2:r,g,b}}"
     }
   },
   "envs": {
diff --git a/dev/packages/pxbabel.json b/dev/packages/pxbabel.json
index 201c9710e..d84bc75e2 100644
--- a/dev/packages/pxbabel.json
+++ b/dev/packages/pxbabel.json
@@ -75,7 +75,7 @@
       "snippet": "pxDeclareEncodingDispatcher{${1:encoding}}{${2:text}}"
     },
     "pxDispatchEncodings{}": {
-      "snippet": "pxDispatchEncodings{${1:enc1,${2:enc2},...}}"
+      "snippet": "pxDispatchEncodings{${1:enc1,enc2,...}}"
     },
     "pxIsEncodingDispatched{}": {
       "snippet": "pxIsEncodingDispatched{${1:encoding}}"
diff --git a/dev/packages/pygmentex.json b/dev/packages/pygmentex.json
deleted file mode 100644
index 3b0fb3ced..000000000
--- a/dev/packages/pygmentex.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "includes": {
-    "fancyvrb": [],
-    "color": [],
-    "ifthen": [],
-    "caption": [],
-    "shellesc": [],
-    "pgfkeys": [],
-    "efbox": [],
-    "mdframed": [],
-    "tikz": []
-  },
-  "macros": {
-    "inputpygmented{}": {
-      "snippet": "inputpygmented{${1:file}}"
-    },
-    "inputpygmented[]{}": {
-      "snippet": "inputpygmented[${2:options}]{${1:file}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "pyginline": {
-      "snippet": "pyginline|${1:code}|"
-    },
-    "pyginline[]": {
-      "snippet": "pyginline[${1:options}]|${2:code}|",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "pyginline[]{}": {
-      "snippet": "pyginline[${2:options}]{${1:verbatimSymbol}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "setpygmented{}": {
-      "snippet": "setpygmented{${1:options}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "widest(){}{}": {
-      "snippet": "widest(${3:string list}){${1:code}}{${2:cmd}}"
-    },
-    "VerbatimOutAppend": {},
-    "remainingglobaloptions": {},
-    "remaininguseroptions": {},
-    "remainingoptions": {},
-    "FormatLineNumber{}": {
-      "snippet": "FormatLineNumber{${1:arg}}"
-    }
-  },
-  "envs": {
-    "pygmented": {},
-    "pygmented[]": {
-      "name": "pygmented",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "VerbatimOutAppend": {}
-  },
-  "options": [
-    "force"
-  ],
-  "keyvals": [
-    [
-      "lang=${1:language}",
-      "sty=${1:pygments style}",
-      "font=${1:font commands}",
-      "colback=",
-      "gobble=${1:integer}",
-      "tabsize=${1:integer}",
-      "linenos",
-      "linenostart=${1:integer}",
-      "linenostep=${1:integer}",
-      "linenosep=",
-      "caption=${1:caption}",
-      "label=",
-      "texcomments",
-      "mathescape",
-      "escapeinside=${1:two chars}",
-      "force",
-      "boxing method=${1:envname}"
-    ],
-    [
-      "lang=${1:language}",
-      "sty=${1:pygments style}",
-      "font=${1:font commands}",
-      "colback=",
-      "gobble=${1:integer}",
-      "tabsize=${1:integer}",
-      "linenos",
-      "linenostart=${1:integer}",
-      "linenostep=${1:integer}",
-      "linenosep=",
-      "caption=${1:caption}",
-      "label=",
-      "texcomments",
-      "mathescape",
-      "escapeinside=${1:two chars}",
-      "force",
-      "inline method=${1:csname}"
-    ],
-    [
-      "lang=${1:language}",
-      "sty=${1:pygments style}",
-      "font=${1:font commands}",
-      "colback=",
-      "gobble=${1:integer}",
-      "tabsize=${1:integer}",
-      "linenos",
-      "linenostart=${1:integer}",
-      "linenostep=${1:integer}",
-      "linenosep=",
-      "caption=${1:caption}",
-      "label=",
-      "texcomments",
-      "mathescape",
-      "escapeinside=${1:two chars}",
-      "force",
-      "inline method=${1:csname}",
-      "boxing method=${1:envname}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/pylatex.json b/dev/packages/pylatex.json
deleted file mode 100644
index 24c01497f..000000000
--- a/dev/packages/pylatex.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "includes": {
-    "comment": [],
-    "listings": [],
-    "keyval": [],
-    "etoolbox": [],
-    "xcolor": [],
-    "pymacros": []
-  },
-  "macros": {
-    "pyverb{}": {
-      "snippet": "pyverb{${1:text}}"
-    },
-    "PySetup{}": {
-      "snippet": "PySetup{${1:keyvals}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "envs": {
-    "python": {}
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "action="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/pythontex.json b/dev/packages/pythontex.json
index f93e66605..a7cca554a 100644
--- a/dev/packages/pythontex.json
+++ b/dev/packages/pythontex.json
@@ -314,7 +314,7 @@
       "snippet": "setpythontexcontext{${1:key-value pairs}}"
     },
     "restartpythontexsession{}": {
-      "snippet": "restartpythontexsession{${1:counter value(${2:s})}}"
+      "snippet": "restartpythontexsession{${1:counter value(s)}}"
     },
     "setpythontexoutputdir{}": {
       "snippet": "setpythontexoutputdir{${1:output directory}}"
diff --git a/dev/packages/qcm.json b/dev/packages/qcm.json
deleted file mode 100644
index 9bd08b332..000000000
--- a/dev/packages/qcm.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "calc": [],
-    "verbatim": [],
-    "tabularx": []
-  },
-  "macros": {
-    "headerfont{}": {
-      "snippet": "headerfont{${1:font commands}}"
-    },
-    "X{}": {
-      "snippet": "X{${1:symbol}}"
-    },
-    "pbs{}": {
-      "snippet": "pbs{${1:arg}}"
-    },
-    "questionspace": {},
-    "answerstitle{}": {
-      "snippet": "answerstitle{${1:text}}"
-    },
-    "answerstitlefont{}": {
-      "snippet": "answerstitlefont{${1:font commands}}"
-    },
-    "answernumberfont{}": {
-      "snippet": "answernumberfont{${1:font commands}}"
-    },
-    "thequestion": {},
-    "truesymbol{}": {
-      "snippet": "truesymbol{${1:symbol}}"
-    },
-    "falsesymbol{}": {
-      "snippet": "falsesymbol{${1:symbol}}"
-    },
-    "true": {},
-    "false": {},
-    "correctionstyle{}": {
-      "snippet": "correctionstyle{${1:font commands}}"
-    },
-    "makeform": {},
-    "makemask": {}
-  },
-  "envs": {
-    "question{}": {
-      "name": "question",
-      "snippet": "{${1:question text}}"
-    },
-    "correction": {}
-  },
-  "options": [
-    "english",
-    "french",
-    "francais",
-    "nocorrection",
-    "correction"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/qrcode.json b/dev/packages/qrcode.json
deleted file mode 100644
index ad56fa4b6..000000000
--- a/dev/packages/qrcode.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "includes": {
-    "xcolor": []
-  },
-  "macros": {
-    "qrcode{}": {
-      "snippet": "qrcode{${1:URL}}"
-    },
-    "qrcode[]{}": {
-      "snippet": "qrcode[${2:options}]{${1:URL}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "qrcode*{}": {
-      "snippet": "qrcode*{${1:URL}}"
-    },
-    "qrcode*[]{}": {
-      "snippet": "qrcode*[${2:options}]{${1:URL}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "qrset{}": {
-      "snippet": "qrset{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "envs": {},
-  "options": [
-    "nolinks",
-    "draft",
-    "final",
-    "forget"
-  ],
-  "keyvals": [
-    [
-      "height=",
-      "level=",
-      "version=",
-      "tight",
-      "padding",
-      "draft",
-      "link",
-      "nolink",
-      "hyperlink"
-    ],
-    [
-      "height=",
-      "level=",
-      "version=",
-      "tight",
-      "padding",
-      "draft"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/qtree.json b/dev/packages/qtree.json
deleted file mode 100644
index fadf5e3d9..000000000
--- a/dev/packages/qtree.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "includes": {
-    "pict2e": []
-  },
-  "macros": {
-    "qtreecentertrue": {},
-    "qtreecenterfalse": {},
-    "qtreepadding": {},
-    "qroofpadding": {},
-    "qtreeunaryht": {},
-    "qtreeinithook": {},
-    "qtreefinalhook": {},
-    "qleafhook": {},
-    "qlabelhook": {},
-    "Tree[]": {
-      "snippet": "Tree[${1:qtree code}]"
-    },
-    "qroof{}": {
-      "snippet": "qroof{${1:text}}"
-    },
-    "qroofx": {},
-    "qroofy": {},
-    "automath": {},
-    "noautomath": {},
-    "qtreeprimes": {},
-    "qsetw{}": {
-      "snippet": "qsetw{${1:length}}"
-    },
-    "faketreewidth{}": {
-      "snippet": "faketreewidth{${1:text}}"
-    },
-    "qbalance": {},
-    "qframesubtree": {},
-    "qtreeshowframes": {},
-    "leaf{}": {
-      "snippet": "leaf{${1:text}}"
-    },
-    "branch{}{}": {
-      "snippet": "branch{${1:integer}}{${2:text}}"
-    },
-    "qobitree": {},
-    "nbranches": {},
-    "qTreeVersion": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/quantikz.json b/dev/packages/quantikz.json
deleted file mode 100644
index 6eefbd2c5..000000000
--- a/dev/packages/quantikz.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "tikzlibraryquantikz2": []
-  },
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ran_toks.json b/dev/packages/ran_toks.json
index 18ef7bf2f..778273909 100644
--- a/dev/packages/ran_toks.json
+++ b/dev/packages/ran_toks.json
@@ -54,11 +54,11 @@
       "snippet": "useThisSeed{${1:init seed value}}"
     },
     "useTheseDBs{}": {
-      "snippet": "useTheseDBs{${1:db1,${2:db2},...}}",
+      "snippet": "useTheseDBs{${1:db1,db2,...}}",
       "option": "usedbapp"
     },
     "useProbDBs{}": {
-      "snippet": "useProbDBs{${1:db1,${2:db2},...}}",
+      "snippet": "useProbDBs{${1:db1,db2,...}}",
       "option": "usedbapp"
     },
     "ProbDBWarningMsg{}": {
diff --git a/dev/packages/randbild.json b/dev/packages/randbild.json
deleted file mode 100644
index 6deb2e3b7..000000000
--- a/dev/packages/randbild.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "includes": {
-    "pst-plot": []
-  },
-  "macros": {
-    "showgrid": {}
-  },
-  "envs": {
-    "randbild{}{}": {
-      "name": "randbild",
-      "snippet": "{${1:x1,${3:y1}}{${2:x2},y2}}"
-    },
-    "randbild[]{}{}": {
-      "name": "randbild",
-      "snippet": "[${3:title}]{${1:x1,${4:y1}}{${2:x2},y2}}"
-    },
-    "randbild*{}{}": {
-      "name": "randbild*",
-      "snippet": "{${1:x1,${3:y1}}{${2:x2},y2}}"
-    },
-    "randbild*[]{}{}": {
-      "name": "randbild*",
-      "snippet": "[${3:title}]{${1:x1,${4:y1}}{${2:x2},y2}}"
-    },
-    "randbildbasis{}{}": {
-      "name": "randbildbasis",
-      "snippet": "{${1:x1,${3:y1}}{${2:x2},y2}}"
-    },
-    "randbildbasis[]{}{}": {
-      "name": "randbildbasis",
-      "snippet": "[${3:title}]{${1:x1,${4:y1}}{${2:x2},y2}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/rangen.json b/dev/packages/rangen.json
index 0157180e2..c3d6e0bae 100644
--- a/dev/packages/rangen.json
+++ b/dev/packages/rangen.json
@@ -47,10 +47,10 @@
       "snippet": "nDivisionsPowerOfTen{${1:integer}}"
     },
     "RandomL{}{}": {
-      "snippet": "RandomL{${1:cmd}}{${2:n1,${3:n2},...}}"
+      "snippet": "RandomL{${1:cmd}}{${2:n1,n2,...}}"
     },
     "RandomL[]{}{}": {
-      "snippet": "RandomL[${3:options}]{${1:cmd}}{${2:n1,${4:n2},...}}",
+      "snippet": "RandomL[${3:options}]{${1:cmd}}{${2:n1,n2,...}}",
       "keyvalindex": 2,
       "keyvalpos": 0
     },
diff --git a/dev/packages/readarray.json b/dev/packages/readarray.json
index 53b951b5d..3cdc6224b 100644
--- a/dev/packages/readarray.json
+++ b/dev/packages/readarray.json
@@ -11,25 +11,25 @@
       "snippet": "readrecordarray{${1:file}}{${2:array-identifier}}"
     },
     "readarray{}{}[]": {
-      "snippet": "readarray{${1:data-macro}}{${2:array-identifier}}[${3:-,${4:rows},columns}]"
+      "snippet": "readarray{${1:data-macro}}{${2:array-identifier}}[${3:-,rows,columns}]"
     },
     "readarray*{}{}[]": {
-      "snippet": "readarray*{${1:data-macro}}{${2:array-identifier}}[${3:-,${4:rows},columns}]"
+      "snippet": "readarray*{${1:data-macro}}{${2:array-identifier}}[${3:-,rows,columns}]"
     },
     "initarray{}[]": {
-      "snippet": "initarray{${1:array-identifier}}[${2:planes,${3:rows},columns}]"
+      "snippet": "initarray{${1:array-identifier}}[${2:planes,rows,columns}]"
     },
     "mergearray{}{}[]": {
-      "snippet": "mergearray{${1:from-array-id}}{${2:to-array-id}}[${3:plane,${4:row},column}]"
+      "snippet": "mergearray{${1:from-array-id}}{${2:to-array-id}}[${3:plane,row,column}]"
     },
     "typesetarray{}": {
       "snippet": "typesetarray{${1:array-identifier}}"
     },
     "arraytomacro{}[]{}": {
-      "snippet": "arraytomacro{${1:array-identifier}}[${2:plane,${4:row},column}]{${3:macro}}"
+      "snippet": "arraytomacro{${1:array-identifier}}[${2:plane,row,column}]{${3:macro}}"
     },
     "setvalue{}[]{}": {
-      "snippet": "setvalue{${1:array-identifier}}[${2:plane,${4:row},column}]{${3:value}}"
+      "snippet": "setvalue{${1:array-identifier}}[${2:plane,row,column}]{${3:value}}"
     },
     "readarraysepchar{}": {
       "snippet": "readarraysepchar{${1:parsing-separator-char}}"
diff --git a/dev/packages/rec-thy.json b/dev/packages/rec-thy.json
index b4d3ddaeb..9919c7487 100644
--- a/dev/packages/rec-thy.json
+++ b/dev/packages/rec-thy.json
@@ -170,19 +170,7 @@
     "forall*": {},
     "forallae": {},
     "forces": {},
-    "forces()": {
-      "snippet": "forces(${1:sup})"
-    },
-    "forces()[]": {
-      "snippet": "forces(${2:sup})[${1:sub}]"
-    },
     "forces*": {},
-    "forces*()": {
-      "snippet": "forces*(${1:sup})"
-    },
-    "forces*()[]": {
-      "snippet": "forces*(${2:sup})[${1:sub}]"
-    },
     "forces*[]": {
       "snippet": "forces*[${1:sub}]"
     },
@@ -203,15 +191,9 @@
     "Hop[]{}": {
       "snippet": "Hop[${2:sub2}]{${1:sub1}}"
     },
-    "Hop[]{}()": {
-      "snippet": "Hop[${2:sub2}]{${1:sub1}}(${3:arg})"
-    },
     "Hop{}": {
       "snippet": "Hop{${1:sub}}"
     },
-    "Hop{}()": {
-      "snippet": "Hop{${1:sub}}(${2:arg})"
-    },
     "hyp": {},
     "HYP": {},
     "iffdef": {},
@@ -236,19 +218,7 @@
       "snippet": "jumpn{${1:arg}}{${2:sup}}"
     },
     "kleeneO": {},
-    "kleeneO()": {
-      "snippet": "kleeneO(${1:sup})"
-    },
-    "kleeneO()[]": {
-      "snippet": "kleeneO(${2:sup})[${1:sub}]"
-    },
     "kleeneO*": {},
-    "kleeneO*()": {
-      "snippet": "kleeneO*(${1:sup})"
-    },
-    "kleeneO*()[]": {
-      "snippet": "kleeneO*(${2:sup})[${1:sub}]"
-    },
     "kleeneO*[]": {
       "snippet": "kleeneO*[${1:sub}]"
     },
@@ -467,12 +437,6 @@
     "REAop{}{}": {
       "snippet": "REAop{${1:sub}}{${2:sup}}"
     },
-    "recf(){}": {
-      "snippet": "recf(${2:sup}){${1:sub}}"
-    },
-    "recf[](){}": {
-      "snippet": "recf[${2:sub2}](${3:sup}){${1:sub1}}"
-    },
     "recf[]{}": {
       "snippet": "recf[${2:sub2}]{${1:sub1}}"
     },
@@ -512,12 +476,6 @@
     "require{}{}": {
       "snippet": "require{${1:letter}}{${2:sub}}"
     },
-    "REset(){}": {
-      "snippet": "REset(${2:sup}){${1:sub}}"
-    },
-    "REset[](){}": {
-      "snippet": "REset[${2:sub2}](${3:sup}){${1:sub1}}"
-    },
     "REset[]{}": {
       "snippet": "REset[${2:sub2}]{${1:sub1}}"
     },
diff --git a/dev/packages/rgltxdoc.json b/dev/packages/rgltxdoc.json
index dc1c2ce7c..5c7241276 100644
--- a/dev/packages/rgltxdoc.json
+++ b/dev/packages/rgltxdoc.json
@@ -60,7 +60,7 @@
       "snippet": "pkgname{${1:package}}"
     },
     "pkgnames{}": {
-      "snippet": "pkgnames{${1:package1,${2:package2},...}}"
+      "snippet": "pkgnames{${1:package1,package2,...}}"
     },
     "cmarg{}": {
       "snippet": "cmarg{${1:arg}}"
diff --git a/dev/packages/ribbonproofs.json b/dev/packages/ribbonproofs.json
index a80c64ee7..39f3f0c6f 100644
--- a/dev/packages/ribbonproofs.json
+++ b/dev/packages/ribbonproofs.json
@@ -48,16 +48,16 @@
       "keyvalpos": 0
     },
     "moveribbons{}": {
-      "snippet": "moveribbons{${1:ribbon1,${2:ribbon2},...}}"
+      "snippet": "moveribbons{${1:ribbon1,ribbon2,...}}"
     },
     "swapribbons{}{}": {
-      "snippet": "swapribbons{${1:name1,${3:name2},${4:...}}{${2:name'1},${5:name'2},...}}"
+      "snippet": "swapribbons{${1:name1,name2,...}}{${2:name'1,name'2,...}}"
     },
     "moveboxes{}": {
-      "snippet": "moveboxes{${1:box1,${2:box2},...}}"
+      "snippet": "moveboxes{${1:box1,box2,...}}"
     },
     "extendboxes{}": {
-      "snippet": "extendboxes{${1:box1,${2:box2},...}}"
+      "snippet": "extendboxes{${1:box1,box2,...}}"
     },
     "jusColor": {},
     "comColor": {},
diff --git a/dev/packages/rigidnotation.json b/dev/packages/rigidnotation.json
deleted file mode 100644
index 1fd71f642..000000000
--- a/dev/packages/rigidnotation.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "includes": {
-    "mathtools": []
-  },
-  "macros": {
-    "NewRigidNotation{}{}": {
-      "snippet": "NewRigidNotation{${1:name}}{${2:symbol}}"
-    },
-    "SetConciseNotation{}": {
-      "snippet": "SetConciseNotation{${1:bool}}"
-    },
-    "UnsetConciseNotation": {},
-    "Tran": {},
-    "Inv": {},
-    "Herm": {},
-    "Conj": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/rterface.json b/dev/packages/rterface.json
index 4723657be..b0beded4b 100644
--- a/dev/packages/rterface.json
+++ b/dev/packages/rterface.json
@@ -20,7 +20,7 @@
       "snippet": "Rvalue*[${2:sig figs}]{${1:expr}}"
     },
     "Rtable{}{}": {
-      "snippet": "Rtable{${1:col1,${3:col2},...}}{${2:number of rows}}"
+      "snippet": "Rtable{${1:col1,col2,...}}{${2:number of rows}}"
     },
     "Rset{}{}": {
       "snippet": "Rset{${1:variable}}{${2:expr}}"
diff --git a/dev/packages/ruby.json b/dev/packages/ruby.json
deleted file mode 100644
index e8bead6e8..000000000
--- a/dev/packages/ruby.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "includes": {
-    "CJK": []
-  },
-  "macros": {
-    "rubysize": {},
-    "rubysep": {},
-    "rubyoverlap": {},
-    "rubynooverlap": {},
-    "rubyCJK": {},
-    "rubylatin": {},
-    "ruby{}{}": {
-      "snippet": "ruby{${1:base characters}}{${2:ruby}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "overlap",
-    "nooverlap",
-    "CJK",
-    "latin"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/sankey.json b/dev/packages/sankey.json
index 27074d71a..ec115ae33 100644
--- a/dev/packages/sankey.json
+++ b/dev/packages/sankey.json
@@ -174,10 +174,10 @@
       "keyvalpos": 0
     },
     "sankeyfork{}{}": {
-      "snippet": "sankeyfork{${1:node name}}{${2:qty1/name1,${3:qty2/name2},...}}"
+      "snippet": "sankeyfork{${1:node name}}{${2:qty1/name1,qty2/name2,...}}"
     },
     "sankeyfork[]{}{}": {
-      "snippet": "sankeyfork[${3:options}]{${1:node name}}{${2:qty1/name1,${4:qty2/name2},...}}",
+      "snippet": "sankeyfork[${3:options}]{${1:node name}}{${2:qty1/name1,qty2/name2,...}}",
       "keyvalindex": 3,
       "keyvalpos": 0
     },
diff --git a/dev/packages/scanpages.json b/dev/packages/scanpages.json
index 191879fd5..65f240a93 100644
--- a/dev/packages/scanpages.json
+++ b/dev/packages/scanpages.json
@@ -20,23 +20,8 @@
     "initviewport{}{}{}{}{}": {
       "snippet": "initviewport{${1:scale}}{${2:llx}}{${3:lly}}{${4:w}}{${5:h}}"
     },
-    "whitesq(){}": {
-      "snippet": "whitesq(${2:x},${3:y}){${1:scale}}"
-    },
-    "whitesq(){}[]": {
-      "snippet": "whitesq(${3:x},${4:y}){${1:x-scale}}[${2:y-scale}]"
-    },
-    "whitecirc(){}": {
-      "snippet": "whitecirc(${2:x},${3:y}){${1:scale}}"
-    },
-    "whitecirc(){}[]": {
-      "snippet": "whitecirc(${3:x},${4:y}){${1:x-scale}}[${2:y-scale}]"
-    },
     "origpgcmd": {},
     "origpgnum": {},
-    "putn(){}": {
-      "snippet": "putn(${2:x},${3:y}){${1:stuff}}"
-    },
     "thegrid{}{}": {
       "snippet": "thegrid{${1:width}}{${2:height}}"
     },
diff --git a/dev/packages/schule.json b/dev/packages/schule.json
index 9a5deec09..bbf31415e 100644
--- a/dev/packages/schule.json
+++ b/dev/packages/schule.json
@@ -543,10 +543,6 @@
     "teilaufgaben": {},
     "loesung": {},
     "loesung*": {},
-    "mcumgebung(Spaltenzahl)": {
-      "name": "mcumgebung",
-      "snippet": "(${1:Spaltenzahl})"
-    },
     "bearbeitungshinweis": {},
     "aufgabenpoolHinweis": {},
     "erwartungen": {},
diff --git a/dev/packages/schwalbe.json b/dev/packages/schwalbe.json
deleted file mode 100644
index 2872bb882..000000000
--- a/dev/packages/schwalbe.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "includes": {
-    "diagram": []
-  },
-  "macros": {
-    "rb{}": {
-      "snippet": "rb{${1:content}}"
-    },
-    "normaldia": {},
-    "smalldia": {},
-    "urdruck": {},
-    "windowpar": {},
-    "bel": {},
-    "ferner": {},
-    "reprint": {},
-    "helplength": {},
-    "boardskip": {},
-    "doublediagram{}": {
-      "snippet": "doublediagram{${1:content}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "10pt",
-    "11pt",
-    "12pt"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/scontents.json b/dev/packages/scontents.json
index fb164f17a..5de1371ef 100644
--- a/dev/packages/scontents.json
+++ b/dev/packages/scontents.json
@@ -1,5 +1,7 @@
 {
-  "includes": {},
+  "includes": {
+    "l3keys2e": []
+  },
   "macros": {
     "setupsc{}": {
       "snippet": "setupsc{${1:options}}",
@@ -115,8 +117,7 @@
       "wrapper={${1:code}}"
     ],
     [
-      "width-tab=${1:integer}",
-      "${1:index}"
+      "width-tab=${1:integer}"
     ],
     [
       "store-env=${1:seq name}",
diff --git a/dev/packages/scrbase.json b/dev/packages/scrbase.json
deleted file mode 100644
index 44e9b89c9..000000000
--- a/dev/packages/scrbase.json
+++ /dev/null
@@ -1,351 +0,0 @@
-{
-  "includes": {
-    "scrlfile": [],
-    "keyval": [],
-    "scrlogo": []
-  },
-  "macros": {
-    "KOMAScriptVersion": {},
-    "rloop{}": {
-      "snippet": "rloop{${1:arg}}"
-    },
-    "IfLTXAtLeastTF{}{}{}": {
-      "snippet": "IfLTXAtLeastTF{${1:date}}{${2:then code}}{${3:else code}}"
-    },
-    "DefineFamily{}": {
-      "snippet": "DefineFamily{${1:family}}"
-    },
-    "DefineFamilyMember{}": {
-      "snippet": "DefineFamilyMember{${1:family}}"
-    },
-    "DefineFamilyMember[]{}": {
-      "snippet": "DefineFamilyMember[${2:member}]{${1:family}}"
-    },
-    "DefineFamilyKey{}{}{}": {
-      "snippet": "DefineFamilyKey{${1:family}}{${2:key}}{${3:action}}"
-    },
-    "DefineFamilyKey[]{}{}{}": {
-      "snippet": "DefineFamilyKey[${4:member}]{${1:family}}{${2:key}}{${3:action}}"
-    },
-    "DefineFamilyKey[]{}{}[]{}": {
-      "snippet": "DefineFamilyKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:action}}"
-    },
-    "RelaxFamilyKey{}{}": {
-      "snippet": "RelaxFamilyKey{${1:family}}{${2:key}}"
-    },
-    "RelaxFamilyKey[]{}{}": {
-      "snippet": "RelaxFamilyKey[${3:member}]{${1:family}}{${2:key}}"
-    },
-    "FamilyKeyState": {},
-    "FamilyKeyStateUnknown": {},
-    "FamilyKeyStateUnknownValue": {},
-    "FamilyKeyStateNeedValue": {},
-    "FamilyKeyStateProcessed": {},
-    "FamilyOfKey": {},
-    "FamilyMemberOfKey": {},
-    "FamilyProcessOptions{}": {
-      "snippet": "FamilyProcessOptions{${1:family}}"
-    },
-    "FamilyProcessOptions[]{}": {
-      "snippet": "FamilyProcessOptions[${2:member}]{${1:family}}"
-    },
-    "AtEndOfFamilyOptions{}": {
-      "snippet": "AtEndOfFamilyOptions{${1:action}}"
-    },
-    "AtEndOfFamilyOptions*{}": {
-      "snippet": "AtEndOfFamilyOptions*{${1:action}}"
-    },
-    "IfArgIsEmpty{}{}{}": {
-      "snippet": "IfArgIsEmpty{${1:arg}}{${2:then code}}{${3:else code}}"
-    },
-    "XdivY{}{}": {
-      "snippet": "XdivY{${1:dividend}}{${2:divisor}}"
-    },
-    "XmodY{}{}": {
-      "snippet": "XmodY{${1:dividend}}{${2:divisor}}"
-    },
-    "Ifundefinedorrelax{}{}{}": {
-      "snippet": "Ifundefinedorrelax{${1:name}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifnotundefined{}{}{}": {
-      "snippet": "Ifnotundefined{${1:name}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifstr{}{}{}{}": {
-      "snippet": "Ifstr{${1:string1}}{${2:string2}}{${3:then code}}{${4:else code}}"
-    },
-    "Ifstrstart{}{}{}{}": {
-      "snippet": "Ifstrstart{${1:string1}}{${2:string2}}{${3:then code}}{${4:else code}}"
-    },
-    "Ifislengthprimitive{}{}{}": {
-      "snippet": "Ifislengthprimitive{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisdimen{}{}{}": {
-      "snippet": "Ifisdimen{${1:string}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisskip{}{}{}": {
-      "snippet": "Ifisskip{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifiscount{}{}{}": {
-      "snippet": "Ifiscount{${1:count}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisdimexpr{}{}{}": {
-      "snippet": "Ifisdimexpr{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisglueexpr{}{}{}": {
-      "snippet": "Ifisglueexpr{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisnumexpr{}{}{}": {
-      "snippet": "Ifisnumexpr{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisdefchar{}{}{}": {
-      "snippet": "Ifisdefchar{${1:arg}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifiscounter{}{}{}": {
-      "snippet": "Ifiscounter{${1:counter}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisinteger{}{}{}": {
-      "snippet": "Ifisinteger{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisdimension{}{}{}": {
-      "snippet": "Ifisdimension{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifisglue{}{}{}": {
-      "snippet": "Ifisglue{${1:expression}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifnumber{}{}{}": {
-      "snippet": "Ifnumber{${1:string}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifintnumber{}{}{}": {
-      "snippet": "Ifintnumber{${1:string}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifdimen{}{}{}": {
-      "snippet": "Ifdimen{${1:string}}{${2:then code}}{${3:else code}}"
-    },
-    "Ifpdfoutput{}{}": {
-      "snippet": "Ifpdfoutput{${1:then code}}{${2:else code}}"
-    },
-    "Ifpsoutput{}{}": {
-      "snippet": "Ifpsoutput{${1:then code}}{${2:else code}}"
-    },
-    "Ifdvioutput{}{}": {
-      "snippet": "Ifdvioutput{${1:then code}}{${2:else code}}"
-    },
-    "IfRTL{}{}": {
-      "snippet": "IfRTL{${1:then code}}{${2:else code}}"
-    },
-    "IfLTR{}{}": {
-      "snippet": "IfLTR{${1:then code}}{${2:else code}}"
-    },
-    "PackageInfoNoLine{}{}": {
-      "snippet": "PackageInfoNoLine{${1:package}}{${2:information}}"
-    },
-    "ClassInfoNoLine{}{}": {
-      "snippet": "ClassInfoNoLine{${1:class}}{${2:information}}"
-    },
-    "IfActiveMkBoth{}{}": {
-      "snippet": "IfActiveMkBoth{${1:then code}}{${2:else code}}"
-    },
-    "BeforeFamilyProcessOptions{}{}": {
-      "snippet": "BeforeFamilyProcessOptions{${1:family}}{${2:code}}"
-    },
-    "BeforeFamilyProcessOptions[]{}{}": {
-      "snippet": "BeforeFamilyProcessOptions[${3:member}]{${1:family}}{${2:code}}"
-    },
-    "FamilyExecuteOptions{}{}": {
-      "snippet": "FamilyExecuteOptions{${1:family}}{${2:options list}}"
-    },
-    "FamilyExecuteOptions[]{}{}": {
-      "snippet": "FamilyExecuteOptions[${3:member}]{${1:family}}{${2:options list}}"
-    },
-    "FamilyOptions{}{}": {
-      "snippet": "FamilyOptions{${1:family}}{${2:options list}}"
-    },
-    "FamilyOption{}{}{}": {
-      "snippet": "FamilyOption{${1:family}}{${2:option}}{${3:value list}}"
-    },
-    "FamilyUnknownKeyValue{}{}{}{}": {
-      "snippet": "FamilyUnknownKeyValue{${1:family}}{${2:key}}{${3:value}}{${4:value list}}"
-    },
-    "FamilyElseValues": {},
-    "FamilyBoolKey{}{}{}": {
-      "snippet": "FamilyBoolKey{${1:family}}{${2:key}}{${3:switch name}}"
-    },
-    "FamilyBoolKey[]{}{}{}": {
-      "snippet": "FamilyBoolKey[${4:member}]{${1:family}}{${2:key}}{${3:switch name}}"
-    },
-    "FamilySetBool{}{}{}{}": {
-      "snippet": "FamilySetBool{${1:family}}{${2:key}}{${3:switch name}}{${4:value}}"
-    },
-    "FamilyInverseBoolKey{}{}{}": {
-      "snippet": "FamilyInverseBoolKey{${1:family}}{${2:key}}{${3:switch name}}"
-    },
-    "FamilyInverseBoolKey[]{}{}{}": {
-      "snippet": "FamilyInverseBoolKey[${4:member}]{${1:family}}{${2:key}}{${3:switch name}}"
-    },
-    "FamilySetInverseBool{}{}{}{}": {
-      "snippet": "FamilySetInverseBool{${1:family}}{${2:key}}{${3:switch name}}{${4:value}}"
-    },
-    "FamilyCounterKey{}{}{}": {
-      "snippet": "FamilyCounterKey{${1:family}}{${2:key}}{${3:counter}}"
-    },
-    "FamilyCounterKey[]{}{}{}": {
-      "snippet": "FamilyCounterKey[${4:member}]{${1:family}}{${2:key}}{${3:counter}}"
-    },
-    "FamilyCounterKey[]{}{}[]{}": {
-      "snippet": "FamilyCounterKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:counter}}"
-    },
-    "FamilySetCounter{}{}{}{}": {
-      "snippet": "FamilySetCounter{${1:family}}{${2:key}}{${3:counter}}{${4:value}}"
-    },
-    "FamilyCounterMacroKey{}{}{}": {
-      "snippet": "FamilyCounterMacroKey{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyCounterMacroKey{}{}[]{}": {
-      "snippet": "FamilyCounterMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
-    },
-    "FamilyCounterMacroKey[]{}{}{}": {
-      "snippet": "FamilyCounterMacroKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyCounterMacroKey[]{}{}[]{}": {
-      "snippet": "FamilyCounterMacroKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
-    },
-    "FamilySetCounterMacro{}{}{}{}": {
-      "snippet": "FamilySetCounterMacro{${1:family}}{${2:key}}{${3:macro}}{${4:value}}"
-    },
-    "FamilyLengthKey{}{}{}": {
-      "snippet": "FamilyLengthKey{${1:family}}{${2:key}}{${3:length}}"
-    },
-    "FamilyLengthKey[]{}{}{}": {
-      "snippet": "FamilyLengthKey[${4:member}]{${1:family}}{${2:key}}{${3:csname}}"
-    },
-    "FamilyLengthKey[]{}{}[]{}": {
-      "snippet": "FamilyLengthKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:csname}}"
-    },
-    "FamilySetLength{}{}{}{}": {
-      "snippet": "FamilySetLength{${1:family}}{${2:key}}{${3:length}}{${4:value}}"
-    },
-    "FamilyLengthMacroKey{}{}{}": {
-      "snippet": "FamilyLengthMacroKey{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyLengthMacroKey{}{}[]{}": {
-      "snippet": "FamilyLengthMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
-    },
-    "FamilyLengthMacroKey[]{}{}{}": {
-      "snippet": "FamilyLengthMacroKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyLengthMacroKey[]{}{}[]{}": {
-      "snippet": "FamilyLengthMacroKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
-    },
-    "FamilySetLengthMacro{}{}{}{}": {
-      "snippet": "FamilySetLengthMacro{${1:family}}{${2:key}}{${3:macro}}{${4:value}}"
-    },
-    "FamilyUseLengthMacroKey{}{}{}": {
-      "snippet": "FamilyUseLengthMacroKey{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyUseLengthMacroKey{}{}[]{}": {
-      "snippet": "FamilyUseLengthMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
-    },
-    "FamilyUseLengthMacroKey[]{}{}{}": {
-      "snippet": "FamilyUseLengthMacroKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyUseLengthMacroKey[]{}{}[]{}": {
-      "snippet": "FamilyUseLengthMacroKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
-    },
-    "FamilySetUseLengthMacro{}{}{}{}": {
-      "snippet": "FamilySetUseLengthMacro{${1:family}}{${2:key}}{${3:macro}}{${4:value}}"
-    },
-    "FamilyNumericalKey{}{}{}{}": {
-      "snippet": "FamilyNumericalKey{${1:family}}{${2:key}}{${3:macro}}{${4:value list}}"
-    },
-    "FamilyLengthMacroKey{}{}[]{}{}": {
-      "snippet": "FamilyLengthMacroKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}{${5:value list}}"
-    },
-    "FamilyLengthMacroKey[]{}{}{}{}": {
-      "snippet": "FamilyLengthMacroKey[${5:member}]{${1:family}}{${2:key}}{${3:macro}}{${4:value list}}"
-    },
-    "FamilyLengthMacroKey[]{}{}[]{}{}": {
-      "snippet": "FamilyLengthMacroKey[${5:member}]{${1:family}}{${2:key}}[${6:default}]{${3:macro}}{${4:value list}}"
-    },
-    "FamilySetNumerical{}{}{}{}{}": {
-      "snippet": "FamilySetNumerical{${1:family}}{${2:key}}{${3:macro}}{${4:value list}}{${5:value}}"
-    },
-    "FamilyStringKey{}{}{}": {
-      "snippet": "FamilyStringKey{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyStringKey{}{}[]{}": {
-      "snippet": "FamilyStringKey{${1:family}}{${2:key}}[${3:default}]{${4:macro}}"
-    },
-    "FamilyStringKey[]{}{}{}": {
-      "snippet": "FamilyStringKey[${4:member}]{${1:family}}{${2:key}}{${3:macro}}"
-    },
-    "FamilyStringKey[]{}{}[]{}": {
-      "snippet": "FamilyStringKey[${4:member}]{${1:family}}{${2:key}}[${5:default}]{${3:macro}}"
-    },
-    "FamilyCSKey{}{}{}": {
-      "snippet": "FamilyCSKey{${1:family}}{${2:key}}{${3:csname}}"
-    },
-    "ForDoHook{}{}": {
-      "snippet": "ForDoHook{${1:specification}}{${2:command}}"
-    },
-    "SplitDoHook{}{}{}": {
-      "snippet": "SplitDoHook{${1:specifier}}{${2:head macro}}{${3:remainder macro}}"
-    },
-    "ExecuteDoHook{}": {
-      "snippet": "ExecuteDoHook{${1:specifier}}"
-    },
-    "AddtoDoHook{}{}": {
-      "snippet": "AddtoDoHook{${1:name}}{${2:command}}"
-    },
-    "AddtoOneTimeDoHook{}{}": {
-      "snippet": "AddtoOneTimeDoHook{${1:name}}{${2:command}}"
-    },
-    "defcaptionname{}{}{}": {
-      "snippet": "defcaptionname{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "defcaptionname*{}{}{}": {
-      "snippet": "defcaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "providecaptionname{}{}{}": {
-      "snippet": "providecaptionname{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "providecaptionname*{}{}{}": {
-      "snippet": "providecaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "newcaptionname{}{}{}": {
-      "snippet": "newcaptionname{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "newcaptionname*{}{}{}": {
-      "snippet": "newcaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "renewcaptionname{}{}{}": {
-      "snippet": "renewcaptionname{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "renewcaptionname*{}{}{}": {
-      "snippet": "renewcaptionname*{${1:language list}}{${2:term}}{${3:definition}}"
-    },
-    "ifnotundefined": {},
-    "ifislengthprimitive": {},
-    "ifisdefchar": {},
-    "ifstr": {},
-    "ifstrstart": {},
-    "ifisdimen": {},
-    "ifisskip": {},
-    "ifiscount": {},
-    "ifisdimexpr": {},
-    "ifisglueexpr": {},
-    "ifisnumexpr": {},
-    "ifiscounter": {},
-    "ifisinteger": {},
-    "ifisdimension": {},
-    "ifisglue": {},
-    "ifnumber": {},
-    "ifintnumber": {},
-    "ifdimen": {},
-    "ifpdfoutput": {},
-    "ifpsoutput": {},
-    "ifdvioutput": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/scrletter.json b/dev/packages/scrletter.json
index 5d2d150ef..608188182 100644
--- a/dev/packages/scrletter.json
+++ b/dev/packages/scrletter.json
@@ -192,12 +192,6 @@
       "snippet": "setshowstyle{${1:style}}"
     },
     "edgesize": {},
-    "showenvelope()()": {
-      "snippet": "showenvelope(${1:width},${2:height})(${3:h-offset},${4:v-offset})"
-    },
-    "showenvelope()()[]": {
-      "snippet": "showenvelope(${2:width},${3:height})(${4:h-offset},${5:v-offset})[${1:instructions}]"
-    },
     "showISOenvelope{}": {
       "snippet": "showISOenvelope{${1:format}}"
     },
diff --git a/dev/packages/se2packages.json b/dev/packages/se2packages.json
index f5d04904d..83bdc6502 100644
--- a/dev/packages/se2packages.json
+++ b/dev/packages/se2packages.json
@@ -83,18 +83,6 @@
       "snippet": "margincites{${1:bibid}}{${2:bibid}}",
       "option": "biblatex=numeric"
     },
-    "margincites(){}{}": {
-      "snippet": "margincites(${3:post}){${1:bibid}}{${2:bibid}}",
-      "option": "biblatex=numeric"
-    },
-    "margincites()(){}{}": {
-      "snippet": "margincites(${3:pre})(${4:post}){${1:bibid}}{${2:bibid}}",
-      "option": "biblatex=numeric"
-    },
-    "margincites()()[]{}[]{}": {
-      "snippet": "margincites(${5:pre})(${6:post})[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
-      "option": "biblatex=numeric"
-    },
     "margincites[]{}[]{}": {
       "snippet": "margincites[${3:post}]{${1:bibid}}[${4:post}]{${2:bibid}}",
       "option": "biblatex=numeric"
@@ -103,10 +91,6 @@
       "snippet": "margincites[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
       "option": "biblatex=numeric"
     },
-    "margincites()()[][]{}[][]{}": {
-      "snippet": "margincites(${7:pre})(${8:post})[${3:pre}][${4:post}]{${1:bibid}}[${5:pre}][${6:post}]{${2:bibid}}",
-      "option": "biblatex=numeric"
-    },
     "bibliofont": {
       "option": "biblatex=numeric"
     }
diff --git a/dev/packages/semantex.json b/dev/packages/semantex.json
deleted file mode 100644
index 58ae1342d..000000000
--- a/dev/packages/semantex.json
+++ /dev/null
@@ -1,630 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": [],
-    "leftindex": [],
-    "semtex": []
-  },
-  "macros": {
-    "NewVariableClass{}": {
-      "snippet": "NewVariableClass{${1:\\Class}}"
-    },
-    "NewVariableClass{}[]": {
-      "snippet": "NewVariableClass{${1:\\Class}}[${2:options}]"
-    },
-    "DeclareVariableClass{}": {
-      "snippet": "DeclareVariableClass{${1:\\Class}}"
-    },
-    "DeclareVariableClass{}[]": {
-      "snippet": "DeclareVariableClass{${1:\\Class}}[${2:options}]"
-    },
-    "NewSymbolClass{}": {
-      "snippet": "NewSymbolClass{${1:\\Class}}"
-    },
-    "NewSymbolClass{}[]": {
-      "snippet": "NewSymbolClass{${1:\\Class}}[${2:options}]"
-    },
-    "DeclareSymbolClass{}": {
-      "snippet": "DeclareSymbolClass{${1:\\Class}}"
-    },
-    "DeclareSymbolClass{}[]": {
-      "snippet": "DeclareSymbolClass{${1:\\Class}}[${2:options}]"
-    },
-    "NewSimpleClass{}": {
-      "snippet": "NewSimpleClass{${1:\\Class}}"
-    },
-    "NewSimpleClass{}[]": {
-      "snippet": "NewSimpleClass{${1:\\Class}}[${2:options}]"
-    },
-    "DeclareSimpleClass{}": {
-      "snippet": "DeclareSimpleClass{${1:\\Class}}"
-    },
-    "DeclareSimpleClass{}[]": {
-      "snippet": "DeclareSimpleClass{${1:\\Class}}[${2:options}]"
-    },
-    "SemantexBaseObject": {},
-    "NewObject{}{}{}": {
-      "snippet": "NewObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}"
-    },
-    "NewObject{}{}{}[]": {
-      "snippet": "NewObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}[${4:options}]"
-    },
-    "DeclareObject{}{}{}": {
-      "snippet": "DeclareObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}"
-    },
-    "DeclareObject{}{}{}[]": {
-      "snippet": "DeclareObject{${1:\\Class}}{${2:\\object}}{${3:symbol}}[${4:options}]"
-    },
-    "SetupClass{}{}": {
-      "snippet": "SetupClass{${1:\\Class}}{${2:keyvals}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "SetupObject{}{}": {
-      "snippet": "SetupObject{${1:\\object}}{${2:keyvals}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "UseClassInCommand{}{}": {
-      "snippet": "UseClassInCommand{${1:\\Class}}{${2:symbol}}"
-    },
-    "UseClassInCommand{}[]{}": {
-      "snippet": "UseClassInCommand{${1:\\Class}}[${2:options}]{${3:symbol}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "SemantexSetup{}": {
-      "snippet": "SemantexSetup{${1:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "SemantexRecordObject{}": {
-      "snippet": "SemantexRecordObject{${1:command}}"
-    },
-    "SemantexRecordSource{}": {
-      "snippet": "SemantexRecordSource{${1:source}}"
-    },
-    "SemantexThis": {},
-    "SemantexSetKeys{}": {
-      "snippet": "SemantexSetKeys{${1:keyvals}}"
-    },
-    "SemantexKeysSet{}": {
-      "snippet": "SemantexKeysSet{${1:keyvals}}"
-    },
-    "SemantexSetKeysx{}": {
-      "snippet": "SemantexSetKeysx{${1:keyvals}}"
-    },
-    "SemantexKeysSetx{}": {
-      "snippet": "SemantexKeysSetx{${1:keyvals}}"
-    },
-    "SemantexSetArgKeys{}": {
-      "snippet": "SemantexSetArgKeys{${1:keyvals}}"
-    },
-    "SemantexArgKeysSet{}": {
-      "snippet": "SemantexArgKeysSet{${1:keyvals}}"
-    },
-    "SemantexSetArgKeysx{}": {
-      "snippet": "SemantexSetArgKeysx{${1:keyvals}}"
-    },
-    "SemantexArgKeysSetx{}": {
-      "snippet": "SemantexArgKeysSetx{${1:keyvals}}"
-    },
-    "SemantexSetArgSingleKeys{}": {
-      "snippet": "SemantexSetArgSingleKeys{${1:keyvals}}"
-    },
-    "SemantexArgSingleKeysSet{}": {
-      "snippet": "SemantexArgSingleKeysSet{${1:keyvals}}"
-    },
-    "SemantexSetArgSingleKeysx{}": {
-      "snippet": "SemantexSetArgSingleKeysx{${1:keyvals}}"
-    },
-    "SemantexArgSingleKeysSetx{}": {
-      "snippet": "SemantexArgSingleKeysSetx{${1:keyvals}}"
-    },
-    "SemantexSetOneArgSingleKey{}": {
-      "snippet": "SemantexSetOneArgSingleKey{${1:keyvals}}"
-    },
-    "SemantexOneSingleArgKeySet{}": {
-      "snippet": "SemantexOneSingleArgKeySet{${1:keyvals}}"
-    },
-    "SemantexSetOneArgSingleKeyx{}": {
-      "snippet": "SemantexSetOneArgSingleKeyx{${1:keyvals}}"
-    },
-    "SemantexOneSingleArgKeySetx{}": {
-      "snippet": "SemantexOneSingleArgKeySetx{${1:keyvals}}"
-    },
-    "SemantexSetArgWithoutKeyval{}": {
-      "snippet": "SemantexSetArgWithoutKeyval{${1:keyvals}}"
-    },
-    "SemantexArgWithoutKeyvalSet{}": {
-      "snippet": "SemantexArgWithoutKeyvalSet{${1:keyvals}}"
-    },
-    "SemantexSetArgWithoutKeyvalx{}": {
-      "snippet": "SemantexSetArgWithoutKeyvalx{${1:keyvals}}"
-    },
-    "SemantexArgWithoutKeyvalSetx{}": {
-      "snippet": "SemantexArgWithoutKeyvalSetx{${1:keyvals}}"
-    },
-    "SemantexDataProvide{}": {
-      "snippet": "SemantexDataProvide{${1:data}}"
-    },
-    "SemantexDataSet{}{}": {
-      "snippet": "SemantexDataSet{${1:data}}{${2:value}}"
-    },
-    "SemantexDataSetx{}{}": {
-      "snippet": "SemantexDataSetx{${1:data}}{${2:value}}"
-    },
-    "SemantexDataPutLeft{}{}": {
-      "snippet": "SemantexDataPutLeft{${1:data}}{${2:value}}"
-    },
-    "SemantexDataPutLeftx{}{}": {
-      "snippet": "SemantexDataPutLeftx{${1:data}}{${2:value}}"
-    },
-    "SemantexDataPutRight{}{}": {
-      "snippet": "SemantexDataPutRight{${1:data}}{${2:value}}"
-    },
-    "SemantexDataPutRightx{}{}": {
-      "snippet": "SemantexDataPutRightx{${1:data}}{${2:value}}"
-    },
-    "SemantexDataGet{}": {
-      "snippet": "SemantexDataGet{${1:data}}"
-    },
-    "SemantexDataGetExpNot{}": {
-      "snippet": "SemantexDataGetExpNot{${1:data}}"
-    },
-    "SemantexDataClear{}": {
-      "snippet": "SemantexDataClear{${1:data}}"
-    },
-    "SemantexBoolProvide{}": {
-      "snippet": "SemantexBoolProvide{${1:boolean}}"
-    },
-    "SemantexBoolSetTrue{}": {
-      "snippet": "SemantexBoolSetTrue{${1:boolean}}"
-    },
-    "SemantexBoolSetFalse{}": {
-      "snippet": "SemantexBoolSetFalse{${1:boolean}}"
-    },
-    "SemantexBoolIfTF{}{}{}": {
-      "snippet": "SemantexBoolIfTF{${1:boolean}}{${2:true}}{${3:false}}"
-    },
-    "SemantexBoolIfT{}{}": {
-      "snippet": "SemantexBoolIfT{${1:boolean}}{${2:true}}"
-    },
-    "SemantexBoolIfF{}{}": {
-      "snippet": "SemantexBoolIfF{${1:boolean}}{${2:false}}"
-    },
-    "SemantexIntProvide{}": {
-      "snippet": "SemantexIntProvide{${1:integer}}"
-    },
-    "SemantexIntGet{}": {
-      "snippet": "SemantexIntGet{${1:integer}}"
-    },
-    "SemantexIntSet{}{}": {
-      "snippet": "SemantexIntSet{${1:integer}}{${2:value}}"
-    },
-    "SemantexIntIncr{}": {
-      "snippet": "SemantexIntIncr{${1:integer}}"
-    },
-    "SemantexIntIfEqTF{}{}{}{}": {
-      "snippet": "SemantexIntIfEqTF{${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}"
-    },
-    "SemantexIntIfEqT{}{}{}": {
-      "snippet": "SemantexIntIfEqT{${1:integer1}}{${2:integer2}}{${3:true}}"
-    },
-    "SemantexIntIfEqF{}{}{}": {
-      "snippet": "SemantexIntIfEqF{${1:integer1}}{${2:integer2}}{${3:false}}"
-    },
-    "SemantexIntIfGreaterTF{}{}{}{}": {
-      "snippet": "SemantexIntIfGreaterTF{${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}"
-    },
-    "SemantexIntIfGreaterT{}{}{}": {
-      "snippet": "SemantexIntIfGreaterT{${1:integer1}}{${2:integer2}}{${3:true}}"
-    },
-    "SemantexIntIfGreaterF{}{}{}": {
-      "snippet": "SemantexIntIfGreaterF{${1:integer1}}{${2:integer2}}{${3:false}}"
-    },
-    "SemantexIntIfLessTF{}{}{}{}": {
-      "snippet": "SemantexIntIfLessTF{${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}"
-    },
-    "SemantexIntIfLessT{}{}{}": {
-      "snippet": "SemantexIntIfLessT{${1:integer1}}{${2:integer2}}{${3:true}}"
-    },
-    "SemantexIntIfLessF{}{}{}": {
-      "snippet": "SemantexIntIfLessF{${1:integer1}}{${2:integer2}}{${3:false}}"
-    },
-    "SemantexIntClear{}": {
-      "snippet": "SemantexIntClear{${1:integer}}"
-    },
-    "SemantexIfBlankTF{}{}{}": {
-      "snippet": "SemantexIfBlankTF{${1:tokens}}{${2:true}}{${3:false}}"
-    },
-    "SemantexIfBlankT{}{}": {
-      "snippet": "SemantexIfBlankT{${1:tokens}}{${2:true}}"
-    },
-    "SemantexIfBlankF{}{}": {
-      "snippet": "SemantexIfBlankF{${1:tokens}}{${2:false}}"
-    },
-    "SemantexStrIfEqTF{}{}{}{}": {
-      "snippet": "SemantexStrIfEqTF{${1:string1}}{${2:string2}}{${3:true}}{${4:false}}"
-    },
-    "SemantexStrIfEqT{}{}{}": {
-      "snippet": "SemantexStrIfEqT{${1:string1}}{${2:string2}}{${3:true}}"
-    },
-    "SemantexStrIfEqF{}{}{}": {
-      "snippet": "SemantexStrIfEqF{${1:string1}}{${2:string2}}{${3:false}}"
-    },
-    "SemantexERROR{}": {
-      "snippet": "SemantexERROR{${1:error message}}"
-    },
-    "SemantexERRORKeyValueNotFound{}{}": {
-      "snippet": "SemantexERRORKeyValueNotFound{${1:key}}{${2:value}}"
-    },
-    "SemantexERRORArgKeyValueNotFound{}{}": {
-      "snippet": "SemantexERRORArgKeyValueNotFound{${1:key}}{${2:value}}"
-    },
-    "SemantexExpNot{}": {
-      "snippet": "SemantexExpNot{${1:value}}"
-    },
-    "RecordSemantexDelimiterSize": {},
-    "SemantexDelimiterSizeNoRecord": {},
-    "SemantexMathCloseAuto{}": {
-      "snippet": "SemantexMathCloseAuto{${1:arg1}}"
-    },
-    "SemantexMathCloseNoPar": {},
-    "SemantexMathClose{}": {
-      "snippet": "SemantexMathClose{${1:arg1}}"
-    },
-    "SemantexMathOpenAuto{}": {
-      "snippet": "SemantexMathOpenAuto{${1:arg1}}"
-    },
-    "SemantexMathOpenNoPar": {},
-    "SemantexMathOpen{}": {
-      "snippet": "SemantexMathOpen{${1:arg1}}"
-    },
-    "SemantexVersion": {},
-    "SemantexAddToRecordedSource": {},
-    "SemantexRecordOutput": {},
-    "SemantexID{}": {
-      "snippet": "SemantexID{${1:id}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "define keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
-      "define keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
-      "append keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
-      "append keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
-      "prepend keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
-      "prepend keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
-      "remove key=${1:key name}",
-      "remove key[${1:args}]=${2:key name}",
-      "define arg keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
-      "define arg keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
-      "append arg keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
-      "append arg keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
-      "prepend arg keys={{${1:key1}}{${2:keys to run}}${3:,{key2}{keys to run},...}}",
-      "prepend arg keys[${1:args}]={{${2:key1}}{${3:keys to run}}${4:,{key2}{keys to run},...}}",
-      "remove arg key=${1:key name}",
-      "remove arg key[${1:args}]=${2:key name}",
-      "execute={${1:TeX code}}",
-      "set keys={${1:keyvals}}",
-      "set keys x={${1:keyvals}}",
-      "data provide={${1:data}}",
-      "data set={${1:data}}{${2:value}}",
-      "data set x={${1:data}}{${2:value}}",
-      "data put left={${1:data}}{${2:value}}",
-      "data put left x={${1:data}}{${2:value}}",
-      "data put right={${1:data}}{${2:value}}",
-      "data put right x={${1:data}}{${2:value}}",
-      "data clear={${1:data}}{${2:value}}",
-      "bool provide={${1:boolean}}",
-      "bool set true={${1:boolean}}",
-      "bool set false={${1:boolean}}",
-      "bool if TF={${1:boolean}}{${2:true}}{${3:false}}",
-      "bool if T={${1:boolean}}{${2:true}}",
-      "bool if F={${1:boolean}}{${2:false}}",
-      "int provide={${1:integer}}",
-      "int set={${1:integer}}{${2:value}}",
-      "int incr={${1:integer}}",
-      "int if eq TF={${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}",
-      "int if eq T={${1:integer1}}{${2:integer2}}{${3:true}}",
-      "int if eq F={${1:integer1}}{${2:integer2}}{${3:false}}",
-      "int if greater TF={${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}",
-      "int if greater T={${1:integer1}}{${2:integer2}}{${3:true}}",
-      "int if greater F={${1:integer1}}{${2:integer2}}{${3:false}}",
-      "int if less TF={${1:integer1}}{${2:integer2}}{${3:true}}{${4:false}}",
-      "int if less T={${1:integer1}}{${2:integer2}}{${3:true}}",
-      "int if less F={${1:integer1}}{${2:integer2}}{${3:false}}",
-      "int clear={${1:integer}}",
-      "if blank TF={${1:tokens}}{${2:true}}{${3:false}}",
-      "if blank T={${1:tokens}}{${2:true}}",
-      "if blank F={${1:tokens}}{${2:false}}",
-      "string if eq TF={${1:string1}}{${2:string2}}{${3:true}}{${4:false}}",
-      "string if eq T={${1:string1}}{${2:string2}}{${3:true}}",
-      "string if eq F={${1:string1}}{${2:string2}}{${3:false}}",
-      "ERROR={${1:error message}}",
-      "ERROR key value not found={${1:key}}{${2:value}}",
-      "ERROR arg key value not found={${1:key}}{${2:value}}",
-      "parent=${1:\\Class}",
-      "class=${1:\\Class}",
-      "copy=${1:\\object}",
-      "symbol={${1:value}}",
-      "symbol put left=${1:value}",
-      "symbol put right=${1:value}",
-      "height phantom=${1:value}",
-      "slanting phantom=${1:value}",
-      "grading position=",
-      "command=${1:command}",
-      "clear command",
-      "return",
-      "inner return",
-      "right return",
-      "left return",
-      "left index return",
-      "right index return",
-      "index return",
-      "left arg return",
-      "right arg return",
-      "arg return",
-      "output=${1:\\Class}",
-      "do output",
-      "output options={${1:keys}}",
-      "parse options={${1:keys}}",
-      "parse",
-      "parse code",
-      "math class=${1:command}",
-      "default=${1:value}",
-      "*",
-      "**",
-      "slot",
-      "dots",
-      "* with other sep=${1:separator}",
-      "** with other sep=${1:separator}",
-      "arg=${1:value}",
-      "smash",
-      "prime",
-      "par",
-      "no par",
-      "never par",
-      "use par=",
-      "par size=",
-      "left par=${1:parenthesis}",
-      "right par=${1:parenthesis}",
-      "spar",
-      "spar=",
-      "spar size=",
-      "left spar=${1:parenthesis}",
-      "right spar=${1:parenthesis}",
-      "other spar={${1:left parenthesis}}{${2:right parenthesis}}",
-      "Other spar={${1:left parenthesis}}{${2:right parenthesis}}{${3:normal|auto|*}}",
-      "set arg keys={${1:keyvals}}",
-      "set arg keys x={${1:keyvals}}",
-      "set arg single keys={${1:keyvals}}",
-      "set arg single keys x={${1:keyvals}}",
-      "set one arg single key=${1:key}",
-      "set one arg single key x=${1:key}",
-      "set arg without keyval=${1:value}",
-      "set arg without keyval x=${1:value}",
-      "pre arg=${1:value}",
-      "pre arg put left=${1:value}",
-      "post arg=${1:value}",
-      "post arg put right=${1:value}",
-      "set arg sep=${1:value}",
-      "set arg slot=${1:value}",
-      "set arg dots=${1:value}",
-      "arg keyval=",
-      "arg position=",
-      "next arg with sep",
-      "sep arg=${1:value}",
-      "comma arg=${1:value}",
-      "arg with other sep={${1:separator}}{${2:value}}",
-      "arg dots with other sep=${1:separator}",
-      "arg slot with other sep=${1:separator}",
-      "arg dots",
-      "comma arg dots",
-      "arg slot",
-      "comma arg slot",
-      "clear arg",
-      "clear pre arg",
-      "clear post arg",
-      "upper=${1:value}",
-      "sep upper=${1:value}",
-      "comman upper=${1:value}",
-      "pre upper=${1:value}",
-      "pre upper put left=${1:value}",
-      "post upper=${1:value}",
-      "post upper put right=${1:value}",
-      "upper put left=${1:value}",
-      "set upper sep=${1:value}",
-      "next upper with sep",
-      "upper with other sep={${1:separator}}{${2:value}}",
-      "upper slot",
-      "sep upper slot",
-      "comma upper slot",
-      "set upper slot=${1:value}",
-      "upper slot with other sep=${1:separator}",
-      "upper dots",
-      "sep upper dots",
-      "comma upper dots",
-      "set upper dots=${1:value}",
-      "upper dots with other sep=${1:separator}",
-      "upper *",
-      "upper **",
-      "sep upper *",
-      "sep upper **",
-      "comma upper *",
-      "comma upper **",
-      "upper * with other sep=${1:separator}",
-      "upper ** with other sep=${1:separator}",
-      "clear upper",
-      "clear pre upper",
-      "clear post upper",
-      "lower=${1:value}",
-      "sep lower=${1:value}",
-      "comma lower=${1:value}",
-      "pre lower=${1:value}",
-      "pre lower put left=${1:value}",
-      "post lower=${1:value}",
-      "post lower put right=${1:value}",
-      "lower put left=${1:value}",
-      "set lower sep=${1:value}",
-      "next lower with sep",
-      "lower with other sep={${1:separator}}{${2:value}}",
-      "lower slot",
-      "sep lower slot",
-      "comma lower slot",
-      "set lower slot=${1:value}",
-      "lower slot with other sep=${1:separator}",
-      "lower dots",
-      "sep lower dots",
-      "comma lower dots",
-      "set lower dots=${1:value}",
-      "lower dots with other sep=${1:separator}",
-      "lower *",
-      "lower **",
-      "sep lower *",
-      "sep lower **",
-      "comma lower *",
-      "comma lower **",
-      "lower * with other sep=${1:separator}",
-      "lower ** with other sep=${1:separator}",
-      "clear lower",
-      "clear pre lower",
-      "clear post lower",
-      "upper left=${1:value}",
-      "sep upper left=${1:value}",
-      "comman upper left=${1:value}",
-      "pre upper left=${1:value}",
-      "pre upper left put left=${1:value}",
-      "post upper left=${1:value}",
-      "post upper left put right=${1:value}",
-      "upper left put left=${1:value}",
-      "set upper left sep=${1:value}",
-      "next upper left with sep",
-      "upper left with other sep={${1:separator}}{${2:value}}",
-      "upper left slot",
-      "sep upper left slot",
-      "comma upper left slot",
-      "set upper left slot=${1:value}",
-      "upper left slot with other sep=${1:separator}",
-      "upper left dots",
-      "sep upper left dots",
-      "comma upper left dots",
-      "set upper left dots=${1:value}",
-      "upper left dots with other sep=${1:separator}",
-      "upper left *",
-      "upper left **",
-      "sep upper left *",
-      "sep upper left **",
-      "comma upper left *",
-      "comma upper left **",
-      "upper left * with other sep=${1:separator}",
-      "upper left ** with other sep=${1:separator}",
-      "clear upper left",
-      "clear pre upper left",
-      "clear post upper left",
-      "lower left=${1:value}",
-      "sep lower left=${1:value}",
-      "comman lower left=${1:value}",
-      "pre lower left=${1:value}",
-      "pre lower left put left=${1:value}",
-      "post lower left=${1:value}",
-      "post lower left put right=${1:value}",
-      "lower left put left=${1:value}",
-      "set lower left sep=${1:value}",
-      "next lower left with sep",
-      "lower left with other sep={${1:separator}}{${2:value}}",
-      "lower left slot",
-      "sep lower left slot",
-      "comma lower left slot",
-      "set lower left slot=${1:value}",
-      "lower left slot with other sep=${1:separator}",
-      "lower left dots",
-      "sep lower left dots",
-      "comma lower left dots",
-      "set lower left dots=${1:value}",
-      "lower left dots with other sep=${1:separator}",
-      "lower left *",
-      "lower left **",
-      "sep lower left *",
-      "sep lower left **",
-      "comma lower left *",
-      "comma lower left **",
-      "lower left * with other sep=${1:separator}",
-      "lower left ** with other sep=${1:separator}",
-      "clear lower left",
-      "clear pre lower left",
-      "clear post lower left",
-      "d=${1:value}",
-      "sep d=${1:value}",
-      "comma d=${1:value}",
-      "pre d=${1:value}",
-      "pre d put left=${1:value}",
-      "post d=${1:value}",
-      "post d put left=${1:value}",
-      "d put left=${1:value}",
-      "set d sep=${1:value}",
-      "next d with sep",
-      "d with other sep={${1:separator}}{${2:value}}",
-      "d slot",
-      "sep d slot",
-      "comma d slot",
-      "set d slot=${1:value}",
-      "d slot with other sep=${1:separator}",
-      "d dots",
-      "sep d dots",
-      "comma d dots",
-      "set d dots=${1:value}",
-      "d dots with other sep=${1:separator}",
-      "d *",
-      "d **",
-      "sep d *",
-      "sep d **",
-      "comma d *",
-      "comma d **",
-      "d * with other sep=${1:separator}",
-      "d ** with other sep=${1:separator}",
-      "clear d",
-      "clear pre d",
-      "clear post d",
-      "i=${1:value}",
-      "sep i=${1:value}",
-      "comma i=${1:value}",
-      "pre i=${1:value}",
-      "pre i put left=${1:value}",
-      "post d=${1:value}",
-      "post i put left=${1:value}",
-      "i put left=${1:value}",
-      "set i sep=${1:value}",
-      "next i with sep",
-      "i with other sep={${1:separator}}{${2:value}}",
-      "i slot",
-      "sep i slot",
-      "comma i slot",
-      "set i slot=${1:value}",
-      "i slot with other sep=${1:separator}",
-      "i dots",
-      "sep i dots",
-      "comma i dots",
-      "set i dots=${1:value}",
-      "i dots with other sep=${1:separator}",
-      "i *",
-      "i **",
-      "sep i *",
-      "sep i **",
-      "comma i *",
-      "comma i **",
-      "i * with other sep=${1:separator}",
-      "i ** with other sep=${1:separator}",
-      "clear i",
-      "clear pre i",
-      "clear post i"
-    ],
-    [
-      "keyval parser=${1:command}",
-      "single key parser=${1:command}",
-      "semtex file"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/semantic.json b/dev/packages/semantic.json
deleted file mode 100644
index eba12bb3e..000000000
--- a/dev/packages/semantic.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "mathlig{}{}": {
-      "snippet": "mathlig{${1:characters}}{${2:ligature commands}}"
-    },
-    "mathligson": {},
-    "mathligsoff": {},
-    "mathligprotect{}": {
-      "snippet": "mathligprotect{${1:macro}}"
-    },
-    "inference{}{}": {
-      "snippet": "inference{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
-    },
-    "inference[]{}{}": {
-      "snippet": "inference[${3:name}]{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
-    },
-    "inference*{}{}": {
-      "snippet": "inference*{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
-    },
-    "inference*[]{}{}": {
-      "snippet": "inference*[${3:name}]{${1:line1 \\\\ ... \\\\ lineN}}{${2:conclusion}}"
-    },
-    "setpremisesend{}": {
-      "snippet": "setpremisesend{${1:length}}"
-    },
-    "setpremisesspace{}": {
-      "snippet": "setpremisesspace{${1:length}}"
-    },
-    "setnamespace{}": {
-      "snippet": "setnamespace{${1:length}}"
-    },
-    "predicate{}": {
-      "snippet": "predicate{${1:formula}}"
-    },
-    "predicatebegin": {},
-    "predicateend": {},
-    "compiler{}": {
-      "snippet": "compiler{${1:source,${2:machine},target}}"
-    },
-    "interpreter{}": {
-      "snippet": "interpreter{${1:source,language}}"
-    },
-    "program{}": {
-      "snippet": "program{${1:program,language}}"
-    },
-    "machine{}": {
-      "snippet": "machine{${1:machine}}"
-    },
-    "reservestyle{}{}": {
-      "snippet": "reservestyle{${1:macro}}{${2:formatting}}"
-    },
-    "reservestyle[]{}{}": {
-      "snippet": "reservestyle[${3:spacing cmd}]{${1:macro}}{${2:formatting}}"
-    },
-    "<": {
-      "detail": "<",
-      "documentation": "LESS-THAN SIGN r:"
-    },
-    "comp{}{}": {
-      "snippet": "comp{${1:command}}{${2:environment}}"
-    },
-    "eval{}{}": {
-      "snippet": "eval{${1:command}}{${2:environment}}"
-    },
-    "evalsymbol": {},
-    "evalsymbol[]": {
-      "snippet": "evalsymbol[${1:superscript}]"
-    },
-    "compsymbol": {},
-    "compsymbol[]": {
-      "snippet": "compsymbol[${1:superscript}]"
-    },
-    "exe{}{}": {
-      "snippet": "exe{${1:program}}{${2:data}}"
-    },
-    "exe{}[]{}": {
-      "snippet": "exe{${1:program}}[${2:machine}]{${3:data}}"
-    },
-    "TestForConflict{}": {
-      "snippet": "TestForConflict{${1:command list}}"
-    },
-    "semanticDate": {},
-    "semanticVersion": {}
-  },
-  "envs": {},
-  "options": [
-    "ligature",
-    "inference",
-    "tdiagram",
-    "reserved",
-    "shorthand"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/semesterplannerlua.json b/dev/packages/semesterplannerlua.json
deleted file mode 100644
index fc01e7df9..000000000
--- a/dev/packages/semesterplannerlua.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "tikzlibrarycalendar": [],
-    "tikzlibrarypositioning": [],
-    "tikzlibraryshapes.misc": [],
-    "tikzlibrarybackgrounds": [],
-    "pgfkeys": [],
-    "xcolor": [],
-    "fontawesome": [],
-    "luapackageloader": []
-  },
-  "macros": {
-    "lecture": {},
-    "lecture[]": {
-      "snippet": "lecture[${1:options}]"
-    },
-    "seminar": {},
-    "seminar[]": {
-      "snippet": "seminar[${1:options}]"
-    },
-    "tutorial": {},
-    "tutorial[]": {
-      "snippet": "tutorial[${1:options}]"
-    },
-    "meeting": {},
-    "meeting[]": {
-      "snippet": "meeting[${1:options}]"
-    },
-    "officehour": {},
-    "officehour[]": {
-      "snippet": "officehour[${1:options}]"
-    },
-    "laboratory": {},
-    "laboratory[]": {
-      "snippet": "laboratory[${1:options}]"
-    },
-    "fieldstudy": {},
-    "fieldstudy[]": {
-      "snippet": "fieldstudy[${1:options}]"
-    },
-    "printSpCalendar{}{}": {
-      "snippet": "printSpCalendar{${1:start date}}{${2:end date}}"
-    },
-    "printSpCalendar[]{}{}": {
-      "snippet": "printSpCalendar[${3:cols}]{${1:start date}}{${2:end date}}"
-    },
-    "appointment": {},
-    "appointment[]": {
-      "snippet": "appointment[${1:options}]"
-    },
-    "exam": {},
-    "exam[]": {
-      "snippet": "exam[${1:options}]"
-    },
-    "deadline": {},
-    "deadline[]": {
-      "snippet": "deadline[${1:options}]"
-    },
-    "oral": {},
-    "written": {},
-    "pmandatory": {},
-    "phigh": {},
-    "pmid": {},
-    "plow": {},
-    "pnone": {},
-    "teams": {},
-    "zoom": {},
-    "youtube": {},
-    "BBB": {},
-    "tbd": {},
-    "tba": {}
-  },
-  "envs": {
-    "timetable": {},
-    "timetable[]": {
-      "name": "timetable",
-      "snippet": "[${1:options}]"
-    },
-    "appointments{}": {
-      "name": "appointments",
-      "snippet": "{${1:true|false}}"
-    },
-    "appointments[]{}": {
-      "name": "appointments",
-      "snippet": "[${2:header}]{${1:true|false}}"
-    },
-    "exams{}": {
-      "name": "exams",
-      "snippet": "{${1:true|false}}"
-    },
-    "deadlines{}": {
-      "name": "deadlines",
-      "snippet": "{${1:true|false}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/sepfootnotes.json b/dev/packages/sepfootnotes.json
index 13755e0d3..65151aec2 100644
--- a/dev/packages/sepfootnotes.json
+++ b/dev/packages/sepfootnotes.json
@@ -49,8 +49,7 @@
     "quiet",
     "warn",
     "error",
-    "global",
-    "after"
+    "global"
   ],
   "keyvals": []
 }
\ No newline at end of file
diff --git a/dev/packages/sets.json b/dev/packages/sets.json
deleted file mode 100644
index f28c51cef..000000000
--- a/dev/packages/sets.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "newset{}{}": {
-      "snippet": "newset{${1:set}}{${2:elmt1|elmt2|...}}"
-    },
-    "newsetsimple{}{}": {
-      "snippet": "newsetsimple{${1:set}}{${2:elmt1|elmt2|...}}"
-    },
-    "listset{}": {
-      "snippet": "listset{${1:set}}"
-    },
-    "setseparator": {},
-    "is": {},
-    "iselementofset{}{}": {
-      "snippet": "iselementofset{${1:element}}{${2:set}}"
-    },
-    "to{}": {
-      "snippet": "to{${1:cmd}}"
-    },
-    "minus": {
-      "detail": "−",
-      "documentation": "MINUS SIGN"
-    },
-    "sortset{}{}": {
-      "snippet": "sortset{${1:set1}}{${2:set2}}"
-    },
-    "deleteduplicates{}{}": {
-      "snippet": "deleteduplicates{${1:set1}}{${2:set2}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/setspace.json b/dev/packages/setspace.json
deleted file mode 100644
index f14880b84..000000000
--- a/dev/packages/setspace.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "singlespacing": {},
-    "onehalfspacing": {},
-    "doublespacing": {},
-    "SetSinglespace{}": {
-      "snippet": "SetSinglespace{${1:factor}}"
-    },
-    "setstretch{}": {
-      "snippet": "setstretch{${1:factor}}"
-    },
-    "displayskipstretch": {},
-    "setdisplayskipstretch{}": {
-      "snippet": "setdisplayskipstretch{${1:factor}}"
-    }
-  },
-  "envs": {
-    "singlespace": {},
-    "singlespace*": {},
-    "doublespace": {},
-    "onehalfspace": {},
-    "spacing{}": {
-      "name": "spacing",
-      "snippet": "{${1:factor}}"
-    }
-  },
-  "options": [
-    "nodisplayskipstretch",
-    "singlespacing",
-    "onehalfspacing",
-    "doublespacing"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/sf298.json b/dev/packages/sf298.json
index ad1454476..cd095a465 100644
--- a/dev/packages/sf298.json
+++ b/dev/packages/sf298.json
@@ -15,7 +15,7 @@
       "snippet": "AbstractLimitation{${1:type}}"
     },
     "Acronyms{}": {
-      "snippet": "Acronyms{${1:acro1,${2:acro2},...}}"
+      "snippet": "Acronyms{${1:acro1,acro2,...}}"
     },
     "Author{}": {
       "snippet": "Author{${1:names}}"
diff --git a/dev/packages/shadow.json b/dev/packages/shadow.json
deleted file mode 100644
index cdfa0bafd..000000000
--- a/dev/packages/shadow.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "shabox{}": {
-      "snippet": "shabox{${1:text}}"
-    },
-    "sboxrule": {},
-    "sboxsep": {},
-    "sdim": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/shadowtext.json b/dev/packages/shadowtext.json
deleted file mode 100644
index 1e49b5ccc..000000000
--- a/dev/packages/shadowtext.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "includes": {
-    "color": []
-  },
-  "macros": {
-    "shadowtext{}": {
-      "snippet": "shadowtext{${1:text}}"
-    },
-    "shadowoffset{}": {
-      "snippet": "shadowoffset{${1:dimen}}"
-    },
-    "shadowoffsetx{}": {
-      "snippet": "shadowoffsetx{${1:dimen}}"
-    },
-    "shadowoffsety{}": {
-      "snippet": "shadowoffsety{${1:dimen}}"
-    },
-    "shadowcolor{}": {
-      "snippet": "shadowcolor{${1:color}}"
-    },
-    "shadowrgb{}": {
-      "snippet": "shadowrgb{${1:r,${2:g},b}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/shapepar.json b/dev/packages/shapepar.json
index 60dbedbbc..41650c551 100644
--- a/dev/packages/shapepar.json
+++ b/dev/packages/shapepar.json
@@ -13,9 +13,6 @@
     "Shapepar[]{}": {
       "snippet": "Shapepar[${2:scale len}]{${1:shape spec}}"
     },
-    "cutout{}()": {
-      "snippet": "cutout{${1:side}}(${2:hoffset},${3:voffset})"
-    },
     "squareshape": {},
     "squarepar": {},
     "circleshape": {},
diff --git a/dev/packages/sidebars.json b/dev/packages/sidebars.json
index 4e021e2f0..fa4c9432a 100644
--- a/dev/packages/sidebars.json
+++ b/dev/packages/sidebars.json
@@ -2,19 +2,19 @@
   "includes": {},
   "macros": {
     "backgroundcolor{}": {
-      "snippet": "backgroundcolor{${1:r,${2:g},b}}"
+      "snippet": "backgroundcolor{${1:r,g,b}}"
     },
     "sidebarcolor{}": {
-      "snippet": "sidebarcolor{${1:r,${2:g},b}}"
+      "snippet": "sidebarcolor{${1:r,g,b}}"
     },
     "highlightcolor{}": {
-      "snippet": "highlightcolor{${1:r,${2:g},b}}"
+      "snippet": "highlightcolor{${1:r,g,b}}"
     },
     "titlecolor{}": {
-      "snippet": "titlecolor{${1:r,${2:g},b}}"
+      "snippet": "titlecolor{${1:r,g,b}}"
     },
     "sidebartitlecolor{}": {
-      "snippet": "sidebartitlecolor{${1:r,${2:g},b}}"
+      "snippet": "sidebartitlecolor{${1:r,g,b}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/sidenotesplus.json b/dev/packages/sidenotesplus.json
index ddcd0ca5f..a0e7a94b6 100644
--- a/dev/packages/sidenotesplus.json
+++ b/dev/packages/sidenotesplus.json
@@ -33,13 +33,7 @@
       "snippet": "sidenotetextbefore*{${1:content}}"
     },
     "sidenotemark": {},
-    "sidenotemark()": {
-      "snippet": "sidenotemark(${1:mark})"
-    },
     "sidenotemark*": {},
-    "sidenotemark*()": {
-      "snippet": "sidenotemark*(${1:mark})"
-    },
     "sidealert{}": {
       "snippet": "sidealert{${1:content}}"
     },
diff --git a/dev/packages/simplekv.json b/dev/packages/simplekv.json
index 21f07f3fc..ceacef524 100644
--- a/dev/packages/simplekv.json
+++ b/dev/packages/simplekv.json
@@ -2,10 +2,10 @@
   "includes": {},
   "macros": {
     "setKV[]{}": {
-      "snippet": "setKV[${2:keygroup name}]{${1:key1=val1,${3:key2=val2},...}}"
+      "snippet": "setKV[${2:keygroup name}]{${1:key1=val1,key2=val2,...}}"
     },
     "setKVdefault[]{}": {
-      "snippet": "setKVdefault[${2:keygroup name}]{${1:key1=val1,${3:key2=val2},...}}"
+      "snippet": "setKVdefault[${2:keygroup name}]{${1:key1=val1,key2=val2,...}}"
     },
     "useKV[]{}": {
       "snippet": "useKV[${2:keygroup}]{${1:key}}"
@@ -23,7 +23,7 @@
       "snippet": "showKV[${2:keygroup}]{${1:key}}"
     },
     "defKV[]{}": {
-      "snippet": "defKV[${2:keygroup}]{${1:key1=code1,${3:key2=code2},...}}"
+      "snippet": "defKV[${2:keygroup}]{${1:key1=code1,key2=code2,...}}"
     },
     "testboolKV{}{}{}": {
       "snippet": "testboolKV{${1:arg}}{${2:true code}}{${3:false code}}"
diff --git a/dev/packages/simplenodes.json b/dev/packages/simplenodes.json
index c652fda43..ab0e229c7 100644
--- a/dev/packages/simplenodes.json
+++ b/dev/packages/simplenodes.json
@@ -22,7 +22,7 @@
       "snippet": "link{${1:name1}}{${2:name2}}"
     },
     "gettikzxy{}{}{}": {
-      "snippet": "gettikzxy{${1:(${4:x},${5:y})}}{${2:xcmd}}{${3:ycmd}}"
+      "snippet": "gettikzxy{${1:(${4:x,y})}}{${2:xcmd}}{${3:ycmd}}"
     },
     "mynode{}{}": {
       "snippet": "mynode{${1:draw color}}{${2:fill color}}"
diff --git a/dev/packages/simpleoptics.json b/dev/packages/simpleoptics.json
index 0cdbcf334..14216bfb1 100644
--- a/dev/packages/simpleoptics.json
+++ b/dev/packages/simpleoptics.json
@@ -34,7 +34,7 @@
       "snippet": "lens{${1:x}}{${2:y}}{${3:focal length}}{${4:height}}{${5:thickness}}"
     },
     "straightline{}{}": {
-      "snippet": "straightline{${1:x1,${3:y1}}{${2:x2},y2}}"
+      "snippet": "straightline{${1:x1,y1}}{${2:x2,y2}}"
     },
     "mirrorX": {},
     "mirrorY": {},
diff --git a/dev/packages/simples-matrices.json b/dev/packages/simples-matrices.json
index 60066a9d8..686af770f 100644
--- a/dev/packages/simples-matrices.json
+++ b/dev/packages/simples-matrices.json
@@ -21,18 +21,6 @@
     "matrice<>[]{}": {
       "snippet": "matrice<${3:keyvals}>[${2:type}]{${1:clist of coefficients}}"
     },
-    "matrice(){}": {
-      "snippet": "matrice(${2:prefix}){${1:clist of coefficients}}"
-    },
-    "matrice()[]{}": {
-      "snippet": "matrice(${3:prefix})[${2:type}]{${1:clist of coefficients}}"
-    },
-    "matrice()<>{}": {
-      "snippet": "matrice(${3:prefix})<${2:keyvals}>{${1:clist of coefficients}}"
-    },
-    "matrice()<>[]{}": {
-      "snippet": "matrice(${4:prefix})<${3:keyvals}>[${2:type}]{${1:clist of coefficients}}"
-    },
     "declarermatrice{}{}": {
       "snippet": "declarermatrice{${1:matrix name}}{${2:clist of coefficients}}"
     },
@@ -45,18 +33,6 @@
     "declarermatrice<>{}[]{}": {
       "snippet": "declarermatrice<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
     },
-    "declarermatrice(){}{}": {
-      "snippet": "declarermatrice(${3:prefix}){${1:matrix name}}{${2:clist of coefficients}}"
-    },
-    "declarermatrice(){}[]{}": {
-      "snippet": "declarermatrice(${4:prefix}){${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
-    },
-    "declarermatrice()<>{}{}": {
-      "snippet": "declarermatrice(${4:prefix})<${3:keyvals}>{${1:matrix name}}{${2:clist of coefficients}}"
-    },
-    "declarermatrice()<>{}[]{}": {
-      "snippet": "declarermatrice(${5:prefix})<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
-    },
     "declarermatrice*{}{}": {
       "snippet": "declarermatrice*{${1:matrix name}}{${2:clist of coefficients}}"
     },
@@ -69,30 +45,12 @@
     "declarermatrice*<>{}[]{}": {
       "snippet": "declarermatrice*<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
     },
-    "declarermatrice*(){}{}": {
-      "snippet": "declarermatrice*(${3:prefix}){${1:matrix name}}{${2:clist of coefficients}}"
-    },
-    "declarermatrice*(){}[]{}": {
-      "snippet": "declarermatrice*(${4:prefix}){${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
-    },
-    "declarermatrice*()<>{}{}": {
-      "snippet": "declarermatrice*(${4:prefix})<${3:keyvals}>{${1:matrix name}}{${2:clist of coefficients}}"
-    },
-    "declarermatrice*()<>{}[]{}": {
-      "snippet": "declarermatrice*(${5:prefix})<${4:keyvals}>{${1:matrix name}}[${2:type}]{${3:clist of coefficients}}"
-    },
     "lamatrice{}": {
       "snippet": "lamatrice{${1:matrix name}}"
     },
     "lamatrice<>{}": {
       "snippet": "lamatrice<${2:keyvals}>{${1:matrix name}}"
     },
-    "lamatrice(){}": {
-      "snippet": "lamatrice(${2:prefix}){${1:matrix name}}"
-    },
-    "lamatrice()<>{}": {
-      "snippet": "lamatrice(${3:prefix})<${2:keyvals}>{${1:matrix name}}"
-    },
     "MatriceInterieur": {},
     "LaMatriceInterieur{}": {
       "snippet": "LaMatriceInterieur{${1:matrix name}}"
@@ -109,18 +67,6 @@
     "matid<>[]{}": {
       "snippet": "matid<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
     },
-    "matid(){}": {
-      "snippet": "matid(${2:prefix}){${1:number of columns}}"
-    },
-    "matid()[]{}": {
-      "snippet": "matid(${3:prefix})[${2:coefficient}]{${1:number of columns}}"
-    },
-    "matid()<>{}": {
-      "snippet": "matid(${3:prefix})<${2:keyvals}>{${1:number of columns}}"
-    },
-    "matid()<>[]{}": {
-      "snippet": "matid(${4:prefix})<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
-    },
     "matnulle{}": {
       "snippet": "matnulle{${1:number of columns}}"
     },
@@ -132,18 +78,6 @@
     },
     "matnulle<>[]{}": {
       "snippet": "matnulle<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
-    },
-    "matnulle(){}": {
-      "snippet": "matnulle(${2:prefix}){${1:number of columns}}"
-    },
-    "matnulle()[]{}": {
-      "snippet": "matnulle(${3:prefix})[${2:coefficient}]{${1:number of columns}}"
-    },
-    "matnulle()<>{}": {
-      "snippet": "matnulle(${3:prefix})<${2:keyvals}>{${1:number of columns}}"
-    },
-    "matnulle()<>[]{}": {
-      "snippet": "matnulle(${4:prefix})<${3:keyvals}>[${2:coefficient}]{${1:number of columns}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/siunitx.json b/dev/packages/siunitx.json
deleted file mode 100644
index 7cb39ca59..000000000
--- a/dev/packages/siunitx.json
+++ /dev/null
@@ -1,2747 +0,0 @@
-{
-  "includes": {
-    "translations": [],
-    "amstext": [],
-    "color": [],
-    "array": [],
-    "xspace": [
-      "use-xspace"
-    ]
-  },
-  "macros": {
-    "A": {
-      "detail": "𝐴",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL A"
-    },
-    "ampere": {},
-    "amu": {},
-    "ang[]{}": {
-      "snippet": "ang[${2:options}]{${1:angle}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ang{}": {
-      "snippet": "ang{${1:angle}}"
-    },
-    "arcminute": {},
-    "arcsecond": {},
-    "as": {},
-    "astronomicalunit": {},
-    "atto": {},
-    "becquerel": {},
-    "bel": {},
-    "bit": {},
-    "byte": {},
-    "C": {
-      "detail": "𝐶",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL C"
-    },
-    "candela": {},
-    "centi": {},
-    "cm": {},
-    "complexnum{}": {
-      "snippet": "complexnum{${1:number}}"
-    },
-    "complexnum[]{}": {
-      "snippet": "complexnum[${2:options}]{${1:number}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "complexqty{}{}": {
-      "snippet": "complexqty{${1:number}}{${2:unit}}"
-    },
-    "complexqty[]{}{}": {
-      "snippet": "complexqty[${3:options}]{${1:number}}{${2:unit}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "coulomb": {},
-    "cubed": {},
-    "cubic": {},
-    "dalton": {},
-    "dB": {},
-    "deca": {},
-    "deci": {},
-    "decibel": {},
-    "DeclareSIPower{}{}{}": {
-      "snippet": "DeclareSIPower{${1:symbol-before}}{${2:symbol-after}}{${3:power}}"
-    },
-    "DeclareSIPrefix{}{}{}": {
-      "snippet": "DeclareSIPrefix{${1:prefix macro}}{${2:symbol}}{${3:power of 10}}"
-    },
-    "DeclareSIQualifier{}{}": {
-      "snippet": "DeclareSIQualifier{${1:qualifier}}{${2:symbol}}"
-    },
-    "DeclareSIUnit[]{}{}": {
-      "snippet": "DeclareSIUnit[${3:options}]{${1:unit}}{${2:definition}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "DeclareSIUnit{}{}": {
-      "snippet": "DeclareSIUnit{${1:unit}}{${2:definition}}"
-    },
-    "degreeCelsius": {},
-    "degree": {},
-    "deka": {},
-    "dm": {},
-    "electronvolt": {},
-    "eV": {},
-    "exa": {},
-    "exbi": {},
-    "F": {
-      "detail": "𝐹",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL F"
-    },
-    "farad": {},
-    "femto": {},
-    "fF": {},
-    "fg": {},
-    "fH": {},
-    "fmol": {},
-    "fs": {},
-    "g": {
-      "detail": "𝑔",
-      "documentation": "MATHEMATICAL ITALIC SMALL G"
-    },
-    "GeV": {},
-    "GHz": {},
-    "gibi": {},
-    "giga": {},
-    "GPa": {},
-    "gram": {},
-    "gray": {},
-    "GW": {},
-    "hectare": {},
-    "hecto": {},
-    "henry": {},
-    "hertz": {},
-    "highlight": {},
-    "hL": {},
-    "hl": {},
-    "hour": {},
-    "Hz": {},
-    "J": {
-      "detail": "𝐽",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL J"
-    },
-    "joule": {},
-    "K": {
-      "detail": "𝐾",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL K"
-    },
-    "kA": {},
-    "katal": {},
-    "kelvin": {},
-    "keV": {},
-    "kg": {},
-    "kHz": {},
-    "kibi": {},
-    "kilo": {},
-    "kilogram": {},
-    "kJ": {},
-    "km": {},
-    "kmol": {},
-    "kN": {},
-    "kohm": {},
-    "kPa": {},
-    "kV": {},
-    "kW": {},
-    "kWh": {},
-    "L": {
-      "detail": "𝐿",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL L"
-    },
-    "l": {
-      "detail": "𝑙",
-      "documentation": "MATHEMATICAL ITALIC SMALL L"
-    },
-    "liter": {},
-    "litre": {},
-    "lumen": {},
-    "lux": {},
-    "m": {
-      "detail": "𝑚",
-      "documentation": "MATHEMATICAL ITALIC SMALL M"
-    },
-    "mA": {},
-    "mC": {},
-    "mebi": {},
-    "mega": {},
-    "meter": {},
-    "metre": {},
-    "MeV": {},
-    "meV": {},
-    "mF": {},
-    "mg": {},
-    "mH": {},
-    "MHz": {},
-    "mHz": {},
-    "micro": {},
-    "milli": {},
-    "minute": {},
-    "mJ": {},
-    "mL": {},
-    "ml": {},
-    "mm": {},
-    "mmol": {},
-    "MN": {},
-    "mN": {},
-    "Mohm": {},
-    "mohm": {},
-    "mol": {},
-    "mole": {},
-    "mp": {
-      "detail": "∓",
-      "documentation": "MINUS-OR-PLUS SIGN"
-    },
-    "MPa": {},
-    "ms": {},
-    "mT": {},
-    "mV": {},
-    "MW": {},
-    "mW": {},
-    "N": {
-      "detail": "𝑁",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL N"
-    },
-    "nA": {},
-    "nano": {},
-    "nC": {},
-    "neper": {},
-    "newton": {},
-    "nF": {},
-    "ng": {},
-    "nm": {},
-    "nmol": {},
-    "ns": {},
-    "num[]{}": {
-      "snippet": "num[${2:options}]{${1:number}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "num{}": {
-      "snippet": "num{${1:number}}"
-    },
-    "numlist[]{}": {
-      "snippet": "numlist[${2:options}]{${1:numbers}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "numlist{}": {
-      "snippet": "numlist{${1:numbers}}"
-    },
-    "numproduct[]{}": {
-      "snippet": "numproduct[${2:options}]{${1:numbers}}",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "numproduct{}": {
-      "snippet": "numproduct{${1:numbers}}"
-    },
-    "numrange[]{}{}": {
-      "snippet": "numrange[${3:options}]{${1:number1}}{${2:number2}}",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "numrange{}{}": {
-      "snippet": "numrange{${1:number1}}{${2:number2}}"
-    },
-    "nV": {},
-    "nW": {},
-    "of{}": {
-      "snippet": "of{${1:text}}"
-    },
-    "ohm": {},
-    "Pa": {},
-    "pA": {},
-    "pascal": {},
-    "pebi": {},
-    "per": {},
-    "percent": {
-      "detail": "%",
-      "documentation": "PERCENT SIGN"
-    },
-    "peta": {},
-    "pF": {},
-    "pg": {},
-    "pH": {},
-    "pico": {},
-    "pmol": {},
-    "ps": {},
-    "pV": {},
-    "qty[]{}{}": {
-      "snippet": "qty[${3:options}]{${1:number}}{${2:unit}}",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "qty{}{}": {
-      "snippet": "qty{${1:number}}{${2:unit}}"
-    },
-    "qtylist[]{}{}": {
-      "snippet": "qtylist[${3:options}]{${1:numbers}}{${2:unit}}",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "qtylist{}{}": {
-      "snippet": "qtylist{${1:numbers}}{${2:unit}}"
-    },
-    "qtyproduct[]{}{}": {
-      "snippet": "qtyproduct[${3:options}]{${1:numbers}}{${2:unit}}",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "qtyproduct{}{}": {
-      "snippet": "qtyproduct{${1:numbers}}{${2:unit}}"
-    },
-    "qtyrange[]{}{}{}": {
-      "snippet": "qtyrange[${4:options}]{${1:number1}}{${2:number2}}{${3:unit}}",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "qtyrange{}{}{}": {
-      "snippet": "qtyrange{${1:number1}}{${2:number2}}{${3:unit}}"
-    },
-    "quecto": {},
-    "quetta": {},
-    "radian": {},
-    "raiseto{}": {
-      "snippet": "raiseto{${1:power}}"
-    },
-    "ronna": {},
-    "ronto": {},
-    "s": {
-      "detail": "𝑠",
-      "documentation": "MATHEMATICAL ITALIC SMALL S"
-    },
-    "second": {
-      "detail": "″",
-      "documentation": "DOUBLE PRIME or second, not superscripted"
-    },
-    "siemens": {},
-    "sievert": {},
-    "sisetup{}": {
-      "snippet": "sisetup{${1:options}}",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "square": {
-      "detail": "⬜",
-      "documentation": "WHITE LARGE SQUARE"
-    },
-    "squared": {},
-    "steradian": {},
-    "T": {
-      "detail": "𝑇",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL T"
-    },
-    "tablenum{}": {
-      "snippet": "tablenum{${1:number}}"
-    },
-    "tablenum[]{}": {
-      "snippet": "tablenum[${2:options}]{${1:number}}",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "tebi": {},
-    "tera": {},
-    "tesla": {},
-    "TeV": {},
-    "THz": {},
-    "tonne": {},
-    "tothe{}": {
-      "snippet": "tothe{${1:power}}"
-    },
-    "uA": {},
-    "uC": {},
-    "uF": {},
-    "ug": {},
-    "uH": {},
-    "uJ": {},
-    "uL": {},
-    "ul": {},
-    "um": {},
-    "umol": {},
-    "unit[]{}": {
-      "snippet": "unit[${2:options}]{${1:unit}}",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "unit{}": {
-      "snippet": "unit{${1:unit}}"
-    },
-    "us": {},
-    "uT": {},
-    "uV": {},
-    "uW": {},
-    "V": {
-      "detail": "𝑉",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL V"
-    },
-    "volt": {},
-    "W": {
-      "detail": "𝑊",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL W"
-    },
-    "watt": {},
-    "weber": {},
-    "yobi": {},
-    "yocto": {},
-    "yotta": {},
-    "zebi": {},
-    "zepto": {},
-    "zetta": {},
-    "angstrom": {},
-    "atomicmassunit": {},
-    "bar": {
-      "detail": " ̄",
-      "documentation": "macron"
-    },
-    "barn": {},
-    "bohr": {},
-    "celsius": {},
-    "clight": {},
-    "DeclareBinaryPrefix{}{}{}": {
-      "snippet": "DeclareBinaryPrefix{${1:prefix macro}}{${2:symbol}}{${3:power of 2}}"
-    },
-    "DeclareSIPostPower{}{}": {
-      "snippet": "DeclareSIPostPower{${1:power macro}}{${2:number}}"
-    },
-    "DeclareSIPrePower{}{}": {
-      "snippet": "DeclareSIPrePower{${1:power macro}}{${2:number}}"
-    },
-    "electronmass": {},
-    "elementarycharge": {},
-    "hartree": {},
-    "knot": {},
-    "mmHg": {},
-    "nauticalmile": {},
-    "planckbar": {},
-    "SendSettingsToPgf": {},
-    "SI[]{}[]{}": {
-      "snippet": "SI[${3:options}]{${1:value}}[${4:pre-unit}]{${2:unit commands}}",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "SI[]{}{}": {
-      "snippet": "SI[${3:options}]{${1:value}}{${2:unit commands}}",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "SI{}[]{}": {
-      "snippet": "SI{${1:value}}[${2:pre-unit}]{${3:unit commands}}"
-    },
-    "SI{}{}": {
-      "snippet": "SI{${1:value}}{${2:unit commands}}"
-    },
-    "si[]{}": {
-      "snippet": "si[${2:options}]{${1:unit}}",
-      "keyvalindex": 15,
-      "keyvalpos": 0
-    },
-    "si{}": {
-      "snippet": "si{${1:unit}}"
-    },
-    "SIlist{}{}": {
-      "snippet": "SIlist{${1:values}}{${2:unit commands}}"
-    },
-    "SIlist[]{}{}": {
-      "snippet": "SIlist[${3:options}]{${1:values}}{${2:unit commands}}",
-      "keyvalindex": 16,
-      "keyvalpos": 0
-    },
-    "SIrange{}{}{}": {
-      "snippet": "SIrange{${1:value1}}{${2:value2}}{${3:unit commands}}"
-    },
-    "SIrange[]{}{}{}": {
-      "snippet": "SIrange[${4:options}]{${1:value1}}{${2:value2}}{${3:unit commands}}",
-      "keyvalindex": 17,
-      "keyvalpos": 0
-    },
-    "SIUnitSymbolAngstrom": {},
-    "SIUnitSymbolArcminute": {},
-    "SIUnitSymbolArcsecond": {},
-    "SIUnitSymbolCelsius": {},
-    "SIUnitSymbolDegree": {},
-    "SIUnitSymbolMicro": {},
-    "SIUnitSymbolOhm": {},
-    "ll": {
-      "detail": "≪",
-      "documentation": "much less type 2"
-    },
-    "gg": {
-      "detail": "≫",
-      "documentation": "much greater type 2"
-    },
-    "le": {
-      "detail": "≤",
-      "documentation": "r: less-than-or-equal"
-    },
-    "ge": {
-      "detail": "≥",
-      "documentation": "r: greater-than-or-equal"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "angle-mode=",
-      "angle-symbol-degree=${1:symbol}",
-      "angle-symbol-minute=${1:symbol}",
-      "angle-symbol-over-decimal",
-      "angle-symbol-second=${1:symbol}",
-      "angle-separator=${1:separator}",
-      "fill-angle-degrees",
-      "fill-angle-minutes",
-      "fill-angle-seconds",
-      "number-angle-product=${1:separator}",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "unit-math-rm=",
-      "unit-math-sf=",
-      "unit-math-tt=",
-      "unit-text-rm=",
-      "unit-text-sf=",
-      "unit-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "add-arc-degree-zero",
-      "add-arc-minute-zero",
-      "add-arc-second-zero",
-      "arc-separator=",
-      "math-arcminute=",
-      "math-arcsecond=",
-      "math-degree=",
-      "redefine-symbols",
-      "text-arcminute=",
-      "text-arcsecond=",
-      "text-degree="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "complex-angle-unit=",
-      "complex-mode=",
-      "complex-root-position=",
-      "complex-symbol-angle=${1:symbol}",
-      "complex-symbol-degree=${1:symbol}",
-      "input-complex-root=${1:tokens}",
-      "output-complex-root=${1:symbol}",
-      "print-complex-unity",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "unit-math-rm=",
-      "unit-math-sf=",
-      "unit-math-tt=",
-      "unit-text-rm=",
-      "unit-text-sf=",
-      "unit-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "fraction-function=",
-      "input-product=",
-      "input-quotient=",
-      "output-product=",
-      "output-quotient=",
-      "quotient-mode=",
-      "literal-superscript-as-power",
-      "power-font=",
-      "prefixes-as-symbols",
-      "allow-number-unit-breaks",
-      "exponent-to-prefix",
-      "number-unit-product=",
-      "multi-part-units=",
-      "table-align-text-pre",
-      "table-align-text-post",
-      "table-comparator",
-      "table-figures-decimal=",
-      "table-figures-exponent=",
-      "table-figures-integer=",
-      "table-figures-uncertainty=",
-      "table-parse-only",
-      "table-omit-exponent",
-      "table-space-text-pre=",
-      "table-space-text-post=",
-      "table-sign-exponent",
-      "table-sign-mantissa",
-      "table-unit-alignment=",
-      "math-angstrom=",
-      "math-celsius=",
-      "math-micro=",
-      "math-ohm=",
-      "text-angstrom=",
-      "text-celsius=",
-      "text-micro=",
-      "text-ohm=",
-      "math-arcminute=",
-      "math-arcsecond=",
-      "math-degree=",
-      "redefine-symbols",
-      "text-arcminute=",
-      "text-arcsecond=",
-      "text-degree="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "fraction-function=",
-      "input-product=",
-      "input-quotient=",
-      "output-product=",
-      "output-quotient=",
-      "quotient-mode="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "list-close-bracket=${1:symbol}",
-      "list-exponents=",
-      "list-final-separator=${1:separator}",
-      "list-independent-prefix",
-      "list-open-bracket=${1:symbol}",
-      "list-pair-separator=${1:separator}",
-      "list-separator=${1:separator}",
-      "list-units=",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "fraction-function=",
-      "input-product=",
-      "input-quotient=",
-      "output-product=",
-      "output-quotient=",
-      "quotient-mode="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "product-close-bracket=${1:symbol}",
-      "product-exponents=",
-      "product-independent-prefix",
-      "product-mode=",
-      "product-open-bracket=${1:symbol}",
-      "product-phrase=${1:text}",
-      "product-symbol=${1:symbol}",
-      "product-units=",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "range-close-bracket=${1:symbol}",
-      "range-exponents=",
-      "range-independent-prefix",
-      "range-open-bracket=${1:symbol}",
-      "range-open-phrase=${1:symbol}",
-      "range-phrase=${1:text}",
-      "range-units=",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "list-close-bracket=${1:symbol}",
-      "list-exponents=",
-      "list-final-separator=${1:separator}",
-      "list-independent-prefix",
-      "list-open-bracket=${1:symbol}",
-      "list-pair-separator=${1:separator}",
-      "list-separator=${1:separator}",
-      "list-units=",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "product-close-bracket=${1:symbol}",
-      "product-exponents=",
-      "product-independent-prefix",
-      "product-mode=",
-      "product-open-bracket=${1:symbol}",
-      "product-phrase=${1:text}",
-      "product-symbol=${1:symbol}",
-      "product-units=",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "range-close-bracket=${1:symbol}",
-      "range-exponents=",
-      "range-independent-prefix",
-      "range-open-bracket=${1:symbol}",
-      "range-open-phrase=${1:symbol}",
-      "range-phrase=${1:text}",
-      "range-units=",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "list-close-bracket=${1:symbol}",
-      "list-exponents=",
-      "list-final-separator=${1:separator}",
-      "list-independent-prefix",
-      "list-open-bracket=${1:symbol}",
-      "list-pair-separator=${1:separator}",
-      "list-separator=${1:separator}",
-      "list-units=",
-      "product-close-bracket=${1:symbol}",
-      "product-exponents=",
-      "product-independent-prefix",
-      "product-mode=",
-      "product-open-bracket=${1:symbol}",
-      "product-phrase=${1:text}",
-      "product-symbol=${1:symbol}",
-      "product-units=",
-      "range-close-bracket=${1:symbol}",
-      "range-exponents=",
-      "range-independent-prefix",
-      "range-open-bracket=${1:symbol}",
-      "range-open-phrase=${1:symbol}",
-      "range-phrase=${1:text}",
-      "range-units=",
-      "complex-angle-unit=",
-      "complex-mode=",
-      "complex-root-position=",
-      "complex-symbol-angle=${1:symbol}",
-      "complex-symbol-degree=${1:symbol}",
-      "input-complex-root=${1:tokens}",
-      "output-complex-root=${1:symbol}",
-      "print-complex-unity",
-      "angle-mode=",
-      "angle-symbol-degree=${1:symbol}",
-      "angle-symbol-minute=${1:symbol}",
-      "angle-symbol-over-decimal",
-      "angle-symbol-second=${1:symbol}",
-      "angle-separator=${1:separator}",
-      "fill-angle-degrees",
-      "fill-angle-minutes",
-      "fill-angle-seconds",
-      "number-angle-product=${1:separator}",
-      "free-standing-units",
-      "overwrite-functions",
-      "space-before-unit",
-      "unit-optional-argument",
-      "use-xspace",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "table-align-comparator",
-      "table-align-exponent",
-      "table-align-text-after",
-      "table-align-text-before",
-      "table-align-uncertainty",
-      "table-alignment=",
-      "table-alignment-mode=",
-      "table-auto-round",
-      "table-column-width=",
-      "table-fixed-width=",
-      "table-format=${1:format value}",
-      "table-model-setup=${1:commands}",
-      "table-number-alignment=",
-      "table-text-alignment=",
-      "locale=",
-      "list-input-separator=${1:separator}",
-      "product-input-separator=${1:separator}",
-      "table-column-type=${1:tokens}",
-      "detect-all",
-      "detect-display-math",
-      "detect-family",
-      "detect-inline-family=",
-      "detect-inline-weight=",
-      "detect-mode",
-      "detect-none",
-      "detect-shape",
-      "detect-weight",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "unit-math-rm=",
-      "unit-math-sf=",
-      "unit-math-tt=",
-      "unit-text-rm=",
-      "unit-text-sf=",
-      "unit-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "fraction-function=",
-      "input-product=",
-      "input-quotient=",
-      "output-product=",
-      "output-quotient=",
-      "quotient-mode=",
-      "add-arc-degree-zero",
-      "add-arc-minute-zero",
-      "add-arc-second-zero",
-      "arc-separator=",
-      "literal-superscript-as-power",
-      "power-font=",
-      "prefixes-as-symbols",
-      "allow-number-unit-breaks",
-      "exponent-to-prefix",
-      "number-unit-product=",
-      "multi-part-units=",
-      "table-align-text-pre",
-      "table-align-text-post",
-      "table-comparator",
-      "table-figures-decimal=",
-      "table-figures-exponent=",
-      "table-figures-integer=",
-      "table-figures-uncertainty=",
-      "table-parse-only",
-      "table-omit-exponent",
-      "table-space-text-pre=",
-      "table-space-text-post=",
-      "table-sign-exponent",
-      "table-sign-mantissa",
-      "table-unit-alignment=",
-      "math-angstrom=",
-      "math-celsius=",
-      "math-micro=",
-      "math-ohm=",
-      "text-angstrom=",
-      "text-celsius=",
-      "text-micro=",
-      "text-ohm=",
-      "math-arcminute=",
-      "math-arcsecond=",
-      "math-degree=",
-      "redefine-symbols",
-      "text-arcminute=",
-      "text-arcsecond=",
-      "text-degree="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "table-align-comparator",
-      "table-align-exponent",
-      "table-align-text-after",
-      "table-align-text-before",
-      "table-align-uncertainty",
-      "table-alignment=",
-      "table-alignment-mode=",
-      "table-auto-round",
-      "table-column-width=",
-      "table-fixed-width=",
-      "table-format=${1:format value}",
-      "table-model-setup=${1:commands}",
-      "table-number-alignment=",
-      "table-text-alignment=",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "locale="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "unit-math-rm=",
-      "unit-math-sf=",
-      "unit-math-tt=",
-      "unit-text-rm=",
-      "unit-text-sf=",
-      "unit-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "fraction-function=",
-      "input-product=",
-      "input-quotient=",
-      "output-product=",
-      "output-quotient=",
-      "quotient-mode=",
-      "literal-superscript-as-power",
-      "power-font=",
-      "prefixes-as-symbols",
-      "allow-number-unit-breaks",
-      "exponent-to-prefix",
-      "number-unit-product=",
-      "multi-part-units=",
-      "math-angstrom=",
-      "math-celsius=",
-      "math-micro=",
-      "math-ohm=",
-      "text-angstrom=",
-      "text-celsius=",
-      "text-micro=",
-      "text-ohm=",
-      "math-arcminute=",
-      "math-arcsecond=",
-      "math-degree=",
-      "redefine-symbols",
-      "text-arcminute=",
-      "text-arcsecond=",
-      "text-degree="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "bracket-unit-denominator",
-      "forbid-literal-units",
-      "fraction-command=${1:command}",
-      "inter-unit-product=${1:separator}",
-      "parse-units",
-      "per-mode=",
-      "display-per-mode=",
-      "inline-per-mode=",
-      "per-symbol-script-correction=${1:separator}",
-      "per-symbol=${1:symbol}",
-      "power-half-as-sqrt",
-      "qualifier-mode=",
-      "qualifier-phrase=${1:text}",
-      "sticky-per",
-      "unit-font-command=${1:command}",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "unit-math-rm=",
-      "unit-math-sf=",
-      "unit-math-tt=",
-      "unit-text-rm=",
-      "unit-text-sf=",
-      "unit-text-tt=",
-      "literal-superscript-as-power",
-      "power-font=",
-      "prefixes-as-symbols",
-      "math-angstrom=",
-      "math-celsius=",
-      "math-micro=",
-      "math-ohm=",
-      "text-angstrom=",
-      "text-celsius=",
-      "text-micro=",
-      "text-ohm=",
-      "math-arcminute=",
-      "math-arcsecond=",
-      "math-degree=",
-      "redefine-symbols",
-      "text-arcminute=",
-      "text-arcsecond=",
-      "text-degree="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "list-close-bracket=${1:symbol}",
-      "list-exponents=",
-      "list-final-separator=${1:separator}",
-      "list-independent-prefix",
-      "list-open-bracket=${1:symbol}",
-      "list-pair-separator=${1:separator}",
-      "list-separator=${1:separator}",
-      "list-units=",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "unit-math-rm=",
-      "unit-math-sf=",
-      "unit-math-tt=",
-      "unit-text-rm=",
-      "unit-text-sf=",
-      "unit-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "fraction-function=",
-      "input-product=",
-      "input-quotient=",
-      "output-product=",
-      "output-quotient=",
-      "quotient-mode=",
-      "literal-superscript-as-power",
-      "power-font=",
-      "prefixes-as-symbols",
-      "allow-number-unit-breaks",
-      "exponent-to-prefix",
-      "number-unit-product=",
-      "multi-part-units=",
-      "math-angstrom=",
-      "math-celsius=",
-      "math-micro=",
-      "math-ohm=",
-      "text-angstrom=",
-      "text-celsius=",
-      "text-micro=",
-      "text-ohm=",
-      "math-arcminute=",
-      "math-arcsecond=",
-      "math-degree=",
-      "redefine-symbols",
-      "text-arcminute=",
-      "text-arcsecond=",
-      "text-degree="
-    ],
-    [
-      "color=",
-      "mode=",
-      "number-color=",
-      "number-mode=",
-      "propagate-math-font",
-      "reset-math-version",
-      "reset-text-family",
-      "reset-text-series",
-      "reset-text-shape",
-      "text-family-to-math",
-      "text-subscript-command=${1:command}",
-      "text-superscript-command=${1:command}",
-      "text-font-command=${1:commands}",
-      "text-series-to-math",
-      "unit-color=",
-      "unit-mode=",
-      "evaluate-expression",
-      "expression=${1:expression}",
-      "input-close-uncertainty=${1:symbols}",
-      "input-comparators=${1:symbols}",
-      "input-decimal-markers=${1:symbols}",
-      "input-digits=${1:symbols}",
-      "input-exponent-markers=${1:symbols}",
-      "input-ignore=${1:symbols}",
-      "input-open-uncertainty=${1:symbols}",
-      "input-signs=${1:symbols}",
-      "input-uncertainty-divider=${1:symbol}",
-      "input-uncertainty-signs=${1:symbols}",
-      "parse-numbers",
-      "retain-explicit-decimal-marker",
-      "retain-explicit-plus",
-      "retain-negative-zero",
-      "retain-zero-uncertainty",
-      "drop-exponent",
-      "drop-uncertainty",
-      "drop-zero-decimal",
-      "exponent-mode=",
-      "exponent-thresholds=${1:min:max}",
-      "fixed-exponent=${1:integer}",
-      "minimum-integer-digits=${1:integer}",
-      "minimum-decimal-digits=${1:integer}",
-      "round-direction=",
-      "round-half=",
-      "round-minimum=${1:number}",
-      "round-mode=",
-      "round-pad",
-      "round-precision=${1:integer}",
-      "round-zero-positive",
-      "uncertainty-round-direction=",
-      "bracket-ambiguous-numbers",
-      "bracket-negative-numbers",
-      "digit-group-size=${1:integer}",
-      "digit-group-first-size=${1:integer}",
-      "digit-group-other-size=${1:integer}",
-      "exponent-base=${1:value}",
-      "exponent-product=${1:symbol}",
-      "group-digits=",
-      "group-minimum-digits=${1:integer}",
-      "group-separator=${1:separator}",
-      "negative-color=",
-      "output-close-uncertainty=${1:symbol}",
-      "output-decimal-marker=${1:symbol}",
-      "output-exponent-marker=${1:symbol}",
-      "output-open-uncertainty=${1:symbol}",
-      "print-exponent-implicit-plus",
-      "print-implicit-plus",
-      "print-mantissa-implicit-plus",
-      "print-unity-mantissa",
-      "print-zero-exponent",
-      "print-zero-integer",
-      "separate-uncertainty",
-      "tight-spacing",
-      "uncertainty-descriptor-mode=",
-      "uncertainty-descriptor-separator=${1:separator}",
-      "uncertainty-descriptors={${1:desc1,desc2,...}}",
-      "uncertainty-mode=",
-      "uncertainty-separator=${1:separator}",
-      "zero-decimal-as-symbol",
-      "zero-symbol=${1:symbol}",
-      "range-close-bracket=${1:symbol}",
-      "range-exponents=",
-      "range-independent-prefix",
-      "range-open-bracket=${1:symbol}",
-      "range-open-phrase=${1:symbol}",
-      "range-phrase=${1:text}",
-      "range-units=",
-      "allow-quantity-breaks",
-      "extract-mass-in-kilograms",
-      "prefix-mode=",
-      "quantity-product=${1:symbol}",
-      "separate-uncertainty-units=",
-      "locale=",
-      "math-rm=",
-      "math-sf=",
-      "math-tt=",
-      "text-rm=",
-      "text-sf=",
-      "text-tt=",
-      "text-tt=",
-      "number-math-rm=",
-      "number-math-sf=",
-      "number-math-tt=",
-      "number-text-rm=",
-      "number-text-sf=",
-      "number-text-tt=",
-      "unit-math-rm=",
-      "unit-math-sf=",
-      "unit-math-tt=",
-      "unit-text-rm=",
-      "unit-text-sf=",
-      "unit-text-tt=",
-      "input-protect-tokens=",
-      "input-symbols=",
-      "add-decimal-zero",
-      "add-integer-zero",
-      "explicit-sign=",
-      "omit-uncertainty",
-      "retain-unity-mantissa",
-      "retain-zero-exponent",
-      "round-integer-to-decimal",
-      "scientific-notation=",
-      "zero-decimal-to-integer",
-      "bracket-numbers",
-      "close-bracket=",
-      "copy-complex-root=",
-      "copy-decimal-marker=",
-      "open-bracket=",
-      "literal-superscript-as-power",
-      "power-font=",
-      "prefixes-as-symbols",
-      "allow-number-unit-breaks",
-      "exponent-to-prefix",
-      "number-unit-product=",
-      "math-angstrom=",
-      "math-celsius=",
-      "math-micro=",
-      "math-ohm=",
-      "text-angstrom=",
-      "text-celsius=",
-      "text-micro=",
-      "text-ohm=",
-      "math-arcminute=",
-      "math-arcsecond=",
-      "math-degree=",
-      "redefine-symbols",
-      "text-arcminute=",
-      "text-arcsecond=",
-      "text-degree="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/skak.json b/dev/packages/skak.json
deleted file mode 100644
index 2f7a395ff..000000000
--- a/dev/packages/skak.json
+++ /dev/null
@@ -1,584 +0,0 @@
-{
-  "includes": {
-    "chessfss": [],
-    "lambda": [],
-    "ifthen": [],
-    "calc": [],
-    "pstricks": [
-      "ps"
-    ],
-    "pst-node": [
-      "ps"
-    ]
-  },
-  "macros": {
-    "newgame": {},
-    "mainline{}": {
-      "snippet": "mainline{${1:moves}}"
-    },
-    "variation{}": {
-      "snippet": "variation{${1:moves}}"
-    },
-    "showboard": {},
-    "hidemoves{}": {
-      "snippet": "hidemoves{${1:moves}}"
-    },
-    "storegame{}": {
-      "snippet": "storegame{${1:name}}"
-    },
-    "restoregame{}": {
-      "snippet": "restoregame{${1:name}}"
-    },
-    "savegame{}": {
-      "snippet": "savegame{${1:name}}"
-    },
-    "loadgame{}": {
-      "snippet": "loadgame{${1:name}}"
-    },
-    "notationon": {},
-    "notationoff": {},
-    "notationOn": {},
-    "notationOff": {},
-    "showinverseboard": {},
-    "wmove{}": {
-      "snippet": "wmove{${1:move}}"
-    },
-    "bmove{}": {
-      "snippet": "bmove{${1:move}}"
-    },
-    "lastmove{}": {
-      "snippet": "lastmove{${1:move}}"
-    },
-    "showonlywhite": {},
-    "showonlyblack": {},
-    "showonly{}": {
-      "snippet": "showonly{${1:piece1,${2:piece2},...}}"
-    },
-    "showallbut{}": {
-      "snippet": "showallbut{${1:piece1,${2:piece2},...}}"
-    },
-    "fenboard{}": {
-      "snippet": "fenboard{${1:instructions}}"
-    },
-    "styleA": {},
-    "styleB": {},
-    "styleC": {},
-    "variationstyle": {},
-    "mainlinestyle": {},
-    "longmoves": {},
-    "shortmoves": {},
-    "newskaklanguage{}{}": {
-      "snippet": "newskaklanguage{${1:language}}{${2:pieces}}"
-    },
-    "skaklanguage[]": {
-      "snippet": "skaklanguage[${1:language}]"
-    },
-    "boardasfen": {},
-    "EnPassantSquare": {},
-    "variationcurrent": {},
-    "continuevariation": {},
-    "continuevariationcurrent": {},
-    "tinyboard": {},
-    "smallboard": {},
-    "normalboard": {},
-    "largeboard": {},
-    "movecomment{}": {
-      "snippet": "movecomment{${1:moves}}"
-    },
-    "showall": {},
-    "showonlypawns": {},
-    "showmoveron": {},
-    "showmoveroff": {},
-    "showmoverOn": {},
-    "showmoverOff": {},
-    "printarrow{}{}": {
-      "snippet": "printarrow{${1:from}}{${2:to}}"
-    },
-    "highlight{}": {
-      "snippet": "highlight{${1:square list}}"
-    },
-    "highlight[]{}": {
-      "snippet": "highlight[${2:marker}]{${1:square list}}"
-    },
-    "printknightmove{}{}": {
-      "snippet": "printknightmove{${1:from}}{${2:to}}"
-    },
-    "afterblack": {},
-    "AfterBlack": {},
-    "aftergrouplength": {},
-    "afterwhite": {},
-    "AfterWhite": {},
-    "Apply{}{}": {
-      "snippet": "Apply{${1:arg1}}{${2:arg2}}"
-    },
-    "arga": {},
-    "argb": {},
-    "BackwardDirection{}": {
-      "snippet": "BackwardDirection{${1:arg1}}"
-    },
-    "beforeblack": {},
-    "beforenumber": {},
-    "beforewhite": {},
-    "BlackCastling": {},
-    "BlackKingSquare": {},
-    "blackopen": {},
-    "BlackPiece{}": {
-      "snippet": "BlackPiece{${1:arg1}}"
-    },
-    "BlackSquarePiece{}": {
-      "snippet": "BlackSquarePiece{${1:arg1}}"
-    },
-    "BoolToString{}": {
-      "snippet": "BoolToString{${1:arg1}}"
-    },
-    "Capture": {},
-    "CastleDone{}": {
-      "snippet": "CastleDone{${1:arg1}}"
-    },
-    "CastleKingFile{}": {
-      "snippet": "CastleKingFile{${1:arg1}}"
-    },
-    "CastleRookFromFile{}": {
-      "snippet": "CastleRookFromFile{${1:arg1}}"
-    },
-    "CastleRookToFile{}": {
-      "snippet": "CastleRookToFile{${1:arg1}}"
-    },
-    "Castling": {},
-    "CheckTest": {},
-    "closecommands": {},
-    "currentlanguage": {},
-    "currentstyle": {},
-    "DoTheMove{}": {
-      "snippet": "DoTheMove{${1:arg1}}"
-    },
-    "DoTheMoveList{}": {
-      "snippet": "DoTheMoveList{${1:arg1}}"
-    },
-    "EatNumber{}": {
-      "snippet": "EatNumber{${1:arg1}}"
-    },
-    "EatNumberA()": {
-      "snippet": "EatNumberA(${1:arg1})"
-    },
-    "EmptyBoard": {},
-    "EqPiece{}{}": {
-      "snippet": "EqPiece{${1:arg1}}{${2:arg2}}"
-    },
-    "EqSquare{}{}": {
-      "snippet": "EqSquare{${1:arg1}}{${2:arg2}}"
-    },
-    "EqStr{}{}": {
-      "snippet": "EqStr{${1:arg1}}{${2:arg2}}"
-    },
-    "ExecuteCastling": {},
-    "ExecuteKingMove": {},
-    "ExecuteMoves": {},
-    "ExecutePawnMove": {},
-    "ExecutePieceMove": {},
-    "ExpectedColour": {},
-    "Explode{}": {
-      "snippet": "Explode{${1:arg1}}"
-    },
-    "ExplodeA{}{}": {
-      "snippet": "ExplodeA{${1:arg1}}{${2:arg2}}"
-    },
-    "ExtractBlackCastling{}": {
-      "snippet": "ExtractBlackCastling{${1:arg1}}"
-    },
-    "ExtractBlackCastlingA()": {
-      "snippet": "ExtractBlackCastlingA(${1:arg1})"
-    },
-    "ExtractWhiteCastling{}": {
-      "snippet": "ExtractWhiteCastling{${1:arg1}}"
-    },
-    "ExtractWhiteCastlingA()": {
-      "snippet": "ExtractWhiteCastlingA(${1:arg1})"
-    },
-    "FenBoard": {},
-    "FenConvert{}": {
-      "snippet": "FenConvert{${1:arg1}}"
-    },
-    "FF{}{}": {
-      "snippet": "FF{${1:arg1}}{${2:arg2}}"
-    },
-    "File{}": {
-      "snippet": "File{${1:arg1}}"
-    },
-    "FileDiscriminator": {},
-    "FileNames": {},
-    "FileOf()": {
-      "snippet": "FileOf(${1:arg})"
-    },
-    "FilterShowOnly{}": {
-      "snippet": "FilterShowOnly{${1:arg1}}"
-    },
-    "FindPieceSquares{}{}": {
-      "snippet": "FindPieceSquares{${1:arg1}}{${2:arg2}}"
-    },
-    "FirstChar()": {
-      "snippet": "FirstChar(${1:arg1})"
-    },
-    "FirstRank{}": {
-      "snippet": "FirstRank{${1:arg1}}"
-    },
-    "ForwardDirection{}": {
-      "snippet": "ForwardDirection{${1:arg1}}"
-    },
-    "FromRank": {},
-    "Get{}": {
-      "snippet": "Get{${1:arg1}}"
-    },
-    "GetBool{}": {
-      "snippet": "GetBool{${1:arg1}}"
-    },
-    "GetNeighbour{}{}": {
-      "snippet": "GetNeighbour{${1:arg1}}{${2:arg2}}"
-    },
-    "Glue{}{}": {
-      "snippet": "Glue{${1:arg1}}{${2:arg2}}"
-    },
-    "HandleMove()": {
-      "snippet": "HandleMove(${1:arg1})"
-    },
-    "InitBoard()": {
-      "snippet": "InitBoard(${1:arg1})"
-    },
-    "InitialRank": {},
-    "InitRank{}{}{}{}{}{}{}{}{}": {
-      "snippet": "InitRank{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}{${6:arg6}}{${7:arg7}}{${8:arg8}}{${9:arg9}}"
-    },
-    "IsBishopQueen{}{}": {
-      "snippet": "IsBishopQueen{${1:arg1}}{${2:arg2}}"
-    },
-    "IsCapture{}": {
-      "snippet": "IsCapture{${1:arg1}}"
-    },
-    "IsDash{}": {
-      "snippet": "IsDash{${1:arg1}}"
-    },
-    "IsFile{}": {
-      "snippet": "IsFile{${1:arg1}}"
-    },
-    "IsNil{}": {
-      "snippet": "IsNil{${1:arg1}}"
-    },
-    "IsO{}": {
-      "snippet": "IsO{${1:arg1}}"
-    },
-    "IsPieceName{}": {
-      "snippet": "IsPieceName{${1:arg1}}"
-    },
-    "IsPromotion{}": {
-      "snippet": "IsPromotion{${1:arg1}}"
-    },
-    "IsRank{}": {
-      "snippet": "IsRank{${1:arg1}}"
-    },
-    "IsRightPiece{}{}": {
-      "snippet": "IsRightPiece{${1:arg1}}{${2:arg2}}"
-    },
-    "IsRookQueen{}{}": {
-      "snippet": "IsRookQueen{${1:arg1}}{${2:arg2}}"
-    },
-    "KingSquare{}": {
-      "snippet": "KingSquare{${1:arg1}}"
-    },
-    "KnightSquares{}": {
-      "snippet": "KnightSquares{${1:arg1}}"
-    },
-    "LambdaAnd": {},
-    "LastCharWasCastle": {},
-    "LastMoveString": {},
-    "leavestylec": {},
-    "LeftDirection{}": {
-      "snippet": "LeftDirection{${1:arg1}}"
-    },
-    "LegalMove{}": {
-      "snippet": "LegalMove{${1:arg1}}"
-    },
-    "LongCastling": {},
-    "LookFor{}{}{}": {
-      "snippet": "LookFor{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "LookForA{}{}{}": {
-      "snippet": "LookForA{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "LookForMove()": {
-      "snippet": "LookForMove(${1:arg1})"
-    },
-    "Mainline()": {
-      "snippet": "Mainline(${1:arg1})"
-    },
-    "MakeMove{}": {
-      "snippet": "MakeMove{${1:arg1}}"
-    },
-    "MakeMoveMainline{}": {
-      "snippet": "MakeMoveMainline{${1:arg1}}"
-    },
-    "MateTest": {},
-    "Member{}{}{}": {
-      "snippet": "Member{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "MemberA{}{}{}{}": {
-      "snippet": "MemberA{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "MoveFrom": {},
-    "movehyphen": {},
-    "MoveRest": {},
-    "MoveTo": {},
-    "MoveToFile": {},
-    "MoveToRank": {},
-    "movewhite": {},
-    "MyEqual{}{}": {
-      "snippet": "MyEqual{${1:arg1}}{${2:arg2}}"
-    },
-    "MyEqualB{}{}{}{}": {
-      "snippet": "MyEqualB{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "MyFirst()": {
-      "snippet": "MyFirst(${1:arg})"
-    },
-    "myrestore{}": {
-      "snippet": "myrestore{${1:arg}}"
-    },
-    "myrightfile{}{}": {
-      "snippet": "myrightfile{${1:arg1}}{${2:arg2}}"
-    },
-    "MySecond()": {
-      "snippet": "MySecond(${1:arg})"
-    },
-    "mystore{}": {
-      "snippet": "mystore{${1:arg}}"
-    },
-    "next": {},
-    "NoEnemiesFound": {},
-    "normalstyles": {},
-    "NotMember{}{}": {
-      "snippet": "NotMember{${1:arg1}}{${2:arg2}}"
-    },
-    "NumberNext": {},
-    "oldpiece": {},
-    "opencommands": {},
-    "pap": {},
-    "ParseCastling()": {
-      "snippet": "ParseCastling(${1:arg1})"
-    },
-    "ParseCastlingA()": {
-      "snippet": "ParseCastlingA(${1:arg1})"
-    },
-    "ParseCoordinates()": {
-      "snippet": "ParseCoordinates(${1:arg1})"
-    },
-    "ParseFenRank{}": {
-      "snippet": "ParseFenRank{${1:arg1}}"
-    },
-    "ParseFenRankA()": {
-      "snippet": "ParseFenRankA(${1:arg1})"
-    },
-    "ParseMove{}": {
-      "snippet": "ParseMove{${1:arg1}}"
-    },
-    "ParseMoveA()": {
-      "snippet": "ParseMoveA(${1:arg1})"
-    },
-    "ParseMoveInit": {},
-    "PawnFrom": {},
-    "PieceNames": {},
-    "PieceNameToMove": {},
-    "PieceNameToPiece{}{}": {
-      "snippet": "PieceNameToPiece{${1:arg1}}{${2:arg2}}"
-    },
-    "PieceToFen{}": {
-      "snippet": "PieceToFen{${1:arg1}}"
-    },
-    "PieceToMove": {},
-    "PrintCastling": {},
-    "printfileangle{}{}": {
-      "snippet": "printfileangle{${1:arg1}}{${2:arg2}}"
-    },
-    "printmove": {},
-    "PrintMoves": {},
-    "printrankangle{}{}": {
-      "snippet": "printrankangle{${1:arg1}}{${2:arg2}}"
-    },
-    "Promotion": {},
-    "PromotionPieceName": {},
-    "Rank{}": {
-      "snippet": "Rank{${1:arg1}}"
-    },
-    "RankDiscriminator": {},
-    "ranklift": {},
-    "RankNames": {},
-    "RankOf()": {
-      "snippet": "RankOf(${1:arg})"
-    },
-    "RemoveLongCastling": {},
-    "RemoveShortCastling": {},
-    "RestChars()": {
-      "snippet": "RestChars(${1:arg1})"
-    },
-    "RightDirection{}": {
-      "snippet": "RightDirection{${1:arg1}}"
-    },
-    "RightFile()": {
-      "snippet": "RightFile(${1:arg1})"
-    },
-    "RightRank()": {
-      "snippet": "RightRank(${1:arg1})"
-    },
-    "runmoves{}": {
-      "snippet": "runmoves{${1:arg1}}"
-    },
-    "ScanDirections{}{}{}": {
-      "snippet": "ScanDirections{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "Set{}{}": {
-      "snippet": "Set{${1:arg1}}{${2:arg2}}"
-    },
-    "SetCheckKing{}{}": {
-      "snippet": "SetCheckKing{${1:arg1}}{${2:arg2}}"
-    },
-    "SetDownLeftNeighbour{}{}{}": {
-      "snippet": "SetDownLeftNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "SetDownNeighbour{}{}{}": {
-      "snippet": "SetDownNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "SetDownRightNeighbour{}{}{}": {
-      "snippet": "SetDownRightNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "SetKingSquare{}{}": {
-      "snippet": "SetKingSquare{${1:arg1}}{${2:arg2}}"
-    },
-    "SetKnightSquares{}{}": {
-      "snippet": "SetKnightSquares{${1:arg1}}{${2:arg2}}"
-    },
-    "SetLeftNeighbour{}{}{}": {
-      "snippet": "SetLeftNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "SetNeighbour{}{}{}": {
-      "snippet": "SetNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "SetRank{}{}": {
-      "snippet": "SetRank{${1:arg1}}{${2:arg2}}"
-    },
-    "SetRightNeighbour{}{}{}": {
-      "snippet": "SetRightNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "setupboard{}{}": {
-      "snippet": "setupboard{${1:arg1}}{${2:arg2}}"
-    },
-    "SetUpLeftNeighbour{}{}{}": {
-      "snippet": "SetUpLeftNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "SetUpNeighbour{}{}{}": {
-      "snippet": "SetUpNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "SetUpRightNeighbour{}{}{}": {
-      "snippet": "SetUpRightNeighbour{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "Showchar{}": {
-      "snippet": "Showchar{${1:arg1}}"
-    },
-    "Showfile{}": {
-      "snippet": "Showfile{${1:arg1}}"
-    },
-    "Showfiles": {},
-    "ShowMover": {},
-    "ShowMoverBlackInverse": {},
-    "ShowMoverBlackNormal": {},
-    "ShowMoverWhiteInverse": {},
-    "ShowMoverWhiteNormal": {},
-    "ShowOnlyList": {},
-    "ShowParseInfo": {},
-    "Showrank{}": {
-      "snippet": "Showrank{${1:arg1}}"
-    },
-    "ShowrankInverse{}": {
-      "snippet": "ShowrankInverse{${1:arg1}}"
-    },
-    "ShowrankInverseWithNumber{}": {
-      "snippet": "ShowrankInverseWithNumber{${1:arg1}}"
-    },
-    "ShowrankNumber{}": {
-      "snippet": "ShowrankNumber{${1:arg1}}"
-    },
-    "ShowrankWithNumber{}": {
-      "snippet": "ShowrankWithNumber{${1:arg1}}"
-    },
-    "showskaklanguage": {},
-    "Sideeffect{}{}{}": {
-      "snippet": "Sideeffect{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "skakstore": {},
-    "squarelength": {},
-    "StoreBool{}{}": {
-      "snippet": "StoreBool{${1:arg1}}{${2:arg2}}"
-    },
-    "StoreLastMove": {},
-    "StringToTokens{}": {
-      "snippet": "StringToTokens{${1:arg1}}"
-    },
-    "StripMove()": {
-      "snippet": "StripMove(${1:arg1})"
-    },
-    "StrToTokens()": {
-      "snippet": "StrToTokens(${1:arg1})"
-    },
-    "tempCastling": {},
-    "TeXifx{}{}{}": {
-      "snippet": "TeXifx{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "thefileFrom": {},
-    "thefileTo": {},
-    "thehalfmove": {},
-    "thehelpgobble": {},
-    "thehelpnumber": {},
-    "thehelpnumberMove": {},
-    "themove": {},
-    "therankFrom": {},
-    "therankTo": {},
-    "tmpCastling": {},
-    "ToggleWhiteSquare": {},
-    "trimhelp": {},
-    "TrimMoveList{}": {
-      "snippet": "TrimMoveList{${1:arg1}}"
-    },
-    "TypeSetAfterBlack": {},
-    "TypeSetAfterWhite": {},
-    "TypeSetColour": {},
-    "TypeSetNumberNext": {},
-    "UndoMove{}": {
-      "snippet": "UndoMove{${1:arg1}}"
-    },
-    "UniqueMove": {},
-    "UpdateCastling": {},
-    "WhiteCastling": {},
-    "WhiteKingSquare": {},
-    "whiteopen": {},
-    "WhiteSquare": {},
-    "WhiteSquarePiece": {},
-    "WhiteToMove{}{}": {
-      "snippet": "WhiteToMove{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "tiny",
-    "small",
-    "normal",
-    "large",
-    "notation",
-    "mover",
-    "moveroff",
-    "notationoff",
-    "ps",
-    "psoff",
-    "english",
-    "styleA",
-    "styleB",
-    "styleC"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/skillicons.json b/dev/packages/skillicons.json
deleted file mode 100644
index 0592a71b7..000000000
--- a/dev/packages/skillicons.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "includes": {
-    "graphicx": []
-  },
-  "macros": {
-    "photosymbol{}": {
-      "snippet": "photosymbol{${1:icon name}}"
-    },
-    "photosymbol[]{}": {
-      "snippet": "photosymbol[${2:size}]{${1:icon name}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/skmath.json b/dev/packages/skmath.json
index 0b5b73915..e2efacd14 100644
--- a/dev/packages/skmath.json
+++ b/dev/packages/skmath.json
@@ -54,13 +54,13 @@
       "snippet": "d{${1:var}}"
     },
     "pd{}{}": {
-      "snippet": "pd{${1:func}}{${2:var1,${3:var2},...}}"
+      "snippet": "pd{${1:func}}{${2:var1,var2,...}}"
     },
     "pd*{}{}": {
-      "snippet": "pd*{${1:func}}{${2:var1,${3:var2},...}}"
+      "snippet": "pd*{${1:func}}{${2:var1,var2,...}}"
     },
     "td{}{}": {
-      "snippet": "td{${1:func}}{${2:var1,${3:var2},...}}"
+      "snippet": "td{${1:func}}{${2:var1,var2,...}}"
     },
     "E{}": {
       "snippet": "E{${1:expr}}"
diff --git a/dev/packages/snotez.json b/dev/packages/snotez.json
index 79bc47b37..1fceba81b 100644
--- a/dev/packages/snotez.json
+++ b/dev/packages/snotez.json
@@ -12,12 +12,6 @@
     "sidenote[]{}": {
       "snippet": "sidenote[${2:mark}]{${1:text}}"
     },
-    "sidenote(){}": {
-      "snippet": "sidenote(${2:offset}){${1:text}}"
-    },
-    "sidenote()[]{}": {
-      "snippet": "sidenote(${3:offset})[${2:mark}]{${1:text}}"
-    },
     "sidenote[][]{}": {
       "snippet": "sidenote[${2:offset}][${3:mark}]{${1:text}}",
       "option": "dblarg=true"
diff --git a/dev/packages/sparklines.json b/dev/packages/sparklines.json
deleted file mode 100644
index 47fd7b099..000000000
--- a/dev/packages/sparklines.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "includes": {
-    "pgf": []
-  },
-  "macros": {
-    "sparkbottomline": {},
-    "sparkbottomline[]": {
-      "snippet": "sparkbottomline[${1:length}]"
-    },
-    "sparklinethickness": {},
-    "sparkdotwidth": {},
-    "sparkspikewidth": {},
-    "sparkbottomlinethickness": {},
-    "sparklineclipsep": {},
-    "sparklineheight": {}
-  },
-  "envs": {
-    "sparkline{}": {
-      "name": "sparkline",
-      "snippet": "{${1:width}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/spbmark.json b/dev/packages/spbmark.json
index 54bb1e301..afa17a1f6 100644
--- a/dev/packages/spbmark.json
+++ b/dev/packages/spbmark.json
@@ -1,5 +1,7 @@
 {
-  "includes": {},
+  "includes": {
+    "l3keys2e": []
+  },
   "macros": {
     "super{}": {
       "snippet": "super{${1:content}}"
@@ -181,12 +183,9 @@
   "options": [
     "text",
     "math",
-    "math*",
     "foot",
     "both",
-    "all",
-    "spcore=",
-    "sbcore="
+    "all"
   ],
   "keyvals": [
     [
diff --git a/dev/packages/spectralsequences.json b/dev/packages/spectralsequences.json
index e0e0c5d85..0af7b7c13 100644
--- a/dev/packages/spectralsequences.json
+++ b/dev/packages/spectralsequences.json
@@ -22,22 +22,6 @@
     "printpage[]": {
       "snippet": "printpage[${1:options}]"
     },
-    "class()": {
-      "snippet": "class(${1:x},${2:y})"
-    },
-    "class[]()": {
-      "snippet": "class[${1:options}](${2:x},${3:y})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "replaceclass()": {
-      "snippet": "replaceclass(${1:x},${2:y},${3:n})"
-    },
-    "replaceclass[]()": {
-      "snippet": "replaceclass[${1:options}](${2:x},${3:y},${4:n})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "replacesource": {},
     "replacesource[]": {
       "snippet": "replacesource[${1:options}]"
@@ -47,82 +31,39 @@
       "snippet": "replacetarget[${1:options}]"
     },
     "replacestructlines": {},
-    "replacestructlines()": {
-      "snippet": "replacestructlines(${1:source coord})"
-    },
-    "classoptions[]()": {
-      "snippet": "classoptions[${1:options}](${2:class name})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "classoptions[]": {
       "snippet": "classoptions[${1:options}]",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "structline": {},
     "structline[]": {
       "snippet": "structline[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "structline()()": {
-      "snippet": "structline(${1:source coord})(${2:target coord})"
-    },
-    "structline[]()()": {
-      "snippet": "structline[${1:options}](${2:source coord})(${3:target coord})",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "structlineoptions[]": {
       "snippet": "structlineoptions[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "structlineoptions[]()()": {
-      "snippet": "structlineoptions[${1:options}](${2:source coord})(${3:target coord})",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "extension": {},
     "extension[]": {
       "snippet": "extension[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "extension()()": {
-      "snippet": "extension(${1:source coord})(${2:target coord})"
-    },
-    "extension[]()()": {
-      "snippet": "extension[${1:options}](${2:source coord})(${3:target coord})",
-      "keyvalindex": 3,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "extensionoptions[]": {
       "snippet": "extensionoptions[${1:options}]"
     },
-    "extensionoptions[]()()": {
-      "snippet": "extensionoptions[${1:options}](${2:source coord})(${3:target coord})"
-    },
-    "circleclasses()()": {
-      "snippet": "circleclasses(${1:source coord})(${2:target coord})"
-    },
-    "circleclasses[]()()": {
-      "snippet": "circleclasses[${1:options}](${2:source coord})(${3:target coord})",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
     "xcoord": {},
     "ycoord": {},
-    "isalive()": {
-      "snippet": "isalive(${1:coord})"
-    },
     "isalive{}": {
       "snippet": "isalive{${1:(${2:coord1})...(${3:coordN})}}"
     },
     "sseqset{}": {
       "snippet": "sseqset{${1:options}}",
-      "keyvalindex": 5,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "Do{}{}": {
@@ -171,96 +112,6 @@
     "SseqIfEmptyF{}{}": {
       "snippet": "SseqIfEmptyF{${1:expression}}{${2:false}}"
     },
-    "IfExistsTF{}(){}{}": {
-      "snippet": "IfExistsTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
-    },
-    "IfExistsT{}(){}": {
-      "snippet": "IfExistsT{${1:page}}(${3:coord}){${2:true}}"
-    },
-    "IfExistsF{}(){}": {
-      "snippet": "IfExistsF{${1:page}}(${3:coord}){${2:false}}"
-    },
-    "IfAliveTF{}(){}{}": {
-      "snippet": "IfAliveTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
-    },
-    "IfAliveT{}(){}": {
-      "snippet": "IfAliveT{${1:page}}(${3:coord}){${2:true}}"
-    },
-    "IfAliveF{}(){}": {
-      "snippet": "IfAliveF{${1:page}}(${3:coord}){${2:false}}"
-    },
-    "IfOutOfBoundsTF(){}{}": {
-      "snippet": "IfOutOfBoundsTF(${3:coord}){${1:true}}{${2:false}}"
-    },
-    "IfOutOfBoundsT(){}": {
-      "snippet": "IfOutOfBoundsT(${2:coord}){${1:true}}"
-    },
-    "IfOutOfBoundsF(){}": {
-      "snippet": "IfOutOfBoundsF(${2:coord}){${1:false}}"
-    },
-    "IfInBoundsTF(){}{}": {
-      "snippet": "IfInBoundsTF(${3:coord}){${1:true}}{${2:false}}"
-    },
-    "IfInBoundsT(){}": {
-      "snippet": "IfInBoundsT(${2:coord}){${1:true}}"
-    },
-    "IfInBoundsF(){}": {
-      "snippet": "IfInBoundsF(${2:coord}){${1:false}}"
-    },
-    "IfValidDifferentialTF{}(){}{}": {
-      "snippet": "IfValidDifferentialTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
-    },
-    "IfValidDifferentialTF{}()(){}{}": {
-      "snippet": "IfValidDifferentialTF{${1:page}}(${4:coord})(${5:target coord}){${2:true}}{${3:false}}"
-    },
-    "IfValidDifferentialT{}(){}": {
-      "snippet": "IfValidDifferentialT{${1:page}}(${3:coord}){${2:true}}"
-    },
-    "IfValidDifferentialT{}()(){}": {
-      "snippet": "IfValidDifferentialT{${1:page}}(${3:coord})(${4:target coord}){${2:true}}"
-    },
-    "IfValidDifferentialF{}(){}": {
-      "snippet": "IfValidDifferentialF{${1:page}}(${3:coord}){${2:false}}"
-    },
-    "IfValidDifferentialF{}()(){}": {
-      "snippet": "IfValidDifferentialF{${1:page}}(${3:coord})(${4:target coord}){${2:false}}"
-    },
-    "DrawIfValidDifferentialTF{}(){}{}": {
-      "snippet": "DrawIfValidDifferentialTF{${1:page}}(${4:coord}){${2:true}}{${3:false}}"
-    },
-    "DrawIfValidDifferentialTF{}()(){}{}": {
-      "snippet": "DrawIfValidDifferentialTF{${1:page}}(${4:coord})(${5:target coord}){${2:true}}{${3:false}}"
-    },
-    "DrawIfValidDifferentialTF[]{}()(){}{}": {
-      "snippet": "DrawIfValidDifferentialTF[${4:options}]{${1:page}}(${5:coord})(${6:target coord}){${2:true}}{${3:false}}"
-    },
-    "DrawIfValidDifferentialT{}(){}": {
-      "snippet": "DrawIfValidDifferentialT{${1:page}}(${3:coord}){${2:true}}"
-    },
-    "DrawIfValidDifferentialT{}()(){}": {
-      "snippet": "DrawIfValidDifferentialT{${1:page}}(${3:coord})(${4:target coord}){${2:true}}"
-    },
-    "DrawIfValidDifferentialT[]{}()(){}": {
-      "snippet": "DrawIfValidDifferentialT[${3:options}]{${1:page}}(${4:coord})(${5:target coord}){${2:true}}"
-    },
-    "DrawIfValidDifferentialF{}(){}": {
-      "snippet": "DrawIfValidDifferentialF{${1:page}}(${3:coord}){${2:false}}"
-    },
-    "DrawIfValidDifferentialF{}()(){}": {
-      "snippet": "DrawIfValidDifferentialF{${1:page}}(${3:coord})(${4:target coord}){${2:false}}"
-    },
-    "DrawIfValidDifferentialF[]{}()(){}": {
-      "snippet": "DrawIfValidDifferentialF[${3:options}]{${1:page}}(${4:coord})(${5:target coord}){${2:false}}"
-    },
-    "DrawIfValidDifferential{}(){}": {
-      "snippet": "DrawIfValidDifferential{${1:page}}(${3:coord}){${2:true}}"
-    },
-    "DrawIfValidDifferential{}()(){}": {
-      "snippet": "DrawIfValidDifferential{${1:page}}(${3:coord})(${4:target coord}){${2:true}}"
-    },
-    "DrawIfValidDifferential[]{}()(){}": {
-      "snippet": "DrawIfValidDifferential[${3:options}]{${1:page}}(${4:coord})(${5:target coord}){${2:true}}"
-    },
     "SseqNormalizeMonomial{}": {
       "snippet": "SseqNormalizeMonomial{${1:monomial}}"
     },
@@ -269,30 +120,6 @@
       "snippet": "SseqNormalizeMonomialSetVariables{${1:monomial}}"
     },
     "SseqAHSSNameHandler": {},
-    "parsecoordinate{}()": {
-      "snippet": "parsecoordinate{${1:macro}}(${2:coord})"
-    },
-    "getdtarget{}{}()": {
-      "snippet": "getdtarget{${1:macro}}{${2:page}}(${3:source coord})"
-    },
-    "parsedifferential{}()": {
-      "snippet": "parsedifferential{${1:page}}(${2:differential coord})"
-    },
-    "parsedifferential{}()()": {
-      "snippet": "parsedifferential{${1:page}}(${2:differential coord})(${3:differential target})"
-    },
-    "nameclass{}()": {
-      "snippet": "nameclass{${1:name}}(${2:coord})"
-    },
-    "tagclass{}()": {
-      "snippet": "tagclass{${1:tag}}(${2:coord})"
-    },
-    "gettag{}()": {
-      "snippet": "gettag{${1:macro}}(${2:coord})"
-    },
-    "pushstack()": {
-      "snippet": "pushstack(${1:coord})"
-    },
     "savestack": {},
     "restorestack": {},
     "SseqNewClassPattern{}{}": {
@@ -337,14 +164,14 @@
     "sseqdata[]": {
       "name": "sseqdata",
       "snippet": "[${1:options}]",
-      "keyvalindex": 6,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "sseqpage": {},
     "sseqpage[]": {
       "name": "sseqpage",
       "snippet": "[${1:options}]",
-      "keyvalindex": 7,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "quiet": {}
@@ -354,37 +181,6 @@
     "tooltips"
   ],
   "keyvals": [
-    [
-      "xshift=${1:integer}",
-      "yshift=${1:integer}",
-      "%color",
-      "\"${1:text}\"",
-      "\"${1:text}\" ${2:TikZ options}",
-      "\"${1:text}\"'",
-      "\"${1:text}\"' ${2:TikZ options}",
-      "pin={${1:TikZ options}}",
-      "description",
-      "circlen=${1:integer}",
-      "newellipse",
-      "ellipse ratio=${1:ratio}",
-      "isosceles triangle",
-      "rectangle",
-      "diamond",
-      "semicircle",
-      "regular polygon",
-      "regular polygon sides=${1:integer}",
-      "minimum width=",
-      "minimum height=",
-      "minimum size=",
-      "inner sep=",
-      "outer sep=",
-      "name=${1:node name}",
-      "show name={${1:label options}}",
-      "tag=${1:tag}",
-      "insert=${1:integer}",
-      "offset={(${1:x,y})}",
-      "tooltip=${1:text}"
-    ],
     [
       "xshift=${1:integer}",
       "yshift=${1:integer}",
@@ -473,19 +269,6 @@
       "in=${1:anchor}",
       "out=${1:anchor}"
     ],
-    [
-      "fit=${1:coords or nodes}",
-      "rounded rectangle",
-      "ellipse ratio=${1:ratio}",
-      "class style",
-      "permanent cycle style",
-      "transient cycle style",
-      "this page class style",
-      "differential style",
-      "struct line style",
-      "page=${1:page}",
-      "page=${1:page}--${2:page max}"
-    ],
     [
       "sseqs={${1:keys}}",
       "change sseqs={${1:keys}}",
diff --git a/dev/packages/spelatex.json b/dev/packages/spelatex.json
deleted file mode 100644
index e22d740d9..000000000
--- a/dev/packages/spelatex.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "includes": {
-    "hyperref": [],
-    "xcolor": [],
-    "ifthen": [],
-    "fancyvrb": [],
-    "newfile": [],
-    "rotating": [],
-    "babel": [],
-    "kvoptions": [],
-    "xkeyval": [],
-    "marginnote": []
-  },
-  "macros": {
-    "setenum{}": {
-      "snippet": "setenum{${1:arg}}",
-      "option": "extramath=true"
-    },
-    "setdesc{}": {
-      "snippet": "setdesc{${1:arg}}",
-      "option": "extramath=true"
-    },
-    "spelitem{}": {
-      "snippet": "spelitem{${1:text}}"
-    },
-    "spelitem[]{}": {
-      "snippet": "spelitem[${2:label}]{${1:text}}"
-    },
-    "spelmacpp{}{}": {
-      "snippet": "spelmacpp{${1:csname}}{${2:action}}"
-    },
-    "spelmacpp{}[]{}": {
-      "snippet": "spelmacpp{${1:csname}}[${2:args}]{${3:action}}"
-    },
-    "spelmacpp{}[][]{}": {
-      "snippet": "spelmacpp{${1:csname}}[${2:args}][${3:default}]{${4:action}}"
-    },
-    "spelenvpp{}{}": {
-      "snippet": "spelenvpp{${1:envname}}{${2:action}}"
-    },
-    "spelenvpp{}[]{}": {
-      "snippet": "spelenvpp{${1:envname}}[${2:args}]{${3:action}}"
-    },
-    "spelenvpp{}[][]{}": {
-      "snippet": "spelenvpp{${1:envname}}[${2:args}][${3:default}]{${4:action}}"
-    },
-    "spelmacad{}{}": {
-      "snippet": "spelmacad{${1:csname}}{${2:text}}"
-    },
-    "spelmacad{}[]{}": {
-      "snippet": "spelmacad{${1:csname}}[${2:args}]{${3:text}}"
-    },
-    "spelmacad{}[][]{}": {
-      "snippet": "spelmacad{${1:csname}}[${2:args}][${3:default}]{${4:text}}"
-    },
-    "spelenvad{}{}{}": {
-      "snippet": "spelenvad{${1:envname}}{${2:begin text}}{${3:end text}}"
-    },
-    "spelenvad{}[]{}{}": {
-      "snippet": "spelenvad{${1:envname}}[${2:args}]{${3:begin text}}{${4:end text}}"
-    },
-    "spelenvad{}[][]{}{}": {
-      "snippet": "spelenvad{${1:envname}}[${2:args}][${3:default}]{${4:begin text}}{${5:end text}}"
-    },
-    "spelatex": {},
-    "spelbox": {},
-    "spelpl": {},
-    "audiodir": {},
-    "chunkdir": {}
-  },
-  "envs": {
-    "spelchunk": {},
-    "spelchunk[]": {
-      "name": "spelchunk",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "spelchunkad": {}
-  },
-  "options": [
-    "format=${1:type}",
-    "disabled",
-    "extramath"
-  ],
-  "keyvals": [
-    [
-      "arealink"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/spot.json b/dev/packages/spot.json
index 42ff04626..1113146d8 100644
--- a/dev/packages/spot.json
+++ b/dev/packages/spot.json
@@ -12,48 +12,24 @@
     "spot[]{}": {
       "snippet": "spot[${2:node options}]{${1:text}}"
     },
-    "spot(){}": {
-      "snippet": "spot(${2:node name}){${1:text}}"
-    },
-    "spot()[]{}": {
-      "snippet": "spot(${3:node name})[${2:node options}]{${1:text}}"
-    },
     "spot<>{}": {
       "snippet": "spot<${2:overlay spec}>{${1:text}}"
     },
     "spot<>[]{}": {
       "snippet": "spot<${3:overlay spec}>[${2:node options}]{${1:text}}"
     },
-    "spot<>(){}": {
-      "snippet": "spot<${2:overlay spec}>(${3:node name}){${1:text}}"
-    },
-    "spot<>()[]{}": {
-      "snippet": "spot<${3:overlay spec}>(${4:node name})[${2:node options}]{${1:text}}"
-    },
     "spot*{}": {
       "snippet": "spot*{${1:text}}"
     },
     "spot*[]{}": {
       "snippet": "spot*[${2:node options}]{${1:text}}"
     },
-    "spot*(){}": {
-      "snippet": "spot*(${2:node name}){${1:text}}"
-    },
-    "spot*()[]{}": {
-      "snippet": "spot*(${3:node name})[${2:node options}]{${1:text}}"
-    },
     "spot*<>{}": {
       "snippet": "spot*<${2:overlay spec}>{${1:text}}"
     },
     "spot*<>[]{}": {
       "snippet": "spot*<${3:overlay spec}>[${2:node options}]{${1:text}}"
     },
-    "spot*<>(){}": {
-      "snippet": "spot*<${2:overlay spec}>(${3:node name}){${1:text}}"
-    },
-    "spot*<>()[]{}": {
-      "snippet": "spot*<${3:overlay spec}>(${4:node name})[${2:node options}]{${1:text}}"
-    },
     "setspotlightcolor{}": {
       "snippet": "setspotlightcolor{${1:color}}"
     },
diff --git a/dev/packages/spotcolor.json b/dev/packages/spotcolor.json
deleted file mode 100644
index 773299175..000000000
--- a/dev/packages/spotcolor.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "includes": {
-    "graphics": []
-  },
-  "macros": {
-    "NewSpotColorSpace{}": {
-      "snippet": "NewSpotColorSpace{${1:name}}"
-    },
-    "AddSpotColor{}{}{}{}": {
-      "snippet": "AddSpotColor{${1:colorspace}}{${2:color}}{${3:pdf name}}{${4:specification}}"
-    },
-    "SpotSpace": {},
-    "SetPageColorSpace{}": {
-      "snippet": "SetPageColorSpace{${1:colorspace}}"
-    },
-    "SpotColor{}{}": {
-      "snippet": "SpotColor{${1:color}}{${2:number}}"
-    },
-    "SetPageColorResource{}": {
-      "snippet": "SetPageColorResource{${1:resource}}"
-    },
-    "thecolorprofile": {},
-    "thecolor": {},
-    "act": {},
-    "csgrab{}{}": {
-      "snippet": "csgrab{${1:arg1}}{${2:arg2}}"
-    },
-    "obj": {},
-    "tempcs": {},
-    "ifhks": {},
-    "hkstrue": {},
-    "hksfalse": {},
-    "ifpantone": {},
-    "pantonetrue": {},
-    "pantonefalse": {}
-  },
-  "envs": {},
-  "options": [
-    "hks",
-    "pantone"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/spreadtab.json b/dev/packages/spreadtab.json
index 520206490..e75dba030 100644
--- a/dev/packages/spreadtab.json
+++ b/dev/packages/spreadtab.json
@@ -37,12 +37,6 @@
     "cmidrule{}": {
       "snippet": "cmidrule{${1:a-b}}"
     },
-    "cmidrule(){}": {
-      "snippet": "cmidrule(${2:trim}){${1:a-b}}"
-    },
-    "cmidrule[](){}": {
-      "snippet": "cmidrule[${2:line width}](${3:trim}){${1:a-b}}"
-    },
     "morecmidrules": {},
     "specialrule{}{}{}": {
       "snippet": "specialrule{${1:line width}}{${2:above space}}{${3:below space}}"
diff --git a/dev/packages/sseq.json b/dev/packages/sseq.json
deleted file mode 100644
index fd2180414..000000000
--- a/dev/packages/sseq.json
+++ /dev/null
@@ -1,410 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "calc": [],
-    "pifont": [],
-    "pgf": [],
-    "xkeyval": []
-  },
-  "macros": {
-    "sseqpacking": {},
-    "sspacksmart": {},
-    "sspackhorizontal": {},
-    "sspackvertical": {},
-    "sspackdiagonal": {},
-    "ssmoveto{}{}": {
-      "snippet": "ssmoveto{${1:x}}{${2:y}}"
-    },
-    "ssmove{}{}": {
-      "snippet": "ssmove{${1:x}}{${2:y}}"
-    },
-    "ssdrop{}": {
-      "snippet": "ssdrop{${1:math}}"
-    },
-    "ssdrop[]{}": {
-      "snippet": "ssdrop[${2:options}]{${1:math}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ssname{}": {
-      "snippet": "ssname{${1:name}}"
-    },
-    "ssgoto{}": {
-      "snippet": "ssgoto{${1:name}}"
-    },
-    "ssprefix{}": {
-      "snippet": "ssprefix{${1:prefix}}"
-    },
-    "ssresetprefix": {},
-    "ssabsgoto{}": {
-      "snippet": "ssabsgoto{${1:name}}"
-    },
-    "ssdroplabel{}": {
-      "snippet": "ssdroplabel{${1:label}}"
-    },
-    "ssdroplabel[]{}": {
-      "snippet": "ssdroplabel[${2:options}]{${1:label}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "ssdropextension": {},
-    "ssstroke": {},
-    "ssstroke[]": {
-      "snippet": "ssstroke[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "ssarrowhead": {},
-    "ssarrowhead[]": {
-      "snippet": "ssarrowhead[${1:arrow style}]"
-    },
-    "ssinversearrowhead": {},
-    "ssinversearrowhead[]": {
-      "snippet": "ssinversearrowhead[${1:arrow style}]"
-    },
-    "ssline{}{}": {
-      "snippet": "ssline{${1:x}}{${2:y}}"
-    },
-    "ssline[]{}{}": {
-      "snippet": "ssline[${3:options}]{${1:x}}{${2:y}}"
-    },
-    "ssarrow{}{}": {
-      "snippet": "ssarrow{${1:x}}{${2:y}}"
-    },
-    "ssarrow[]{}{}": {
-      "snippet": "ssarrow[${3:options}]{${1:x}}{${2:y}}"
-    },
-    "ssbullstring{}{}{}": {
-      "snippet": "ssbullstring{${1:x}}{${2:y}}{${3:n}}"
-    },
-    "ssinfbullstring{}{}{}": {
-      "snippet": "ssinfbullstring{${1:x}}{${2:y}}{${3:n}}"
-    },
-    "ssdropbull": {},
-    "ssdropboxed{}": {
-      "snippet": "ssdropboxed{${1:math}}"
-    },
-    "ssdropcircled{}": {
-      "snippet": "ssdropcircled{${1:math}}"
-    },
-    "sscurve{}": {
-      "snippet": "sscurve{${1:value}}"
-    },
-    "ssdashedstroke": {},
-    "ssdashedcurve{}": {
-      "snippet": "ssdashedcurve{${1:value}}"
-    },
-    "ssdottedstroke": {},
-    "ssdottedcurve{}": {
-      "snippet": "ssdottedcurve{${1:value}}"
-    },
-    "sscurvedline{}{}{}": {
-      "snippet": "sscurvedline{${1:value}}{${2:x}}{${3:y}}"
-    },
-    "ssdashedline{}{}": {
-      "snippet": "ssdashedline{${1:x}}{${2:y}}"
-    },
-    "sscurveddashedline{}{}{}": {
-      "snippet": "sscurveddashedline{${1:value}}{${2:x}}{${3:y}}"
-    },
-    "sscurvedarrow{}{}{}": {
-      "snippet": "sscurvedarrow{${1:value}}{${2:x}}{${3:y}}"
-    },
-    "ssdashedarrow{}{}": {
-      "snippet": "ssdashedarrow{${1:x}}{${2:y}}"
-    },
-    "sscurveddashedarrow{}{}{}": {
-      "snippet": "sscurveddashedarrow{${1:value}}{${2:x}}{${3:y}}"
-    },
-    "ssvoidline{}{}": {
-      "snippet": "ssvoidline{${1:x}}{${2:y}}"
-    },
-    "ssvoidarrow{}{}": {
-      "snippet": "ssvoidarrow{${1:x}}{${2:y}}"
-    },
-    "ssinversevoidarrow{}{}": {
-      "snippet": "ssinversevoidarrow{${1:x}}{${2:y}}"
-    },
-    "ssplaceboxed{}{}{}": {
-      "snippet": "ssplaceboxed{${1:arg1}}{${2:arg2}}{${3:math}}"
-    },
-    "ssplacecircled{}{}{}": {
-      "snippet": "ssplacecircled{${1:arg1}}{${2:arg2}}{${3:math}}"
-    },
-    "ssplace{}{}{}": {
-      "snippet": "ssplace{${1:arg1}}{${2:arg2}}{${3:math}}"
-    },
-    "currprefix": {},
-    "dropvarname{}{}": {
-      "snippet": "dropvarname{${1:arg1}}{${2:arg2}}"
-    },
-    "extractcoords": {},
-    "ifcurroutofrange": {},
-    "ifoutofrange": {},
-    "outofrangetrue": {},
-    "outofrangefalse": {},
-    "ifnodrop{}{}": {
-      "snippet": "ifnodrop{${1:arg1}}{${2:arg2}}"
-    },
-    "ifuniquedrop{}{}": {
-      "snippet": "ifuniquedrop{${1:arg1}}{${2:arg2}}"
-    },
-    "ntimes{}{}": {
-      "snippet": "ntimes{${1:arg1}}{${2:arg2}}"
-    },
-    "putxyq{}": {
-      "snippet": "putxyq{${1:code}}"
-    },
-    "putxy{}": {
-      "snippet": "putxy{${1:code}}"
-    },
-    "setcnt": {},
-    "ssassertsource": {},
-    "ssconncolor": {},
-    "ssdroperrormsg{}{}": {
-      "snippet": "ssdroperrormsg{${1:arg1}}{${2:arg2}}"
-    },
-    "sseqbullcnt": {},
-    "sseqconcludeconnection": {},
-    "sseqconncommand": {},
-    "sseqgridstyle": {},
-    "sseqpack{}{}": {
-      "snippet": "sseqpack{${1:arg1}}{${2:arg2}}"
-    },
-    "sseqrearrange{}{}{}{}{}": {
-      "snippet": "sseqrearrange{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
-    },
-    "sseqsavecnti": {},
-    "sseqsavecntii": {},
-    "sseqsavecntiii": {},
-    "sseqsavecntiv": {},
-    "sseqsavecntix": {},
-    "sseqsavecnto": {},
-    "sseqsavecntv": {},
-    "sseqsavecntvi": {},
-    "sseqsavecntvii": {},
-    "sseqsavecntviii": {},
-    "sseqstacking{}{}{}": {
-      "snippet": "sseqstacking{${1:x}}{${2:y}}{${3:n}}"
-    },
-    "sseqwritecolor{}": {
-      "snippet": "sseqwritecolor{${1:color}}"
-    },
-    "sseqxlabel": {},
-    "sseqylabel": {},
-    "ssfinishpos": {},
-    "ssglobalname{}": {
-      "snippet": "ssglobalname{${1:name}}"
-    },
-    "ssgridchess{}{}": {
-      "snippet": "ssgridchess{${1:arg1}}{${2:arg2}}"
-    },
-    "ssgridcrossword{}{}": {
-      "snippet": "ssgridcrossword{${1:arg1}}{${2:arg2}}"
-    },
-    "ssgriddots{}{}": {
-      "snippet": "ssgriddots{${1:arg1}}{${2:arg2}}"
-    },
-    "ssgridgo{}{}": {
-      "snippet": "ssgridgo{${1:arg1}}{${2:arg2}}"
-    },
-    "ssgridnone{}{}": {
-      "snippet": "ssgridnone{${1:arg1}}{${2:arg2}}"
-    },
-    "sslabelcolor": {},
-    "ssplacecolor": {},
-    "ssprepareline{}{}": {
-      "snippet": "ssprepareline{${1:arg1}}{${2:arg2}}"
-    },
-    "sssetglobalname{}": {
-      "snippet": "sssetglobalname{${1:name}}"
-    },
-    "act": {},
-    "for": {},
-    "lst": {},
-    "temp": {},
-    "tempcmd": {},
-    "tempoutercmd": {},
-    "temptwo": {},
-    "tmpcnt": {},
-    "tmpname": {},
-    "tmpval": {},
-    "pgfdecoratedcompleteddistance": {},
-    "pgfdecoratedremainingdistance": {},
-    "pgfdecoratedinputsegmentcompleteddistance": {},
-    "pgfdecoratedinputsegmentremainingdistance": {},
-    "pgfdecorationsegmentamplitude": {},
-    "pgfdecorationsegmentlength": {},
-    "pgfdecorationsegmentangle": {},
-    "pgfdecorationsegmentaspect": {},
-    "pgfmetadecorationsegmentamplitude": {},
-    "pgfmetadecorationsegmentlength": {},
-    "ifpgfdecoratepathhascorners": {},
-    "pgfdecoratepathhascornerstrue": {},
-    "pgfdecoratepathhascornersfalse": {},
-    "pgfdeclaredecoration{}{}{}": {
-      "snippet": "pgfdeclaredecoration{${1:name}}{${2:initial state}}{${3:states}}"
-    },
-    "state{}{}": {
-      "snippet": "state{${1:name}}{${2:code}}"
-    },
-    "state{}[]{}": {
-      "snippet": "state{${1:name}}[${2:options}]{${3:code}}",
-      "keyvalindex": 3,
-      "keyvalpos": 1
-    },
-    "pgfifdecoration{}{}{}": {
-      "snippet": "pgfifdecoration{${1:name}}{${2:if code}}{${3:else code}}"
-    },
-    "pgfdeclaremetadecoration{}{}{}": {
-      "snippet": "pgfdeclaremetadecoration{${1:name}}{${2:initial state}}{${3:states}}"
-    },
-    "pgfifmetadecoration{}{}{}": {
-      "snippet": "pgfifmetadecoration{${1:name}}{${2:if code}}{${3:else code}}"
-    },
-    "decoration{}": {
-      "snippet": "decoration{${1:name}}"
-    },
-    "beforedecoration{}": {
-      "snippet": "beforedecoration{${1:before code}}"
-    },
-    "afterdecoration{}": {
-      "snippet": "afterdecoration{${1:after code}}"
-    },
-    "pgfmetadecoratedpathlength": {},
-    "pgfmetadecoratedcompleteddistance": {},
-    "pgfmetadecoratedinputsegmentcompleteddistance": {},
-    "pgfmetadecoratedinputsegmentremainingdistance": {},
-    "pgfdecoratebeforecode": {},
-    "pgfdecorateaftercode": {},
-    "pgfdecoratepath{}{}": {
-      "snippet": "pgfdecoratepath{${1:name}}{${2:path commands}}"
-    },
-    "pgfdecoratecurrentpath{}": {
-      "snippet": "pgfdecoratecurrentpath{${1:name}}"
-    },
-    "pgfdecoration{}": {
-      "snippet": "pgfdecoration{${1:name}}"
-    },
-    "endpgfdecoration": {},
-    "pgfdecorationpath": {},
-    "pgfdecoratedpath": {},
-    "pgfdecorateexistingpath": {},
-    "pgfdecoratedpathlength": {},
-    "pgfpointdecoratedpathfirst": {},
-    "pgfpointdecoratedpathlast": {},
-    "pgfpointdecoratedinputsegmentfirst": {},
-    "pgfpointdecoratedinputsegmentlast": {},
-    "pgfsetdecorationsegmenttransformation{}": {
-      "snippet": "pgfsetdecorationsegmenttransformation{${1:code}}"
-    },
-    "pgfmetadecoratedremainingdistance": {},
-    "pgfpointmetadecoratedpathfirst": {},
-    "pgfpointmetadecoratedpathlast": {},
-    "pgfdecoratedinputsegmentlength": {},
-    "pgfdecoratedangle": {},
-    "pgfdecoratedinputsegmentstartangle": {},
-    "pgfdecoratedinputsegmentendangle": {},
-    "pgfdecorationcurrentinputsegment": {},
-    "pgfdecorationnextinputsegmentobject": {},
-    "pgfdecorationinputsegmentmoveto": {},
-    "pgfdecorationinputsegmentlineto": {},
-    "pgfdecorationinputsegmentcurveto": {},
-    "pgfdecorationinputsegmentclosepath": {},
-    "pgfdecorationinputsegmentlast": {},
-    "ifpgfdecoraterectangleclockwise": {},
-    "pgfdecoraterectangleclockwisetrue": {},
-    "pgfdecoraterectangleclockwisefalse": {},
-    "pgfmetadecoration{}": {
-      "snippet": "pgfmetadecoration{${1:name}}"
-    },
-    "endpgfmetadecoration": {}
-  },
-  "envs": {
-    "sseq{}{}": {
-      "name": "sseq",
-      "snippet": "{${1:x-range}}{${2:y-range}}"
-    },
-    "sseq[]{}{}": {
-      "name": "sseq",
-      "snippet": "[${3:options}]{${1:x-range}}{${2:y-range}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "pgfdecoration{}": {
-      "name": "pgfdecoration",
-      "snippet": "{${1:name}}"
-    },
-    "pgfmetadecoration{}": {
-      "name": "pgfmetadecoration",
-      "snippet": "{${1:name}}"
-    }
-  },
-  "options": [
-    "color",
-    "nocolor",
-    "debug"
-  ],
-  "keyvals": [
-    [
-      "circled",
-      "boxed",
-      "color=",
-      "name=${1:name}"
-    ],
-    [
-      "U",
-      "LU",
-      "RU",
-      "L",
-      "R",
-      "LD",
-      "RD",
-      "D",
-      "color="
-    ],
-    [
-      "color=",
-      "curve=${1:value}",
-      "dashed",
-      "dashed=${1:dash type}",
-      "dotted",
-      "dotted=${1:dash type}",
-      "arrowfrom",
-      "arrowfrom=${1:arrow style}",
-      "arrowto",
-      "arrowto=${1:arrow style}",
-      "void"
-    ],
-    [
-      "switch if less than=${1:dimen} to ${2:new state}",
-      "switch if input segment less than=${1:dimen} to ${2:new state}",
-      "width=",
-      "repeat state=${1:repetitions}",
-      "next state=${1:new state}",
-      "if input segment is closepath={${1:options}}",
-      "auto end on length=",
-      "auto corner on length=",
-      "persistent precomputation=${1:precode}",
-      "persistent postcomputation=${1:postcode}"
-    ],
-    [
-      "grid=",
-      "entrysize=",
-      "labels=${1:labels}",
-      "xlabels=${1:labels}",
-      "ylabels=${1:labels}",
-      "labelstep=${1:integer}",
-      "xlabelstep=${1:integer}",
-      "ylabelstep=${1:integer}",
-      "gapsize=",
-      "xgapsize=",
-      "ygapsize=",
-      "gridstroke=",
-      "leak=",
-      "xleak=",
-      "yleak=",
-      "arrows=${1:arrow type}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/stack.json b/dev/packages/stack.json
deleted file mode 100644
index 6acc44099..000000000
--- a/dev/packages/stack.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "NewStack{}{}": {
-      "snippet": "NewStack{${1:stack name}}{${2:value}}"
-    },
-    "Stack{}": {
-      "snippet": "Stack{${1:stack}}"
-    },
-    "Push{}{}": {
-      "snippet": "Push{${1:stack}}{${2:value}}"
-    },
-    "Pop{}": {
-      "snippet": "Pop{${1:stack}}"
-    },
-    "ShowTop{}": {
-      "snippet": "ShowTop{${1:stack}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/stackengine.json b/dev/packages/stackengine.json
deleted file mode 100644
index e4ada51a4..000000000
--- a/dev/packages/stackengine.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "listofitems": [],
-    "calc": []
-  },
-  "macros": {
-    "Sstackgap": {},
-    "Lstackgap": {},
-    "setstackgap{}{}": {
-      "snippet": "setstackgap{${1:S or L}}{${2:gap}}"
-    },
-    "stackgap": {},
-    "stackalignment": {},
-    "quietstack": {},
-    "useanchorwidth": {},
-    "stacktype": {},
-    "stackMath": {},
-    "lstackMath": {},
-    "stackText": {},
-    "lstackText": {},
-    "strutlongstacks{}": {
-      "snippet": "strutlongstacks{${1:T or F}}"
-    },
-    "strutshortanchors{}": {
-      "snippet": "strutshortanchors{${1:T or F}}"
-    },
-    "setstackEOL{}": {
-      "snippet": "setstackEOL{${1:end-of-line character}}"
-    },
-    "stackengine{}{}{}{}{}{}{}{}": {
-      "snippet": "stackengine{${1:gap}}{${2:anchor}}{${3:item}}{${4:O or U}}{${5:align}}{${6:quiet-bool}}{${7:anchorwidth-bool}}{${8:type}}"
-    },
-    "stackon{}{}": {
-      "snippet": "stackon{${1:anchor}}{${2:item}}"
-    },
-    "stackon[]{}{}": {
-      "snippet": "stackon[${3:length}]{${1:anchor}}{${2:item}}"
-    },
-    "stackunder{}{}": {
-      "snippet": "stackunder{${1:anchor}}{${2:item}}"
-    },
-    "stackunder[]{}{}": {
-      "snippet": "stackunder[${3:length}]{${1:anchor}}{${2:item}}"
-    },
-    "Shortstack{}": {
-      "snippet": "Shortstack{${1:item1 ... itemN anchor}}"
-    },
-    "Shortstack[]{}": {
-      "snippet": "Shortstack[${2:align}]{${1:item1 ... itemN anchor}}"
-    },
-    "Longstack{}": {
-      "snippet": "Longstack{${1:item1 ... itemN anchor}}"
-    },
-    "Longstack[]{}": {
-      "snippet": "Longstack[${2:align}]{${1:item1 ... itemN anchor}}"
-    },
-    "Shortunderstack{}": {
-      "snippet": "Shortunderstack{${1:anchor item1 ... itemN}}"
-    },
-    "Shortunderstack[]{}": {
-      "snippet": "Shortunderstack[${2:align}]{${1:anchor item1 ... itemN}}"
-    },
-    "Longunderstack{}": {
-      "snippet": "Longunderstack{${1:anchor item1 ... itemN}}"
-    },
-    "Longunderstack[]{}": {
-      "snippet": "Longunderstack[${2:align}]{${1:anchor item1 ... itemN}}"
-    },
-    "tllap[]{}": {
-      "snippet": "tllap[${2:length}]{${1:item}}"
-    },
-    "tllap{}": {
-      "snippet": "tllap{${1:item}}"
-    },
-    "tclap[]{}": {
-      "snippet": "tclap[${2:length}]{${1:item}}"
-    },
-    "tclap{}": {
-      "snippet": "tclap{${1:item}}"
-    },
-    "trlap[]{}": {
-      "snippet": "trlap[${2:length}]{${1:item}}"
-    },
-    "trlap{}": {
-      "snippet": "trlap{${1:item}}"
-    },
-    "bllap[]{}": {
-      "snippet": "bllap[${2:length}]{${1:item}}"
-    },
-    "bllap{}": {
-      "snippet": "bllap{${1:item}}"
-    },
-    "bclap[]{}": {
-      "snippet": "bclap[${2:length}]{${1:item}}"
-    },
-    "bclap{}": {
-      "snippet": "bclap{${1:item}}"
-    },
-    "brlap[]{}": {
-      "snippet": "brlap[${2:length}]{${1:item}}"
-    },
-    "brlap{}": {
-      "snippet": "brlap{${1:item}}"
-    },
-    "toplap{}{}": {
-      "snippet": "toplap{${1:direction}}{${2:item}}"
-    },
-    "toplap[]{}{}": {
-      "snippet": "toplap[${3:length}]{${1:direction}}{${2:item}}"
-    },
-    "bottomlap{}{}": {
-      "snippet": "bottomlap{${1:direction}}{${2:item}}"
-    },
-    "bottomlap[]{}{}": {
-      "snippet": "bottomlap[${3:length}]{${1:direction}}{${2:item}}"
-    },
-    "stackanchor{}{}": {
-      "snippet": "stackanchor{${1:top item}}{${2:bottom item}}"
-    },
-    "stackanchor[]{}{}": {
-      "snippet": "stackanchor[${3:gap}]{${1:top item}}{${2:bottom item}}"
-    },
-    "Centerstack{}": {
-      "snippet": "Centerstack{${1:item1 ... itemN}}"
-    },
-    "Centerstack[]{}": {
-      "snippet": "Centerstack[${2:align}]{${1:item1 ... itemN}}"
-    },
-    "Vectorstack{}": {
-      "snippet": "Vectorstack{${1:item1 ... itemN}}"
-    },
-    "Vectorstack[]{}": {
-      "snippet": "Vectorstack[${2:align}]{${1:item1 ... itemN}}"
-    },
-    "parenVectorstack{}": {
-      "snippet": "parenVectorstack{${1:item1 ... itemN}}"
-    },
-    "parenVectorstack[]{}": {
-      "snippet": "parenVectorstack[${2:align}]{${1:item1 ... itemN}}"
-    },
-    "bracketVectorstack{}": {
-      "snippet": "bracketVectorstack{${1:item1 ... itemN}}"
-    },
-    "bracketVectorstack[]{}": {
-      "snippet": "bracketVectorstack[${2:align}]{${1:item1 ... itemN}}"
-    },
-    "braceVectorstack{}": {
-      "snippet": "braceVectorstack{${1:item1 ... itemN}}"
-    },
-    "braceVectorstack[]{}": {
-      "snippet": "braceVectorstack[${2:align}]{${1:item1 ... itemN}}"
-    },
-    "vertVectorstack{}": {
-      "snippet": "vertVectorstack{${1:item1 ... itemN}}"
-    },
-    "vertVectorstack[]{}": {
-      "snippet": "vertVectorstack[${2:align}]{${1:item1 ... itemN}}"
-    },
-    "ensurestackMath{}": {
-      "snippet": "ensurestackMath{${1:formula}}"
-    },
-    "abovebaseline{}": {
-      "snippet": "abovebaseline{${1:item}}"
-    },
-    "abovebaseline[]{}": {
-      "snippet": "abovebaseline[${2:gap}]{${1:item}}"
-    },
-    "belowbaseline{}": {
-      "snippet": "belowbaseline{${1:item}}"
-    },
-    "belowbaseline[]{}": {
-      "snippet": "belowbaseline[${2:gap}]{${1:item}}"
-    },
-    "stackinset{}{}{}{}{}{}": {
-      "snippet": "stackinset{${1:Halign}}{${2:Hoffset}}{${3:Valign}}{${4:Voffset}}{${5:inset item}}{${6:anchor item}}"
-    },
-    "addstackgap{}": {
-      "snippet": "addstackgap{${1:item}}"
-    },
-    "addstackgap[]{}": {
-      "snippet": "addstackgap[${2:gap}]{${1:item}}"
-    },
-    "hsmash{}": {
-      "snippet": "hsmash{${1:item}}"
-    },
-    "savestack{}{}": {
-      "snippet": "savestack{${1:macro}}{${2:stacking operation}}"
-    },
-    "stackengineversionnumber": {},
-    "removebs{}": {
-      "snippet": "removebs{${1:arg}}"
-    },
-    "stackedbox": {},
-    "bottominset": {},
-    "topinset": {}
-  },
-  "envs": {},
-  "options": [
-    "usestackEOL",
-    "oldsyntax"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/standalone.json b/dev/packages/standalone.json
deleted file mode 100644
index c18b7b32f..000000000
--- a/dev/packages/standalone.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "includes": {
-    "adjustbox": [],
-    "currfile": [],
-    "filemod-expmin": [],
-    "gincltex": [],
-    "ifluatex": [],
-    "ifpdf": [],
-    "ifxetex": [],
-    "shellesc": [],
-    "trimclip": [],
-    "varwidth": [],
-    "xkeyval": []
-  },
-  "macros": {
-    "includestandalone{}": {
-      "snippet": "includestandalone{${1:file}}"
-    },
-    "includestandalone[]{}": {
-      "snippet": "includestandalone[${2:options}]{${1:file}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "standaloneconfig{}": {
-      "snippet": "standaloneconfig{${1:options}}"
-    },
-    "standaloneignore": {},
-    "ifstandalone": {},
-    "standalonetrue": {},
-    "standalonefalse": {},
-    "ifstandalonebeamer": {},
-    "standalonebeamertrue": {},
-    "standalonebeamerfalse": {},
-    "IfStandalone{}{}": {
-      "snippet": "IfStandalone{${1:code for standalone}}{${2:code for main document}}"
-    },
-    "onlyifstandalone{}": {
-      "snippet": "onlyifstandalone{${1:code}}"
-    }
-  },
-  "envs": {
-    "standalone": {}
-  },
-  "options": [
-    "subpreambles",
-    "sort",
-    "print",
-    "comments",
-    "nocomments",
-    "obeyclassoptions",
-    "group",
-    "mode=",
-    "extension=${1:extension}",
-    "build={${1:build options}}"
-  ],
-  "keyvals": [
-    [
-      "alt={${1:alt text}}",
-      "bb=${1:llx lly urx ury}",
-      "bbllx=",
-      "bblly=",
-      "bburx=",
-      "bbury=",
-      "natwidth=",
-      "natheight=",
-      "hiresbb",
-      "pagebox=",
-      "viewport=${1:llx lly urx ury}",
-      "trim=${1:llx lly urx ury}",
-      "angle=${1:degrees}",
-      "origin=",
-      "width=",
-      "height=",
-      "totalheight=",
-      "keepaspectratio",
-      "scale=${1:factor}",
-      "clip",
-      "draft",
-      "type=${1:file type}",
-      "ext=${1:file extension}",
-      "read=${1:read-file extension}",
-      "command=",
-      "quiet",
-      "page=${1:page number}",
-      "interpolate",
-      "decodearray={${1:color array}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/standardsectioning.json b/dev/packages/standardsectioning.json
deleted file mode 100644
index fd59ac739..000000000
--- a/dev/packages/standardsectioning.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {},
-  "options": [
-    "article",
-    "book",
-    "report"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/statistics.json b/dev/packages/statistics.json
deleted file mode 100644
index 9550446ee..000000000
--- a/dev/packages/statistics.json
+++ /dev/null
@@ -1,527 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "siunitx": [],
-    "tikz": [],
-    "tikzlibrarydatavisualization": [],
-    "tikzlibraryfit": []
-  },
-  "macros": {
-    "StatsSortData{}": {
-      "snippet": "StatsSortData{${1:cmd}}"
-    },
-    "StatsRangeData{}": {
-      "snippet": "StatsRangeData{${1:cmd}}"
-    },
-    "statisticssetup{}": {
-      "snippet": "statisticssetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "statisticssetup[]{}": {
-      "snippet": "statisticssetup[${2:module}]{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 1
-    },
-    "StatsTable{}": {
-      "snippet": "StatsTable{${1:data source}}"
-    },
-    "StatsTable[]{}": {
-      "snippet": "StatsTable[${2:options}]{${1:data source}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "StatsTable{}[]": {
-      "snippet": "StatsTable{${1:data source}}[${2:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "StatsTable[]{}[]": {
-      "snippet": "StatsTable[${2:options}]{${1:data source}}[${3:options}]",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "IN": {},
-    "currentcolumn": {},
-    "valuename": {},
-    "countname": {},
-    "freqname": {},
-    "iccname": {},
-    "icfname": {},
-    "dccname": {},
-    "dcfname": {},
-    "firsthline": {},
-    "lasthline": {},
-    "StatsGraph{}": {
-      "snippet": "StatsGraph{${1:data source}}"
-    },
-    "StatsGraph[]{}": {
-      "snippet": "StatsGraph[${2:options}]{${1:data source}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "StatsGraph{}[]": {
-      "snippet": "StatsGraph{${1:data source}}[${2:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 1
-    },
-    "StatsGraph[]{}[]": {
-      "snippet": "StatsGraph[${2:options}]{${1:data source}}[${3:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "ccountname": {},
-    "cfreqname": {},
-    "min": {},
-    "max": {},
-    "range": {},
-    "xstep": {},
-    "total": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "values",
-      "values=${1:row header text}",
-      "counts",
-      "counts=${1:row header text}",
-      "frequencies",
-      "frequencies=${1:row header text}",
-      "icc",
-      "icc=${1:row header text}",
-      "icf",
-      "icf=${1:row header text}",
-      "dcc",
-      "dcc=${1:row header text}",
-      "dcf",
-      "dcf=${1:row header text}",
-      "novalues",
-      "nocounts",
-      "nofrequencies",
-      "noicc",
-      "nodcc",
-      "noicf",
-      "nodcf",
-      "values/header=${1:row header text}",
-      "counts/header=${1:row header text}",
-      "frequencies/header=${1:row header text}",
-      "icc/header=${1:row header text}",
-      "icf/header=${1:row header text}",
-      "dcc/header=${1:row header text}",
-      "dcf/header=${1:row header text}",
-      "values/format=${1:formatting code}",
-      "counts/format=${1:formatting code}",
-      "frequencies/format=${1:formatting code}",
-      "icc/format=${1:formatting code}",
-      "icf/format=${1:formatting code}",
-      "dcc/format=${1:formatting code}",
-      "dcf/format=${1:formatting code}",
-      "allcounts/format=${1:formatting code}",
-      "allfreqs/format=${1:formatting code}",
-      "allfreqs/format/percent",
-      "allfreqs/format/real",
-      "digits=${1:integer}",
-      "showonly={${1:integer/range list}}",
-      "showonly/hidden=${1:formatting code}",
-      "showonly/shown=${1:formatting code}",
-      "maxcols={${1:integer list}}",
-      "tablesep=${1:TeX content}",
-      "preline=${1:array content}",
-      "postline=${1:array content}",
-      "outline=${1:array content}",
-      "newline=${1:array content}",
-      "coltype=${1:coltype}",
-      "headcoltype=${1:coltype}",
-      "frame=",
-      "valign=",
-      "picture={${1:TikZ options}}",
-      "picture/reset",
-      "axissystem={${1:TikZ axis options}}",
-      "axissystem/reset",
-      "width=",
-      "height",
-      "tikzinfo'={${1:TikZ picture code}}",
-      "tikzinfo'/reset",
-      "tikzinfo={${1:TikZ picture code}}",
-      "tikzinfo/reset",
-      "style={${1:TikZ path options}}",
-      "style/reset",
-      "comb/style={${1:TikZ path options}}",
-      "comb/style/reset",
-      "histogram/style={${1:TikZ path options}}",
-      "histogram/style/reset",
-      "cumulative/style={${1:TikZ path options}}",
-      "cumulative/style/reset",
-      "showonly={${1:integer/range list}}",
-      "counts",
-      "counts=${1:label}",
-      "frequencies",
-      "frequencies=${1:label}",
-      "comb/counts",
-      "comb/counts=${1:label}",
-      "comb/frequencies",
-      "comb/frequencies=${1:label}",
-      "histogram/counts",
-      "histogram/counts=${1:label}",
-      "histogram/frequencies",
-      "histogram/frequencies=${1:label}",
-      "cumulative/counts",
-      "cumulative/counts=${1:label}",
-      "cumulative/frequencies",
-      "cumulative/frequencies=${1:label}",
-      "counts/label=${1:label}",
-      "frequencies/label=${1:label}",
-      "comb/counts/label=${1:label}",
-      "comb/frequencies/label=${1:label}",
-      "histogram/counts/label=${1:label}",
-      "histogram/frequencies/label=${1:label}",
-      "cumulative/counts/label=${1:label}",
-      "cumulative/frequencies/label=${1:label}",
-      "y/label=${1:label}",
-      "comb/y/label=${1:label}",
-      "histogram/y/label=${1:label}",
-      "cumulative/y/label=${1:label}",
-      "counts/axis={${1:TikZ axis options}}",
-      "frequencies/axis={${1:TikZ axis options}}",
-      "comb/counts/axis={${1:TikZ axis options}}",
-      "comb/frequencies/axis={${1:TikZ axis options}}",
-      "histogram/counts/axis={${1:TikZ axis options}}",
-      "histogram/frequencies/axis={${1:TikZ axis options}}",
-      "cumulative/counts/axis={${1:TikZ axis options}}",
-      "cumulative/frequencies/axis={${1:TikZ axis options}}",
-      "counts/axis/reset",
-      "frequencies/axis/reset",
-      "comb/counts/axis/reset",
-      "comb/frequencies/axis/reset",
-      "histogram/counts/axis/reset",
-      "histogram/frequencies/axis/reset",
-      "cumulative/counts/axis/reset",
-      "cumulative/frequencies/axis/reset",
-      "y/axis={${1:TikZ axis options}}",
-      "y/axis/reset",
-      "comb/axis={${1:TikZ axis options}}",
-      "comb/axis/reset",
-      "histogram/axis={${1:TikZ axis options}}",
-      "histogram/axis/reset",
-      "cumulative/axis={${1:TikZ axis options}}",
-      "cumulative/axis/reset",
-      "counts/format=${1:formatting code}",
-      "frequencies/format=${1:formatting code}",
-      "y/format=${1:formatting code}",
-      "comb/counts/format=${1:formatting code}",
-      "comb/frequencies/format=${1:formatting code}",
-      "comb/y/format=${1:formatting code}",
-      "histogram/counts/format=${1:formatting code}",
-      "histogram/frequencies/format=${1:formatting code}",
-      "histogram/y/format=${1:formatting code}",
-      "cumulative/counts/format=${1:formatting code}",
-      "cumulative/frequencies/format=${1:formatting code}",
-      "cumulative/y/format=${1:formatting code}",
-      "frequencies/format/real=${1:places}",
-      "comb/frequencies/format/real=${1:places}",
-      "histogram/frequencies/format/real=${1:places}",
-      "cumulative/frequencies/format/real=${1:places}",
-      "frequencies/format/percent=${1:places}",
-      "comb/frequencies/format/percent=${1:places}",
-      "histogram/frequencies/format/percent=${1:places}",
-      "cumulative/frequencies/format/percent=${1:places}",
-      "counts/margin=${1:expr}",
-      "frequencies/margin=${1:expr}",
-      "y/margin=${1:expr}",
-      "comb/counts/margin=${1:expr}",
-      "comb/frequencies/margin=${1:expr}",
-      "comb/y/margin=${1:expr}",
-      "histogram/counts/margin=${1:expr}",
-      "histogram/frequencies/margin=${1:expr}",
-      "histogram/y/margin=${1:expr}",
-      "cumulative/counts/margin=${1:expr}",
-      "cumulative/frequencies/margin=${1:expr}",
-      "cumulative/y/margin=${1:expr}",
-      "values/label=${1:label}",
-      "x/label=${1:label}",
-      "comb/values/label=${1:label}",
-      "comb/x/label=${1:label}",
-      "histogram/values/label=${1:label}",
-      "histogram/x/label=${1:label}",
-      "cumulative/values/label=${1:label}",
-      "cumulative/x/label=${1:label}",
-      "values/axis={${1:TikZ axis options}}",
-      "x/axis={${1:TikZ axis options}}",
-      "comb/values/axis={${1:TikZ axis options}}",
-      "comb/x/axis={${1:TikZ axis options}}",
-      "histogram/values/axis={${1:TikZ axis options}}",
-      "histogram/x/axis={${1:TikZ axis options}}",
-      "cumulative/values/axis={${1:TikZ axis options}}",
-      "cumulative/x/axis={${1:TikZ axis options}}",
-      "values/axis/reset",
-      "x/axis/reset",
-      "comb/values/axis/reset",
-      "comb/x/axis/reset",
-      "histogram/values/axis/reset",
-      "histogram/x/axis/reset",
-      "cumulative/values/axis/reset",
-      "cumulative/x/axis/reset",
-      "values/format=${1:formatting code}",
-      "x/format=${1:formatting code}",
-      "comb/values/format=${1:formatting code}",
-      "comb/x/format=${1:formatting code}",
-      "histogram/values/format=${1:formatting code}",
-      "histogram/x/format=${1:formatting code}",
-      "cumulative/values/format=${1:formatting code}",
-      "cumulative/x/format=${1:formatting code}",
-      "values/margin=${1:expr}",
-      "x/margin=${1:expr}",
-      "comb/values/margin=${1:expr}",
-      "comb/x/margin=${1:expr}",
-      "histogram/values/margin=${1:expr}",
-      "histogram/x/margin=${1:expr}",
-      "cumulative/values/margin=${1:expr}",
-      "cumulative/x/margin=${1:expr}",
-      "cumulative",
-      "decreasing",
-      "histogram/areas",
-      "histogram/areas/style={${1:TikZ node options}}",
-      "histogram/areas/style/reset",
-      "histogram/counts/autostep",
-      "histogram/counts/autostep=${1:fp expr}",
-      "histogram/frequencies/autostep",
-      "histogram/frequencies/autostep=${1:fp expr}",
-      "histogram/y/autostep",
-      "histogram/y/autostep=${1:fp expr}",
-      "histogram/legend={${1:legend keys}}",
-      "histogram/legend/x",
-      "histogram/legend/x=${1:fp expr}",
-      "histogram/legend/w",
-      "histogram/legend/w=${1:fp expr}",
-      "histogram/legend/y=${1:fp expr}",
-      "histogram/legend/h=${1:fp expr}",
-      "histogram/legend/area=${1:fp expr}",
-      "histogram/legend/options={${1:TikZ node options}}",
-      "histogram/legend/options/reset",
-      "histogram/legend/label=${1:TikZ label value}"
-    ],
-    [
-      "values",
-      "values=${1:row header text}",
-      "counts",
-      "counts=${1:row header text}",
-      "frequencies",
-      "frequencies=${1:row header text}",
-      "icc",
-      "icc=${1:row header text}",
-      "icf",
-      "icf=${1:row header text}",
-      "dcc",
-      "dcc=${1:row header text}",
-      "dcf",
-      "dcf=${1:row header text}",
-      "novalues",
-      "nocounts",
-      "nofrequencies",
-      "noicc",
-      "nodcc",
-      "noicf",
-      "nodcf",
-      "values/header=${1:row header text}",
-      "counts/header=${1:row header text}",
-      "frequencies/header=${1:row header text}",
-      "icc/header=${1:row header text}",
-      "icf/header=${1:row header text}",
-      "dcc/header=${1:row header text}",
-      "dcf/header=${1:row header text}",
-      "values/format=${1:formatting code}",
-      "counts/format=${1:formatting code}",
-      "frequencies/format=${1:formatting code}",
-      "icc/format=${1:formatting code}",
-      "icf/format=${1:formatting code}",
-      "dcc/format=${1:formatting code}",
-      "dcf/format=${1:formatting code}",
-      "allcounts/format=${1:formatting code}",
-      "allfreqs/format=${1:formatting code}",
-      "allfreqs/format/percent",
-      "allfreqs/format/real",
-      "digits=${1:integer}",
-      "showonly={${1:integer/range list}}",
-      "showonly/hidden=${1:formatting code}",
-      "showonly/shown=${1:formatting code}",
-      "maxcols={${1:integer list}}",
-      "tablesep=${1:TeX content}",
-      "preline=${1:array content}",
-      "postline=${1:array content}",
-      "outline=${1:array content}",
-      "newline=${1:array content}",
-      "coltype=${1:coltype}",
-      "headcoltype=${1:coltype}",
-      "frame=",
-      "valign="
-    ],
-    [
-      "picture={${1:TikZ options}}",
-      "picture/reset",
-      "axissystem={${1:TikZ axis options}}",
-      "axissystem/reset",
-      "width=",
-      "height",
-      "tikzinfo'={${1:TikZ picture code}}",
-      "tikzinfo'/reset",
-      "tikzinfo={${1:TikZ picture code}}",
-      "tikzinfo/reset",
-      "style={${1:TikZ path options}}",
-      "style/reset",
-      "comb/style={${1:TikZ path options}}",
-      "comb/style/reset",
-      "histogram/style={${1:TikZ path options}}",
-      "histogram/style/reset",
-      "cumulative/style={${1:TikZ path options}}",
-      "cumulative/style/reset",
-      "showonly={${1:integer/range list}}",
-      "counts",
-      "counts=${1:label}",
-      "frequencies",
-      "frequencies=${1:label}",
-      "comb/counts",
-      "comb/counts=${1:label}",
-      "comb/frequencies",
-      "comb/frequencies=${1:label}",
-      "histogram/counts",
-      "histogram/counts=${1:label}",
-      "histogram/frequencies",
-      "histogram/frequencies=${1:label}",
-      "cumulative/counts",
-      "cumulative/counts=${1:label}",
-      "cumulative/frequencies",
-      "cumulative/frequencies=${1:label}",
-      "counts/label=${1:label}",
-      "frequencies/label=${1:label}",
-      "comb/counts/label=${1:label}",
-      "comb/frequencies/label=${1:label}",
-      "histogram/counts/label=${1:label}",
-      "histogram/frequencies/label=${1:label}",
-      "cumulative/counts/label=${1:label}",
-      "cumulative/frequencies/label=${1:label}",
-      "y/label=${1:label}",
-      "comb/y/label=${1:label}",
-      "histogram/y/label=${1:label}",
-      "cumulative/y/label=${1:label}",
-      "counts/axis={${1:TikZ axis options}}",
-      "frequencies/axis={${1:TikZ axis options}}",
-      "comb/counts/axis={${1:TikZ axis options}}",
-      "comb/frequencies/axis={${1:TikZ axis options}}",
-      "histogram/counts/axis={${1:TikZ axis options}}",
-      "histogram/frequencies/axis={${1:TikZ axis options}}",
-      "cumulative/counts/axis={${1:TikZ axis options}}",
-      "cumulative/frequencies/axis={${1:TikZ axis options}}",
-      "counts/axis/reset",
-      "frequencies/axis/reset",
-      "comb/counts/axis/reset",
-      "comb/frequencies/axis/reset",
-      "histogram/counts/axis/reset",
-      "histogram/frequencies/axis/reset",
-      "cumulative/counts/axis/reset",
-      "cumulative/frequencies/axis/reset",
-      "y/axis={${1:TikZ axis options}}",
-      "y/axis/reset",
-      "comb/axis={${1:TikZ axis options}}",
-      "comb/axis/reset",
-      "histogram/axis={${1:TikZ axis options}}",
-      "histogram/axis/reset",
-      "cumulative/axis={${1:TikZ axis options}}",
-      "cumulative/axis/reset",
-      "counts/format=${1:formatting code}",
-      "frequencies/format=${1:formatting code}",
-      "y/format=${1:formatting code}",
-      "comb/counts/format=${1:formatting code}",
-      "comb/frequencies/format=${1:formatting code}",
-      "comb/y/format=${1:formatting code}",
-      "histogram/counts/format=${1:formatting code}",
-      "histogram/frequencies/format=${1:formatting code}",
-      "histogram/y/format=${1:formatting code}",
-      "cumulative/counts/format=${1:formatting code}",
-      "cumulative/frequencies/format=${1:formatting code}",
-      "cumulative/y/format=${1:formatting code}",
-      "frequencies/format/real=${1:places}",
-      "comb/frequencies/format/real=${1:places}",
-      "histogram/frequencies/format/real=${1:places}",
-      "cumulative/frequencies/format/real=${1:places}",
-      "frequencies/format/percent=${1:places}",
-      "comb/frequencies/format/percent=${1:places}",
-      "histogram/frequencies/format/percent=${1:places}",
-      "cumulative/frequencies/format/percent=${1:places}",
-      "counts/margin=${1:expr}",
-      "frequencies/margin=${1:expr}",
-      "y/margin=${1:expr}",
-      "comb/counts/margin=${1:expr}",
-      "comb/frequencies/margin=${1:expr}",
-      "comb/y/margin=${1:expr}",
-      "histogram/counts/margin=${1:expr}",
-      "histogram/frequencies/margin=${1:expr}",
-      "histogram/y/margin=${1:expr}",
-      "cumulative/counts/margin=${1:expr}",
-      "cumulative/frequencies/margin=${1:expr}",
-      "cumulative/y/margin=${1:expr}",
-      "values/label=${1:label}",
-      "x/label=${1:label}",
-      "comb/values/label=${1:label}",
-      "comb/x/label=${1:label}",
-      "histogram/values/label=${1:label}",
-      "histogram/x/label=${1:label}",
-      "cumulative/values/label=${1:label}",
-      "cumulative/x/label=${1:label}",
-      "values/axis={${1:TikZ axis options}}",
-      "x/axis={${1:TikZ axis options}}",
-      "comb/values/axis={${1:TikZ axis options}}",
-      "comb/x/axis={${1:TikZ axis options}}",
-      "histogram/values/axis={${1:TikZ axis options}}",
-      "histogram/x/axis={${1:TikZ axis options}}",
-      "cumulative/values/axis={${1:TikZ axis options}}",
-      "cumulative/x/axis={${1:TikZ axis options}}",
-      "values/axis/reset",
-      "x/axis/reset",
-      "comb/values/axis/reset",
-      "comb/x/axis/reset",
-      "histogram/values/axis/reset",
-      "histogram/x/axis/reset",
-      "cumulative/values/axis/reset",
-      "cumulative/x/axis/reset",
-      "values/format=${1:formatting code}",
-      "x/format=${1:formatting code}",
-      "comb/values/format=${1:formatting code}",
-      "comb/x/format=${1:formatting code}",
-      "histogram/values/format=${1:formatting code}",
-      "histogram/x/format=${1:formatting code}",
-      "cumulative/values/format=${1:formatting code}",
-      "cumulative/x/format=${1:formatting code}",
-      "values/margin=${1:expr}",
-      "x/margin=${1:expr}",
-      "comb/values/margin=${1:expr}",
-      "comb/x/margin=${1:expr}",
-      "histogram/values/margin=${1:expr}",
-      "histogram/x/margin=${1:expr}",
-      "cumulative/values/margin=${1:expr}",
-      "cumulative/x/margin=${1:expr}",
-      "cumulative",
-      "decreasing",
-      "histogram/areas",
-      "histogram/areas/style={${1:TikZ node options}}",
-      "histogram/areas/style/reset",
-      "histogram/counts/autostep",
-      "histogram/counts/autostep=${1:fp expr}",
-      "histogram/frequencies/autostep",
-      "histogram/frequencies/autostep=${1:fp expr}",
-      "histogram/y/autostep",
-      "histogram/y/autostep=${1:fp expr}",
-      "histogram/legend={${1:legend keys}}",
-      "histogram/legend/x",
-      "histogram/legend/x=${1:fp expr}",
-      "histogram/legend/w",
-      "histogram/legend/w=${1:fp expr}",
-      "histogram/legend/y=${1:fp expr}",
-      "histogram/legend/h=${1:fp expr}",
-      "histogram/legend/area=${1:fp expr}",
-      "histogram/legend/options={${1:TikZ node options}}",
-      "histogram/legend/options/reset",
-      "histogram/legend/label=${1:TikZ label value}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/stex.json b/dev/packages/stex.json
deleted file mode 100644
index 7e4ac8e51..000000000
--- a/dev/packages/stex.json
+++ /dev/null
@@ -1,985 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": [],
-    "ltxcmds": [],
-    "stex-logo": [],
-    "standalone": [],
-    "babel": [],
-    "stex-tikzinput": []
-  },
-  "macros": {
-    "libinput{}": {
-      "snippet": "libinput{${1:file}}"
-    },
-    "libusepackage{}": {
-      "snippet": "libusepackage{${1:package}}"
-    },
-    "libusepackage[]{}": {
-      "snippet": "libusepackage[${2:options}]{${1:package}}"
-    },
-    "addmhbibresource{}": {
-      "snippet": "addmhbibresource{${1:bib file}}"
-    },
-    "addmhbibresource[]{}": {
-      "snippet": "addmhbibresource[${2:archive}]{${1:bib file}}"
-    },
-    "libusetikzlibrary{}": {
-      "snippet": "libusetikzlibrary{${1:library}}"
-    },
-    "ifstexhtml": {},
-    "stexhtmlfalse": {},
-    "stexhtmltrue": {},
-    "STEXinvisible{}": {
-      "snippet": "STEXinvisible{${1:code}}"
-    },
-    "skipfragment": {},
-    "setsectionlevel{}": {
-      "snippet": "setsectionlevel{${1:level}}"
-    },
-    "currentsectionlevel": {},
-    "Currentsectionlevel": {},
-    "inputref{}": {
-      "snippet": "inputref{${1:file}}"
-    },
-    "inputref[]{}": {
-      "snippet": "inputref[${2:archive}]{${1:file}}"
-    },
-    "mhinput{}": {
-      "snippet": "mhinput{${1:file}}"
-    },
-    "mhinput[]{}": {
-      "snippet": "mhinput[${2:archive}]{${1:file}}"
-    },
-    "ifinputref": {},
-    "inputreftrue": {},
-    "inputreffalse": {},
-    "IfInputref{}{}": {
-      "snippet": "IfInputref{${1:true}}{${2:false}}"
-    },
-    "mhgraphics{}": {
-      "snippet": "mhgraphics{${1:imagefile}}"
-    },
-    "mhgraphics[]{}": {
-      "snippet": "mhgraphics[${2:options}]{${1:imagefile}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "cmhgraphics{}": {
-      "snippet": "cmhgraphics{${1:imagefile}}"
-    },
-    "cmhgraphics[]{}": {
-      "snippet": "cmhgraphics[${2:options}]{${1:imagefile}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "lstinputmhlisting{}": {
-      "snippet": "lstinputmhlisting{${1:file}}"
-    },
-    "lstinputmhlisting[]{}": {
-      "snippet": "lstinputmhlisting[${2:options}]{${1:file}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "clstinputmhlisting{}": {
-      "snippet": "clstinputmhlisting{${1:file}}"
-    },
-    "clstinputmhlisting[]{}": {
-      "snippet": "clstinputmhlisting[${2:options}]{${1:file}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "sref{}": {
-      "snippet": "sref{${1:label}}"
-    },
-    "sref[]{}": {
-      "snippet": "sref[${2:options}]{${1:label}}"
-    },
-    "sref[]{}[]": {
-      "snippet": "sref[${2:options1}]{${1:label}}[${3:options2}]"
-    },
-    "srefsetin{}{}": {
-      "snippet": "srefsetin{${1:file}}{${2:title}}"
-    },
-    "srefsetin[]{}{}": {
-      "snippet": "srefsetin[${3:archive}]{${1:file}}{${2:title}}"
-    },
-    "sreflabel{}": {
-      "snippet": "sreflabel{${1:label}}"
-    },
-    "extref{}{}": {
-      "snippet": "extref{${1:label}}{${2:keyvals}}"
-    },
-    "extref[]{}{}": {
-      "snippet": "extref[${3:options}]{${1:label}}{${2:keyvals}}"
-    },
-    "STEXexport{}": {
-      "snippet": "STEXexport{${1:code}}"
-    },
-    "symdecl{}": {
-      "snippet": "symdecl{${1:name}}"
-    },
-    "symdecl{}[]": {
-      "snippet": "symdecl{${1:name}}[${2:options}]"
-    },
-    "symdecl*{}": {
-      "snippet": "symdecl*{${1:name}}"
-    },
-    "symdecl*{}[]": {
-      "snippet": "symdecl*{${1:name}}[${2:options}]"
-    },
-    "textsymdecl{}{}": {
-      "snippet": "textsymdecl{${1:name}}{${2:definition}}"
-    },
-    "textsymdecl{}[]{}": {
-      "snippet": "textsymdecl{${1:name}}[${2:options}]{${3:definition}}"
-    },
-    "symdef{}{}": {
-      "snippet": "symdef{${1:name}}{${2:definition}}"
-    },
-    "symdef{}[]{}": {
-      "snippet": "symdef{${1:name}}[${2:options}]{${3:definition}}"
-    },
-    "symref{}{}": {
-      "snippet": "symref{${1:name}}{${2:text}}"
-    },
-    "sr{}{}": {
-      "snippet": "sr{${1:name}}{${2:text}}"
-    },
-    "symname{}": {
-      "snippet": "symname{${1:name}}"
-    },
-    "symname[]{}": {
-      "snippet": "symname[${2:options}]{${1:name}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "sn{}": {
-      "snippet": "sn{${1:name}}"
-    },
-    "sn[]{}": {
-      "snippet": "sn[${2:options}]{${1:name}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Symname{}": {
-      "snippet": "Symname{${1:name}}"
-    },
-    "Symname[]{}": {
-      "snippet": "Symname[${2:options}]{${1:name}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Sn{}": {
-      "snippet": "Sn{${1:name}}"
-    },
-    "Sn[]{}": {
-      "snippet": "Sn[${2:options}]{${1:name}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "sns{}": {
-      "snippet": "sns{${1:name}}"
-    },
-    "Sns{}": {
-      "snippet": "Sns{${1:name}}"
-    },
-    "srefsym{}{}": {
-      "snippet": "srefsym{${1:name}}{${2:text}}"
-    },
-    "srefsymuri{}{}": {
-      "snippet": "srefsymuri{${1:URI}}{${2:text}}"
-    },
-    "symuse{}": {
-      "snippet": "symuse{${1:name}}"
-    },
-    "notation{}{}": {
-      "snippet": "notation{${1:name}}{${2:definition}}"
-    },
-    "notation{}[]{}": {
-      "snippet": "notation{${1:name}}[${2:options}]{${3:definition}}"
-    },
-    "notation*{}{}": {
-      "snippet": "notation*{${1:name}}{${2:definition}}"
-    },
-    "notation*{}[]{}": {
-      "snippet": "notation*{${1:name}}[${2:options}]{${3:definition}}"
-    },
-    "comp{}": {
-      "snippet": "comp{${1:component}}"
-    },
-    "maincomp{}": {
-      "snippet": "maincomp{${1:component}}"
-    },
-    "setnotation{}{}": {
-      "snippet": "setnotation{${1:name}}{${2:id}}"
-    },
-    "infprec": {},
-    "neginfprec": {},
-    "dobrackets{}": {
-      "snippet": "dobrackets{${1:code}}"
-    },
-    "withbrackets{}{}{}": {
-      "snippet": "withbrackets{${1:left}}{${2:right}}{${3:code}}"
-    },
-    "argsep{}{}": {
-      "snippet": "argsep{${1:parameter token}}{${2:separator}}"
-    },
-    "argmap{}{}{}": {
-      "snippet": "argmap{${1:parameter token}}{${2:code}}{${3:separator}}"
-    },
-    "argarraymap{}{}{}{}": {
-      "snippet": "argarraymap{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "arg{}": {
-      "snippet": "arg{${1:code}}"
-    },
-    "arg[]{}": {
-      "snippet": "arg[${2:i}]{${1:code}}"
-    },
-    "arg*{}": {
-      "snippet": "arg*{${1:code}}"
-    },
-    "arg*[]{}": {
-      "snippet": "arg*[${2:i}]{${1:code}}"
-    },
-    "usemodule{}": {
-      "snippet": "usemodule{${1:module}}"
-    },
-    "usemodule[]{}": {
-      "snippet": "usemodule[${2:archive}]{${1:module}}"
-    },
-    "requiremodule{}": {
-      "snippet": "requiremodule{${1:module}}"
-    },
-    "requiremodule[]{}": {
-      "snippet": "requiremodule[${2:archive}]{${1:module}}"
-    },
-    "importmodule{}": {
-      "snippet": "importmodule{${1:module}}"
-    },
-    "importmodule[]{}": {
-      "snippet": "importmodule[${2:archive}]{${1:module}}"
-    },
-    "vardef{}{}": {
-      "snippet": "vardef{${1:name}}{${2:definition}}"
-    },
-    "vardef{}[]{}": {
-      "snippet": "vardef{${1:name}}[${2:options}]{${3:definition}}"
-    },
-    "varnotation{}{}": {
-      "snippet": "varnotation{${1:name}}{${2:definition}}"
-    },
-    "varnotation{}[]{}": {
-      "snippet": "varnotation{${1:name}}[${2:options}]{${3:definition}}"
-    },
-    "svar{}": {
-      "snippet": "svar{${1:text}}"
-    },
-    "svar[]{}": {
-      "snippet": "svar[${2:name}]{${1:text}}"
-    },
-    "varseq{}{}{}": {
-      "snippet": "varseq{${1:name}}{${2:range}}{${3:definition}}"
-    },
-    "varseq{}[]{}{}": {
-      "snippet": "varseq{${1:name}}[${2:options}]{${3:range}}{${4:definition}}"
-    },
-    "ellipses": {},
-    "seqmap{}{}": {
-      "snippet": "seqmap{${1:code}}{${2:sequence}}"
-    },
-    "this": {},
-    "usestructure{}": {
-      "snippet": "usestructure{${1:struct}}"
-    },
-    "inlineass{}": {
-      "snippet": "inlineass{${1:text}}"
-    },
-    "inlineass[]{}": {
-      "snippet": "inlineass[${2:options}]{${1:text}}"
-    },
-    "inlinedef{}": {
-      "snippet": "inlinedef{${1:text}}"
-    },
-    "inlinedef[]{}": {
-      "snippet": "inlinedef[${2:options}]{${1:text}}"
-    },
-    "inlineex{}": {
-      "snippet": "inlineex{${1:text}}"
-    },
-    "inlineex[]{}": {
-      "snippet": "inlineex[${2:options}]{${1:text}}"
-    },
-    "varbind{}": {
-      "snippet": "varbind{${1:cls}}"
-    },
-    "definiendum{}{}": {
-      "snippet": "definiendum{${1:name}}{${2:code}}"
-    },
-    "definame{}": {
-      "snippet": "definame{${1:name}}"
-    },
-    "definame[]{}": {
-      "snippet": "definame[${2:options}]{${1:name}}"
-    },
-    "Definame{}": {
-      "snippet": "Definame{${1:name}}"
-    },
-    "Definame[]{}": {
-      "snippet": "Definame[${2:options}]{${1:name}}"
-    },
-    "defnotation{}": {
-      "snippet": "defnotation{${1:code}}"
-    },
-    "definiens{}": {
-      "snippet": "definiens{${1:code}}"
-    },
-    "definiens[]{}": {
-      "snippet": "definiens[${2:name}]{${1:code}}"
-    },
-    "premise{}": {
-      "snippet": "premise{${1:text}}"
-    },
-    "conclusion{}": {
-      "snippet": "conclusion{${1:text}}"
-    },
-    "conclusion[]{}": {
-      "snippet": "conclusion[${2:symbol}]{${1:text}}"
-    },
-    "symrefemph{}": {
-      "snippet": "symrefemph{${1:text}}"
-    },
-    "compemph{}": {
-      "snippet": "compemph{${1:text}}"
-    },
-    "defemph{}": {
-      "snippet": "defemph{${1:text}}"
-    },
-    "varemph{}": {
-      "snippet": "varemph{${1:text}}"
-    },
-    "stexstylemodule{}": {
-      "snippet": "stexstylemodule{${1:definition}}"
-    },
-    "stexstylemodule[]{}": {
-      "snippet": "stexstylemodule[${2:style}]{${1:definition}}"
-    },
-    "stexstylecopymodule{}": {
-      "snippet": "stexstylecopymodule{${1:definition}}"
-    },
-    "stexstylecopymodule[]{}": {
-      "snippet": "stexstylecopymodule[${2:style}]{${1:definition}}"
-    },
-    "stexstyleinterpretmodule{}": {
-      "snippet": "stexstyleinterpretmodule{${1:definition}}"
-    },
-    "stexstyleinterpretmodule[]{}": {
-      "snippet": "stexstyleinterpretmodule[${2:style}]{${1:definition}}"
-    },
-    "stexstylerealization{}": {
-      "snippet": "stexstylerealization{${1:definition}}"
-    },
-    "stexstylerealization[]{}": {
-      "snippet": "stexstylerealization[${2:style}]{${1:definition}}"
-    },
-    "stexstylemathstructure{}": {
-      "snippet": "stexstylemathstructure{${1:definition}}"
-    },
-    "stexstylemathstructure[]{}": {
-      "snippet": "stexstylemathstructure[${2:style}]{${1:definition}}"
-    },
-    "stexstyleextstructure{}": {
-      "snippet": "stexstyleextstructure{${1:definition}}"
-    },
-    "stexstyleextstructure[]{}": {
-      "snippet": "stexstyleextstructure[${2:style}]{${1:definition}}"
-    },
-    "stexstyledefinition{}": {
-      "snippet": "stexstyledefinition{${1:definition}}"
-    },
-    "stexstyledefinition[]{}": {
-      "snippet": "stexstyledefinition[${2:style}]{${1:definition}}"
-    },
-    "stexstyleassertion{}": {
-      "snippet": "stexstyleassertion{${1:definition}}"
-    },
-    "stexstyleassertion[]{}": {
-      "snippet": "stexstyleassertion[${2:style}]{${1:definition}}"
-    },
-    "stexstyleexample{}": {
-      "snippet": "stexstyleexample{${1:definition}}"
-    },
-    "stexstyleexample[]{}": {
-      "snippet": "stexstyleexample[${2:style}]{${1:definition}}"
-    },
-    "stexstyleparagraph{}": {
-      "snippet": "stexstyleparagraph{${1:definition}}"
-    },
-    "stexstyleparagraph[]{}": {
-      "snippet": "stexstyleparagraph[${2:style}]{${1:definition}}"
-    },
-    "stexstyleproof{}": {
-      "snippet": "stexstyleproof{${1:definition}}"
-    },
-    "stexstyleproof[]{}": {
-      "snippet": "stexstyleproof[${2:style}]{${1:definition}}"
-    },
-    "stexstylesubproof{}": {
-      "snippet": "stexstylesubproof{${1:definition}}"
-    },
-    "stexstylesubproof[]{}": {
-      "snippet": "stexstylesubproof[${2:style}]{${1:definition}}"
-    },
-    "stexstyleusemodule{}": {
-      "snippet": "stexstyleusemodule{${1:definition}}"
-    },
-    "stexstyleusemodule[]{}": {
-      "snippet": "stexstyleusemodule[${2:style}]{${1:definition}}"
-    },
-    "stexstyleimportmodule{}": {
-      "snippet": "stexstyleimportmodule{${1:definition}}"
-    },
-    "stexstyleimportmodule[]{}": {
-      "snippet": "stexstyleimportmodule[${2:style}]{${1:definition}}"
-    },
-    "stexstylerequiremodule{}": {
-      "snippet": "stexstylerequiremodule{${1:definition}}"
-    },
-    "stexstylerequiremodule[]{}": {
-      "snippet": "stexstylerequiremodule[${2:style}]{${1:definition}}"
-    },
-    "stexstyleassign{}": {
-      "snippet": "stexstyleassign{${1:definition}}"
-    },
-    "stexstyleassign[]{}": {
-      "snippet": "stexstyleassign[${2:style}]{${1:definition}}"
-    },
-    "stexstylerenamedecl{}": {
-      "snippet": "stexstylerenamedecl{${1:definition}}"
-    },
-    "stexstylerenamedecl[]{}": {
-      "snippet": "stexstylerenamedecl[${2:style}]{${1:definition}}"
-    },
-    "stexstyleassignMorphism{}": {
-      "snippet": "stexstyleassignMorphism{${1:definition}}"
-    },
-    "stexstyleassignMorphism[]{}": {
-      "snippet": "stexstyleassignMorphism[${2:style}]{${1:definition}}"
-    },
-    "stexstylecopymod{}": {
-      "snippet": "stexstylecopymod{${1:definition}}"
-    },
-    "stexstylecopymod[]{}": {
-      "snippet": "stexstylecopymod[${2:style}]{${1:definition}}"
-    },
-    "stexstyleinterpretmod{}": {
-      "snippet": "stexstyleinterpretmod{${1:definition}}"
-    },
-    "stexstyleinterpretmod[]{}": {
-      "snippet": "stexstyleinterpretmod[${2:style}]{${1:definition}}"
-    },
-    "stexstylerealize{}": {
-      "snippet": "stexstylerealize{${1:definition}}"
-    },
-    "stexstylerealize[]{}": {
-      "snippet": "stexstylerealize[${2:style}]{${1:definition}}"
-    },
-    "stexstylesymdecl{}": {
-      "snippet": "stexstylesymdecl{${1:definition}}"
-    },
-    "stexstylesymdecl[]{}": {
-      "snippet": "stexstylesymdecl[${2:style}]{${1:definition}}"
-    },
-    "stexstyletextsymdecl{}": {
-      "snippet": "stexstyletextsymdecl{${1:definition}}"
-    },
-    "stexstyletextsymdecl[]{}": {
-      "snippet": "stexstyletextsymdecl[${2:style}]{${1:definition}}"
-    },
-    "stexstylenotation{}": {
-      "snippet": "stexstylenotation{${1:definition}}"
-    },
-    "stexstylenotation[]{}": {
-      "snippet": "stexstylenotation[${2:style}]{${1:definition}}"
-    },
-    "stexstylevarnotation{}": {
-      "snippet": "stexstylevarnotation{${1:definition}}"
-    },
-    "stexstylevarnotation[]{}": {
-      "snippet": "stexstylevarnotation[${2:style}]{${1:definition}}"
-    },
-    "stexstylesymdef{}": {
-      "snippet": "stexstylesymdef{${1:definition}}"
-    },
-    "stexstylesymdef[]{}": {
-      "snippet": "stexstylesymdef[${2:style}]{${1:definition}}"
-    },
-    "stexstylevardef{}": {
-      "snippet": "stexstylevardef{${1:definition}}"
-    },
-    "stexstylevardef[]{}": {
-      "snippet": "stexstylevardef[${2:style}]{${1:definition}}"
-    },
-    "stexstylevarseq{}": {
-      "snippet": "stexstylevarseq{${1:definition}}"
-    },
-    "stexstylevarseq[]{}": {
-      "snippet": "stexstylevarseq[${2:style}]{${1:definition}}"
-    },
-    "stexstylespfsketch{}": {
-      "snippet": "stexstylespfsketch{${1:definition}}"
-    },
-    "stexstylespfsketch[]{}": {
-      "snippet": "stexstylespfsketch[${2:style}]{${1:definition}}"
-    },
-    "stexstyleMMTinclude{}": {
-      "snippet": "stexstyleMMTinclude{${1:definition}}"
-    },
-    "stexstyleMMTinclude[]{}": {
-      "snippet": "stexstyleMMTinclude[${2:style}]{${1:definition}}"
-    },
-    "assign{}{}": {
-      "snippet": "assign{${1:arg1}}{${2:arg2}}"
-    },
-    "assignMorphism": {},
-    "assumption{}": {
-      "snippet": "assumption{${1:text}}"
-    },
-    "conclude[]{}": {
-      "snippet": "conclude[${2:options}]{${1:text}}"
-    },
-    "conclude{}": {
-      "snippet": "conclude{${1:text}}"
-    },
-    "eqstep*{}": {
-      "snippet": "eqstep*{${1:text}}"
-    },
-    "eqstep{}": {
-      "snippet": "eqstep{${1:text}}"
-    },
-    "mathhub": {},
-    "mmlarg{}{}": {
-      "snippet": "mmlarg{${1:arg1}}{${2:arg2}}"
-    },
-    "mmlintent{}{}": {
-      "snippet": "mmlintent{${1:arg1}}{${2:arg2}}"
-    },
-    "mmtdef{}": {
-      "snippet": "mmtdef{${1:arg}}"
-    },
-    "mmtdef{}[]": {
-      "snippet": "mmtdef{${1:arg}}[${2:opt}]"
-    },
-    "MMTinclude{}": {
-      "snippet": "MMTinclude{${1:arg1}}"
-    },
-    "MMTrule{}{}": {
-      "snippet": "MMTrule{${1:arg1}}{${2:arg2}}"
-    },
-    "MSC{}": {
-      "snippet": "MSC{${1:arg1}}"
-    },
-    "objective{}{}": {
-      "snippet": "objective{${1:arg1}}{${2:arg2}}"
-    },
-    "precondition{}{}": {
-      "snippet": "precondition{${1:arg1}}{${2:arg2}}"
-    },
-    "realize{}{}": {
-      "snippet": "realize{${1:arg1}}{${2:arg2}}"
-    },
-    "renamedecl[]{}{}": {
-      "snippet": "renamedecl[${3:optarg1}]{${1:arg2}}{${2:arg3}}"
-    },
-    "renamedecl{}{}": {
-      "snippet": "renamedecl{${1:arg1}}{${2:arg2}}"
-    },
-    "spfjust{}": {
-      "snippet": "spfjust{${1:text}}"
-    },
-    "spfstep[]{}": {
-      "snippet": "spfstep[${2:options}]{${1:text}}"
-    },
-    "spfstep{}": {
-      "snippet": "spfstep{${1:text}}"
-    },
-    "sproofend": {},
-    "stexcommentfont": {},
-    "stexdoctitle{}": {
-      "snippet": "stexdoctitle{${1:arg}}"
-    },
-    "STEXInternalSetSrefSymURL{}{}": {
-      "snippet": "STEXInternalSetSrefSymURL{${1:arg1}}{${2:arg2}}"
-    },
-    "STEXInternalSrefRestoreTarget{}{}{}{}{}": {
-      "snippet": "STEXInternalSrefRestoreTarget{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
-    },
-    "STEXInternalSymbolAfterInvokationTL": {},
-    "STEXInternalTermMathArgiii{}{}{}": {
-      "snippet": "STEXInternalTermMathArgiii{${1:arg1}}{${2:arg2}}{${3:arg3}}"
-    },
-    "STEXInternalTermMathAssocArgiiiii{}{}{}{}{}": {
-      "snippet": "STEXInternalTermMathAssocArgiiiii{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
-    },
-    "STEXRestoreNotsEnd": {},
-    "thisarchive": {},
-    "thiscopyname": {},
-    "thismodulename": {},
-    "thismoduleuri": {},
-    "thisstyle": {},
-    "thistitle": {},
-    "yield{}": {
-      "snippet": "yield{${1:text}}"
-    }
-  },
-  "envs": {
-    "sfragment{}": {
-      "name": "sfragment",
-      "snippet": "{${1:title}}"
-    },
-    "sfragment[]{}": {
-      "name": "sfragment",
-      "snippet": "[${2:keyvals}]{${1:title}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "blindfragment": {},
-    "smodule{}": {
-      "name": "smodule",
-      "snippet": "{${1:module}}"
-    },
-    "smodule[]{}": {
-      "name": "smodule",
-      "snippet": "[${2:options}]{${1:module}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "mathstructure{}": {
-      "name": "mathstructure",
-      "snippet": "{${1:name}}"
-    },
-    "mathstructure{}[]": {
-      "name": "mathstructure",
-      "snippet": "{${1:name}}[${2:options}]"
-    },
-    "extstructure{}{}": {
-      "name": "extstructure",
-      "snippet": "{${1:name}}{${2:structs}}"
-    },
-    "extstructure{}[]{}": {
-      "name": "extstructure",
-      "snippet": "{${1:name}}[${2:options}]{${3:structs}}"
-    },
-    "extstructure*{}{}": {
-      "name": "extstructure*",
-      "snippet": "{${1:name}}{${2:struct}}"
-    },
-    "sdefinition": {},
-    "sdefinition[]": {
-      "name": "sdefinition",
-      "snippet": "[${1:options}]"
-    },
-    "sassertion": {},
-    "sassertion[]": {
-      "name": "sassertion",
-      "snippet": "[${1:options}]"
-    },
-    "sexample": {},
-    "sexample[]": {
-      "name": "sexample",
-      "snippet": "[${1:options}]"
-    },
-    "sparagraph": {},
-    "sparagraph[]": {
-      "name": "sparagraph",
-      "snippet": "[${1:options}]"
-    },
-    "sproof": {},
-    "sproof[]": {
-      "name": "sproof",
-      "snippet": "[${1:options}]"
-    },
-    "copymodule{}{}": {
-      "name": "copymodule",
-      "snippet": "{${1:arg1}}{${2:arg2}}"
-    },
-    "interpretmodule{}{}": {
-      "name": "interpretmodule",
-      "snippet": "{${1:arg1}}{${2:arg2}}"
-    },
-    "mmtinterface[]{}{}": {
-      "name": "mmtinterface",
-      "snippet": "[${3:opt}]{${1:arg1}}{${2:arg2}}"
-    },
-    "mmtinterface{}{}": {
-      "name": "mmtinterface",
-      "snippet": "{${1:arg1}}{${2:arg2}}"
-    },
-    "realization[]{}": {
-      "name": "realization",
-      "snippet": "[${2:optarg1}]{${1:arg2}}"
-    },
-    "realization{}": {
-      "name": "realization",
-      "snippet": "{${1:arg1}}"
-    },
-    "spfblock": {},
-    "subproof[]{}": {
-      "name": "subproof",
-      "snippet": "[${2:options}]{${1:text}}"
-    },
-    "subproof{}": {
-      "name": "subproof",
-      "snippet": "{${1:text}}"
-    }
-  },
-  "options": [
-    "lang=${1:language}",
-    "mathhub=${1:directory}",
-    "writesms",
-    "usems",
-    "image",
-    "nofrontmatter",
-    "debug=${1:log-prefix}",
-    "checkterms"
-  ],
-  "keyvals": [
-    [
-      "archive=${1:file path}",
-      "alt={${1:alt text}}",
-      "bb=${1:llx lly urx ury}",
-      "bbllx=",
-      "bblly=",
-      "bburx=",
-      "bbury=",
-      "natwidth=",
-      "natheight=",
-      "hiresbb",
-      "pagebox=",
-      "viewport=${1:llx lly urx ury}",
-      "trim=${1:llx lly urx ury}",
-      "angle=${1:degrees}",
-      "origin=",
-      "width=",
-      "height=",
-      "totalheight=",
-      "keepaspectratio",
-      "scale=${1:factor}",
-      "clip",
-      "draft",
-      "type=${1:file type}",
-      "ext=${1:file extension}",
-      "read=${1:read-file extension}",
-      "command=",
-      "quiet",
-      "page=${1:page number}",
-      "interpolate",
-      "decodearray={${1:color array}}"
-    ],
-    [
-      "inputpath=${1:path}",
-      "aboveskip=",
-      "belowskip=",
-      "lineskip=",
-      "boxpos=",
-      "print",
-      "showlines",
-      "emptylines=${1:number}",
-      "emptylines=*${1:number}",
-      "gobble=${1:number}",
-      "style=${1:style name}",
-      "language=${1:language}",
-      "language=[${1:dialect}]${2:language}",
-      "alsolanguage=${1:language}",
-      "alsolanguage=[${1:dialect}]${2:language}",
-      "defaultdialect=[${1:dialect}]${2:language}",
-      "printpod",
-      "usekeywordsintag",
-      "tagstyle=${1:style}",
-      "markfirstintag=${1:style}",
-      "makemacrouse",
-      "basicstyle=${1:style}",
-      "identifierstyle=${1:style}",
-      "commentstyle=${1:style}",
-      "stringstyle=${1:style}",
-      "keywordstyle=${1:style}",
-      "keywordstyle=[${1:number}]${2:style}",
-      "keywordstyle=[${1:number}]*${2:style}",
-      "ndkeywordstyle=${1:style}",
-      "classoffset=${1:number}",
-      "texcsstyle=${1:style}",
-      "texcsstyle=[${1:class number}]${2:style}",
-      "texcsstyle=*[${1:class number}]${2:style}",
-      "directivestyle=${1:style}",
-      "emph={${1:identifier list}}",
-      "emph=[${1:number}]{${2:identifier list}}",
-      "moreemph={${1:identifier list}}",
-      "moreemph=[${1:number}]{${2:identifier list}}",
-      "deleteemph={${1:identifier list}}",
-      "deleteemph=[${1:number}]{${2:identifier list}}",
-      "emphstyle={${1:style}}",
-      "emphstyle=[${1:number}]{${2:style}}",
-      "delim=[${1:type}][${2:style}]${3:delimiters}",
-      "delim=*[${1:type}][${2:style}]${3:delimiters}",
-      "delim=**[${1:type}][${2:style}]${3:delimiters}",
-      "moredelim=[${1:type}][${2:style}]${3:delimiters}",
-      "moredelim=*[${1:type}][${2:style}]${3:delimiters}",
-      "moredelim=**[${1:type}][${2:style}]${3:delimiters}",
-      "deletedelim=[${1:type}][${2:style}]${3:delimiters}",
-      "deletedelim=*[${1:type}][${2:style}]${3:delimiters}",
-      "deletedelim=**[${1:type}][${2:style}]${3:delimiters}",
-      "extendedchars",
-      "inputencoding=${1:encoding}",
-      "upquote",
-      "tabsize=${1:number}",
-      "showtabs",
-      "tab=${1:tokens}",
-      "showspaces",
-      "showstringspaces",
-      "formfeed=${1:tokens}",
-      "numbers=",
-      "stepnumber=${1:number}",
-      "numberfirstline",
-      "numberstyle=${1:style}",
-      "numbersep=",
-      "numberblanklines",
-      "firstnumber=${1:auto|last|<number>}",
-      "name=${1:name}",
-      "title=${1:title text}",
-      "caption={${1:caption text}}",
-      "caption={[${1:short}]${2:caption text}}",
-      "label=",
-      "nolol",
-      "numberbychapter",
-      "captionpos=${1:subset of tb}",
-      "abovecaptionskip=",
-      "belowcaptionskip=",
-      "linewidth=",
-      "xleftmargin=",
-      "xrightmargin=",
-      "resetmargins",
-      "breaklines",
-      "breakatwhitespace",
-      "prebreak=${1:tokens}",
-      "postbreak=${1:tokens}",
-      "breakindent=",
-      "breakautoindent",
-      "frame=${1:type}",
-      "frameround=",
-      "framesep=",
-      "rulesep=",
-      "framerule=",
-      "framexleftmargin=",
-      "framexrightmargin=",
-      "framextopmargin=",
-      "framexbottommargin=",
-      "backgroundcolor=",
-      "rulecolor=",
-      "fillcolor=",
-      "rulesepcolor=",
-      "frameshape={${1:top shape}}{${2:left shape}}{${3:right shape}}{${4:bottom shape}}",
-      "index={${1:identifiers}}",
-      "index=[${1:number}]{${2:identifiers}}",
-      "index=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
-      "moreindex={${1:identifiers}}",
-      "moreindex=[${1:number}]{${2:identifiers}}",
-      "moreindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
-      "deleteindex={${1:identifiers}}",
-      "deleteindex=[${1:number}]{${2:identifiers}}",
-      "deleteindex=[${1:number}][${2:keyword classes}]{${3:identifiers}}",
-      "indexstyle=${1:one-parameter macro}",
-      "indexstyle=[${1:number}]${2:one-parameter macro}",
-      "columns=${1:alignment}",
-      "columns=[${1:c|l|r}]${2:alignment}",
-      "flexiblecolumns",
-      "keepspaces",
-      "basewidth=",
-      "fontadjust",
-      "texcl",
-      "mathescape",
-      "escapechar=${1:character}",
-      "escapeinside=${1:<char1><char2>}",
-      "escapebegin=${1:tokens}",
-      "escapeend=${1:tokens}",
-      "fancyvrb",
-      "fvcmdparams=${1:<cmd1> <num1> ...}",
-      "morefvcmdparams=${1:<cmd1> <num1> ...}",
-      "literate={${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
-      "literate=*{${1:replace}}{${2:replacement text}}{${3:length}}${4:...}",
-      "rangebeginprefix=${1:prefix}",
-      "rangebeginsuffix=${1:suffix}",
-      "rangeendprefix=${1:prefix}",
-      "rangeendsuffix=${1:suffix}",
-      "rangeprefix=${1:prefix}",
-      "rangesuffix=${1:suffix}",
-      "includerangemarker",
-      "multicols=${1:number}",
-      "float",
-      "float=${1:subset of tbph}",
-      "float=*${1:subset of tbph}",
-      "floatplacement=${1:place specifiers}",
-      "firstline=${1:number}",
-      "lastline=${1:number}",
-      "linerange={${1:first1-last1,first2-last2,...}}",
-      "consecutivenumbers",
-      "keywordsprefix=${1:prefix}",
-      "keywords={${1:list of keywords}}",
-      "keywords=[${1:number}]{${2:list of keywords}}",
-      "morekeywords={${1:list of keywords}}",
-      "morekeywords=[${1:number}]{${2:list of keywords}}",
-      "deletekeywords={${1:list of keywords}}",
-      "deletekeywords=[${1:number}]{${2:list of keywords}}",
-      "ndkeywords={${1:list of keywords}}",
-      "moreendkeywords={${1:list of keywords}}",
-      "deleteendkeywords={${1:list of keywords}}",
-      "texcs={${1:list of csnames}}",
-      "texcs=[${1:class number}]{${2:list of csnames}}",
-      "moretexcs={${1:list of csnames}}",
-      "moretexcs=[${1:class number}]{${2:list of csnames}}",
-      "deletetexcs={${1:list of csnames}}",
-      "deletetexcs=[${1:class number}]{${2:list of csnames}}",
-      "directives={${1:list of compiler directives}}",
-      "moredirectives={${1:list of compiler directives}}",
-      "deletedirectives={${1:list of compiler directives}}",
-      "sensitive",
-      "alsoletter={${1:character sequence}}",
-      "alsodigit={${1:character sequence}}",
-      "alsoother={${1:character sequence}}",
-      "otherkeywords={${1:keywords}}",
-      "tag=${1:<char1><char2>}",
-      "string=${1:delimiter}",
-      "string=[${1:b|d|m|bd|s}]${2:delimiter}",
-      "morestring=${1:delimiter}",
-      "morestring=[${1:b|d|m|bd|s}]${2:delimiter}",
-      "deletestring=${1:delimiter}",
-      "deletestring=[${1:b|d|m|bd|s}]${2:delimiter}",
-      "comment=${1:delimiter(s)}",
-      "comment=[${1:type}]${2:delimiter(s)}",
-      "morecomment=${1:delimiter(s)}",
-      "morecomment=[${1:type}]${2:delimiter(s)}",
-      "deletecomment=${1:delimiter(s)}",
-      "deletecomment=[${1:type}]${2:delimiter(s)}",
-      "keywordcomment={${1:keywords}}",
-      "morekeywordcomment={${1:keywords}}",
-      "deletekeywordcomment={${1:keywords}}",
-      "keywordcommentsemicolon={${1:keywords}}{${2:keywords}}{${3:keywords}}",
-      "podcomment"
-    ],
-    [
-      "pre=",
-      "post="
-    ],
-    [
-      "id=",
-      "short=${1:short title}"
-    ],
-    [
-      "title={${1:text}}",
-      "style=",
-      "id=",
-      "ns=${1:URI}",
-      "lang=${1:language}",
-      "sig=${1:language}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/structmech.json b/dev/packages/structmech.json
index d783ebc79..ac32ce4a1 100644
--- a/dev/packages/structmech.json
+++ b/dev/packages/structmech.json
@@ -27,28 +27,28 @@
       "snippet": "NodalForce[${3:color}]{${1:x,y}}[${4:Hlabel}][${5:Vlabel}][${6:Rlabel}]{${2:rotation}}[${7:scale}]"
     },
     "BasicForce{}{}{}": {
-      "snippet": "BasicForce{${1:x1,${4:y1}}{${2:x2},y2}}{${3:label}}"
+      "snippet": "BasicForce{${1:x1,y1}}{${2:x2,y2}}{${3:label}}"
     },
     "BasicForce[]{}{}{}": {
-      "snippet": "BasicForce[${4:number}]{${1:x1,${5:y1}}{${2:x2},y2}}{${3:label}}"
+      "snippet": "BasicForce[${4:number}]{${1:x1,y1}}{${2:x2,y2}}{${3:label}}"
     },
     "BasicForce[]{}{}{}{}": {
-      "snippet": "BasicForce[${5:number}]{${1:x1,${6:y1}}{${2:x2},y2}}{${3:label}}{${4:TikZ keys}}"
+      "snippet": "BasicForce[${5:number}]{${1:x1,y1}}{${2:x2,y2}}{${3:label}}{${4:TikZ keys}}"
     },
     "BasicForce[]{}{}{}{}[][][]": {
-      "snippet": "BasicForce[${5:number}]{${1:x1,${9:y1}}{${2:x2},y2}}{${3:label}}{${4:TikZ keys}}[${6:label1}][${7:label2}][${8:label3}]"
+      "snippet": "BasicForce[${5:number}]{${1:x1,y1}}{${2:x2,y2}}{${3:label}}{${4:TikZ keys}}[${6:label1}][${7:label2}][${8:label3}]"
     },
     "UDL{}{}": {
-      "snippet": "UDL{${1:x1,${3:y1}}{${2:x2},y2}}"
+      "snippet": "UDL{${1:x1,y1}}{${2:x2,y2}}"
     },
     "UDL[]{}{}": {
-      "snippet": "UDL[${3:F}]{${1:x1,${4:y1}}{${2:x2},y2}}"
+      "snippet": "UDL[${3:F}]{${1:x1,y1}}{${2:x2,y2}}"
     },
     "UDL[]{}{}[]": {
-      "snippet": "UDL[${3:F}]{${1:x1,${5:y1}}{${2:x2},y2}}[${4:label}]"
+      "snippet": "UDL[${3:F}]{${1:x1,y1}}{${2:x2,y2}}[${4:label}]"
     },
     "UDL[]{}{}[]{}": {
-      "snippet": "UDL[${4:F}]{${1:x1,${6:y1}}{${2:x2},y2}}[${5:label}]{${3:scale}}"
+      "snippet": "UDL[${4:F}]{${1:x1,y1}}{${2:x2,y2}}[${5:label}]{${3:scale}}"
     },
     "HingeSupport{}": {
       "snippet": "HingeSupport{${1:x,y}}"
@@ -120,70 +120,70 @@
       "snippet": "CoorOrigin[${3:rotation}]{${1:x,y}}[${4:xlabel}][${5:ylabel}]{${2:scale}}"
     },
     "IForceA{}{}{}{}": {
-      "snippet": "IForceA{${1:x1,${5:y1}}{${2:x2},y2}}{${3:force-lower}}{${4:force-higher}}"
+      "snippet": "IForceA{${1:x1,y1}}{${2:x2,y2}}{${3:force-lower}}{${4:force-higher}}"
     },
     "IForceA[]{}{}{}{}": {
-      "snippet": "IForceA[${5:color}]{${1:x1,${6:y1}}{${2:x2},y2}}{${3:force-lower}}{${4:force-higher}}"
+      "snippet": "IForceA[${5:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:force-lower}}{${4:force-higher}}"
     },
     "IForceA[]{}{}{}{}{}": {
-      "snippet": "IForceA[${6:color}]{${1:x1,${7:y1}}{${2:x2},y2}}{${3:force-lower}}{${4:force-higher}}{${5:scale}}"
+      "snippet": "IForceA[${6:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:force-lower}}{${4:force-higher}}{${5:scale}}"
     },
     "IForceB{}{}{}{}{}": {
-      "snippet": "IForceB{${1:x1,${6:y1}}{${2:x2},y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
+      "snippet": "IForceB{${1:x1,y1}}{${2:x2,y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
     },
     "IForceB[]{}{}{}{}{}": {
-      "snippet": "IForceB[${6:color}]{${1:x1,${7:y1}}{${2:x2},y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
+      "snippet": "IForceB[${6:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}"
     },
     "IForceB[]{}{}{}{}{}{}": {
-      "snippet": "IForceB[${7:color}]{${1:x1,${8:y1}}{${2:x2},y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}{${6:scale}}"
+      "snippet": "IForceB[${7:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:moment-lower}}{${4:moment-higher}}{${5:increment}}{${6:scale}}"
     },
     "BeamDeformP{}{}{}{}": {
-      "snippet": "BeamDeformP{${1:x1,${5:y1}}{${2:x2},y2}}{${3:disp-lower}}{${4:disp-higher}}"
+      "snippet": "BeamDeformP{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}{${4:disp-higher}}"
     },
     "BeamDeformP[]{}{}{}{}": {
-      "snippet": "BeamDeformP[${5:color}]{${1:x1,${6:y1}}{${2:x2},y2}}{${3:disp-lower}}{${4:disp-higher}}"
+      "snippet": "BeamDeformP[${5:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}{${4:disp-higher}}"
     },
     "BeamDeformP[]{}{}{}[]{}[]": {
-      "snippet": "BeamDeformP[${5:color}]{${1:x1,${8:y1}}{${2:x2},y2}}{${3:disp-lower}}[${6:rot-lower}]{${4:disp-higher}}[${7:rot-higher}]"
+      "snippet": "BeamDeformP[${5:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}[${6:rot-lower}]{${4:disp-higher}}[${7:rot-higher}]"
     },
     "BeamDeformP[]{}{}{}[]{}[]{}": {
-      "snippet": "BeamDeformP[${6:color}]{${1:x1,${9:y1}}{${2:x2},y2}}{${3:disp-lower}}[${7:rot-lower}]{${4:disp-higher}}[${8:rot-higher}]{${5:scale}}"
+      "snippet": "BeamDeformP[${6:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:disp-lower}}[${7:rot-lower}]{${4:disp-higher}}[${8:rot-higher}]{${5:scale}}"
     },
     "BeamDeformR{}{}": {
-      "snippet": "BeamDeformR{${1:x1,${3:y1}}{${2:x2},y2}}"
+      "snippet": "BeamDeformR{${1:x1,y1}}{${2:x2,y2}}"
     },
     "BeamDeformR[]{}{}": {
-      "snippet": "BeamDeformR[${3:color}]{${1:x1,${4:y1}}{${2:x2},y2}}"
+      "snippet": "BeamDeformR[${3:color}]{${1:x1,y1}}{${2:x2,y2}}"
     },
     "BeamDeformR[]{}{}[][]": {
-      "snippet": "BeamDeformR[${3:color}]{${1:x1,${6:y1}}{${2:x2},y2}}[${4:rot-lower}][${5:rot-higher}]"
+      "snippet": "BeamDeformR[${3:color}]{${1:x1,y1}}{${2:x2,y2}}[${4:rot-lower}][${5:rot-higher}]"
     },
     "BeamDeformR[]{}{}[][]{}": {
-      "snippet": "BeamDeformR[${4:color}]{${1:x1,${7:y1}}{${2:x2},y2}}[${5:rot-lower}][${6:rot-higher}]{${3:scale}}"
+      "snippet": "BeamDeformR[${4:color}]{${1:x1,y1}}{${2:x2,y2}}[${5:rot-lower}][${6:rot-higher}]{${3:scale}}"
     },
     "Dashpot{}{}": {
-      "snippet": "Dashpot{${1:x1,${3:y1}}{${2:x2},y2}}"
+      "snippet": "Dashpot{${1:x1,y1}}{${2:x2,y2}}"
     },
     "Dashpot{}{}{}": {
-      "snippet": "Dashpot{${1:x1,${4:y1}}{${2:x2},y2}}{${3:scale}}"
+      "snippet": "Dashpot{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
     },
     "Dashpot[]{}{}": {
-      "snippet": "Dashpot[${3:color}]{${1:x1,${4:y1}}{${2:x2},y2}}"
+      "snippet": "Dashpot[${3:color}]{${1:x1,y1}}{${2:x2,y2}}"
     },
     "Dashpot[]{}{}{}": {
-      "snippet": "Dashpot[${4:color}]{${1:x1,${5:y1}}{${2:x2},y2}}{${3:scale}}"
+      "snippet": "Dashpot[${4:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
     },
     "Spring{}{}": {
-      "snippet": "Spring{${1:x1,${3:y1}}{${2:x2},y2}}"
+      "snippet": "Spring{${1:x1,y1}}{${2:x2,y2}}"
     },
     "Spring{}{}{}": {
-      "snippet": "Spring{${1:x1,${4:y1}}{${2:x2},y2}}{${3:scale}}"
+      "snippet": "Spring{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
     },
     "Spring[]{}{}": {
-      "snippet": "Spring[${3:color}]{${1:x1,${4:y1}}{${2:x2},y2}}"
+      "snippet": "Spring[${3:color}]{${1:x1,y1}}{${2:x2,y2}}"
     },
     "Spring[]{}{}{}": {
-      "snippet": "Spring[${4:color}]{${1:x1,${5:y1}}{${2:x2},y2}}{${3:scale}}"
+      "snippet": "Spring[${4:color}]{${1:x1,y1}}{${2:x2,y2}}{${3:scale}}"
     },
     "Angle": {},
     "FAC": {},
diff --git a/dev/packages/struktex.json b/dev/packages/struktex.json
index 8bb4d27c0..33ef1fae6 100644
--- a/dev/packages/struktex.json
+++ b/dev/packages/struktex.json
@@ -140,14 +140,6 @@
     "dfrend": {}
   },
   "envs": {
-    "struktogramm(width,height)": {
-      "name": "struktogramm",
-      "snippet": "(${1:width},${2:height})"
-    },
-    "struktogramm(width,height)[]": {
-      "name": "struktogramm",
-      "snippet": "(${2:width},${3:height})[${1:title}]"
-    },
     "declaration": {},
     "declaration[]": {
       "name": "declaration",
diff --git a/dev/packages/styledcmd.json b/dev/packages/styledcmd.json
index cbbb8fcb1..b619881a4 100644
--- a/dev/packages/styledcmd.json
+++ b/dev/packages/styledcmd.json
@@ -52,7 +52,7 @@
       "snippet": "providestyledcmdExp{${1:cmd}}{${2:style name}}[${3:args}]{${4:definition}}"
     },
     "AddCMDToGroup{}{}": {
-      "snippet": "AddCMDToGroup{${1:group name}}{${2:cmd1,${3:cmd2},...}}"
+      "snippet": "AddCMDToGroup{${1:group name}}{${2:cmd1,cmd2,...}}"
     },
     "SetGroupStyle{}{}": {
       "snippet": "SetGroupStyle{${1:group name}}{${2:style name}}"
diff --git a/dev/packages/subfigure.json b/dev/packages/subfigure.json
index 1b0c33e68..f1f87bac9 100644
--- a/dev/packages/subfigure.json
+++ b/dev/packages/subfigure.json
@@ -49,9 +49,6 @@
     "iftabletopcap": {},
     "tabletopcaptrue": {},
     "tabletopcapfalse": {},
-    "label(){}": {
-      "snippet": "label(${2:bookmark}){${1:key}}"
-    },
     "subcapfont": {},
     "subcaplabelfont": {},
     "subcapsize": {},
diff --git a/dev/packages/sudoku.json b/dev/packages/sudoku.json
deleted file mode 100644
index 930a7f9b3..000000000
--- a/dev/packages/sudoku.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "sudokuformat": {},
-    "sudokusize": {},
-    "sudokuthickline": {},
-    "sudokuthinline": {}
-  },
-  "envs": {
-    "sudoku": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/suffix.json b/dev/packages/suffix.json
deleted file mode 100644
index bd04b2481..000000000
--- a/dev/packages/suffix.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/sverb.json b/dev/packages/sverb.json
deleted file mode 100644
index 2cb6b4958..000000000
--- a/dev/packages/sverb.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "listingsize": {},
-    "listingindent": {},
-    "verbinput{}": {
-      "snippet": "verbinput{${1:file}}"
-    },
-    "matcher{}{}{}": {
-      "snippet": "matcher{${1:cmd}}{${2:target}}{${3:process-cmd}}"
-    }
-  },
-  "envs": {
-    "listing": {},
-    "listing*{}": {
-      "name": "listing*",
-      "snippet": "{${1:end string}}"
-    },
-    "verbwrite{}": {
-      "name": "verbwrite",
-      "snippet": "{${1:file}}"
-    },
-    "demo{}": {
-      "name": "demo",
-      "snippet": "{${1:title}}"
-    },
-    "demo[]{}": {
-      "name": "demo",
-      "snippet": "[${2:shape}]{${1:title}}"
-    },
-    "ignore": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/svg.json b/dev/packages/svg.json
deleted file mode 100644
index 9bb95c627..000000000
--- a/dev/packages/svg.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "includes": {
-    "iftex": [],
-    "scrbase": [],
-    "pdftexcmds": [],
-    "trimspaces": [],
-    "graphicx": [],
-    "shellesc": [],
-    "ifplatform": [],
-    "xcolor": [],
-    "transparent": [],
-    "pgfsys": []
-  },
-  "macros": {
-    "svgsetup{}": {
-      "snippet": "svgsetup{${1:options}}"
-    },
-    "svgpath{}": {
-      "snippet": "svgpath{${1:path}}"
-    },
-    "includesvg{}": {
-      "snippet": "includesvg{${1:imagefile}}"
-    },
-    "includesvg[]{}": {
-      "snippet": "includesvg[${2:options}]{${1:imagefile}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "includeinkscape{}": {
-      "snippet": "includeinkscape{${1:imagefile}}"
-    },
-    "includeinkscape[]{}": {
-      "snippet": "includeinkscape[${2:options}]{${1:imagefile}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "setsvg{}": {
-      "snippet": "setsvg{${1:options}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "usexcolor=",
-    "usetransparent=",
-    "noxcolor",
-    "notransparent",
-    "inkscape=",
-    "inkscapepath=",
-    "inkscapeexe=${1:exec path}",
-    "inkscapeversion=",
-    "inkscapename=${1:file name}",
-    "inkscapeformat=",
-    "inkscapelatex",
-    "inkscapearea=",
-    "inkscapedpi=${1:integer}",
-    "inkscapeopt=${1:Inkscape option}",
-    "svgextension=${1:extension}",
-    "width=",
-    "height=",
-    "distort",
-    "scale=${1:factor}",
-    "pretex=${1:code}",
-    "apptex=${1:code}",
-    "draft",
-    "lastpage"
-  ],
-  "keyvals": [
-    [
-      "inkscape=",
-      "inkscapeformat=",
-      "inkscapelatex",
-      "inkscapearea=",
-      "inkscapedpi=${1:integer}",
-      "inkscapeopt=${1:Inkscape option}",
-      "svgextension=${1:extension}",
-      "width=",
-      "height=",
-      "distort",
-      "scale=${1:factor}",
-      "pretex=${1:code}",
-      "apptex=${1:code}",
-      "draft",
-      "lastpage",
-      "angle=${1:degrees}",
-      "origin="
-    ],
-    [
-      "inkscapeformat=",
-      "inkscapelatex",
-      "width=",
-      "height=",
-      "distort",
-      "scale=${1:factor}",
-      "pretex=${1:code}",
-      "apptex=${1:code}",
-      "draft",
-      "lastpage",
-      "angle=${1:degrees}",
-      "origin="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/swfigure.json b/dev/packages/swfigure.json
index 4b379f520..4912e0075 100644
--- a/dev/packages/swfigure.json
+++ b/dev/packages/swfigure.json
@@ -18,9 +18,6 @@
     "DFimage[]{}[]{}[]": {
       "snippet": "DFimage[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}]"
     },
-    "DFimage[]{}[]{}[]()<>": {
-      "snippet": "DFimage[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}](${7:height coor})<${6:line corr}>"
-    },
     "cleartoeven{}": {
       "snippet": "cleartoeven{${1:number}}"
     },
@@ -73,9 +70,6 @@
     "FSfigure{}[]{}[]": {
       "snippet": "FSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "FSfigure{}[]{}[]()<>": {
-      "snippet": "FSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "FSfigure{}{}": {
       "snippet": "FSfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -88,9 +82,6 @@
     "HSfigure{}[]{}[]": {
       "snippet": "HSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "HSfigure{}[]{}[]()<>": {
-      "snippet": "HSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "HSfigure{}{}": {
       "snippet": "HSfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -104,9 +95,6 @@
     "NFfigure{}[]{}[]": {
       "snippet": "NFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "NFfigure{}[]{}[]()<>": {
-      "snippet": "NFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "NFfigure{}{}": {
       "snippet": "NFfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -119,9 +107,6 @@
     "RFfigure{}[]{}[]": {
       "snippet": "RFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "RFfigure{}[]{}[]()<>": {
-      "snippet": "RFfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "RFfigure{}{}": {
       "snippet": "RFfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -131,7 +116,7 @@
     "RFx": {},
     "RFy": {},
     "SetList{}{}": {
-      "snippet": "SetList{${1:cmd}}{${2:item1,${3:item2},...}}"
+      "snippet": "SetList{${1:cmd}}{${2:item1,item2,...}}"
     },
     "spreadwidth": {},
     "SWcaptionShift": {},
@@ -141,9 +126,6 @@
     "SWfigure{}[]{}[]": {
       "snippet": "SWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "SWfigure{}[]{}[]()<>": {
-      "snippet": "SWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "SWfigure{}{}": {
       "snippet": "SWfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -159,9 +141,6 @@
     "THfigure{}[]{}[]": {
       "snippet": "THfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "THfigure{}[]{}[]()<>": {
-      "snippet": "THfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "THfigure{}{}": {
       "snippet": "THfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -175,9 +154,6 @@
     "TWfigure{}[]{}[]": {
       "snippet": "TWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "TWfigure{}[]{}[]()<>": {
-      "snippet": "TWfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "TWfigure{}{}": {
       "snippet": "TWfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -190,9 +166,6 @@
     "VSfigure{}[]{}[]": {
       "snippet": "VSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}]"
     },
-    "VSfigure{}[]{}[]()<>": {
-      "snippet": "VSfigure{${1:imagefile}}[${2:lof entry}]{${3:caption}}[${4:label}](${6:height coor})<${5:line corr}>"
-    },
     "VSfigure{}{}": {
       "snippet": "VSfigure{${1:imagefile}}{${2:caption}}"
     },
@@ -216,10 +189,6 @@
     "DFimage[]{}[]{}[]": {
       "name": "DFimage",
       "snippet": "[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}]"
-    },
-    "DFimage[]{}[]{}[](height coor)<>": {
-      "name": "DFimage",
-      "snippet": "[${3:mode}]{${1:imagefile}}[${4:lof entry}]{${2:caption}}[${5:label}](${7:height coor})<${6:line corr}>"
     }
   },
   "options": [],
diff --git a/dev/packages/synthslant.json b/dev/packages/synthslant.json
index 1cfcba6b0..cade81c80 100644
--- a/dev/packages/synthslant.json
+++ b/dev/packages/synthslant.json
@@ -1,6 +1,5 @@
 {
   "includes": {
-    "etoolbox": [],
     "iftex": [],
     "xkeyval": [],
     "fontspec": [
diff --git a/dev/packages/systeme.json b/dev/packages/systeme.json
index f3aaae59b..d384ae0ff 100644
--- a/dev/packages/systeme.json
+++ b/dev/packages/systeme.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "systeme{}": {
-      "snippet": "systeme{${1:eq1,${2:eq2},...}}"
+      "snippet": "systeme{${1:eq1,eq2,...}}"
     },
     "systeme[]{}": {
-      "snippet": "systeme[${2:alignment_chars}]{${1:eq1,${3:eq2},...}}"
+      "snippet": "systeme[${2:alignment_chars}]{${1:eq1,eq2,...}}"
     },
     "syslineskipcoeff{}": {
       "snippet": "syslineskipcoeff{${1:value}}"
diff --git a/dev/packages/tableof.json b/dev/packages/tableof.json
deleted file mode 100644
index 09c0d080f..000000000
--- a/dev/packages/tableof.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "includes": {
-    "atveryend": []
-  },
-  "macros": {
-    "toftagstart{}": {
-      "snippet": "toftagstart{${1:tag1,${2:tag2},...}}"
-    },
-    "toftagstop{}": {
-      "snippet": "toftagstop{${1:tag1,${2:tag2},...}}"
-    },
-    "toftagthis{}": {
-      "snippet": "toftagthis{${1:tag1,${2:tag2},...}}"
-    },
-    "tofuntagthis{}": {
-      "snippet": "tofuntagthis{${1:tag1,${2:tag2},...}}"
-    },
-    "nexttocwithtags{}{}": {
-      "snippet": "nexttocwithtags{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "nexttocwithtags*{}{}": {
-      "snippet": "nexttocwithtags*{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "nexttocwithtags{}*{}": {
-      "snippet": "nexttocwithtags{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "nexttocwithtags*{}*{}": {
-      "snippet": "nexttocwithtags*{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "tableoftaggedcontents{}{}": {
-      "snippet": "tableoftaggedcontents{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "tableoftaggedcontents*{}{}": {
-      "snippet": "tableoftaggedcontents*{${1:required-tag1,${3:required-tag2},${4:...}}{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "tableoftaggedcontents{}*{}": {
-      "snippet": "tableoftaggedcontents{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "tableoftaggedcontents*{}*{}": {
-      "snippet": "tableoftaggedcontents*{${1:required-tag1,${3:required-tag2},${4:...}}*{${2:excluded-tag1},${5:excluded-tag2},...}}"
-    },
-    "tableof{}": {
-      "snippet": "tableof{${1:required-tag1,${2:required-tag2},...}}"
-    },
-    "tableof*{}": {
-      "snippet": "tableof*{${1:required-tag1,${2:required-tag2},...}}"
-    },
-    "tablenotof{}": {
-      "snippet": "tablenotof{${1:excluded-tag1,${2:excluded-tag2},...}}"
-    },
-    "tablenotof*{}": {
-      "snippet": "tablenotof*{${1:excluded-tag1,${2:excluded-tag2},...}}"
-    },
-    "tofOpenTocFileForWrite": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/tablvar.json b/dev/packages/tablvar.json
index 05245f151..0c5a6df68 100644
--- a/dev/packages/tablvar.json
+++ b/dev/packages/tablvar.json
@@ -30,7 +30,7 @@
     },
     "discont": {},
     "hachure{}{}": {
-      "snippet": "hachure{${1:llx,${3:lly}}{${2:urx},ury}}"
+      "snippet": "hachure{${1:llx,lly}}{${2:urx,ury}}"
     },
     "haut{}": {
       "snippet": "haut{${1:label}}"
diff --git a/dev/packages/tabstackengine.json b/dev/packages/tabstackengine.json
index c956744f2..a49c05df1 100644
--- a/dev/packages/tabstackengine.json
+++ b/dev/packages/tabstackengine.json
@@ -32,7 +32,7 @@
     },
     "TABruleshift": {},
     "TABcline{}": {
-      "snippet": "TABcline{${1:cols1,${2:cols2},...}}"
+      "snippet": "TABcline{${1:cols1,cols2,...}}"
     },
     "relaxTABsyntax": {
       "option": "TABcline"
diff --git a/dev/packages/tabto.json b/dev/packages/tabto.json
index a015114d0..a48c96ee4 100644
--- a/dev/packages/tabto.json
+++ b/dev/packages/tabto.json
@@ -11,7 +11,7 @@
     "TabPrevPos": {},
     "tab": {},
     "TabPositions{}": {
-      "snippet": "TabPositions{${1:length1,${2:length2},...}}"
+      "snippet": "TabPositions{${1:length1,length2,...}}"
     },
     "NumTabs{}": {
       "snippet": "NumTabs{${1:number}}"
diff --git a/dev/packages/tabu.json b/dev/packages/tabu.json
deleted file mode 100644
index d88a74fab..000000000
--- a/dev/packages/tabu.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "includes": {
-    "array": [],
-    "varwidth": [],
-    "delarray": [
-      "delarray"
-    ],
-    "linegoal": [
-      "linegoal"
-    ]
-  },
-  "macros": {
-    "tabulinestyle{}": {
-      "snippet": "tabulinestyle{${1:style}}"
-    },
-    "usetabu{}": {
-      "snippet": "usetabu{${1:username}}"
-    },
-    "tabucline{}": {
-      "snippet": "tabucline{${1:from-to}}"
-    },
-    "tabucline[]{}": {
-      "snippet": "tabucline[${2:spec}]{${1:from-to}}"
-    },
-    "savetabu{}": {
-      "snippet": "savetabu{${1:username}}"
-    },
-    "preamble{}": {
-      "snippet": "preamble{${1:username}}"
-    },
-    "tabuphantomline": {},
-    "extrarowdepth": {},
-    "abovetabulinesep": {},
-    "belowtabulinesep": {},
-    "tabustrutrule": {},
-    "taburulecolor{}": {
-      "snippet": "taburulecolor|${2:doubleRuleSepColor}|{${1:color}}"
-    },
-    "tabureset": {},
-    "newtabulinestyle{}": {
-      "snippet": "newtabulinestyle{${1:style}}"
-    },
-    "everyrow{}": {
-      "snippet": "everyrow{${1:code}}"
-    },
-    "rowfont[]{}": {
-      "snippet": "rowfont[${2:alignment}]{${1:fontSpec}}"
-    },
-    "tabudecimal{}": {
-      "snippet": "tabudecimal{${1:code}}"
-    },
-    "firstline": {},
-    "lastline": {},
-    "iftabuscantokens": {},
-    "tabuscantokenstrue": {},
-    "tabuscantokensfalse": {},
-    "tabucolumn{}": {
-      "snippet": "tabucolumn{${1:arg}}"
-    },
-    "tabucolX": {},
-    "tabudefaulttarget": {},
-    "tabuDisableCommands": {},
-    "tabuendlongtrial": {},
-    "tabulineoff": {},
-    "tabulineon": {},
-    "tabuthepreamble": {},
-    "thetaburow": {},
-    "tracingtabu": {}
-  },
-  "envs": {
-    "tabu{}": {
-      "name": "tabu",
-      "snippet": "{${1:preamble}}"
-    },
-    "longtabu{}": {
-      "name": "longtabu",
-      "snippet": "{${1:preamble}}"
-    }
-  },
-  "options": [
-    "delarray",
-    "linegoal",
-    "scantokens",
-    "debugshow"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/tabularcalc.json b/dev/packages/tabularcalc.json
index 0e8f53e58..3a42bde07 100644
--- a/dev/packages/tabularcalc.json
+++ b/dev/packages/tabularcalc.json
@@ -6,11 +6,11 @@
   },
   "macros": {
     "htablecalc{}{}{}{}": {
-      "snippet": "htablecalc{${1:cell (${5:0},${6:0})}}{${2:var=val1,${7:val2},...}}{${3:label}}{${4:formula}}"
+      "snippet": "htablecalc{${1:cell (${5:0,0})}}{${2:var=val1,val2,...}}{${3:label}}{${4:formula}}"
     },
     "tclistsep": {},
     "vtablecalc{}{}{}{}": {
-      "snippet": "vtablecalc{${1:cell (${5:0},${6:0})}}{${2:var=val1,${7:val2},...}}{${3:label}}{${4:formula}}"
+      "snippet": "vtablecalc{${1:cell (${5:0,0})}}{${2:var=val1,val2,...}}{${3:label}}{${4:formula}}"
     },
     "tcnoshowmark": {},
     "tcatbeginrow": {},
diff --git a/dev/packages/tagpdf.json b/dev/packages/tagpdf.json
index e69dbe4b5..850d45f92 100644
--- a/dev/packages/tagpdf.json
+++ b/dev/packages/tagpdf.json
@@ -41,6 +41,9 @@
     },
     "tagpdfsuppressmarks{}": {
       "snippet": "tagpdfsuppressmarks{${1:arg}}"
+    },
+    "UseTaggingSocket{}": {
+      "snippet": "UseTaggingSocket{${1:socket name}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/tasks.json b/dev/packages/tasks.json
index aa8f15119..847ec4429 100644
--- a/dev/packages/tasks.json
+++ b/dev/packages/tasks.json
@@ -7,22 +7,10 @@
     "task[]": {
       "snippet": "task[${1:label text}]"
     },
-    "task[]()": {
-      "snippet": "task[${1:label text}](${2:cols})"
-    },
-    "task()": {
-      "snippet": "task(${1:cols})"
-    },
     "task*": {},
     "task*[]": {
       "snippet": "task*[${1:label text}]"
     },
-    "task*[]()": {
-      "snippet": "task*[${1:label text}](${2:cols})"
-    },
-    "task*()": {
-      "snippet": "task*(${1:cols})"
-    },
     "startnewitemline": {},
     "settasks{}": {
       "snippet": "settasks{${1:keyvals}}",
@@ -32,19 +20,9 @@
     "NewTasksEnvironment{}": {
       "snippet": "NewTasksEnvironment{${1:envname}}"
     },
-    "NewTasksEnvironment[]{}[]()": {
-      "snippet": "NewTasksEnvironment[${2:keyvals}]{${1:envname}}[${3:separator}](${4:cols})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "RenewTasksEnvironment{}": {
       "snippet": "RenewTasksEnvironment{${1:envname}}"
     },
-    "RenewTasksEnvironment[]{}[]()": {
-      "snippet": "RenewTasksEnvironment[${2:keyvals}]{${1:envname}}[${3:separator}](${4:cols})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
     "tasksifmeasuringTF{}{}": {
       "snippet": "tasksifmeasuringTF{${1:true}}{${2:false}}"
     },
@@ -65,16 +43,6 @@
       "snippet": "[${1:keyvals}]",
       "keyvalindex": 0,
       "keyvalpos": 0
-    },
-    "tasks[](cols)": {
-      "name": "tasks",
-      "snippet": "[${1:keyvals}](${2:cols})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "tasks(cols)": {
-      "name": "tasks",
-      "snippet": "(${1:cols})"
     }
   },
   "options": [],
diff --git a/dev/packages/tcolorbox.json b/dev/packages/tcolorbox.json
index d9199d4b2..d5522ce87 100644
--- a/dev/packages/tcolorbox.json
+++ b/dev/packages/tcolorbox.json
@@ -2,7 +2,7 @@
   "includes": {
     "environ": [],
     "etoolbox": [],
-    "tikz": [],
+    "pgf": [],
     "verbatim": [],
     "tcolorboxlibraryskins": [
       "skins"
@@ -815,6 +815,7 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
+      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
@@ -1164,6 +1165,7 @@
       "skin first=${1:name}",
       "skin middle=${1:name}",
       "skin last=${1:name}",
+      "graphical environment=${1:envname}",
       "frame engine=",
       "interior titled engine=",
       "interior engine=",
diff --git a/dev/packages/tcolorboxlibrarydocumentation.json b/dev/packages/tcolorboxlibrarydocumentation.json
index 75f2d7b92..63cbebb85 100644
--- a/dev/packages/tcolorboxlibrarydocumentation.json
+++ b/dev/packages/tcolorboxlibrarydocumentation.json
@@ -313,7 +313,6 @@
       "doc into index",
       "doc no index",
       "keywords bold",
-      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -398,7 +397,6 @@
       "doc head key={${1:options}}",
       "doc raster key={${1:options}}",
       "keywords bold",
-      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -477,7 +475,6 @@
       "doc head command={${1:options}}",
       "doc raster command={${1:options}}",
       "keywords bold",
-      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -556,7 +553,6 @@
       "doc head environment={${1:options}}",
       "doc raster environment={${1:options}}",
       "keywords bold",
-      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -635,7 +631,6 @@
       "doc head path={${1:options}}",
       "doc raster path={${1:options}}",
       "keywords bold",
-      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
@@ -696,8 +691,9 @@
       "documentation minted options={${1:minted keys}}",
       "documentation minted style=${1:minted style}",
       "documentation minted language=${1:language}",
+      "before example={${1:code}}",
+      "after example={${1:code}}",
       "keywords bold",
-      "page ref formatter=${1:macro}",
       "index command=${1:macro}",
       "index command name=${1:name}",
       "index format=",
diff --git a/dev/packages/tcolorboxlibraryskins.json b/dev/packages/tcolorboxlibraryskins.json
index 4c6433f5a..ca9c55f26 100644
--- a/dev/packages/tcolorboxlibraryskins.json
+++ b/dev/packages/tcolorboxlibraryskins.json
@@ -1,5 +1,6 @@
 {
   "includes": {
+    "tikz": [],
     "tikzfill.image": []
   },
   "macros": {
diff --git a/dev/packages/ted.json b/dev/packages/ted.json
deleted file mode 100644
index 069b1e140..000000000
--- a/dev/packages/ted.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "Substitute{}{}{}": {
-      "snippet": "Substitute{${1:input}}{${2:from}}{${3:to}}"
-    },
-    "Substitute*{}{}{}": {
-      "snippet": "Substitute*{${1:input}}{${2:from}}{${3:to}}"
-    },
-    "Substitute[]{}{}{}": {
-      "snippet": "Substitute[${4:output}]{${1:input}}{${2:from}}{${3:to}}"
-    },
-    "Substitute*[]{}{}{}": {
-      "snippet": "Substitute*[${4:output}]{${1:input}}{${2:from}}{${3:to}}"
-    },
-    "ShowTokens{}": {
-      "snippet": "ShowTokens{${1:token list}}"
-    },
-    "ShowTokens*{}": {
-      "snippet": "ShowTokens*{${1:token list}}"
-    },
-    "ShowTokensLogonly": {},
-    "ShowTokensOnline": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/tensor.json b/dev/packages/tensor.json
deleted file mode 100644
index 09f07cca4..000000000
--- a/dev/packages/tensor.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "indices{}": {
-      "snippet": "indices{${1:^sup1_sub1^sup2_sub2...}}"
-    },
-    "indices*{}": {
-      "snippet": "indices*{${1:^sup1_sub1^sup2_sub2...}}"
-    },
-    "tensor{}{}": {
-      "snippet": "tensor{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
-    },
-    "tensor[]{}{}": {
-      "snippet": "tensor[${3:pre-indices}]{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
-    },
-    "tensor*{}{}": {
-      "snippet": "tensor*{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
-    },
-    "tensor*[]{}{}": {
-      "snippet": "tensor*[${3:pre-indices}]{${1:symbol}}{${2:^sup1_sub1^sup2_sub2...}}"
-    },
-    "indexmarker": {},
-    "nuclide{}": {
-      "snippet": "nuclide{${1:symbol}}"
-    },
-    "nuclide[]{}": {
-      "snippet": "nuclide[${2:mass no}]{${1:symbol}}"
-    },
-    "nuclide[][]{}": {
-      "snippet": "nuclide[${2:mass no}][${3:atomic no}]{${1:symbol}}"
-    },
-    "nuclideFont": {},
-    "massnumFont": {},
-    "tensorSmash": {},
-    "tensorStrut": {}
-  },
-  "envs": {},
-  "options": [
-    "align",
-    "text",
-    "nosmash",
-    "nostrut"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/tex.json b/dev/packages/tex.json
deleted file mode 100644
index 984786914..000000000
--- a/dev/packages/tex.json
+++ /dev/null
@@ -1,1425 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "above": {},
-    "abovedisplayshortskip": {},
-    "abovedisplayskip": {},
-    "abovewithdelims": {},
-    "accent": {},
-    "adjdemerits": {},
-    "advance": {},
-    "afterassignment": {},
-    "aftergroup": {},
-    "atop": {},
-    "atopwithdelims": {},
-    "badness": {},
-    "baselineskip": {},
-    "batchmode": {},
-    "begingroup": {},
-    "belowdisplayshortskip": {},
-    "belowdisplayskip": {},
-    "binoppenalty": {},
-    "botmark": {},
-    "box": {},
-    "boxmaxdepth": {},
-    "brokenpenalty": {},
-    "catcode": {},
-    "char": {},
-    "chardef": {},
-    "chardef{}": {
-      "snippet": "chardef{${1:cmd}}"
-    },
-    "cleaders": {},
-    "closein": {},
-    "closeout": {},
-    "clubpenalty": {},
-    "copy": {},
-    "count": {},
-    "countdef": {},
-    "countdef{}": {
-      "snippet": "countdef{${1:cmd}}"
-    },
-    "cr": {},
-    "crcr": {},
-    "csname": {},
-    "day": {},
-    "deadcycles": {},
-    "def": {},
-    "def{}": {
-      "snippet": "def{${1:cmd}}"
-    },
-    "defaulthyphenchar": {},
-    "defaultskewchar": {},
-    "delcode": {},
-    "delimiter": {},
-    "delimiterfactor": {},
-    "delimitershortfall": {},
-    "dimen": {},
-    "dimendef": {},
-    "dimendef{}": {
-      "snippet": "dimendef{${1:cmd}}"
-    },
-    "discretionary{}{}{}": {
-      "snippet": "discretionary{${1:pre-break}}{${2:post-break}}{${3:no-break}}"
-    },
-    "displayindent": {},
-    "displaylimits": {},
-    "displaywidowpenalty": {},
-    "displaywidth": {},
-    "divide": {},
-    "doublehyphendemerits": {},
-    "dp": {},
-    "dump": {},
-    "edef": {},
-    "edef{}": {
-      "snippet": "edef{${1:cmd}}"
-    },
-    "else": {},
-    "emergencystretch": {},
-    "end": {},
-    "endcsname": {},
-    "endgroup": {},
-    "endinput": {},
-    "endlinechar": {},
-    "eqno{}": {
-      "snippet": "eqno{${1:eqn num}}"
-    },
-    "errhelp": {},
-    "errmessage{}": {
-      "snippet": "errmessage{${1:text}}"
-    },
-    "errorcontextlines": {},
-    "errorstopmode": {},
-    "escapechar": {},
-    "everycr": {},
-    "everydisplay": {},
-    "everyhbox": {},
-    "everyjob": {},
-    "everymath": {},
-    "everypar": {},
-    "everyvbox": {},
-    "exhyphenpenalty": {},
-    "expandafter": {},
-    "fam": {},
-    "fi": {},
-    "finalhyphendemerits": {},
-    "firstmark": {},
-    "floatingpenalty": {},
-    "font": {},
-    "font{}": {
-      "snippet": "font{${1:cmd}}"
-    },
-    "fontdimen": {},
-    "fontname": {},
-    "futurelet": {},
-    "futurelet{}": {
-      "snippet": "futurelet{${1:cmd}}"
-    },
-    "gdef": {},
-    "gdef{}": {
-      "snippet": "gdef{${1:cmd}}"
-    },
-    "global": {},
-    "globaldefs": {},
-    "halign": {},
-    "hangafter": {},
-    "hangindent": {},
-    "hbadness": {},
-    "hbox{}": {
-      "snippet": "hbox{${1:text}}"
-    },
-    "hfil": {},
-    "hfill": {},
-    "hfilneg": {},
-    "hfuzz": {},
-    "hoffset": {},
-    "holdinginserts": {},
-    "hrule": {},
-    "hsize": {},
-    "hskip": {},
-    "hss": {},
-    "ht": {},
-    "hyphenation{}": {
-      "snippet": "hyphenation{${1:space separated words}}"
-    },
-    "hyphenchar": {},
-    "hyphenpenalty": {},
-    "if": {},
-    "ifcase": {},
-    "ifcat": {},
-    "ifdim": {},
-    "ifeof": {},
-    "iffalse": {},
-    "ifhbox": {},
-    "ifhmode": {},
-    "ifinner": {},
-    "ifmmode": {},
-    "ifnum": {},
-    "ifodd": {},
-    "iftrue": {},
-    "ifvbox": {},
-    "ifvmode": {},
-    "ifvoid": {},
-    "ifx": {},
-    "ignorespaces": {},
-    "immediate": {},
-    "indent": {},
-    "insert": {},
-    "insertpenalties": {},
-    "interlinepenalty": {},
-    "jobname": {},
-    "kern": {},
-    "language": {},
-    "lastbox": {},
-    "lastkern": {},
-    "lastpenalty": {},
-    "lastskip": {},
-    "lccode": {},
-    "leaders": {},
-    "left": {
-      "snippet": "left|${1}\\right|"
-    },
-    "lefthyphenmin": {},
-    "leftskip": {},
-    "leqno{}": {
-      "snippet": "leqno{${1:eqn num}}"
-    },
-    "let": {},
-    "let{}{}": {
-      "snippet": "let{${1:cmd}}{${2:def}}"
-    },
-    "limits": {},
-    "linepenalty": {},
-    "lineskip": {},
-    "lineskiplimit": {},
-    "long": {},
-    "looseness": {},
-    "lower": {},
-    "lowercase{}": {
-      "snippet": "lowercase{${1:text}}"
-    },
-    "mag": {},
-    "mark{}": {
-      "snippet": "mark{${1:mark text}}"
-    },
-    "mathaccent": {},
-    "mathbin": {},
-    "mathchar": {},
-    "mathchardef": {},
-    "mathchardef{}": {
-      "snippet": "mathchardef{${1:cmd}}"
-    },
-    "mathchoice{}{}{}{}": {
-      "snippet": "mathchoice{${1:display}}{${2:text}}{${3:subscript}}{${4:subsubscript}}"
-    },
-    "mathclose": {},
-    "mathcode": {},
-    "mathinner": {},
-    "mathop": {},
-    "mathopen": {},
-    "mathord": {},
-    "mathpunct": {},
-    "mathrel": {},
-    "mathsurround": {},
-    "maxdeadcycles": {},
-    "maxdepth": {},
-    "meaning": {},
-    "medmuskip": {},
-    "message{}": {
-      "snippet": "message{${1:text}}"
-    },
-    "mkern": {},
-    "month": {},
-    "moveleft": {},
-    "moveright": {},
-    "mskip": {},
-    "multiply": {},
-    "muskip": {},
-    "muskipdef": {},
-    "muskipdef{}": {
-      "snippet": "muskipdef{${1:cmd}}"
-    },
-    "newlinechar": {},
-    "noalign{}": {
-      "snippet": "noalign{${1:material}}"
-    },
-    "noboundary": {},
-    "noexpand": {},
-    "nolimits": {},
-    "nonscript": {},
-    "nonstopmode": {},
-    "nulldelimiterspace": {},
-    "nullfont": {},
-    "number": {},
-    "omit": {},
-    "openin": {},
-    "openout": {},
-    "or": {},
-    "outer": {},
-    "output": {},
-    "outputpenalty": {},
-    "over": {},
-    "overfullrule": {},
-    "overwithdelims": {},
-    "pagedepth": {},
-    "pagefilllstretch": {},
-    "pagefillstretch": {},
-    "pagefilstretch": {},
-    "pagegoal": {},
-    "pageshrink": {},
-    "pagestretch": {},
-    "pagetotal": {},
-    "par": {},
-    "parfillskip": {},
-    "parindent": {},
-    "parshape": {},
-    "parskip": {},
-    "patterns{}": {
-      "snippet": "patterns{${1:patterns}}"
-    },
-    "pausing": {},
-    "penalty": {},
-    "postdisplaypenalty": {},
-    "predisplaypenalty": {},
-    "predisplaysize": {},
-    "pretolerance": {},
-    "prevdepth": {},
-    "prevgraf": {},
-    "radical": {},
-    "raise": {},
-    "read": {},
-    "relax": {},
-    "relpenalty": {},
-    "right": {},
-    "rightskip": {},
-    "righthyphenmin": {},
-    "romannumeral": {},
-    "scriptfont": {},
-    "scriptscriptfont": {},
-    "scriptscriptstyle": {},
-    "scriptspace": {},
-    "scriptstyle": {},
-    "scrollmode": {},
-    "setbox": {},
-    "setlanguage": {},
-    "sfcode": {},
-    "shipout": {},
-    "show": {},
-    "showbox": {},
-    "showboxbreadth": {},
-    "showboxdepth": {},
-    "showlists": {},
-    "showthe": {},
-    "skewchar": {},
-    "skip": {},
-    "skipdef": {},
-    "skipdef{}": {
-      "snippet": "skipdef{${1:cmd}}"
-    },
-    "spacefactor": {},
-    "spaceskip": {},
-    "span": {},
-    "special{}": {
-      "snippet": "special{${1:code}}"
-    },
-    "splitbotmark": {},
-    "splitfirstmark": {},
-    "splitmaxdepth": {},
-    "splittopskip": {},
-    "string": {},
-    "string{}": {
-      "snippet": "string{${1:cmd}}"
-    },
-    "tabskip": {},
-    "textfont": {},
-    "textstyle": {},
-    "the": {},
-    "thickmuskip": {},
-    "thinmuskip": {},
-    "time": {},
-    "toks": {},
-    "toksdef": {},
-    "toksdef{}": {
-      "snippet": "toksdef{${1:cmd}}"
-    },
-    "tolerance": {},
-    "topmark": {},
-    "topskip": {},
-    "tracingcommands": {},
-    "tracinglostchars": {},
-    "tracingmacros": {},
-    "tracingonline": {},
-    "tracingoutput": {},
-    "tracingpages": {},
-    "tracingparagraphs": {},
-    "tracingrestores": {},
-    "tracingstats": {},
-    "uccode": {},
-    "uchyph": {},
-    "unhbox": {},
-    "unhcopy": {},
-    "unkern": {},
-    "unpenalty": {},
-    "unskip": {},
-    "unvbox": {},
-    "unvcopy": {},
-    "uppercase{}": {
-      "snippet": "uppercase{${1:text}}"
-    },
-    "vadjust{}": {
-      "snippet": "vadjust{${1:vertical mode material}}"
-    },
-    "valign{}": {
-      "snippet": "valign{${1:⟨preamble⟩ \\cr ⟨column⟩ \\cr ... ⟨column⟩ \\cr}}"
-    },
-    "vbadness": {},
-    "vbox{}": {
-      "snippet": "vbox{${1:text}}"
-    },
-    "vcenter{}": {
-      "snippet": "vcenter{${1:vertical mode material}}"
-    },
-    "vfil": {},
-    "vfill": {},
-    "vfilneg": {},
-    "vfuzz": {},
-    "voffset": {},
-    "vrule": {},
-    "vsize": {},
-    "vskip": {},
-    "vsplit": {},
-    "vss": {},
-    "vtop{}": {
-      "snippet": "vtop{${1:vertical mode material}}"
-    },
-    "wd": {},
-    "widowpenalty": {},
-    "write": {},
-    "xdef": {},
-    "xdef{}": {
-      "snippet": "xdef{${1:cmd}}"
-    },
-    "xleaders": {},
-    "xspaceskip": {},
-    "year": {},
-    "aa": {},
-    "AA": {},
-    "active": {},
-    "ae": {},
-    "AE": {},
-    "aleph": {
-      "detail": "ℵ",
-      "documentation": "aleph, hebrew"
-    },
-    "allowbreak": {},
-    "amalg": {
-      "detail": "⨿",
-      "documentation": "AMALGAMATION OR COPRODUCT"
-    },
-    "angle": {
-      "detail": "∠",
-      "documentation": "ANGLE"
-    },
-    "arccos": {},
-    "arcsin": {},
-    "arctan": {},
-    "arg": {},
-    "arrowvert": {},
-    "Arrowvert": {},
-    "ast": {
-      "detail": "∗",
-      "documentation": "ASTERISK OPERATOR (Hodge star operator)"
-    },
-    "asymp": {
-      "detail": "≍",
-      "documentation": "asymptotically equal to"
-    },
-    "b{}": {
-      "snippet": "b{${1:o}}"
-    },
-    "backslash": {
-      "detail": "\\",
-      "documentation": "REVERSE SOLIDUS"
-    },
-    "bf": {},
-    "bgroup": {},
-    "big": {
-      "snippet": "big|${1}\\big|"
-    },
-    "Big": {
-      "snippet": "Big|${1}\\Big|"
-    },
-    "bigbreak": {},
-    "bigcirc": {},
-    "bigg": {},
-    "Bigg": {},
-    "biggl": {},
-    "Biggl": {},
-    "biggm": {},
-    "Biggm": {},
-    "biggr": {},
-    "Biggr": {},
-    "bigl": {},
-    "Bigl": {},
-    "bigm": {},
-    "Bigm": {},
-    "bigodot": {
-      "detail": "⨀",
-      "documentation": "N-ARY CIRCLED DOT OPERATOR"
-    },
-    "bigoplus": {
-      "detail": "⨁",
-      "documentation": "N-ARY CIRCLED PLUS OPERATOR"
-    },
-    "bigotimes": {
-      "detail": "⨂",
-      "documentation": "N-ARY CIRCLED TIMES OPERATOR"
-    },
-    "bigr": {},
-    "Bigr": {},
-    "bigskip": {},
-    "bigskipamount": {},
-    "bigsqcup": {
-      "detail": "⨆",
-      "documentation": "N-ARY SQUARE UNION OPERATOR"
-    },
-    "bigtriangledown": {
-      "detail": "▽",
-      "documentation": "big down open"
-    },
-    "bigtriangleup": {
-      "detail": "△",
-      "documentation": "big up open"
-    },
-    "biguplus": {
-      "detail": "⨄",
-      "documentation": "N-ARY UNION OPERATOR WITH PLUS"
-    },
-    "bigvee": {
-      "detail": "⋁",
-      "documentation": "logical and operator"
-    },
-    "bigwedge": {
-      "detail": "⋀",
-      "documentation": "logical or operator"
-    },
-    "bmod": {},
-    "bordermatrix{}": {
-      "snippet": "bordermatrix{${1:line \\cr ... line \\cr}}"
-    },
-    "bot": {
-      "detail": "⊥",
-      "documentation": "UP TACK, bottom"
-    },
-    "bowtie": {
-      "detail": "⋈",
-      "documentation": "BOWTIE"
-    },
-    "brace": {},
-    "bracevert": {},
-    "brack": {},
-    "break": {},
-    "buildrel": {},
-    "bullet": {
-      "detail": "∙",
-      "documentation": "BULLET OPERATOR"
-    },
-    "c{}": {
-      "snippet": "c{${1:o}}"
-    },
-    "cal": {},
-    "cases{}": {
-      "snippet": "cases{${1:contents}}"
-    },
-    "cdotp": {
-      "detail": "·",
-      "documentation": "b: MIDDLE DOT"
-    },
-    "choose": {},
-    "clap{}": {
-      "snippet": "clap{${1:text}}"
-    },
-    "clubsuit": {
-      "detail": "♣",
-      "documentation": "club suit symbol"
-    },
-    "colon": {
-      "detail": ":",
-      "documentation": "COLON (not ratio)"
-    },
-    "cong": {
-      "detail": "≅",
-      "documentation": "congruent with"
-    },
-    "coprod": {
-      "detail": "∐",
-      "documentation": "coproduct operator"
-    },
-    "copyright": {},
-    "cos": {},
-    "cosh": {},
-    "cot": {},
-    "coth": {},
-    "csc": {},
-    "d{}": {
-      "snippet": "d{${1:o}}"
-    },
-    "dag": {},
-    "dagger": {
-      "detail": "†",
-      "documentation": "DAGGER relation"
-    },
-    "dashv": {
-      "detail": "⊣",
-      "documentation": "LEFT TACK, non- does no (dash, vertical)"
-    },
-    "ddag": {},
-    "ddagger": {
-      "detail": "‡",
-      "documentation": "DOUBLE DAGGER relation"
-    },
-    "deg": {},
-    "det": {},
-    "diamond": {
-      "detail": "⋄",
-      "documentation": "DIAMOND OPERATOR (white diamond)"
-    },
-    "diamondsuit": {
-      "detail": "♢",
-      "documentation": "diamond suit symbol"
-    },
-    "dim": {},
-    "displaylines{}": {
-      "snippet": "displaylines{${1:line \\cr ... line \\cr}}"
-    },
-    "doteq": {
-      "detail": "≐",
-      "documentation": "equals, single dot above"
-    },
-    "dotfill": {},
-    "dots": {},
-    "downarrow": {
-      "detail": "↓",
-      "documentation": "downward arrow"
-    },
-    "Downarrow": {
-      "detail": "⇓",
-      "documentation": "down double arrow"
-    },
-    "downbracefill": {},
-    "egroup": {},
-    "eject": {},
-    "ell": {
-      "detail": "ℓ",
-      "documentation": "cursive small l"
-    },
-    "empty": {},
-    "emptyset": {},
-    "endgraf": {},
-    "endline": {},
-    "enskip": {},
-    "enspace": {},
-    "exp": {},
-    "filbreak": {},
-    "flat": {
-      "detail": "♭",
-      "documentation": "musical flat"
-    },
-    "fmtname": {},
-    "fmtversion": {},
-    "frenchspacing": {},
-    "frown": {
-      "detail": "⌢",
-      "documentation": "FROWN (down curve)"
-    },
-    "gcd": {},
-    "ge": {
-      "detail": "≥",
-      "documentation": "r: greater-than-or-equal"
-    },
-    "gets": {
-      "detail": "←",
-      "documentation": "a: leftward arrow"
-    },
-    "gg": {
-      "detail": "≫",
-      "documentation": "much greater type 2"
-    },
-    "goodbreak": {},
-    "H{}": {
-      "snippet": "H{${1:o}}"
-    },
-    "hbar": {},
-    "heartsuit": {
-      "detail": "♡",
-      "documentation": "heart suit symbol"
-    },
-    "hglue": {},
-    "hidewidth": {},
-    "hom": {},
-    "hookleftarrow": {
-      "detail": "↩",
-      "documentation": "left arrow-hooked"
-    },
-    "hookrightarrow": {
-      "detail": "↪",
-      "documentation": "right arrow-hooked"
-    },
-    "hphantom{}": {
-      "snippet": "hphantom{${1:text}}"
-    },
-    "hrulefill": {},
-    "i": {
-      "detail": "𝑖",
-      "documentation": "MATHEMATICAL ITALIC SMALL I"
-    },
-    "ialign{}": {
-      "snippet": "ialign{${1:⟨preamble⟩ \\cr ⟨row⟩ \\cr ... ⟨row⟩ \\cr}}"
-    },
-    "iff": {
-      "detail": "⟺",
-      "documentation": "LONG LEFT RIGHT DOUBLE ARROW"
-    },
-    "Im": {
-      "detail": "ℑ",
-      "documentation": "imaginary part"
-    },
-    "imath": {
-      "detail": "𝚤",
-      "documentation": "MATHEMATICAL ITALIC SMALL DOTLESS I"
-    },
-    "inf": {},
-    "int": {
-      "detail": "∫",
-      "documentation": "INTEGRAL operator"
-    },
-    "it": {},
-    "j": {
-      "detail": "𝑗",
-      "documentation": "MATHEMATICAL ITALIC SMALL J"
-    },
-    "jmath": {
-      "detail": "𝚥",
-      "documentation": "MATHEMATICAL ITALIC SMALL DOTLESS J"
-    },
-    "jot": {},
-    "ker": {},
-    "l": {
-      "detail": "𝑙",
-      "documentation": "MATHEMATICAL ITALIC SMALL L"
-    },
-    "L": {
-      "detail": "𝐿",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL L"
-    },
-    "land": {
-      "detail": "∧",
-      "documentation": "b: LOGICAL AND"
-    },
-    "langle": {
-      "detail": "⟨",
-      "documentation": "MATHEMATICAL LEFT ANGLE BRACKET"
-    },
-    "lbrace": {
-      "detail": "{",
-      "documentation": "LEFT CURLY BRACKET"
-    },
-    "lbrack": {
-      "detail": "[",
-      "documentation": "LEFT SQUARE BRACKET"
-    },
-    "lceil": {
-      "detail": "⌈",
-      "documentation": "LEFT CEILING"
-    },
-    "ldotp": {},
-    "le": {
-      "detail": "≤",
-      "documentation": "r: less-than-or-equal"
-    },
-    "leftarrowfill": {},
-    "leftharpoondown": {
-      "detail": "↽",
-      "documentation": "left harpoon-down"
-    },
-    "leftharpoonup": {
-      "detail": "↼",
-      "documentation": "left harpoon-up"
-    },
-    "leftline{}": {
-      "snippet": "leftline{${1:text}}"
-    },
-    "leftrightarrow": {
-      "detail": "⇆",
-      "documentation": "left arrow over right arrow"
-    },
-    "lfloor": {
-      "detail": "⌊",
-      "documentation": "LEFT FLOOR"
-    },
-    "lg": {},
-    "lgroup": {
-      "detail": "⟮",
-      "documentation": "MATHEMATICAL LEFT FLATTENED PARENTHESIS"
-    },
-    "lim": {},
-    "liminf": {},
-    "limsup": {},
-    "line{}": {
-      "snippet": "line{${1:text}}"
-    },
-    "ll": {
-      "detail": "≪",
-      "documentation": "much less type 2"
-    },
-    "llap{}": {
-      "snippet": "llap{${1:text}}"
-    },
-    "lmoustache": {
-      "detail": "⎰",
-      "documentation": "? \\lmous UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION"
-    },
-    "ln": {},
-    "lnot": {
-      "detail": "¬",
-      "documentation": "NOT SIGN"
-    },
-    "log": {},
-    "loggingall": {},
-    "longleftarrow": {
-      "detail": "⟵",
-      "documentation": "LONG LEFTWARDS ARROW"
-    },
-    "Longleftarrow": {
-      "detail": "⟸",
-      "documentation": "LONG LEFTWARDS DOUBLE ARROW"
-    },
-    "longleftrightarrow": {
-      "detail": "⟷",
-      "documentation": "LONG LEFT RIGHT ARROW"
-    },
-    "Longleftrightarrow": {
-      "detail": "⟺",
-      "documentation": "LONG LEFT RIGHT DOUBLE ARROW"
-    },
-    "longmapsto": {
-      "detail": "⟼",
-      "documentation": "LONG RIGHTWARDS ARROW FROM BAR"
-    },
-    "longrightarrow": {
-      "detail": "⟶",
-      "documentation": "LONG RIGHTWARDS ARROW"
-    },
-    "Longrightarrow": {
-      "detail": "⟹",
-      "documentation": "LONG RIGHTWARDS DOUBLE ARROW"
-    },
-    "loop": {},
-    "lor": {
-      "detail": "∨",
-      "documentation": "b: LOGICAL OR"
-    },
-    "lq": {},
-    "magstep": {},
-    "magstephalf": {},
-    "mapsto": {
-      "detail": "↦",
-      "documentation": "maps righ z notation maplet"
-    },
-    "mathpalette{}{}": {
-      "snippet": "mathpalette{${1:arg1}}{${2:arg2}}"
-    },
-    "mathstrut": {},
-    "matrix{}": {
-      "snippet": "matrix{${1:line \\cr ... line \\cr}}"
-    },
-    "max": {},
-    "maxdimen": {},
-    "medbreak": {},
-    "medskip": {},
-    "medskipamount": {},
-    "min": {},
-    "mit": {},
-    "models": {
-      "detail": "⊧",
-      "documentation": "MODELS (ver short double dash)"
-    },
-    "mp": {
-      "detail": "∓",
-      "documentation": "MINUS-OR-PLUS SIGN"
-    },
-    "nabla": {
-      "detail": "∇",
-      "documentation": "NABLA, del, hamilton operator"
-    },
-    "narrower": {},
-    "natural": {
-      "detail": "♮",
-      "documentation": "music natural"
-    },
-    "nearrow": {
-      "detail": "↗",
-      "documentation": "ne pointing arrow"
-    },
-    "ne": {
-      "detail": "≠",
-      "documentation": "r: not equal"
-    },
-    "negthinspace": {},
-    "newbox": {},
-    "newbox{}": {
-      "snippet": "newbox{${1:cmd}}"
-    },
-    "newcount": {},
-    "newcount{}": {
-      "snippet": "newcount{${1:cmd}}"
-    },
-    "newdimen": {},
-    "newdimen{}": {
-      "snippet": "newdimen{${1:cmd}}"
-    },
-    "newfam": {},
-    "newfam{}": {
-      "snippet": "newfam{${1:cmd}}"
-    },
-    "newhelp": {},
-    "newhelp{}{}": {
-      "snippet": "newhelp{${1:cmd}}{${2:help text}}"
-    },
-    "newif": {},
-    "newif{}": {
-      "snippet": "newif{${1:definition}}"
-    },
-    "newinsert": {},
-    "newinsert{}": {
-      "snippet": "newinsert{${1:cmd}}"
-    },
-    "newlanguage": {},
-    "newlanguage{}": {
-      "snippet": "newlanguage{${1:cmd}}"
-    },
-    "newmuskip": {},
-    "newmuskip{}": {
-      "snippet": "newmuskip{${1:cmd}}"
-    },
-    "newread": {},
-    "newread{}": {
-      "snippet": "newread{${1:cmd}}"
-    },
-    "newskip": {},
-    "newskip{}": {
-      "snippet": "newskip{${1:cmd}}"
-    },
-    "newtoks": {},
-    "newtoks{}": {
-      "snippet": "newtoks{${1:cmd}}"
-    },
-    "newwrite": {},
-    "newwrite{}": {
-      "snippet": "newwrite{${1:cmd}}"
-    },
-    "ni": {
-      "detail": "∋",
-      "documentation": "con variant"
-    },
-    "nobreak": {},
-    "nointerlineskip": {},
-    "nonfrenchspacing": {},
-    "normalbaselines": {},
-    "normalbaselineskip": {},
-    "normallineskip": {},
-    "normallineskiplimit": {},
-    "not": {
-      "detail": " ̸",
-      "documentation": "COMBINING LONG SOLIDUS OVERLAY"
-    },
-    "null": {},
-    "nwarrow": {
-      "detail": "↖",
-      "documentation": "nw pointing arrow"
-    },
-    "o": {
-      "detail": "𝑜",
-      "documentation": "MATHEMATICAL ITALIC SMALL O"
-    },
-    "O": {
-      "detail": "𝑂",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL O"
-    },
-    "oalign{}": {
-      "snippet": "oalign{${1:arg}}"
-    },
-    "obeylines": {},
-    "obeyspaces": {},
-    "odot": {
-      "detail": "⊙",
-      "documentation": "middle dot in circle"
-    },
-    "oe": {},
-    "OE": {},
-    "offinterlineskip": {},
-    "oint": {
-      "detail": "∮",
-      "documentation": "CONTOUR INTEGRAL operator"
-    },
-    "ominus": {
-      "detail": "⊖",
-      "documentation": "minus sign in circle"
-    },
-    "ooalign{}": {
-      "snippet": "ooalign{${1:arg}}"
-    },
-    "oplus": {
-      "detail": "⊕",
-      "documentation": "plus sign in circle"
-    },
-    "oslash": {
-      "detail": "⊘",
-      "documentation": "solidus in circle"
-    },
-    "otimes": {
-      "detail": "⊗",
-      "documentation": "multiply sign in circle"
-    },
-    "overleftarrow{}": {
-      "snippet": "overleftarrow{${1:text}}"
-    },
-    "overrightarrow{}": {
-      "snippet": "overrightarrow{${1:text}}"
-    },
-    "owns": {
-      "detail": "∋",
-      "documentation": "con variant"
-    },
-    "P": {
-      "detail": "𝑃",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL P"
-    },
-    "parallel": {
-      "detail": "∥",
-      "documentation": "parallel"
-    },
-    "perp": {
-      "detail": "⟂",
-      "documentation": "PERPENDICULAR"
-    },
-    "phantom{}": {
-      "snippet": "phantom{${1:text}}"
-    },
-    "pmatrix{}": {
-      "snippet": "pmatrix{${1:line \\cr ${2:line} \\cr}}"
-    },
-    "pmod": {},
-    "Pr": {},
-    "prec": {
-      "detail": "≺",
-      "documentation": "PRECEDES"
-    },
-    "preceq": {
-      "detail": "⪯",
-      "documentation": "PRECEDES ABOVE SINGLE-LINE EQUALS SIGN"
-    },
-    "propto": {
-      "detail": "∝",
-      "documentation": "is PROPORTIONAL TO"
-    },
-    "qquad": {},
-    "quad": {
-      "detail": " ",
-      "documentation": "emquad"
-    },
-    "raggedbottom": {},
-    "rangle": {
-      "detail": "⟩",
-      "documentation": "MATHEMATICAL RIGHT ANGLE BRACKET"
-    },
-    "rbrace": {
-      "detail": "}",
-      "documentation": "RIGHT CURLY BRACKET"
-    },
-    "rbrack": {
-      "detail": "]",
-      "documentation": "RIGHT SQUARE BRACKET"
-    },
-    "rceil": {
-      "detail": "⌉",
-      "documentation": "RIGHT CEILING"
-    },
-    "Re": {
-      "detail": "ℜ",
-      "documentation": "real part"
-    },
-    "repeat": {},
-    "rfloor": {
-      "detail": "⌋",
-      "documentation": "RIGHT FLOOR"
-    },
-    "rgroup": {
-      "detail": "⟯",
-      "documentation": "MATHEMATICAL RIGHT FLATTENED PARENTHESIS"
-    },
-    "rightarrowfill": {},
-    "rightharpoondown": {
-      "detail": "⇁",
-      "documentation": "right harpoon-down"
-    },
-    "rightharpoonup": {
-      "detail": "⇀",
-      "documentation": "right harpoon-up"
-    },
-    "rightleftharpoons": {
-      "detail": "⇌",
-      "documentation": "right harpoon over left"
-    },
-    "rightline{}": {
-      "snippet": "rightline{${1:text}}"
-    },
-    "rlap{}": {
-      "snippet": "rlap{${1:text}}"
-    },
-    "rm": {},
-    "rmoustache": {
-      "detail": "⎱",
-      "documentation": "? \\rmous UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION"
-    },
-    "root": {},
-    "rq": {},
-    "S": {
-      "detail": "𝑆",
-      "documentation": "MATHEMATICAL ITALIC CAPITAL S"
-    },
-    "sb{}": {
-      "snippet": "sb{${1:subscript}}"
-    },
-    "searrow": {
-      "detail": "↘",
-      "documentation": "se pointing arrow"
-    },
-    "sec": {},
-    "sharp": {
-      "detail": "♯",
-      "documentation": "= \\ MUSIC SHARP SIGN, z notation infix bag count"
-    },
-    "showhyphens{}": {
-      "snippet": "showhyphens{${1:space separated words}}"
-    },
-    "sim": {
-      "detail": "∼",
-      "documentation": "similar TILDE OPERATOR"
-    },
-    "simeq": {
-      "detail": "≃",
-      "documentation": "similar, equals"
-    },
-    "sin": {},
-    "sinh": {},
-    "skew{}{}{}": {
-      "snippet": "skew{${1:num}}{${2:math accent}}{${3:text}}"
-    },
-    "sl": {},
-    "slash": {
-      "detail": "∕",
-      "documentation": "DIVISION SLASH"
-    },
-    "smallbreak": {},
-    "smallint": {},
-    "smallskip": {},
-    "smallskipamount": {},
-    "smash{}": {
-      "snippet": "smash{${1:text}}"
-    },
-    "smile": {
-      "detail": "⌣",
-      "documentation": "SMILE (up curve)"
-    },
-    "sp{}": {
-      "snippet": "sp{${1:superscript}}"
-    },
-    "space": {},
-    "spadesuit": {
-      "detail": "♠",
-      "documentation": "spades suit symbol"
-    },
-    "sqcap": {
-      "detail": "⊓",
-      "documentation": "square intersection"
-    },
-    "sqcup": {
-      "detail": "⊔",
-      "documentation": "square union"
-    },
-    "sqsubseteq": {
-      "detail": "⊑",
-      "documentation": "square subset, equals"
-    },
-    "sqsupseteq": {
-      "detail": "⊒",
-      "documentation": "square superset, equals"
-    },
-    "ss": {},
-    "star": {
-      "detail": "⋆",
-      "documentation": "small s filled, low"
-    },
-    "strut": {},
-    "strutbox": {},
-    "subseteq": {
-      "detail": "⊆",
-      "documentation": "subset, equals"
-    },
-    "succ": {
-      "detail": "≻",
-      "documentation": "SUCCEEDS"
-    },
-    "succeq": {
-      "detail": "⪰",
-      "documentation": "SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN"
-    },
-    "sup": {},
-    "supseteq": {
-      "detail": "⊇",
-      "documentation": "superset, equals"
-    },
-    "surd": {},
-    "swarrow": {
-      "detail": "↙",
-      "documentation": "sw pointing arrow"
-    },
-    "t{}": {
-      "snippet": "t{${1:oo}}"
-    },
-    "tan": {},
-    "tanh": {},
-    "TeX": {},
-    "thinspace": {},
-    "to": {
-      "detail": "→",
-      "documentation": "rightward arrow, z notation total function"
-    },
-    "top": {
-      "detail": "⊤",
-      "documentation": "DOWN TACK, top"
-    },
-    "tracingall": {},
-    "triangle": {
-      "detail": "△",
-      "documentation": "big up open"
-    },
-    "triangleleft": {
-      "detail": "◁",
-      "documentation": "(large) lef open; z notation domain restriction"
-    },
-    "triangleright": {
-      "detail": "▷",
-      "documentation": "(large) righ open; z notation range restriction"
-    },
-    "tt": {},
-    "u{}": {
-      "snippet": "u{${1:o}}"
-    },
-    "underbar{}": {
-      "snippet": "underbar{${1:text}}"
-    },
-    "uparrow": {
-      "detail": "↑",
-      "documentation": "upward arrow"
-    },
-    "Uparrow": {
-      "detail": "⇑",
-      "documentation": "up double arrow"
-    },
-    "upbracefill": {},
-    "updownarrow": {
-      "detail": "↕",
-      "documentation": "up and down arrow"
-    },
-    "Updownarrow": {
-      "detail": "⇕",
-      "documentation": "up and down double arrow"
-    },
-    "uplus": {
-      "detail": "⊎",
-      "documentation": "plus sign in union"
-    },
-    "v{}": {
-      "snippet": "v{${1:o}}"
-    },
-    "vdash": {
-      "detail": "⊢",
-      "documentation": "RIGHT TACK, proves, implies, yields, (ver dash)"
-    },
-    "vert": {
-      "detail": "|",
-      "documentation": "vertical bar"
-    },
-    "Vert": {
-      "detail": "‖",
-      "documentation": "double vertical bar"
-    },
-    "vglue": {},
-    "vphantom{}": {
-      "snippet": "vphantom{${1:text}}"
-    },
-    "wlog{}": {
-      "snippet": "wlog{${1:token list}}"
-    },
-    "wp": {
-      "detail": "℘",
-      "documentation": "weierstrass p"
-    },
-    "wr": {
-      "detail": "≀",
-      "documentation": "WREATH PRODUCT"
-    },
-    "allocationnumber": {},
-    "braceld": {},
-    "bracelu": {},
-    "bracerd": {},
-    "braceru": {},
-    "do": {},
-    "dospecials": {},
-    "footins": {},
-    "footnoterule": {},
-    "hideskip": {},
-    "interdisplaylinepenalty": {},
-    "interfootnotelinepenalty": {},
-    "intop": {},
-    "joinrel": {},
-    "leavevmode": {},
-    "lhook": {},
-    "mapstochar": {},
-    "mathhexbox": {},
-    "ointop": {},
-    "relbar": {},
-    "Relbar": {},
-    "removelastskip": {},
-    "rhook": {},
-    "rootbox": {},
-    "vdots": {
-      "detail": "⋮",
-      "documentation": "VERTICAL ELLIPSIS"
-    },
-    "big(": {
-      "snippet": "big(${2:${1}\\big})"
-    },
-    "big[": {
-      "snippet": "big[${1}\\big]"
-    },
-    "Big(": {
-      "snippet": "Big(${2:${1}\\Big})"
-    },
-    "Big[": {
-      "snippet": "Big[${1}\\Big]"
-    },
-    "bigl(": {
-      "snippet": "bigl(${2:${1}\\bigr})"
-    },
-    "bigl[": {
-      "snippet": "bigl[${1}\\bigr]"
-    },
-    "Bigl(": {
-      "snippet": "Bigl(${2:${1}\\Bigr})"
-    },
-    "Bigl[": {
-      "snippet": "Bigl[${1}\\Bigr]"
-    },
-    "biggl(": {
-      "snippet": "biggl(${2:${1}\\biggr})"
-    },
-    "biggl[": {
-      "snippet": "biggl[${1}\\biggr]"
-    },
-    "Biggl(": {
-      "snippet": "Biggl(${2:${1}\\Biggr})"
-    },
-    "Biggl[": {
-      "snippet": "Biggl[${1}\\Biggr]"
-    },
-    "left(": {
-      "snippet": "left(${2:${1}\\right})"
-    },
-    "left[": {
-      "snippet": "left[${1}\\right]"
-    },
-    "int_{}^{}": {
-      "snippet": "int_{${1:min}}^{${2:max}}"
-    },
-    "lim_{}": {
-      "snippet": "lim_{${1:min}}"
-    },
-    "prod_{}^{}": {
-      "snippet": "prod_{${1:min}}^{${2:max}}"
-    },
-    "sum_{}^{}": {
-      "snippet": "sum_{${1:min}}^{${2:max}}"
-    },
-    "beginL": {},
-    "beginR": {},
-    "detokenize{}": {
-      "snippet": "detokenize{${1:arg}}"
-    },
-    "endL": {},
-    "endR": {},
-    "eTeXrevision": {},
-    "eTeXversion": {},
-    "everyeof{}": {
-      "snippet": "everyeof{${1:arg}}"
-    },
-    "currentgrouplevel": {},
-    "currentgrouptype": {},
-    "currentiflevel": {},
-    "currentiftype": {},
-    "currentifbranch": {},
-    "ifcsname": {},
-    "ifdefined": {},
-    "interactionmode": {},
-    "lastlinefit": {},
-    "lastnodetype": {},
-    "middle": {},
-    "numexpr": {},
-    "parshapedimen": {},
-    "parshapeindent": {},
-    "parshapelength": {},
-    "predisplaydirection": {},
-    "protected": {},
-    "scantokens{}": {
-      "snippet": "scantokens{${1:arg}}"
-    },
-    "showgroups": {},
-    "showtokens{}": {
-      "snippet": "showtokens{${1:arg}}"
-    },
-    "TeXXeTstate": {},
-    "tracingassigns": {},
-    "tracinggroups": {},
-    "tracingifs": {},
-    "tracingscantokens": {},
-    "unexpanded{}": {
-      "snippet": "unexpanded{${1:arg}}"
-    },
-    "unless": {},
-    "dimexpr": {},
-    "glueexpr": {},
-    "muexpr": {},
-    "gluestretch": {},
-    "glueshrink": {},
-    "gluestretchorder": {},
-    "glueshrinkorder": {},
-    "gluetomu": {},
-    "mutoglue": {},
-    "interlinepenalties": {},
-    "clubpenalties": {},
-    "widowpenalties": {},
-    "displaywidowpenalties": {},
-    "tracingnesting": {},
-    "savingvdiscards": {},
-    "savinghyphcodes": {},
-    "showifs": {},
-    "pagediscards": {},
-    "splitdiscards": {},
-    "iffontchar": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/tex4ht.json b/dev/packages/tex4ht.json
index 79fdc8d02..ddab06faf 100644
--- a/dev/packages/tex4ht.json
+++ b/dev/packages/tex4ht.json
@@ -30,7 +30,7 @@
       "snippet": "CssFile[${1:list of CSS files}]"
     },
     "CutAt{}": {
-      "snippet": "CutAt{${1:at-unit,${2:until-unit1},${3:until-unit2},...}}"
+      "snippet": "CutAt{${1:at-unit,until-unit1,until-unit2,...}}"
     },
     "EndCss": {},
     "EndCssFile": {},
@@ -139,10 +139,10 @@
     "SkipRefstepAnchor": {},
     "TableOfContents": {},
     "tableofcontents[]": {
-      "snippet": "tableofcontents[${1:unit1,${2:unit2},...}]"
+      "snippet": "tableofcontents[${1:unit1,unit2,...}]"
     },
     "TableOfContents[]": {
-      "snippet": "TableOfContents[${1:unit1,${2:unit2},...}]"
+      "snippet": "TableOfContents[${1:unit1,unit2,...}]"
     },
     "Tag{}{}": {
       "snippet": "Tag{${1:label}}{${2:content}}"
@@ -153,7 +153,7 @@
     "TitleCount": {},
     "TitleMark": {},
     "TocAt{}": {
-      "snippet": "TocAt{${1:section-type1,${2:section-type2},...}}"
+      "snippet": "TocAt{${1:section-type1,section-type2,...}}"
     },
     "TocCount": {},
     "AddFontFace{}{}{}{}": {
diff --git a/dev/packages/texdraw.json b/dev/packages/texdraw.json
index 973b9ba26..f0bc783db 100644
--- a/dev/packages/texdraw.json
+++ b/dev/packages/texdraw.json
@@ -9,50 +9,14 @@
     "everytexdraw{}": {
       "snippet": "everytexdraw{${1:TeXdraw commands}}"
     },
-    "move ()": {
-      "snippet": "move (${1:x y})"
-    },
-    "lvec ()": {
-      "snippet": "lvec (${1:x y})"
-    },
-    "avec ()": {
-      "snippet": "avec (${1:x y})"
-    },
-    "rmove ()": {
-      "snippet": "rmove (${1:dx dy})"
-    },
-    "rlvec ()": {
-      "snippet": "rlvec (${1:dx dy})"
-    },
-    "ravec ()": {
-      "snippet": "ravec (${1:dx dy})"
-    },
-    "lpatt ()": {
-      "snippet": "lpatt (${1:pattern})"
-    },
-    "htext (){}": {
-      "snippet": "htext (${2:x y}){${1:text}}"
-    },
     "htext{}": {
       "snippet": "htext{${1:text}}"
     },
-    "vtext (){}": {
-      "snippet": "vtext (${2:x y}){${1:text}}"
-    },
     "vtext{}": {
       "snippet": "vtext{${1:text}}"
     },
-    "clvec ()()()": {
-      "snippet": "clvec (${1:x1 y1})(${2:x2 y2})(${3:x3 y3})"
-    },
     "bsegment": {},
     "esegment": {},
-    "savecurrpos ()": {
-      "snippet": "savecurrpos (${1:*${2:px} *py})"
-    },
-    "savepos ()()": {
-      "snippet": "savepos (${1:x y})(${2:*${3:px} *py})"
-    },
     "drawbb": {},
     "writeps{}": {
       "snippet": "writeps{${1:ps-commands}}"
@@ -69,9 +33,6 @@
     "intdiv{}{}{}": {
       "snippet": "intdiv{${1:numerator}}{${2:denominator}}{${3:macro}}"
     },
-    "listtopix (){}": {
-      "snippet": "listtopix (${2:list}){${1:macro}}"
-    },
     "pixtobp{}{}": {
       "snippet": "pixtobp{${1:pixels}}{${2:macro}}"
     },
diff --git a/dev/packages/texshade.json b/dev/packages/texshade.json
index d75a6fcf7..f2436e186 100644
--- a/dev/packages/texshade.json
+++ b/dev/packages/texshade.json
@@ -71,7 +71,7 @@
       "snippet": "clearlogocolors[${1:color}]"
     },
     "codon{}{}": {
-      "snippet": "codon{${1:amino-acid}}{${2:triplet1,${3:triplet2},...}}"
+      "snippet": "codon{${1:amino-acid}}{${2:triplet1,triplet2,...}}"
     },
     "colorscalestretch{}": {
       "snippet": "colorscalestretch{${1:factor}}"
@@ -88,7 +88,7 @@
     },
     "disallowzero": {},
     "DNAgroups{}": {
-      "snippet": "DNAgroups{${1:group1,${2:group2},...}}"
+      "snippet": "DNAgroups{${1:group1,group2,...}}"
     },
     "DNAsims{}{}": {
       "snippet": "DNAsims{${1:residue}}{${2:similars}}"
@@ -98,7 +98,7 @@
       "snippet": "domaingaprule{${1:thickness}}"
     },
     "donotshade{}": {
-      "snippet": "donotshade{${1:seq1,${2:seq2},...}}"
+      "snippet": "donotshade{${1:seq1,seq2,...}}"
     },
     "echostructurefile{}": {
       "snippet": "echostructurefile{${1:strucref}}"
@@ -249,12 +249,12 @@
     "hidelegend": {},
     "hidelogoscale": {},
     "hidename{}": {
-      "snippet": "hidename{${1:seq1,${2:seq2},...}}"
+      "snippet": "hidename{${1:seq1,seq2,...}}"
     },
     "hidenames": {},
     "hidenegatives": {},
     "hidenumber{}": {
-      "snippet": "hidenumber{${1:seq1,${2:seq2},...}}"
+      "snippet": "hidenumber{${1:seq1,seq2,...}}"
     },
     "hidenumbering": {},
     "hideonDSSP{}": {
@@ -279,7 +279,7 @@
       "snippet": "hideruler[${1:top/bottom}]"
     },
     "hideseq{}": {
-      "snippet": "hideseq{${1:seq1,${2:seq2},...}}"
+      "snippet": "hideseq{${1:seq1,seq2,...}}"
     },
     "hideseqs": {},
     "hidesequencelogo": {},
@@ -318,7 +318,7 @@
       "snippet": "includeTCoffee{${1:file}}"
     },
     "killseq{}": {
-      "snippet": "killseq{${1:seq1,${2:seq2},...}}"
+      "snippet": "killseq{${1:seq1,seq2,...}}"
     },
     "legendbf": {},
     "legendcolor{}": {
@@ -388,7 +388,7 @@
       "snippet": "movelegend{${1:x-offset}}{${2:y-offset}}"
     },
     "namecolor{}{}": {
-      "snippet": "namecolor{${1:seq1,${3:seq2},...}}{${2:color}}"
+      "snippet": "namecolor{${1:seq1,seq2,...}}{${2:color}}"
     },
     "nameconsensus{}": {
       "snippet": "nameconsensus{${1:name}}"
@@ -442,7 +442,7 @@
     "noblockskip": {},
     "nosepline": {},
     "numbercolor{}{}": {
-      "snippet": "numbercolor{${1:seq1,${3:seq2},...}}{${2:color}}"
+      "snippet": "numbercolor{${1:seq1,seq2,...}}{${2:color}}"
     },
     "numberingbf": {},
     "numberingcolor{}": {
@@ -471,10 +471,10 @@
     },
     "numcount": {},
     "orderseqs{}": {
-      "snippet": "orderseqs{${1:seq1,${2:seq2},...}}"
+      "snippet": "orderseqs{${1:seq1,seq2,...}}"
     },
     "pepgroups{}": {
-      "snippet": "pepgroups{${1:group1,${2:group2},...}}"
+      "snippet": "pepgroups{${1:group1,group2,...}}"
     },
     "pepsims{}{}": {
       "snippet": "pepsims{${1:residue}}{${2:similars}}"
diff --git a/dev/packages/textopo.json b/dev/packages/textopo.json
index eb708b7de..ae1c40332 100644
--- a/dev/packages/textopo.json
+++ b/dev/packages/textopo.json
@@ -11,7 +11,7 @@
       "snippet": "getsequence[${3:option}]{${1:type}}{${2:file}}"
     },
     "MRs{}": {
-      "snippet": "MRs{${1:start1${1}stop1,${2:start2${2}stop2},...}}"
+      "snippet": "MRs{${1:start1${1}stop1,start2${2}stop2,...}}"
     },
     "Nterm{}": {
       "snippet": "Nterm{${1:intra|extra}}"
@@ -53,10 +53,10 @@
       "snippet": "labelinside[${2:left|right}]{${1:text}}"
     },
     "moveinsidelabel{}": {
-      "snippet": "moveinsidelabel{${1:⟨dir,${2:dist⟩ or ⟨x},y⟩}}"
+      "snippet": "moveinsidelabel{${1:⟨dir,dist⟩ or ⟨x,y⟩}}"
     },
     "moveoutsidelabel{}": {
-      "snippet": "moveoutsidelabel{${1:⟨dir,${2:dist⟩ or ⟨x},y⟩}}"
+      "snippet": "moveoutsidelabel{${1:⟨dir,dist⟩ or ⟨x,y⟩}}"
     },
     "broadenmembrane{}{}": {
       "snippet": "broadenmembrane{${1:left|right}}{${2:length}}"
@@ -78,10 +78,10 @@
       "snippet": "labelTM{${1:num}}{${2:label-text}}"
     },
     "labelTM[]{}{}": {
-      "snippet": "labelTM[${3:⟨dir,${4:dist⟩ or ⟨x},y⟩}]{${1:num}}{${2:label-text}}"
+      "snippet": "labelTM[${3:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:num}}{${2:label-text}}"
     },
     "moveTMlabel{}{}": {
-      "snippet": "moveTMlabel{${1:num}}{${2:⟨dir,${3:dist⟩ or ⟨x},y⟩}}"
+      "snippet": "moveTMlabel{${1:num}}{${2:⟨dir,dist⟩ or ⟨x,y⟩}}"
     },
     "TMlabelcolor{}": {
       "snippet": "TMlabelcolor{${1:color}}"
@@ -91,10 +91,10 @@
       "snippet": "labelloops{${1:style}}"
     },
     "labelloop[]{}{}": {
-      "snippet": "labelloop[${3:⟨dir,${4:dist⟩ or ⟨x},y⟩}]{${1:num}}{${2:label-text}}"
+      "snippet": "labelloop[${3:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:num}}{${2:label-text}}"
     },
     "movelooplabel{}{}": {
-      "snippet": "movelooplabel{${1:num}}{${2:⟨dir,${3:dist⟩ or ⟨x},y⟩}}"
+      "snippet": "movelooplabel{${1:num}}{${2:⟨dir,dist⟩ or ⟨x,y⟩}}"
     },
     "looplabelcolor{}": {
       "snippet": "looplabelcolor{${1:color}}"
@@ -111,7 +111,7 @@
       "snippet": "labelregion{${1:list-of-regions}}{${2:style-name}}{${3:label-text}}"
     },
     "labelregion[]{}{}{}": {
-      "snippet": "labelregion[${4:⟨dir,${5:dist⟩ or ⟨x},y⟩}]{${1:list-of-regions}}{${2:style-name}}{${3:label-text}}"
+      "snippet": "labelregion[${4:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:list-of-regions}}{${2:style-name}}{${3:label-text}}"
     },
     "phosphorylation{}": {
       "snippet": "phosphorylation{${1:list-of-positions}}"
@@ -135,13 +135,13 @@
       "snippet": "addtagtoNterm{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "addtagtoNterm[]{}{}{}": {
-      "snippet": "addtagtoNterm[${4:⟨dir,${5:dist⟩ or ⟨x},y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
+      "snippet": "addtagtoNterm[${4:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "addtagtoCterm{}{}{}": {
       "snippet": "addtagtoCterm{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "addtagtoCterm[]{}{}{}": {
-      "snippet": "addtagtoCterm[${4:⟨dir,${5:dist⟩ or ⟨x},y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
+      "snippet": "addtagtoCterm[${4:⟨dir,dist⟩ or ⟨x,y⟩}]{${1:tag-sequence}}{${2:style-name}}{${3:label-text}}"
     },
     "seqstart{}": {
       "snippet": "seqstart{${1:num}}"
diff --git a/dev/packages/textpos.json b/dev/packages/textpos.json
index 0ca728011..e022fa471 100644
--- a/dev/packages/textpos.json
+++ b/dev/packages/textpos.json
@@ -59,24 +59,7 @@
       "snippet": "tekstblokroolkulur{${1:color}}"
     }
   },
-  "envs": {
-    "textblock{}(hpos,vpos)": {
-      "name": "textblock",
-      "snippet": "{${1:hsize}}(${2:hpos},${3:vpos})"
-    },
-    "textblock{}[](hpos,vpos)": {
-      "name": "textblock",
-      "snippet": "{${1:hsize}}[${2:ho,vo}](${3:hpos},${4:vpos})"
-    },
-    "textblock*{}(hpos,vpos)": {
-      "name": "textblock*",
-      "snippet": "{${1:hsize}}(${2:hpos},${3:vpos})"
-    },
-    "textblock*{}[](hpos,vpos)": {
-      "name": "textblock*",
-      "snippet": "{${1:hsize}}[${2:ho,vo}](${3:hpos},${4:vpos})"
-    }
-  },
+  "envs": {},
   "options": [
     "showboxes",
     "noshowtext",
diff --git a/dev/packages/theorem.json b/dev/packages/theorem.json
deleted file mode 100644
index 779eca14d..000000000
--- a/dev/packages/theorem.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "theoremstyle{}": {
-      "snippet": "theoremstyle{${1:style}}"
-    },
-    "theorembodyfont{}": {
-      "snippet": "theorembodyfont{${1:font}}"
-    },
-    "theoremheaderfont{}": {
-      "snippet": "theoremheaderfont{${1:font}}"
-    },
-    "theorempreskipamount": {},
-    "theorempostskipamount": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/thm-listof.json b/dev/packages/thm-listof.json
index 9dce45088..a084f0619 100644
--- a/dev/packages/thm-listof.json
+++ b/dev/packages/thm-listof.json
@@ -21,13 +21,13 @@
       "snippet": "thmtformatoptarg{${1:arg}}"
     },
     "showtheorems{}": {
-      "snippet": "showtheorems{${1:thm1,${2:thm2},...}}"
+      "snippet": "showtheorems{${1:thm1,thm2,...}}"
     },
     "ignoretheorems{}": {
-      "snippet": "ignoretheorems{${1:thm1,${2:thm2},...}}"
+      "snippet": "ignoretheorems{${1:thm1,thm2,...}}"
     },
     "onlynamedtheorems{}": {
-      "snippet": "onlynamedtheorems{${1:thm1,${2:thm2},...}}"
+      "snippet": "onlynamedtheorems{${1:thm1,thm2,...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/tikz-3dplot.json b/dev/packages/tikz-3dplot.json
index 2c0006c27..f127362cf 100644
--- a/dev/packages/tikz-3dplot.json
+++ b/dev/packages/tikz-3dplot.json
@@ -42,12 +42,6 @@
     "tdplotgetpolarcoords{}{}{}": {
       "snippet": "tdplotgetpolarcoords{${1:x}}{${2:y}}{${3:z}}"
     },
-    "tdplotcrossprod()()": {
-      "snippet": "tdplotcrossprod(${1:x1},${2:y1},${3:z1})(${4:x2},${5:y2},${6:z2})"
-    },
-    "tdplotdefinepoints()()()": {
-      "snippet": "tdplotdefinepoints(${1:vx},${2:vy},${3:vz})(${4:x1},${5:y1},${6:z1})(${7:x2},${8:y2},${9:z2})"
-    },
     "tdplotdrawarc{}{}{}{}{}{}": {
       "snippet": "tdplotdrawarc{${1:center}}{${2:r}}{${3:angle start}}{${4:angle end}}{${5:label options}}{${6:label}}"
     },
diff --git a/dev/packages/tikz-inet.json b/dev/packages/tikz-inet.json
index aa6b11a7a..b9b38bc80 100644
--- a/dev/packages/tikz-inet.json
+++ b/dev/packages/tikz-inet.json
@@ -7,31 +7,10 @@
     "inetcell{}": {
       "snippet": "inetcell{${1:symbol}}"
     },
-    "inetcell[](){}[]": {
-      "snippet": "inetcell[${2:options}](${4:node name}){${1:symbol}}[${3:angle}]"
-    },
-    "inetwire()()": {
-      "snippet": "inetwire(${1:cell1.port1})(${2:cell2.port2})"
-    },
-    "inetwire[]()()": {
-      "snippet": "inetwire[${1:options}](${2:cell1.port1})(${3:cell2.port2})"
-    },
     "inetloop": {},
     "inetloop[]": {
       "snippet": "inetloop[${1:options}]"
     },
-    "inetwirecoords()()": {
-      "snippet": "inetwirecoords(${1:node1})(${2:node2})"
-    },
-    "inetwirecoords[]()()": {
-      "snippet": "inetwirecoords[${1:options}](${2:node1})(${3:node2})"
-    },
-    "inetwirefree()": {
-      "snippet": "inetwirefree(${1:cell.port})"
-    },
-    "inetwirefree[]()": {
-      "snippet": "inetwirefree[${1:options}](${2:cell.port})"
-    },
     "inetbox{}{}": {
       "snippet": "inetbox{${1:(${3:cell1}) (${4:cell2}) ...}}{${2:node name}}"
     },
diff --git a/dev/packages/tikz-lake-fig.json b/dev/packages/tikz-lake-fig.json
index dcac31432..2d6579516 100644
--- a/dev/packages/tikz-lake-fig.json
+++ b/dev/packages/tikz-lake-fig.json
@@ -13,9 +13,6 @@
     "relsize": []
   },
   "macros": {
-    "mystrut()": {
-      "snippet": "mystrut(${1:height},${2:depth})"
-    },
     "lakediagramgreen[]": {
       "snippet": "lakediagramgreen[${1:scale}]"
     },
diff --git a/dev/packages/tikz-network.json b/dev/packages/tikz-network.json
index 855d3bce3..780db3a03 100644
--- a/dev/packages/tikz-network.json
+++ b/dev/packages/tikz-network.json
@@ -23,20 +23,12 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "Edge()()": {
-      "snippet": "Edge(${1:vertex1})(${2:vertex2})"
-    },
-    "Edge[]()()": {
-      "snippet": "Edge[${1:options}](${2:vertex1})(${3:vertex2})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "Text{}": {
       "snippet": "Text{${1:text}}"
     },
     "Text[]{}": {
       "snippet": "Text[${2:options}]{${1:text}}",
-      "keyvalindex": 2,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "Vertices{}": {
@@ -44,7 +36,7 @@
     },
     "Vertices[]{}": {
       "snippet": "Vertices[${2:options}]{${1:file}}",
-      "keyvalindex": 3,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "Edges{}": {
@@ -52,12 +44,12 @@
     },
     "Edges[]{}": {
       "snippet": "Edges[${2:options}]{${1:file}}",
-      "keyvalindex": 4,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "Plane[]": {
       "snippet": "Plane[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "SetDefaultUnit{}": {
@@ -74,24 +66,24 @@
     },
     "SetVertexStyle[]": {
       "snippet": "SetVertexStyle[${1:options}]",
-      "keyvalindex": 6,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "SetEdgeStyle[]": {
       "snippet": "SetEdgeStyle[${1:options}]",
-      "keyvalindex": 7,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "EdgesNotInBG": {},
     "EdgesInBG": {},
     "SetTextStyle[]": {
       "snippet": "SetTextStyle[${1:options}]",
-      "keyvalindex": 8,
+      "keyvalindex": 7,
       "keyvalpos": 0
     },
     "SetPlaneStyle[]": {
       "snippet": "SetPlaneStyle[${1:options}]",
-      "keyvalindex": 9,
+      "keyvalindex": 8,
       "keyvalpos": 0
     },
     "SetPlaneWidth{}": {
@@ -127,27 +119,6 @@
       "RGB",
       "Pseudo"
     ],
-    [
-      "lw=",
-      "color=",
-      "opacity=",
-      "bend=",
-      "label=",
-      "fontsize=",
-      "fontcolor=",
-      "fontscale=",
-      "position=",
-      "distance=",
-      "style=",
-      "path={${1:vertex list}}",
-      "loopsize=",
-      "loopposition=",
-      "loopshape=",
-      "Direct",
-      "Math",
-      "RGB",
-      "NotInBG"
-    ],
     [
       "x=",
       "y=",
diff --git a/dev/packages/tikz-truchet.json b/dev/packages/tikz-truchet.json
index c3601aeff..51f11325f 100644
--- a/dev/packages/tikz-truchet.json
+++ b/dev/packages/tikz-truchet.json
@@ -7,45 +7,45 @@
       "snippet": "truchetsquare{${1:Center}}{${2:NE}}{${3:NW}}{${4:SW}}{${5:SE}}"
     },
     "truchetsquare[]{}{}{}{}{}": {
-      "snippet": "truchetsquare[${6:(${7:x},${8:y})}]{${1:Center}}{${2:NE}}{${3:NW}}{${4:SW}}{${5:SE}}"
+      "snippet": "truchetsquare[${6:(${7:x,y})}]{${1:Center}}{${2:NE}}{${3:NW}}{${4:SW}}{${5:SE}}"
     },
     "diagonalsquare{}{}{}{}": {
       "snippet": "diagonalsquare{${1:NE}}{${2:NW}}{${3:SW}}{${4:SE}}"
     },
     "diagonalsquare[]{}{}{}{}": {
-      "snippet": "diagonalsquare[${5:(${6:x},${7:y})}]{${1:NE}}{${2:NW}}{${3:SW}}{${4:SE}}"
+      "snippet": "diagonalsquare[${5:(${6:x,y})}]{${1:NE}}{${2:NW}}{${3:SW}}{${4:SE}}"
     },
     "tileA": {},
     "tileA[]": {
-      "snippet": "tileA[${1:(${2:x},${3:y})}]"
+      "snippet": "tileA[${1:(${2:x,y})}]"
     },
     "tileB": {},
     "tileB[]": {
-      "snippet": "tileB[${1:(${2:x},${3:y})}]"
+      "snippet": "tileB[${1:(${2:x,y})}]"
     },
     "tileC": {},
     "tileC[]": {
-      "snippet": "tileC[${1:(${2:x},${3:y})}]"
+      "snippet": "tileC[${1:(${2:x,y})}]"
     },
     "tileD": {},
     "tileD[]": {
-      "snippet": "tileD[${1:(${2:x},${3:y})}]"
+      "snippet": "tileD[${1:(${2:x,y})}]"
     },
     "truchethex{}{}{}{}{}{}{}": {
       "snippet": "truchethex{${1:Center}}{${2:NW}}{${3:W}}{${4:SW}}{${5:SE}}{${6:E}}{${7:NW}}"
     },
     "truchethex[]{}{}{}{}{}{}{}": {
-      "snippet": "truchethex[${8:(${9:x},${10:y})}]{${1:Center}}{${2:NW}}{${3:W}}{${4:SW}}{${5:SE}}{${6:E}}{${7:NW}}"
+      "snippet": "truchethex[${8:(${9:x,y})}]{${1:Center}}{${2:NW}}{${3:W}}{${4:SW}}{${5:SE}}{${6:E}}{${7:NW}}"
     },
     "truchetsplithex": {},
     "truchetsplithex[]": {
-      "snippet": "truchetsplithex[${1:(${2:x},${3:y})}]"
+      "snippet": "truchetsplithex[${1:(${2:x,y})}]"
     },
     "truchetcube{}{}{}{}{}{}": {
       "snippet": "truchetcube{${1:Bottom}}{${2:Front}}{${3:Right}}{${4:Back}}{${5:Left}}{${6:Right}}"
     },
     "truchetcube[]{}{}{}{}{}{}": {
-      "snippet": "truchetcube[${7:(${8:x},${9:y})}]{${1:Bottom}}{${2:Front}}{${3:Right}}{${4:Back}}{${5:Left}}{${6:Right}}"
+      "snippet": "truchetcube[${7:(${8:x,y})}]{${1:Bottom}}{${2:Front}}{${3:Right}}{${4:Back}}{${5:Left}}{${6:Right}}"
     }
   },
   "envs": {
diff --git a/dev/packages/tikz.json b/dev/packages/tikz.json
deleted file mode 100644
index d4d5ac964..000000000
--- a/dev/packages/tikz.json
+++ /dev/null
@@ -1,1508 +0,0 @@
-{
-  "includes": {
-    "pgf": [],
-    "pgffor": []
-  },
-  "macros": {
-    "scoped": {},
-    "scoped[]": {
-      "snippet": "scoped[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "tikzset{}": {
-      "snippet": "tikzset{${1:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "tikzoption{}{}": {
-      "snippet": "tikzoption{${1:key}}{${2:value}}"
-    },
-    "tikzaddafternodepathoption{}": {
-      "snippet": "tikzaddafternodepathoption{${1:arg}}"
-    },
-    "tikzparentanchor": {},
-    "tikzchildanchor": {},
-    "tikzparentnode": {},
-    "tikzchildnode": {},
-    "tikzpicture": {},
-    "endtikzpicture": {},
-    "tikz": {},
-    "tikz[]": {
-      "snippet": "tikz[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "tikzdeclarecoordinatesystem{}{}": {
-      "snippet": "tikzdeclarecoordinatesystem{${1:name}}{${2:code}}"
-    },
-    "tikzaliascoordinatesystem{}{}": {
-      "snippet": "tikzaliascoordinatesystem{${1:new name}}{${2:old name}}"
-    },
-    "tikzifinpicture{}{}": {
-      "snippet": "tikzifinpicture{${1:in code}}{${2:out code}}"
-    },
-    "tikzaddtikzonlycommandshortcutlet{}{}": {
-      "snippet": "tikzaddtikzonlycommandshortcutlet{${1:short cmd}}{${2:cmd}}"
-    },
-    "tikzaddtikzonlycommandshortcutdef{}{}": {
-      "snippet": "tikzaddtikzonlycommandshortcutdef{${1:short cmd}}{${2:def}}"
-    },
-    "nodepart{}": {
-      "snippet": "nodepart{${1:part name}}"
-    },
-    "nodepart[]{}": {
-      "snippet": "nodepart[${2:options}]{${1:part name}}",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "pgfextra{}": {
-      "snippet": "pgfextra{${1:code}}"
-    },
-    "endpgfextra": {},
-    "pgfstrokehook": {},
-    "tikztostart": {},
-    "tikztotarget": {},
-    "tikztonodes": {},
-    "tikzlastnode": {},
-    "pgfplotlastpoint": {},
-    "tikzerror{}": {
-      "snippet": "tikzerror{${1:message}}"
-    },
-    "tikzleveldistance": {},
-    "tikzsiblingdistance": {},
-    "tikztreelevel": {},
-    "tikznumberofchildren": {},
-    "tikznumberofcurrentchild": {},
-    "tikzpathuptonow": {},
-    "tikzpictext": {},
-    "tikzpictextoptions": {},
-    "tikzdeclarepic{}{}": {
-      "snippet": "tikzdeclarepic{${1:arg1}}{${2:arg2}}"
-    },
-    "p": {
-      "detail": "𝑝",
-      "documentation": "MATHEMATICAL ITALIC SMALL P"
-    },
-    "x": {
-      "detail": "𝑥",
-      "documentation": "MATHEMATICAL ITALIC SMALL X"
-    },
-    "y": {
-      "detail": "𝑦",
-      "documentation": "MATHEMATICAL ITALIC SMALL Y"
-    },
-    "tikzgdeventcallback{}{}": {
-      "snippet": "tikzgdeventcallback{${1:arg1}}{${2:arg2}}"
-    },
-    "tikzgdeventgroupcallback{}": {
-      "snippet": "tikzgdeventgroupcallback{${1:arg1}}"
-    },
-    "tikzgdlatenodeoptionacallback{}": {
-      "snippet": "tikzgdlatenodeoptionacallback{${1:arg1}}"
-    },
-    "usetikzlibrary{}": {
-      "snippet": "usetikzlibrary{${1:library list}}",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "pgfplothandlercurveto": {},
-    "pgfsetplottension{}": {
-      "snippet": "pgfsetplottension{${1:tension}}"
-    },
-    "pgfplothandlerclosedcurve": {},
-    "pgfplothandlerxcomb": {},
-    "pgfplothandlerycomb": {},
-    "pgfplotxzerolevelstreamstart": {},
-    "pgfplotxzerolevelstreamend": {},
-    "pgfplotxzerolevelstreamnext": {},
-    "pgfplotyzerolevelstreamstart": {},
-    "pgfplotyzerolevelstreamend": {},
-    "pgfplotyzerolevelstreamnext": {},
-    "pgfplotxzerolevelstreamconstant{}": {
-      "snippet": "pgfplotxzerolevelstreamconstant{${1:dimen}}"
-    },
-    "pgfplotyzerolevelstreamconstant{}": {
-      "snippet": "pgfplotyzerolevelstreamconstant{${1:dimen}}"
-    },
-    "pgfplotbarwidth": {},
-    "pgfplotbarshift": {},
-    "pgfplothandlerybar": {},
-    "pgfplothandlerxbar": {},
-    "pgfplothandlerybarinterval": {},
-    "pgfplothandlerxbarinterval": {},
-    "pgfplothandlerconstantlineto": {},
-    "pgfplothandlerconstantlinetomarkright": {},
-    "pgfplothandlerconstantlinetomarkmid": {},
-    "pgfplothandlerjumpmarkright": {},
-    "pgfplothandlerjumpmarkleft": {},
-    "pgfplothandlerjumpmarkmid": {},
-    "pgfplothandlerpolarcomb": {},
-    "pgfplothandlermark{}": {
-      "snippet": "pgfplothandlermark{${1:mark code}}"
-    },
-    "pgfsetplotmarkrepeat{}": {
-      "snippet": "pgfsetplotmarkrepeat{${1:repeat count}}"
-    },
-    "pgfsetplotmarkphase{}": {
-      "snippet": "pgfsetplotmarkphase{${1:index}}"
-    },
-    "pgfplothandlermarklisted{}{}": {
-      "snippet": "pgfplothandlermarklisted{${1:code}}{${2:positions}}"
-    },
-    "pgfdeclareplotmark{}{}": {
-      "snippet": "pgfdeclareplotmark{${1:name}}{${2:code}}"
-    },
-    "pgfsetplotmarksize{}": {
-      "snippet": "pgfsetplotmarksize{${1:size}}"
-    },
-    "pgfplotmarksize": {},
-    "pgfuseplotmark{}": {
-      "snippet": "pgfuseplotmark{${1:name}}"
-    },
-    "pgfplothandlergaplineto": {},
-    "pgfplothandlergapcycle": {},
-    "ifpgfmatrix": {},
-    "pgfmatrixtrue": {},
-    "pgfmatrixfalse": {},
-    "pgfmatrixcurrentrow": {},
-    "pgfmatrixcurrentcolumn": {},
-    "pgfmatrixbeforeassemblenode{}": {
-      "snippet": "pgfmatrixbeforeassemblenode{${1:code}}"
-    },
-    "pgfsetmatrixrowsep{}": {
-      "snippet": "pgfsetmatrixrowsep{${1:sep list}}"
-    },
-    "pgfsetmatrixcolumnsep{}": {
-      "snippet": "pgfsetmatrixcolumnsep{${1:sep list}}"
-    },
-    "pgfmatrixrowsep": {},
-    "pgfmatrixcolumnsep": {},
-    "pgfmatrix{}{}{}{}{}{}{}": {
-      "snippet": "pgfmatrix{${1:shape}}{${2:anchor}}{${3:name}}{${4:usage}}{${5:shift}}{${6:precode}}{${7:matrix cells}}"
-    },
-    "pgfmatrixnextcell": {},
-    "pgfmatrixnextcell[]": {
-      "snippet": "pgfmatrixnextcell[${1:additional sep list}]"
-    },
-    "pgfmatrixbegincode": {},
-    "pgfmatrixendcode": {},
-    "pgfmatrixemptycode": {},
-    "pgfmatrixendrow": {},
-    "pgfmatrixendrow[]": {
-      "snippet": "pgfmatrixendrow[${1:additional sep list}]"
-    }
-  },
-  "envs": {
-    "scope": {},
-    "scope[]": {
-      "name": "scope",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "tikzpicture": {},
-    "tikzpicture[]": {
-      "name": "tikzpicture",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "execute at begin scope=${1:code}",
-      "execute at end scope=${1:code}",
-      "transparency group",
-      "transparency group=${1:options}",
-      "every path/.style={${1:options}}",
-      "every circle/.style={${1:options}}",
-      "every to/.style={${1:options}}",
-      "every node/.style={${1:options}}",
-      "every lower node part/.style={${1:options}}",
-      "every label/.style={${1:options}}",
-      "every pin/.style={${1:options}}",
-      "every pin edge/.style={${1:options}}",
-      "every edge/.style={${1:options}}",
-      "every pic/.style={${1:options}}",
-      "every new ->/.style={${1:options}}",
-      "every new --/.style={${1:options}}",
-      "every new <->/.style={${1:options}}",
-      "every new <-/.style={${1:options}}",
-      "every new -!-/.style={${1:options}}",
-      "every matrix/.style={${1:options}}",
-      "every outer matrix/.style={${1:options}}",
-      "every child/.style={${1:options}}",
-      "every child node/.style={${1:options}}",
-      "every plot/.style={${1:options}}",
-      "every mark/.style={${1:options}}",
-      "every loop/.style={${1:options}}",
-      "execute at begin to=${1:code}",
-      "execute at end to=${1:code}",
-      "execute at begin node=${1:code}",
-      "execute at end node=${1:code}",
-      "trim left",
-      "trim left=${1:<dimen> or <coord> or default}",
-      "trim right",
-      "trim right=${1:<dimen> or <coord> or default}",
-      "tri lowlevel",
-      "name prefix=${1:text}",
-      "name suffix=${1:text}",
-      "badness warnings for centered text",
-      "node halign header=${1:macro}",
-      "level/.style={${1:options}}",
-      "level ${1:n}/.style={${2:options}}",
-      "level distance=",
-      "sibling distance=",
-      "edge from parent/.style={${1:options}}",
-      "variable=${1:macro}",
-      "samples=${1:number}",
-      "domain=${1:start}:${2:end}",
-      "samples at=${1:samples list}",
-      "parametric",
-      "range=${1:start}:${2:end}",
-      "yrange=${1:start}:${2:end}",
-      "xrange=${1:start}:${2:end}",
-      "id=${1:id}",
-      "prefix",
-      "raw gnuplot",
-      "mark=${1:mark}",
-      "mark repeat=${1:number}",
-      "mark phase=${1:number}",
-      "mark indices=${1:list}",
-      "mark size=",
-      "mark options={${1:options}}",
-      "no marks",
-      "no markers",
-      "sharp plot",
-      "smooth",
-      "tension=${1:value}",
-      "smooth cycle",
-      "const plot",
-      "const plot mark left",
-      "const plot mark right",
-      "const plot mark mid",
-      "jump mark left",
-      "jump mark right",
-      "jump mark mid",
-      "ycomb",
-      "xcomb",
-      "polar comb",
-      "ybar",
-      "xbar",
-      "ybar interval",
-      "xbar interval",
-      "only marks",
-      "blend mode=",
-      "blend group=",
-      "matrix/inner style order={${1:list}}",
-      "bar width=",
-      "bar shift=",
-      "bar interval shift=${1:factor}",
-      "bar interval width=${1:scale}",
-      "gap around stream point=",
-      "x=${1:<dimen> or <coord>}",
-      "y=${1:<dimen> or <coord>}",
-      "z=${1:<dimen> or <coord>}",
-      "name=${1:name}",
-      "append after command=${1:path}",
-      "prefix after command=${1:path}",
-      "rounded corners",
-      "rounded corners=",
-      "sharp corners",
-      "x radius=${1:<num> or <dimen>}",
-      "y radius=${1:<num> or <dimen>}",
-      "radius=",
-      "at=${1:coord}",
-      "start angle=${1:degrees}",
-      "end angle=${1:degrees}",
-      "delta angle=${1:degrees}",
-      "step=${1:<num> or <dimen> or <coord>}",
-      "xstep=${1:<num> or <dimen>}",
-      "ystep=${1:<num> or <dimen>}",
-      "help lines",
-      "bend=${1:coord}",
-      "bend pos=${1:fraction}",
-      "parabola height=",
-      "bend at start",
-      "bend at end",
-      "to path=${1:path}",
-      "save path=${1:macro}",
-      "use path=${1:macro}",
-      "color=",
-      "%color",
-      "draw",
-      "draw=",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line cap=",
-      "line join=",
-      "miter limit=${1:factor}",
-      "dash pattern=${1:dash pattern}",
-      "dash phase=${1:dash phase}",
-      "dash=${1:dash pattern} phase ${2:dash phase}",
-      "dash expand off",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "double",
-      "double=",
-      "double distance=",
-      "double distance between line centers=",
-      "double equal sign distance",
-      "fill",
-      "fill=",
-      "pattern",
-      "pattern=${1:name}",
-      "pattern color=",
-      "nonzero rule",
-      "even odd rule",
-      "shade",
-      "shading=",
-      "shading angle=${1:degrees}",
-      "arrows=${1:start spec}-${2:end spec}",
-      "->",
-      "<-",
-      "<->",
-      "tips",
-      "tips=",
-      ">=${1:end arrow spec}",
-      "shorten <=",
-      "shorten >=",
-      "inner sep=",
-      "inner xsep=",
-      "inner ysep=",
-      "outer sep=${1:<dimen> or auto}",
-      "outer xsep=",
-      "outer ysep=",
-      "minimum height=",
-      "minimum width=",
-      "minimum size=",
-      "shape aspect=${1:aspect ratio}",
-      "shape border uses incircle",
-      "shape border rotate=${1:degrees}",
-      "text=",
-      "node font=${1:font commands}",
-      "font=${1:font commands}",
-      "text width=",
-      "align=",
-      "text height=",
-      "text depth=",
-      "anchor=",
-      "above",
-      "above=",
-      "below",
-      "below=",
-      "right",
-      "right=",
-      "left",
-      "left=",
-      "above left",
-      "above right",
-      "below left",
-      "below right",
-      "centered",
-      "transform shape",
-      "transform shape nonlinear",
-      "pos=${1:fraction}",
-      "auto",
-      "auto=",
-      "swap",
-      "sloped",
-      "allow upside down",
-      "midway",
-      "near start",
-      "near end",
-      "very near start",
-      "very near end",
-      "at start",
-      "at end",
-      "label=${1:angle}:${2:text}",
-      "label=[${1:options}]${2:angle}:${3:text}",
-      "label position=${1:degrees}",
-      "absolute",
-      "label distance=",
-      "pin=${1:angle}:${2:text}",
-      "pin=[${1:options}]${2:angle}:${3:text}",
-      "pin distance=",
-      "pin edge={${1:options}}",
-      "remember picture",
-      "overlay",
-      "growth parent anchor=",
-      "growth function=${1:macro}",
-      "edge from parent path=${1:path}",
-      "draw opacity=${1:value}",
-      "opacity=${1:value}",
-      "transparent",
-      "ultra nearly transparent",
-      "very nearly transparent",
-      "nearly transparent",
-      "semitransparent",
-      "nearly opaque",
-      "very nearly opaque",
-      "ultra nearly opaque",
-      "opaque",
-      "fill opacity=${1:value}",
-      "text opacity=${1:value}",
-      "shift={${1:coordinate}}",
-      "shift only",
-      "xshift=",
-      "yshift=",
-      "scale=${1:scale}",
-      "xscale=${1:scale}",
-      "yscale=${1:scale}",
-      "xslant=${1:factor}",
-      "yslant=${1:factor}",
-      "rotate=${1:degrees}",
-      "rotate around={${1:degree}:${2:coordinate}}",
-      "rotate around x=${1:degrees}",
-      "rotate around y=${1:degrees}",
-      "rotate around z=${1:degrees}",
-      "cm={${1:a,b,c,d,coord}}",
-      "reset cm",
-      "transform canvas={${1:options}}",
-      "out=${1:degrees}",
-      "in=${1:degrees}",
-      "relative",
-      "bend left",
-      "bend left=${1:degrees}",
-      "bend right",
-      "bend right=${1:degrees}",
-      "bend angle=${1:degrees}",
-      "looseness=${1:number}",
-      "out looseness=${1:number}",
-      "in looseness=${1:number}",
-      "min distance=",
-      "max distance=",
-      "out min distance=",
-      "out max distance=",
-      "in min distance=",
-      "in max distance=",
-      "distance=",
-      "out distance=",
-      "in distance=",
-      "out control=${1:coord}",
-      "in control=${1:coord}",
-      "controls=${1:coord1} and ${2:coord2}",
-      "%tikzstyle",
-      "pic type=${1:type}",
-      "pics/code=${1:code}",
-      "pics/foreground code=${1:code}",
-      "pics/background code=${1:code}",
-      "pic text=${1:text}",
-      "pic text options={${1:options}}",
-      "column sep=",
-      "row sep=",
-      "every cell={${1:row}}{${2:column}}",
-      "cells={${1:options}}",
-      "nodes={${1:options}}",
-      "column ${1:n}/.style={${2:options}}",
-      "every odd column/.style={${1:options}}",
-      "every even column/.style={${1:options}}",
-      "row ${1:m}/.style={${2:options}}",
-      "every odd row/.style={${1:options}}",
-      "every even row/.style={${1:options}}",
-      "row ${1:m} column ${2:n}/.style={${3:options}}",
-      "execute at begin cell=${1:code}",
-      "execute at end cell=${1:code}",
-      "execute at empty cell=${1:code}",
-      "matrix anchor=${1:anchor}",
-      "ampersand replacement=${1:macro}"
-    ],
-    [
-      "every picture/.style={${1:options}}",
-      "baseline",
-      "baseline=${1:<dimen> or <coord> or default}",
-      "execute at begin picture=${1:code}",
-      "execute at end picture=${1:code}",
-      "every scope/.style={${1:options}}",
-      "execute at begin scope=${1:code}",
-      "execute at end scope=${1:code}",
-      "transparency group",
-      "transparency group=${1:options}",
-      "every path/.style={${1:options}}",
-      "every circle/.style={${1:options}}",
-      "every to/.style={${1:options}}",
-      "every node/.style={${1:options}}",
-      "every lower node part/.style={${1:options}}",
-      "every label/.style={${1:options}}",
-      "every pin/.style={${1:options}}",
-      "every pin edge/.style={${1:options}}",
-      "every edge/.style={${1:options}}",
-      "every pic/.style={${1:options}}",
-      "every new ->/.style={${1:options}}",
-      "every new --/.style={${1:options}}",
-      "every new <->/.style={${1:options}}",
-      "every new <-/.style={${1:options}}",
-      "every new -!-/.style={${1:options}}",
-      "every matrix/.style={${1:options}}",
-      "every outer matrix/.style={${1:options}}",
-      "every child/.style={${1:options}}",
-      "every child node/.style={${1:options}}",
-      "every plot/.style={${1:options}}",
-      "every mark/.style={${1:options}}",
-      "every loop/.style={${1:options}}",
-      "execute at begin to=${1:code}",
-      "execute at end to=${1:code}",
-      "execute at begin node=${1:code}",
-      "execute at end node=${1:code}",
-      "trim left",
-      "trim left=${1:<dimen> or <coord> or default}",
-      "trim right",
-      "trim right=${1:<dimen> or <coord> or default}",
-      "tri lowlevel",
-      "name prefix=${1:text}",
-      "name suffix=${1:text}",
-      "badness warnings for centered text",
-      "node halign header=${1:macro}",
-      "level/.style={${1:options}}",
-      "level ${1:n}/.style={${2:options}}",
-      "level distance=",
-      "sibling distance=",
-      "edge from parent/.style={${1:options}}",
-      "variable=${1:macro}",
-      "samples=${1:number}",
-      "domain=${1:start}:${2:end}",
-      "samples at=${1:samples list}",
-      "parametric",
-      "range=${1:start}:${2:end}",
-      "yrange=${1:start}:${2:end}",
-      "xrange=${1:start}:${2:end}",
-      "id=${1:id}",
-      "prefix",
-      "raw gnuplot",
-      "mark=${1:mark}",
-      "mark repeat=${1:number}",
-      "mark phase=${1:number}",
-      "mark indices=${1:list}",
-      "mark size=",
-      "mark options={${1:options}}",
-      "no marks",
-      "no markers",
-      "sharp plot",
-      "smooth",
-      "tension=${1:value}",
-      "smooth cycle",
-      "const plot",
-      "const plot mark left",
-      "const plot mark right",
-      "const plot mark mid",
-      "jump mark left",
-      "jump mark right",
-      "jump mark mid",
-      "ycomb",
-      "xcomb",
-      "polar comb",
-      "ybar",
-      "xbar",
-      "ybar interval",
-      "xbar interval",
-      "only marks",
-      "blend mode=",
-      "blend group=",
-      "matrix/inner style order={${1:list}}",
-      "bar width=",
-      "bar shift=",
-      "bar interval shift=${1:factor}",
-      "bar interval width=${1:scale}",
-      "gap around stream point=",
-      "x=${1:<dimen> or <coord>}",
-      "y=${1:<dimen> or <coord>}",
-      "z=${1:<dimen> or <coord>}",
-      "name=${1:name}",
-      "append after command=${1:path}",
-      "prefix after command=${1:path}",
-      "rounded corners",
-      "rounded corners=",
-      "sharp corners",
-      "x radius=${1:<num> or <dimen>}",
-      "y radius=${1:<num> or <dimen>}",
-      "radius=",
-      "at=${1:coord}",
-      "start angle=${1:degrees}",
-      "end angle=${1:degrees}",
-      "delta angle=${1:degrees}",
-      "step=${1:<num> or <dimen> or <coord>}",
-      "xstep=${1:<num> or <dimen>}",
-      "ystep=${1:<num> or <dimen>}",
-      "help lines",
-      "bend=${1:coord}",
-      "bend pos=${1:fraction}",
-      "parabola height=",
-      "bend at start",
-      "bend at end",
-      "to path=${1:path}",
-      "save path=${1:macro}",
-      "use path=${1:macro}",
-      "color=",
-      "%color",
-      "draw",
-      "draw=",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line cap=",
-      "line join=",
-      "miter limit=${1:factor}",
-      "dash pattern=${1:dash pattern}",
-      "dash phase=${1:dash phase}",
-      "dash=${1:dash pattern} phase ${2:dash phase}",
-      "dash expand off",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "double",
-      "double=",
-      "double distance=",
-      "double distance between line centers=",
-      "double equal sign distance",
-      "fill",
-      "fill=",
-      "pattern",
-      "pattern=${1:name}",
-      "pattern color=",
-      "nonzero rule",
-      "even odd rule",
-      "shade",
-      "shading=",
-      "shading angle=${1:degrees}",
-      "arrows=${1:start spec}-${2:end spec}",
-      "->",
-      "<-",
-      "<->",
-      "tips",
-      "tips=",
-      ">=${1:end arrow spec}",
-      "shorten <=",
-      "shorten >=",
-      "inner sep=",
-      "inner xsep=",
-      "inner ysep=",
-      "outer sep=${1:<dimen> or auto}",
-      "outer xsep=",
-      "outer ysep=",
-      "minimum height=",
-      "minimum width=",
-      "minimum size=",
-      "shape aspect=${1:aspect ratio}",
-      "shape border uses incircle",
-      "shape border rotate=${1:degrees}",
-      "text=",
-      "node font=${1:font commands}",
-      "font=${1:font commands}",
-      "text width=",
-      "align=",
-      "text height=",
-      "text depth=",
-      "anchor=",
-      "above",
-      "above=",
-      "below",
-      "below=",
-      "right",
-      "right=",
-      "left",
-      "left=",
-      "above left",
-      "above right",
-      "below left",
-      "below right",
-      "centered",
-      "transform shape",
-      "transform shape nonlinear",
-      "pos=${1:fraction}",
-      "auto",
-      "auto=",
-      "swap",
-      "sloped",
-      "allow upside down",
-      "midway",
-      "near start",
-      "near end",
-      "very near start",
-      "very near end",
-      "at start",
-      "at end",
-      "label=${1:angle}:${2:text}",
-      "label=[${1:options}]${2:angle}:${3:text}",
-      "label position=${1:degrees}",
-      "absolute",
-      "label distance=",
-      "pin=${1:angle}:${2:text}",
-      "pin=[${1:options}]${2:angle}:${3:text}",
-      "pin distance=",
-      "pin edge={${1:options}}",
-      "remember picture",
-      "overlay",
-      "growth parent anchor=",
-      "growth function=${1:macro}",
-      "edge from parent path=${1:path}",
-      "draw opacity=${1:value}",
-      "opacity=${1:value}",
-      "transparent",
-      "ultra nearly transparent",
-      "very nearly transparent",
-      "nearly transparent",
-      "semitransparent",
-      "nearly opaque",
-      "very nearly opaque",
-      "ultra nearly opaque",
-      "opaque",
-      "fill opacity=${1:value}",
-      "text opacity=${1:value}",
-      "shift={${1:coordinate}}",
-      "shift only",
-      "xshift=",
-      "yshift=",
-      "scale=${1:scale}",
-      "xscale=${1:scale}",
-      "yscale=${1:scale}",
-      "xslant=${1:factor}",
-      "yslant=${1:factor}",
-      "rotate=${1:degrees}",
-      "rotate around={${1:degree}:${2:coordinate}}",
-      "rotate around x=${1:degrees}",
-      "rotate around y=${1:degrees}",
-      "rotate around z=${1:degrees}",
-      "cm={${1:a,b,c,d,coord}}",
-      "reset cm",
-      "transform canvas={${1:options}}",
-      "out=${1:degrees}",
-      "in=${1:degrees}",
-      "relative",
-      "bend left",
-      "bend left=${1:degrees}",
-      "bend right",
-      "bend right=${1:degrees}",
-      "bend angle=${1:degrees}",
-      "looseness=${1:number}",
-      "out looseness=${1:number}",
-      "in looseness=${1:number}",
-      "min distance=",
-      "max distance=",
-      "out min distance=",
-      "out max distance=",
-      "in min distance=",
-      "in max distance=",
-      "distance=",
-      "out distance=",
-      "in distance=",
-      "out control=${1:coord}",
-      "in control=${1:coord}",
-      "controls=${1:coord1} and ${2:coord2}",
-      "%tikzstyle",
-      "pic type=${1:type}",
-      "pics/code=${1:code}",
-      "pics/foreground code=${1:code}",
-      "pics/background code=${1:code}",
-      "pic text=${1:text}",
-      "pic text options={${1:options}}",
-      "column sep=",
-      "row sep=",
-      "every cell={${1:row}}{${2:column}}",
-      "cells={${1:options}}",
-      "nodes={${1:options}}",
-      "column ${1:n}/.style={${2:options}}",
-      "every odd column/.style={${1:options}}",
-      "every even column/.style={${1:options}}",
-      "row ${1:m}/.style={${2:options}}",
-      "every odd row/.style={${1:options}}",
-      "every even row/.style={${1:options}}",
-      "row ${1:m} column ${2:n}/.style={${3:options}}",
-      "execute at begin cell=${1:code}",
-      "execute at end cell=${1:code}",
-      "execute at empty cell=${1:code}",
-      "matrix anchor=${1:anchor}",
-      "ampersand replacement=${1:macro}"
-    ],
-    [
-      "baseline",
-      "baseline=${1:<dimen> or <coord> or default}",
-      "execute at begin picture=${1:code}",
-      "execute at end picture=${1:code}",
-      "every scope/.style={${1:options}}",
-      "every path/.style={${1:options}}",
-      "every circle/.style={${1:options}}",
-      "every to/.style={${1:options}}",
-      "every node/.style={${1:options}}",
-      "every lower node part/.style={${1:options}}",
-      "every label/.style={${1:options}}",
-      "every pin/.style={${1:options}}",
-      "every pin edge/.style={${1:options}}",
-      "every edge/.style={${1:options}}",
-      "every pic/.style={${1:options}}",
-      "every new ->/.style={${1:options}}",
-      "every new --/.style={${1:options}}",
-      "every new <->/.style={${1:options}}",
-      "every new <-/.style={${1:options}}",
-      "every new -!-/.style={${1:options}}",
-      "every matrix/.style={${1:options}}",
-      "every outer matrix/.style={${1:options}}",
-      "every child/.style={${1:options}}",
-      "every child node/.style={${1:options}}",
-      "every plot/.style={${1:options}}",
-      "every mark/.style={${1:options}}",
-      "every loop/.style={${1:options}}",
-      "execute at begin to=${1:code}",
-      "execute at end to=${1:code}",
-      "execute at begin node=${1:code}",
-      "execute at end node=${1:code}",
-      "trim left",
-      "trim left=${1:<dimen> or <coord> or default}",
-      "trim right",
-      "trim right=${1:<dimen> or <coord> or default}",
-      "tri lowlevel",
-      "name prefix=${1:text}",
-      "name suffix=${1:text}",
-      "badness warnings for centered text",
-      "node halign header=${1:macro}",
-      "level/.style={${1:options}}",
-      "level ${1:n}/.style={${2:options}}",
-      "level distance=",
-      "sibling distance=",
-      "edge from parent/.style={${1:options}}",
-      "variable=${1:macro}",
-      "samples=${1:number}",
-      "domain=${1:start}:${2:end}",
-      "samples at=${1:samples list}",
-      "parametric",
-      "range=${1:start}:${2:end}",
-      "yrange=${1:start}:${2:end}",
-      "xrange=${1:start}:${2:end}",
-      "id=${1:id}",
-      "prefix",
-      "raw gnuplot",
-      "mark=${1:mark}",
-      "mark repeat=${1:number}",
-      "mark phase=${1:number}",
-      "mark indices=${1:list}",
-      "mark size=",
-      "mark options={${1:options}}",
-      "no marks",
-      "no markers",
-      "sharp plot",
-      "smooth",
-      "tension=${1:value}",
-      "smooth cycle",
-      "const plot",
-      "const plot mark left",
-      "const plot mark right",
-      "const plot mark mid",
-      "jump mark left",
-      "jump mark right",
-      "jump mark mid",
-      "ycomb",
-      "xcomb",
-      "polar comb",
-      "ybar",
-      "xbar",
-      "ybar interval",
-      "xbar interval",
-      "only marks",
-      "blend mode=",
-      "blend group=",
-      "matrix/inner style order={${1:list}}",
-      "bar width=",
-      "bar shift=",
-      "bar interval shift=${1:factor}",
-      "bar interval width=${1:scale}",
-      "gap around stream point=",
-      "x=${1:<dimen> or <coord>}",
-      "y=${1:<dimen> or <coord>}",
-      "z=${1:<dimen> or <coord>}",
-      "name=${1:name}",
-      "append after command=${1:path}",
-      "prefix after command=${1:path}",
-      "rounded corners",
-      "rounded corners=",
-      "sharp corners",
-      "x radius=${1:<num> or <dimen>}",
-      "y radius=${1:<num> or <dimen>}",
-      "radius=",
-      "at=${1:coord}",
-      "start angle=${1:degrees}",
-      "end angle=${1:degrees}",
-      "delta angle=${1:degrees}",
-      "step=${1:<num> or <dimen> or <coord>}",
-      "xstep=${1:<num> or <dimen>}",
-      "ystep=${1:<num> or <dimen>}",
-      "help lines",
-      "bend=${1:coord}",
-      "bend pos=${1:fraction}",
-      "parabola height=",
-      "bend at start",
-      "bend at end",
-      "to path=${1:path}",
-      "save path=${1:macro}",
-      "use path=${1:macro}",
-      "color=",
-      "%color",
-      "draw",
-      "draw=",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line cap=",
-      "line join=",
-      "miter limit=${1:factor}",
-      "dash pattern=${1:dash pattern}",
-      "dash phase=${1:dash phase}",
-      "dash=${1:dash pattern} phase ${2:dash phase}",
-      "dash expand off",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "double",
-      "double=",
-      "double distance=",
-      "double distance between line centers=",
-      "double equal sign distance",
-      "fill",
-      "fill=",
-      "pattern",
-      "pattern=${1:name}",
-      "pattern color=",
-      "nonzero rule",
-      "even odd rule",
-      "shade",
-      "shading=",
-      "shading angle=${1:degrees}",
-      "arrows=${1:start spec}-${2:end spec}",
-      "->",
-      "<-",
-      "<->",
-      "tips",
-      "tips=",
-      ">=${1:end arrow spec}",
-      "shorten <=",
-      "shorten >=",
-      "inner sep=",
-      "inner xsep=",
-      "inner ysep=",
-      "outer sep=${1:<dimen> or auto}",
-      "outer xsep=",
-      "outer ysep=",
-      "minimum height=",
-      "minimum width=",
-      "minimum size=",
-      "shape aspect=${1:aspect ratio}",
-      "shape border uses incircle",
-      "shape border rotate=${1:degrees}",
-      "text=",
-      "node font=${1:font commands}",
-      "font=${1:font commands}",
-      "text width=",
-      "align=",
-      "text height=",
-      "text depth=",
-      "anchor=",
-      "above",
-      "above=",
-      "below",
-      "below=",
-      "right",
-      "right=",
-      "left",
-      "left=",
-      "above left",
-      "above right",
-      "below left",
-      "below right",
-      "centered",
-      "transform shape",
-      "transform shape nonlinear",
-      "pos=${1:fraction}",
-      "auto",
-      "auto=",
-      "swap",
-      "sloped",
-      "allow upside down",
-      "midway",
-      "near start",
-      "near end",
-      "very near start",
-      "very near end",
-      "at start",
-      "at end",
-      "label=${1:angle}:${2:text}",
-      "label=[${1:options}]${2:angle}:${3:text}",
-      "label position=${1:degrees}",
-      "absolute",
-      "label distance=",
-      "pin=${1:angle}:${2:text}",
-      "pin=[${1:options}]${2:angle}:${3:text}",
-      "pin distance=",
-      "pin edge={${1:options}}",
-      "remember picture",
-      "overlay",
-      "growth parent anchor=",
-      "growth function=${1:macro}",
-      "edge from parent path=${1:path}",
-      "draw opacity=${1:value}",
-      "opacity=${1:value}",
-      "transparent",
-      "ultra nearly transparent",
-      "very nearly transparent",
-      "nearly transparent",
-      "semitransparent",
-      "nearly opaque",
-      "very nearly opaque",
-      "ultra nearly opaque",
-      "opaque",
-      "fill opacity=${1:value}",
-      "text opacity=${1:value}",
-      "shift={${1:coordinate}}",
-      "shift only",
-      "xshift=",
-      "yshift=",
-      "scale=${1:scale}",
-      "xscale=${1:scale}",
-      "yscale=${1:scale}",
-      "xslant=${1:factor}",
-      "yslant=${1:factor}",
-      "rotate=${1:degrees}",
-      "rotate around={${1:degree}:${2:coordinate}}",
-      "rotate around x=${1:degrees}",
-      "rotate around y=${1:degrees}",
-      "rotate around z=${1:degrees}",
-      "cm={${1:a,b,c,d,coord}}",
-      "reset cm",
-      "transform canvas={${1:options}}",
-      "out=${1:degrees}",
-      "in=${1:degrees}",
-      "relative",
-      "bend left",
-      "bend left=${1:degrees}",
-      "bend right",
-      "bend right=${1:degrees}",
-      "bend angle=${1:degrees}",
-      "looseness=${1:number}",
-      "out looseness=${1:number}",
-      "in looseness=${1:number}",
-      "min distance=",
-      "max distance=",
-      "out min distance=",
-      "out max distance=",
-      "in min distance=",
-      "in max distance=",
-      "distance=",
-      "out distance=",
-      "in distance=",
-      "out control=${1:coord}",
-      "in control=${1:coord}",
-      "controls=${1:coord1} and ${2:coord2}",
-      "%tikzstyle",
-      "pic type=${1:type}",
-      "pics/code=${1:code}",
-      "pics/foreground code=${1:code}",
-      "pics/background code=${1:code}",
-      "pic text=${1:text}",
-      "pic text options={${1:options}}",
-      "column sep=",
-      "row sep=",
-      "every cell={${1:row}}{${2:column}}",
-      "cells={${1:options}}",
-      "nodes={${1:options}}",
-      "column ${1:n}/.style={${2:options}}",
-      "every odd column/.style={${1:options}}",
-      "every even column/.style={${1:options}}",
-      "row ${1:m}/.style={${2:options}}",
-      "every odd row/.style={${1:options}}",
-      "every even row/.style={${1:options}}",
-      "row ${1:m} column ${2:n}/.style={${3:options}}",
-      "execute at begin cell=${1:code}",
-      "execute at end cell=${1:code}",
-      "execute at empty cell=${1:code}",
-      "matrix anchor=${1:anchor}",
-      "ampersand replacement=${1:macro}"
-    ],
-    [
-      "x=${1:<dimen> or <coord>}",
-      "y=${1:<dimen> or <coord>}",
-      "z=${1:<dimen> or <coord>}",
-      "name=${1:name}",
-      "append after command=${1:path}",
-      "prefix after command=${1:path}",
-      "rounded corners",
-      "rounded corners=",
-      "sharp corners",
-      "x radius=${1:<num> or <dimen>}",
-      "y radius=${1:<num> or <dimen>}",
-      "radius=",
-      "at=${1:coord}",
-      "start angle=${1:degrees}",
-      "end angle=${1:degrees}",
-      "delta angle=${1:degrees}",
-      "step=${1:<num> or <dimen> or <coord>}",
-      "xstep=${1:<num> or <dimen>}",
-      "ystep=${1:<num> or <dimen>}",
-      "help lines",
-      "bend=${1:coord}",
-      "bend pos=${1:fraction}",
-      "parabola height=",
-      "bend at start",
-      "bend at end",
-      "to path=${1:path}",
-      "save path=${1:macro}",
-      "use path=${1:macro}",
-      "color=",
-      "%color",
-      "draw",
-      "draw=",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line cap=",
-      "line join=",
-      "miter limit=${1:factor}",
-      "dash pattern=${1:dash pattern}",
-      "dash phase=${1:dash phase}",
-      "dash=${1:dash pattern} phase ${2:dash phase}",
-      "dash expand off",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "double",
-      "double=",
-      "double distance=",
-      "double distance between line centers=",
-      "double equal sign distance",
-      "fill",
-      "fill=",
-      "pattern",
-      "pattern=${1:name}",
-      "pattern color=",
-      "nonzero rule",
-      "even odd rule",
-      "shade",
-      "shading=",
-      "shading angle=${1:degrees}",
-      "arrows=${1:start spec}-${2:end spec}",
-      "->",
-      "<-",
-      "<->",
-      "tips",
-      "tips=",
-      ">=${1:end arrow spec}",
-      "shorten <=",
-      "shorten >=",
-      "inner sep=",
-      "inner xsep=",
-      "inner ysep=",
-      "outer sep=${1:<dimen> or auto}",
-      "outer xsep=",
-      "outer ysep=",
-      "minimum height=",
-      "minimum width=",
-      "minimum size=",
-      "shape aspect=${1:aspect ratio}",
-      "shape border uses incircle",
-      "shape border rotate=${1:degrees}",
-      "text=",
-      "node font=${1:font commands}",
-      "font=${1:font commands}",
-      "text width=",
-      "align=",
-      "text height=",
-      "text depth=",
-      "anchor=",
-      "above",
-      "above=",
-      "below",
-      "below=",
-      "right",
-      "right=",
-      "left",
-      "left=",
-      "above left",
-      "above right",
-      "below left",
-      "below right",
-      "centered",
-      "transform shape",
-      "transform shape nonlinear",
-      "pos=${1:fraction}",
-      "auto",
-      "auto=",
-      "swap",
-      "sloped",
-      "allow upside down",
-      "midway",
-      "near start",
-      "near end",
-      "very near start",
-      "very near end",
-      "at start",
-      "at end",
-      "label=${1:angle}:${2:text}",
-      "label=[${1:options}]${2:angle}:${3:text}",
-      "label position=${1:degrees}",
-      "absolute",
-      "label distance=",
-      "pin=${1:angle}:${2:text}",
-      "pin=[${1:options}]${2:angle}:${3:text}",
-      "pin distance=",
-      "pin edge={${1:options}}",
-      "remember picture",
-      "overlay",
-      "growth parent anchor=",
-      "growth function=${1:macro}",
-      "edge from parent path=${1:path}",
-      "draw opacity=${1:value}",
-      "opacity=${1:value}",
-      "transparent",
-      "ultra nearly transparent",
-      "very nearly transparent",
-      "nearly transparent",
-      "semitransparent",
-      "nearly opaque",
-      "very nearly opaque",
-      "ultra nearly opaque",
-      "opaque",
-      "fill opacity=${1:value}",
-      "text opacity=${1:value}",
-      "shift={${1:coordinate}}",
-      "shift only",
-      "xshift=",
-      "yshift=",
-      "scale=${1:scale}",
-      "xscale=${1:scale}",
-      "yscale=${1:scale}",
-      "xslant=${1:factor}",
-      "yslant=${1:factor}",
-      "rotate=${1:degrees}",
-      "rotate around={${1:degree}:${2:coordinate}}",
-      "rotate around x=${1:degrees}",
-      "rotate around y=${1:degrees}",
-      "rotate around z=${1:degrees}",
-      "cm={${1:a,b,c,d,coord}}",
-      "reset cm",
-      "transform canvas={${1:options}}",
-      "out=${1:degrees}",
-      "in=${1:degrees}",
-      "relative",
-      "bend left",
-      "bend left=${1:degrees}",
-      "bend right",
-      "bend right=${1:degrees}",
-      "bend angle=${1:degrees}",
-      "looseness=${1:number}",
-      "out looseness=${1:number}",
-      "in looseness=${1:number}",
-      "min distance=",
-      "max distance=",
-      "out min distance=",
-      "out max distance=",
-      "in min distance=",
-      "in max distance=",
-      "distance=",
-      "out distance=",
-      "in distance=",
-      "out control=${1:coord}",
-      "in control=${1:coord}",
-      "controls=${1:coord1} and ${2:coord2}",
-      "%tikzstyle",
-      "matrix",
-      "shape=${1:shape}",
-      "circle",
-      "rectangle"
-    ],
-    [
-      "3d",
-      "angles",
-      "animations",
-      "arrows.meta",
-      "automata",
-      "babel",
-      "backgrounds",
-      "bayesnet",
-      "bbox",
-      "bending",
-      "braids",
-      "calc",
-      "calendar",
-      "calligraphy",
-      "cd",
-      "celtic",
-      "chains",
-      "circuits",
-      "circuits.ee",
-      "circuits.ee.IEC",
-      "circuits.ee.IEC.relay",
-      "circuits.logic",
-      "circuits.logic.CDH",
-      "circuits.logic.IEC",
-      "circuits.logic.US",
-      "circuits.plc.ladder",
-      "circuits.plc.sfc",
-      "colorbrewer",
-      "commutative-diagrams",
-      "curvilinear",
-      "datavisualization",
-      "datavisualization.3d",
-      "datavisualization.barcharts",
-      "datavisualization.formats.functions",
-      "datavisualization.polar",
-      "datavisualization.sparklines",
-      "decorations",
-      "decorations.footprints",
-      "decorations.fractals",
-      "decorations.markings",
-      "decorations.pathmorphing",
-      "decorations.pathreplacing",
-      "decorations.shapes",
-      "decorations.text",
-      "dubins",
-      "ducks",
-      "er",
-      "ext.calendar-plus",
-      "ext.misc",
-      "ext.node-families",
-      "ext.node-families.shapes.geometric",
-      "ext.paths.arcto",
-      "ext.paths.ortho",
-      "ext.paths.timer",
-      "ext.patterns.images",
-      "ext.positioning-plus",
-      "ext.scalepicture",
-      "ext.shapes.circlearrow",
-      "ext.shapes.circlecrosssplit",
-      "ext.shapes.heatmark",
-      "ext.shapes.rectangleroundedcorners",
-      "ext.shapes.superellipse",
-      "ext.shapes.uncenteredrectangle",
-      "ext.topaths.arcthrough",
-      "ext.transformations.mirror",
-      "external",
-      "fadings",
-      "fill.hexagon",
-      "fill.image",
-      "fill.rhombus",
-      "fit",
-      "fixedpointarithmetic",
-      "folding",
-      "fpu",
-      "graphdrawing",
-      "graphs",
-      "graphs.standard",
-      "hobby",
-      "intersections",
-      "karnaugh",
-      "knots",
-      "lindenmayersystems",
-      "math",
-      "matrix",
-      "matrix.skeleton",
-      "mindmap",
-      "nef",
-      "ocgx",
-      "optics",
-      "overlay-beamer-styles",
-      "patterns",
-      "patterns.images",
-      "patterns.meta",
-      "penrose",
-      "perspective",
-      "petri",
-      "plothandlers",
-      "plotmarks",
-      "positioning",
-      "profiler",
-      "quantikz",
-      "quotes",
-      "rdf",
-      "rulercompass",
-      "scopes",
-      "shadings",
-      "shadows",
-      "shadows.blur",
-      "shapes",
-      "shapes.arrows",
-      "shapes.callouts",
-      "shapes.gates.ee",
-      "shapes.gates.ee.IEC",
-      "shapes.gates.logic",
-      "shapes.gates.logic.IEC",
-      "shapes.gates.logic.US",
-      "shapes.geometric",
-      "shapes.misc",
-      "shapes.multipart",
-      "shapes.symbols",
-      "spath3",
-      "spy",
-      "svg.path",
-      "swigs",
-      "switching-architectures",
-      "through",
-      "tikzmark",
-      "topaths",
-      "tqft",
-      "trees",
-      "turtle",
-      "views",
-      "zx-calculus"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/tikz3d-fr.json b/dev/packages/tikz3d-fr.json
index 9c90456ad..90c03751f 100644
--- a/dev/packages/tikz3d-fr.json
+++ b/dev/packages/tikz3d-fr.json
@@ -57,12 +57,6 @@
     "MarquePointsEspace[]{}": {
       "snippet": "MarquePointsEspace[${2:clés}]{${1:liste}}"
     },
-    "TraceSegmentEspace()()": {
-      "snippet": "TraceSegmentEspace(${1:point})(${2:point})"
-    },
-    "TraceSegmentEspace[]()()": {
-      "snippet": "TraceSegmentEspace[${1:options TikZ}](${2:point})(${3:point})"
-    },
     "TraceSegmentsEspace{}": {
       "snippet": "TraceSegmentsEspace{${1:liste}}"
     },
diff --git a/dev/packages/tikzdotncross.json b/dev/packages/tikzdotncross.json
index 66d9d5e01..168ba2ad3 100644
--- a/dev/packages/tikzdotncross.json
+++ b/dev/packages/tikzdotncross.json
@@ -5,24 +5,6 @@
   "macros": {
     "showcoordstrue": {},
     "showcoordsfalse": {},
-    "ncoord()": {
-      "snippet": "ncoord(${1:coord})"
-    },
-    "pincoord()": {
-      "snippet": "pincoord(${1:coord})"
-    },
-    "dotcoord()": {
-      "snippet": "dotcoord(${1:coord})"
-    },
-    "dotpincoord()": {
-      "snippet": "dotpincoord(${1:coord})"
-    },
-    "odotcoord()": {
-      "snippet": "odotcoord(${1:coord})"
-    },
-    "odotpincoord()": {
-      "snippet": "odotpincoord(${1:coord})"
-    },
     "pathcross{}{}{}": {
       "snippet": "pathcross{${1:coordA}}{${2:coordB}}{${3:path-name}}"
     },
diff --git a/dev/packages/tikzinput.json b/dev/packages/tikzinput.json
deleted file mode 100644
index a46fc5e25..000000000
--- a/dev/packages/tikzinput.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": [],
-    "graphicx": [],
-    "tikz": [],
-    "standalone": []
-  },
-  "macros": {
-    "tikzinput{}": {
-      "snippet": "tikzinput{${1:file}}"
-    },
-    "tikzinput[]{}": {
-      "snippet": "tikzinput[${2:options}]{${1:file}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ctikzinput{}": {
-      "snippet": "ctikzinput{${1:file}}"
-    },
-    "ctikzinput[]{}": {
-      "snippet": "ctikzinput[${2:options}]{${1:file}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "envs": {},
-  "options": [
-    "image"
-  ],
-  "keyvals": [
-    [
-      "alt={${1:alt text}}",
-      "bb=${1:llx lly urx ury}",
-      "bbllx=",
-      "bblly=",
-      "bburx=",
-      "bbury=",
-      "natwidth=",
-      "natheight=",
-      "hiresbb",
-      "pagebox=",
-      "viewport=${1:llx lly urx ury}",
-      "trim=${1:llx lly urx ury}",
-      "angle=${1:degrees}",
-      "origin=",
-      "width=",
-      "height=",
-      "totalheight=",
-      "keepaspectratio",
-      "scale=${1:factor}",
-      "clip",
-      "draft",
-      "type=${1:file type}",
-      "ext=${1:file extension}",
-      "read=${1:read-file extension}",
-      "command=",
-      "quiet",
-      "page=${1:page number}",
-      "interpolate",
-      "decodearray={${1:color array}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/tikzlibrarycommutative-diagrams.json b/dev/packages/tikzlibrarycommutative-diagrams.json
index 01b854ac6..fdca12bdf 100644
--- a/dev/packages/tikzlibrarycommutative-diagrams.json
+++ b/dev/packages/tikzlibrarycommutative-diagrams.json
@@ -254,9 +254,6 @@
     "kDVelosFetchFirstSourceThen{}": {
       "snippet": "kDVelosFetchFirstSourceThen{${1:arg}}"
     },
-    "kDVelosFFSBracketsThen{}()": {
-      "snippet": "kDVelosFFSBracketsThen{${1:arg1}}(${2:arg2})"
-    },
     "kDVelosFFSTillOverThen{}{}": {
       "snippet": "kDVelosFFSTillOverThen{${1:arg1}}{${2:arg2}}"
     },
@@ -300,9 +297,6 @@
     "kDVelosCurLstTar": {},
     "kDVelosPrvLstTar": {},
     "kDVelosFetchTargetThen": {},
-    "kDVelosFTBracketsThen{}()": {
-      "snippet": "kDVelosFTBracketsThen{${1:arg1}}(${2:arg2})"
-    },
     "kDVelosFTTillOverThen{}": {
       "snippet": "kDVelosFTTillOverThen{${1:arg}}"
     },
diff --git a/dev/packages/tikzlibrarydatavisualization.json b/dev/packages/tikzlibrarydatavisualization.json
index 735d07980..c8ae99f15 100644
--- a/dev/packages/tikzlibrarydatavisualization.json
+++ b/dev/packages/tikzlibrarydatavisualization.json
@@ -40,9 +40,6 @@
     "pgfooclass{}{}": {
       "snippet": "pgfooclass{${1:class name}}{${2:body}}"
     },
-    "pgfooclass(){}{}": {
-      "snippet": "pgfooclass(${3:list of superclasses}){${1:class name}}{${2:body}}"
-    },
     "pgfoonew{}": {
       "snippet": "pgfoonew{${1:cmd}}"
     },
diff --git a/dev/packages/tikzlings.json b/dev/packages/tikzlings.json
deleted file mode 100644
index a4f66f888..000000000
--- a/dev/packages/tikzlings.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "tikzlings-anteaters": [],
-    "tikzlings-bats": [],
-    "tikzlings-bears": [],
-    "tikzlings-bees": [],
-    "tikzlings-bugs": [],
-    "tikzlings-cats": [],
-    "tikzlings-chickens": [],
-    "tikzlings-coatis": [],
-    "tikzlings-elephants": [],
-    "tikzlings-hippos": [],
-    "tikzlings-koalas": [],
-    "tikzlings-marmots": [],
-    "tikzlings-mice": [],
-    "tikzlings-moles": [],
-    "tikzlings-owls": [],
-    "tikzlings-pandas": [],
-    "tikzlings-penguins": [],
-    "tikzlings-pigs": [],
-    "tikzlings-rhinos": [],
-    "tikzlings-sheep": [],
-    "tikzlings-sloths": [],
-    "tikzlings-snowmen": [],
-    "tikzlings-squirrels": [],
-    "tikzlings-wolves": [],
-    "tikzlings-addons": []
-  },
-  "macros": {
-    "tikzling": {},
-    "tikzling[]": {
-      "snippet": "tikzling[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ExpArgsNnx": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "body=",
-      "back",
-      "3D",
-      "contour",
-      "contour=",
-      "hat",
-      "hat=",
-      "tophat",
-      "tophat=",
-      "beret",
-      "beret=",
-      "strawhat",
-      "strawhat=",
-      "ribbon",
-      "ribbon=",
-      "harlequin",
-      "harlequin=",
-      "niuqelrah",
-      "niuqelrah=",
-      "witch",
-      "witch=",
-      "magichat",
-      "magichat=",
-      "magicstars",
-      "magicstars=",
-      "crown",
-      "crown=",
-      "queencrown",
-      "queencrown=",
-      "kingcrown",
-      "kingcrown=",
-      "santa",
-      "santa=",
-      "chef",
-      "chef=",
-      "graduate",
-      "graduate=",
-      "tassel",
-      "tassel=",
-      "alien",
-      "alien=",
-      "book",
-      "book={${1:text}}",
-      "bookcolour=",
-      "signpost",
-      "signpost={${1:text}}",
-      "signcolour=",
-      "signback=",
-      "speech",
-      "speech={${1:text}}",
-      "bubblecolour=",
-      "think",
-      "think={${1:text}}",
-      "pizza",
-      "cheese",
-      "cheese=",
-      "baguette",
-      "baguette=",
-      "cake",
-      "cake=",
-      "icecream",
-      "icecream=",
-      "flavoura=",
-      "flavourb=",
-      "flavourc=",
-      "milkshake",
-      "milkshake=",
-      "wine",
-      "wine=",
-      "cricket",
-      "cricket=",
-      "hockey",
-      "hockey=",
-      "football",
-      "football=",
-      "crystalball",
-      "crystalball=",
-      "magicwand",
-      "rollingpin",
-      "rollingpin=",
-      "lightsaber",
-      "lightsaber=",
-      "torch",
-      "torch=",
-      "basket",
-      "basket=",
-      "easter",
-      "easter=",
-      "egga=",
-      "eggb=",
-      "eggc=",
-      "crozier",
-      "crozier=",
-      "shovel",
-      "shovel=",
-      "pickaxe",
-      "pickaxe=",
-      "strawbroom",
-      "strawbroom=",
-      "strawbroomstick",
-      "strawbroomstick=",
-      "strawbroomribbon",
-      "strawbroomribbon=",
-      "broom",
-      "broom=",
-      "broomstick",
-      "broomstick=",
-      "umbrella",
-      "umbrella=",
-      "umbrellaclosed",
-      "umbrellaclosed=",
-      "handbag",
-      "handbag=",
-      "cocktail",
-      "rotate=${1:degrees}",
-      "scale=${1:factor}",
-      "xshift=",
-      "yshift="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/tikzpingus.json b/dev/packages/tikzpingus.json
index a1cee9dc4..9a99e81c5 100644
--- a/dev/packages/tikzpingus.json
+++ b/dev/packages/tikzpingus.json
@@ -30,12 +30,12 @@
       "keyvalpos": 0
     },
     "pinguloadlibrary{}": {
-      "snippet": "pinguloadlibrary{${1:library1,${2:library2},...}}",
+      "snippet": "pinguloadlibrary{${1:library1,library2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "pinguloadlibraries{}": {
-      "snippet": "pinguloadlibraries{${1:library1,${2:library2},...}}",
+      "snippet": "pinguloadlibraries{${1:library1,library2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
diff --git a/dev/packages/tikzquests.json b/dev/packages/tikzquests.json
index a86d088c4..9f15f6eb2 100644
--- a/dev/packages/tikzquests.json
+++ b/dev/packages/tikzquests.json
@@ -55,9 +55,6 @@
     "ftikzQuestion[]{}[]": {
       "snippet": "ftikzQuestion[${2:repository}]{${1:name}}[${3:keyvals}]"
     },
-    "ftikzQuestion()[]{}[]<>": {
-      "snippet": "ftikzQuestion(${5:scale})[${2:repository}]{${1:name}}[${3:keyvals}]<${4:annotation}>"
-    },
     "tikzQuestion{}": {
       "snippet": "tikzQuestion{${1:name}}"
     },
@@ -67,9 +64,6 @@
     "tikzQuestion[]{}[]": {
       "snippet": "tikzQuestion[${2:repository}]{${1:name}}[${3:keyvals}]"
     },
-    "tikzQuestion()[]{}[]<>": {
-      "snippet": "tikzQuestion(${5:scale})[${2:repository}]{${1:name}}[${3:keyvals}]<${4:annotation}>"
-    },
     "rawtikzQuestion{}": {
       "snippet": "rawtikzQuestion{${1:name}}"
     },
diff --git a/dev/packages/tikzrput.json b/dev/packages/tikzrput.json
index 2f3b59b02..d91efd418 100644
--- a/dev/packages/tikzrput.json
+++ b/dev/packages/tikzrput.json
@@ -4,18 +4,6 @@
     "iftex": []
   },
   "macros": {
-    "rput(){}": {
-      "snippet": "rput(${2:x},${3:y}){${1:object}}"
-    },
-    "rput[](){}": {
-      "snippet": "rput[${2:refpoint}](${3:x},${4:y}){${1:object}}"
-    },
-    "rput{}(){}": {
-      "snippet": "rput{${1:angle}}(${3:x},${4:y}){${2:object}}"
-    },
-    "rput[]{}(){}": {
-      "snippet": "rput[${3:refpoint}]{${1:angle}}(${4:x},${5:y}){${2:object}}"
-    },
     "tikzrputPtVirCode": {},
     "tikzrputAtCode": {},
     "tikzrputTwoPtCode": {},
diff --git a/dev/packages/time.json b/dev/packages/time.json
deleted file mode 100644
index c0be4a8c8..000000000
--- a/dev/packages/time.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "now": {},
-    "hour": {},
-    "minute": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/titlefoot.json b/dev/packages/titlefoot.json
index 90ce13bf7..d95122840 100644
--- a/dev/packages/titlefoot.json
+++ b/dev/packages/titlefoot.json
@@ -2,7 +2,7 @@
   "includes": {},
   "macros": {
     "keywords{}": {
-      "snippet": "keywords{${1:word1,${2:word2},...}}"
+      "snippet": "keywords{${1:word1,word2,...}}"
     },
     "runningtitle{}": {
       "snippet": "runningtitle{${1:text}}"
diff --git a/dev/packages/titleps.json b/dev/packages/titleps.json
index d96f5f6e9..057aa10e6 100644
--- a/dev/packages/titleps.json
+++ b/dev/packages/titleps.json
@@ -60,10 +60,10 @@
       "snippet": "ifthesubparagraph{${1:true}}{${2:false}}"
     },
     "settitlemarks{}": {
-      "snippet": "settitlemarks{${1:level-name,${2:sublevel-name},...}}"
+      "snippet": "settitlemarks{${1:level-name,sublevel-name,...}}"
     },
     "settitlemarks*{}": {
-      "snippet": "settitlemarks*{${1:level-name,${2:sublevel-name},...}}",
+      "snippet": "settitlemarks*{${1:level-name,sublevel-name,...}}",
       "option": "extramarks"
     },
     "headrule": {},
diff --git a/dev/packages/titleref.json b/dev/packages/titleref.json
deleted file mode 100644
index 0e5178d0a..000000000
--- a/dev/packages/titleref.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "theTitleReference{}{}": {
-      "snippet": "theTitleReference{${1:number}}{${2:title}}"
-    },
-    "titleref{}": {
-      "snippet": "titleref{${1:label}}"
-    },
-    "currenttitle": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/tkz-base.json b/dev/packages/tkz-base.json
index 4d1b57414..e82d42577 100644
--- a/dev/packages/tkz-base.json
+++ b/dev/packages/tkz-base.json
@@ -82,103 +82,32 @@
       "keyvalindex": 8,
       "keyvalpos": 0
     },
-    "tkzGrid[]()()": {
-      "snippet": "tkzGrid[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "tkzDefPoint(){}": {
-      "snippet": "tkzDefPoint(${2:angle:radius}){${1:name}}"
-    },
-    "tkzDefPoint[](){}": {
-      "snippet": "tkzDefPoint[${2:options}](${3:angle:radius}){${1:name}}",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
     "tkzDefPoints{}": {
-      "snippet": "tkzDefPoints{${1:x1/y1/name1,${2:x2/y2/name2},...}}"
+      "snippet": "tkzDefPoints{${1:x1/y1/name1,x2/y2/name2,...}}"
     },
     "tkzDefPoints[]{}": {
-      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,${3:x2/y2/name2},...}}"
-    },
-    "tkzDefShiftPoint[](){}": {
-      "snippet": "tkzDefShiftPoint[${2:point}](${3:angle:radius}){${1:name}}"
-    },
-    "tkzDefShiftPointCoord[](){}": {
-      "snippet": "tkzDefShiftPointCoord[${2:a,b}](${3:angle:radius}){${1:name}}"
-    },
-    "tkzDrawPoint()": {
-      "snippet": "tkzDrawPoint(${1:point})"
-    },
-    "tkzDrawPoint[]()": {
-      "snippet": "tkzDrawPoint[${1:options}](${2:point})",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "tkzDrawPoints()": {
-      "snippet": "tkzDrawPoints(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawPoints[]()": {
-      "snippet": "tkzDrawPoints[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "tkzLabelPoint(){}": {
-      "snippet": "tkzLabelPoint(${2:point}){${1:label}}"
-    },
-    "tkzLabelPoint[](){}": {
-      "snippet": "tkzLabelPoint[${2:TikZ options}](${3:point}){${1:label}}"
-    },
-    "tkzLabelPoints()": {
-      "snippet": "tkzLabelPoints(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzLabelPoints[]()": {
-      "snippet": "tkzLabelPoints[${1:TikZ options}](${2:point1},${3:point2},${4:...})"
-    },
-    "tkzAutoLabelPoints[]()": {
-      "snippet": "tkzAutoLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 11,
-      "keyvalpos": 0
+      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,x2/y2/name2,...}}"
     },
     "tkzSetUpPoint[]": {
       "snippet": "tkzSetUpPoint[${1:options}]",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "tkzPointShowCoord()": {
-      "snippet": "tkzPointShowCoord(${1:point})"
-    },
-    "tkzPointShowCoord[]()": {
-      "snippet": "tkzPointShowCoord[${1:options}](${2:point})",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "tkzShowPointCoord()": {
-      "snippet": "tkzShowPointCoord(${1:point})"
-    },
-    "tkzShowPointCoord[]()": {
-      "snippet": "tkzShowPointCoord[${1:options}](${2:point})",
-      "keyvalindex": 13,
+      "keyvalindex": 9,
       "keyvalpos": 0
     },
     "tkzClip": {},
     "tkzClip[]": {
       "snippet": "tkzClip[${1:options}]",
-      "keyvalindex": 14,
+      "keyvalindex": 10,
       "keyvalpos": 0
     },
     "tkzShowBB[]": {
       "snippet": "tkzShowBB[${1:TikZ options}]"
     },
     "tkzClipBB": {},
-    "tkzSetBB()()": {
-      "snippet": "tkzSetBB(${1:point1})(${2:point2})"
-    },
     "tkzSaveBB": {},
     "tkzRestoreBB": {},
     "tkzRep[]": {
       "snippet": "tkzRep[${1:options}]",
-      "keyvalindex": 15,
+      "keyvalindex": 11,
       "keyvalpos": 0
     },
     "tkzHLine{}": {
@@ -186,7 +115,7 @@
     },
     "tkzHLine[]{}": {
       "snippet": "tkzHLine[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 16,
+      "keyvalindex": 12,
       "keyvalpos": 0
     },
     "tkzHLines{}": {
@@ -194,7 +123,7 @@
     },
     "tkzHLines[]{}": {
       "snippet": "tkzHLines[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 16,
+      "keyvalindex": 12,
       "keyvalpos": 0
     },
     "tkzVLine{}": {
@@ -202,7 +131,7 @@
     },
     "tkzVLine[]{}": {
       "snippet": "tkzVLine[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 16,
+      "keyvalindex": 12,
       "keyvalpos": 0
     },
     "tkzVLines{}": {
@@ -210,7 +139,7 @@
     },
     "tkzVLines[]{}": {
       "snippet": "tkzVLines[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 16,
+      "keyvalindex": 12,
       "keyvalpos": 0
     },
     "tkzHTick{}": {
@@ -218,7 +147,7 @@
     },
     "tkzHTick[]{}": {
       "snippet": "tkzHTick[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 17,
+      "keyvalindex": 13,
       "keyvalpos": 0
     },
     "tkzHTicks{}": {
@@ -226,7 +155,7 @@
     },
     "tkzHTicks[]{}": {
       "snippet": "tkzHTicks[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 17,
+      "keyvalindex": 13,
       "keyvalpos": 0
     },
     "tkzVTick{}": {
@@ -234,7 +163,7 @@
     },
     "tkzVTick[]{}": {
       "snippet": "tkzVTick[${2:options}]{${1:decimal number}}",
-      "keyvalindex": 17,
+      "keyvalindex": 13,
       "keyvalpos": 0
     },
     "tkzVTicks{}": {
@@ -242,54 +171,30 @@
     },
     "tkzVTicks[]{}": {
       "snippet": "tkzVTicks[${2:options}]{${1:list of decimal numbers}}",
-      "keyvalindex": 17,
+      "keyvalindex": 13,
       "keyvalpos": 0
     },
     "tkzDefSetOfPoints{}": {
-      "snippet": "tkzDefSetOfPoints{${1:x1/y1,${2:x2/y2},...}}"
+      "snippet": "tkzDefSetOfPoints{${1:x1/y1,x2/y2,...}}"
     },
     "tkzDefSetOfPoints[]{}": {
-      "snippet": "tkzDefSetOfPoints[${2:options}]{${1:x1/y1,${3:x2/y2},...}}",
-      "keyvalindex": 18,
+      "snippet": "tkzDefSetOfPoints[${2:options}]{${1:x1/y1,x2/y2,...}}",
+      "keyvalindex": 14,
       "keyvalpos": 0
     },
     "tkzDrawSetOfPoints[]": {
       "snippet": "tkzDrawSetOfPoints[${1:options}]",
-      "keyvalindex": 18,
+      "keyvalindex": 14,
       "keyvalpos": 0
     },
     "tkzJoinSetOfPoints[]": {
       "snippet": "tkzJoinSetOfPoints[${1:options}]",
-      "keyvalindex": 18,
-      "keyvalpos": 0
-    },
-    "tkzDrawMark()": {
-      "snippet": "tkzDrawMark(${1:point})"
-    },
-    "tkzDrawMark[]()": {
-      "snippet": "tkzDrawMark[${1:options}](${2:point})",
-      "keyvalindex": 18,
-      "keyvalpos": 0
-    },
-    "tkzDrawMarks()": {
-      "snippet": "tkzDrawMarks(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawMarks[]()": {
-      "snippet": "tkzDrawMarks[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 18,
+      "keyvalindex": 14,
       "keyvalpos": 0
     },
     "tkzSetUpMark[]": {
       "snippet": "tkzSetUpMark[${1:options}]",
-      "keyvalindex": 19,
-      "keyvalpos": 0
-    },
-    "tkzText(){}": {
-      "snippet": "tkzText(${2:x},${3:y}){${1:text}}"
-    },
-    "tkzText[](){}": {
-      "snippet": "tkzText[${2:options}](${3:x},${4:y}){${1:text}}",
-      "keyvalindex": 20,
+      "keyvalindex": 15,
       "keyvalpos": 0
     },
     "tkzLegend{}": {
@@ -297,7 +202,7 @@
     },
     "tkzLegend[]{}": {
       "snippet": "tkzLegend[${2:options}]{${1:style/size/color/text}}",
-      "keyvalindex": 21,
+      "keyvalindex": 16,
       "keyvalpos": 0
     },
     "tkzGetPoint{}": {
@@ -370,24 +275,9 @@
     },
     "DisabledNumprint": {},
     "EnabledNumprint": {},
-    "tkzSwapPoints()": {
-      "snippet": "tkzSwapPoints(${1:A},${2:B})"
-    },
-    "tkzPermute()": {
-      "snippet": "tkzPermute(${1:A},${2:B},${3:C})"
-    },
-    "tkzDotProduct()": {
-      "snippet": "tkzDotProduct(${1:A},${2:B},${3:C})"
-    },
     "tkzGetResult{}": {
       "snippet": "tkzGetResult{${1:name}}"
     },
-    "tkzIsLinear()": {
-      "snippet": "tkzIsLinear(${1:A},${2:B},${3:C})"
-    },
-    "tkzIsOrtho()": {
-      "snippet": "tkzIsOrtho(${1:A},${2:B},${3:C})"
-    },
     "tkzHelpGrid": {},
     "setupcolorkeys{}": {
       "snippet": "setupcolorkeys{${1:color keys}}"
@@ -411,20 +301,11 @@
     "tkzSetUpGrid[]": {
       "snippet": "tkzSetUpGrid[${1:options}]"
     },
-    "tkzRenamePoint(){}": {
-      "snippet": "tkzRenamePoint(${2:arg1}){${1:arg2}}"
-    },
     "tkzGetPoints{}{}": {
       "snippet": "tkzGetPoints{${1:arg1}}{${2:arg2}}"
     },
     "tkzSetUpLabel[]": {
       "snippet": "tkzSetUpLabel[${1:options}]"
-    },
-    "tkzGetPointCoord(){}": {
-      "snippet": "tkzGetPointCoord(${2:arg1}){${1:arg2}}"
-    },
-    "tkzGetPointxy(){}": {
-      "snippet": "tkzGetPointxy(${2:arg1}){${1:arg2}}"
     }
   },
   "envs": {},
@@ -511,32 +392,12 @@
       "subystep=${1:number}",
       "line width="
     ],
-    [
-      "shift=(${1:x},${2:y})"
-    ],
-    [
-      "shape=",
-      "size=",
-      "color="
-    ],
-    [
-      "center=",
-      "dist=${1:factor}"
-    ],
     [
       "shape=",
       "size=${1:number}",
       "color=",
       "fill="
     ],
-    [
-      "xlabel=${1:text}",
-      "xstyle=",
-      "noxdraw",
-      "ylabel=${1:text}",
-      "ystyle=",
-      "noydraw"
-    ],
     [
       "space=${1:number}"
     ],
@@ -570,17 +431,6 @@
       "fill=",
       "size="
     ],
-    [
-      "draw",
-      "color=",
-      "text=",
-      "fill=",
-      "opacity=${1:factor}",
-      "line width=",
-      "rotate=${1:degrees}",
-      "inner sep=",
-      "text width="
-    ],
     [
       "line"
     ]
diff --git a/dev/packages/tkz-berge.json b/dev/packages/tkz-berge.json
index 73310c8db..2cbdd5d6f 100644
--- a/dev/packages/tkz-berge.json
+++ b/dev/packages/tkz-berge.json
@@ -33,7 +33,7 @@
       "snippet": "EdgeIdentity{${1:prefix1}}{${2:prefix2}}{${3:number of vertices}}"
     },
     "EdgeIdentity*{}{}{}": {
-      "snippet": "EdgeIdentity*{${1:prefix1}}{${2:prefix2}}{${3:vertex1,${4:vertex2},...}}"
+      "snippet": "EdgeIdentity*{${1:prefix1}}{${2:prefix2}}{${3:vertex1,vertex2,...}}"
     },
     "EdgeFromOneToAll{}{}{}{}": {
       "snippet": "EdgeFromOneToAll{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:number of vertices}}"
@@ -42,7 +42,7 @@
       "snippet": "EdgeFromOneToSeq{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:start}}{${5:end}}"
     },
     "EdgeFromOneToSel{}{}{}{}": {
-      "snippet": "EdgeFromOneToSel{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:vertex1,${5:vertex2},...}}"
+      "snippet": "EdgeFromOneToSel{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:vertex1,vertex2,...}}"
     },
     "EdgeFromOneToComp{}{}{}{}": {
       "snippet": "EdgeFromOneToComp{${1:prefix1}}{${2:prefix2}}{${3:from}}{${4:number of vertices}}"
@@ -89,10 +89,10 @@
       "keyvalpos": 0
     },
     "grCirculant{}{}": {
-      "snippet": "grCirculant{${1:number of vertices}}{${2:step1,${3:step2},...}}"
+      "snippet": "grCirculant{${1:number of vertices}}{${2:step1,step2,...}}"
     },
     "grCirculant[]{}{}": {
-      "snippet": "grCirculant[${3:options}]{${1:number of vertices}}{${2:step1,${4:step2},...}}",
+      "snippet": "grCirculant[${3:options}]{${1:number of vertices}}{${2:step1,step2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -153,7 +153,7 @@
       "keyvalpos": 0
     },
     "grLCF[]{}{}": {
-      "snippet": "grLCF[${3:RA-number}]{${1:num1,${4:num2},...}}{${2:number}}"
+      "snippet": "grLCF[${3:RA-number}]{${1:num1,num2,...}}{${2:number}}"
     },
     "tkzSetUpColors[]": {
       "snippet": "tkzSetUpColors[${1:options}]",
@@ -161,10 +161,10 @@
       "keyvalpos": 0
     },
     "AssignVertexLabel{}{}": {
-      "snippet": "AssignVertexLabel{${1:prefix}}{${2:name1,${3:name2},...}}"
+      "snippet": "AssignVertexLabel{${1:prefix}}{${2:name1,name2,...}}"
     },
     "AssignVertexLabel[]{}{}": {
-      "snippet": "AssignVertexLabel[${3:options}]{${1:prefix}}{${2:name1,${4:name2},...}}",
+      "snippet": "AssignVertexLabel[${3:options}]{${1:prefix}}{${2:name1,name2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
diff --git a/dev/packages/tkz-elements.json b/dev/packages/tkz-elements.json
index 98c32aee7..334a677e4 100644
--- a/dev/packages/tkz-elements.json
+++ b/dev/packages/tkz-elements.json
@@ -12,12 +12,6 @@
     },
     "tkzDN[]{}": {
       "snippet": "tkzDN[${2:n}]{${1:r}}"
-    },
-    "tkzDrawLuaEllipse()": {
-      "snippet": "tkzDrawLuaEllipse(${1:pt1},${2:pt2},${3:pt3})"
-    },
-    "tkzDrawLuaEllipse[]()": {
-      "snippet": "tkzDrawLuaEllipse[${1:options}](${2:pt1},${3:pt2},${4:pt3})"
     }
   },
   "envs": {
diff --git a/dev/packages/tkz-euclide.json b/dev/packages/tkz-euclide.json
index 8da3dd027..14bfda990 100644
--- a/dev/packages/tkz-euclide.json
+++ b/dev/packages/tkz-euclide.json
@@ -47,25 +47,11 @@
       "snippet": "tkzCos{${1:arg}}",
       "option": "lua"
     },
-    "tkzDefPoint(){}": {
-      "snippet": "tkzDefPoint(${2:angle:radius}){${1:ref}}"
-    },
-    "tkzDefPoint[](){}": {
-      "snippet": "tkzDefPoint[${2:options}](${3:angle:radius}){${1:ref}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "tkzDefShiftPoint[](){}": {
-      "snippet": "tkzDefShiftPoint[${2:point}](${3:angle:radius}){${1:ref}}"
-    },
-    "tkzDefShiftPointCoord[](){}": {
-      "snippet": "tkzDefShiftPointCoord[${2:point1}](${3:angle:radius}){${1:point2}}"
-    },
     "tkzDefPoints{}": {
-      "snippet": "tkzDefPoints{${1:x1/y1/name1,${2:x2/y2/name2},...}}"
+      "snippet": "tkzDefPoints{${1:x1/y1/name1,x2/y2/name2,...}}"
     },
     "tkzDefPoints[]{}": {
-      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,${3:x2/y2/name2},...}}"
+      "snippet": "tkzDefPoints[${2:options}]{${1:x1/y1/name1,x2/y2/name2,...}}"
     },
     "tkzGetPoint{}": {
       "snippet": "tkzGetPoint{${1:ref}}"
@@ -85,639 +71,64 @@
     "tkzGetLength{}": {
       "snippet": "tkzGetLength{${1:csname}}"
     },
-    "tkzDefMidPoint()": {
-      "snippet": "tkzDefMidPoint(${1:point1},${2:point2})"
-    },
-    "tkzDefBarycentricPoint()": {
-      "snippet": "tkzDefBarycentricPoint(${1:point1=num1},${2:point2=num2},${3:...})"
-    },
-    "tkzDefSimilitudeCenter()()": {
-      "snippet": "tkzDefSimilitudeCenter(${1:O},${2:A})(${3:O'},${4:B})"
-    },
-    "tkzDefSimilitudeCenter[]()()": {
-      "snippet": "tkzDefSimilitudeCenter[${1:options}](${2:O},${3:A})(${4:O'},${5:B})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "tkzDefHarmonic()": {
-      "snippet": "tkzDefHarmonic(${1:A},${2:B},${3:C})"
-    },
-    "tkzDefHarmonic[]()": {
-      "snippet": "tkzDefHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "tkzDefGoldenRatio()": {
-      "snippet": "tkzDefGoldenRatio(${1:point1},${2:point2})"
-    },
-    "tkzDefEquiPoints()": {
-      "snippet": "tkzDefEquiPoints(${1:point1},${2:point2})"
-    },
-    "tkzDefEquiPoints[]()": {
-      "snippet": "tkzDefEquiPoints[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "tkzDefMidArc()": {
-      "snippet": "tkzDefMidArc(${1:A},${2:B},${3:C})"
-    },
-    "tkzDefTriangleCenter()": {
-      "snippet": "tkzDefTriangleCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefTriangleCenter[]()": {
-      "snippet": "tkzDefTriangleCenter[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "tkzDefProjExcenter()(){}": {
-      "snippet": "tkzDefProjExcenter(${2:A},${3:B},${4:C})(${5:a},${6:b},${7:c}){${1:X,${8:Y},Z}}"
-    },
-    "tkzDefProjExcenter[]()(){}": {
-      "snippet": "tkzDefProjExcenter[${2:options}](${3:A},${4:B},${5:C})(${6:a},${7:b},${8:c}){${1:X,${9:Y},Z}}",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "tkzDefPointOnLine()": {
-      "snippet": "tkzDefPointOnLine(${1:point1},${2:point2})"
-    },
-    "tkzDefPointOnLine[]()": {
-      "snippet": "tkzDefPointOnLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
     "tkzDefPointOnCircle[]": {
       "snippet": "tkzDefPointOnCircle[${1:options}]",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "tkzDefPointBy()": {
-      "snippet": "tkzDefPointBy(${1:point})"
-    },
-    "tkzDefPointBy[]()": {
-      "snippet": "tkzDefPointBy[${1:options}](${2:point})",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "tkzDefPointsBy(){}": {
-      "snippet": "tkzDefPointsBy(${2:point1},${3:point2},${4:...}){${1:point1,${5:point2},...}}"
-    },
-    "tkzDefPointsBy[](){}": {
-      "snippet": "tkzDefPointsBy[${2:options}](${3:point1},${4:point2},${5:...}){${1:point1,${6:point2},...}}",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "tkzDefPointWith()": {
-      "snippet": "tkzDefPointWith(${1:point1},${2:point2})"
-    },
-    "tkzDefPointWith[]()": {
-      "snippet": "tkzDefPointWith[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 9,
-      "keyvalpos": 0
-    },
-    "tkzGetVectxy(){}": {
-      "snippet": "tkzGetVectxy(${2:point1},${3:point2}){${1:text}}"
-    },
-    "tkzDefLine()": {
-      "snippet": "tkzDefLine(${1:point1},${2:point2})"
-    },
-    "tkzDefLine[]()": {
-      "snippet": "tkzDefLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 10,
-      "keyvalpos": 0
-    },
-    "tkzDefTangent()": {
-      "snippet": "tkzDefTangent(${1:point1},${2:point2})"
-    },
-    "tkzDefTangent[]()": {
-      "snippet": "tkzDefTangent[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 11,
-      "keyvalpos": 0
-    },
-    "tkzDefTriangle[]()": {
-      "snippet": "tkzDefTriangle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 12,
-      "keyvalpos": 0
-    },
-    "tkzDefSpcTriangle[](){}": {
-      "snippet": "tkzDefSpcTriangle[${2:options}](${3:point1},${4:point2},${5:point3}){${1:ref1,${6:ref2},ref3}}",
-      "keyvalindex": 13,
-      "keyvalpos": 0
-    },
-    "tkzPermute()": {
-      "snippet": "tkzPermute(${1:A},${2:B},${3:C})"
-    },
-    "tkzDefSquare()": {
-      "snippet": "tkzDefSquare(${1:point1},${2:point2})"
-    },
-    "tkzDefRectangle()": {
-      "snippet": "tkzDefRectangle(${1:point1},${2:point2})"
-    },
-    "tkzDefParallelogram()": {
-      "snippet": "tkzDefParallelogram(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefGoldenRectangle()": {
-      "snippet": "tkzDefGoldenRectangle(${1:point1},${2:point2})"
-    },
-    "tkzDefGoldRectangle()": {
-      "snippet": "tkzDefGoldRectangle(${1:point1},${2:point2})"
-    },
-    "tkzDefRegPolygon()": {
-      "snippet": "tkzDefRegPolygon(${1:point1},${2:point2})"
-    },
-    "tkzDefRegPolygon[]()": {
-      "snippet": "tkzDefRegPolygon[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 14,
-      "keyvalpos": 0
-    },
-    "tkzDefCircle()": {
-      "snippet": "tkzDefCircle(${1:point1},${2:point2})"
-    },
-    "tkzDefCircle[]()": {
-      "snippet": "tkzDefCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 15,
-      "keyvalpos": 0
-    },
-    "tkzDefCircleBy()": {
-      "snippet": "tkzDefCircleBy(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleBy[]()": {
-      "snippet": "tkzDefCircleBy[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 16,
-      "keyvalpos": 0
-    },
-    "tkzInterLL()()": {
-      "snippet": "tkzInterLL(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterLC()()": {
-      "snippet": "tkzInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterLC[]()()": {
-      "snippet": "tkzInterLC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
-      "keyvalindex": 17,
-      "keyvalpos": 0
-    },
-    "tkzInterCC()()": {
-      "snippet": "tkzInterCC(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterCC[]()()": {
-      "snippet": "tkzInterCC[${1:options}](${2:point1},${3:point2})(${4:point3},${5:point4})",
-      "keyvalindex": 17,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "tkzTestInterCC()()": {
-      "snippet": "tkzTestInterCC(${1:O},${2:A})(${3:O'},${4:B})"
-    },
     "iftkzFlagCC": {},
     "tkzFlagCCtrue": {},
     "tkzFlagCCfalse": {},
-    "tkzInterCCN()()": {
-      "snippet": "tkzInterCCN(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzInterCCR()()": {
-      "snippet": "tkzInterCCR(${1:point1},${2:radius1})(${3:point2},${4:radius2})"
-    },
-    "tkzGetAngle()": {
-      "snippet": "tkzGetAngle(${1:csname})"
-    },
     "tkzAngleResult": {},
-    "tkzFindAngle()": {
-      "snippet": "tkzFindAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFindSlopeAngle()": {
-      "snippet": "tkzFindSlopeAngle(${1:point1},${2:point2})"
-    },
     "tkzDefRandPointOn[]": {
       "snippet": "tkzDefRandPointOn[${1:options}]",
-      "keyvalindex": 18,
-      "keyvalpos": 0
-    },
-    "tkzDrawPoint()": {
-      "snippet": "tkzDrawPoint(${1:name})"
-    },
-    "tkzDrawPoint[]()": {
-      "snippet": "tkzDrawPoint[${1:options}](${2:name})",
-      "keyvalindex": 19,
-      "keyvalpos": 0
-    },
-    "tkzDrawPoints()": {
-      "snippet": "tkzDrawPoints(${1:name1},${2:name2},${3:...})"
-    },
-    "tkzDrawPoints[]()": {
-      "snippet": "tkzDrawPoints[${1:options}](${2:name1},${3:name2},${4:...})",
-      "keyvalindex": 19,
-      "keyvalpos": 0
-    },
-    "tkzDrawLine()": {
-      "snippet": "tkzDrawLine(${1:point1},${2:point2})"
-    },
-    "tkzDrawLine[]()": {
-      "snippet": "tkzDrawLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 20,
-      "keyvalpos": 0
-    },
-    "tkzDrawLines()": {
-      "snippet": "tkzDrawLines(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawLines[]()": {
-      "snippet": "tkzDrawLines[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 20,
-      "keyvalpos": 0
-    },
-    "tkzDrawSegment()": {
-      "snippet": "tkzDrawSegment(${1:point1},${2:point2})"
-    },
-    "tkzDrawSegment[]()": {
-      "snippet": "tkzDrawSegment[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 21,
-      "keyvalpos": 0
-    },
-    "tkzDrawSegments()": {
-      "snippet": "tkzDrawSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzDrawSegments[]()": {
-      "snippet": "tkzDrawSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 21,
-      "keyvalpos": 0
-    },
-    "tkzDrawPolygon()": {
-      "snippet": "tkzDrawPolygon(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawPolygon[]()": {
-      "snippet": "tkzDrawPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 22,
-      "keyvalpos": 0
-    },
-    "tkzDrawPolySeg()": {
-      "snippet": "tkzDrawPolySeg(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawPolySeg[]()": {
-      "snippet": "tkzDrawPolySeg[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 22,
-      "keyvalpos": 0
-    },
-    "tkzDrawCircle()": {
-      "snippet": "tkzDrawCircle(${1:point1},${2:point2})"
-    },
-    "tkzDrawCircle[]()": {
-      "snippet": "tkzDrawCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 23,
-      "keyvalpos": 0
-    },
-    "tkzDrawCircles()": {
-      "snippet": "tkzDrawCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzDrawCircles[]()": {
-      "snippet": "tkzDrawCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 23,
-      "keyvalpos": 0
-    },
-    "tkzDrawSemiCircle()": {
-      "snippet": "tkzDrawSemiCircle(${1:point1},${2:point2})"
-    },
-    "tkzDrawSemiCircle[]()": {
-      "snippet": "tkzDrawSemiCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 24,
-      "keyvalpos": 0
-    },
-    "tkzDrawSemiCircles()": {
-      "snippet": "tkzDrawSemiCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzDrawSemiCircles[]()": {
-      "snippet": "tkzDrawSemiCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 24,
-      "keyvalpos": 0
-    },
-    "tkzDrawArc()()": {
-      "snippet": "tkzDrawArc(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzDrawArc[]()()": {
-      "snippet": "tkzDrawArc[${1:options}](${2:point1},${3:point2})(${4:point3})",
-      "keyvalindex": 25,
-      "keyvalpos": 0
-    },
-    "tkzDrawSector()()": {
-      "snippet": "tkzDrawSector(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzDrawSector[]()()": {
-      "snippet": "tkzDrawSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
-      "keyvalindex": 26,
-      "keyvalpos": 0
-    },
-    "tkzFillCircle()": {
-      "snippet": "tkzFillCircle(${1:point1},${2:point2})"
-    },
-    "tkzFillCircle[]()": {
-      "snippet": "tkzFillCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 27,
-      "keyvalpos": 0
-    },
-    "tkzFillCircles()": {
-      "snippet": "tkzFillCircles(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzFillCircles[]()": {
-      "snippet": "tkzFillCircles[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 27,
-      "keyvalpos": 0
-    },
-    "tkzFillPolygon()": {
-      "snippet": "tkzFillPolygon(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzFillPolygon[]()": {
-      "snippet": "tkzFillPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 28,
-      "keyvalpos": 0
-    },
-    "tkzFillSector()()": {
-      "snippet": "tkzFillSector(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzFillSector[]()()": {
-      "snippet": "tkzFillSector[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillAngle()": {
-      "snippet": "tkzFillAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFillAngle[]()": {
-      "snippet": "tkzFillAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 29,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "tkzInit[]": {
       "snippet": "tkzInit[${1:options}]",
-      "keyvalindex": 30,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "tkzClip": {},
     "tkzClip[]": {
       "snippet": "tkzClip[${1:options}]",
-      "keyvalindex": 31,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "tkzShowBB": {},
     "tkzShowBB[]": {
       "snippet": "tkzShowBB[${1:options}]",
-      "keyvalindex": 32,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "tkzClipBB": {},
-    "tkzClipPolygon()": {
-      "snippet": "tkzClipPolygon(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzClipPolygon[]()": {
-      "snippet": "tkzClipPolygon[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 33,
-      "keyvalpos": 0
-    },
-    "tkzClipCircle()": {
-      "snippet": "tkzClipCircle(${1:point1},${2:point2})"
-    },
-    "tkzClipCircle[]()": {
-      "snippet": "tkzClipCircle[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 33,
-      "keyvalpos": 0
-    },
-    "tkzClipSector[]()()": {
-      "snippet": "tkzClipSector[${1:options}](${2:point1},${3:point2})(${4:point3})",
-      "keyvalindex": 34,
-      "keyvalpos": 0
-    },
-    "tkzClipSector()()": {
-      "snippet": "tkzClipSector(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzMarkSegment()": {
-      "snippet": "tkzMarkSegment(${1:point1},${2:point2})"
-    },
-    "tkzMarkSegment[]()": {
-      "snippet": "tkzMarkSegment[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "tkzMarkSegments()": {
-      "snippet": "tkzMarkSegments(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzMarkSegments[]()": {
-      "snippet": "tkzMarkSegments[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "tkzMarkArc()": {
-      "snippet": "tkzMarkArc(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMarkArc[]()": {
-      "snippet": "tkzMarkArc[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 35,
-      "keyvalpos": 0
-    },
-    "tkzMarkAngle()": {
-      "snippet": "tkzMarkAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMarkAngle[]()": {
-      "snippet": "tkzMarkAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 36,
-      "keyvalpos": 0
-    },
-    "tkzMarkRightAngle()": {
-      "snippet": "tkzMarkRightAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMarkRightAngle[]()": {
-      "snippet": "tkzMarkRightAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 37,
-      "keyvalpos": 0
-    },
-    "tkzPicAngle()": {
-      "snippet": "tkzPicAngle(${1:A},${2:O},${3:B})"
-    },
-    "tkzPicAngle[]()": {
-      "snippet": "tkzPicAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
-    },
-    "tkzPicRightAngle()": {
-      "snippet": "tkzPicRightAngle(${1:A},${2:O},${3:B})"
-    },
-    "tkzPicRightAngle[]()": {
-      "snippet": "tkzPicRightAngle[${1:TikZ options}](${2:A},${3:O},${4:B})"
-    },
-    "tkzLabelPoint(){}": {
-      "snippet": "tkzLabelPoint(${2:point}){${1:label}}"
-    },
-    "tkzLabelPoint[](){}": {
-      "snippet": "tkzLabelPoint[${2:options}](${3:point}){${1:label}}",
-      "keyvalindex": 38,
-      "keyvalpos": 0
-    },
-    "tkzLabelPoints()": {
-      "snippet": "tkzLabelPoints(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzLabelPoints[]()": {
-      "snippet": "tkzLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 38,
-      "keyvalpos": 0
-    },
-    "tkzAutoLabelPoints()": {
-      "snippet": "tkzAutoLabelPoints(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzAutoLabelPoints[]()": {
-      "snippet": "tkzAutoLabelPoints[${1:options}](${2:point1},${3:point2},${4:...})",
-      "keyvalindex": 39,
-      "keyvalpos": 0
-    },
-    "tkzLabelSegment(){}": {
-      "snippet": "tkzLabelSegment(${2:point1},${3:point2}){${1:label}}"
-    },
-    "tkzLabelSegment[](){}": {
-      "snippet": "tkzLabelSegment[${2:options}](${3:point1},${4:point2}){${1:label}}",
-      "keyvalindex": 40,
-      "keyvalpos": 0
-    },
-    "tkzLabelSegments(){}": {
-      "snippet": "tkzLabelSegments(${2:pt1},${3:pt2 pt3},${4:pt4 ...}){${1:label}}"
-    },
-    "tkzLabelSegments[](){}": {
-      "snippet": "tkzLabelSegments[${2:options}](${3:pt1},${4:pt2 pt3},${5:pt4 ...}){${1:label}}",
-      "keyvalindex": 40,
-      "keyvalpos": 0
-    },
-    "tkzLabelLine(){}": {
-      "snippet": "tkzLabelLine(${2:point1},${3:point2}){${1:label}}"
-    },
-    "tkzLabelLine[](){}": {
-      "snippet": "tkzLabelLine[${2:options}](${3:point1},${4:point2}){${1:label}}"
-    },
-    "tkzLabelAngle()": {
-      "snippet": "tkzLabelAngle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzLabelAngle[]()": {
-      "snippet": "tkzLabelAngle[${1:options}](${2:point1},${3:point2},${4:point3})",
-      "keyvalindex": 41,
-      "keyvalpos": 0
-    },
-    "tkzLabelCircle()(){}": {
-      "snippet": "tkzLabelCircle(${2:point1},${3:point2})(${4:angle}){${1:label}}"
-    },
-    "tkzLabelCircle[]()(){}": {
-      "snippet": "tkzLabelCircle[${2:options}](${3:point1},${4:point2})(${5:angle}){${1:label}}",
-      "keyvalindex": 42,
-      "keyvalpos": 0
-    },
-    "tkzLabelArc(){}": {
-      "snippet": "tkzLabelArc(${2:point1},${3:point2},${4:point3}){${1:label}}"
-    },
-    "tkzLabelArc[](){}": {
-      "snippet": "tkzLabelArc[${2:options}](${3:point1},${4:point2},${5:point3}){${1:label}}",
-      "keyvalindex": 43,
-      "keyvalpos": 0
-    },
-    "tkzCompass()": {
-      "snippet": "tkzCompass(${1:point1},${2:point2})"
-    },
-    "tkzCompass[]()": {
-      "snippet": "tkzCompass[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 44,
-      "keyvalpos": 0
-    },
-    "tkzCompasss()": {
-      "snippet": "tkzCompasss(${1:pt1},${2:pt2 pt3},${3:pt4 ...})"
-    },
-    "tkzCompasss[]()": {
-      "snippet": "tkzCompasss[${1:options}](${2:pt1},${3:pt2 pt3},${4:pt4 ...})",
-      "keyvalindex": 44,
-      "keyvalpos": 0
-    },
-    "tkzShowLine()": {
-      "snippet": "tkzShowLine(${1:point1},${2:point2})"
-    },
-    "tkzShowLine[]()": {
-      "snippet": "tkzShowLine[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 45,
-      "keyvalpos": 0
-    },
-    "tkzShowTransformation()": {
-      "snippet": "tkzShowTransformation(${1:point1},${2:point2})"
-    },
-    "tkzShowTransformation[]()": {
-      "snippet": "tkzShowTransformation[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 46,
-      "keyvalpos": 0
-    },
-    "tkzProtractor()": {
-      "snippet": "tkzProtractor(${1:point1},${2:point2})"
-    },
-    "tkzProtractor[]()": {
-      "snippet": "tkzProtractor[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 47,
-      "keyvalpos": 0
-    },
-    "tkzDuplicateSegment()()": {
-      "snippet": "tkzDuplicateSegment(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzDuplicateSegment()(){}": {
-      "snippet": "tkzDuplicateSegment(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
-    },
-    "tkzDuplicateLength()()": {
-      "snippet": "tkzDuplicateLength(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzDuplicateLength()(){}": {
-      "snippet": "tkzDuplicateLength(${2:point1},${3:point2})(${4:point3},${5:point4}){${1:point5}}"
-    },
-    "tkzCalcLength()": {
-      "snippet": "tkzCalcLength(${1:point1},${2:point2})"
-    },
-    "tkzCalcLength[]()": {
-      "snippet": "tkzCalcLength[${1:options}](${2:point1},${3:point2})",
-      "keyvalindex": 48,
-      "keyvalpos": 0
-    },
-    "tkzpttocm(){}": {
-      "snippet": "tkzpttocm(${2:number}){${1:csname}}"
-    },
-    "tkzcmtopt(){}": {
-      "snippet": "tkzcmtopt(${2:number}){${1:csname}}"
-    },
-    "tkzGetPointCoord(){}": {
-      "snippet": "tkzGetPointCoord(${2:point}){${1:csname}}"
-    },
-    "tkzSwapPoints()": {
-      "snippet": "tkzSwapPoints(${1:A},${2:B})"
-    },
-    "tkzDotProduct()": {
-      "snippet": "tkzDotProduct(${1:A},${2:B},${3:C})"
-    },
-    "tkzPowerCircle()()": {
-      "snippet": "tkzPowerCircle(${1:A})(${2:O},${3:M})"
-    },
-    "tkzDefRadicalAxis()()": {
-      "snippet": "tkzDefRadicalAxis(${1:A},${2:B})(${3:C},${4:D})"
-    },
-    "tkzIsLinear()": {
-      "snippet": "tkzIsLinear(${1:A},${2:B},${3:C})"
-    },
-    "tkzIsOrtho()": {
-      "snippet": "tkzIsOrtho(${1:A},${2:B},${3:C})"
-    },
     "tkzGetResult{}": {
       "snippet": "tkzGetResult{${1:csname}}"
     },
     "tkzSetUpColors[]": {
       "snippet": "tkzSetUpColors[${1:options}]",
-      "keyvalindex": 49,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "tkzSetUpPoint[]": {
       "snippet": "tkzSetUpPoint[${1:options}]",
-      "keyvalindex": 50,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "tkzSetUpLine[]": {
       "snippet": "tkzSetUpLine[${1:options}]",
-      "keyvalindex": 51,
+      "keyvalindex": 7,
       "keyvalpos": 0
     },
     "tkzSetUpArc[]": {
       "snippet": "tkzSetUpArc[${1:options}]",
-      "keyvalindex": 52,
+      "keyvalindex": 8,
       "keyvalpos": 0
     },
     "tkzSetUpCompass[]": {
       "snippet": "tkzSetUpCompass[${1:options}]",
-      "keyvalindex": 52,
+      "keyvalindex": 8,
       "keyvalpos": 0
     },
     "tkzSetUpLabel[]": {
@@ -729,21 +140,6 @@
     "tkzLengthResult": {},
     "fileversion": {},
     "filedate": {},
-    "tkzDrawBisector()": {
-      "snippet": "tkzDrawBisector(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefIntSimilitudeCenter()()": {
-      "snippet": "tkzDefIntSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
-    "tkzDefExtSimilitudeCenter()()": {
-      "snippet": "tkzDefExtSimilitudeCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
-    "tkzDefIntHomotheticCenter()()": {
-      "snippet": "tkzDefIntHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
-    "tkzDefExtHomotheticCenter()()": {
-      "snippet": "tkzDefExtHomotheticCenter(${1:point1},${2:num1})(${3:point2},${4:num2})"
-    },
     "tkzDrawMedian": {},
     "tkzDrawBisector": {},
     "tkzDrawAltitude": {},
@@ -767,9 +163,6 @@
     "tkzSetUpAllColors[]": {
       "snippet": "tkzSetUpAllColors[${1:options}]"
     },
-    "tkzNormalizeAngle()": {
-      "snippet": "tkzNormalizeAngle(${1:arg})"
-    },
     "tkzpointnormalised{}": {
       "snippet": "tkzpointnormalised{${1:arg}}"
     },
@@ -800,20 +193,12 @@
     "EnabledNumprint": {},
     "tkzMathResult": {},
     "tkzHelpGrid": {},
-    "tkzText(){}": {
-      "snippet": "tkzText(${2:x},${3:y}){${1:text}}"
-    },
-    "tkzText[](){}": {
-      "snippet": "tkzText[${2:options}](${3:x},${4:y}){${1:text}}",
-      "keyvalindex": 53,
-      "keyvalpos": 0
-    },
     "tkzLegend{}": {
       "snippet": "tkzLegend{${1:style/size/color/text}}"
     },
     "tkzLegend[]{}": {
       "snippet": "tkzLegend[${2:options}]{${1:style/size/color/text}}",
-      "keyvalindex": 54,
+      "keyvalindex": 9,
       "keyvalpos": 0
     },
     "ifinteger": {},
@@ -826,27 +211,15 @@
     "tkzDrawX": {},
     "tkzDrawX[]": {
       "snippet": "tkzDrawX[${1:options}]",
-      "keyvalindex": 55,
+      "keyvalindex": 10,
       "keyvalpos": 0
     },
     "tkzDrawY": {},
     "tkzDrawY[]": {
       "snippet": "tkzDrawY[${1:options}]",
-      "keyvalindex": 56,
+      "keyvalindex": 11,
       "keyvalpos": 0
     },
-    "tkzDrawPolygons()": {
-      "snippet": "tkzDrawPolygons(${1:point1},${2:point2},${3:...})"
-    },
-    "tkzDrawPolygons[]()": {
-      "snippet": "tkzDrawPolygons[${1:options}](${2:point1},${3:point2},${4:...})"
-    },
-    "tkzLabelRegPolygon(){}": {
-      "snippet": "tkzLabelRegPolygon(${2:point}){${1:label1,${3:label2},...}}"
-    },
-    "tkzLabelRegPolygon[](){}": {
-      "snippet": "tkzLabelRegPolygon[${2:options}](${3:point}){${1:label1,${4:label2},...}}"
-    },
     "iftkzClipOutPoly": {},
     "tkzClipOutPolytrue": {},
     "tkzClipOutPolyfalse": {},
@@ -861,505 +234,25 @@
     },
     "tkzGrid[]": {
       "snippet": "tkzGrid[${1:options}]",
-      "keyvalindex": 57,
-      "keyvalpos": 0
-    },
-    "tkzGrid[]()()": {
-      "snippet": "tkzGrid[${1:options}](${2:x1},${3:y1})(${4:x2},${5:y2})",
-      "keyvalindex": 57,
+      "keyvalindex": 12,
       "keyvalpos": 0
     },
-    "tkzDefCircleTranslation()": {
-      "snippet": "tkzDefCircleTranslation(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleHomothety()": {
-      "snippet": "tkzDefCircleHomothety(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleReflection()": {
-      "snippet": "tkzDefCircleReflection(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleSymmetry()": {
-      "snippet": "tkzDefCircleSymmetry(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleRotation()": {
-      "snippet": "tkzDefCircleRotation(${1:point1},${2:point2})"
-    },
-    "tkzDefOrthogonalCircle()": {
-      "snippet": "tkzDefOrthogonalCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefOrthoThroughCircle()": {
-      "snippet": "tkzDefOrthoThroughCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
-    },
-    "tkzDefInversionCircle()": {
-      "snippet": "tkzDefInversionCircle(${1:point1},${2:point2},${3:point3},${4:point4})"
-    },
-    "tkzDefEquilateral()": {
-      "snippet": "tkzDefEquilateral(${1:point1},${2:point2})"
-    },
-    "tkzDefIsoscelesRightTriangle()": {
-      "snippet": "tkzDefIsoscelesRightTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDrawEquilateral[]()": {
-      "snippet": "tkzDrawEquilateral[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzDefIsoscelesRightTriangle[]()": {
-      "snippet": "tkzDefIsoscelesRightTriangle[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzDefTwoOne()": {
-      "snippet": "tkzDefTwoOne(${1:point1},${2:point2})"
-    },
-    "tkzDefPythagore()": {
-      "snippet": "tkzDefPythagore(${1:point1},${2:point2})"
-    },
-    "tkzDefSchoolTriangle()": {
-      "snippet": "tkzDefSchoolTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefGoldTriangle()": {
-      "snippet": "tkzDefGoldTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefEuclideTriangle()": {
-      "snippet": "tkzDefEuclideTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefGoldenTriangle()": {
-      "snippet": "tkzDefGoldenTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefCheopsTriangle()": {
-      "snippet": "tkzDefCheopsTriangle(${1:point1},${2:point2})"
-    },
-    "tkzDefTwoAnglesTriangle()": {
-      "snippet": "tkzDefTwoAnglesTriangle(${1:point1},${2:point2})"
-    },
     "SetUpPTTR{}": {
       "snippet": "SetUpPTTR{${1:options}}"
     },
-    "tkzDefIncentralTriangle[]()()": {
-      "snippet": "tkzDefIncentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefExcentralTriangle[]()()": {
-      "snippet": "tkzDefExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzExcentralTriangle[]()()": {
-      "snippet": "tkzExcentralTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefIntouchTriangle[]()()": {
-      "snippet": "tkzDefIntouchTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefContactTriangle[]()()": {
-      "snippet": "tkzDefContactTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefFeuerbachTriangle[]()()": {
-      "snippet": "tkzDefFeuerbachTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefCentroidTriangle[]()()": {
-      "snippet": "tkzDefCentroidTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefMedialTriangle[]()()": {
-      "snippet": "tkzDefMedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefMidpointTriangle[]()()": {
-      "snippet": "tkzDefMidpointTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefOrthicTriangle[]()()": {
-      "snippet": "tkzDefOrthicTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefAltitudeTriangle[]()()": {
-      "snippet": "tkzDefAltitudeTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefEulerTriangle[]()()": {
-      "snippet": "tkzDefEulerTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefTangentialTriangle[]()()": {
-      "snippet": "tkzDefTangentialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzDefSymmedialTriangle[]()()": {
-      "snippet": "tkzDefSymmedialTriangle[${1:options}](${2:point1},${3:point2},${4:point3})(${5:ref1},${6:ref2})"
-    },
-    "tkzPointShowCoord()": {
-      "snippet": "tkzPointShowCoord(${1:point})"
-    },
-    "tkzPointShowCoord[]()": {
-      "snippet": "tkzPointShowCoord[${1:options}](${2:point})",
-      "keyvalindex": 58,
-      "keyvalpos": 0
-    },
-    "tkzShowPointCoord()": {
-      "snippet": "tkzShowPointCoord(${1:point})"
-    },
-    "tkzShowPointCoord[]()": {
-      "snippet": "tkzShowPointCoord[${1:options}](${2:point})",
-      "keyvalindex": 58,
-      "keyvalpos": 0
-    },
-    "tkzDefCircleR()": {
-      "snippet": "tkzDefCircleR(${1:point1},${2:point2})"
-    },
-    "tkzDefCircleD()": {
-      "snippet": "tkzDefCircleD(${1:point1},${2:point2})"
-    },
-    "tkzDefCircumCircle()": {
-      "snippet": "tkzDefCircumCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefInCircle()": {
-      "snippet": "tkzDefInCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefExCircle()": {
-      "snippet": "tkzDefExCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefExRadius()": {
-      "snippet": "tkzDefExRadius(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerCircle()": {
-      "snippet": "tkzDefEulerCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefNinePointsCircle()": {
-      "snippet": "tkzDefNinePointsCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFeuerBachCircle()": {
-      "snippet": "tkzFeuerBachCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerRadius()": {
-      "snippet": "tkzDefEulerRadius(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefApolloniusCircle()": {
-      "snippet": "tkzDefApolloniusCircle(${1:point1},${2:point2})"
-    },
-    "tkzDefSpiekerCircle()": {
-      "snippet": "tkzDefSpiekerCircle(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDrawSectorRAngles[]()()": {
-      "snippet": "tkzDrawSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorN[]()()": {
-      "snippet": "tkzDrawSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorRotate[]()()": {
-      "snippet": "tkzDrawSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorAngles[]()()": {
-      "snippet": "tkzDrawSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorRwithNodesAngles[]()()": {
-      "snippet": "tkzDrawSectorRwithNodesAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawSectorR[]()()": {
-      "snippet": "tkzDrawSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorRAngles[]()()": {
-      "snippet": "tkzFillSectorRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorN[]()()": {
-      "snippet": "tkzFillSectorN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorRotate[]()()": {
-      "snippet": "tkzFillSectorRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorAngles[]()()": {
-      "snippet": "tkzFillSectorAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzFillSectorR[]()()": {
-      "snippet": "tkzFillSectorR[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDefLineLL[]()": {
-      "snippet": "tkzDefLineLL[${1:options}](${2:point1},${3:point2},${4:point3})"
-    },
-    "tkzDefOrthLine[]()": {
-      "snippet": "tkzDefOrthLine[${1:options}](${2:point1},${3:point2},${4:point3})"
-    },
-    "tkzDefMediatorLine[]()": {
-      "snippet": "tkzDefMediatorLine[${1:options}](${2:point1},${3:point2},${4:point3})"
-    },
-    "tkzDefBisectorLine()": {
-      "snippet": "tkzDefBisectorLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefBisectorOutLine()": {
-      "snippet": "tkzDefBisectorOutLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefSymmedianLine()": {
-      "snippet": "tkzDefSymmedianLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefAltitudeLine()": {
-      "snippet": "tkzDefAltitudeLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerLine()": {
-      "snippet": "tkzDefEulerLine(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzTgtAt()()": {
-      "snippet": "tkzTgtAt(${1:point1})(${2:point2})"
-    },
-    "tkzTgtFromP()()": {
-      "snippet": "tkzTgtFromP(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzTgtFromPR()()": {
-      "snippet": "tkzTgtFromPR(${1:point1},${2:point2})(${3:point3})"
-    },
-    "tkzRegPolygonCenter()": {
-      "snippet": "tkzRegPolygonCenter(${1:point1},${2:point2})"
-    },
-    "tkzRegPolygonSide()": {
-      "snippet": "tkzRegPolygonSide(${1:point1},${2:point2})"
-    },
-    "tkzRenamePoint(){}": {
-      "snippet": "tkzRenamePoint(${2:arg1}){${1:arg2}}"
-    },
-    "tkzGetPointxy(){}": {
-      "snippet": "tkzGetPointxy(${2:arg1}){${1:arg2}}"
-    },
-    "tkzDrawArcTowards[]()()": {
-      "snippet": "tkzDrawArcTowards[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRotate[]()()": {
-      "snippet": "tkzDrawArcRotate[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcAngles[]()()": {
-      "snippet": "tkzDrawArcAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRwithNodes[]()()": {
-      "snippet": "tkzDrawArcRwithNodes[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcR[]()()": {
-      "snippet": "tkzDrawArcR[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRAngles[]()()": {
-      "snippet": "tkzDrawArcRAngles[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzDrawArcRAN[]()()": {
-      "snippet": "tkzDrawArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzPathArcRAN[]()()": {
-      "snippet": "tkzPathArcRAN[${1:options}](${2:point1},${3:point2})(${4:point3})"
-    },
-    "tkzRandPointOnRect()": {
-      "snippet": "tkzRandPointOnRect(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnSegment()": {
-      "snippet": "tkzRandPointOnSegment(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnLine()": {
-      "snippet": "tkzRandPointOnLine(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnCircle()": {
-      "snippet": "tkzRandPointOnCircle(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnCircleThrough()": {
-      "snippet": "tkzRandPointOnCircleThrough(${1:point1},${2:point2})"
-    },
-    "tkzRandPointOnDisk()": {
-      "snippet": "tkzRandPointOnDisk(${1:point1},${2:point2})"
-    },
-    "tkzVecKOrth[]()": {
-      "snippet": "tkzVecKOrth[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzVecK[]()": {
-      "snippet": "tkzVecK[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzVecKOrthNorm[]()": {
-      "snippet": "tkzVecKOrthNorm[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzVecKNorm[]()": {
-      "snippet": "tkzVecKNorm[${1:options}](${2:point1},${3:point2})"
-    },
-    "tkzShowMediatorLine[]()": {
-      "snippet": "tkzShowMediatorLine[${1:opts}](${2:arg})"
-    },
-    "tkzShowLLLine[]()()": {
-      "snippet": "tkzShowLLLine[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowOrthLine[]()()": {
-      "snippet": "tkzShowOrthLine[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowBisectorLine[]()()": {
-      "snippet": "tkzShowBisectorLine[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowTranslation[]()()": {
-      "snippet": "tkzShowTranslation[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowSymOrth[]()()": {
-      "snippet": "tkzShowSymOrth[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowCSym[]()()": {
-      "snippet": "tkzShowCSym[${1:opts}](${2:arg1})(${3:arg2})"
-    },
-    "tkzShowProjection[]()()": {
-      "snippet": "tkzShowProjection[${1:opts}](${2:arg1})(${3:arg2})"
-    },
     "ExtractPoint": {},
     "FirstPointInList{}": {
       "snippet": "FirstPointInList{${1:arg}}"
     },
-    "tkzTranslation()(){}": {
-      "snippet": "tkzTranslation(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUTranslation()()": {
-      "snippet": "tkzUTranslation(${1:arg1})(${2:arg2})"
-    },
-    "tkzCSym()(){}": {
-      "snippet": "tkzCSym(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUCSym()()": {
-      "snippet": "tkzUCSym(${1:arg1})(${2:arg2})"
-    },
-    "tkzSymOrth()(){}": {
-      "snippet": "tkzSymOrth(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUSymOrth()()": {
-      "snippet": "tkzUSymOrth(${1:arg1})(${2:arg2})"
-    },
-    "tkzProjection()(){}": {
-      "snippet": "tkzProjection(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUProjection()()": {
-      "snippet": "tkzUProjection(${1:arg1})(${2:arg2})"
-    },
-    "tkzHomo()(){}": {
-      "snippet": "tkzHomo(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUHomo()()": {
-      "snippet": "tkzUHomo(${1:arg1})(${2:arg2})"
-    },
-    "tkzRotateAngle()(){}": {
-      "snippet": "tkzRotateAngle(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzURotateAngle()()": {
-      "snippet": "tkzURotateAngle(${1:arg1})(${2:arg2})"
-    },
-    "tkzRotateInRad()(){}": {
-      "snippet": "tkzRotateInRad(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzURotateInRad()()": {
-      "snippet": "tkzURotateInRad(${1:arg1})(${2:arg2})"
-    },
-    "tkzInversePoint()(){}": {
-      "snippet": "tkzInversePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUInversePoint()()": {
-      "snippet": "tkzUInversePoint(${1:arg1})(${2:arg2})"
-    },
-    "tkzInverseNegativePoint()(){}": {
-      "snippet": "tkzInverseNegativePoint(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
-    "tkzUInverseNegativePoint()()": {
-      "snippet": "tkzUInverseNegativePoint(${1:arg1})(${2:arg2})"
-    },
-    "tkzDefBCPoint()": {
-      "snippet": "tkzDefBCPoint(${1:point1=num1},${2:point2=num2},${3:...})"
-    },
-    "tkzDivHarmonic()": {
-      "snippet": "tkzDivHarmonic(${1:pt1},${2:pt2},${3:pt3})"
-    },
-    "tkzDivHarmonic[]()": {
-      "snippet": "tkzDivHarmonic[${1:options}](${2:pt1},${3:pt2},${4:pt3})"
-    },
-    "tkzOrthoCenter()": {
-      "snippet": "tkzOrthoCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefOrthoCenter()": {
-      "snippet": "tkzDefOrthoCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzCentroid()": {
-      "snippet": "tkzCentroid(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzBaryCenter()": {
-      "snippet": "tkzBaryCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzCircumCenter()": {
-      "snippet": "tkzCircumCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefCircumCenter()": {
-      "snippet": "tkzDefCircumCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzInCenter()": {
-      "snippet": "tkzInCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefInCenter()": {
-      "snippet": "tkzDefInCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzExCenter()": {
-      "snippet": "tkzExCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefExCenter()": {
-      "snippet": "tkzDefExCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzEulerCenter()": {
-      "snippet": "tkzEulerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzNinePointCenter()": {
-      "snippet": "tkzNinePointCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefEulerCenter()": {
-      "snippet": "tkzDefEulerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzSymmedianCenter()": {
-      "snippet": "tkzSymmedianCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzLemoinePoint()": {
-      "snippet": "tkzLemoinePoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzGrebePoint()": {
-      "snippet": "tkzGrebePoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefLemoinePoint()": {
-      "snippet": "tkzDefLemoinePoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzSpiekerCenter()": {
-      "snippet": "tkzSpiekerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefSpiekerCenter()": {
-      "snippet": "tkzDefSpiekerCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzGergonneCenter()": {
-      "snippet": "tkzGergonneCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefGergonneCenter()": {
-      "snippet": "tkzDefGergonneCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzNagelCenter()": {
-      "snippet": "tkzNagelCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefNagelCenter()": {
-      "snippet": "tkzDefNagelCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzMittenpunktCenter()": {
-      "snippet": "tkzMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefMittenpunktCenter()": {
-      "snippet": "tkzDefMittenpunktCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefMiddlespoint()": {
-      "snippet": "tkzDefMiddlespoint(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzFeuerbachCenter()": {
-      "snippet": "tkzFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzDefFeuerbachCenter()": {
-      "snippet": "tkzDefFeuerbachCenter(${1:point1},${2:point2},${3:point3})"
-    },
-    "tkzOrthogonalCenter()": {
-      "snippet": "tkzOrthogonalCenter(${1:point1},${2:point2})"
-    },
     "usetkzobj{}": {
       "snippet": "usetkzobj{${1:list of objects}}"
     },
     "usetkztool{}": {
       "snippet": "usetkztool{${1:list of tools}}"
     },
-    "tkzInterLLxy()()": {
-      "snippet": "tkzInterLLxy(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
-    "tkzTestInterLC()()": {
-      "snippet": "tkzTestInterLC(${1:point1},${2:point2})(${3:point3},${4:point4})"
-    },
     "iftkzFlagLC": {},
     "tkzFlagLCtrue": {},
     "tkzFlagLCfalse": {},
-    "tkzInterLCR()(){}{}": {
-      "snippet": "tkzInterLCR(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
-    },
-    "tkzInterLCWithNodes()(){}{}": {
-      "snippet": "tkzInterLCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
-    },
-    "tkzInterCCWithNodes()(){}{}": {
-      "snippet": "tkzInterCCWithNodes(${3:arg1})(${4:arg2}){${1:arg3}}{${2:arg4}}"
-    },
     "tkzAddName[]{}": {
       "snippet": "tkzAddName[${2:options}]{${1:name}}"
     },
@@ -1384,162 +277,12 @@
     "lua"
   ],
   "keyvals": [
-    [
-      "label=${1:text}",
-      "shift=(${1:x},${2:y})",
-      "shift=(${1:angle}:${2:radius})"
-    ],
-    [
-      "ext",
-      "int"
-    ],
-    [
-      "both",
-      "ext",
-      "int"
-    ],
-    [
-      "dist=",
-      "from=${1:point}",
-      "show",
-      "/tkzcompass/delta=${1:number}"
-    ],
-    [
-      "ortho",
-      "orthic",
-      "centroid",
-      "median",
-      "circum",
-      "in",
-      "ex",
-      "euler",
-      "gergonne",
-      "symmedian",
-      "lemoine",
-      "grebe",
-      "spieker",
-      "nagel",
-      "mittenpunkt",
-      "feuerbach"
-    ],
-    [
-      "name=${1:name}"
-    ],
-    [
-      "pos=${1:number}"
-    ],
     [
       "through=center ${1:point1} angle ${2:degrees} point ${3:point2}",
       "R=center ${1:point} angle ${2:degrees} radius ${3:radius}",
       "through in rad=center ${1:point1} angle ${2:radians} point ${3:point2}",
       "R in rad=center ${1:point} angle ${2:radians} radius ${3:radius}"
     ],
-    [
-      "translation=from ${1:point1} to ${2:point2}",
-      "homothety=center ${1:point} ratio ${2:number}",
-      "reflection=over ${1:point1}--${2:point2}",
-      "symmetry=center ${1:point}",
-      "projection=onto ${1:point1}--${2:point2}",
-      "rotation=center ${1:point} angle ${2:degrees}",
-      "rotation in rad=center ${1:point} angle ${2:radians}",
-      "inversion=center ${1:point1} through ${2:point2}",
-      "inversion negative=center ${1:point1} through ${2:point2}"
-    ],
-    [
-      "orthogonal",
-      "orthogonal normed",
-      "linear",
-      "linear normed",
-      "colinear=at ${1:point}",
-      "colinear normed=at ${1:point}",
-      "K=${1:number}"
-    ],
-    [
-      "mediator",
-      "perpendicular=through ${1:point}",
-      "orthogonal=through ${1:point}",
-      "parallel=through ${1:point}",
-      "bisector",
-      "bisector out",
-      "symmedian",
-      "altitude",
-      "euler",
-      "tangent at=${1:point}",
-      "tangent from=${1:point}",
-      "K=${1:number}",
-      "normed"
-    ],
-    [
-      "at=${1:point}",
-      "from=${1:point}",
-      "from with R=${1:point}"
-    ],
-    [
-      "two angles=${1:angle1} and ${2:angle2}",
-      "equilateral",
-      "isosceles right",
-      "pythagore",
-      "pythagoras",
-      "egyptian",
-      "school",
-      "gold",
-      "euclid",
-      "golden",
-      "cheops",
-      "swap"
-    ],
-    [
-      "orthic",
-      "centroid",
-      "medial",
-      "in",
-      "incentral",
-      "ex",
-      "excentral",
-      "extouch",
-      "intouch",
-      "contact",
-      "euler",
-      "symmedial",
-      "tangential",
-      "feuerbach",
-      "name=${1:name}",
-      "ortho"
-    ],
-    [
-      "name=${1:name}",
-      "sides=${1:integer}",
-      "center",
-      "side"
-    ],
-    [
-      "R",
-      "diameter",
-      "circum",
-      "in",
-      "ex",
-      "euler",
-      "nine",
-      "spieker",
-      "apollonius",
-      "orthogonal from=${1:point}",
-      "orthogonal through=${1:point1} and ${2:point2}",
-      "K=${1:number}"
-    ],
-    [
-      "translation=from ${1:point1} to ${2:point2}",
-      "homothety=center ${1:point} ratio ${2:number}",
-      "reflection=over ${1:point1}--${2:point2}",
-      "symmetry=center ${1:point}",
-      "projection=onto ${1:point1}--${2:point2}",
-      "rotation=center ${1:point} angle ${2:degrees}",
-      "inversion=center ${1:point1} through ${2:point2}"
-    ],
-    [
-      "N",
-      "R",
-      "with nodes"
-    ],
     [
       "rectangle=${1:point1} and ${2:point2}",
       "segment=${1:point1}--${2:point2}",
@@ -1548,279 +291,6 @@
       "circle through=center ${1:point1} through ${2:point2}",
       "disk through=center ${1:point1} through ${2:point2}"
     ],
-    [
-      "shape=",
-      "size=${1:number}",
-      "color=",
-      "%color",
-      "fill=",
-      "draw=",
-      "opacity=${1:factor}",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "add=${1:num1} and ${2:num2}",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "style={${1:TikZ options}}",
-      "->",
-      "<-",
-      "<->",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line width=",
-      "double",
-      "double distance="
-    ],
-    [
-      "add=${1:num1} and ${2:num2}",
-      "dim={${1:label},${2:dim},${3:option}}",
-      "color=",
-      "%color",
-      "opacity=${1:factor}",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "style={${1:TikZ options}}",
-      "->",
-      "<-",
-      "<->",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line width=",
-      "double",
-      "double distance="
-    ],
-    [
-      "color=",
-      "%color",
-      "fill=",
-      "draw=",
-      "opacity=${1:factor}",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "style={${1:TikZ options}}",
-      "->",
-      "<-",
-      "<->",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "line width=",
-      "line join=",
-      "double",
-      "double distance="
-    ],
-    [
-      "through",
-      "R",
-      "color=",
-      "%color",
-      "fill=",
-      "opacity=${1:factor}",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "through",
-      "diameter",
-      "color=",
-      "%color",
-      "fill=",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "towards",
-      "rotate",
-      "R",
-      "R with nodes",
-      "angles",
-      "delta=${1:number}",
-      "reverse",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "towards",
-      "rotate",
-      "R",
-      "R with nodes",
-      "fill=",
-      "opacity=${1:factor}",
-      "color=",
-      "%color",
-      "draw=",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick",
-      "double",
-      "double distance="
-    ],
-    [
-      "radius",
-      "R",
-      "color=",
-      "%color",
-      "fill=",
-      "opacity=${1:factor}"
-    ],
-    [
-      "color=",
-      "%color",
-      "opacity=${1:factor}",
-      "fill="
-    ],
-    [
-      "size=${1:number}",
-      "color=",
-      "%color",
-      "opacity=${1:factor}",
-      "fill=",
-      "left color=",
-      "right color="
-    ],
     [
       "xmin=${1:number}",
       "xmax=${1:number}",
@@ -1839,229 +309,6 @@
       "color=",
       "%color"
     ],
-    [
-      "out"
-    ],
-    [
-      "towards",
-      "rotate",
-      "R"
-    ],
-    [
-      "pos=${1:number}",
-      "color=",
-      "%color",
-      "mark=${1:mark}",
-      "size=",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "arc=",
-      "size=",
-      "mark=${1:mark}",
-      "mksize=",
-      "mkcolor=",
-      "color=",
-      "mkpos=${1:number}"
-    ],
-    [
-      "german",
-      "size=${1:number}",
-      "fill=",
-      "opacity=${1:factor}",
-      "draw=",
-      "color=",
-      "%color",
-      "line width="
-    ],
-    [
-      "left",
-      "right",
-      "above",
-      "below",
-      "above right",
-      "above left",
-      "below right",
-      "below left",
-      "color=",
-      "%color",
-      "font=${1:font commands}",
-      "label=${1:text}",
-      "centered"
-    ],
-    [
-      "left",
-      "right",
-      "above",
-      "below",
-      "above right",
-      "above left",
-      "below right",
-      "below left",
-      "color=",
-      "%color",
-      "font=${1:font commands}",
-      "label=${1:text}",
-      "centered",
-      "center=${1:point}",
-      "dist=${1:number}"
-    ],
-    [
-      "pos=${1:number}",
-      "swap",
-      "auto",
-      "below=",
-      "above=",
-      "left=",
-      "right=",
-      "below left=",
-      "below right=",
-      "above left=",
-      "above right=",
-      "sloped",
-      "midway",
-      "near start",
-      "near end",
-      "very near start",
-      "very near end",
-      "at start",
-      "at end",
-      "color=",
-      "%color"
-    ],
-    [
-      "pos=${1:number}",
-      "circle",
-      "draw",
-      "fill=",
-      "font=${1:font commands}"
-    ],
-    [
-      "radius",
-      "R",
-      "below=",
-      "above=",
-      "left=",
-      "right=",
-      "below left=",
-      "below right=",
-      "above left=",
-      "above right=",
-      "color=",
-      "%color",
-      "fill=",
-      "font=${1:font commands}",
-      "draw",
-      "text width=",
-      "text centered"
-    ],
-    [
-      "pos=${1:number}",
-      "below=",
-      "above=",
-      "left=",
-      "right=",
-      "below left=",
-      "below right=",
-      "above left=",
-      "above right=",
-      "color=",
-      "%color"
-    ],
-    [
-      "delta=${1:degrees}",
-      "length=${1:number}",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "mediator",
-      "parallel=through ${1:point}",
-      "perpendicular=through ${1:point}",
-      "orthogonal",
-      "bisector",
-      "K=${1:number}",
-      "length=${1:number}",
-      "ratio=${1:number}",
-      "gap=${1:number}",
-      "size=${1:number}",
-      "color=",
-      "%color",
-      "solid",
-      "dotted",
-      "densely dotted",
-      "loosely dotted",
-      "dashed",
-      "densely dashed",
-      "loosely dashed",
-      "dash dot",
-      "densely dash dot",
-      "loosely dash dot",
-      "dash dot dot",
-      "densely dash dot dot",
-      "loosely dash dot dot",
-      "line width=",
-      "style={${1:TikZ options}}",
-      "line width=",
-      "ultra thin",
-      "very thin",
-      "thin",
-      "semithick",
-      "thick",
-      "very thick",
-      "ultra thick"
-    ],
-    [
-      "reflection=over ${1:point1}--${2:point2}",
-      "symmetry=center ${1:point}",
-      "projection=onto ${1:point1}--${2:point2}",
-      "translation=from ${1:point1} to ${2:point2}",
-      "K=${1:number}",
-      "length=${1:number}",
-      "ratio=${1:number}",
-      "gap=${1:number}",
-      "size=${1:number}",
-      "color=",
-      "%color"
-    ],
-    [
-      "lw=",
-      "scale=${1:factor}",
-      "return"
-    ],
-    [
-      "cm"
-    ],
     [
       "background=",
       "text="
@@ -2086,17 +333,6 @@
       "add=${1:num1} and ${2:num2}",
       "delta=${1:number}"
     ],
-    [
-      "draw",
-      "color=",
-      "text=",
-      "fill=",
-      "opacity=${1:factor}",
-      "line width=",
-      "rotate=${1:degrees}",
-      "inner sep=",
-      "text width="
-    ],
     [
       "line"
     ],
@@ -2130,14 +366,6 @@
       "subxstep=${1:number}",
       "subystep=${1:number}",
       "line width="
-    ],
-    [
-      "xlabel=${1:text}",
-      "xstyle=",
-      "noxdraw",
-      "ylabel=${1:text}",
-      "ystyle=",
-      "noydraw"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/tkz-fct.json b/dev/packages/tkz-fct.json
index 06bfe08e8..707595a8f 100644
--- a/dev/packages/tkz-fct.json
+++ b/dev/packages/tkz-fct.json
@@ -12,50 +12,34 @@
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "tkzDefPointByFct()": {
-      "snippet": "tkzDefPointByFct(${1:number})"
-    },
-    "tkzDefPointByFct[]()": {
-      "snippet": "tkzDefPointByFct[${1:options}](${2:number})",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "tkzDrawTangentLine()": {
-      "snippet": "tkzDrawTangentLine(${1:number})"
-    },
-    "tkzDrawTangentLine[]()": {
-      "snippet": "tkzDrawTangentLine[${1:options}](${2:number})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "tkzDrawArea[]": {
       "snippet": "tkzDrawArea[${1:options}]",
-      "keyvalindex": 3,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "tkzDrawAreafg[]": {
       "snippet": "tkzDrawAreafg[${1:options}]",
-      "keyvalindex": 4,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSum[]": {
       "snippet": "tkzDrawRiemannSum[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSumInf[]": {
       "snippet": "tkzDrawRiemannSumInf[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSumSup[]": {
       "snippet": "tkzDrawRiemannSumSup[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "tkzDrawRiemannSumMid[]": {
       "snippet": "tkzDrawRiemannSumMid[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "tkzFctPar{}{}": {
@@ -86,17 +70,6 @@
       "line width=",
       "style="
     ],
-    [
-      "draw",
-      "with=",
-      "ref="
-    ],
-    [
-      "draw",
-      "with=",
-      "kr=",
-      "kl="
-    ],
     [
       "domain=",
       "with=",
diff --git a/dev/packages/tkz-graph.json b/dev/packages/tkz-graph.json
index 16fc83c19..7bd668926 100644
--- a/dev/packages/tkz-graph.json
+++ b/dev/packages/tkz-graph.json
@@ -12,77 +12,13 @@
       "keyvalpos": 0
     },
     "Vertices{}{}": {
-      "snippet": "Vertices{${1:type}}{${2:vertex1,${3:vertex2},...}}"
+      "snippet": "Vertices{${1:type}}{${2:vertex1,vertex2,...}}"
     },
     "Vertices[]{}{}": {
-      "snippet": "Vertices[${3:options}]{${1:type}}{${2:vertex1,${4:vertex2},...}}",
+      "snippet": "Vertices[${3:options}]{${1:type}}{${2:vertex1,vertex2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
-    "EA(){}": {
-      "snippet": "EA(${2:vertex1}){${1:vertex2}}"
-    },
-    "EA[](){}": {
-      "snippet": "EA[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "WE(){}": {
-      "snippet": "WE(${2:vertex1}){${1:vertex2}}"
-    },
-    "WE[](){}": {
-      "snippet": "WE[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "NO(){}": {
-      "snippet": "NO(${2:vertex1}){${1:vertex2}}"
-    },
-    "NO[](){}": {
-      "snippet": "NO[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "SO(){}": {
-      "snippet": "SO(${2:vertex1}){${1:vertex2}}"
-    },
-    "SO[](){}": {
-      "snippet": "SO[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "NOEA(){}": {
-      "snippet": "NOEA(${2:vertex1}){${1:vertex2}}"
-    },
-    "NOEA[](){}": {
-      "snippet": "NOEA[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "NOWE(){}": {
-      "snippet": "NOWE(${2:vertex1}){${1:vertex2}}"
-    },
-    "NOWE[](){}": {
-      "snippet": "NOWE[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "SOEA(){}": {
-      "snippet": "SOEA(${2:vertex1}){${1:vertex2}}"
-    },
-    "SOEA[](){}": {
-      "snippet": "SOEA[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "SOWE(){}": {
-      "snippet": "SOWE(${2:vertex1}){${1:vertex2}}"
-    },
-    "SOWE[](){}": {
-      "snippet": "SOWE[${2:options}](${3:vertex1}){${1:vertex2}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
     "SetGraphUnit{}": {
       "snippet": "SetGraphUnit{${1:number}}"
     },
@@ -91,31 +27,9 @@
     "SetVertexLabel": {},
     "SetVertexLabelOut": {},
     "SetVertexLabelIn": {},
-    "Edge()()": {
-      "snippet": "Edge(${1:vertex1})(${2:vertex2})"
-    },
-    "Edge[]()()": {
-      "snippet": "Edge[${1:options}](${2:vertex1})(${3:vertex2})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "Loop()": {
-      "snippet": "Loop(${1:vertex})"
-    },
-    "Loop[]()": {
-      "snippet": "Loop[${1:options}](${2:vertex})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "Edges()": {
-      "snippet": "Edges(${1:vertex1},${2:vertex2},${3:...})"
-    },
-    "Edges[]()": {
-      "snippet": "Edges[${1:options}](${2:vertex1},${3:vertex2},${4:...})"
-    },
     "GraphInit[]": {
       "snippet": "GraphInit[${1:options}]",
-      "keyvalindex": 4,
+      "keyvalindex": 1,
       "keyvalpos": 0
     },
     "VertexInnerSep": {},
@@ -140,22 +54,22 @@
     "SetVertexSimple": {},
     "SetVertexSimple[]": {
       "snippet": "SetVertexSimple[${1:options}]",
-      "keyvalindex": 5,
+      "keyvalindex": 2,
       "keyvalpos": 0
     },
     "SetVertexNormal[]": {
       "snippet": "SetVertexNormal[${1:options}]",
-      "keyvalindex": 6,
+      "keyvalindex": 3,
       "keyvalpos": 0
     },
     "SetUpVertex[]": {
       "snippet": "SetUpVertex[${1:options}]",
-      "keyvalindex": 7,
+      "keyvalindex": 4,
       "keyvalpos": 0
     },
     "SetUpEdge[]": {
       "snippet": "SetUpEdge[${1:options}]",
-      "keyvalindex": 8,
+      "keyvalindex": 5,
       "keyvalpos": 0
     },
     "SetGraphShadeColor{}{}{}": {
@@ -172,7 +86,7 @@
     },
     "grProb[]{}{}{}{}{}{}": {
       "snippet": "grProb[${7:options}]{${1:left-vertex}}{${2:right-vertex}}{${3:toplabel}}{${4:bottomlabel}}{${5:leftlabel}}{${6:rightlabel}}",
-      "keyvalindex": 9,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "grProbThree{}{}{}{}{}{}": {
@@ -180,11 +94,11 @@
     },
     "grProbThree[]{}{}{}{}{}{}": {
       "snippet": "grProbThree[${7:options}]{${1:right-vertex}}{${2:up-vertex}}{${3:down-vertex}}{${4:rr/ru/rd}}{${5:uu/ud/ur}}{${6:dd/dr/du}}",
-      "keyvalindex": 9,
+      "keyvalindex": 6,
       "keyvalpos": 0
     },
     "AddVertexColor{}{}": {
-      "snippet": "AddVertexColor{${1:color}}{${2:vertex1,${3:vertex2},...}}"
+      "snippet": "AddVertexColor{${1:color}}{${2:vertex1,vertex2,...}}"
     },
     "SetVertexArt": {}
   },
@@ -206,46 +120,6 @@
       "Ldist=",
       "Lpos="
     ],
-    [
-      "x=",
-      "y=",
-      "a=",
-      "d=",
-      "Node",
-      "position=",
-      "dir=",
-      "NoLabel",
-      "LabelOut",
-      "L=",
-      "Math",
-      "Ldist=",
-      "Lpos=",
-      "unit="
-    ],
-    [
-      "local",
-      "color=",
-      "lw=",
-      "label=",
-      "labeltext=",
-      "labelcolor=",
-      "labelstyle=",
-      "style="
-    ],
-    [
-      "color=",
-      "lw=",
-      "label=",
-      "labelstyle=",
-      "style=",
-      "color=",
-      "lw=",
-      "label=",
-      "labelstyle=",
-      "style=",
-      "dir=",
-      "dist="
-    ],
     [
       "vstyle="
     ],
diff --git a/dev/packages/tkz-kiviat.json b/dev/packages/tkz-kiviat.json
index 5b7825c00..5ea78437b 100644
--- a/dev/packages/tkz-kiviat.json
+++ b/dev/packages/tkz-kiviat.json
@@ -5,15 +5,15 @@
   },
   "macros": {
     "tkzKiviatDiagram{}": {
-      "snippet": "tkzKiviatDiagram{${1:name1,${2:name2},...}}"
+      "snippet": "tkzKiviatDiagram{${1:name1,name2,...}}"
     },
     "tkzKiviatDiagram[]{}": {
-      "snippet": "tkzKiviatDiagram[${2:options}]{${1:name1,${3:name2},...}}",
+      "snippet": "tkzKiviatDiagram[${2:options}]{${1:name1,name2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
     "tkzKiviatLine[]{}": {
-      "snippet": "tkzKiviatLine[${2:options}]{${1:num1,${3:num2},...}}",
+      "snippet": "tkzKiviatLine[${2:options}]{${1:num1,num2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -22,17 +22,12 @@
       "keyvalindex": 1,
       "keyvalpos": 0
     },
-    "tkzKiviatGrad[]()": {
-      "snippet": "tkzKiviatGrad[${1:options}](${2:integer})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "tkzKiviatDiagramFromFile{}": {
       "snippet": "tkzKiviatDiagramFromFile{${1:file}}"
     },
     "tkzKiviatDiagramFromFile[]{}": {
       "snippet": "tkzKiviatDiagramFromFile[${2:options}]{${1:file}}",
-      "keyvalindex": 3,
+      "keyvalindex": 2,
       "keyvalpos": 0
     }
   },
@@ -52,12 +47,6 @@
       "fill=",
       "opacity="
     ],
-    [
-      "graduation distance=",
-      "prefix=",
-      "suffix=",
-      "unity="
-    ],
     [
       "lattice=",
       "gap=",
diff --git a/dev/packages/tkz-tab.json b/dev/packages/tkz-tab.json
index 3b6d4c642..938fc3909 100644
--- a/dev/packages/tkz-tab.json
+++ b/dev/packages/tkz-tab.json
@@ -7,10 +7,10 @@
   },
   "macros": {
     "tkzTabInit{}{}": {
-      "snippet": "tkzTabInit{${1:expr1/height1,${3:expr2/height2},${4:...}}{${2:expr1},${5:expr2},...}}"
+      "snippet": "tkzTabInit{${1:expr1/height1,expr2/height2,...}}{${2:expr1,expr2,...}}"
     },
     "tkzTabInit[]{}{}": {
-      "snippet": "tkzTabInit[${3:options}]{${1:expr1/height1,${4:expr2/height2},${5:...}}{${2:expr1},${6:expr2},...}}",
+      "snippet": "tkzTabInit[${3:options}]{${1:expr1/height1,expr2/height2,...}}{${2:expr1,expr2,...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
@@ -23,18 +23,18 @@
       "keyvalpos": 0
     },
     "tkzTabLine{}": {
-      "snippet": "tkzTabLine{${1:symbol1,${2:symbol2},...}}"
+      "snippet": "tkzTabLine{${1:symbol1,symbol2,...}}"
     },
     "tkzTabLine[]{}": {
-      "snippet": "tkzTabLine[${2:options}]{${1:symbol1,${3:symbol2},...}}",
+      "snippet": "tkzTabLine[${2:options}]{${1:symbol1,symbol2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "tkzTabVar{}": {
-      "snippet": "tkzTabVar{${1:symbol1/expr,${2:symbol2/expr1/expr2},...}}"
+      "snippet": "tkzTabVar{${1:symbol1/expr,symbol2/expr1/expr2,...}}"
     },
     "tkzTabVar[]{}": {
-      "snippet": "tkzTabVar[${2:options}]{${1:symbol1/expr,${3:symbol2/expr1/expr2},...}}",
+      "snippet": "tkzTabVar[${2:options}]{${1:symbol1/expr,symbol2/expr1/expr2,...}}",
       "keyvalindex": 2,
       "keyvalpos": 0
     },
@@ -79,7 +79,7 @@
       "keyvalpos": 0
     },
     "tkzTabSlope{}": {
-      "snippet": "tkzTabSlope{${1:num1/leftexpr1/rightexpr1,${2:num2/leftexpr2/rightexpr3},...}}"
+      "snippet": "tkzTabSlope{${1:num1/leftexpr1/rightexpr1,num2/leftexpr2/rightexpr3,...}}"
     },
     "tkzTabSetup": {},
     "tkzTabSetup[]": {
diff --git a/dev/packages/tocbasic.json b/dev/packages/tocbasic.json
deleted file mode 100644
index 8afe9ceee..000000000
--- a/dev/packages/tocbasic.json
+++ /dev/null
@@ -1,288 +0,0 @@
-{
-  "includes": {
-    "scrbase": [],
-    "scrlogo": []
-  },
-  "macros": {
-    "Ifattoclist{}{}{}": {
-      "snippet": "Ifattoclist{${1:extension}}{${2:then code}}{${3:else code}}"
-    },
-    "addtotoclist{}": {
-      "snippet": "addtotoclist{${1:extension}}"
-    },
-    "addtotoclist[]{}": {
-      "snippet": "addtotoclist[${2:owner}]{${1:extension}}"
-    },
-    "owneroftoc{}": {
-      "snippet": "owneroftoc{${1:arg}}"
-    },
-    "categoryoftoc{}": {
-      "snippet": "categoryoftoc{${1:arg}}"
-    },
-    "AtAddToTocList{}": {
-      "snippet": "AtAddToTocList{${1:commands}}"
-    },
-    "AtAddToTocList[]{}": {
-      "snippet": "AtAddToTocList[${2:owner}]{${1:commands}}"
-    },
-    "removefromtoclist{}": {
-      "snippet": "removefromtoclist{${1:extension}}"
-    },
-    "removefromtoclist[]{}": {
-      "snippet": "removefromtoclist[${2:owner}]{${1:extension}}"
-    },
-    "doforeachtocfile{}": {
-      "snippet": "doforeachtocfile{${1:commands}}"
-    },
-    "doforeachtocfile[]{}": {
-      "snippet": "doforeachtocfile[${2:owner}]{${1:commands}}"
-    },
-    "addtoeachtocfile{}": {
-      "snippet": "addtoeachtocfile{${1:content}}"
-    },
-    "addtoeachtocfile[]{}": {
-      "snippet": "addtoeachtocfile[${2:owner}]{${1:content}}"
-    },
-    "addcontentslinetoeachtocfile{}{}": {
-      "snippet": "addcontentslinetoeachtocfile{${1:level}}{${2:text}}"
-    },
-    "addcontentslinetoeachtocfile[]{}{}": {
-      "snippet": "addcontentslinetoeachtocfile[${3:owner}]{${1:level}}{${2:text}}"
-    },
-    "addxcontentsline{}{}{}": {
-      "snippet": "addxcontentsline{${1:extension}}{${2:level}}{${3:text}}"
-    },
-    "addxcontentsline{}{}[]{}": {
-      "snippet": "addxcontentsline{${1:extension}}{${2:level}}[${3:section number}]{${4:text}}"
-    },
-    "nonumberline": {},
-    "addxcontentslinetoeachtocfile{}{}": {
-      "snippet": "addxcontentslinetoeachtocfile{${1:level}}{${2:text}}"
-    },
-    "addxcontentslinetoeachtocfile{}[]{}": {
-      "snippet": "addxcontentslinetoeachtocfile{${1:level}}[${2:section number}]{${3:text}}"
-    },
-    "addxcontentslinetoeachtocfile[]{}{}": {
-      "snippet": "addxcontentslinetoeachtocfile[${3:owner}]{${1:level}}{${2:text}}"
-    },
-    "addxcontentslinetoeachtocfile[]{}[]{}": {
-      "snippet": "addxcontentslinetoeachtocfile[${3:owner}]{${1:level}}[${4:section number}]{${2:text}}"
-    },
-    "BeforeStartingTOC{}": {
-      "snippet": "BeforeStartingTOC{${1:commands}}"
-    },
-    "BeforeStartingTOC[]{}": {
-      "snippet": "BeforeStartingTOC[${2:extension}]{${1:commands}}"
-    },
-    "AfterStartingTOC{}": {
-      "snippet": "AfterStartingTOC{${1:commands}}"
-    },
-    "AfterStartingTOC[]{}": {
-      "snippet": "AfterStartingTOC[${2:extension}]{${1:commands}}"
-    },
-    "listoftoc{}": {
-      "snippet": "listoftoc{${1:extension}}"
-    },
-    "listoftoc[]{}": {
-      "snippet": "listoftoc[${2:list-of title}]{${1:extension}}"
-    },
-    "listoftoc*{}": {
-      "snippet": "listoftoc*{${1:extension}}"
-    },
-    "listofname": {},
-    "listofeachtoc": {},
-    "listofeachtoc[]": {
-      "snippet": "listofeachtoc[${1:owner}]"
-    },
-    "BeforeTOCHead{}": {
-      "snippet": "BeforeTOCHead{${1:commands}}"
-    },
-    "BeforeTOCHead[]{}": {
-      "snippet": "BeforeTOCHead[${2:extension}]{${1:commands}}"
-    },
-    "AfterTOCHead{}": {
-      "snippet": "AfterTOCHead{${1:commands}}"
-    },
-    "AfterTOCHead[]{}": {
-      "snippet": "AfterTOCHead[${2:extension}]{${1:commands}}"
-    },
-    "deftocheading{}{}": {
-      "snippet": "deftocheading{${1:extension}}{${2:definition}}"
-    },
-    "setuptoc{}{}": {
-      "snippet": "setuptoc{${1:extension}}{${2:feature list}}"
-    },
-    "unsettoc{}{}": {
-      "snippet": "unsettoc{${1:extension}}{${2:feature list}}"
-    },
-    "Iftocfeature{}{}{}{}": {
-      "snippet": "Iftocfeature{${1:extension}}{${2:feature}}{${3:then code}}{${4:else code}}"
-    },
-    "tocbasicautomode": {},
-    "DeclareNewTOC{}": {
-      "snippet": "DeclareNewTOC{${1:extension}}"
-    },
-    "DeclareNewTOC[]{}": {
-      "snippet": "DeclareNewTOC[${2:options}]{${1:extension}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "usetocbasicnumberline": {},
-    "usetocbasicnumberline[]": {
-      "snippet": "usetocbasicnumberline[${1:code}]"
-    },
-    "TOCEntryStyleInitCode{}{}": {
-      "snippet": "TOCEntryStyleInitCode{${1:style}}{${2:initial code}}"
-    },
-    "TOCEntryStyleInitCode*{}{}": {
-      "snippet": "TOCEntryStyleInitCode*{${1:style}}{${2:initial code}}"
-    },
-    "TOCEntryStyleStartInitCode{}{}": {
-      "snippet": "TOCEntryStyleStartInitCode{${1:style}}{${2:initial code}}"
-    },
-    "DefineTOCEntryBooleanOption{}{}{}{}": {
-      "snippet": "DefineTOCEntryBooleanOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
-    },
-    "DefineTOCEntryBooleanOption{}[]{}{}{}": {
-      "snippet": "DefineTOCEntryBooleanOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
-    },
-    "DefineTOCEntryCommandOption{}{}{}{}": {
-      "snippet": "DefineTOCEntryCommandOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
-    },
-    "DefineTOCEntryCommandOption{}[]{}{}{}": {
-      "snippet": "DefineTOCEntryCommandOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
-    },
-    "DefineTOCEntryIfOption{}{}{}{}": {
-      "snippet": "DefineTOCEntryIfOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
-    },
-    "DefineTOCEntryIfOption{}[]{}{}{}": {
-      "snippet": "DefineTOCEntryIfOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
-    },
-    "DefineTOCEntryLengthOption{}{}{}{}": {
-      "snippet": "DefineTOCEntryLengthOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
-    },
-    "DefineTOCEntryLengthOption{}[]{}{}{}": {
-      "snippet": "DefineTOCEntryLengthOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
-    },
-    "DefineTOCEntryListOption{}{}{}{}": {
-      "snippet": "DefineTOCEntryListOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
-    },
-    "DefineTOCEntryListOption{}[]{}{}{}": {
-      "snippet": "DefineTOCEntryListOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
-    },
-    "DefineTOCEntryNumberOption{}{}{}{}": {
-      "snippet": "DefineTOCEntryNumberOption{${1:option}}{${2:prefix}}{${3:postfix}}{${4:description}}"
-    },
-    "DefineTOCEntryNumberOption{}[]{}{}{}": {
-      "snippet": "DefineTOCEntryNumberOption{${1:option}}[${2:default}]{${3:prefix}}{${4:postfix}}{${5:description}}"
-    },
-    "DefineTOCEntryOption{}{}": {
-      "snippet": "DefineTOCEntryOption{${1:option}}{${2:code}}"
-    },
-    "DefineTOCEntryOption{}[]{}": {
-      "snippet": "DefineTOCEntryOption{${1:option}}[${2:default}]{${3:code}}"
-    },
-    "AddToDeclareTOCEntryStylePreCheckNeeds{}": {
-      "snippet": "AddToDeclareTOCEntryStylePreCheckNeeds{${1:code}}"
-    },
-    "PreToDeclareTOCEntryStylePreCheckNeeds{}": {
-      "snippet": "PreToDeclareTOCEntryStylePreCheckNeeds{${1:code}}"
-    },
-    "TOCEntryStyleNeedsCommandByOption{}{}{}{}{}": {
-      "snippet": "TOCEntryStyleNeedsCommandByOption{${1:option}}{${2:arg2}}{${3:arg3}}{${4:arg4}}{${5:arg5}}"
-    },
-    "DeclareTOCEntryStyle{}{}": {
-      "snippet": "DeclareTOCEntryStyle{${1:style}}{${2:command code}}"
-    },
-    "DeclareTOCEntryStyle{}[]{}": {
-      "snippet": "DeclareTOCEntryStyle{${1:style}}[${2:initial code}]{${3:command code}}"
-    },
-    "CloneTOCEntryStyle{}{}": {
-      "snippet": "CloneTOCEntryStyle{${1:style}}{${2:new style}}"
-    },
-    "DeclareTOCStyleEntry{}{}": {
-      "snippet": "DeclareTOCStyleEntry{${1:style}}{${2:entry level}}"
-    },
-    "DeclareTOCStyleEntry[]{}{}": {
-      "snippet": "DeclareTOCStyleEntry[${3:option list}]{${1:style}}{${2:entry level}}"
-    },
-    "DeclareTOCStyleEntries{}{}": {
-      "snippet": "DeclareTOCStyleEntries{${1:style}}{${2:entry level}}"
-    },
-    "DeclareTOCStyleEntries[]{}{}": {
-      "snippet": "DeclareTOCStyleEntries[${3:option list}]{${1:style}}{${2:entry level}}"
-    },
-    "LastTOCLevelWasHigher": {},
-    "LastTOCLevelWasSame": {},
-    "LastTOCLevelWasLower": {},
-    "TOCLineLeaderFill": {},
-    "TOCLineLeaderFill[]": {
-      "snippet": "TOCLineLeaderFill[${1:leader}]"
-    },
-    "MakeMarkcase{}": {
-      "snippet": "MakeMarkcase{${1:text}}"
-    },
-    "parttocdepth": {},
-    "sectiontocdepth": {},
-    "subsectiontocdepth": {},
-    "subsubsectiontocdepth": {},
-    "paragraphtocdepth": {},
-    "subparagraphtocdepth": {},
-    "ifattoclist": {},
-    "iftocfeature": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "atbegin=${1:commands}",
-      "atend=${1:commands}",
-      "category=${1:string}",
-      "counterwithin=${1:counter}",
-      "float",
-      "floatpos=${1:float positions}",
-      "floattype=${1:number}",
-      "forcenames",
-      "hang=",
-      "indent=",
-      "level=${1:number}",
-      "listname=${1:title}",
-      "name=${1:entry name}",
-      "nonfloat",
-      "owner=${1:string}",
-      "setup={${1:list of attributes}}",
-      "tocentrystyle=${1:TOC-entry style}",
-      "tocentryafterpar=${1:code}",
-      "tocentrybeforeskip=",
-      "tocentrybreakafternumber=",
-      "tocentrydynindent=",
-      "tocentrydynnumwidth=",
-      "tocentryentryformat=${1:command}",
-      "tocentryentrynumberformat=${1:command}",
-      "tocentryindent=",
-      "tocentrylevel=${1:integer}",
-      "tocentryindentfollows={${1:list of levels}}",
-      "tocentrylinefill=${1:code}",
-      "tocentrynumsep=",
-      "tocentrynumwidth=",
-      "tocentryonendentry=${1:code}",
-      "tocentryonendlastentry=${1:code}",
-      "tocentryonstartentry=${1:code}",
-      "tocentryonstartfirstentry=${1:code}",
-      "tocentryonstarthigherlevel=${1:code}",
-      "tocentryonstartlowerlevel=${1:code}",
-      "tocentryonstartsamelevel=${1:code}",
-      "tocentrypagenumberbox=${1:command}",
-      "tocentrypagenumberformat=${1:command}",
-      "tocentrypagenumberwidth=",
-      "tocentryprepagenumber=${1:code}",
-      "tocentryraggedentrytext=",
-      "tocentryraggedpagenumber=",
-      "tocentryraggedright=",
-      "tocentryrightindent=",
-      "type=${1:entry type}",
-      "types=${1:string}",
-      "unset={${1:list of attributes}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/todo.json b/dev/packages/todo.json
deleted file mode 100644
index 13b819bf6..000000000
--- a/dev/packages/todo.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "includes": {
-    "amssymb": []
-  },
-  "macros": {
-    "todo{}": {
-      "snippet": "todo{${1:text}}"
-    },
-    "todo[]{}": {
-      "snippet": "todo[${2:mark text}]{${1:text}}"
-    },
-    "todo*{}": {
-      "snippet": "todo*{${1:text}}"
-    },
-    "todo*[]{}": {
-      "snippet": "todo*[${2:mark text}]{${1:text}}"
-    },
-    "Todo{}": {
-      "snippet": "Todo{${1:text}}"
-    },
-    "Todo[]{}": {
-      "snippet": "Todo[${2:mark text}]{${1:text}}"
-    },
-    "Todo*{}": {
-      "snippet": "Todo*{${1:text}}"
-    },
-    "Todo*[]{}": {
-      "snippet": "Todo*[${2:mark text}]{${1:text}}"
-    },
-    "todoformat": {},
-    "todomark": {},
-    "done": {},
-    "done[]": {
-      "snippet": "done[${1:done text}]"
-    },
-    "todoopen": {},
-    "todoclose": {},
-    "astodos{}": {
-      "snippet": "astodos{${1:mark text}}"
-    },
-    "todoenvformat": {},
-    "todos": {},
-    "todoname": {},
-    "thetodo": {},
-    "doneitem{}{}": {
-      "snippet": "doneitem{${1:arg1}}{${2:arg2}}"
-    },
-    "todoitem{}{}": {
-      "snippet": "todoitem{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {
-    "todoenv": {}
-  },
-  "options": [
-    "nothing",
-    "hide",
-    "superscript",
-    "marginpar"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/todonotes.json b/dev/packages/todonotes.json
deleted file mode 100644
index 398bc16ad..000000000
--- a/dev/packages/todonotes.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "xkeyval": [],
-    "xcolor": [],
-    "tikz": [],
-    "tikzlibrarypositioning": [],
-    "calc": [],
-    "tikzlibraryshadows": [
-      "loadshadowlibrary"
-    ]
-  },
-  "macros": {
-    "todo{}": {
-      "snippet": "todo{${1:text}}"
-    },
-    "todo[]{}": {
-      "snippet": "todo[${2:options}]{${1:text}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "setuptodonotes{}": {
-      "snippet": "setuptodonotes{${1:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "todostyle{}{}": {
-      "snippet": "todostyle{${1:name}}{${2:options}}",
-      "keyvalindex": 1,
-      "keyvalpos": 1
-    },
-    "missingfigure{}": {
-      "snippet": "missingfigure{${1:text}}"
-    },
-    "missingfigure[]{}": {
-      "snippet": "missingfigure[${2:options}]{${1:text}}",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "listoftodos": {},
-    "listoftodos[]": {
-      "snippet": "listoftodos[${1:name}]"
-    },
-    "todototoc": {},
-    "todoformat{}": {
-      "snippet": "todoformat{${1:arg}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "disable",
-    "obeyDraft",
-    "obeyFinal",
-    "danish",
-    "german",
-    "ngerman",
-    "english",
-    "french",
-    "swedish",
-    "spanish",
-    "catalan",
-    "italian",
-    "portuguese",
-    "dutch",
-    "croatian",
-    "colorinlistoftodos",
-    "color=",
-    "backgroundcolor=",
-    "linecolor=",
-    "bordercolor=",
-    "tickmarkheight=",
-    "textwidth=",
-    "textsize=${1:fontsize csname}",
-    "format=${1:csname}",
-    "prependcaption={${1:text}}",
-    "loadshadowlibrary",
-    "shadow",
-    "dvistyle",
-    "figwidth="
-  ],
-  "keyvals": [
-    [
-      "disable",
-      "color=",
-      "backgroundcolor=",
-      "textcolor=",
-      "linecolor=",
-      "bordercolor=",
-      "shadow",
-      "noshadow",
-      "tickmarkheight=",
-      "format=${1:csname}",
-      "line",
-      "noline",
-      "inline",
-      "noinline",
-      "size=${1:fontsize command}",
-      "list",
-      "nolist",
-      "caption={${1:text}}",
-      "prepend",
-      "noprepend",
-      "fancyline",
-      "author=${1:author}",
-      "inlinewidth=",
-      "inlinepar",
-      "noinlinepar",
-      "%todonotesstyle"
-    ],
-    [
-      "disable",
-      "color=",
-      "backgroundcolor=",
-      "textcolor=",
-      "linecolor=",
-      "bordercolor=",
-      "shadow",
-      "noshadow",
-      "tickmarkheight=",
-      "format=${1:csname}",
-      "line",
-      "noline",
-      "inline",
-      "noinline",
-      "size=${1:fontsize command}",
-      "list",
-      "nolist",
-      "caption={${1:text}}",
-      "prepend",
-      "noprepend",
-      "fancyline",
-      "author=${1:author}",
-      "inlinewidth=",
-      "inlinepar",
-      "noinlinepar",
-      "figwidth=",
-      "figheight=",
-      "figcolor=",
-      "%todonotesstyle"
-    ],
-    [
-      "figwidth=",
-      "figheight=",
-      "figcolor=",
-      "%todonotesstyle"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/tokcycle.json b/dev/packages/tokcycle.json
index 734d6dfc1..12857490d 100644
--- a/dev/packages/tokcycle.json
+++ b/dev/packages/tokcycle.json
@@ -62,7 +62,7 @@
       "snippet": "groupedcytoks{${1:code}}"
     },
     "stripimplicitgroupingcase{}": {
-      "snippet": "stripimplicitgroupingcase{${1:0,${2: 1}, or -1}}"
+      "snippet": "stripimplicitgroupingcase{${1:0, 1, or -1}}"
     },
     "tcpeek{}": {
       "snippet": "tcpeek{${1:cmd}}"
diff --git a/dev/packages/tone.json b/dev/packages/tone.json
deleted file mode 100644
index c75a6bbe7..000000000
--- a/dev/packages/tone.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "includes": {
-    "tipa": []
-  },
-  "macros": {
-    "tone{}": {
-      "snippet": "tone{${1:arg}}"
-    },
-    "rtone{}": {
-      "snippet": "rtone{${1:arg}}"
-    },
-    "stone{}": {
-      "snippet": "stone{${1:arg}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/toolbox.json b/dev/packages/toolbox.json
deleted file mode 100644
index 4f88eb448..000000000
--- a/dev/packages/toolbox.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "toolboxMakeDef{}{}": {
-      "snippet": "toolboxMakeDef{${1:name}}{${2:replacement}}"
-    },
-    "toolboxMakeDef[]{}{}": {
-      "snippet": "toolboxMakeDef[${3:prefix}]{${1:name}}{${2:replacement}}"
-    },
-    "toolboxFreeDef{}": {
-      "snippet": "toolboxFreeDef{${1:name}}"
-    },
-    "toolboxFreeDef[]{}": {
-      "snippet": "toolboxFreeDef[${2:prefix}]{${1:name}}"
-    },
-    "toolboxFreeDef*{}": {
-      "snippet": "toolboxFreeDef*{${1:name}}"
-    },
-    "toolboxFreeDef*[]{}": {
-      "snippet": "toolboxFreeDef*[${2:prefix}]{${1:name}}"
-    },
-    "toolboxFuturelet{}": {
-      "snippet": "toolboxFuturelet{${1:cmd}}"
-    },
-    "toolboxGobbleNext{}": {
-      "snippet": "toolboxGobbleNext{${1:cmd}}"
-    },
-    "toolboxIfNextToken{}{}{}": {
-      "snippet": "toolboxIfNextToken{${1:token}}{${2:if}}{${3:else}}"
-    },
-    "toolboxToken": {},
-    "toolboxIfNextGobbling{}{}{}": {
-      "snippet": "toolboxIfNextGobbling{${1:token}}{${2:if}}{${3:else}}"
-    },
-    "toolboxIfEmpty{}{}{}": {
-      "snippet": "toolboxIfEmpty{${1:arg}}{${2:if}}{${3:else}}"
-    },
-    "toolboxIfX{}{}{}{}": {
-      "snippet": "toolboxIfX{${1:arg1}}{${2:arg2}}{${3:if}}{${4:else}}"
-    },
-    "toolboxIfElse{}{}{}": {
-      "snippet": "toolboxIfElse{${1:ifcmd}}{${2:if}}{${3:else}}"
-    },
-    "toolboxLoop{}{}": {
-      "snippet": "toolboxLoop{${1:items}}{${2:action}}"
-    },
-    "toolboxLoopName{}{}{}": {
-      "snippet": "toolboxLoopName{${1:name}}{${2:items}}{${3:action}}"
-    },
-    "toolboxTokenLoop{}{}": {
-      "snippet": "toolboxTokenLoop{${1:tokens}}{${2:action}}"
-    },
-    "toolboxTokenLoopName{}{}{}": {
-      "snippet": "toolboxTokenLoopName{${1:name}}{${2:tokens}}{${3:action}}"
-    },
-    "toolboxDef{}": {
-      "snippet": "toolboxDef{${1:cmd}}"
-    },
-    "toolboxSpace": {},
-    "toolboxAppend{}": {
-      "snippet": "toolboxAppend{${1:cmd}}"
-    },
-    "toolboxTokDef{}{}": {
-      "snippet": "toolboxTokDef{${1:argumentlist}}{${2:cmd}}"
-    },
-    "toolboxSplitAt{}{}{}{}": {
-      "snippet": "toolboxSplitAt{${1:argument}}{${2:search}}{${3:\\beforestring}}{${4:\\afterstring}}"
-    },
-    "toolboxSplitAt*{}{}{}{}": {
-      "snippet": "toolboxSplitAt*{${1:argument}}{${2:search}}{${3:\\beforestring}}{${4:\\afterstring}}"
-    },
-    "toolboxMakeSplit{}{}": {
-      "snippet": "toolboxMakeSplit{${1:search}}{${2:cmd}}"
-    },
-    "toolboxMakeSplit*{}{}": {
-      "snippet": "toolboxMakeSplit*{${1:search}}{${2:cmd}}"
-    },
-    "toolboxFreeSplit{}": {
-      "snippet": "toolboxFreeSplit{${1:cmd}}"
-    },
-    "toolboxMakeHarmless{}": {
-      "snippet": "toolboxMakeHarmless{${1:cmd}}"
-    },
-    "toolboxDropBrace{}": {
-      "snippet": "toolboxDropBrace{${1:cmd}}"
-    },
-    "toolboxIf{}{}{}": {
-      "snippet": "toolboxIf{${1:comparison}}{${2:def cmds}}{${3:cmd}}"
-    },
-    "toolboxNewiftrue{}": {
-      "snippet": "toolboxNewiftrue{${1:name}}"
-    },
-    "toolboxNewiffalse{}": {
-      "snippet": "toolboxNewiffalse{${1:name}}"
-    },
-    "toolboxNewifTrue{}": {
-      "snippet": "toolboxNewifTrue{${1:name}}"
-    },
-    "toolboxNewifFalse{}": {
-      "snippet": "toolboxNewifFalse{${1:name}}"
-    },
-    "toolboxLet{}": {
-      "snippet": "toolboxLet{${1:cmd}}"
-    },
-    "toolboxEmpty": {},
-    "toolboxSpaceToken": {},
-    "toolboxFirstOfTwo{}{}": {
-      "snippet": "toolboxFirstOfTwo{${1:arg1}}{${2:arg2}}"
-    },
-    "toolboxSecondOfTwo{}{}": {
-      "snippet": "toolboxSecondOfTwo{${1:arg1}}{${2:arg2}}"
-    },
-    "toolboxGobbleArg{}": {
-      "snippet": "toolboxGobbleArg{${1:arg}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/toptesi.json b/dev/packages/toptesi.json
deleted file mode 100644
index e410fb8d7..000000000
--- a/dev/packages/toptesi.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
-  "includes": {
-    "xkeyval": [],
-    "scrextend": [],
-    "iftex": [],
-    "xspace": [],
-    "topfront": [],
-    "graphicx": [],
-    "etoolbox": [],
-    "topcoman": [],
-    "frontespizio": [
-      "tipotesi=frontespizio"
-    ],
-    "toptesi-scudo": [
-      "tipotesi=scudo"
-    ],
-    "toptesi-sss": [
-      "tipotesi=secondaria",
-      "tipotesi=sss"
-    ]
-  },
-  "macros": {
-    "CandidateNames{}": {
-      "snippet": "CandidateNames{${1:candidate list headings}}",
-      "option": "tipotesi=magistrale"
-    },
-    "corsodistudi{}": {
-      "snippet": "corsodistudi{${1:degree proper name}}",
-      "option": "tipotesi=monografia"
-    },
-    "giorno{}": {
-      "snippet": "giorno{${1:date}}",
-      "option": "tipotesi=monografia"
-    },
-    "luogo{}": {
-      "snippet": "luogo{${1:location}}",
-      "option": "tipotesi=monografia"
-    },
-    "NomeAteneo{}": {
-      "snippet": "NomeAteneo{${1:university proper name}}",
-      "option": "tipotesi=monografia"
-    },
-    "NomeCorsoDiStudi": {
-      "option": "tipotesi=monografia"
-    },
-    "NomeElaborato{}": {
-      "snippet": "NomeElaborato{${1:thesis name}}",
-      "option": "tipotesi=monografia"
-    },
-    "NomeRelatore{}{}": {
-      "snippet": "NomeRelatore{${1:singular}}{${2:plural}}",
-      "option": "tipotesi=monografia"
-    },
-    "StrutturaDi{}": {
-      "snippet": "StrutturaDi{${1:name}}",
-      "option": "tipotesi=monografia"
-    },
-    "TitoloListaCandidati{}": {
-      "snippet": "TitoloListaCandidati{${1:candidate list headings}}",
-      "option": "tipotesi=magistrale"
-    },
-    "backmatter": {},
-    "captionof{}{}": {
-      "snippet": "captionof{${1:float type}}{${2:text}}"
-    },
-    "english": {},
-    "ExtendCaptions{}{}{}": {
-      "snippet": "ExtendCaptions{${1:language}}{${2:summary title}}{${3:acknowledgements title}}"
-    },
-    "figurespagetrue": {},
-    "frontmatter": {},
-    "goodpagebreak": {},
-    "goodpagebreak[]": {
-      "snippet": "goodpagebreak[${1:n}]"
-    },
-    "indici": {},
-    "indici[]": {
-      "snippet": "indici[${1:pagestyle}]"
-    },
-    "inglese": {},
-    "italiano": {},
-    "mainmatter": {},
-    "nota[]{}": {
-      "snippet": "nota[${2:mark}]{${1:text}}"
-    },
-    "nota{}": {
-      "snippet": "nota{${1:text}}"
-    },
-    "NoteWhiteLine": {},
-    "paginavuota": {},
-    "ringraziamenti": {},
-    "setbindingcorrection{}": {
-      "snippet": "setbindingcorrection{${1:length}}"
-    },
-    "sommario": {},
-    "tablespagetrue": {},
-    "tomo": {},
-    "captionSD*[]{}": {
-      "snippet": "captionSD*[${2:short text}]{${1:text}}"
-    },
-    "captionSD*{}": {
-      "snippet": "captionSD*{${1:text}}"
-    },
-    "captionSD[]{}": {
-      "snippet": "captionSD[${2:short text}]{${1:text}}"
-    },
-    "captionSD{}": {
-      "snippet": "captionSD{${1:text}}"
-    },
-    "SDcaption[]{}{}": {
-      "snippet": "SDcaption[${3:short text}]{${1:text}}{${2:label}}"
-    },
-    "SDcaption{}{}": {
-      "snippet": "SDcaption{${1:text}}{${2:label}}"
-    },
-    "SDimage{}": {
-      "snippet": "SDimage{${1:image commands}}"
-    },
-    "acknowledgements": {},
-    "acknowledgename": {},
-    "allcontents": {},
-    "allcontents[]": {
-      "snippet": "allcontents[${1:pagestyle}]"
-    },
-    "blankpagestyle{}": {
-      "snippet": "blankpagestyle{${1:pagestyle}}"
-    },
-    "captionsetup{}": {
-      "snippet": "captionsetup{${1:options}}"
-    },
-    "captionwidth": {},
-    "chapterbibliographyfalse": {},
-    "chapterbibliographytrue": {},
-    "customfalse": {},
-    "emptypage": {},
-    "figurespagefalse": {},
-    "frontmatterfalse": {},
-    "frontmattertrue": {},
-    "fullwidth": {},
-    "headWarn{}": {
-      "snippet": "headWarn{${1:text}}"
-    },
-    "ifchapterbibliography": {},
-    "ifcustom": {},
-    "ifempty{}": {
-      "snippet": "ifempty{${1:arg}}"
-    },
-    "iffigurespage": {},
-    "iffrontmatter": {},
-    "iflibro": {},
-    "ifNumberFloat": {},
-    "ifnumeriromani": {},
-    "iftablespage": {},
-    "iftoc": {},
-    "ifTOPfolioinhead": {},
-    "ifTOPnocenterfolio": {},
-    "ifTOPnocenterhead": {},
-    "ifTOPnumerazioneromana": {},
-    "interno": {},
-    "lapagina": {},
-    "librofalse": {},
-    "librotrue": {},
-    "NoValidTipo{}": {
-      "snippet": "NoValidTipo{${1:option}}"
-    },
-    "NumberFloatfalse": {},
-    "NumberFloattrue": {},
-    "numeriromanifalse": {},
-    "numeriromanitrue": {},
-    "originalcaption[]{}": {
-      "snippet": "originalcaption[${2:short text}]{${1:text}}"
-    },
-    "originalcaption{}": {
-      "snippet": "originalcaption{${1:text}}"
-    },
-    "phantomsection": {},
-    "saveaddvspace": {},
-    "SDcapbox": {},
-    "SDcaptionwidth": {},
-    "SDfigbox": {},
-    "SDfigurewidth": {},
-    "SDlinewidth": {},
-    "SDtabular{}": {
-      "snippet": "SDtabular{${1:image commands}}"
-    },
-    "summary": {},
-    "summaryname": {},
-    "tablespagefalse": {},
-    "theNumberSD": {},
-    "tocfalse": {},
-    "toctrue": {},
-    "TOPfolioinheadfalse": {},
-    "TOPfolioinheadtrue": {},
-    "TOPnocenterfoliofalse": {},
-    "TOPnocenterfoliotrue": {},
-    "TOPnocenterheadfalse": {},
-    "TOPnocenterheadtrue": {},
-    "TOPnumerazioneromanafalse": {},
-    "TOPnumerazioneromanatrue": {},
-    "TOPsecnumdepth": {},
-    "TROF": {},
-    "TROFF": {},
-    "TRON": {}
-  },
-  "envs": {
-    "ThesisTitlePage": {
-      "option": "tipotesi=dottorale"
-    },
-    "ThesisTitlePage*": {
-      "name": "ThesisTitlePage",
-      "snippet": "*",
-      "option": "tipotesi=dottorale"
-    },
-    "citazioni": {},
-    "dedica": {},
-    "dedication": {},
-    "interlinea{}": {
-      "name": "interlinea",
-      "snippet": "{${1:factor}}"
-    },
-    "pdfxmetadata": {},
-    "wittysentences": {},
-    "SDbox{}": {
-      "name": "SDbox",
-      "snippet": "{${1:float type}}"
-    },
-    "SDbox{}*": {
-      "name": "SDbox",
-      "snippet": "{${1:float type}}*"
-    },
-    "SDbox{}[]": {
-      "name": "SDbox",
-      "snippet": "{${1:float type}}[${2:width factor}]"
-    },
-    "SDbox{}*[]": {
-      "name": "SDbox",
-      "snippet": "{${1:float type}}*[${2:width factor}]"
-    }
-  },
-  "options": [
-    "cucitura=",
-    "corpo=",
-    "chapterbib",
-    "evenboxes",
-    "libro",
-    "stile=",
-    "autoretitolo",
-    "oldstyle",
-    "nocenterfolio",
-    "nocenterhead",
-    "folioinhead",
-    "numerazioneromana",
-    "tipotesi="
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/totpages.json b/dev/packages/totpages.json
deleted file mode 100644
index 7fa6261af..000000000
--- a/dev/packages/totpages.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "includes": {
-    "everyshi": [],
-    "keyval": []
-  },
-  "macros": {
-    "theTotPages": {},
-    "TotPerSheet": {},
-    "TotSheets": {},
-    "ifTotPagesToDvi": {},
-    "TotPagesToDvitrue": {},
-    "TotPagesToDvifalse": {},
-    "ifPagesPerSheet": {},
-    "PagesPerSheettrue": {},
-    "PagesPerSheetfalse": {}
-  },
-  "envs": {},
-  "options": [
-    "dvi",
-    "nodvi",
-    "pagespersheet=${1:integer}",
-    "nopagespersheet"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/trace.json b/dev/packages/trace.json
deleted file mode 100644
index 90fa86830..000000000
--- a/dev/packages/trace.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "traceon": {},
-    "traceoff": {}
-  },
-  "envs": {},
-  "options": [
-    "logonly",
-    "full"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/translations.json b/dev/packages/translations.json
deleted file mode 100644
index d196b30f8..000000000
--- a/dev/packages/translations.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "pdftexcmds": []
-  },
-  "macros": {
-    "DeclareLanguage{}": {
-      "snippet": "DeclareLanguage{${1:lang}}"
-    },
-    "DeclareLanguageAlias{}{}": {
-      "snippet": "DeclareLanguageAlias{${1:lang2}}{${2:lang1}}"
-    },
-    "DeclareLanguageDialect{}{}": {
-      "snippet": "DeclareLanguageDialect{${1:dialect}}{${2:lang}}"
-    },
-    "NewTranslation{}{}{}": {
-      "snippet": "NewTranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "NewTranslationFallback{}{}": {
-      "snippet": "NewTranslationFallback{${1:key}}{${2:translation}}"
-    },
-    "RenewTranslation{}{}{}": {
-      "snippet": "RenewTranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "RenewTranslationFallback{}{}": {
-      "snippet": "RenewTranslationFallback{${1:key}}{${2:translation}}"
-    },
-    "ProvideTranslation{}{}{}": {
-      "snippet": "ProvideTranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "ProvideTranslationFallback{}{}": {
-      "snippet": "ProvideTranslationFallback{${1:key}}{${2:translation}}"
-    },
-    "DeclareTranslation{}{}{}": {
-      "snippet": "DeclareTranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "DeclareTranslationFallback{}{}": {
-      "snippet": "DeclareTranslationFallback{${1:key}}{${2:fallback}}"
-    },
-    "definetranslation{}{}{}": {
-      "snippet": "definetranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "definetranslationfallback{}{}": {
-      "snippet": "definetranslationfallback{${1:key}}{${2:translation}}"
-    },
-    "redefinetranslation{}{}{}": {
-      "snippet": "redefinetranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "redefinetranslationfallback{}{}": {
-      "snippet": "redefinetranslationfallback{${1:key}}{${2:translation}}"
-    },
-    "addtranslation{}{}{}": {
-      "snippet": "addtranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "addtranslationfallback{}{}": {
-      "snippet": "addtranslationfallback{${1:key}}{${2:translation}}"
-    },
-    "declaretranslation{}{}{}": {
-      "snippet": "declaretranslation{${1:lang}}{${2:key}}{${3:translation}}"
-    },
-    "declaretranslationfallback{}{}": {
-      "snippet": "declaretranslationfallback{${1:key}}{${2:translation}}"
-    },
-    "IfTranslation{}{}{}{}": {
-      "snippet": "IfTranslation{${1:lang}}{${2:key}}{${3:true}}{${4:false}}"
-    },
-    "GetTranslationFor{}{}": {
-      "snippet": "GetTranslationFor{${1:lang}}{${2:key}}"
-    },
-    "GetTranslation{}": {
-      "snippet": "GetTranslation{${1:key}}"
-    },
-    "GetLCTranslationFor{}{}": {
-      "snippet": "GetLCTranslationFor{${1:lang}}{${2:key}}"
-    },
-    "GetLCTranslation{}": {
-      "snippet": "GetLCTranslation{${1:key}}"
-    },
-    "GetTranslationForWarn{}{}": {
-      "snippet": "GetTranslationForWarn{${1:lang}}{${2:key}}"
-    },
-    "GetTranslationWarn{}": {
-      "snippet": "GetTranslationWarn{${1:key}}"
-    },
-    "GetLCTranslationForWarn{}{}": {
-      "snippet": "GetLCTranslationForWarn{${1:lang}}{${2:key}}"
-    },
-    "GetLCTranslationWarn{}": {
-      "snippet": "GetLCTranslationWarn{${1:key}}"
-    },
-    "SaveTranslationFor{}{}{}": {
-      "snippet": "SaveTranslationFor{${1:cmd}}{${2:lang}}{${3:key}}"
-    },
-    "SaveTranslation{}{}": {
-      "snippet": "SaveTranslation{${1:cmd}}{${2:key}}"
-    },
-    "LoadDictionary{}": {
-      "snippet": "LoadDictionary{${1:name}}"
-    },
-    "LoadDictionaryFor{}{}": {
-      "snippet": "LoadDictionaryFor{${1:lang}}{${2:name}}"
-    },
-    "LoadDictionaryForDialect{}{}": {
-      "snippet": "LoadDictionaryForDialect{${1:lang}}{${2:name}}"
-    },
-    "NewDictTranslation{}{}": {
-      "snippet": "NewDictTranslation{${1:key}}{${2:translation}}"
-    },
-    "RenewDictTranslation{}{}": {
-      "snippet": "RenewDictTranslation{${1:key}}{${2:translation}}"
-    },
-    "ProvideDictTranslation{}{}": {
-      "snippet": "ProvideDictTranslation{${1:key}}{${2:translation}}"
-    },
-    "DeclareDictTranslation{}{}": {
-      "snippet": "DeclareDictTranslation{${1:key}}{${2:translation}}"
-    },
-    "ProvideDictionaryFor{}{}[]": {
-      "snippet": "ProvideDictionaryFor{${1:lang}}{${2:name}}[${3:date}]"
-    },
-    "PrintDictionaryFor{}{}{}{}{}": {
-      "snippet": "PrintDictionaryFor{${1:lang}}{${2:name}}{${3:pre}}{${4:mid}}{${5:post}}"
-    },
-    "baselanguage{}": {
-      "snippet": "baselanguage{${1:lang}}"
-    },
-    "ifcurrentlanguage{}{}{}": {
-      "snippet": "ifcurrentlanguage{${1:lang}}{${2:true}}{${3:false}}"
-    },
-    "ifcurrentlang{}": {
-      "snippet": "ifcurrentlang{${1:lang}}"
-    },
-    "ifcurrentbaselanguage{}{}{}": {
-      "snippet": "ifcurrentbaselanguage{${1:lang}}{${2:true}}{${3:false}}"
-    },
-    "ifcurrentbaselang{}": {
-      "snippet": "ifcurrentbaselang{${1:lang}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/translator.json b/dev/packages/translator.json
deleted file mode 100644
index 2b871d622..000000000
--- a/dev/packages/translator.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "includes": {
-    "keyval": []
-  },
-  "macros": {
-    "newtranslation{}{}": {
-      "snippet": "newtranslation{${1:key}}{${2:translation}}"
-    },
-    "newtranslation[]{}{}": {
-      "snippet": "newtranslation[${3:options}]{${1:key}}{${2:translation}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "renewtranslation{}{}": {
-      "snippet": "renewtranslation{${1:key}}{${2:translation}}"
-    },
-    "renewtranslation[]{}{}": {
-      "snippet": "renewtranslation[${3:options}]{${1:key}}{${2:translation}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "providetranslation{}{}": {
-      "snippet": "providetranslation{${1:key}}{${2:translation}}"
-    },
-    "providetranslation[]{}{}": {
-      "snippet": "providetranslation[${3:options}]{${1:key}}{${2:translation}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "deftranslation{}{}": {
-      "snippet": "deftranslation{${1:key}}{${2:translation}}"
-    },
-    "deftranslation[]{}{}": {
-      "snippet": "deftranslation[${3:options}]{${1:key}}{${2:translation}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "ProvidesDictionary{}{}": {
-      "snippet": "ProvidesDictionary{${1:kind}}{${2:language}}"
-    },
-    "ProvidesDictionary{}{}[]": {
-      "snippet": "ProvidesDictionary{${1:kind}}{${2:language}}[${3:version}]"
-    },
-    "usedictionary{}": {
-      "snippet": "usedictionary{${1:kind}}"
-    },
-    "uselanguage{}": {
-      "snippet": "uselanguage{${1:lang1,${2:lang2},...}}"
-    },
-    "translate{}": {
-      "snippet": "translate{${1:key}}"
-    },
-    "translate[]{}": {
-      "snippet": "translate[${2:options}]{${1:key}}"
-    },
-    "translatelet{}{}": {
-      "snippet": "translatelet{${1:macro}}{${2:key}}"
-    },
-    "translatelet[]{}{}": {
-      "snippet": "translatelet[${3:options}]{${1:macro}}{${2:key}}"
-    },
-    "languagepath{}": {
-      "snippet": "languagepath{${1:path}}"
-    },
-    "languagealias{}{}": {
-      "snippet": "languagealias{${1:name}}{${2:language list}}"
-    },
-    "languagename": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "to=${1:language}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/trees.json b/dev/packages/trees.json
deleted file mode 100644
index 05a48d4c3..000000000
--- a/dev/packages/trees.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "branchlabels{}{}{}": {
-      "snippet": "branchlabels{${1:label1}}{${2:label2}}{${3:label3}}"
-    },
-    "branchwidth": {},
-    "coordstep": {},
-    "xcoord": {},
-    "ycoord": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/trig.json b/dev/packages/trig.json
deleted file mode 100644
index 5620e18c4..000000000
--- a/dev/packages/trig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "CalculateSin{}": {
-      "snippet": "CalculateSin{${1:angle}}"
-    },
-    "CalculateCos{}": {
-      "snippet": "CalculateCos{${1:angle}}"
-    },
-    "UseSin{}": {
-      "snippet": "UseSin{${1:angle}}"
-    },
-    "UseCos{}": {
-      "snippet": "UseCos{${1:angle}}"
-    },
-    "CalculateTan{}": {
-      "snippet": "CalculateTan{${1:angle}}"
-    },
-    "UseTan{}": {
-      "snippet": "UseTan{${1:angle}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/truncate.json b/dev/packages/truncate.json
deleted file mode 100644
index 3212f5bce..000000000
--- a/dev/packages/truncate.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "truncate{}{}": {
-      "snippet": "truncate{${1:width}}{${2:text}}"
-    },
-    "truncate[]{}{}": {
-      "snippet": "truncate[${3:marker}]{${1:width}}{${2:text}}"
-    },
-    "TruncateMarker": {}
-  },
-  "envs": {},
-  "options": [
-    "breakwords",
-    "breakall",
-    "hyphenate",
-    "fit"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/truthtable.json b/dev/packages/truthtable.json
deleted file mode 100644
index 5a15ed6b8..000000000
--- a/dev/packages/truthtable.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "includes": {
-    "luacode": []
-  },
-  "macros": {
-    "truthtable{}{}{}{}{}{}": {
-      "snippet": "truthtable{${1:vars}}{${2:dvars}}{${3:statements}}{${4:dstatements}}{${5:true val}}{${6:false val}}"
-    },
-    "truthtableasc{}{}{}{}{}{}": {
-      "snippet": "truthtableasc{${1:vars}}{${2:dvars}}{${3:statements}}{${4:dstatements}}{${5:true val}}{${6:false val}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/tsvtemplate.json b/dev/packages/tsvtemplate.json
index 151ae3318..52b8ee3a5 100644
--- a/dev/packages/tsvtemplate.json
+++ b/dev/packages/tsvtemplate.json
@@ -8,7 +8,7 @@
       "snippet": "tsvtemplate{${1:template}}{${2:file}}"
     },
     "tsvtemplate[]{}{}": {
-      "snippet": "tsvtemplate[${3:colname1,${4:colname2},...}]{${1:template}}{${2:file}}"
+      "snippet": "tsvtemplate[${3:colname1,colname2,...}]{${1:template}}{${2:file}}"
     },
     "applytemplate{}{}{}{}": {
       "snippet": "applytemplate{${1:separator}}{${2:colnames}}{${3:template}}{${4:file}}"
@@ -22,7 +22,7 @@
     },
     "tsv template[]{}": {
       "name": "tsv template",
-      "snippet": "[${2:colname1,${3:colname2},...}]{${1:file}}"
+      "snippet": "[${2:colname1,colname2,...}]{${1:file}}"
     }
   },
   "options": [],
diff --git a/dev/packages/twemojis.json b/dev/packages/twemojis.json
deleted file mode 100644
index 4760f8c5c..000000000
--- a/dev/packages/twemojis.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "ifthen": []
-  },
-  "macros": {
-    "twemoji{}": {
-      "snippet": "twemoji{${1:emoji name}}"
-    },
-    "twemoji[]{}": {
-      "snippet": "twemoji[${2:options}]{${1:emoji name}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "texttwemoji{}": {
-      "snippet": "texttwemoji{${1:emoji name}}"
-    },
-    "twemojiDefaultHeight": {},
-    "defineTwemoji{}{}": {
-      "snippet": "defineTwemoji{${1:number}}{${2:name}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "alt={${1:alt text}}",
-      "bb=${1:llx lly urx ury}",
-      "bbllx=",
-      "bblly=",
-      "bburx=",
-      "bbury=",
-      "natwidth=",
-      "natheight=",
-      "hiresbb",
-      "pagebox=",
-      "viewport=${1:llx lly urx ury}",
-      "trim=${1:llx lly urx ury}",
-      "angle=${1:degrees}",
-      "origin=",
-      "width=",
-      "height=",
-      "totalheight=",
-      "keepaspectratio",
-      "scale=${1:factor}",
-      "clip",
-      "draft",
-      "type=${1:file type}",
-      "ext=${1:file extension}",
-      "read=${1:read-file extension}",
-      "command=",
-      "quiet",
-      "page=${1:page number}",
-      "interpolate",
-      "decodearray={${1:color array}}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/typog.json b/dev/packages/typog.json
index f445572c3..f267a2aad 100644
--- a/dev/packages/typog.json
+++ b/dev/packages/typog.json
@@ -8,9 +8,6 @@
     "typogget{}": {
       "snippet": "typogget{${1:key}}"
     },
-    "typoggetnth{}{}{}": {
-      "snippet": "typoggetnth{${1:csname}}{${2:key}}{${3:index}}"
-    },
     "fontsizeinfo{}": {
       "snippet": "fontsizeinfo{${1:csname}}"
     },
@@ -91,33 +88,6 @@
     "Singleguillemetright": {},
     "Doubleguillemetleft": {},
     "Doubleguillemetright": {},
-    "uppercaseadjustlabelitems{}": {
-      "snippet": "uppercaseadjustlabelitems{${1:levels-to-adjust}}"
-    },
-    "lowercaseadjustlabelitems{}": {
-      "snippet": "lowercaseadjustlabelitems{${1:levels-to-adjust}}"
-    },
-    "noadjustlabelitems{}": {
-      "snippet": "noadjustlabelitems{${1:levels-to-adjust}}"
-    },
-    "typogadjuststairs{}{}{}": {
-      "snippet": "typogadjuststairs{${1:step-size}}{${2:number-of-steps}}{${3:sample}}"
-    },
-    "typogadjuststairs[]{}{}{}": {
-      "snippet": "typogadjuststairs[${4:scale}]{${1:step-size}}{${2:number-of-steps}}{${3:sample}}"
-    },
-    "typoguppercaseadjustcheck{}": {
-      "snippet": "typoguppercaseadjustcheck{${1:sample}}"
-    },
-    "typoguppercaseadjustcheck[]{}": {
-      "snippet": "typoguppercaseadjustcheck[${2:scale}]{${1:sample}}"
-    },
-    "typoglowercaseadjustcheck{}": {
-      "snippet": "typoglowercaseadjustcheck{${1:sample}}"
-    },
-    "typoglowercaseadjustcheck[]{}": {
-      "snippet": "typoglowercaseadjustcheck[${2:scale}]{${1:sample}}"
-    },
     "widespace": {},
     "widespace*": {},
     "narrowspace": {},
@@ -156,9 +126,6 @@
     "smoothraggedrightleftskip": {},
     "smoothraggedrightparindent": {},
     "smoothraggedrightragwidth": {},
-    "typogadjuststairsfor{}{}{}{}{}": {
-      "snippet": "typogadjuststairsfor{${1:scale-factor}}{${2:step-size}}{${3:number-of-steps}}{${4:sample}}{${5:N}}"
-    },
     "typoglogo": {}
   },
   "envs": {
@@ -310,7 +277,6 @@
     "debug",
     "nodebug",
     "ligaturekern=",
-    "lowercaselabelitemadjustments={${1:dim1,dim2,dim3,dim4}}",
     "mathitalicscorrection=",
     "raise*=",
     "raisecapitaldash=",
@@ -323,8 +289,7 @@
     "stretchlimits={${1:lim1,lim2,lim3}}",
     "slashkern=",
     "textitalicscorrection=",
-    "trackingttspacing=${1:outer-spacing}",
-    "uppercaselabelitemadjustments={${1:dim1,dim2,dim3,dim4}}"
+    "trackingttspacing=${1:outer-spacing}"
   ],
   "keyvals": [
     [
diff --git a/dev/packages/ucs.json b/dev/packages/ucs.json
deleted file mode 100644
index 666c0964a..000000000
--- a/dev/packages/ucs.json
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "includes": {
-    "ucshyper": [
-      "hyperref"
-    ],
-    "graphicx": [
-      "graphics"
-    ]
-  },
-  "macros": {
-    "SetUnicodeOption{}": {
-      "snippet": "SetUnicodeOption{${1:option}}"
-    },
-    "SetUnicodeOption[]{}": {
-      "snippet": "SetUnicodeOption[${2:priority}]{${1:option}}"
-    },
-    "ifUnicodeOptioncombine": {},
-    "UnicodeOptioncombinetrue": {},
-    "UnicodeOptioncombinefalse": {},
-    "ifUnicodeOptiondefault": {},
-    "UnicodeOptiondefaulttrue": {},
-    "UnicodeOptiondefaultfalse": {},
-    "ifUnicodeOptiondocument": {},
-    "UnicodeOptiondocumenttrue": {},
-    "UnicodeOptiondocumentfalse": {},
-    "ifUnicodeOptionfasterrors": {},
-    "UnicodeOptionfasterrorstrue": {},
-    "UnicodeOptionfasterrorsfalse": {},
-    "ifUnicodeOptiongraphics": {},
-    "UnicodeOptiongraphicstrue": {},
-    "UnicodeOptiongraphicsfalse": {},
-    "ifUnicodeOptionsavemem": {},
-    "UnicodeOptionsavememtrue": {},
-    "UnicodeOptionsavememfalse": {},
-    "ifUnicodeOptionwarnunknown": {},
-    "UnicodeOptionwarnunknowntrue": {},
-    "UnicodeOptionwarnunknownfalse": {},
-    "ifUnicodeOptionautogenerated": {},
-    "UnicodeOptionautogeneratedtrue": {},
-    "UnicodeOptionautogeneratedfalse": {},
-    "ifUnicodeOptioncjkgb": {},
-    "UnicodeOptioncjkgbtrue": {},
-    "UnicodeOptioncjkgbfalse": {},
-    "ifUnicodeOptioncjkhangul": {},
-    "UnicodeOptioncjkhangultrue": {},
-    "UnicodeOptioncjkhangulfalse": {},
-    "ifUnicodeOptioncjkjis": {},
-    "UnicodeOptioncjkjistrue": {},
-    "UnicodeOptioncjkjisfalse": {},
-    "ifUnicodeOptionmathletters": {},
-    "UnicodeOptionmathletterstrue": {},
-    "UnicodeOptionmathlettersfalse": {},
-    "ifUnicodeOptionpostscript": {},
-    "UnicodeOptionpostscripttrue": {},
-    "UnicodeOptionpostscriptfalse": {},
-    "ifUnicodeOptionprivatecsur": {},
-    "UnicodeOptionprivatecsurtrue": {},
-    "UnicodeOptionprivatecsurfalse": {},
-    "ifUnicodeOptiontipa": {},
-    "UnicodeOptiontipatrue": {},
-    "UnicodeOptiontipafalse": {},
-    "XDeclareUnicodeOption{}{}{}{}{}": {
-      "snippet": "XDeclareUnicodeOption{${1:package}}{${2:name}}{${3:activate}}{${4:on}}{${5:off}}"
-    },
-    "DeclareUnicodeOption{}": {
-      "snippet": "DeclareUnicodeOption{${1:name}}"
-    },
-    "DeclareUnicodeOption[]{}": {
-      "snippet": "DeclareUnicodeOption[${2:package}]{${1:name}}"
-    },
-    "unicodevirtual{}": {
-      "snippet": "unicodevirtual{${1:code}}"
-    },
-    "unicodecombine": {},
-    "PreloadUnicodePage{}": {
-      "snippet": "PreloadUnicodePage{${1:number}}"
-    },
-    "PrerenderUnicode{}": {
-      "snippet": "PrerenderUnicode{${1:code}}"
-    },
-    "DeclareUnicodeCharacter{}{}": {
-      "snippet": "DeclareUnicodeCharacter{${1:slot}}{${2:macro}}"
-    },
-    "DeclareUnicodeCharacterAsOptional{}{}{}": {
-      "snippet": "DeclareUnicodeCharacterAsOptional{${1:slot}}{${2:option}}{${3:macro}}"
-    },
-    "unichar{}": {
-      "snippet": "unichar{${1:slot}}"
-    },
-    "unicodesuper{}": {
-      "snippet": "unicodesuper{${1:text}}"
-    },
-    "PrintUnicodeName{}": {
-      "snippet": "PrintUnicodeName{${1:number}}"
-    },
-    "UnicodeCharFilter{}": {
-      "snippet": "UnicodeCharFilter{${1:command}}"
-    },
-    "UCSProtectionNone": {},
-    "UCSProtectionIeC": {},
-    "UCSProtectionUnichar": {},
-    "textascii{}": {
-      "snippet": "textascii{${1:text}}"
-    },
-    "textasciiencoding": {},
-    "textpentehkaton": {},
-    "textstigmavariant": {},
-    "textqoppavariant": {},
-    "textsanpi": {},
-    "textdialytikaperispomeni{}": {
-      "snippet": "textdialytikaperispomeni{${1:arg}}"
-    },
-    "textdialytikatonos{}": {
-      "snippet": "textdialytikatonos{${1:arg}}"
-    },
-    "textdialytikaoxia{}": {
-      "snippet": "textdialytikaoxia{${1:arg}}"
-    },
-    "textdialytikavaria{}": {
-      "snippet": "textdialytikavaria{${1:arg}}"
-    },
-    "textoxia{}": {
-      "snippet": "textoxia{${1:arg}}"
-    },
-    "textparenleft": {},
-    "textparenright": {},
-    "textdasia{}": {
-      "snippet": "textdasia{${1:arg}}"
-    },
-    "textpsili{}": {
-      "snippet": "textpsili{${1:arg}}"
-    },
-    "textquestion": {},
-    "textdasiaperispomeni{}": {
-      "snippet": "textdasiaperispomeni{${1:arg}}"
-    },
-    "textdasiavaria{}": {
-      "snippet": "textdasiavaria{${1:arg}}"
-    },
-    "textdasiaoxia{}": {
-      "snippet": "textdasiaoxia{${1:arg}}"
-    },
-    "textpsiliperispomeni{}": {
-      "snippet": "textpsiliperispomeni{${1:arg}}"
-    },
-    "textpsilioxia{}": {
-      "snippet": "textpsilioxia{${1:arg}}"
-    },
-    "textpsilivaria{}": {
-      "snippet": "textpsilivaria{${1:arg}}"
-    },
-    "textsubiota{}": {
-      "snippet": "textsubiota{${1:arg}}"
-    },
-    "textpsiliiota{}": {
-      "snippet": "textpsiliiota{${1:arg}}"
-    },
-    "textdasiaiota{}": {
-      "snippet": "textdasiaiota{${1:arg}}"
-    },
-    "textvariaiota{}": {
-      "snippet": "textvariaiota{${1:arg}}"
-    },
-    "textoxiaiota{}": {
-      "snippet": "textoxiaiota{${1:arg}}"
-    },
-    "textpsilivariaiota{}": {
-      "snippet": "textpsilivariaiota{${1:arg}}"
-    },
-    "textdasiavariaiota{}": {
-      "snippet": "textdasiavariaiota{${1:arg}}"
-    },
-    "textpsilioxiaiota{}": {
-      "snippet": "textpsilioxiaiota{${1:arg}}"
-    },
-    "textdasiaoxiaiota{}": {
-      "snippet": "textdasiaoxiaiota{${1:arg}}"
-    },
-    "textperispomeniiota{}": {
-      "snippet": "textperispomeniiota{${1:arg}}"
-    },
-    "textpsiliperispomeniiota{}": {
-      "snippet": "textpsiliperispomeniiota{${1:arg}}"
-    },
-    "textdasiaperispomeniiota{}": {
-      "snippet": "textdasiaperispomeniiota{${1:arg}}"
-    },
-    "texthbar": {},
-    "textHbar": {},
-    "textbhook": {},
-    "textBhook": {},
-    "textdhook": {},
-    "textDhook": {},
-    "texteopen": {},
-    "textEopen": {},
-    "textschwa": {},
-    "texteturned": {},
-    "textEreversed": {},
-    "textGammaafrican": {},
-    "textgammalatinsmall": {},
-    "textKhook": {},
-    "textkhook": {},
-    "textDafrican": {},
-    "textdtail": {},
-    "textTretroflexhook": {},
-    "texttretroflexhook": {},
-    "textOopen": {},
-    "textoopen": {},
-    "textIotaafrican": {},
-    "textiotalatin": {},
-    "textFhook": {},
-    "textYhook": {},
-    "textyhook": {},
-    "textEsh": {},
-    "textesh": {},
-    "textThook": {},
-    "textthook": {},
-    "textEzh": {},
-    "textezh": {},
-    "textChook": {},
-    "textchook": {},
-    "textTbar": {},
-    "texttbar": {},
-    "textVhook": {},
-    "textvhook": {},
-    "textPhook": {},
-    "textphook": {},
-    "textNhookleft": {},
-    "textnhookleft": {},
-    "texttesh": {},
-    "textdblgravecmb{}": {
-      "snippet": "textdblgravecmb{${1:arg}}"
-    },
-    "LinkUnicodeOptionToPkg{}{}": {
-      "snippet": "LinkUnicodeOptionToPkg{${1:option}}{${2:package}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "combine",
-    "nocombine",
-    "default",
-    "nodefault",
-    "document",
-    "nodocument",
-    "fasterrors",
-    "nofasterrors",
-    "graphics",
-    "nographics",
-    "savemem",
-    "nosavemem",
-    "warnunknown",
-    "nowarnunknown",
-    "autogenerated",
-    "noautogenerated",
-    "cjkbg5",
-    "nocjkbg5",
-    "cjkgb",
-    "nocjkgb",
-    "cjkhangul",
-    "nocjkhangul",
-    "cjkjis",
-    "nocjkjis",
-    "mathletters",
-    "nomathletters",
-    "postscript",
-    "nopostscript",
-    "privatecsur",
-    "noprivatecsur",
-    "tipa",
-    "notipa",
-    "showmagickern",
-    "hyperref"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/ucshyper.json b/dev/packages/ucshyper.json
deleted file mode 100644
index 21cb3154f..000000000
--- a/dev/packages/ucshyper.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "includes": {
-    "hyperref": []
-  },
-  "macros": {
-    "UCSPU{}": {
-      "snippet": "UCSPU{${1:number}}"
-    },
-    "UCSPUrange{}{}": {
-      "snippet": "UCSPUrange{${1:num1}}{${2:num2}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "nodirect",
-    "direct",
-    "noprerender",
-    "prerender"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/uni.json b/dev/packages/uni.json
deleted file mode 100644
index c5451ddff..000000000
--- a/dev/packages/uni.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "textuni{}": {
-      "snippet": "textuni{${1:text}}"
-    },
-    "uni": {},
-    "textunirm{}": {
-      "snippet": "textunirm{${1:text}}"
-    },
-    "unirm": {},
-    "textunisl{}": {
-      "snippet": "textunisl{${1:text}}"
-    },
-    "unisl": {},
-    "textunisc{}": {
-      "snippet": "textunisc{${1:text}}"
-    },
-    "unisc": {},
-    "textunist{}": {
-      "snippet": "textunist{${1:text}}"
-    },
-    "unist": {},
-    "textunibf{}": {
-      "snippet": "textunibf{${1:text}}"
-    },
-    "unibf": {},
-    "textunibsl{}": {
-      "snippet": "textunibsl{${1:text}}"
-    },
-    "unibsl": {},
-    "textunibsc{}": {
-      "snippet": "textunibsc{${1:text}}"
-    },
-    "unibsc": {},
-    "textunibst{}": {
-      "snippet": "textunibst{${1:text}}"
-    },
-    "unibst": {},
-    "bausquare": {},
-    "baucircle": {},
-    "bautriangle": {},
-    "bauhead": {},
-    "bauforms": {},
-    "dh": {},
-    "dj": {},
-    "ng": {},
-    "th": {},
-    "varQ": {},
-    "DH": {},
-    "DJ": {},
-    "NG": {},
-    "TH": {},
-    "guilsinglleft": {},
-    "guilsinglright": {},
-    "guillemoleft": {},
-    "guillemoright": {},
-    "quotesinglbase": {},
-    "quotedblbase": {},
-    "textogonek": {},
-    "textcmr{}": {
-      "snippet": "textcmr{${1:text}}",
-      "option": "default"
-    },
-    "cmr": {
-      "option": "default"
-    },
-    "cmrdefault": {
-      "option": "default"
-    },
-    "cmrenc": {
-      "option": "default"
-    },
-    "cmrfamily": {
-      "option": "default"
-    },
-    "unifamily": {},
-    "unifamilydefault": {},
-    "uniseries": {},
-    "uniseriesdefault": {},
-    "unishape": {},
-    "unishapedefault": {},
-    "stshape": {},
-    "stdefault": {},
-    "k{}": {
-      "snippet": "k{${1:arg}}"
-    },
-    "DeclareUniChar{}{}": {
-      "snippet": "DeclareUniChar{${1:command}}{${2:slot}}"
-    },
-    "DeclareUniCommand{}{}": {
-      "snippet": "DeclareUniCommand{${1:command}}{${2:definition}}"
-    },
-    "DeclareUniCommand{}[]{}": {
-      "snippet": "DeclareUniCommand{${1:command}}[${2:args}]{${3:definition}}"
-    },
-    "UniError{}": {
-      "snippet": "UniError{${1:message}}"
-    },
-    "unifiledate": {},
-    "unifileversion": {}
-  },
-  "envs": {},
-  "options": [
-    "strict",
-    "default",
-    "medium",
-    "bold"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/units.json b/dev/packages/units.json
deleted file mode 100644
index b8b99c399..000000000
--- a/dev/packages/units.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "includes": {
-    "ifthen": [],
-    "nicefrac": []
-  },
-  "macros": {
-    "unit[]{}": {
-      "snippet": "unit[${2:value}]{${1:dimension}}"
-    },
-    "unit{}": {
-      "snippet": "unit{${1:dimension}}"
-    },
-    "unitfrac[]{}{}": {
-      "snippet": "unitfrac[${3:value}]{${1:num}}{${2:den}}"
-    },
-    "unitfrac{}{}": {
-      "snippet": "unitfrac{${1:num}}{${2:den}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "tight",
-    "loose",
-    "nice",
-    "ugly"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/upmethodology-document.json b/dev/packages/upmethodology-document.json
deleted file mode 100644
index 07fcb006c..000000000
--- a/dev/packages/upmethodology-document.json
+++ /dev/null
@@ -1,699 +0,0 @@
-{
-  "includes": {
-    "upmethodology-p-common": [],
-    "babel": [],
-    "vmargin": [],
-    "upmethodology-extension": [],
-    "upmethodology-fmt": [],
-    "upmethodology-version": [],
-    "draftwatermark": []
-  },
-  "macros": {
-    "listendskip": {},
-    "declaredocument{}{}{}": {
-      "snippet": "declaredocument{${1:project}}{${2:name}}{${3:ref}}"
-    },
-    "declaredocumentex{}{}{}{}": {
-      "snippet": "declaredocumentex{${1:project}}{${2:subproject}}{${3:name}}{${4:ref}}"
-    },
-    "upmdocumentsummary": {},
-    "upmdocumentsummary[]": {
-      "snippet": "upmdocumentsummary[${1:width}]"
-    },
-    "upmdocinfopage": {},
-    "upmpublicationpage": {},
-    "upmpublicationminipage": {},
-    "theupmproject": {},
-    "theupmsubproject": {},
-    "theupmdocname": {},
-    "theupmdocref": {},
-    "theupmsmalldoclogo": {},
-    "theupmdoclogo": {},
-    "defupmsmalllogo{}": {
-      "snippet": "defupmsmalllogo{${1:imagefile}}"
-    },
-    "defupmlogo{}": {
-      "snippet": "defupmlogo{${1:imagefile}}"
-    },
-    "theupmfulldocname": {},
-    "setdocabstract{}": {
-      "snippet": "setdocabstract{${1:text}}"
-    },
-    "setdocabstract[]{}": {
-      "snippet": "setdocabstract[${2:language}]{${1:text}}"
-    },
-    "setdockeywords{}": {
-      "snippet": "setdockeywords{${1:keywords}}"
-    },
-    "setdockeywords[]{}": {
-      "snippet": "setdockeywords[${2:language}]{${1:keywords}}"
-    },
-    "theupmdocabstract": {},
-    "theupmdockeywords": {},
-    "theauthorlist": {},
-    "ifdocumentauthor{}{}{}": {
-      "snippet": "ifdocumentauthor{${1:name}}{${2:true}}{${3:false}}"
-    },
-    "addauthor{}{}": {
-      "snippet": "addauthor{${1:first name}}{${2:name}}"
-    },
-    "addauthor[]{}{}": {
-      "snippet": "addauthor[${3:email}]{${1:first name}}{${2:name}}"
-    },
-    "addauthor*{}{}{}": {
-      "snippet": "addauthor*{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "addauthor*[]{}{}{}": {
-      "snippet": "addauthor*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "upmdocumentauthors": {},
-    "upmdocumentauthors[]": {
-      "snippet": "upmdocumentauthors[${1:width}]"
-    },
-    "thevalidatorlist": {},
-    "addvalidator{}{}": {
-      "snippet": "addvalidator{${1:first name}}{${2:name}}"
-    },
-    "addvalidator[]{}{}": {
-      "snippet": "addvalidator[${3:email}]{${1:first name}}{${2:name}}"
-    },
-    "addvalidator*{}{}{}": {
-      "snippet": "addvalidator*{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "addvalidator*[]{}{}{}": {
-      "snippet": "addvalidator*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "upmdocumentvalidators": {},
-    "upmdocumentvalidators[]": {
-      "snippet": "upmdocumentvalidators[${1:width}]"
-    },
-    "addauthorvalidator{}{}": {
-      "snippet": "addauthorvalidator{${1:first name}}{${2:name}}"
-    },
-    "addauthorvalidator[]{}{}": {
-      "snippet": "addauthorvalidator[${3:email}]{${1:first name}}{${2:name}}"
-    },
-    "addauthorvalidator*{}{}{}": {
-      "snippet": "addauthorvalidator*{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "addauthorvalidator*[]{}{}{}": {
-      "snippet": "addauthorvalidator*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "theinformedlist": {},
-    "addinformed{}{}": {
-      "snippet": "addinformed{${1:first name}}{${2:name}}"
-    },
-    "addinformed[]{}{}": {
-      "snippet": "addinformed[${3:email}]{${1:first name}}{${2:name}}"
-    },
-    "addinformed*{}{}{}": {
-      "snippet": "addinformed*{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "addinformed*[]{}{}{}": {
-      "snippet": "addinformed*[${4:email}]{${1:first name}}{${2:name}}{${3:comment}}"
-    },
-    "upmdocumentinformedpeople": {},
-    "upmdocumentinformedpeople[]": {
-      "snippet": "upmdocumentinformedpeople[${1:width}]"
-    },
-    "theupmcopyrighter": {},
-    "theupmpublisher": {},
-    "theupmprintedin": {},
-    "theupmisbn": {},
-    "theupmissn": {},
-    "theupmdoi": {},
-    "theupmpublishingdate": {},
-    "theupmformattedpublisher": {},
-    "theupmformattedcopyrighter": {},
-    "setdocumentpurpose{}": {
-      "snippet": "setdocumentpurpose{${1:text}}"
-    },
-    "setpublisher{}": {
-      "snippet": "setpublisher{${1:name}}"
-    },
-    "setcopyrighter{}": {
-      "snippet": "setcopyrighter{${1:name}}"
-    },
-    "setprintingaddress{}": {
-      "snippet": "setprintingaddress{${1:address}}"
-    },
-    "setisbn{}": {
-      "snippet": "setisbn{${1:ISBN}}"
-    },
-    "setissn{}": {
-      "snippet": "setissn{${1:ISSN}}"
-    },
-    "setdoi{}": {
-      "snippet": "setdoi{${1:DOI}}"
-    },
-    "captionsenglish": {},
-    "dateenglish": {},
-    "extrasenglish": {},
-    "noextrasenglish": {},
-    "englishhyphenmins": {},
-    "britishhyphenmins": {},
-    "americanhyphenmins": {},
-    "prefacename": {
-      "option": "francais"
-    },
-    "bibname": {
-      "option": "francais"
-    },
-    "chaptername": {
-      "option": "francais"
-    },
-    "enclname": {
-      "option": "francais"
-    },
-    "ccname": {
-      "option": "francais"
-    },
-    "headtoname": {
-      "option": "francais"
-    },
-    "seename": {
-      "option": "francais"
-    },
-    "alsoname": {
-      "option": "francais"
-    },
-    "proofname": {
-      "option": "francais"
-    },
-    "glossaryname": {
-      "option": "francais"
-    },
-    "frenchsetup{}": {
-      "snippet": "frenchsetup{${1:options}}",
-      "option": "francais",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "frenchbsetup{}": {
-      "snippet": "frenchbsetup{${1:options}}",
-      "option": "francais",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "AddThinSpaceBeforeFootnotes": {
-      "option": "francais"
-    },
-    "at": {
-      "option": "francais"
-    },
-    "AutoSpaceBeforeFDP": {
-      "option": "francais"
-    },
-    "boi": {
-      "option": "francais"
-    },
-    "bsc{}": {
-      "snippet": "bsc{${1:text}}",
-      "option": "francais"
-    },
-    "CaptionSeparator": {
-      "option": "francais"
-    },
-    "captionsfrench": {
-      "option": "francais"
-    },
-    "circonflexe": {
-      "option": "francais"
-    },
-    "dateacadian": {
-      "option": "francais"
-    },
-    "datefrench": {
-      "option": "francais"
-    },
-    "DecimalMathComma": {
-      "option": "francais"
-    },
-    "degre": {
-      "option": "francais"
-    },
-    "degres": {
-      "option": "francais"
-    },
-    "descindentFB": {
-      "option": "francais"
-    },
-    "dotFFN": {
-      "option": "francais"
-    },
-    "extrasfrench": {
-      "option": "francais"
-    },
-    "FBcolonspace": {
-      "option": "francais"
-    },
-    "FBdatebox": {
-      "option": "francais"
-    },
-    "FBdatespace": {
-      "option": "francais"
-    },
-    "FBeverylineguill": {
-      "option": "francais"
-    },
-    "FBfigtabshape": {
-      "option": "francais"
-    },
-    "FBfnindent": {
-      "option": "francais"
-    },
-    "FBFrenchFootnotesfalse": {
-      "option": "francais"
-    },
-    "FBFrenchFootnotestrue": {
-      "option": "francais"
-    },
-    "FBFrenchSuperscriptstrue": {
-      "option": "francais"
-    },
-    "FBGlobalLayoutFrenchtrue": {
-      "option": "francais"
-    },
-    "FBgspchar": {
-      "option": "francais"
-    },
-    "FBguillopen": {
-      "option": "francais"
-    },
-    "FBguillspace": {
-      "option": "francais"
-    },
-    "FBInnerGuillSinglefalse": {
-      "option": "francais"
-    },
-    "FBInnerGuillSingletrue": {
-      "option": "francais"
-    },
-    "FBListItemsAsParfalse": {
-      "option": "francais"
-    },
-    "FBListItemsAsPartrue": {
-      "option": "francais"
-    },
-    "FBLowercaseSuperscriptstrue": {
-      "option": "francais"
-    },
-    "FBmedkern": {
-      "option": "francais"
-    },
-    "FBPartNameFulltrue": {
-      "option": "francais"
-    },
-    "FBsetspaces[]{}{}{}{}": {
-      "snippet": "FBsetspaces[${5:language}]{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
-      "option": "francais"
-    },
-    "FBsetspaces{}{}{}{}": {
-      "snippet": "FBsetspaces{${1:type}}{${2:width}}{${3:stretch}}{${4:shrink}}",
-      "option": "francais"
-    },
-    "FBSmallCapsFigTabCaptionstrue": {
-      "option": "francais"
-    },
-    "FBStandardEnumerateEnvtrue": {
-      "option": "francais"
-    },
-    "FBStandardItemizeEnvtrue": {
-      "option": "francais"
-    },
-    "FBStandardItemLabelstrue": {
-      "option": "francais"
-    },
-    "FBStandardLayouttrue": {
-      "option": "francais"
-    },
-    "FBStandardListSpacingtrue": {
-      "option": "francais"
-    },
-    "FBStandardListstrue": {
-      "option": "francais"
-    },
-    "FBsupR": {
-      "option": "francais"
-    },
-    "FBsupS": {
-      "option": "francais"
-    },
-    "FBtextellipsis": {
-      "option": "francais"
-    },
-    "FBthickkern": {
-      "option": "francais"
-    },
-    "FBthinspace": {
-      "option": "francais"
-    },
-    "FBthousandsep": {
-      "option": "francais"
-    },
-    "FBWarning{}": {
-      "snippet": "FBWarning{${1:message}}",
-      "option": "francais"
-    },
-    "fg": {
-      "option": "francais"
-    },
-    "fgi": {
-      "option": "francais"
-    },
-    "fgii": {
-      "option": "francais"
-    },
-    "fprimo)": {
-      "option": "francais"
-    },
-    "frenchdate{}{}{}": {
-      "snippet": "frenchdate{${1:day}}{${2:month}}{${3:year}}",
-      "option": "francais"
-    },
-    "FrenchEnumerate{}": {
-      "snippet": "FrenchEnumerate{${1:arg}}",
-      "option": "francais"
-    },
-    "FrenchFootnotes": {
-      "option": "francais"
-    },
-    "FrenchLabelItem": {
-      "option": "francais"
-    },
-    "frenchpartfirst": {
-      "option": "francais"
-    },
-    "frenchpartsecond": {
-      "option": "francais"
-    },
-    "FrenchPopularEnumerate{}": {
-      "snippet": "FrenchPopularEnumerate{${1:arg}}",
-      "option": "francais"
-    },
-    "frenchtoday": {
-      "option": "francais"
-    },
-    "Frlabelitemi": {
-      "option": "francais"
-    },
-    "Frlabelitemii": {
-      "option": "francais"
-    },
-    "Frlabelitemiii": {
-      "option": "francais"
-    },
-    "Frlabelitemiv": {
-      "option": "francais"
-    },
-    "frquote{}": {
-      "snippet": "frquote{${1:text}}",
-      "option": "francais"
-    },
-    "fup{}": {
-      "snippet": "fup{${1:text}}",
-      "option": "francais"
-    },
-    "ieme": {
-      "option": "francais"
-    },
-    "iemes": {
-      "option": "francais"
-    },
-    "ier": {
-      "option": "francais"
-    },
-    "iere": {
-      "option": "francais"
-    },
-    "ieres": {
-      "option": "francais"
-    },
-    "iers": {
-      "option": "francais"
-    },
-    "ifFBAutoSpaceFootnotes": {
-      "option": "francais"
-    },
-    "ifFBCompactItemize": {
-      "option": "francais"
-    },
-    "ifFBCustomiseFigTabCaptions": {
-      "option": "francais"
-    },
-    "ifFBfrench": {
-      "option": "francais"
-    },
-    "ifFBFrenchFootnotes": {
-      "option": "francais"
-    },
-    "ifFBFrenchSuperscripts": {
-      "option": "francais"
-    },
-    "ifFBGlobalLayoutFrench": {
-      "option": "francais"
-    },
-    "ifFBIndentFirst": {
-      "option": "francais"
-    },
-    "ifFBINGuillSpace": {
-      "option": "francais"
-    },
-    "ifFBListItemsAsPar": {
-      "option": "francais"
-    },
-    "ifFBListOldLayout": {
-      "option": "francais"
-    },
-    "ifFBLowercaseSuperscripts": {
-      "option": "francais"
-    },
-    "ifFBLuaTeX": {
-      "option": "francais"
-    },
-    "ifFBOldFigTabCaptions": {
-      "option": "francais"
-    },
-    "ifFBOriginalTypewriter": {
-      "option": "francais"
-    },
-    "ifFBPartNameFull": {
-      "option": "francais"
-    },
-    "ifFBReduceListSpacing": {
-      "option": "francais"
-    },
-    "ifFBShowOptions": {
-      "option": "francais"
-    },
-    "ifFBSmallCapsFigTabCaptions": {
-      "option": "francais"
-    },
-    "ifFBStandardEnumerateEnv": {
-      "option": "francais"
-    },
-    "ifFBStandardItemizeEnv": {
-      "option": "francais"
-    },
-    "ifFBStandardItemLabels": {
-      "option": "francais"
-    },
-    "ifFBStandardLayout": {
-      "option": "francais"
-    },
-    "ifFBStandardLists": {
-      "option": "francais"
-    },
-    "ifFBStandardListSpacing": {
-      "option": "francais"
-    },
-    "ifFBSuppressWarning": {
-      "option": "francais"
-    },
-    "ifFBThinColonSpace": {
-      "option": "francais"
-    },
-    "ifFBThinSpaceInFrenchNumbers": {
-      "option": "francais"
-    },
-    "ifFBunicode": {
-      "option": "francais"
-    },
-    "ifFBXeTeX": {
-      "option": "francais"
-    },
-    "ifLaTeXe": {
-      "option": "francais"
-    },
-    "kernFFN": {
-      "option": "francais"
-    },
-    "labelindentFB": {
-      "option": "francais"
-    },
-    "labelwidthFB": {
-      "option": "francais"
-    },
-    "leftmarginFB": {
-      "option": "francais"
-    },
-    "listfigurename": {
-      "option": "francais"
-    },
-    "listindentFB": {
-      "option": "francais"
-    },
-    "No": {
-      "option": "francais"
-    },
-    "no": {
-      "option": "francais"
-    },
-    "NoAutoSpaceBeforeFDP": {
-      "option": "francais"
-    },
-    "NoAutoSpacing": {
-      "option": "francais"
-    },
-    "NoEveryParQuote": {
-      "option": "francais"
-    },
-    "noextrasfrench": {
-      "option": "francais"
-    },
-    "nombre{}": {
-      "snippet": "nombre{${1:arg}}",
-      "option": "francais"
-    },
-    "nos": {
-      "option": "francais"
-    },
-    "Nos": {
-      "option": "francais"
-    },
-    "og": {
-      "option": "francais"
-    },
-    "ogi": {
-      "option": "francais"
-    },
-    "ogii": {
-      "option": "francais"
-    },
-    "parindentFFN": {
-      "option": "francais"
-    },
-    "partfirst": {
-      "option": "francais"
-    },
-    "partnameord": {
-      "option": "francais"
-    },
-    "partsecond": {
-      "option": "francais"
-    },
-    "primo": {
-      "option": "francais"
-    },
-    "quarto": {
-      "option": "francais"
-    },
-    "rmfamilyFB": {
-      "option": "francais"
-    },
-    "secundo": {
-      "option": "francais"
-    },
-    "sffamilyFB": {
-      "option": "francais"
-    },
-    "StandardFootnotes": {
-      "option": "francais"
-    },
-    "StandardMathComma": {
-      "option": "francais"
-    },
-    "tertio": {
-      "option": "francais"
-    },
-    "tild": {
-      "option": "francais"
-    },
-    "ttfamilyFB": {
-      "option": "francais"
-    },
-    "up{}": {
-      "snippet": "up{${1:text}}",
-      "option": "francais"
-    },
-    "xspace": {
-      "option": "francais"
-    }
-  },
-  "envs": {
-    "descriptionFB": {
-      "option": "francais"
-    },
-    "enumerateFB": {
-      "option": "francais"
-    },
-    "itemizeFB": {
-      "option": "francais"
-    },
-    "listFB{}": {
-      "name": "listFB",
-      "snippet": "{${1:symbol}}",
-      "option": "francais"
-    },
-    "listORI{}": {
-      "name": "listORI",
-      "snippet": "{${1:symbol}}",
-      "option": "francais"
-    }
-  },
-  "options": [
-    "french",
-    "francais",
-    "english"
-  ],
-  "keyvals": [
-    [
-      "ShowOptions",
-      "StandardLayout",
-      "GlobalLayoutFrench",
-      "IndentFirst",
-      "PartNameFull",
-      "ListItemsAsPar",
-      "StandardListSpacing",
-      "StandardItemizeEnv",
-      "StandardEnumerateEnv",
-      "StandardItemLabels",
-      "ItemLabels=",
-      "ItemLabeli=",
-      "ItemLabelii=",
-      "ItemLabeliii=",
-      "ItemLabeliv=",
-      "StandardLists",
-      "ListOldLayout",
-      "FrenchFootnotes",
-      "AutoSpaceFootnotes",
-      "AutoSpacePunctuation",
-      "ThinColonSpace",
-      "OriginalTypewriter",
-      "UnicodeNoBreakSpaces",
-      "og=",
-      "fg=",
-      "INGuillSpace",
-      "EveryParGuill=",
-      "EveryLineGuill=",
-      "InnerGuillSingle",
-      "ThinSpaceInFrenchNumbers",
-      "SmallCapsFigTabCaptions",
-      "CustomiseFigTabCaptions",
-      "OldFigTabCaptions",
-      "FrenchSuperscripts",
-      "LowercaseSuperscripts",
-      "SuppressWarning"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/upmethodology-extension.json b/dev/packages/upmethodology-extension.json
index 4d839af75..32a1b5f4c 100644
--- a/dev/packages/upmethodology-extension.json
+++ b/dev/packages/upmethodology-extension.json
@@ -45,9 +45,6 @@
     "DeclareCopyright[]{}{}{}{}": {
       "snippet": "DeclareCopyright[${5:language}]{${1:extname}}{${2:year}}{${3:copyrighter}}{${4:text}}"
     },
-    "Put(){}": {
-      "snippet": "Put(${2:x},${3:y}){${1:stuff}}"
-    },
     "UseExtension{}": {
       "snippet": "UseExtension{${1:extname}}"
     }
diff --git a/dev/packages/uptex.json b/dev/packages/uptex.json
deleted file mode 100644
index 985bf79ad..000000000
--- a/dev/packages/uptex.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "includes": {
-    "ptex": []
-  },
-  "macros": {
-    "disablecjktoken": {},
-    "enablecjktoken": {},
-    "forcecjktoken": {},
-    "kchar": {},
-    "kchardef": {},
-    "kchardef{}": {
-      "snippet": "kchardef{${1:cmd}}"
-    },
-    "uptexrevision": {},
-    "uptexversion": {},
-    "currentcjktoken": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/uri.json b/dev/packages/uri.json
deleted file mode 100644
index e0bbc37a0..000000000
--- a/dev/packages/uri.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "includes": {
-    "kvoptions": [],
-    "url": []
-  },
-  "macros": {
-    "urisetup{}": {
-      "snippet": "urisetup{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "uref{}{}": {
-      "snippet": "uref{${1:URL}}{${2:link text}}"
-    },
-    "arxiv{}": {
-      "snippet": "arxiv{${1:arXiv path}}"
-    },
-    "asin{}": {
-      "snippet": "asin{${1:Amazon number}}"
-    },
-    "doi{}": {
-      "snippet": "doi{${1:DOI number}}"
-    },
-    "hdl{}": {
-      "snippet": "hdl{${1:handle.net path}}"
-    },
-    "nbn{}": {
-      "snippet": "nbn{${1:NBN spec}}"
-    },
-    "oclc{}": {
-      "snippet": "oclc{${1:WorldCat number}}"
-    },
-    "oid{}": {
-      "snippet": "oid{${1:OID number}}"
-    },
-    "pubmed{}": {
-      "snippet": "pubmed{${1:PubMed number}}"
-    },
-    "tinyuri{}": {
-      "snippet": "tinyuri{${1:TinyURL path}}"
-    },
-    "tinypuri{}": {
-      "snippet": "tinypuri{${1:TinyURL path}}"
-    },
-    "wc{}": {
-      "snippet": "wc{${1:WebCite path}}"
-    },
-    "citeurl{}": {
-      "snippet": "citeurl{${1:URL}}"
-    },
-    "mailto{}": {
-      "snippet": "mailto{${1:address}}"
-    },
-    "mailto[]{}": {
-      "snippet": "mailto[${2:subject}]{${1:address}}"
-    },
-    "ukoeln{}": {
-      "snippet": "ukoeln{${1:UKoeln address}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": [
-    [
-      "arxivpre={%|}",
-      "arxivpost={%|}",
-      "asinpre={%|}",
-      "asinpost={%|}",
-      "doipre={%|}",
-      "doipost={%|}",
-      "hdlpre={%|}",
-      "hdlpost={%|}",
-      "nbnpre={%|}",
-      "nbnpost={%|}",
-      "oclcpre={%|}",
-      "oclcpost={%|}",
-      "oidpre={%|}",
-      "oidpost={%|}",
-      "pubmedpre={%|}",
-      "pubmedpost={%|}",
-      "tinyuripre={%|}",
-      "tinyuripost={%|}",
-      "tinypuripre={%|}",
-      "tinypuripost={%|}",
-      "wcpre={%|}",
-      "wcpost={%|}",
-      "xmpppre={%|}",
-      "xmpppost={%|}",
-      "citeurlpre={%|}",
-      "citeurlpost={%|}",
-      "mailtopre={%|}",
-      "mailtopost={%|}",
-      "ukoelnpre={%|}",
-      "ukoelnpost={%|}"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/url.json b/dev/packages/url.json
deleted file mode 100644
index 35d88459d..000000000
--- a/dev/packages/url.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "url{}": {
-      "snippet": "url{${1:URL}}"
-    },
-    "path{}": {
-      "snippet": "path{${1:URL}}"
-    },
-    "urldef{}": {
-      "snippet": "urldef{${1:cmd}}"
-    },
-    "DeclareUrlCommand{}{}": {
-      "snippet": "DeclareUrlCommand{${1:cmd}}{${2:definition}}"
-    },
-    "urlstyle{}": {
-      "snippet": "urlstyle{${1:style}}"
-    },
-    "UrlBreaks": {},
-    "UrlBigBreaks": {},
-    "UrlNoBreaks": {},
-    "UrlOrds": {},
-    "UrlSpecials": {},
-    "UrlTildeSpecial": {},
-    "UrlFont": {},
-    "UrlLeft": {},
-    "UrlRight": {},
-    "Urlmuskip": {},
-    "UrlBreakPenalty": {},
-    "UrlBigBreakPenalty": {}
-  },
-  "envs": {},
-  "options": [
-    "obeyspaces",
-    "hyphens",
-    "spaces",
-    "lowtilde",
-    "allowmove"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/va.json b/dev/packages/va.json
deleted file mode 100644
index 3f1d8455f..000000000
--- a/dev/packages/va.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "va": {},
-    "textva{}": {
-      "snippet": "textva{${1:text}}"
-    },
-    "vacal": {},
-    "textvacal{}": {
-      "snippet": "textvacal{${1:text}}"
-    },
-    "filename": {},
-    "fileversion": {},
-    "filedate": {},
-    "docversion": {},
-    "docdate": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/varioref.json b/dev/packages/varioref.json
deleted file mode 100644
index cd710e686..000000000
--- a/dev/packages/varioref.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "vref{}": {
-      "snippet": "vref{${1:label}}"
-    },
-    "vref*{}": {
-      "snippet": "vref*{${1:label}}"
-    },
-    "vpageref{}": {
-      "snippet": "vpageref{${1:label}}"
-    },
-    "vpageref*{}": {
-      "snippet": "vpageref*{${1:label}}"
-    },
-    "vpageref[]{}": {
-      "snippet": "vpageref[${2:samepage}]{${1:label}}"
-    },
-    "vpageref*[]{}": {
-      "snippet": "vpageref*[${2:samepage}]{${1:label}}"
-    },
-    "vpageref[][]{}": {
-      "snippet": "vpageref[${2:samepage}][${3:otherpage}]{${1:label}}"
-    },
-    "vpageref*[][]{}": {
-      "snippet": "vpageref*[${2:samepage}][${3:otherpage}]{${1:label}}"
-    },
-    "vrefrange{}{}": {
-      "snippet": "vrefrange{${1:fromlabel}}{${2:tolabel}}"
-    },
-    "vrefrange[]{}{}": {
-      "snippet": "vrefrange[${3:same page text}]{${1:fromlabel}}{${2:tolabel}}"
-    },
-    "vpagerefrange{}{}": {
-      "snippet": "vpagerefrange{${1:fromlabel}}{${2:tolabel}}"
-    },
-    "vpagerefrange*{}{}": {
-      "snippet": "vpagerefrange*{${1:fromlabel}}{${2:tolabel}}"
-    },
-    "vpagerefrange[]{}{}": {
-      "snippet": "vpagerefrange[${3:same page text}]{${1:fromlabel}}{${2:tolabel}}"
-    },
-    "vpagerefrange*[]{}{}": {
-      "snippet": "vpagerefrange*[${3:same page text}]{${1:fromlabel}}{${2:tolabel}}"
-    },
-    "vrefpagenum{}{}": {
-      "snippet": "vrefpagenum{${1:cmd}}{${2:label}}"
-    },
-    "vpagerefcompare{}{}{}{}": {
-      "snippet": "vpagerefcompare{${1:label1}}{${2:label2}}{${3:true}}{${4:false}}"
-    },
-    "vpagerefnearby{}{}{}": {
-      "snippet": "vpagerefnearby{${1:label}}{${2:true}}{${3:false}}"
-    },
-    "labelformat{}{}": {
-      "snippet": "labelformat{${1:counter}}{${2:argument}}"
-    },
-    "Vref{}": {
-      "snippet": "Vref{${1:label}}"
-    },
-    "Vref*{}": {
-      "snippet": "Vref*{${1:label}}"
-    },
-    "Ref{}": {
-      "snippet": "Ref{${1:label}}"
-    },
-    "thevpagerefnum": {},
-    "reftextbefore": {},
-    "reftextfacebefore": {},
-    "reftextafter": {},
-    "reftextfaceafter": {},
-    "reftextcurrent": {},
-    "reftextfaraway{}": {
-      "snippet": "reftextfaraway{${1:label}}"
-    },
-    "reftextvario{}{}": {
-      "snippet": "reftextvario{${1:text1}}{${2:text2}}"
-    },
-    "reftextpagerange{}{}": {
-      "snippet": "reftextpagerange{${1:label1}}{${2:label2}}"
-    },
-    "reftextlabelrange{}{}": {
-      "snippet": "reftextlabelrange{${1:label1}}{${2:label2}}"
-    },
-    "vrefformat": {},
-    "Vrefformat": {},
-    "vrefrangeformat": {},
-    "fullrefformat": {},
-    "vrefdefaultformat": {},
-    "Vrefdefaultformat": {},
-    "vrefrangedefaultformat": {},
-    "fullrefdefaultformat": {},
-    "vrefwarning": {},
-    "vrefshowerrors": {},
-    "fullref{}": {
-      "snippet": "fullref{${1:label}}"
-    },
-    "vpagerefcomparenearby{}{}{}{}": {
-      "snippet": "vpagerefcomparenearby{${1:label1}}{${2:label2}}{${3:true}}{${4:false}}"
-    }
-  },
-  "envs": {},
-  "options": [
-    "afrikaans",
-    "american",
-    "arabic",
-    "austrian",
-    "naustrian",
-    "basque",
-    "bahasam",
-    "brazil",
-    "breton",
-    "bulgarian",
-    "catalan",
-    "croatian",
-    "czech",
-    "danish",
-    "dutch",
-    "english",
-    "esperanto",
-    "finnish",
-    "french",
-    "galician",
-    "german",
-    "ngerman",
-    "greek",
-    "icelandic",
-    "italian",
-    "japanese",
-    "magyar",
-    "norsk",
-    "nynorsk",
-    "polish",
-    "portuges",
-    "romanian",
-    "russian",
-    "slovak",
-    "slovene",
-    "spanish",
-    "swedish",
-    "turkish",
-    "ukrainian",
-    "francais",
-    "germanb",
-    "draft",
-    "final",
-    "space",
-    "nospace"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/varwidth.json b/dev/packages/varwidth.json
deleted file mode 100644
index 4e5c09a0d..000000000
--- a/dev/packages/varwidth.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "narrowragged": {}
-  },
-  "envs": {
-    "varwidth{}": {
-      "name": "varwidth",
-      "snippet": "{${1:width}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/vector.json b/dev/packages/vector.json
deleted file mode 100644
index 855d9a55b..000000000
--- a/dev/packages/vector.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "includes": {
-    "calc": [],
-    "ifthen": []
-  },
-  "macros": {
-    "bvec{}": {
-      "snippet": "bvec{${1:arg}}"
-    },
-    "buvec{}": {
-      "snippet": "buvec{${1:arg}}"
-    },
-    "svec{}": {
-      "snippet": "svec{${1:arg}}"
-    },
-    "suvec{}": {
-      "snippet": "suvec{${1:arg}}"
-    },
-    "uvec{}": {
-      "snippet": "uvec{${1:arg}}"
-    },
-    "uuvec{}": {
-      "snippet": "uuvec{${1:arg}}"
-    },
-    "firstelement{}": {
-      "snippet": "firstelement{${1:start index}}"
-    },
-    "irvec{}": {
-      "snippet": "irvec{${1:arg}}"
-    },
-    "irvec[]{}": {
-      "snippet": "irvec[${2:end index}]{${1:arg}}"
-    },
-    "icvec{}": {
-      "snippet": "icvec{${1:arg}}"
-    },
-    "icvec[]{}": {
-      "snippet": "icvec[${2:end index}]{${1:arg}}"
-    },
-    "rvec{}{}{}": {
-      "snippet": "rvec{${1:arg}}{${2:start index}}{${3:end index}}"
-    },
-    "cvec{}{}{}": {
-      "snippet": "cvec{${1:arg}}{${2:start index}}{${3:end index}}"
-    },
-    "undertilde{}": {
-      "snippet": "undertilde{${1:arg}}",
-      "option": "wavy"
-    }
-  },
-  "envs": {},
-  "options": [
-    "wavy"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/verbatim.json b/dev/packages/verbatim.json
deleted file mode 100644
index f66095467..000000000
--- a/dev/packages/verbatim.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "verbatiminput{}": {
-      "snippet": "verbatiminput{${1:file}}"
-    },
-    "verbatiminput*{}": {
-      "snippet": "verbatiminput*{${1:file}}"
-    }
-  },
-  "envs": {
-    "comment": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/verse.json b/dev/packages/verse.json
deleted file mode 100644
index 8fc15a5af..000000000
--- a/dev/packages/verse.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "indentpattern{}": {
-      "snippet": "indentpattern{${1:digits}}"
-    },
-    "versewidth": {},
-    "vin": {},
-    "vgap": {},
-    "vindent": {},
-    "leftmargini": {},
-    "stanzaskip": {},
-    "verselinebreak": {},
-    "verselinebreak[]": {
-      "snippet": "verselinebreak[${1:length}]"
-    },
-    "flagverse{}": {
-      "snippet": "flagverse{${1:flag}}"
-    },
-    "vleftskip": {},
-    "vrightskip": {},
-    "poemlines{}": {
-      "snippet": "poemlines{${1:nth}}"
-    },
-    "setverselinenums{}{}": {
-      "snippet": "setverselinenums{${1:first line num}}{${2:start nums at}}"
-    },
-    "thepoemline": {},
-    "verselinenumfont{}": {
-      "snippet": "verselinenumfont{${1:font-spec}}"
-    },
-    "verselinenumbersleft": {},
-    "verselinenumbersright": {},
-    "poemtitle{}{}": {
-      "snippet": "poemtitle{${1:short}}{${2:long}}"
-    },
-    "poemtitle*{}{}": {
-      "snippet": "poemtitle*{${1:short}}{${2:long}}"
-    },
-    "poemtoc": {},
-    "poemtitlefont": {},
-    "beforepoemtitleskip": {},
-    "afterpoemtitleskip": {},
-    "poemtitlemark{}": {
-      "snippet": "poemtitlemark{${1:title}}"
-    },
-    "newarray{}{}{}": {
-      "snippet": "newarray{${1:array name}}{${2:low}}{${3:high}}"
-    },
-    "setarrayelement{}{}{}": {
-      "snippet": "setarrayelement{${1:array name}}{${2:index}}{${3:text}}"
-    },
-    "getarrayelement{}{}{}": {
-      "snippet": "getarrayelement{${1:array name}}{${2:index}}{${3:result}}"
-    },
-    "checkarrayindex{}{}": {
-      "snippet": "checkarrayindex{${1:array name}}{${2:index}}"
-    },
-    "stringtoarray{}{}": {
-      "snippet": "stringtoarray{${1:array name}}{${2:string}}"
-    },
-    "arraytostring{}{}": {
-      "snippet": "arraytostring{${1:array name}}{${2:result}}"
-    },
-    "checkifinteger{}": {
-      "snippet": "checkifinteger{${1:number}}"
-    },
-    "altindentfalse": {},
-    "altindenttrue": {},
-    "bounderrorfalse": {},
-    "bounderrortrue": {},
-    "gobm{}": {
-      "snippet": "gobm{${1:number}}"
-    },
-    "ifaltindent": {},
-    "ifbounderror": {},
-    "ifinteger": {},
-    "ifpattern": {},
-    "ifstarpattern": {},
-    "integerfalse": {},
-    "integertrue": {},
-    "patternfalse": {},
-    "patterntrue": {},
-    "starpatternfalse": {},
-    "starpatterntrue": {},
-    "thechrsinstr": {},
-    "thefvsline": {},
-    "theHpoemline": {},
-    "thevslineno": {},
-    "vlnumfont": {}
-  },
-  "envs": {
-    "verse": {},
-    "verse[]": {
-      "name": "verse",
-      "snippet": "[${1:length of average line}]"
-    },
-    "altverse": {},
-    "patverse": {},
-    "patverse*": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/version.json b/dev/packages/version.json
deleted file mode 100644
index dcf32ab4d..000000000
--- a/dev/packages/version.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "includeversion{}": {
-      "snippet": "includeversion{${1:envname}}"
-    },
-    "excludeversion{}": {
-      "snippet": "excludeversion{${1:envname}}"
-    },
-    "excludeversion[]{}": {
-      "snippet": "excludeversion[${2:text}]{${1:envname}}"
-    }
-  },
-  "envs": {
-    "comment": {}
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/vowel.json b/dev/packages/vowel.json
deleted file mode 100644
index 23d2144cc..000000000
--- a/dev/packages/vowel.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "putcvowel{}{}": {
-      "snippet": "putcvowel{${1:symbol}}{${2:num}}"
-    },
-    "putcvowel[]{}{}": {
-      "snippet": "putcvowel[${3:dot pos}]{${1:symbol}}{${2:num}}"
-    },
-    "putvowel{}{}{}": {
-      "snippet": "putvowel{${1:symbol}}{${2:x}}{${3:y}}"
-    },
-    "putvowel[]{}{}{}": {
-      "snippet": "putvowel[${4:dot pos}]{${1:symbol}}{${2:x}}{${3:y}}"
-    },
-    "super{}": {
-      "snippet": "super{${1:text}}"
-    },
-    "vowelhunit": {},
-    "vowelvunit": {},
-    "vowelsep": {},
-    "vowelline": {},
-    "vowelsymbol": {},
-    "diagrate": {},
-    "ifrectdgm": {},
-    "rectdgmtrue": {},
-    "rectdgmfalse": {},
-    "iftriangledgm": {},
-    "triangledgmtrue": {},
-    "triangledgmfalse": {},
-    "ifthreelevel": {},
-    "threeleveltrue": {},
-    "threelevelfalse": {},
-    "ifnoerase": {},
-    "noerasetrue": {},
-    "noerasefalse": {},
-    "diagline{}{}": {
-      "snippet": "diagline{${1:arg1}}{${2:arg2}}"
-    }
-  },
-  "envs": {
-    "vowel": {},
-    "vowel[]": {
-      "name": "vowel",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    }
-  },
-  "options": [],
-  "keyvals": [
-    [
-      "plain",
-      "simple",
-      "standard",
-      "ipanew",
-      "rectangle",
-      "triangle",
-      "three"
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/wargame.json b/dev/packages/wargame.json
index 4e4cb6cb8..5a548726f 100644
--- a/dev/packages/wargame.json
+++ b/dev/packages/wargame.json
@@ -19,40 +19,12 @@
     "amstext": []
   },
   "macros": {
-    "hex()": {
-      "snippet": "hex(${1:location})"
-    },
-    "hex()()": {
-      "snippet": "hex(${1:location})(${2:name})"
-    },
-    "hex[]()": {
-      "snippet": "hex[${1:options}](${2:location})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "hex[]()()": {
-      "snippet": "hex[${1:options}](${2:location})(${3:name})",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "boardframe()()": {
-      "snippet": "boardframe(${1:lower-left})(${2:upper-right})"
-    },
-    "boardframe[]()()": {
-      "snippet": "boardframe[${1:margin}](${2:lower-left})(${3:upper-right})"
-    },
-    "boardclip()(){}": {
-      "snippet": "boardclip(${2:lower-left})(${3:upper-right}){${1:options}}"
-    },
     "splitboard{}": {
       "snippet": "splitboard{${1:options}}",
-      "keyvalindex": 1,
+      "keyvalindex": 0,
       "keyvalpos": 0
     },
     "hexdbglvl": {},
-    "markpos{}()": {
-      "snippet": "markpos{${1:arg1}}(${2:arg2})"
-    },
     "init": {},
     "northedge": {},
     "southedge": {},
@@ -121,19 +93,7 @@
     "boardXmax": {},
     "boardYmax": {},
     "hexboardpath": {},
-    "boardpath()()": {
-      "snippet": "boardpath(${1:lower-left})(${2:upper-right})"
-    },
     "debuggrid": {},
-    "boardhexes()()": {
-      "snippet": "boardhexes(${1:arg1})(${2:arg2})"
-    },
-    "boardhexes[]()()": {
-      "snippet": "boardhexes[${1:options}](${2:arg1})(${3:arg2})"
-    },
-    "segment()(){}{}{}{}": {
-      "snippet": "segment(${5:arg1})(${6:arg2}){${1:arg3}}{${2:arg4}}{${3:arg5}}{${4:arg6}}"
-    },
     "wargamelogo": {},
     "wargamelogo[]": {
       "snippet": "wargamelogo[${1:options}]"
@@ -145,22 +105,6 @@
     "wglogbb{}": {
       "snippet": "wglogbb{${1:arg}}"
     },
-    "natoapp()": {
-      "snippet": "natoapp(${1:location})"
-    },
-    "natoapp()()": {
-      "snippet": "natoapp(${1:location})(${2:name})"
-    },
-    "natoapp[]()": {
-      "snippet": "natoapp[${1:options}](${2:location})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "natoapp[]()()": {
-      "snippet": "natoapp[${1:options}](${2:location})(${3:name})",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
     "natoappdbglvl": {},
     "octagon": {},
     "topline": {},
@@ -248,33 +192,8 @@
     "innernortheast": {},
     "linex": {},
     "liney": {},
-    "chit()": {
-      "snippet": "chit(${1:location})"
-    },
-    "chit()()": {
-      "snippet": "chit(${1:location})(${2:name})"
-    },
-    "chit[]()": {
-      "snippet": "chit[${1:options}](${2:location})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "chit[]()()": {
-      "snippet": "chit[${1:options}](${2:location})(${3:name})",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
     "chitdbglvl": {},
     "chitframeopt": {},
-    "shadechit()": {
-      "snippet": "shadechit(${1:arg})"
-    },
-    "eliminatechit()": {
-      "snippet": "eliminatechit(${1:arg})"
-    },
-    "stackchits()(){}": {
-      "snippet": "stackchits(${2:arg1})(${3:arg2}){${1:arg3}}"
-    },
     "oob": {},
     "hoob": {},
     "chits{}{}{}": {
@@ -325,17 +244,6 @@
     "terrainpic"
   ],
   "keyvals": [
-    [
-      "terrain={${1:terrain-keys}}",
-      "ridges={${1:ridges-keys}}",
-      "label={${1:label-keys}}",
-      "town={${1:town-keys}}",
-      "bevel={${1:bevel-keys}}",
-      "extra={${1:extra-keys}}",
-      "extra clipped={${1:extra-keys}}",
-      "row=${1:row}",
-      "column=${1:column}"
-    ],
     [
       "paper=",
       "landscape",
@@ -347,27 +255,6 @@
       "output=${1:file name}",
       "standalone",
       "scale=${1:factor}"
-    ],
-    [
-      "faction=${1:faction}",
-      "command=",
-      "main={${1:mains}}",
-      "left={${1:lefts}}",
-      "right={${1:rights}}",
-      "top={${1:tops}}",
-      "bottom={${1:bottoms}}",
-      "below={${1:belows}}",
-      "echelon=",
-      "frame={${1:frame-keys}}"
-    ],
-    [
-      "symbol={${1:nato app 6(c) spec}}",
-      "full={${1:spec}}",
-      "color=",
-      "fill=",
-      "text=",
-      "draw=",
-      "bevel={${1:bevel-keys}}"
     ]
   ]
 }
\ No newline at end of file
diff --git a/dev/packages/watermark.json b/dev/packages/watermark.json
deleted file mode 100644
index 4bee777fb..000000000
--- a/dev/packages/watermark.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "watermark{}": {
-      "snippet": "watermark{${1:body}}"
-    },
-    "leftwatermark{}": {
-      "snippet": "leftwatermark{${1:body}}"
-    },
-    "rightwatermark{}": {
-      "snippet": "rightwatermark{${1:body}}"
-    },
-    "thiswatermark{}": {
-      "snippet": "thiswatermark{${1:body}}"
-    },
-    "thispageheading{}": {
-      "snippet": "thispageheading{${1:heading}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/web.json b/dev/packages/web.json
deleted file mode 100644
index b09eb0d83..000000000
--- a/dev/packages/web.json
+++ /dev/null
@@ -1,1013 +0,0 @@
-{
-  "includes": {
-    "xkeyval": [],
-    "ifpdf": [],
-    "ifxetex": [],
-    "xcolor": [],
-    "calc": [],
-    "amssymb": [],
-    "hyperref": [],
-    "aeb-comment": [],
-    "eso-pic": [
-      "usetemplates",
-      "leftpanel",
-      "rightpanel",
-      "leftpanelprt",
-      "rightpanelprt"
-    ],
-    "graphicx": [
-      "usetemplates",
-      "leftpanel",
-      "rightpanel",
-      "leftpanelprt",
-      "rightpanelprt"
-    ],
-    "pifont": [
-      "pro",
-      "extended"
-    ],
-    "colortbl": [
-      "table"
-    ],
-    "pdfcolmk": [
-      "fixpdftex"
-    ]
-  },
-  "macros": {
-    "ui{}": {
-      "snippet": "ui{${1:keyvals}}",
-      "option": "useui",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "screensize{}{}": {
-      "snippet": "screensize{${1:height}}{${2:width}}"
-    },
-    "margins{}{}{}{}": {
-      "snippet": "margins{${1:left}}{${2:right}}{${3:top}}{${4:bottom}}"
-    },
-    "margins[]{}{}{}{}": {
-      "snippet": "margins[${5:panel width}]{${1:left}}{${2:right}}{${3:top}}{${4:bottom}}"
-    },
-    "setScreensizeFromGraphic{}": {
-      "snippet": "setScreensizeFromGraphic{${1:imagefile}}"
-    },
-    "setScreensizeFromGraphic[]{}": {
-      "snippet": "setScreensizeFromGraphic[${2:options}]{${1:imagefile}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "addtoWebHeight{}": {
-      "snippet": "addtoWebHeight{${1:length}}"
-    },
-    "addtoWebWidth{}": {
-      "snippet": "addtoWebWidth{${1:length}}"
-    },
-    "panelwidth{}": {
-      "snippet": "panelwidth{${1:width}}"
-    },
-    "lheader{}": {
-      "snippet": "lheader{${1:text}}"
-    },
-    "cheader{}": {
-      "snippet": "cheader{${1:text}}"
-    },
-    "rheader{}": {
-      "snippet": "rheader{${1:text}}"
-    },
-    "lfooter{}": {
-      "snippet": "lfooter{${1:text}}"
-    },
-    "cfooter{}": {
-      "snippet": "cfooter{${1:text}}"
-    },
-    "rfooter{}": {
-      "snippet": "rfooter{${1:text}}"
-    },
-    "headerformat{}": {
-      "snippet": "headerformat{${1:font commands}}"
-    },
-    "footerformat{}": {
-      "snippet": "footerformat{${1:font commands}}"
-    },
-    "webheadwrapper{}": {
-      "snippet": "webheadwrapper{${1:code}}"
-    },
-    "webfootwrapper{}": {
-      "snippet": "webfootwrapper{${1:code}}"
-    },
-    "clearHeaders": {},
-    "restoreHeaders": {},
-    "clearFooters": {},
-    "restoreFooters": {},
-    "headersOnSectionPage": {},
-    "noHeadersOnSectionPage": {},
-    "subject{}": {
-      "snippet": "subject{${1:subject}}"
-    },
-    "university{}": {
-      "snippet": "university{${1:university}}"
-    },
-    "email{}": {
-      "snippet": "email{${1:email}}"
-    },
-    "version{}": {
-      "snippet": "version{${1:version}}"
-    },
-    "copyrightyears{}": {
-      "snippet": "copyrightyears{${1:years}}"
-    },
-    "universityColor{}": {
-      "snippet": "universityColor{${1:color}}"
-    },
-    "titleColor{}": {
-      "snippet": "titleColor{${1:color}}"
-    },
-    "authorColor{}": {
-      "snippet": "authorColor{${1:color}}"
-    },
-    "keywords{}": {
-      "snippet": "keywords{${1:word1,${2:word2},...}}"
-    },
-    "topTitlePage": {},
-    "titlepageTrailer": {},
-    "optionalPageMatter{}": {
-      "snippet": "optionalPageMatter{${1:content}}"
-    },
-    "optionalPageMatter[]{}": {
-      "snippet": "optionalPageMatter[${2:vspace}]{${1:content}}"
-    },
-    "nocopyright": {},
-    "minimumskip": {},
-    "copyrightLabel{}": {
-      "snippet": "copyrightLabel{${1:text}}"
-    },
-    "revisionLabel{}": {
-      "snippet": "revisionLabel{${1:text}}"
-    },
-    "versionLabel{}": {
-      "snippet": "versionLabel{${1:text}}"
-    },
-    "webtitle": {},
-    "webauthor": {},
-    "websubject": {},
-    "webkeywords": {},
-    "webuniversity": {},
-    "webemail": {},
-    "webversion": {},
-    "webcopyrightyears": {},
-    "directoryName{}": {
-      "snippet": "directoryName{${1:name}}"
-    },
-    "tocName{}": {
-      "snippet": "tocName{${1:name}}"
-    },
-    "dirContentLink{}": {
-      "snippet": "dirContentLink{${1:text}}"
-    },
-    "formatWordDirectory{}": {
-      "snippet": "formatWordDirectory{${1:font commands}}"
-    },
-    "formatDirectoryItems{}": {
-      "snippet": "formatDirectoryItems{${1:font commands}}"
-    },
-    "removeDirTOC": {},
-    "removeDirArticle": {},
-    "addtoDirList{}": {
-      "snippet": "addtoDirList{${1:new item}}"
-    },
-    "dirTOCItem": {},
-    "dirArticleItem": {},
-    "priorDirMatter{}": {
-      "snippet": "priorDirMatter{${1:content}}"
-    },
-    "afterDirMatter{}": {
-      "snippet": "afterDirMatter{${1:content}}"
-    },
-    "priorDirList{}": {
-      "snippet": "priorDirList{${1:content}}"
-    },
-    "afterDirList{}": {
-      "snippet": "afterDirList{${1:content}}"
-    },
-    "directoryhook{}": {
-      "snippet": "directoryhook{${1:code}}"
-    },
-    "tocindent{}": {
-      "snippet": "tocindent{${1:indent}}"
-    },
-    "widestNumber{}": {
-      "snippet": "widestNumber{${1:number}}"
-    },
-    "tocColor{}": {
-      "snippet": "tocColor{${1:color}}"
-    },
-    "coverpagemargin": {},
-    "makeinlinetitle": {},
-    "NaviBarOn": {},
-    "NaviBarOff": {},
-    "navibarTextColor{}": {
-      "snippet": "navibarTextColor{${1:color}}"
-    },
-    "navibarBgColor{}": {
-      "snippet": "navibarBgColor{${1:color}}"
-    },
-    "navibariconHeight{}": {
-      "snippet": "navibariconHeight{${1:height}}"
-    },
-    "navibariconWidth{}": {
-      "snippet": "navibariconWidth{${1:width}}"
-    },
-    "newNaviIcon{}{}{}{}{}": {
-      "snippet": "newNaviIcon{${1:cmd}}{${2:width}}{${3:height}}{${4:text}}{${5:action}}"
-    },
-    "newNaviIcon[]{}{}{}{}{}": {
-      "snippet": "newNaviIcon[${6:m|j|l}]{${1:cmd}}{${2:width}}{${3:height}}{${4:text}}{${5:action}}"
-    },
-    "insertnaviiconhere{}": {
-      "snippet": "insertnaviiconhere{${1:code}}"
-    },
-    "insertnaviiconhereafter{}": {
-      "snippet": "insertnaviiconhereafter{${1:code}}"
-    },
-    "ArrowUp{}": {
-      "snippet": "ArrowUp{${1:code}}"
-    },
-    "ArrowDown{}": {
-      "snippet": "ArrowDown{${1:code}}"
-    },
-    "defaultpageheader": {},
-    "directionIconTextColor{}": {
-      "snippet": "directionIconTextColor{${1:color}}"
-    },
-    "directionIconBgColor{}": {
-      "snippet": "directionIconBgColor{${1:color}}"
-    },
-    "panelNaviGroup": {},
-    "ifeqforpaper": {},
-    "eqforpapertrue": {},
-    "eqforpaperfalse": {},
-    "useFullWidthForPaper": {},
-    "prtscr{}{}": {
-      "snippet": "prtscr{${1:print text}}{${2:screen text}}"
-    },
-    "NewPage": {},
-    "template{}": {
-      "snippet": "template{${1:imagefile}}"
-    },
-    "template[]{}": {
-      "snippet": "template[${2:options}]{${1:imagefile}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "textBgColor{}": {
-      "snippet": "textBgColor{${1:color}}"
-    },
-    "AddToTemplate{}": {
-      "snippet": "AddToTemplate{${1:template name}}"
-    },
-    "paneltemplate{}": {
-      "snippet": "paneltemplate{${1:imagefile}}"
-    },
-    "paneltemplate[]{}": {
-      "snippet": "paneltemplate[${2:options}]{${1:imagefile}}"
-    },
-    "panelBgColor{}": {
-      "snippet": "panelBgColor{${1:color}}"
-    },
-    "AddToPanelTemplate{}": {
-      "snippet": "AddToPanelTemplate{${1:template name}}"
-    },
-    "buildpanel{}": {
-      "snippet": "buildpanel{${1:content}}"
-    },
-    "minPanelWidth{}": {
-      "snippet": "minPanelWidth{${1:length}}"
-    },
-    "disableTemplate{}": {
-      "snippet": "disableTemplate{${1:template name}}"
-    },
-    "enableTemplate{}": {
-      "snippet": "enableTemplate{${1:template name}}"
-    },
-    "disablePanelTemplate{}": {
-      "snippet": "disablePanelTemplate{${1:template name}}"
-    },
-    "enablePanelTemplate{}": {
-      "snippet": "enablePanelTemplate{${1:template name}}"
-    },
-    "ClearTextTemplate": {},
-    "ClearPanelTemplate": {},
-    "ClearBuildPanel": {},
-    "ClearAllTemplates": {},
-    "ClearTextTemplateBuffer": {},
-    "ClearPanelTemplateBuffer": {},
-    "aboveTopTitleSkip{}": {
-      "snippet": "aboveTopTitleSkip{${1:skip}}"
-    },
-    "noFinalDot": {},
-    "tocPartTitle{}": {
-      "snippet": "tocPartTitle{${1:TeX code}}"
-    },
-    "formatPartTitle{}": {
-      "snippet": "formatPartTitle{${1:TeX code}}"
-    },
-    "restorePartTitleFormat": {},
-    "noPartNumbers": {},
-    "formatChapterNumber{}": {
-      "snippet": "formatChapterNumber{${1:TeX code}}"
-    },
-    "formatChapterTitle{}": {
-      "snippet": "formatChapterTitle{${1:TeX code}}"
-    },
-    "DeclareDocInfo{}": {
-      "snippet": "DeclareDocInfo{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "DeclarePageLayout{}": {
-      "snippet": "DeclarePageLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "universityLayout{}": {
-      "snippet": "universityLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "titleLayout{}": {
-      "snippet": "titleLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "authorLayout{}": {
-      "snippet": "authorLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 4,
-      "keyvalpos": 0
-    },
-    "topTitlePageProportion{}": {
-      "snippet": "topTitlePageProportion{${1:factor}}",
-      "option": "extended"
-    },
-    "DesignTitlePageTrailer{}": {
-      "snippet": "DesignTitlePageTrailer{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 5,
-      "keyvalpos": 0
-    },
-    "selectTocDings{}": {
-      "snippet": "selectTocDings{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 6,
-      "keyvalpos": 0
-    },
-    "selectColors{}": {
-      "snippet": "selectColors{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 7,
-      "keyvalpos": 0
-    },
-    "noSectionNumbers": {
-      "option": "extended"
-    },
-    "tocLayout{}": {
-      "snippet": "tocLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "sectionLayout{}": {
-      "snippet": "sectionLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "subsectionLayout{}": {
-      "snippet": "subsectionLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "subsubsectionLayout{}": {
-      "snippet": "subsubsectionLayout{${1:keyvals}}",
-      "option": "extended",
-      "keyvalindex": 8,
-      "keyvalpos": 0
-    },
-    "shadowhoffset{}": {
-      "snippet": "shadowhoffset{${1:length}}",
-      "option": "extended"
-    },
-    "shadowvoffset{}": {
-      "snippet": "shadowvoffset{${1:length}}",
-      "option": "extended"
-    },
-    "customSecHead{}": {
-      "snippet": "customSecHead{${1:TeX code}}",
-      "option": "extended"
-    },
-    "customSubsecHead{}": {
-      "snippet": "customSubsecHead{${1:TeX code}}",
-      "option": "extended"
-    },
-    "customSubsubsecHead{}": {
-      "snippet": "customSubsubsecHead{${1:TeX code}}",
-      "option": "extended"
-    },
-    "preparedLabel{}": {
-      "snippet": "preparedLabel{${1:text}}",
-      "option": "extended"
-    },
-    "prepared{}": {
-      "snippet": "prepared{${1:date}}",
-      "option": "extended"
-    },
-    "talkdate{}": {
-      "snippet": "talkdate{${1:date}}",
-      "option": "extended"
-    },
-    "webtalkdate": {
-      "option": "extended"
-    },
-    "talkdateLabel{}": {
-      "snippet": "talkdateLabel{${1:text}}",
-      "option": "extended"
-    },
-    "talksite{}": {
-      "snippet": "talksite{${1:site}}",
-      "option": "extended"
-    },
-    "customUniversity{}": {
-      "snippet": "customUniversity{${1:TeX code}}",
-      "option": "extended"
-    },
-    "customTitle{}": {
-      "snippet": "customTitle{${1:TeX code}}",
-      "option": "extended"
-    },
-    "customAuthor{}": {
-      "snippet": "customAuthor{${1:TeX code}}",
-      "option": "extended"
-    },
-    "customToc{}": {
-      "snippet": "customToc{${1:TeX code}}",
-      "option": "extended"
-    },
-    "halignuniversity": {
-      "option": "extended"
-    },
-    "haligntitle": {
-      "option": "extended"
-    },
-    "halignauthor": {
-      "option": "extended"
-    },
-    "halignsection": {
-      "option": "extended"
-    },
-    "halignsubsection": {
-      "option": "extended"
-    },
-    "halignsubsubsection": {
-      "option": "extended"
-    },
-    "haligntoc": {
-      "option": "extended"
-    },
-    "subsubDefaultDing{}": {
-      "snippet": "subsubDefaultDing{${1:symbol}}",
-      "option": "extended"
-    },
-    "sectionTitle": {
-      "option": "extended"
-    },
-    "sectionAuthor": {
-      "option": "extended"
-    },
-    "sectionUniversity": {
-      "option": "extended"
-    },
-    "sectionToc": {
-      "option": "extended"
-    },
-    "ifShadow": {
-      "option": "extended"
-    },
-    "Shadowtrue": {
-      "option": "extended"
-    },
-    "Shadowfalse": {
-      "option": "extended"
-    },
-    "useSectionNumbers": {
-      "option": "extended"
-    },
-    "dDingToc{}": {
-      "snippet": "dDingToc{${1:symbol}}",
-      "option": "extended"
-    },
-    "ddDingToc{}": {
-      "snippet": "ddDingToc{${1:symbol}}",
-      "option": "extended"
-    },
-    "dddDingToc{}": {
-      "snippet": "dddDingToc{${1:symbol}}",
-      "option": "extended"
-    },
-    "dDingTocColor{}": {
-      "snippet": "dDingTocColor{${1:color}}",
-      "option": "extended"
-    },
-    "ddDingTocColor{}": {
-      "snippet": "ddDingTocColor{${1:color}}",
-      "option": "extended"
-    },
-    "dddDingTocColor{}": {
-      "snippet": "dddDingTocColor{${1:color}}",
-      "option": "extended"
-    },
-    "BGColorAndGraphic": {},
-    "BGColorAndGraphicFullWidth": {},
-    "FALSEACTIONii": {},
-    "FALSEACTIONiia": {},
-    "InitLayout": {},
-    "SETTEMPBOXi": {},
-    "SETTEMPBOXii": {},
-    "SHOWTEMPBOXi": {},
-    "TRUEACTIONi": {},
-    "TRUEACTIONia": {},
-    "aboveOPMvspace": {},
-    "addToWebHWError": {},
-    "addtofullwidthtemplateArgs{}": {
-      "snippet": "addtofullwidthtemplateArgs{${1:arg}}"
-    },
-    "addtopaneltemplateArgs{}": {
-      "snippet": "addtopaneltemplateArgs{${1:arg}}"
-    },
-    "addtotemplateArgs{}": {
-      "snippet": "addtotemplateArgs{${1:arg}}"
-    },
-    "aebwritelastpage": {},
-    "allowTransparency": {},
-    "bWebCustomize": {},
-    "calculatefullwidth": {},
-    "centertextonpage": {},
-    "chkpanelgroup": {},
-    "clearfullwidthtemplateArgs": {},
-    "clearpaneltemplateArgs": {},
-    "cleartemplateArgs": {},
-    "currLeftMarg": {},
-    "currPanelWidth": {},
-    "currTopMarg": {},
-    "cyrCommand": {},
-    "disablePanels{}": {
-      "snippet": "disablePanels{${1:arg}}"
-    },
-    "disableScreens{}": {
-      "snippet": "disableScreens{${1:arg}}"
-    },
-    "eWebCustomize": {},
-    "forceSubSubNumbers": {},
-    "fullscreenwidth": {},
-    "fullscreenwidthadj": {},
-    "fullwidthtemplate{}{}": {
-      "snippet": "fullwidthtemplate{${1:arg1}}{${2:arg2}}"
-    },
-    "get": {},
-    "getDimsFromGraphic{}{}{}{}": {
-      "snippet": "getDimsFromGraphic{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "getargsii": {},
-    "getargs{}{}": {
-      "snippet": "getargs{${1:arg1}}{${2:arg2}}"
-    },
-    "hproportionwebauthor": {},
-    "hproportionwebtitle": {},
-    "hproportionwebuniversity": {},
-    "incby": {},
-    "inputWebCfg": {},
-    "insNaviBar": {},
-    "insertwebtoc": {},
-    "isChapter": {},
-    "listAddToPanelTemplates": {},
-    "listAddToTemplates": {},
-    "loadwebpro": {},
-    "makeFullwidthhead": {},
-    "maketitlepostamble": {},
-    "maketitlepreamble": {},
-    "marginsize": {},
-    "maxtextscreentext": {},
-    "newBottomMarg": {},
-    "newLeftMarg": {},
-    "newPanelWidth": {},
-    "newRightMarg": {},
-    "newTopMarg": {},
-    "nocopyrightNotice": {},
-    "nocopyrightsymbol": {},
-    "norevisionLabel": {},
-    "optionalpagematter": {},
-    "origpaperheight": {},
-    "origpaperwidth": {},
-    "panelIconGroup": {},
-    "panelNavigroupWidth": {},
-    "panelSep": {},
-    "panelgroupHeight{}": {
-      "snippet": "panelgroupHeight{${1:arg}}"
-    },
-    "panelgroupSep{}": {
-      "snippet": "panelgroupSep{${1:arg}}"
-    },
-    "panelgroupWidth{}": {
-      "snippet": "panelgroupWidth{${1:arg}}"
-    },
-    "panelrowsep": {},
-    "panelscreenwidth": {},
-    "panelsep{}": {
-      "snippet": "panelsep{${1:arg}}"
-    },
-    "pdfLang{}": {
-      "snippet": "pdfLang{${1:arg}}"
-    },
-    "placePanelTemplateInLayer[]{}": {
-      "snippet": "placePanelTemplateInLayer[${2:opt}]{${1:arg}}"
-    },
-    "placePanelTemplateInLayer{}": {
-      "snippet": "placePanelTemplateInLayer{${1:arg}}"
-    },
-    "placeScreenNavibar": {},
-    "placeTemplateInLayer[]{}": {
-      "snippet": "placeTemplateInLayer[${2:opt}]{${1:arg}}"
-    },
-    "placeTemplateInLayer{}": {
-      "snippet": "placeTemplateInLayer{${1:arg}}"
-    },
-    "popFromFullWidthPage": {},
-    "prtscrA{}{}": {
-      "snippet": "prtscrA{${1:arg1}}{${2:arg2}}"
-    },
-    "prtscrV": {},
-    "pushToFullWidthPage": {},
-    "removehereaftericon": {},
-    "resetmargins[]{}{}{}{}": {
-      "snippet": "resetmargins[${5:opt}]{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "resetmargins{}{}{}{}": {
-      "snippet": "resetmargins{${1:arg1}}{${2:arg2}}{${3:arg3}}{${4:arg4}}"
-    },
-    "restoreElements{}": {
-      "snippet": "restoreElements{${1:arg}}"
-    },
-    "restorePanels{}": {
-      "snippet": "restorePanels{${1:arg}}"
-    },
-    "restoreSavedHead": {},
-    "restoreScreens{}": {
-      "snippet": "restoreScreens{${1:arg}}"
-    },
-    "restorenormalsettings": {},
-    "saveClearElements{}": {
-      "snippet": "saveClearElements{${1:arg}}"
-    },
-    "saveElements{}": {
-      "snippet": "saveElements{${1:arg}}"
-    },
-    "setPageDevice[]{}{}": {
-      "snippet": "setPageDevice[${3:opt}]{${1:arg1}}{${2:arg2}}"
-    },
-    "setPageDevice{}{}": {
-      "snippet": "setPageDevice{${1:arg1}}{${2:arg2}}"
-    },
-    "shortwebsubject": {},
-    "shortwebtitle": {},
-    "stdPanelBG": {},
-    "stdbldpanel": {},
-    "templatedefaults": {},
-    "textscreenwidth": {},
-    "thewebemail": {},
-    "tightsettings": {},
-    "titleauthorproportion": {},
-    "tocIndentByNumber{}": {
-      "snippet": "tocIndentByNumber{${1:arg}}"
-    },
-    "tocindentByNumber": {},
-    "trailerFontSize": {},
-    "useStandardPanel": {},
-    "vspaceAfterDirName": {},
-    "webArg": {},
-    "webNotPaneledWarning": {},
-    "webSaveMargDim": {},
-    "webSaveSSDim": {},
-    "webdirectory": {},
-    "websetheadheight": {},
-    "webtableofcontents": {}
-  },
-  "envs": {
-    "forscreen": {},
-    "forpaper": {},
-    "Fullwidthtext": {}
-  },
-  "options": [
-    "noxcolor",
-    "dutch",
-    "french",
-    "german",
-    "italian",
-    "norsk",
-    "russian",
-    "spanish",
-    "dansk",
-    "polish",
-    "finnish",
-    "czech",
-    "catalan",
-    "brazil",
-    "turkish",
-    "dvips",
-    "dvipsone",
-    "dviwindo",
-    "textures",
-    "pdftex",
-    "dvipdfm",
-    "dvipdfmx",
-    "xetex",
-    "luatex",
-    "forpaper",
-    "forcolorpaper",
-    "latexlayout",
-    "uselatexsectioning",
-    "weblikeclass",
-    "nodirectory",
-    "usedirectory",
-    "latextoc",
-    "nobullets",
-    "designi",
-    "designii",
-    "designiii",
-    "designiv",
-    "designv",
-    "designvi",
-    "designvii",
-    "designviii",
-    "designix",
-    "usesf",
-    "unicode",
-    "xhyperref",
-    "addtoHyOpts={${1:hyperref options}}",
-    "addtoHyOpts*={${1:hyperref options}}",
-    "useui",
-    "forceSubSubNumbers",
-    "centertitlepage",
-    "centertitlepagefull",
-    "pro",
-    "extended",
-    "draft",
-    "usetemplates",
-    "leftpanel",
-    "rightpanel",
-    "templatesforpaper",
-    "rightpanelprt",
-    "leftpanelprt",
-    "navibar",
-    "navibar*",
-    "tight",
-    "tight*",
-    "uselatexparts",
-    "uselatexchapters",
-    "natural",
-    "rgb",
-    "cmy",
-    "cmyk",
-    "hsb",
-    "gray",
-    "RGB",
-    "HTML",
-    "HSB",
-    "Gray",
-    "monochrome",
-    "dvipsnames",
-    "dvipsnames*",
-    "svgnames",
-    "svgnames*",
-    "x11names",
-    "x11names*",
-    "table",
-    "fixpdftex",
-    "hyperref",
-    "prologue",
-    "kernelfbox",
-    "xcdraw",
-    "noxcdraw",
-    "fixinclude",
-    "showerrors",
-    "hideerrors"
-  ],
-  "keyvals": [
-    [
-      "border=",
-      "linewidth=",
-      "highlight=",
-      "bordercolor={${1:R G B}}",
-      "linestyle=",
-      "dasharray=${1:number}",
-      "linktxtcolor=",
-      "annotflags=",
-      "fieldflags=",
-      "maxlength=${1:number}",
-      "tooltip={${1:text}}",
-      "default=${1:text}",
-      "value=${1:text}",
-      "rotate=",
-      "bgcolor={${1:R G B}}",
-      "uptxt={${1:text}}",
-      "downtxt={${1:text}}",
-      "rollovertxt={${1:text}}",
-      "normappr=${1:string}",
-      "rollappr=${1:string}",
-      "downappr=${1:string}",
-      "importicons=",
-      "layout=",
-      "scalewhen=",
-      "scale=",
-      "position={${1:x y}}",
-      "fitbounds",
-      "appr={${1:specs}}",
-      "align=",
-      "textfont=${1:font name}",
-      "textsize=${1:number}",
-      "textcolor=${1:number}",
-      "autocenter=",
-      "inline=",
-      "presets=${1:\\cmd}",
-      "symbolchoice=",
-      "rectW=",
-      "rectH=",
-      "width=",
-      "height=",
-      "scalefactor=${1:factor}",
-      "goto={${1:KV-pairs}}",
-      "js={${1:script}}",
-      "mouseup={${1:script}}",
-      "mousedown={${1:script}}",
-      "onenter={${1:script}}",
-      "onexit={${1:script}}",
-      "onfocus={${1:script}}",
-      "onblur={${1:script}}",
-      "format={${1:script}}",
-      "keystroke={${1:script}}",
-      "validate={${1:script}}",
-      "calculate={${1:script}}",
-      "pageopen={${1:script}}",
-      "pageclose={${1:script}}",
-      "pagevisible={${1:script}}",
-      "pageinvisible={${1:script}}",
-      "lock={${1:KV-pairs}}"
-    ],
-    [
-      "alt={${1:alt text}}",
-      "bb=${1:llx lly urx ury}",
-      "bbllx=",
-      "bblly=",
-      "bburx=",
-      "bbury=",
-      "natwidth=",
-      "natheight=",
-      "hiresbb",
-      "pagebox=",
-      "viewport=${1:llx lly urx ury}",
-      "trim=${1:llx lly urx ury}",
-      "angle=${1:degrees}",
-      "origin=",
-      "width=",
-      "height=",
-      "totalheight=",
-      "keepaspectratio",
-      "scale=${1:factor}",
-      "clip",
-      "draft",
-      "type=${1:file type}",
-      "ext=${1:file extension}",
-      "read=${1:read-file extension}",
-      "command=",
-      "quiet",
-      "page=${1:page number}",
-      "interpolate",
-      "decodearray={${1:color array}}"
-    ],
-    [
-      "title={${1:text}}",
-      "author={${1:name}}",
-      "university={${1:university}}",
-      "email=${1:email}",
-      "talksite={${1:site}}",
-      "talkdate=${1:date}",
-      "talkdateLabel={${1:text}}",
-      "version=${1:version}",
-      "versionLabel={${1:text}}",
-      "subject={${1:subject}}",
-      "keywords={${1:word1,word2,...}}",
-      "copyrightyears={${1:years}}",
-      "prepared=${1:date}",
-      "preparedLabel={${1:text}}",
-      "Title={${1:text}}",
-      "authors={${1:name1}}{${2:name2}}${3:...}",
-      "Subject={${1:subject}}",
-      "Keywords={${1:word1,word2,...}}",
-      "lang=${1:language}",
-      "copyrightStatus=",
-      "copyrightNotice={${1:text}}",
-      "copyrightInfoURL=${1:URL}",
-      "authortitle={${1:text}}",
-      "descriptionwriter={${1:text}}",
-      "customProperties={name=${1:name1},value=${2:value1}}${3:{name=name2,value=value2}...}"
-    ],
-    [
-      "design=",
-      "screensizeOf=",
-      "screensize={${1:height}}{${2:width}}",
-      "margins={${1:left}}{${2:right}}{${3:top}}{${4:bottom}}",
-      "headheight=",
-      "topmargin=",
-      "additionalheadsep=",
-      "marginparsep=",
-      "marginparwidth=",
-      "marginparpush=",
-      "footskip=",
-      "webfootskip=",
-      "panelwidth=",
-      "panelsep="
-    ],
-    [
-      "fontfamily=",
-      "fontseries=",
-      "fontshape=",
-      "fontsize=",
-      "halign=",
-      "color=",
-      "special=",
-      "framecolor=",
-      "bgcolor=",
-      "shadowcolor=",
-      "beforeskip=",
-      "afterskip=",
-      "usefont={${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}{${5:size}}",
-      "hproportion=${1:factor}",
-      "xhalign="
-    ],
-    [
-      "ul=${1:text}",
-      "ur=${1:text}",
-      "ll=${1:text}",
-      "lr=${1:text}",
-      "textColor=",
-      "bgColor=",
-      "borderColor=",
-      "fboxsep=",
-      "fboxrule=",
-      "graphic=${1:imagefile}",
-      "namedgraphic=${1:name}",
-      "raise=",
-      "fontSize=${1:fontsize cmd}",
-      "formatting=${1:font commands}"
-    ],
-    [
-      "dDing=${1:symbol}",
-      "ddDing=${1:symbol}",
-      "dddDing=${1:symbol}",
-      "dDingColor=",
-      "ddDingColor=",
-      "dddDingColor="
-    ],
-    [
-      "universityColor=",
-      "titleColor=",
-      "textBgColor=",
-      "panelBgColor=",
-      "urlColor=",
-      "linkColor=",
-      "fileColor="
-    ],
-    [
-      "fontfamily=",
-      "fontseries=",
-      "fontshape=",
-      "fontsize=",
-      "halign=",
-      "ding=${1:symbol}",
-      "color=",
-      "special=",
-      "framecolor=",
-      "bgcolor=",
-      "shadowcolor=",
-      "beforeskip=",
-      "afterskip=",
-      "usefont={${1:encoding}}{${2:family}}{${3:series}}{${4:shape}}{${5:size}}",
-      "numdingcolor=",
-      "reset="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/wiley-authoringtemplate.json b/dev/packages/wiley-authoringtemplate.json
index 6139514ed..b55eacf26 100644
--- a/dev/packages/wiley-authoringtemplate.json
+++ b/dev/packages/wiley-authoringtemplate.json
@@ -96,7 +96,7 @@
       "snippet": "hint{${1:text}}"
     },
     "keywords{}": {
-      "snippet": "keywords{${1:keyword1,${2:keyword2},...}}"
+      "snippet": "keywords{${1:keyword1,keyword2,...}}"
     },
     "latexprintindex": {},
     "midrule": {},
diff --git a/dev/packages/witharrows.json b/dev/packages/witharrows.json
deleted file mode 100644
index 90f8de0aa..000000000
--- a/dev/packages/witharrows.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "includes": {
-    "l3keys2e": [],
-    "varwidth": [],
-    "tikz": [],
-    "tikzlibrarybending": [],
-    "footnote": [
-      "footnote"
-    ],
-    "footnotehyper": [
-      "footnotehyper"
-    ]
-  },
-  "macros": {
-    "WithArrowsOptions{}": {
-      "snippet": "WithArrowsOptions{${1:options}}",
-      "keyvalindex": 0,
-      "keyvalpos": 0
-    },
-    "Arrow{}": {
-      "snippet": "Arrow{${1:label}}"
-    },
-    "Arrow[]{}": {
-      "snippet": "Arrow[${2:options}]{${1:label}}",
-      "keyvalindex": 1,
-      "keyvalpos": 0
-    },
-    "MultiArrow{}{}": {
-      "snippet": "MultiArrow{${1:row1,${3:row2},...}}{${2:label}}"
-    },
-    "WithArrowsLastEnv": {},
-    "tag{}": {
-      "snippet": "tag{${1:label}}"
-    },
-    "tag*{}": {
-      "snippet": "tag*{${1:label}}"
-    },
-    "notag": {},
-    "tagnextline": {},
-    "WithArrowsRightX": {},
-    "WithArrowsNewStyle{}{}": {
-      "snippet": "WithArrowsNewStyle{${1:style name}}{${2:options}}"
-    },
-    "WithArrowsNbLines": {},
-    "WithArrows": {},
-    "endWithArrows": {},
-    "DispWithArrows": {},
-    "endDispWithArrows": {},
-    "myfileversion": {},
-    "myfiledate": {}
-  },
-  "envs": {
-    "WithArrows": {},
-    "WithArrows[]": {
-      "name": "WithArrows",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 2,
-      "keyvalpos": 0
-    },
-    "DispWithArrows": {},
-    "DispWithArrows[]": {
-      "name": "DispWithArrows",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    },
-    "DispWithArrows*": {},
-    "DispWithArrows*[]": {
-      "name": "DispWithArrows*",
-      "snippet": "[${1:options}]",
-      "keyvalindex": 3,
-      "keyvalpos": 0
-    }
-  },
-  "options": [
-    "footnote",
-    "footnotehyper"
-  ],
-  "keyvals": [
-    [
-      "c",
-      "b",
-      "right-overlap",
-      "tikz={${1:TikZ options}}",
-      "xoffset=",
-      "command-name=${1:csname}",
-      "code-before=${1:code}",
-      "code-after=${1:code}",
-      "format=${1:cols}",
-      "show-nodes",
-      "show-node-names",
-      "displaystyle",
-      "ll",
-      "lr",
-      "rl",
-      "rr",
-      "i",
-      "group",
-      "groups",
-      "up-and-down={${1:options}}",
-      "jot=",
-      "interline=",
-      "tikz-code={${1:code}}",
-      "start-adjust=",
-      "end-adjust=",
-      "adjust=",
-      "ygap=",
-      "ystart=",
-      "max-length-of-arrow=",
-      "%witharrowsstyle",
-      "wrap-lines",
-      "tagged-lines={${1:line1,line2,...}}",
-      "fleqn",
-      "mathindent=",
-      "subequations",
-      "standard-behaviour-with-items",
-      "xoffset-for-o-arrows=",
-      "up-and-down/width=",
-      "up-and-down/radius=",
-      "no-arrows"
-    ],
-    [
-      "jump=${1:integer}",
-      "xoffset=",
-      "tikz=",
-      "tikz-code={${1:code}}",
-      "ll",
-      "lr",
-      "rl",
-      "rr",
-      "i",
-      "new-group",
-      "o",
-      "up",
-      "up={${1:options}}",
-      "down",
-      "down={${1:options}}"
-    ],
-    [
-      "c",
-      "b",
-      "right-overlap",
-      "tikz={${1:TikZ options}}",
-      "xoffset=",
-      "command-name=${1:csname}",
-      "code-before=${1:code}",
-      "code-after=${1:code}",
-      "format=${1:cols}",
-      "show-nodes",
-      "show-node-names",
-      "displaystyle",
-      "ll",
-      "lr",
-      "rl",
-      "rr",
-      "i",
-      "group",
-      "groups",
-      "up-and-down={${1:options}}",
-      "jot=",
-      "interline=",
-      "tikz-code={${1:code}}",
-      "start-adjust=",
-      "end-adjust=",
-      "adjust=",
-      "ygap=",
-      "ystart=",
-      "max-length-of-arrow=",
-      "%witharrowsstyle",
-      "name=${1:node name}"
-    ],
-    [
-      "tikz={${1:TikZ options}}",
-      "xoffset=",
-      "command-name=${1:csname}",
-      "code-before=${1:code}",
-      "code-after=${1:code}",
-      "format=${1:cols}",
-      "show-nodes",
-      "show-node-names",
-      "displaystyle",
-      "ll",
-      "lr",
-      "rl",
-      "rr",
-      "i",
-      "group",
-      "groups",
-      "up-and-down={${1:options}}",
-      "jot=",
-      "interline=",
-      "tikz-code={${1:code}}",
-      "start-adjust=",
-      "end-adjust=",
-      "adjust=",
-      "ygap=",
-      "ystart=",
-      "max-length-of-arrow=",
-      "%witharrowsstyle",
-      "name=${1:node name}",
-      "wrap-lines",
-      "tagged-lines={${1:line1,line2,...}}",
-      "fleqn",
-      "mathindent=",
-      "subequations",
-      "standard-behaviour-with-items",
-      "left-brace",
-      "left-brace={${1:content}}",
-      "replace-left-brace-by="
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/dev/packages/wordcloud.json b/dev/packages/wordcloud.json
index e975206bc..8f4205ce8 100644
--- a/dev/packages/wordcloud.json
+++ b/dev/packages/wordcloud.json
@@ -4,10 +4,10 @@
   },
   "macros": {
     "wordcloud{}": {
-      "snippet": "wordcloud{${1:(${2:word1},${3:weight1});(${4:word2},${5:weight2});...}}"
+      "snippet": "wordcloud{${1:(${2:word1,weight1});(${3:word2,weight2});...}}"
     },
     "wordcloud[]{}": {
-      "snippet": "wordcloud[${2:options}]{${1:(${3:word1},${4:weight1});(${5:word2},${6:weight2});...}}",
+      "snippet": "wordcloud[${2:options}]{${1:(${3:word1,weight1});(${4:word2,weight2});...}}",
       "keyvalindex": 0,
       "keyvalpos": 0
     },
@@ -20,7 +20,7 @@
       "keyvalpos": 0
     },
     "wordcloudIgnoreWords{}": {
-      "snippet": "wordcloudIgnoreWords{${1:word1,${2:word2},...}}"
+      "snippet": "wordcloudIgnoreWords{${1:word1,word2,...}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/wrapfig.json b/dev/packages/wrapfig.json
deleted file mode 100644
index 0850ff24a..000000000
--- a/dev/packages/wrapfig.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "wrapoverhang": {},
-    "WFclear": {}
-  },
-  "envs": {
-    "wrapfigure{}{}": {
-      "name": "wrapfigure",
-      "snippet": "{${1:position}}{${2:width}}"
-    },
-    "wrapfigure[]{}[]{}": {
-      "name": "wrapfigure",
-      "snippet": "[${3:lineheight}]{${1:position}}[${4:overhang}]{${2:width}}"
-    },
-    "wraptable{}{}": {
-      "name": "wraptable",
-      "snippet": "{${1:position}}{${2:width}}"
-    },
-    "wraptable[]{}[]{}": {
-      "name": "wraptable",
-      "snippet": "[${3:lineheight}]{${1:position}}[${4:overhang}]{${2:width}}"
-    },
-    "wrapfloat{}{}{}": {
-      "name": "wrapfloat",
-      "snippet": "{${1:floatname}}{${2:position}}{${3:width}}"
-    }
-  },
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xassoccnt.json b/dev/packages/xassoccnt.json
index 8d2c6c2da..f9e91f9b1 100644
--- a/dev/packages/xassoccnt.json
+++ b/dev/packages/xassoccnt.json
@@ -12,34 +12,34 @@
       "keyvalpos": 2
     },
     "NewDocumentCounter{}": {
-      "snippet": "NewDocumentCounter{${1:counter1,${2:counter2},...}}"
+      "snippet": "NewDocumentCounter{${1:counter1,counter2,...}}"
     },
     "NewDocumentCounter{}[]": {
-      "snippet": "NewDocumentCounter{${1:counter1,${3:counter2},...}}[${2:resetting counter}]"
+      "snippet": "NewDocumentCounter{${1:counter1,counter2,...}}[${2:resetting counter}]"
     },
     "NewDocumentCounter[]{}": {
-      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,${3:counter2},...}}",
+      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,counter2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "NewDocumentCounter[]{}[]": {
-      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,${4:counter2},...}}[${3:resetting counter}]",
+      "snippet": "NewDocumentCounter[${2:options}]{${1:counter1,counter2,...}}[${3:resetting counter}]",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "DeclareDocumentCounter{}": {
-      "snippet": "DeclareDocumentCounter{${1:counter1,${2:counter2},...}}"
+      "snippet": "DeclareDocumentCounter{${1:counter1,counter2,...}}"
     },
     "DeclareDocumentCounter{}[]": {
-      "snippet": "DeclareDocumentCounter{${1:counter1,${3:counter2},...}}[${2:resetting counter}]"
+      "snippet": "DeclareDocumentCounter{${1:counter1,counter2,...}}[${2:resetting counter}]"
     },
     "DeclareDocumentCounter[]{}": {
-      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,${3:counter2},...}}",
+      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,counter2,...}}",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
     "DeclareDocumentCounter[]{}[]": {
-      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,${4:counter2},...}}[${3:resetting counter}]",
+      "snippet": "DeclareDocumentCounter[${2:options}]{${1:counter1,counter2,...}}[${3:resetting counter}]",
       "keyvalindex": 1,
       "keyvalpos": 0
     },
@@ -81,10 +81,10 @@
     "LastSetCounter": {},
     "LastCounterValue": {},
     "RemoveFromReset{}{}": {
-      "snippet": "RemoveFromReset{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
+      "snippet": "RemoveFromReset{${1:counter1,counter2,...}}{${2:driver counter}}"
     },
     "RemoveFromFullReset{}{}": {
-      "snippet": "RemoveFromFullReset{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
+      "snippet": "RemoveFromFullReset{${1:counter1,counter2,...}}{${2:driver counter}}"
     },
     "ClearCounterResetList{}": {
       "snippet": "ClearCounterResetList{${1:driver counter}}"
@@ -93,7 +93,7 @@
       "snippet": "ClearCounterResetList*{${1:driver counter}}"
     },
     "AddToReset{}{}": {
-      "snippet": "AddToReset{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
+      "snippet": "AddToReset{${1:counter1,counter2,...}}{${2:driver counter}}"
     },
     "countersresetlistcount{}": {
       "snippet": "countersresetlistcount{${1:counter}}"
@@ -125,22 +125,22 @@
       "snippet": "GetParentCounter{${1:counter}}"
     },
     "LoopAddtoCounters{}{}": {
-      "snippet": "LoopAddtoCounters{${1:counter1,${3:counter2},...}}{${2:increment}}"
+      "snippet": "LoopAddtoCounters{${1:counter1,counter2,...}}{${2:increment}}"
     },
     "LoopResetCounters{}": {
-      "snippet": "LoopResetCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "LoopResetCounters{${1:counter1,counter2,...}}"
     },
     "LoopRefstepCounters{}": {
-      "snippet": "LoopRefstepCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "LoopRefstepCounters{${1:counter1,counter2,...}}"
     },
     "LoopSetCounters{}{}": {
-      "snippet": "LoopSetCounters{${1:counter1,${3:counter2},...}}{${2:value}}"
+      "snippet": "LoopSetCounters{${1:counter1,counter2,...}}{${2:value}}"
     },
     "LoopStepCounters{}": {
-      "snippet": "LoopStepCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "LoopStepCounters{${1:counter1,counter2,...}}"
     },
     "LoopCountersFunction{}{}": {
-      "snippet": "LoopCountersFunction{${1:counter1,${3:counter2},...}}{${2:macro}}"
+      "snippet": "LoopCountersFunction{${1:counter1,counter2,...}}{${2:macro}}"
     },
     "LoopCounterResetList{}{}": {
       "snippet": "LoopCounterResetList{${1:counter}}{${2:macro}}"
@@ -149,16 +149,16 @@
       "snippet": "LoopFullCounterResetList{${1:counter}}{${2:macro}}"
     },
     "CounterWithin{}{}": {
-      "snippet": "CounterWithin{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
+      "snippet": "CounterWithin{${1:counter1,counter2,...}}{${2:driver counter}}"
     },
     "CounterWithin*{}{}": {
-      "snippet": "CounterWithin*{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
+      "snippet": "CounterWithin*{${1:counter1,counter2,...}}{${2:driver counter}}"
     },
     "CounterWithout{}{}": {
-      "snippet": "CounterWithout{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
+      "snippet": "CounterWithout{${1:counter1,counter2,...}}{${2:driver counter}}"
     },
     "CounterWithout*{}{}": {
-      "snippet": "CounterWithout*{${1:counter1,${3:counter2},...}}{${2:driver counter}}"
+      "snippet": "CounterWithout*{${1:counter1,counter2,...}}{${2:driver counter}}"
     },
     "BinaryValue{}": {
       "snippet": "BinaryValue{${1:counter}}"
@@ -179,31 +179,31 @@
       "snippet": "xAlphAlph{${1:counter}}"
     },
     "CounterFormat{}": {
-      "snippet": "CounterFormat{${1:counter1!format1,${2:counter2!format2},...}}"
+      "snippet": "CounterFormat{${1:counter1!format1,counter2!format2,...}}"
     },
     "CounterFormat[]{}": {
-      "snippet": "CounterFormat[${2:options}]{${1:counter1!format1,${3:counter2!format2},...}}",
+      "snippet": "CounterFormat[${2:options}]{${1:counter1!format1,counter2!format2,...}}",
       "keyvalindex": 3,
       "keyvalpos": 0
     },
     "StoreCounterFormats{}": {
-      "snippet": "StoreCounterFormats{${1:shorthand1!macro1,${2:shorthand2!macro2},...}}"
+      "snippet": "StoreCounterFormats{${1:shorthand1!macro1,shorthand2!macro2,...}}"
     },
     "StoreCounterFormats[]{}": {
-      "snippet": "StoreCounterFormats[${2:options}]{${1:shorthand1!macro1,${3:shorthand2!macro2},...}}",
+      "snippet": "StoreCounterFormats[${2:options}]{${1:shorthand1!macro1,shorthand2!macro2,...}}",
       "keyvalindex": 4,
       "keyvalpos": 0
     },
     "AddCounterFormats{}": {
-      "snippet": "AddCounterFormats{${1:shorthand1!macro1,${2:shorthand2!macro2},...}}"
+      "snippet": "AddCounterFormats{${1:shorthand1!macro1,shorthand2!macro2,...}}"
     },
     "AddCounterFormats[]{}": {
-      "snippet": "AddCounterFormats[${2:options}]{${1:shorthand1!macro1,${3:shorthand2!macro2},...}}",
+      "snippet": "AddCounterFormats[${2:options}]{${1:shorthand1!macro1,shorthand2!macro2,...}}",
       "keyvalindex": 4,
       "keyvalpos": 0
     },
     "RemoveCounterFormats{}": {
-      "snippet": "RemoveCounterFormats{${1:shorthand1,${2:shorthand2},...}}"
+      "snippet": "RemoveCounterFormats{${1:shorthand1,shorthand2,...}}"
     },
     "DeclareAssociatedCounters{}{}": {
       "snippet": "DeclareAssociatedCounters{${1:driver counter}}{${2:assoc counter list}}"
@@ -253,10 +253,10 @@
       "snippet": "IsDriverCounter{${1:driver counter}}{${2:true}}{${3:false}}"
     },
     "DeclareCoupledCounters{}": {
-      "snippet": "DeclareCoupledCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "DeclareCoupledCounters{${1:counter1,counter2,...}}"
     },
     "DeclareCoupledCounters[]{}": {
-      "snippet": "DeclareCoupledCounters[${2:options}]{${1:counter1,${3:counter2},...}}",
+      "snippet": "DeclareCoupledCounters[${2:options}]{${1:counter1,counter2,...}}",
       "keyvalindex": 6,
       "keyvalpos": 0
     },
@@ -264,18 +264,18 @@
       "snippet": "DeclareCoupledCountersGroup{${1:group name}}"
     },
     "RemoveCoupledCounters{}": {
-      "snippet": "RemoveCoupledCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "RemoveCoupledCounters{${1:counter1,counter2,...}}"
     },
     "RemoveCoupledCounters[]{}": {
-      "snippet": "RemoveCoupledCounters[${2:options}]{${1:counter1,${3:counter2},...}}",
+      "snippet": "RemoveCoupledCounters[${2:options}]{${1:counter1,counter2,...}}",
       "keyvalindex": 7,
       "keyvalpos": 0
     },
     "AddCoupledCounters{}": {
-      "snippet": "AddCoupledCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "AddCoupledCounters{${1:counter1,counter2,...}}"
     },
     "AddCoupledCounters[]{}": {
-      "snippet": "AddCoupledCounters[${2:options}]{${1:counter1,${3:counter2},...}}"
+      "snippet": "AddCoupledCounters[${2:options}]{${1:counter1,counter2,...}}"
     },
     "ClearCoupledCounters{}": {
       "snippet": "ClearCoupledCounters{${1:options}}"
@@ -323,13 +323,13 @@
       "snippet": "IsPeriodicCounterF{${1:counter}}{${2:false}}"
     },
     "SuspendCounters{}": {
-      "snippet": "SuspendCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "SuspendCounters{${1:counter1,counter2,...}}"
     },
     "CascadeSuspendCounters{}": {
-      "snippet": "CascadeSuspendCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "CascadeSuspendCounters{${1:counter1,counter2,...}}"
     },
     "ResumeSuspendedCounters{}": {
-      "snippet": "ResumeSuspendedCounters{${1:counter1,${2:counter2},...}}"
+      "snippet": "ResumeSuspendedCounters{${1:counter1,counter2,...}}"
     },
     "ResumeAllSuspendedCounters": {},
     "IsSuspendedCounter{}{}{}": {
@@ -362,16 +362,16 @@
       "snippet": "IsTotalCounterF{${1:counter}}{${2:false}}"
     },
     "NewTotalDocumentCounter{}": {
-      "snippet": "NewTotalDocumentCounter{${1:total-counter1,${2:total-counter2},...}}"
+      "snippet": "NewTotalDocumentCounter{${1:total-counter1,total-counter2,...}}"
     },
     "NewTotalDocumentCounter[]{}": {
-      "snippet": "NewTotalDocumentCounter[${2:options}]{${1:total-counter1,${3:total-counter2},...}}"
+      "snippet": "NewTotalDocumentCounter[${2:options}]{${1:total-counter1,total-counter2,...}}"
     },
     "DeclareTotalDocumentCounter{}": {
-      "snippet": "DeclareTotalDocumentCounter{${1:total-counter1,${2:total-counter2},...}}"
+      "snippet": "DeclareTotalDocumentCounter{${1:total-counter1,total-counter2,...}}"
     },
     "DeclareTotalDocumentCounter[]{}": {
-      "snippet": "DeclareTotalDocumentCounter[${2:options}]{${1:total-counter1,${3:total-counter2},...}}"
+      "snippet": "DeclareTotalDocumentCounter[${2:options}]{${1:total-counter1,total-counter2,...}}"
     },
     "IsSuperTotalCounterTF{}{}{}": {
       "snippet": "IsSuperTotalCounterTF{${1:counter}}{${2:true}}{${3:false}}"
@@ -399,10 +399,10 @@
       "snippet": "LaTeXLabel[${2:cleveref overrule}]{${1:key}}"
     },
     "RegisterPreLabelHook{}": {
-      "snippet": "RegisterPreLabelHook{${1:cmd1,${2:cmd2},...}}"
+      "snippet": "RegisterPreLabelHook{${1:cmd1,cmd2,...}}"
     },
     "RegisterPostLabelHook{}": {
-      "snippet": "RegisterPostLabelHook{${1:cmd1,${2:cmd2},...}}"
+      "snippet": "RegisterPostLabelHook{${1:cmd1,cmd2,...}}"
     },
     "ClearPostLabelHook": {},
     "ClearPreLabelHook": {},
diff --git a/dev/packages/xcntperchap.json b/dev/packages/xcntperchap.json
index 1464e84d1..f09300ca1 100644
--- a/dev/packages/xcntperchap.json
+++ b/dev/packages/xcntperchap.json
@@ -6,10 +6,10 @@
   },
   "macros": {
     "RegisterTrackCounter{}{}": {
-      "snippet": "RegisterTrackCounter{${1:track counter}}{${2:counter1,${3:counter2},...}}"
+      "snippet": "RegisterTrackCounter{${1:track counter}}{${2:counter1,counter2,...}}"
     },
     "RegisterMultipleTrackCounters{}{}": {
-      "snippet": "RegisterMultipleTrackCounters{${1:trackcounter1,${3:trackcounter2},${4:...}}{${2:counter1},${5:counter2},...}}"
+      "snippet": "RegisterMultipleTrackCounters{${1:trackcounter1,trackcounter2,...}}{${2:counter1,counter2,...}}"
     },
     "ObtainTrackedValue{}{}": {
       "snippet": "ObtainTrackedValue{${1:track level}}{${2:tracked counter}}"
@@ -42,10 +42,10 @@
       "snippet": "ObtainTrackedValueByLabel[${3:counter}]{${1:label}}{${2:tracked counter}}"
     },
     "AddToTrackedCounters{}{}": {
-      "snippet": "AddToTrackedCounters{${1:trackedcounter1,${3:trackedcounter2},...}}{${2:counter value}}"
+      "snippet": "AddToTrackedCounters{${1:trackedcounter1,trackedcounter2,...}}{${2:counter value}}"
     },
     "RegisterCounters{}{}": {
-      "snippet": "RegisterCounters{${1:track counter}}{${2:counter1,${3:counter2},...}}"
+      "snippet": "RegisterCounters{${1:track counter}}{${2:counter1,counter2,...}}"
     },
     "CloseTrackFileForWrite": {},
     "GetStoredValues": {},
diff --git a/dev/packages/xcolor.json b/dev/packages/xcolor.json
deleted file mode 100644
index 11316fbe6..000000000
--- a/dev/packages/xcolor.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "includes": {
-    "color": [],
-    "colortbl": [
-      "table"
-    ]
-  },
-  "macros": {
-    "GetGinDriver": {},
-    "GinDriver": {},
-    "xcolorcmd": {},
-    "adjustUCRBG": {},
-    "rangeHsb": {},
-    "rangetHsb": {},
-    "rangeRGB": {},
-    "rangeHSB": {},
-    "rangeGray": {},
-    "substitutecolormodel{}{}": {
-      "snippet": "substitutecolormodel{${1:source model}}{${2:target model-list}}"
-    },
-    "selectcolormodel{}": {
-      "snippet": "selectcolormodel{${1:num model}}"
-    },
-    "ifconvertcolorsD": {},
-    "convertcolorsDtrue": {},
-    "convertcolorsDfalse": {},
-    "ifconvertcolorsU": {},
-    "convertcolorsUtrue": {},
-    "convertcolorsUfalse": {},
-    "definecolor{}{}{}": {
-      "snippet": "definecolor{${1:name}}{${2:model-list}}{${3:spec-list}}"
-    },
-    "definecolor[]{}{}{}": {
-      "snippet": "definecolor[${4:type}]{${1:name}}{${2:model-list}}{${3:spec-list}}"
-    },
-    "providecolor{}{}{}": {
-      "snippet": "providecolor{${1:name}}{${2:model-list}}{${3:spec-list}}"
-    },
-    "providecolor[]{}{}{}": {
-      "snippet": "providecolor[${4:type}]{${1:name}}{${2:model-list}}{${3:spec-list}}"
-    },
-    "colorlet{}{}": {
-      "snippet": "colorlet{${1:name}}{${2:color}}"
-    },
-    "colorlet{}[]{}": {
-      "snippet": "colorlet{${1:name}}[${2:num-model}]{${3:color}}"
-    },
-    "colorlet[]{}{}": {
-      "snippet": "colorlet[${3:type}]{${1:name}}{${2:color}}"
-    },
-    "colorlet[]{}[]{}": {
-      "snippet": "colorlet[${3:type}]{${1:name}}[${4:num-model}]{${2:color}}"
-    },
-    "definecolorset[]{}{}{}{}": {
-      "snippet": "definecolorset[${5:type}]{${1:model-list}}{${2:head}}{${3:tail}}{${4:set-spec}}"
-    },
-    "providecolorset[]{}{}{}{}": {
-      "snippet": "providecolorset[${5:type}]{${1:model-list}}{${2:head}}{${3:tail}}{${4:set-spec}}"
-    },
-    "preparecolor[]{}{}{}": {
-      "snippet": "preparecolor[${4:type}]{${1:name}}{${2:model-list}}{${3:spec-list}}"
-    },
-    "preparecolorset[]{}{}{}{}": {
-      "snippet": "preparecolorset[${5:type}]{${1:model-list}}{${2:head}}{${3:tail}}{${4:set-spec}}"
-    },
-    "ifdefinecolors": {},
-    "definecolorstrue": {},
-    "definecolorsfalse": {},
-    "definecolors{}": {
-      "snippet": "definecolors{${1:id-list}}"
-    },
-    "providecolors{}": {
-      "snippet": "providecolors{${1:id-list}}"
-    },
-    "ifglobalcolors": {},
-    "globalcolorstrue": {},
-    "globalcolorsfalse": {},
-    "xglobal": {},
-    "boxframe{}{}{}": {
-      "snippet": "boxframe{${1:width}}{${2:height}}{${3:depth}}"
-    },
-    "testcolor{}": {
-      "snippet": "testcolor{${1:color}}"
-    },
-    "testcolor[]{}": {
-      "snippet": "testcolor[${2:model-list}]{${1:spec-list}}"
-    },
-    "blendcolors{}": {
-      "snippet": "blendcolors{${1:mix-expr}}"
-    },
-    "blendcolors*{}": {
-      "snippet": "blendcolors*{${1:mix-expr}}"
-    },
-    "maskcolors{}": {
-      "snippet": "maskcolors{${1:color}}"
-    },
-    "maskcolors[]{}": {
-      "snippet": "maskcolors[${2:num-model}]{${1:color}}"
-    },
-    "ifmaskcolors": {},
-    "maskcolorstrue": {},
-    "maskcolorsfalse": {},
-    "colormask": {},
-    "definecolorseries{}{}{}{}{}": {
-      "snippet": "definecolorseries{${1:name}}{${2:core-model}}{${3:method}}{${4:b-spec}}{${5:s-spec}}"
-    },
-    "definecolorseries{}{}{}[]{}[]{}": {
-      "snippet": "definecolorseries{${1:name}}{${2:core-model}}{${3:method}}[${4:b-model}]{${5:b-spec}}[${6:s-model}]{${7:s-spec}}"
-    },
-    "resetcolorseries[]{}": {
-      "snippet": "resetcolorseries[${2:div}]{${1:name}}"
-    },
-    "colorseriescycle": {},
-    "extractcolorspec{}{}": {
-      "snippet": "extractcolorspec{${1:color}}{${2:cmd}}"
-    },
-    "extractcolorspecs{}{}{}": {
-      "snippet": "extractcolorspecs{${1:color}}{${2:model-cmd}}{${3:color-cmd}}"
-    },
-    "convertcolorspec{}{}{}{}": {
-      "snippet": "convertcolorspec{${1:model}}{${2:spec}}{${3:target-model}}{${4:cmd}}"
-    }
-  },
-  "envs": {
-    "testcolors": {},
-    "testcolors[]": {
-      "name": "testcolors",
-      "snippet": "[${1:model-list}]"
-    }
-  },
-  "options": [
-    "dvips",
-    "xdvi",
-    "dvipdf",
-    "dvipdfm",
-    "dvipdfmx",
-    "luatex",
-    "pdftex",
-    "dvipsone",
-    "dviwindo",
-    "emtex",
-    "dviwin",
-    "oztex",
-    "textures",
-    "pctexps",
-    "pctexwin",
-    "pctexhp",
-    "pctex32",
-    "truetex",
-    "tcidvi",
-    "vtex",
-    "xetex",
-    "dvisvgm",
-    "natural",
-    "rgb",
-    "cmy",
-    "cmyk",
-    "hsb",
-    "gray",
-    "RGB",
-    "HTML",
-    "HSB",
-    "Gray",
-    "monochrome",
-    "dvipsnames",
-    "dvipsnames*",
-    "svgnames",
-    "svgnames*",
-    "x11names",
-    "x11names*",
-    "table",
-    "prologue",
-    "kernelfbox",
-    "xcdraw",
-    "noxcdraw",
-    "fixinclude",
-    "showerrors",
-    "hideerrors"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xetex.json b/dev/packages/xetex.json
deleted file mode 100644
index 0914b10d2..000000000
--- a/dev/packages/xetex.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "XeTeXtracingfonts": {},
-    "XeTeXfonttype": {},
-    "XeTeXfirstfontchar": {},
-    "XeTeXlastfontchar": {},
-    "XeTeXglyph": {},
-    "XeTeXcountglyphs": {},
-    "XeTeXglyphname": {},
-    "XeTeXglyphindex": {},
-    "XeTeXcharglyph": {},
-    "XeTeXglyphbounds": {},
-    "XeTeXuseglyphmetrics": {},
-    "XeTeXgenerateactualtext": {},
-    "XeTeXOTcountscripts": {},
-    "XeTeXOTscripttag": {},
-    "XeTeXOTcountlanguages": {},
-    "XeTeXOTlanguagetag": {},
-    "XeTeXOTcountfeatures": {},
-    "XeTeXOTfeaturetag": {},
-    "XeTeXcountfeatures": {},
-    "XeTeXfeaturecode": {},
-    "XeTeXfeaturename": {},
-    "XeTeXisexclusivefeature": {},
-    "XeTeXfindfeaturebyname": {},
-    "XeTeXcountselectors": {},
-    "XeTeXselectorcode": {},
-    "XeTeXselectorname": {},
-    "XeTeXisdefaultselector": {},
-    "XeTeXfindselectorbyname": {},
-    "XeTeXcountvariations": {},
-    "XeTeXvariation": {},
-    "XeTeXvariationname": {},
-    "XeTeXvariationmin": {},
-    "XeTeXvariationmax": {},
-    "XeTeXvariationdefault": {},
-    "XeTeXfindvariationbyname": {},
-    "XeTeXinterwordspaceshaping": {},
-    "Umathcode": {},
-    "Umathcodenum": {},
-    "Umathchar": {},
-    "Umathcharnum": {},
-    "Umathchardef": {},
-    "Umathchardef{}": {
-      "snippet": "Umathchardef{${1:cmd}}"
-    },
-    "Umathcharnumdef": {},
-    "Umathcharnumdef{}": {
-      "snippet": "Umathcharnumdef{${1:cmd}}"
-    },
-    "Udelcode": {},
-    "Udelcodenum": {},
-    "Udelimiter": {},
-    "Umathaccent": {},
-    "Uradical": {},
-    "Uchar": {},
-    "Ucharcat": {},
-    "XeTeXinterchartokenstate": {},
-    "newXeTeXintercharclass": {},
-    "newXeTeXintercharclass{}": {
-      "snippet": "newXeTeXintercharclass{${1:cmd}}"
-    },
-    "XeTeXcharclass": {},
-    "XeTeXinterchartoks": {},
-    "XeTeXinputnormalization": {},
-    "XeTeXinputencoding": {},
-    "XeTeXdefaultencoding": {},
-    "XeTeXdashbreakstate": {},
-    "XeTeXlinebreaklocale": {},
-    "XeTeXlinebreakskip": {},
-    "XeTeXlinebreakpenalty": {},
-    "XeTeXupwardsmode": {},
-    "XeTeXhyphenatablelength": {},
-    "XeTeXpicfile": {},
-    "XeTeXpdffile": {},
-    "XeTeXpdfpagecount": {},
-    "XeTeXprotrudechars": {},
-    "pdfpageheight": {},
-    "pdfpagewidth": {},
-    "pdfsavepos": {},
-    "pdflastxpos": {},
-    "pdflastypos": {},
-    "expanded": {},
-    "ifincsname": {},
-    "ifprimitive": {},
-    "primitive": {},
-    "shellescape": {},
-    "strcmp{}{}": {
-      "snippet": "strcmp{${1:arg1}}{${2:arg2}}"
-    },
-    "normaldeviate": {},
-    "randomseed": {},
-    "setrandomseed": {},
-    "uniformdeviate": {},
-    "elapsedtime": {},
-    "resettimer": {},
-    "creationdate": {},
-    "filedump": {},
-    "filemoddate{}": {
-      "snippet": "filemoddate{${1:file}}"
-    },
-    "filesize{}": {
-      "snippet": "filesize{${1:file}}"
-    },
-    "mdfivesum": {},
-    "pdfmapfile{}": {
-      "snippet": "pdfmapfile{${1:file}}"
-    },
-    "pdfmapline{}": {
-      "snippet": "pdfmapline{${1:map spec}}"
-    },
-    "suppressfontnotfounderror": {},
-    "XeTeXversion": {},
-    "XeTeXrevision": {},
-    "XeTeXmathcode": {},
-    "XeTeXmathcodenum": {},
-    "XeTeXmathchar": {},
-    "XeTeXmathcharnum": {},
-    "XeTeXmathchardef": {},
-    "XeTeXmathcharnumdef": {},
-    "XeTeXdelcode": {},
-    "XeTeXdelcodenum": {},
-    "XeTeXdelimiter": {},
-    "XeTeXmathaccent": {},
-    "XeTeXradical": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xfp.json b/dev/packages/xfp.json
deleted file mode 100644
index bd04b2481..000000000
--- a/dev/packages/xfp.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "includes": {},
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xintcfrac.json b/dev/packages/xintcfrac.json
index 9ad007717..cfd04684d 100644
--- a/dev/packages/xintcfrac.json
+++ b/dev/packages/xintcfrac.json
@@ -43,13 +43,13 @@
       "snippet": "xintFtoCC{${1:A/B}}"
     },
     "xintCstoF{}": {
-      "snippet": "xintCstoF{${1:num1,${2:num2},...}}"
+      "snippet": "xintCstoF{${1:num1,num2,...}}"
     },
     "xintGCtoF{}": {
       "snippet": "xintGCtoF{${1:expr}}"
     },
     "xintCstoCv{}": {
-      "snippet": "xintCstoCv{${1:num1,${2:num2},...}}"
+      "snippet": "xintCstoCv{${1:num1,num2,...}}"
     },
     "xintGCtoCv{}": {
       "snippet": "xintGCtoCv{${1:expr}}"
@@ -76,16 +76,16 @@
       "snippet": "xintGCntoGC{${1:integer}}{${2:macro1}}{${3:macro2}}"
     },
     "xintCstoGC{}": {
-      "snippet": "xintCstoGC{${1:num1,${2:num2},...}}"
+      "snippet": "xintCstoGC{${1:num1,num2,...}}"
     },
     "xintiCstoF{}": {
-      "snippet": "xintiCstoF{${1:integer1,${2:integer2},...}}"
+      "snippet": "xintiCstoF{${1:integer1,integer2,...}}"
     },
     "xintiGCtoF{}": {
       "snippet": "xintiGCtoF{${1:integer expr}}"
     },
     "xintiCstoCv{}": {
-      "snippet": "xintiCstoCv{${1:integer1,${2:integer2},...}}"
+      "snippet": "xintiCstoCv{${1:integer1,integer2,...}}"
     },
     "xintiGCtoCv{}": {
       "snippet": "xintiGCtoCv{${1:integer expr}}"
diff --git a/dev/packages/xlop.json b/dev/packages/xlop.json
index 8b2efd72d..76eca14a9 100644
--- a/dev/packages/xlop.json
+++ b/dev/packages/xlop.json
@@ -80,18 +80,6 @@
     "opdisplay[]{}{}": {
       "snippet": "opdisplay[${3:specs}]{${1:style}}{${2:number}}"
     },
-    "oplput(){}": {
-      "snippet": "oplput(${2:x},${3:y}){${1:text}}"
-    },
-    "oprput(){}": {
-      "snippet": "oprput(${2:x},${3:y}){${1:text}}"
-    },
-    "ophline(){}": {
-      "snippet": "ophline(${2:x},${3:y}){${1:length}}"
-    },
-    "opvline(){}": {
-      "snippet": "opvline(${2:x},${3:y}){${1:length}}"
-    },
     "opexport{}{}": {
       "snippet": "opexport{${1:number}}{${2:cmd}}"
     },
diff --git a/dev/packages/xob-font.json b/dev/packages/xob-font.json
index 1960ead96..7a76b021a 100644
--- a/dev/packages/xob-font.json
+++ b/dev/packages/xob-font.json
@@ -6,114 +6,6 @@
     "ob-unfontsdefault": []
   },
   "macros": {
-    "setkomainfont()": {
-      "snippet": "setkomainfont(${1:Regular})"
-    },
-    "setkomainfont()()": {
-      "snippet": "setkomainfont(${1:Regular})(${2:Bold})"
-    },
-    "setkomainfont()()()": {
-      "snippet": "setkomainfont(${1:Regular})(${2:Bold})(${3:Italic})"
-    },
-    "setkomainfont[]()": {
-      "snippet": "setkomainfont[${1:basename}](${2:Regular})"
-    },
-    "setkomainfont[]()()": {
-      "snippet": "setkomainfont[${1:basename}](${2:Regular})(${3:Bold})"
-    },
-    "setkomainfont[]()()()": {
-      "snippet": "setkomainfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
-    },
-    "setkosansfont()": {
-      "snippet": "setkosansfont(${1:Regular})"
-    },
-    "setkosansfont()()": {
-      "snippet": "setkosansfont(${1:Regular})(${2:Bold})"
-    },
-    "setkosansfont()()()": {
-      "snippet": "setkosansfont(${1:Regular})(${2:Bold})(${3:Italic})"
-    },
-    "setkosansfont[]()": {
-      "snippet": "setkosansfont[${1:basename}](${2:Regular})"
-    },
-    "setkosansfont[]()()": {
-      "snippet": "setkosansfont[${1:basename}](${2:Regular})(${3:Bold})"
-    },
-    "setkosansfont[]()()()": {
-      "snippet": "setkosansfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
-    },
-    "setkomonofont()": {
-      "snippet": "setkomonofont(${1:Regular})"
-    },
-    "setkomonofont()()": {
-      "snippet": "setkomonofont(${1:Regular})(${2:Bold})"
-    },
-    "setkomonofont()()()": {
-      "snippet": "setkomonofont(${1:Regular})(${2:Bold})(${3:Italic})"
-    },
-    "setkomonofont[]()": {
-      "snippet": "setkomonofont[${1:basename}](${2:Regular})"
-    },
-    "setkomonofont[]()()": {
-      "snippet": "setkomonofont[${1:basename}](${2:Regular})(${3:Bold})"
-    },
-    "setkomonofont[]()()()": {
-      "snippet": "setkomonofont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
-    },
-    "setobmainfont()": {
-      "snippet": "setobmainfont(${1:Regular})"
-    },
-    "setobmainfont()()": {
-      "snippet": "setobmainfont(${1:Regular})(${2:Bold})"
-    },
-    "setobmainfont()()()": {
-      "snippet": "setobmainfont(${1:Regular})(${2:Bold})(${3:Italic})"
-    },
-    "setobmainfont[]()": {
-      "snippet": "setobmainfont[${1:basename}](${2:Regular})"
-    },
-    "setobmainfont[]()()": {
-      "snippet": "setobmainfont[${1:basename}](${2:Regular})(${3:Bold})"
-    },
-    "setobmainfont[]()()()": {
-      "snippet": "setobmainfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
-    },
-    "setobsansfont()": {
-      "snippet": "setobsansfont(${1:Regular})"
-    },
-    "setobsansfont()()": {
-      "snippet": "setobsansfont(${1:Regular})(${2:Bold})"
-    },
-    "setobsansfont()()()": {
-      "snippet": "setobsansfont(${1:Regular})(${2:Bold})(${3:Italic})"
-    },
-    "setobsansfont[]()": {
-      "snippet": "setobsansfont[${1:basename}](${2:Regular})"
-    },
-    "setobsansfont[]()()": {
-      "snippet": "setobsansfont[${1:basename}](${2:Regular})(${3:Bold})"
-    },
-    "setobsansfont[]()()()": {
-      "snippet": "setobsansfont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
-    },
-    "setobmonofont()": {
-      "snippet": "setobmonofont(${1:Regular})"
-    },
-    "setobmonofont()()": {
-      "snippet": "setobmonofont(${1:Regular})(${2:Bold})"
-    },
-    "setobmonofont()()()": {
-      "snippet": "setobmonofont(${1:Regular})(${2:Bold})(${3:Italic})"
-    },
-    "setobmonofont[]()": {
-      "snippet": "setobmonofont[${1:basename}](${2:Regular})"
-    },
-    "setobmonofont[]()()": {
-      "snippet": "setobmonofont[${1:basename}](${2:Regular})(${3:Bold})"
-    },
-    "setobmonofont[]()()()": {
-      "snippet": "setobmonofont[${1:basename}](${2:Regular})(${3:Bold})(${4:Italic})"
-    },
     "compressbnms": {},
     "setmonoscale{}": {
       "snippet": "setmonoscale{${1:factor}}"
@@ -130,21 +22,12 @@
     "setkormainfont{}": {
       "snippet": "setkormainfont{${1:Regular}}"
     },
-    "setkormainfont()(){}": {
-      "snippet": "setkormainfont(${2:Bold})(${3:Italic}){${1:Regular}}"
-    },
     "setkorsansfont{}": {
       "snippet": "setkorsansfont{${1:Regular}}"
     },
-    "setkorsansfont()(){}": {
-      "snippet": "setkorsansfont(${2:Bold})(${3:Italic}){${1:Regular}}"
-    },
     "setkormonofont{}": {
       "snippet": "setkormonofont{${1:Regular}}"
     },
-    "setkormonofont()(){}": {
-      "snippet": "setkormonofont(${2:Bold})(${3:Italic}){${1:Regular}}"
-    },
     "setkorfontorigmethod{}{}": {
       "snippet": "setkorfontorigmethod{${1:arg1}}{${2:arg2}}"
     },
diff --git a/dev/packages/xpatch.json b/dev/packages/xpatch.json
deleted file mode 100644
index 9d146fed5..000000000
--- a/dev/packages/xpatch.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "includes": {
-    "etoolbox": [],
-    "patch-common": []
-  },
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xpicture.json b/dev/packages/xpicture.json
index 20d22a4eb..6bcf012d2 100644
--- a/dev/packages/xpicture.json
+++ b/dev/packages/xpicture.json
@@ -14,15 +14,6 @@
     "pictcolor{}": {
       "snippet": "pictcolor{${1:color}}"
     },
-    "referencesystem()()()": {
-      "snippet": "referencesystem(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "changereferencesystem()()()": {
-      "snippet": "changereferencesystem(${1:x0},${2:y0})(${3:x1},${4:y1})(${5:x2},${6:y2})"
-    },
-    "translateorigin()": {
-      "snippet": "translateorigin(${1:x0},${2:y0})"
-    },
     "rotateaxes{}": {
       "snippet": "rotateaxes{${1:angle}}"
     },
@@ -35,9 +26,6 @@
     "cartesianreference": {},
     "polarreference": {},
     "draftPictures": {},
-    "cartesianaxes()()": {
-      "snippet": "cartesianaxes(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
     "axescolor": {},
     "axesthickness": {},
     "xunitdivisions": {},
@@ -111,9 +99,6 @@
     "printyticslabels[]{}{}{}": {
       "snippet": "printyticslabels[${4:digits}]{${1:firstcoor}}{${2:incr}}{${3:bound}}"
     },
-    "cartesiangrid()()": {
-      "snippet": "cartesiangrid(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
     "gridcolor": {},
     "secundarygridcolor": {},
     "gridthickness": {},
@@ -125,27 +110,6 @@
     "degreespolarlabels": {},
     "radianspolarlabels": {},
     "rlabelpos": {},
-    "Put(){}": {
-      "snippet": "Put(${2:x},${3:y}){${1:object}}"
-    },
-    "Put[](){}": {
-      "snippet": "Put[${2:position}](${3:x},${4:y}){${1:object}}"
-    },
-    "Put*(){}": {
-      "snippet": "Put*(${2:x},${3:y}){${1:object}}"
-    },
-    "Put*[](){}": {
-      "snippet": "Put*[${2:position}](${3:x},${4:y}){${1:object}}"
-    },
-    "cPut{}(){}": {
-      "snippet": "cPut{${1:position}}(${3:x},${4:y}){${2:object}}"
-    },
-    "rPut{}(){}": {
-      "snippet": "rPut{${1:position}}(${3:x},${4:y}){${2:object}}"
-    },
-    "rPut*{}(){}": {
-      "snippet": "rPut*{${1:position}}(${3:x},${4:y}){${2:object}}"
-    },
     "Pictlabelsep": {},
     "defaultPut{}": {
       "snippet": "defaultPut{${1:c|r}}"
@@ -153,54 +117,9 @@
     "highestlabel{}": {
       "snippet": "highestlabel{${1:text}}"
     },
-    "multiPut()(){}{}": {
-      "snippet": "multiPut(${3:x0},${4:y0})(${5:∆x},${6:∆y}){${1:n}}{${2:object}}"
-    },
-    "multiPut[]()(){}{}": {
-      "snippet": "multiPut[${3:position}](${4:x0},${5:y0})(${6:∆x},${7:∆y}){${1:n}}{${2:object}}"
-    },
-    "multiPut*()(){}{}": {
-      "snippet": "multiPut*(${3:x0},${4:y0})(${5:∆x},${6:∆y}){${1:n}}{${2:object}}"
-    },
-    "multiPut*[]()(){}{}": {
-      "snippet": "multiPut*[${3:position}](${4:x0},${5:y0})(${6:∆x},${7:∆y}){${1:n}}{${2:object}}"
-    },
-    "multicPut{}()(){}{}": {
-      "snippet": "multicPut{${1:position}}(${4:x0},${5:y0})(${6:∆x},${7:∆y}){${2:n}}{${3:object}}"
-    },
-    "multirPut{}()(){}{}": {
-      "snippet": "multirPut{${1:position}}(${4:x0},${5:y0})(${6:∆x},${7:∆y}){${2:n}}{${3:object}}"
-    },
-    "multirPut*{}()(){}{}": {
-      "snippet": "multirPut*{${1:position}}(${4:x0},${5:y0})(${6:∆x},${7:∆y}){${2:n}}{${3:object}}"
-    },
-    "xLINE()()": {
-      "snippet": "xLINE(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "xVECTOR()()": {
-      "snippet": "xVECTOR(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "xtrivVECTOR()()": {
-      "snippet": "xtrivVECTOR(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
     "arrowsize{}{}": {
       "snippet": "arrowsize{${1:xlen}}{${2:ylen}}"
     },
-    "xline(){}": {
-      "snippet": "xline(${2:x},${3:y}){${1:size}}"
-    },
-    "xvector(){}": {
-      "snippet": "xvector(${2:x},${3:y}){${1:size}}"
-    },
-    "xtrivvector(){}": {
-      "snippet": "xtrivvector(${2:x},${3:y}){${1:size}}"
-    },
-    "zerovector()": {
-      "snippet": "zerovector(${1:x},${2:y})"
-    },
-    "zerotrivvector()": {
-      "snippet": "zerotrivvector(${1:x},${2:y})"
-    },
     "regularPolygon{}{}": {
       "snippet": "regularPolygon{${1:radius}}{${2:sides}}"
     },
@@ -261,9 +180,6 @@
     },
     "pointmarkdiam": {},
     "pointmark": {},
-    "qCurve()()()()": {
-      "snippet": "qCurve(${1:x0},${2:y0})(${3:u0},${4:v0})(${5:x1},${6:y1})(${7:u1},${8:v1})"
-    },
     "bgfalse": {},
     "bgtrue": {},
     "degreesfalse": {},
@@ -292,9 +208,6 @@
     "labelstrue": {},
     "makegrid": {},
     "makenogrid": {},
-    "polarcoor()()": {
-      "snippet": "polarcoor(${1:a},${2:b})(${3:c},${4:d})"
-    },
     "polarfalse": {},
     "polartrue": {},
     "qCOS{}{}": {
@@ -303,32 +216,8 @@
     "qSIN{}{}": {
       "snippet": "qSIN{${1:angle}}{${2:cmd}}"
     },
-    "qUNITVECTOR()()": {
-      "snippet": "qUNITVECTOR(${1:a},${2:b})(${3:c},${4:d})"
-    },
-    "refsysPoint()()": {
-      "snippet": "refsysPoint(${1:a},${2:b})(${3:c},${4:d})"
-    },
-    "refsyspPoint()()": {
-      "snippet": "refsyspPoint(${1:a},${2:b})(${3:c},${4:d})"
-    },
-    "refsyspVector()()": {
-      "snippet": "refsyspVector(${1:a},${2:b})(${3:c},${4:d})"
-    },
-    "refsysVector()()": {
-      "snippet": "refsysVector(${1:a},${2:b})(${3:c},${4:d})"
-    },
-    "refsysxyPoint()()": {
-      "snippet": "refsysxyPoint(${1:a},${2:b})(${3:c},${4:d})"
-    },
-    "refsysxyVector()()": {
-      "snippet": "refsysxyVector(${1:a},${2:b})(${3:c},${4:d})"
-    },
     "rputstarfalse": {},
     "rputstartrue": {},
-    "strline()()": {
-      "snippet": "strline(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
     "themultiput": {},
     "ticsfalse": {},
     "ticslabelsgridfalse": {},
@@ -339,24 +228,7 @@
     "yone": {},
     "yzero": {}
   },
-  "envs": {
-    "Picture(x0,y0)(x1,y1)": {
-      "name": "Picture",
-      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "Picture[](x0,y0)(x1,y1)": {
-      "name": "Picture",
-      "snippet": "[${1:color}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    },
-    "xpicture(x0,y0)(x1,y1)": {
-      "name": "xpicture",
-      "snippet": "(${1:x0},${2:y0})(${3:x1},${4:y1})"
-    },
-    "xpicture[](x0,y0)(x1,y1)": {
-      "name": "xpicture",
-      "snippet": "[${1:color}](${2:x0},${3:y0})(${4:x1},${5:y1})"
-    }
-  },
+  "envs": {},
   "options": [
     "draft",
     "dvips",
diff --git a/dev/packages/xr-hyper.json b/dev/packages/xr-hyper.json
index fcd85a14a..1d1deb818 100644
--- a/dev/packages/xr-hyper.json
+++ b/dev/packages/xr-hyper.json
@@ -1,8 +1,25 @@
 {
-  "includes": {
-    "xr": []
+  "includes": {},
+  "macros": {
+    "externaldocument{}": {
+      "snippet": "externaldocument{${1:file}}"
+    },
+    "externaldocument[]{}": {
+      "snippet": "externaldocument[${2:prefix}]{${1:file}}"
+    },
+    "externaldocument[][]{}": {
+      "snippet": "externaldocument[${2:prefix}][${3:nocite}]{${1:file}}"
+    },
+    "externaldocument{}[]": {
+      "snippet": "externaldocument{${1:file}}[${2:URL}]"
+    },
+    "externalcitedocument{}": {
+      "snippet": "externalcitedocument{${1:file}}"
+    },
+    "externalcitedocument[]{}": {
+      "snippet": "externalcitedocument[${2:prefix}]{${1:file}}"
+    }
   },
-  "macros": {},
   "envs": {},
   "options": [],
   "keyvals": []
diff --git a/dev/packages/xr.json b/dev/packages/xr.json
deleted file mode 100644
index 0c0a344a8..000000000
--- a/dev/packages/xr.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "externaldocument{}": {
-      "snippet": "externaldocument{${1:file}}"
-    },
-    "externaldocument[]{}": {
-      "snippet": "externaldocument[${2:prefix}]{${1:file}}"
-    },
-    "externaldocument[][]{}": {
-      "snippet": "externaldocument[${2:prefix}][${3:nocite}]{${1:file}}"
-    },
-    "externaldocument{}[]": {
-      "snippet": "externaldocument{${1:file}}[${2:URL}]"
-    },
-    "externalcitedocument{}": {
-      "snippet": "externalcitedocument{${1:file}}"
-    },
-    "externalcitedocument[]{}": {
-      "snippet": "externalcitedocument[${2:prefix}]{${1:file}}"
-    },
-    "externalcitedocument[][]{}": {
-      "snippet": "externalcitedocument[${2:prefix}][${3:nocite}]{${1:file}}"
-    },
-    "externalcitedocument{}[]": {
-      "snippet": "externalcitedocument{${1:file}}[${2:URL}]"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xskak.json b/dev/packages/xskak.json
index 24eb8bbe5..eccb954ce 100644
--- a/dev/packages/xskak.json
+++ b/dev/packages/xskak.json
@@ -106,9 +106,6 @@
     "ifxskakboolpromotion": {},
     "ifxskakboolvar": {},
     "ifxskakpdfmatch": {},
-    "ParseCastlingAA()": {
-      "snippet": "ParseCastlingAA(${1:arg})"
-    },
     "skaklongmoves": {},
     "variationmovemode": {},
     "xskakboolcapturefalse": {},
diff --git a/dev/packages/xspace.json b/dev/packages/xspace.json
deleted file mode 100644
index 862583f6d..000000000
--- a/dev/packages/xspace.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "includes": {},
-  "macros": {
-    "xspace": {},
-    "xspaceaddexceptions{}": {
-      "snippet": "xspaceaddexceptions{${1:arg}}"
-    },
-    "xspaceremoveexception{}": {
-      "snippet": "xspaceremoveexception{${1:arg}}"
-    }
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xtemplate.json b/dev/packages/xtemplate.json
index f307a1a41..214f6d181 100644
--- a/dev/packages/xtemplate.json
+++ b/dev/packages/xtemplate.json
@@ -4,6 +4,19 @@
     "DeclareObjectType{}{}": {
       "snippet": "DeclareObjectType{${1:object type}}{${2:args}}"
     },
+    "DeclareTemplateInterface{}{}{}{}": {
+      "snippet": "DeclareTemplateInterface{${1:object type}}{${2:template}}{${3:args}}{${4:key list}}"
+    },
+    "KeyValue{}": {
+      "snippet": "KeyValue{${1:key name}}"
+    },
+    "DeclareTemplateCode{}{}{}{}{}": {
+      "snippet": "DeclareTemplateCode{${1:object type}}{${2:template}}{${3:args}}{${4:key bindings}}{${5:code}}"
+    },
+    "AssignTemplateKeys": {},
+    "DeclareInstance{}{}{}{}": {
+      "snippet": "DeclareInstance{${1:object type}}{${2:instance}}{${3:template}}{${4:parameters}}"
+    },
     "IfInstanceExistT{}{}{}{}": {
       "snippet": "IfInstanceExistT{${1:object type}}{${2:instance}}{${3:true}}{${4:false}}"
     },
@@ -13,8 +26,41 @@
     "IfInstanceExistTF{}{}{}{}": {
       "snippet": "IfInstanceExistTF{${1:object type}}{${2:instance}}{${3:true}}{${4:false}}"
     },
+    "DeclareInstanceCopy{}{}{}": {
+      "snippet": "DeclareInstanceCopy{${1:object type}}{${2:instance1}}{${3:instance2}}"
+    },
+    "UseInstance{}{}": {
+      "snippet": "UseInstance{${1:object type}}{${2:instance}}"
+    },
+    "UseTemplate{}{}{}": {
+      "snippet": "UseTemplate{${1:object type}}{${2:template}}{${3:settings}}"
+    },
+    "EditTemplateDefaults{}{}{}": {
+      "snippet": "EditTemplateDefaults{${1:object type}}{${2:template}}{${3:new defaults}}"
+    },
+    "EditInstance{}{}{}": {
+      "snippet": "EditInstance{${1:object type}}{${2:instance}}{${3:new values}}"
+    },
     "DeclareRestrictedTemplate{}{}{}{}": {
       "snippet": "DeclareRestrictedTemplate{${1:object type}}{${2:parent template}}{${3:new template}}{${4:parameters}}"
+    },
+    "SetTemplateKeys{}{}{}": {
+      "snippet": "SetTemplateKeys{${1:object type}}{${2:template}}{${3:keyvals}}"
+    },
+    "ShowInstanceValues{}{}": {
+      "snippet": "ShowInstanceValues{${1:object type}}{${2:instance}}"
+    },
+    "ShowTemplateCode{}{}": {
+      "snippet": "ShowTemplateCode{${1:object type}}{${2:template}}"
+    },
+    "ShowTemplateDefaults{}{}": {
+      "snippet": "ShowTemplateDefaults{${1:object type}}{${2:template}}"
+    },
+    "ShowTemplateInterface{}{}": {
+      "snippet": "ShowTemplateInterface{${1:object type}}{${2:template}}"
+    },
+    "ShowTemplateVariables{}{}": {
+      "snippet": "ShowTemplateVariables{${1:object type}}{${2:template}}"
     }
   },
   "envs": {},
diff --git a/dev/packages/xy.json b/dev/packages/xy.json
deleted file mode 100644
index e40a1f458..000000000
--- a/dev/packages/xy.json
+++ /dev/null
@@ -1,370 +0,0 @@
-{
-  "includes": {
-    "ifpdf": []
-  },
-  "macros": {
-    "xyoption{}": {
-      "snippet": "xyoption{${1:option}}"
-    },
-    "xyrequire{}": {
-      "snippet": "xyrequire{${1:option}}"
-    },
-    "xywithoption{}{}": {
-      "snippet": "xywithoption{${1:option}}{${2:code}}"
-    },
-    "xyeverywithoption{}{}": {
-      "snippet": "xyeverywithoption{${1:option}}{${2:code}}"
-    },
-    "xyeveryrequest{}{}": {
-      "snippet": "xyeveryrequest{${1:option}}{${2:code}}"
-    },
-    "afterPATH{}": {
-      "snippet": "afterPATH{${1:decor}}"
-    },
-    "afterPOS{}": {
-      "snippet": "afterPOS{${1:decor}}"
-    },
-    "AliasPattern{}{}{}": {
-      "snippet": "AliasPattern{${1:alias}}{${2:name}}{${3:file}}"
-    },
-    "ar[]": {
-      "snippet": "ar[${1:hop}]"
-    },
-    "arrowobject{}": {
-      "snippet": "arrowobject{${1:object}}"
-    },
-    "cir{}": {
-      "snippet": "cir{${1:spec}}"
-    },
-    "cir<>{}": {
-      "snippet": "cir<${2:radius}>{${1:spec}}"
-    },
-    "circleEdge": {},
-    "Col": {},
-    "CompileFixPoint{}": {
-      "snippet": "CompileFixPoint{${1:id}}"
-    },
-    "CompileMatrices": {},
-    "CompilePrefix{}": {
-      "snippet": "CompilePrefix{${1:prefix}}"
-    },
-    "composite{}": {
-      "snippet": "composite{${1:objects}}"
-    },
-    "connect": {},
-    "croplattice{}{}{}{}{}{}{}{}": {
-      "snippet": "croplattice{${1:pt1}}{${2:pt2}}{${3:pt3}}{${4:pt4}}{${5:pt5}}{${6:pt6}}{${7:pt7}}{${8:pt8}}"
-    },
-    "crv{}": {
-      "snippet": "crv{${1:poslist}}"
-    },
-    "crvs{}": {
-      "snippet": "crvs{${1:dir}}"
-    },
-    "curve{}": {
-      "snippet": "curve{${1:poslist}}"
-    },
-    "curveobject{}": {
-      "snippet": "curveobject{${1:object}}"
-    },
-    "ddtwocell": {},
-    "defaultlatticebody": {},
-    "dir{}": {
-      "snippet": "dir{${1:dir}}"
-    },
-    "Direction": {},
-    "dltwocell": {},
-    "drop": {},
-    "drtwocell": {},
-    "dtwocell": {},
-    "dumpPSdict{}": {
-      "snippet": "dumpPSdict{${1:filename}}"
-    },
-    "dutwocell": {},
-    "ellipse{}": {
-      "snippet": "ellipse{${1:style}}"
-    },
-    "ellipse<>{}": {
-      "snippet": "ellipse<${2:dimen}>{${1:style}}"
-    },
-    "endxy": {},
-    "frm{}": {
-      "snippet": "frm{${1:frame}}"
-    },
-    "halfrootthree": {},
-    "halfroottwo": {},
-    "knotstyle{}": {
-      "snippet": "knotstyle{${1:char}}"
-    },
-    "knotSTYLE{}": {
-      "snippet": "knotSTYLE{${1:code}}"
-    },
-    "knotstyles{}{}": {
-      "snippet": "knotstyles{${1:char1}}{${2:char2}}"
-    },
-    "labelbox": {},
-    "labelmargin": {},
-    "labelstyle": {},
-    "latticeA": {},
-    "latticeB": {},
-    "latticebody": {},
-    "latticeX": {},
-    "latticeY": {},
-    "ldtwocell": {},
-    "lltwocell": {},
-    "LoadAllPatterns{}": {
-      "snippet": "LoadAllPatterns{${1:file}}"
-    },
-    "LoadPattern{}{}": {
-      "snippet": "LoadPattern{${1:name}}{${2:file}}"
-    },
-    "lowercurveobject{}": {
-      "snippet": "lowercurveobject{${1:object}}"
-    },
-    "lrtwocell": {},
-    "ltwocell": {},
-    "lutwocell": {},
-    "MakeOutlines": {},
-    "maxTPICpoints{}": {
-      "snippet": "maxTPICpoints{${1:number}}"
-    },
-    "modmapobject{}": {
-      "snippet": "modmapobject{${1:object}}"
-    },
-    "MovieSetup{}": {
-      "snippet": "MovieSetup{${1:width=width,height=height}}"
-    },
-    "MultipleDrivers": {},
-    "newdir{}{}": {
-      "snippet": "newdir{${1:directional}}{${2:composite}}"
-    },
-    "newgraphescape{}{}": {
-      "snippet": "newgraphescape{${1:letter}}{${2:graph}}"
-    },
-    "newxycolor{}{}": {
-      "snippet": "newxycolor{${1:name}}{${2:code}}"
-    },
-    "newxypattern{}{}": {
-      "snippet": "newxypattern{${1:name}}{${2:data}}"
-    },
-    "NoCompileMatrices": {},
-    "NoEMspecials": {},
-    "NoOutlines": {},
-    "NoPScolor": {},
-    "NoPSframes": {},
-    "NoPSlines": {},
-    "NoPSrotate": {},
-    "NoPSspecials": {},
-    "NoPStiles": {},
-    "NoResizing": {},
-    "NoRules": {},
-    "NoTips": {},
-    "NoTPICframes": {},
-    "NoTPICspecials": {},
-    "object": {},
-    "objectbox{}": {
-      "snippet": "objectbox{${1:text}}"
-    },
-    "objectheight": {},
-    "objectmargin": {},
-    "objectstyle": {},
-    "objectwidth": {},
-    "OnlyOutlines": {},
-    "partroottwo": {},
-    "PATH": {},
-    "PATHafterPOS": {},
-    "POS": {},
-    "qspline{}": {
-      "snippet": "qspline{${1:style}}"
-    },
-    "rdtwocell": {},
-    "rectangleEdge": {},
-    "restore": {},
-    "rltwocell": {},
-    "Row": {},
-    "rrtwocell": {},
-    "rtwocell": {},
-    "rutwocell": {},
-    "save": {},
-    "scene": {},
-    "SelectTips{}{}": {
-      "snippet": "SelectTips{${1:family}}{${2:size}}"
-    },
-    "ShowOutlines": {},
-    "SilentMatrices": {},
-    "SloppyCurves": {},
-    "splinetolerance{}": {
-      "snippet": "splinetolerance{${1:dimen}}"
-    },
-    "turnradius": {},
-    "twocell": {},
-    "twocellhead{}": {
-      "snippet": "twocellhead{${1:object}}"
-    },
-    "twocellstyle": {},
-    "twocelltail{}": {
-      "snippet": "twocelltail{${1:object}}"
-    },
-    "txt{}": {
-      "snippet": "txt{${1:text}}"
-    },
-    "txt<>{}": {
-      "snippet": "txt<${2:width}>{${1:text}}"
-    },
-    "udtwocell": {},
-    "ultwocell": {},
-    "uppercurveobject{}": {
-      "snippet": "uppercurveobject{${1:object}}"
-    },
-    "urtwocell": {},
-    "UseAllTwocells": {},
-    "UseCompositeMaps": {},
-    "UseCrayolaColors": {},
-    "UseCurvedFrames": {},
-    "UseEMspecials": {},
-    "UseFontFrames": {},
-    "UseHalfTwocells": {},
-    "UsePatternFile{}": {
-      "snippet": "UsePatternFile{${1:file}}"
-    },
-    "UsePScolor": {},
-    "UsePSframes": {},
-    "UsePSheader{}": {
-      "snippet": "UsePSheader{${1:file}}"
-    },
-    "UsePSlines": {},
-    "UsePSrotate": {},
-    "UsePSspecials{}": {
-      "snippet": "UsePSspecials{${1:driver}}"
-    },
-    "UsePStiles": {},
-    "UseResizing": {},
-    "UseRules": {},
-    "UseSingleDriver": {},
-    "UseTips": {},
-    "UseTPICframes": {},
-    "UseTPICspecials": {},
-    "UseTwocells": {},
-    "utwocell": {},
-    "uutwocell": {},
-    "xtwocell[]{}": {
-      "snippet": "xtwocell[${2:hop}]{${1:displace}}"
-    },
-    "xtwocell{}": {
-      "snippet": "xtwocell{${1:displace}}"
-    },
-    "Xy": {},
-    "xy": {},
-    "xyatipfont": {},
-    "xybox{}": {
-      "snippet": "xybox{${1:<${2:pos}><${3:decor}>}}"
-    },
-    "xybsqlfont": {},
-    "xybtipfont": {},
-    "xycircfont": {},
-    "xycircle(){}": {
-      "snippet": "xycircle(${2:x},${3:y}){${1:style}}"
-    },
-    "xycircle<>{}": {
-      "snippet": "xycircle<${2:radius}>{${1:style}}"
-    },
-    "xycompile{}": {
-      "snippet": "xycompile{${1:<${2:pos}><${3:decor}>}}"
-    },
-    "xycompileto{}{}": {
-      "snippet": "xycompileto{${1:name}}{${2:<${3:pos}><${4:decor}>}}"
-    },
-    "xydashfont": {},
-    "xydate": {},
-    "xyecho": {},
-    "xygraph{}": {
-      "snippet": "xygraph{${1:graph}}"
-    },
-    "xyignore{}": {
-      "snippet": "xyignore{${1:<${2:pos}><${3:decor}>}}"
-    },
-    "xyimport()(){}": {
-      "snippet": "xyimport(${2:width},${3:height})(${4:xoffset},${5:yoffset}){${1:graphics code}}"
-    },
-    "xyimport(){}": {
-      "snippet": "xyimport(${2:width},${3:height}){${1:graphics code}}"
-    },
-    "xylattice{}{}{}{}": {
-      "snippet": "xylattice{${1:pt1}}{${2:pt2}}{${3:pt3}}{${4:pt4}}"
-    },
-    "xymatrix{}": {
-      "snippet": "xymatrix{${1:xy code}}"
-    },
-    "xymatrixcolsep": {},
-    "xymatrixcompile{}": {
-      "snippet": "xymatrixcompile{${1:xy code}}"
-    },
-    "xymatrixnocompile{}": {
-      "snippet": "xymatrixnocompile{${1:xy code}}"
-    },
-    "xymatrixrowsep": {},
-    "xypolygon": {},
-    "xypolyline{}": {
-      "snippet": "xypolyline{${1:toks}}"
-    },
-    "xypolyname": {},
-    "xypolynode": {},
-    "xypolynum": {},
-    "xyprovide{}{}{}{}{}{}": {
-      "snippet": "xyprovide{${1:option}}{${2:name}}{${3:version}}{${4:author}}{${5:email}}{${6:address}}"
-    },
-    "xyPSdefaultdict": {},
-    "xyquiet": {},
-    "xyReloadDrivers": {},
-    "xyresetcatcodes": {},
-    "xyShowDrivers": {},
-    "xytracing": {},
-    "xyverbose": {},
-    "xyversion": {},
-    "zeroDivideLimit{}": {
-      "snippet": "zeroDivideLimit{${1:number}}"
-    }
-  },
-  "envs": {
-    "xy": {}
-  },
-  "options": [
-    "curve",
-    "frame",
-    "tips",
-    "line",
-    "rotate",
-    "color",
-    "tile",
-    "import",
-    "movie",
-    "ps",
-    "tpic",
-    "emtex",
-    "necula",
-    "picture",
-    "all",
-    "dummy",
-    "arrow",
-    "2cell",
-    "matrix",
-    "graph",
-    "poly",
-    "web",
-    "arc",
-    "knot",
-    "smart",
-    "barr",
-    "dvidrv",
-    "dvips",
-    "dvitops",
-    "oztex",
-    "17oztex",
-    "textures",
-    "16textures",
-    "xdvi",
-    "pdf",
-    "v2"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/xymtx-pdf.json b/dev/packages/xymtx-pdf.json
index c1c9caf08..4ca0e9924 100644
--- a/dev/packages/xymtx-pdf.json
+++ b/dev/packages/xymtx-pdf.json
@@ -15,43 +15,19 @@
     "cyan": {},
     "dashhasheddash": {},
     "green": {},
-    "HashWedgeAsSubst()(){}": {
-      "snippet": "HashWedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "HashWedgeAsSubstPDF()(){}": {
-      "snippet": "HashWedgeAsSubstPDF(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "HashWedgeAsSubstX()()": {
-      "snippet": "HashWedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "HashWedgeAsSubstX()()[]": {
-      "snippet": "HashWedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
-    },
-    "HashWedgeAsSubstXPDF()()": {
-      "snippet": "HashWedgeAsSubstXPDF(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "HashWedgeAsSubstXPDF()()[]": {
-      "snippet": "HashWedgeAsSubstXPDF(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
-    },
     "ifsizereduction": {},
     "magenta": {},
-    "PutBondLine()(){}": {
-      "snippet": "PutBondLine(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
-    },
-    "PutDashedBond()(){}": {
-      "snippet": "PutDashedBond(${2:xstart},${3:ystart})(${4:xend},${5:yend}){${1:thickness}}"
-    },
     "putRoundArrow[]{}": {
-      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
+      "snippet": "putRoundArrow[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
     },
     "putRoundArrow{}": {
-      "snippet": "putRoundArrow{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
+      "snippet": "putRoundArrow{${1:(${2:x1,y1})(${3:x2,y2})...}}"
     },
     "putRoundArrowPDF[]{}": {
-      "snippet": "putRoundArrowPDF[${2:arrowhead}]{${1:(${3:x1},${4:y1})(${5:x2},${6:y2})...}}"
+      "snippet": "putRoundArrowPDF[${2:arrowhead}]{${1:(${3:x1,y1})(${4:x2,y2})...}}"
     },
     "putRoundArrowPDF{}": {
-      "snippet": "putRoundArrowPDF{${1:(${2:x1},${3:y1})(${4:x2},${5:y2})...}}"
+      "snippet": "putRoundArrowPDF{${1:(${2:x1,y1})(${3:x2,y2})...}}"
     },
     "red": {},
     "setxymtxpdf": {},
@@ -62,36 +38,6 @@
     "sizereductiontrue": {},
     "thickLineWidth": {},
     "thinLineWidth": {},
-    "WavyAsSubst()(){}": {
-      "snippet": "WavyAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "WavyAsSubstPDF()(){}": {
-      "snippet": "WavyAsSubstPDF(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "WavyAsSubstX()()": {
-      "snippet": "WavyAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "WavyAsSubstXPDF()()": {
-      "snippet": "WavyAsSubstXPDF(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "WedgeAsSubst()(){}": {
-      "snippet": "WedgeAsSubst(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "WedgeAsSubstPDF()(){}": {
-      "snippet": "WedgeAsSubstPDF(${2:xstart},${3:ystart})(${4:xslope},${5:yslope}){${1:length}}"
-    },
-    "WedgeAsSubstX()()": {
-      "snippet": "WedgeAsSubstX(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "WedgeAsSubstX()()[]": {
-      "snippet": "WedgeAsSubstX(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
-    },
-    "WedgeAsSubstXPDF()()": {
-      "snippet": "WedgeAsSubstXPDF(${1:xstart},${2:ystart})(${3:xend},${4:yend})"
-    },
-    "WedgeAsSubstXPDF()()[]": {
-      "snippet": "WedgeAsSubstXPDF(${2:xstart},${3:ystart})(${4:xend},${5:yend})[${1:thickness}]"
-    },
     "wedgehasheddash": {},
     "wedgehashedwedge": {},
     "white": {},
diff --git a/dev/packages/yagusylo.json b/dev/packages/yagusylo.json
index a6c8ed0bd..6740e4afc 100644
--- a/dev/packages/yagusylo.json
+++ b/dev/packages/yagusylo.json
@@ -91,7 +91,7 @@
       "keyvalpos": 0
     },
     "setyagitemize{}": {
-      "snippet": "setyagitemize{${1:symfam1,${2: number1},${3: color1. symfam2},${4: number2}, color2. ...}}"
+      "snippet": "setyagitemize{${1:symfam1, number1, color1. symfam2, number2, color2. ...}}"
     },
     "setyagitemize*{}": {
       "snippet": "setyagitemize*{${1:dingname1. dingname2. ...}}"
diff --git a/dev/packages/ydoc.json b/dev/packages/ydoc.json
deleted file mode 100644
index 89157a70a..000000000
--- a/dev/packages/ydoc.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "includes": {
-    "ydoc-code": [],
-    "ydoc-expl": [],
-    "ydoc-desc": [],
-    "ydoc-doc": [],
-    "newverbs": [],
-    "fontenc": [],
-    "fourier": [],
-    "ifpdf": [],
-    "microtype": [],
-    "array": [],
-    "booktabs": [],
-    "multicol": [],
-    "xcolor": [],
-    "listings": [],
-    "hyperref": []
-  },
-  "macros": {
-    "DH": {},
-    "dh": {},
-    "dj": {},
-    "DJ": {},
-    "guillemetleft": {},
-    "guillemetright": {},
-    "guillemotleft": {},
-    "guillemotright": {},
-    "guilsinglleft": {},
-    "guilsinglright": {},
-    "Hwithstroke": {},
-    "hwithstroke": {},
-    "k{}": {
-      "snippet": "k{${1:arg}}"
-    },
-    "NG": {},
-    "ng": {},
-    "quotedblbase": {},
-    "quotesinglbase": {},
-    "textogonekcentered{}": {
-      "snippet": "textogonekcentered{${1:arg}}"
-    },
-    "textquotedbl": {},
-    "th": {},
-    "TH": {}
-  },
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/youngtab.json b/dev/packages/youngtab.json
index 5af274436..550ca338f 100644
--- a/dev/packages/youngtab.json
+++ b/dev/packages/youngtab.json
@@ -16,12 +16,6 @@
     "Yinterspace{}": {
       "snippet": "Yinterspace{${1:skip}}"
     },
-    "yng()": {
-      "snippet": "yng(${1:r1},${2:r2},${3:...})"
-    },
-    "young()": {
-      "snippet": "young(${1:r11r12...},${2:r21r22...},${3:...})"
-    },
     "Ystdtext{}": {
       "snippet": "Ystdtext{${1:0|1}}"
     }
diff --git a/dev/packages/ytableau.json b/dev/packages/ytableau.json
index a387611a3..af46bf28e 100644
--- a/dev/packages/ytableau.json
+++ b/dev/packages/ytableau.json
@@ -12,15 +12,15 @@
     "endytableau": {},
     "none": {},
     "ytableaushort{}": {
-      "snippet": "ytableaushort{${1:line1,${2:line2},...}}",
+      "snippet": "ytableaushort{${1:line1,line2,...}}",
       "option": "textmode"
     },
     "ytableaushort[]{}": {
-      "snippet": "ytableaushort[${2:formatting}]{${1:line1,${3:line2},...}}",
+      "snippet": "ytableaushort[${2:formatting}]{${1:line1,line2,...}}",
       "option": "textmode"
     },
     "ydiagram{}": {
-      "snippet": "ydiagram{${1:offset+num1,${2:num2},...}}"
+      "snippet": "ydiagram{${1:offset+num1,num2,...}}"
     }
   },
   "envs": {
diff --git a/dev/packages/zhnumber.json b/dev/packages/zhnumber.json
index d734873b1..28d29514b 100644
--- a/dev/packages/zhnumber.json
+++ b/dev/packages/zhnumber.json
@@ -68,10 +68,10 @@
       "snippet": "zhganzhinian{${1:year}}"
     },
     "zhnumExtendScaleMap{}": {
-      "snippet": "zhnumExtendScaleMap{${1:character1,${2: character2},${3: ...}, charactern}}"
+      "snippet": "zhnumExtendScaleMap{${1:character1, character2, ..., charactern}}"
     },
     "zhnumExtendScaleMap[]{}": {
-      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1,${3: character2},${4: ...}, charactern}}"
+      "snippet": "zhnumExtendScaleMap[${2:character}]{${1:character1, character2, ..., charactern}}"
     },
     "zhnumsetup{}": {
       "snippet": "zhnumsetup{${1:options}}",
diff --git a/dev/packages/zref.json b/dev/packages/zref.json
deleted file mode 100644
index 0e6536dbc..000000000
--- a/dev/packages/zref.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "includes": {
-    "zref-base": [],
-    "zref-abspage": [
-      "abspage"
-    ],
-    "zref-counter": [
-      "counter"
-    ],
-    "zref-dotfill": [
-      "dotfill"
-    ],
-    "zref-hyperref": [
-      "hyperref"
-    ],
-    "zref-lastpage": [
-      "lastpage"
-    ],
-    "zref-marks": [
-      "marks"
-    ],
-    "zref-nextpage": [
-      "nextpage"
-    ],
-    "zref-pageattr": [
-      "pageattr"
-    ],
-    "zref-pagelayout": [
-      "pagelayout"
-    ],
-    "zref-perpage": [
-      "perpage"
-    ],
-    "zref-runs": [
-      "runs"
-    ],
-    "zref-savepos": [
-      "savepos"
-    ],
-    "zref-thepage": [
-      "thepage"
-    ],
-    "zref-titleref": [
-      "titleref"
-    ],
-    "zref-totpages": [
-      "totpages"
-    ],
-    "zref-user": [
-      "user"
-    ],
-    "zref-xr": [
-      "xr"
-    ]
-  },
-  "macros": {},
-  "envs": {},
-  "options": [
-    "abspage",
-    "counter",
-    "dotfill",
-    "hyperref",
-    "lastpage",
-    "marks",
-    "nextpage",
-    "pageattr",
-    "pagelayout",
-    "perpage",
-    "runs",
-    "savepos",
-    "thepage",
-    "titleref",
-    "totpages",
-    "user",
-    "xr"
-  ],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/packages/zx-calculus.json b/dev/packages/zx-calculus.json
deleted file mode 100644
index 9b7779bcb..000000000
--- a/dev/packages/zx-calculus.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "includes": {
-    "tikz": [],
-    "tikz-cd": [],
-    "tikzlibraryzx-calculus": []
-  },
-  "macros": {},
-  "envs": {},
-  "options": [],
-  "keyvals": []
-}
\ No newline at end of file
diff --git a/dev/pyintel/pkgcommand.py b/dev/pyintel/pkgcommand.py
index 3d24f0a70..731ba26ea 100644
--- a/dev/pyintel/pkgcommand.py
+++ b/dev/pyintel/pkgcommand.py
@@ -57,12 +57,8 @@ def create_snippet(line: str) -> str:
             snippet = re.sub(r'(\[)([^\[\$]*)(\])', p.sub, snippet)
         else:
             snippet = re.sub(r'(\{|\[)([^\{\[\$]*)(\}|\])', p.sub, snippet)
-
     snippet = re.sub(r'(?<![\{\s:\[])(\<)([a-zA-Z\s]*)(\>)', p.sub, snippet)
-
-    # (x0,y0,z0)(x1,y1)
-    # snippet = re.sub(r'(\()([^\{\}\[\]\(\)]*)(\))', p.sub, snippet)
-    snippet = re.sub(r'(?<=\(|,)()([^,()]+)()(?=,|\))', p.sub, snippet)
+    snippet = re.sub(r'(\()([^\{\}\[\]\(\)]*)(\))', p.sub, snippet)
     p.setKeepDelimiters(False)
     snippet = re.sub(r'(?<![\{:\[=-])(%\<)([a-zA-Z\s]*)(%\>)(?!})', p.sub, snippet)
 
@@ -73,7 +69,6 @@ def create_snippet(line: str) -> str:
     snippet = re.sub(r'%<([^%]*?)%:.*?%>', r'\1', snippet)
     snippet = re.sub(r'%<([^%]*?)%>', r'\1', snippet)
     snippet = re.sub(r'\$\{(\d+:.*?)%.*?\}', r'${\1}', snippet)
-    
     return snippet
 
 
@@ -252,9 +247,7 @@ def parse_cwl_file(self, file_path: Union[Path, str], remove_spaces: bool = Fals
                     name = name.strip()
                 # The name field can only contain letters, `{`, `}`, `[`, `]` and `*`.
                 # https://github.com/James-Yu/LaTeX-Workshop/issues/3264#issuecomment-1138733921
-                # Also include `(`, `)`, and `,`
-                # https://github.com/James-Yu/LaTeX-Workshop/issues/4313#issuecomment-2214209089
-                if re.search(r'[^A-Za-z0-9\[\]\{\}\<\>\*_^:\(\),\s]', name) is not None or '%' in name:
+                if re.search(r'[^A-Za-z0-9\[\]\{\}\<\>\*_^:\s]', name) is not None or '%' in name:
                     continue
                 snippet = create_snippet(match[2] if len(match.groups()) >= 2 and match[2] else '')
                 pkg.envs[name] = Env(
@@ -285,9 +278,7 @@ def parse_cwl_file(self, file_path: Union[Path, str], remove_spaces: bool = Fals
                     name = name.strip()
                 # The name field can only contain letters, `{`, `}`, `[`, `]` and `*`.
                 # https://github.com/James-Yu/LaTeX-Workshop/issues/3264#issuecomment-1138733921
-                # Also include `(`, `)`, and `,`
-                # https://github.com/James-Yu/LaTeX-Workshop/issues/4313#issuecomment-2214209089
-                if re.search(r'[^A-Za-z\[\]\{\}\<\>\*_^:\(\),\s]', name) is not None:
+                if re.search(r'[^A-Za-z\[\]\{\}\<\>\*_^:\s]', name) is not None:
                     continue
                 if name in self.commands:
                     continue
diff --git a/package.json b/package.json
index ae7e9a9fe..49e3b9636 100644
--- a/package.json
+++ b/package.json
@@ -153,13 +153,6 @@
       {
         "id": "markdown_latex_combined",
         "configuration": "./syntax/markdown-latex-combined-language-configuration.json"
-      },
-      {
-        "id": "latex_workshop_log",
-        "aliases": [
-          "LaTeX Workshop Log"
-        ],
-        "configuration": "./syntax/latex-workshop-log-language-configuration.json"
       }
     ],
     "grammars": [
@@ -267,11 +260,6 @@
         "embeddedLanguages": {
           "source.r": "r"
         }
-      },
-      {
-        "language": "latex_workshop_log",
-        "scopeName": "text.latex_workshop.log",
-        "path": "./syntax/LaTeX-Workshop-Log.tmLanguage.json"
       }
     ],
     "snippets": [
diff --git a/src/compile/queue.ts b/src/compile/queue.ts
index 368f5e8c5..9d0d2a71d 100644
--- a/src/compile/queue.ts
+++ b/src/compile/queue.ts
@@ -136,8 +136,5 @@ export const queue = {
     clear,
     isLastStep,
     getStep,
-    getStepString,
-    _test: {
-        getQueue: () => stepQueue
-    }
+    getStepString
 }
diff --git a/src/preview/server.ts b/src/preview/server.ts
index 9f5586cb0..410d25f83 100644
--- a/src/preview/server.ts
+++ b/src/preview/server.ts
@@ -109,7 +109,7 @@ function initialize(hostname?: string): http.Server {
                 logger.log(`BE AWARE: YOU ARE PUBLIC TO ${hostname} !`)
             }
             state.validOriginUri = await obtainValidOrigin(address.port, hostname ?? '127.0.0.1')
-            logger.log(`validOrigin is ${getValidOrigin()}`)
+            logger.log(`valdOrigin is ${getValidOrigin()}`)
             initializeWsServer(httpServer, getValidOrigin())
             // if (initializeResolve) {
             //     initializeResolve(undefined)
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index eb8f214b8..cea383b00 100644
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import { lw } from '../lw'
 
-const LOG_PANEL = vscode.window.createOutputChannel('LaTeX Workshop', 'latex_workshop_log')
+const LOG_PANEL = vscode.window.createOutputChannel('LaTeX Workshop')
 const COMPILER_PANEL = vscode.window.createOutputChannel('LaTeX Compiler')
 const STATUS_ITEM = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, -10000)
 const PLACEHOLDERS: {[placeholder: string]: string} = {}
diff --git a/syntax/DocTeX.tmLanguage.json b/syntax/DocTeX.tmLanguage.json
index 44e9faf3a..4dbdd5878 100644
--- a/syntax/DocTeX.tmLanguage.json
+++ b/syntax/DocTeX.tmLanguage.json
@@ -148,7 +148,7 @@
                         "4": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -1954,7 +1954,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -1964,7 +1964,7 @@
                         "5": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -2422,7 +2422,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -2458,7 +2458,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -2616,7 +2616,7 @@
                     "name": "meta.scope.item.latex"
                 },
                 {
-                    "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
+                    "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}:.]*\\})*)(?:([<\\[])[^\\]<>]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)",
                     "captures": {
                         "1": {
                             "name": "keyword.control.cite.latex"
@@ -2632,20 +2632,18 @@
                             ]
                         },
                         "4": {
-                            "patterns": [
-                                {
-                                    "include": "#optional-arg-angle-no-highlight"
-                                }
-                            ]
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
                         },
                         "5": {
-                            "patterns": [
-                                {
-                                    "include": "#optional-arg-bracket-no-highlight"
-                                }
-                            ]
+                            "name": "punctuation.definition.arguments.optional.end.latex"
                         },
                         "6": {
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
+                        },
+                        "7": {
+                            "name": "punctuation.definition.arguments.optional.end.latex"
+                        },
+                        "8": {
                             "name": "punctuation.definition.arguments.begin.latex"
                         }
                     },
@@ -2658,7 +2656,6 @@
                     "name": "meta.citation.latex",
                     "patterns": [
                         {
-                            "match": "((%).*)$",
                             "captures": {
                                 "1": {
                                     "name": "comment.line.percentage.tex"
@@ -2666,7 +2663,8 @@
                                 "2": {
                                     "name": "punctuation.definition.comment.tex"
                                 }
-                            }
+                            },
+                            "match": "((%).*)$"
                         },
                         {
                             "match": "[\\p{Alphabetic}\\p{Number}:.-]+",
@@ -2796,7 +2794,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -2839,7 +2837,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -2876,7 +2874,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -2923,7 +2921,7 @@
                         "3": {
                             "patterns": [
                                 {
-                                    "include": "#optional-arg-bracket"
+                                    "include": "#optional-arg"
                                 }
                             ]
                         },
@@ -3104,7 +3102,7 @@
                             "name": "punctuation.definition.variable.latex"
                         }
                     },
-                    "match": "(\\\\)(?:[cgl]_+[_\\p{Alphabetic}@]+_[a-z]+|[qs]_[_\\p{Alphabetic}@]+[\\p{Alphabetic}@])",
+                    "match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_[a-z]+",
                     "name": "variable.other.latex3.latex"
                 },
                 {
@@ -3129,29 +3127,27 @@
                 {
                     "captures": {
                         "1": {
-                            "patterns": [
-                                {
-                                    "include": "#optional-arg-parenthesis-no-highlight"
-                                }
-                            ]
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
                         },
                         "2": {
-                            "patterns": [
-                                {
-                                    "include": "#optional-arg-bracket-no-highlight"
-                                }
-                            ]
+                            "name": "punctuation.definition.arguments.optional.end.latex"
                         },
                         "3": {
-                            "name": "punctuation.definition.arguments.begin.latex"
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
                         },
                         "4": {
-                            "name": "constant.other.reference.citation.latex"
+                            "name": "punctuation.definition.arguments.optional.end.latex"
                         },
                         "5": {
-                            "name": "punctuation.definition.arguments.end.latex"
+                            "name": "punctuation.definition.arguments.begin.latex"
                         },
                         "6": {
+                            "name": "constant.other.reference.citation.latex"
+                        },
+                        "7": {
+                            "name": "punctuation.definition.arguments.end.latex"
+                        },
+                        "8": {
                             "patterns": [
                                 {
                                     "include": "#autocites-arg"
@@ -3159,7 +3155,7 @@
                             ]
                         }
                     },
-                    "match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
+                    "match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
                 }
             ]
         },
@@ -3217,7 +3213,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -3280,7 +3276,7 @@
                 }
             ]
         },
-        "optional-arg-bracket": {
+        "optional-arg": {
             "patterns": [
                 {
                     "captures": {
@@ -3298,73 +3294,6 @@
                     "name": "meta.parameter.optional.latex"
                 }
             ]
-        },
-        "optional-arg-parenthesis": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "variable.parameter.function.latex"
-                        },
-                        "3": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(\\()([^\\(]*?)(\\))",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
-        },
-        "optional-arg-bracket-no-highlight": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(\\[)[^\\[]*?(\\])",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
-        },
-        "optional-arg-angle-no-highlight": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(<)[^<]*?(>)",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
-        },
-        "optional-arg-parenthesis-no-highlight": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(\\()[^\\(]*?(\\))",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
         }
     },
     "scopeName": "text.tex.doctex"
diff --git a/syntax/LaTeX-Workshop-Log.tmLanguage.json b/syntax/LaTeX-Workshop-Log.tmLanguage.json
deleted file mode 100644
index cfeb46ed0..000000000
--- a/syntax/LaTeX-Workshop-Log.tmLanguage.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "name": "LaTeX Workshop log",
-    "patterns": [
-        {
-            "begin": "^\\[([0-9\\.:]*)\\]\\[(\\w*)\\](?:\\[(\\w*)\\])?\\s?",
-            "end":"$",
-            "beginCaptures": {
-                "1": {
-                    "name": "constant.numeric.timestamp.latex_workshop.log"
-                },
-                "2": {
-                    "name": "constant.language.latex_workshop.log"
-                },
-                "3": {
-                    "name": "constant.language.latex_workshop.log"
-                }
-            },
-            "patterns": [
-                {
-                    "include": "#events"
-                },
-                {
-                    "include": "#variables"
-                },
-                {
-                    "include": "#message_with_brace_arguments"
-                },
-                {
-                    "include": "#message_with_bracket_arguments"
-                }
-            ]
-        }
-    ],
-    "repository": {
-        "events": {
-            "match": "\\G(BUILD_DONE|AUTO_BUILD_INITIATED|ROOT_FILE_CHANGED|ROOT_FILE_SEARCHED|FILE_PARSED|VIEWER_PAGE_LOADED|VIEWER_STATUS_CHANGED|FILE_WATCHED|FILE_CHANGED|FILE_REMOVED|DOCUMENT_CHANGED|STRUCTURE_UPDATED|AUTO_CLEANED)(?::\\s(.*))?",
-            "captures": {
-                "1": {
-                    "name": "support.function.latex_workshop.log"
-                },
-                "2": {
-                    "name": "string.latex_workshop.log"
-                }
-            },
-            "name": "meta.event.latex_workshop.log"
-        },
-         "variables": {
-            "match": "\\G(?:Set\\s)?(\\$?[\\w\\.-]+):\\s?(.*(?=\\s?\\.$)|.*(?=$))",
-            "captures": {
-                "1": {
-                    "name": "support.variable.latex_workshop.log"
-                },
-                "2": {
-                    "name": "string.latex_workshop.log"
-                }
-            },
-            "name": "meta.variable.latex_workshop.log"
-        },
-        "message_with_bracket_arguments": {
-            "match": "\\G([\\w\\s]+):\\s?\\[(.*)\\]",
-            "captures": {
-                "1": {
-                    "name": "entity.message.latex_workshop.log"
-                },
-                "2": {
-                    "name": "string.latex_workshop.log"
-                }
-            },
-            "name": "meta.message.latex_workshop.log"
-        },
-        "message_with_brace_arguments": {
-            "match": "\\G([\\w\\s]+):\\s?\\{(.*)\\}",
-            "captures": {
-                "1": {
-                    "name": "entity.message.latex_workshop.log"
-                },
-                "2": {
-                    "name": "string.latex_workshop.log"
-                }
-            },
-            "name": "meta.message.latex_workshop.log"
-        }
-    },
-    "scopeName": "text.latex_workshop.log"
-}
diff --git a/syntax/LaTeX.tmLanguage.json b/syntax/LaTeX.tmLanguage.json
index 3e938d4fd..191957c22 100644
--- a/syntax/LaTeX.tmLanguage.json
+++ b/syntax/LaTeX.tmLanguage.json
@@ -87,7 +87,7 @@
                 "4": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -1893,7 +1893,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -1903,7 +1903,7 @@
                 "5": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -2361,7 +2361,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -2397,7 +2397,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -2555,7 +2555,7 @@
             "name": "meta.scope.item.latex"
         },
         {
-            "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
+            "begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}:.]*\\})*)(?:([<\\[])[^\\]<>]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)",
             "captures": {
                 "1": {
                     "name": "keyword.control.cite.latex"
@@ -2571,20 +2571,18 @@
                     ]
                 },
                 "4": {
-                    "patterns": [
-                        {
-                            "include": "#optional-arg-angle-no-highlight"
-                        }
-                    ]
+                    "name": "punctuation.definition.arguments.optional.begin.latex"
                 },
                 "5": {
-                    "patterns": [
-                        {
-                            "include": "#optional-arg-bracket-no-highlight"
-                        }
-                    ]
+                    "name": "punctuation.definition.arguments.optional.end.latex"
                 },
                 "6": {
+                    "name": "punctuation.definition.arguments.optional.begin.latex"
+                },
+                "7": {
+                    "name": "punctuation.definition.arguments.optional.end.latex"
+                },
+                "8": {
                     "name": "punctuation.definition.arguments.begin.latex"
                 }
             },
@@ -2597,7 +2595,6 @@
             "name": "meta.citation.latex",
             "patterns": [
                 {
-                    "match": "((%).*)$",
                     "captures": {
                         "1": {
                             "name": "comment.line.percentage.tex"
@@ -2605,7 +2602,8 @@
                         "2": {
                             "name": "punctuation.definition.comment.tex"
                         }
-                    }
+                    },
+                    "match": "((%).*)$"
                 },
                 {
                     "match": "[\\p{Alphabetic}\\p{Number}:.-]+",
@@ -2735,7 +2733,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -2778,7 +2776,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -2815,7 +2813,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -2862,7 +2860,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -3043,7 +3041,7 @@
                     "name": "punctuation.definition.variable.latex"
                 }
             },
-            "match": "(\\\\)(?:[cgl]_+[_\\p{Alphabetic}@]+_[a-z]+|[qs]_[_\\p{Alphabetic}@]+[\\p{Alphabetic}@])",
+            "match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_[a-z]+",
             "name": "variable.other.latex3.latex"
         },
         {
@@ -3068,29 +3066,27 @@
                 {
                     "captures": {
                         "1": {
-                            "patterns": [
-                                {
-                                    "include": "#optional-arg-parenthesis-no-highlight"
-                                }
-                            ]
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
                         },
                         "2": {
-                            "patterns": [
-                                {
-                                    "include": "#optional-arg-bracket-no-highlight"
-                                }
-                            ]
+                            "name": "punctuation.definition.arguments.optional.end.latex"
                         },
                         "3": {
-                            "name": "punctuation.definition.arguments.begin.latex"
+                            "name": "punctuation.definition.arguments.optional.begin.latex"
                         },
                         "4": {
-                            "name": "constant.other.reference.citation.latex"
+                            "name": "punctuation.definition.arguments.optional.end.latex"
                         },
                         "5": {
-                            "name": "punctuation.definition.arguments.end.latex"
+                            "name": "punctuation.definition.arguments.begin.latex"
                         },
                         "6": {
+                            "name": "constant.other.reference.citation.latex"
+                        },
+                        "7": {
+                            "name": "punctuation.definition.arguments.end.latex"
+                        },
+                        "8": {
                             "patterns": [
                                 {
                                     "include": "#autocites-arg"
@@ -3098,7 +3094,7 @@
                             ]
                         }
                     },
-                    "match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
+                    "match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
                 }
             ]
         },
@@ -3156,7 +3152,7 @@
                 "3": {
                     "patterns": [
                         {
-                            "include": "#optional-arg-bracket"
+                            "include": "#optional-arg"
                         }
                     ]
                 },
@@ -3219,7 +3215,7 @@
                 }
             ]
         },
-        "optional-arg-bracket": {
+        "optional-arg": {
             "patterns": [
                 {
                     "captures": {
@@ -3237,73 +3233,6 @@
                     "name": "meta.parameter.optional.latex"
                 }
             ]
-        },
-        "optional-arg-parenthesis": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "variable.parameter.function.latex"
-                        },
-                        "3": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(\\()([^\\(]*?)(\\))",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
-        },
-        "optional-arg-bracket-no-highlight": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(\\[)[^\\[]*?(\\])",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
-        },
-        "optional-arg-angle-no-highlight": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(<)[^<]*?(>)",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
-        },
-        "optional-arg-parenthesis-no-highlight": {
-            "patterns": [
-                {
-                    "captures": {
-                        "1": {
-                            "name": "punctuation.definition.arguments.optional.begin.latex"
-                        },
-                        "2": {
-                            "name": "punctuation.definition.arguments.optional.end.latex"
-                        }
-                    },
-                    "match": "(\\()[^\\(]*?(\\))",
-                    "name": "meta.parameter.optional.latex"
-                }
-            ]
         }
     },
     "scopeName": "text.tex.latex"
diff --git a/syntax/latex-workshop-log-language-configuration.json b/syntax/latex-workshop-log-language-configuration.json
deleted file mode 100644
index 859032acf..000000000
--- a/syntax/latex-workshop-log-language-configuration.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"brackets": [
-		["[", "]"]
-	],
-	"wordPattern": "(#-?\\d+|[A-Za-z_.][0-9A-Za-z_.]*\\$?)"
-}
diff --git a/test/fixtures/unittest/04_core_root/find_workspace/trap.tex b/test/fixtures/unittest/04_core_root/find_workspace/trap.tex
new file mode 100644
index 000000000..fbc57a55f
--- /dev/null
+++ b/test/fixtures/unittest/04_core_root/find_workspace/trap.tex
@@ -0,0 +1,2 @@
+\documentclass{article}
+\begin{document}
diff --git a/test/units/05_compile.test.ts b/test/units/05_compile.test.ts
deleted file mode 100644
index 075645310..000000000
--- a/test/units/05_compile.test.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import * as path from 'path'
-import * as sinon from 'sinon'
-import { assert, mock } from './utils'
-import { lw } from '../../src/lw'
-import { queue } from '../../src/compile/queue'
-
-describe(path.basename(__filename).split('.')[0] + ':', () => {
-    // const fixture = path.basename(__filename).split('.')[0]
-
-    before(() => {
-        mock.object(lw, 'file', 'root')
-    })
-
-    after(() => {
-        sinon.restore()
-    })
-
-    describe.only('queue module', () => {
-        beforeEach(() => {
-            queue.clear()
-        })
-
-        it('should clear the queue', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
-            assert.strictEqual(queue._test.getQueue().steps.length, 1)
-
-            queue.clear()
-            assert.strictEqual(queue._test.getQueue().steps.length, 0)
-        })
-
-        it('should get the next step from the queue', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
-            queue.add({ name: 'bibtex', command: 'bibtex' }, 'main.tex', 'Recipe1', Date.now(), false)
-
-            const step1 = queue.getStep()
-            const step2 = queue.getStep()
-
-            assert.strictEqual(step1?.name, 'latex')
-            assert.strictEqual(step2?.name, 'bibtex')
-        })
-
-        it('should add a Tool as a RecipeStep to the queue', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now())
-
-            const step = queue.getStep()
-            assert.ok(step)
-            assert.strictEqual(step.rootFile, 'main.tex')
-            assert.strictEqual(step.recipeName, 'Recipe1')
-            assert.strictEqual(step.isExternal, false)
-        })
-
-        it('should add a Tool as an ExternalStep to the queue', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), true, '/usr/bin')
-
-            const step = queue.getStep()
-            assert.ok(step)
-            assert.strictEqual(step.recipeName, 'External')
-            assert.strictEqual(step.isExternal, true)
-            assert.strictEqual(step.cwd, '/usr/bin')
-        })
-
-        it('should prepend a Tool as a RecipeStep to the queue', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now())
-
-            let step = queue.getStep()
-            queue.clear()
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'alt.tex', 'Recipe1', Date.now())
-
-            assert.ok(step)
-            queue.prepend(step)
-
-            step = queue.getStep()
-            assert.ok(step)
-            assert.strictEqual(step.rootFile, 'main.tex')
-            assert.strictEqual(step.recipeName, 'Recipe1')
-            assert.strictEqual(step.isExternal, false)
-        })
-
-        it('should check if the last step in the queue', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
-
-            let step = queue.getStep()
-            assert.ok(step)
-            assert.ok(queue.isLastStep(step))
-
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now() + 1, false)
-
-            step = queue.getStep()
-            assert.ok(step)
-            assert.ok(queue.isLastStep(step))
-        })
-
-        it('should get the formatted string representation of a step', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
-
-            const step = queue.getStep()
-            assert.ok(step)
-            const stepString = queue.getStepString(step)
-            assert.strictEqual(stepString, 'Recipe1')
-        })
-
-        it('should get correct step repr with multiple recipes', () => {
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now(), false)
-            queue.add({ name: 'latex', command: 'pdflatex' }, 'main.tex', 'Recipe1', Date.now() + 1, false)
-            const step = queue.getStep()
-            assert.ok(step)
-            const stepString = queue.getStepString(step)
-            assert.strictEqual(stepString, 'Recipe1')
-        })
-
-        it('should get correct step repr with multiple tools in one recipe', () => {
-            const recipeTime = Date.now()
-            queue.add({ name: 'latex1', command: 'pdflatex' }, 'main.tex', 'Recipe1', recipeTime, false)
-            queue.add({ name: 'latex2', command: 'pdflatex' }, 'main.tex', 'Recipe1', recipeTime, false)
-
-            let step = queue.getStep()
-            assert.ok(step)
-            let stepString = queue.getStepString(step)
-            assert.strictEqual(stepString, 'Recipe1: 1/2 (latex1)')
-
-            step = queue.getStep()
-            assert.ok(step)
-            stepString = queue.getStepString(step)
-            assert.strictEqual(stepString, 'Recipe1: 2/2 (latex2)')
-        })
-    })
-})
diff --git a/viewer/components/refresh.ts b/viewer/components/refresh.ts
index 855e57249..5b28bd8fd 100644
--- a/viewer/components/refresh.ts
+++ b/viewer/components/refresh.ts
@@ -1,7 +1,6 @@
 import * as utils from './utils.js'
 import { setTrimValue } from './trimming.js'
 import { sendLog } from './connection.js'
-import { viewerState, viewerStatePromise } from './state.js'
 import type { PDFViewerApplicationType, PDFViewerApplicationOptionsType } from './interface'
 import type { PdfViewerParams } from '../../types/latex-workshop-protocol-types/index.js'
 
@@ -113,7 +112,6 @@ export async function restoreState() {
 
 async function restoreDefault() {
     const params = await (await fetch('config.json')).json() as PdfViewerParams
-    await viewerStatePromise
 
     if (params.trim !== undefined) {
         setTrimValue(params.trim)
@@ -129,14 +127,6 @@ async function restoreDefault() {
     if (params.spreadMode !== undefined) {
         PDFViewerApplication.pdfViewer.spreadMode = params.spreadMode
     }
-
-    const viewerContainer = document.getElementById('viewerContainer')!
-    if (typeof viewerState.scrollTop === 'number' && viewerContainer.scrollTop !== viewerState.scrollTop) {
-        viewerContainer.scrollTop = viewerState.scrollTop
-    }
-    if (typeof viewerState.scrollLeft === 'number' && viewerContainer.scrollLeft !== viewerState.scrollLeft) {
-        viewerContainer.scrollLeft = viewerState.scrollLeft
-    }
 }
 
 let oldVisiblePages: number[]
diff --git a/viewer/components/state.ts b/viewer/components/state.ts
index 01914c208..4c626ae19 100644
--- a/viewer/components/state.ts
+++ b/viewer/components/state.ts
@@ -1,6 +1,6 @@
 import * as utils from './utils.js'
 import type { PDFViewerApplicationType } from './interface'
-import type { PanelManagerResponse, PdfViewerParams, PdfViewerState } from '../../types/latex-workshop-protocol-types/index.js'
+import type { PdfViewerParams, PdfViewerState } from '../../types/latex-workshop-protocol-types/index.js'
 import { getTrimValue } from './trimming.js'
 import { isSyncTeXEnabled, registerSyncTeX, setSyncTeXKey } from './synctex.js'
 import { IsAutoRefreshEnabled } from './refresh.js'
@@ -8,32 +8,28 @@ import { sendPanel } from './connection.js'
 
 declare const PDFViewerApplication: PDFViewerApplicationType
 
-export let viewerState: PdfViewerState
-let viewerStatePromiseResolve: () => void
-export const viewerStatePromise = new Promise<void>(resolve => viewerStatePromiseResolve = resolve)
+// let viewerState: PdfViewerState | undefined
 
 export function initUploadState() {
-    window.addEventListener('message', (e) => {
-        const data = e.data as PanelManagerResponse
-        if (!data.type) {
-            console.log('LateXWorkshopPdfViewer received a message of unknown type: ' + JSON.stringify(data))
-            return
-        }
-        switch (data.type) {
-            case 'restore_state': {
-                viewerState = data.state
-                viewerStatePromiseResolve()
-                break
-            }
-            default: {
-                break
-            }
-        }
-    })
+//     window.addEventListener('message', (e) => {
+//         const data = e.data as PanelManagerResponse
+//         if (!data.type) {
+//             console.log('LateXWorkshopPdfViewer received a message of unknown type: ' + JSON.stringify(data))
+//             return
+//         }
+//         switch (data.type) {
+//             case 'restore_state': {
+//                 console.log(data.state)
+//                 // viewerState = data.state
+//                 break
+//             }
+//             default: {
+//                 break
+//             }
+//         }
+//     })
 
     window.addEventListener('scrollend', () => { uploadState() }, true)
-
-    sendPanel({ type: 'initialized' })
 }
 
 export function uploadState() {
@@ -86,3 +82,42 @@ export async function setParams() {
         registerSyncTeX()
     }
 }
+
+// export async function setState(extension: LateXWorkshopPdfViewer) {
+//     const state = viewerState ?? await (await fetch('config.json')).json() as PdfViewerParams
+
+//     if (state.trim !== undefined) {
+//         setTrimValue(state.trim)
+//     }
+
+//     // By setting the scale, scaling will be invoked if necessary.
+//     // The scale can be a non-number one.
+//     if (state.scale !== undefined) {
+//         PDFViewerApplication.pdfViewer.currentScaleValue = state.scale
+//     }
+//     if (state.scrollMode !== undefined) {
+//         PDFViewerApplication.pdfViewer.scrollMode = state.scrollMode
+//     }
+//     if (state.spreadMode !== undefined) {
+//         PDFViewerApplication.pdfViewer.spreadMode = state.spreadMode
+//     }
+//     if (!('scrollTop' in state)) {
+//         return
+//     }
+
+//     if (state.scrollTop !== undefined) {
+//         document.getElementById('viewerContainer')!.scrollTop = state.scrollTop
+//     }
+//     if (state.scrollLeft !== undefined) {
+//         document.getElementById('viewerContainer')!.scrollLeft = state.scrollLeft
+//     }
+//     if (state.sidebarView !== undefined) {
+//         PDFViewerApplication.pdfSidebar.switchView(state.sidebarView)
+//     }
+//     if (state.synctexEnabled !== undefined) {
+//         extension.setSynctex(state.synctexEnabled)
+//     }
+//     if (state.autoReloadEnabled !== undefined) {
+//         extension.setAutoReload(state.autoReloadEnabled)
+//     }
+// }