diff --git a/package-lock.json b/package-lock.json
index 92f05b75d..a1132b2e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,8 +43,8 @@
         "ml-tree-similarity": "^2.2.0",
         "multiplet-analysis": "^2.1.2",
         "nmr-correlation": "^2.3.3",
-        "nmr-load-save": "^1.2.0",
-        "nmr-processing": "^12.12.3",
+        "nmr-load-save": "^1.2.2",
+        "nmr-processing": "13.0.3-pre.1730842757",
         "nmredata": "^0.9.11",
         "numeral": "^2.0.6",
         "openchemlib": "^8.16.0",
@@ -53,8 +53,8 @@
         "re-resizable": "6.10.0",
         "react-d3-utils": "^2.0.0",
         "react-dropzone": "14.2.3",
-        "react-error-boundary": "^4.1.1",
-        "react-hook-form": "^7.53.0",
+        "react-error-boundary": "^4.1.2",
+        "react-hook-form": "^7.53.1",
         "react-icons": "^5.3.0",
         "react-inspector": "^6.0.2",
         "react-mf": "^2.0.3",
@@ -70,23 +70,23 @@
         "yup": "^1.4.0"
       },
       "devDependencies": {
-        "@babel/plugin-transform-modules-commonjs": "^7.25.7",
-        "@babel/preset-react": "^7.25.7",
-        "@babel/preset-typescript": "^7.25.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/preset-react": "^7.25.9",
+        "@babel/preset-typescript": "^7.25.9",
         "@playwright/test": "^1.48.1",
         "@simbathesailor/use-what-changed": "^2.0.0",
         "@types/d3": "^7.4.3",
-        "@types/lodash": "^4.17.10",
-        "@types/node": "^22.7.6",
-        "@types/papaparse": "^5.3.14",
-        "@types/react": "^18.3.11",
+        "@types/lodash": "^4.17.12",
+        "@types/node": "^22.7.9",
+        "@types/papaparse": "^5.3.15",
+        "@types/react": "^18.3.12",
         "@types/react-dom": "^18.3.1",
         "@types/react-table": "^7.7.20",
         "@vitejs/plugin-react-swc": "^3.7.1",
         "@vitest/coverage-v8": "^2.1.3",
         "cross-env": "^7.0.3",
-        "cspell": "^8.15.3",
-        "eslint": "^9.12.0",
+        "cspell": "^8.15.4",
+        "eslint": "^9.13.0",
         "eslint-config-cheminfo-react": "^14.0.0",
         "eslint-config-cheminfo-typescript": "^16.0.0",
         "modern-normalize": "^3.0.1",
@@ -102,7 +102,7 @@
         "stylelint": "^16.10.0",
         "stylelint-config-standard": "^36.0.1",
         "typescript": "^5.6.3",
-        "vite": "^5.4.9",
+        "vite": "^5.4.10",
         "vitest": "^2.1.3"
       },
       "peerDependencies": {
@@ -125,12 +125,12 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
-      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.9.tgz",
+      "integrity": "sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.25.7",
+        "@babel/highlight": "^7.25.9",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -181,12 +181,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
-      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.9.tgz",
+      "integrity": "sha512-omlUGkr5EaoIJrhLf9CJ0TvjBRpd9+AXRG//0GEQ9THSo8wPiTlbpy1/Ow8ZTrbXpjd9FHXfbFQx32I04ht0FA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7",
+        "@babel/types": "^7.25.9",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -196,13 +196,13 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -227,18 +227,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+      "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -249,43 +249,43 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
-      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
-      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
-      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.9.tgz",
+      "integrity": "sha512-TvLZY/F3+GvdRYFZFyxMvnsKi+4oJdgZzU3BoGN9Uc2d9C6zfNwJcKKhjqLAhK8i46mv93jsO74fDh3ih6rpHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-simple-access": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -295,22 +295,22 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
-      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
-      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -318,15 +318,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
-      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+      "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -336,55 +336,55 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
-      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
+      "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
-      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
-      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
-      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
-      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -407,12 +407,12 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
-      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz",
+      "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -422,12 +422,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
-      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.9.tgz",
+      "integrity": "sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.8"
+        "@babel/types": "^7.25.9"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -437,13 +437,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.7.tgz",
-      "integrity": "sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -453,13 +453,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.7.tgz",
-      "integrity": "sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -469,15 +469,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
-      "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
+      "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-simple-access": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -487,13 +487,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.7.tgz",
-      "integrity": "sha512-r0QY7NVU8OnrwE+w2IWiRom0wwsTbjx4+xH2RTd7AVdof3uurXOF+/mXHQDRk+2jIvWgSaCHKMgggfvM4dyUGA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz",
+      "integrity": "sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -503,17 +503,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.7.tgz",
-      "integrity": "sha512-vILAg5nwGlR9EXE8JIOX4NHXd49lrYbN8hnjffDtoULwpL9hUx/N55nqh2qd0q6FyNDfjl9V79ecKGvFbcSA0Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz",
+      "integrity": "sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-syntax-jsx": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -523,13 +523,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.7.tgz",
-      "integrity": "sha512-5yd3lH1PWxzW6IZj+p+Y4OLQzz0/LzlOG8vGqonHfVR3euf1vyzyMUJk9Ac+m97BH46mFc/98t9PmYLyvgL3qg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz",
+      "integrity": "sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.25.7"
+        "@babel/plugin-transform-react-jsx": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -539,14 +539,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.7.tgz",
-      "integrity": "sha512-6YTHJ7yjjgYqGc8S+CbEXhLICODk0Tn92j+vNJo07HFk9t3bjFgAKxPLFhHwF2NjmQVSI1zBRfBWUeVBa2osfA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz",
+      "integrity": "sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -556,17 +556,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.7.tgz",
-      "integrity": "sha512-VKlgy2vBzj8AmEzunocMun2fF06bsSWV+FvVXohtL6FGve/+L217qhHxRTVGHEDO/YR8IANcjzgJsd04J8ge5Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz",
+      "integrity": "sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/plugin-syntax-typescript": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-syntax-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -576,18 +576,18 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.7.tgz",
-      "integrity": "sha512-GjV0/mUEEXpi1U5ZgDprMRRgajGMRW3G5FjMr5KLKD8nT2fTG8+h/klV3+6Dm5739QE+K5+2e91qFKAYI3pmRg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
+      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
-        "@babel/plugin-transform-react-display-name": "^7.25.7",
-        "@babel/plugin-transform-react-jsx": "^7.25.7",
-        "@babel/plugin-transform-react-jsx-development": "^7.25.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-transform-react-display-name": "^7.25.9",
+        "@babel/plugin-transform-react-jsx": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-development": "^7.25.9",
+        "@babel/plugin-transform-react-pure-annotations": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -597,17 +597,17 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.25.7.tgz",
-      "integrity": "sha512-rkkpaXJZOFN45Fb+Gki0c+KMIglk4+zZXOoMJuyEK8y8Kkc8Jd3BDmP7qPsz0zQMJj+UD7EprF+AqAXcILnexw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.25.9.tgz",
+      "integrity": "sha512-XWxw1AcKk36kgxf4C//fl0ikjLeqGUWn062/Fd8GtpTfDJOX6Ud95FK+4JlDA36BX4bNGndXi3a6Vr4Jo5/61A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
-        "@babel/plugin-syntax-jsx": "^7.25.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.25.7",
-        "@babel/plugin-transform-typescript": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -629,30 +629,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
-      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
-      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/generator": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7",
+        "@babel/code-frame": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.25.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -661,14 +661,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
-      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.9.tgz",
+      "integrity": "sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -766,9 +765,9 @@
       }
     },
     "node_modules/@cspell/cspell-bundled-dicts": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.15.3.tgz",
-      "integrity": "sha512-wIuJomJEJn60w+ts4dFBYEo3kkwdPe1R4qVn52hDq5CUzrNniSywCpeBQO8Sgy5ljk73ojENbMBCE8+Jrukk0Q==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.15.4.tgz",
+      "integrity": "sha512-t5b2JwGeUmzmjl319mCuaeKGxTvmzLLRmrpdHr+ZZGRO4nf7L48Lbe9A6uwNUvsZe0cXohiNXsrrsuzRVXswVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -782,7 +781,7 @@
         "@cspell/dict-css": "^4.0.16",
         "@cspell/dict-dart": "^2.2.4",
         "@cspell/dict-django": "^4.1.3",
-        "@cspell/dict-docker": "^1.1.10",
+        "@cspell/dict-docker": "^1.1.11",
         "@cspell/dict-dotnet": "^5.0.8",
         "@cspell/dict-elixir": "^4.0.6",
         "@cspell/dict-en_us": "^4.3.26",
@@ -813,17 +812,17 @@
         "@cspell/dict-php": "^4.0.13",
         "@cspell/dict-powershell": "^5.0.13",
         "@cspell/dict-public-licenses": "^2.0.11",
-        "@cspell/dict-python": "^4.2.11",
+        "@cspell/dict-python": "^4.2.12",
         "@cspell/dict-r": "^2.0.4",
         "@cspell/dict-ruby": "^5.0.7",
         "@cspell/dict-rust": "^4.0.9",
         "@cspell/dict-scala": "^5.0.6",
-        "@cspell/dict-software-terms": "^4.1.10",
+        "@cspell/dict-software-terms": "^4.1.11",
         "@cspell/dict-sql": "^2.1.8",
         "@cspell/dict-svelte": "^1.0.5",
         "@cspell/dict-swift": "^2.0.4",
         "@cspell/dict-terraform": "^1.0.5",
-        "@cspell/dict-typescript": "^3.1.9",
+        "@cspell/dict-typescript": "^3.1.10",
         "@cspell/dict-vue": "^3.0.3"
       },
       "engines": {
@@ -831,22 +830,22 @@
       }
     },
     "node_modules/@cspell/cspell-json-reporter": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.15.3.tgz",
-      "integrity": "sha512-348UsYDdPTaGUvzdRY+Tj8rnN/1yLFkbEc6FkTejkBPwL0rpaJLp27N3Y8uZfrFGyMem/fYS+aHAvB3kTIzieQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.15.4.tgz",
+      "integrity": "sha512-solraYhZG4l++NeVCOtpc8DMvwHc46TmJt8DQbgvKtk6wOjTEcFrwKfA6Ei9YKbvyebJlpWMenO3goOll0loYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-types": "8.15.3"
+        "@cspell/cspell-types": "8.15.4"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@cspell/cspell-pipe": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.15.3.tgz",
-      "integrity": "sha512-Xodpkm1HJjGtmlL+V4B06PbeEsfhZtNwvPLTtaMExP4ED78VimBYlSz3lR+8jZgkHvZOhbQuHw7zwBqQd4u4Mg==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.15.4.tgz",
+      "integrity": "sha512-WfCmZVFC6mX6vYlf02hWwelcSBTbDQgc5YqY+1miuMk+OHSUAHSACjZId6/a4IAID94xScvFfj7jgrdejUVvIQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -854,9 +853,9 @@
       }
     },
     "node_modules/@cspell/cspell-resolver": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.15.3.tgz",
-      "integrity": "sha512-KoSv9iGbItS1uGlXspTg9XQmbBnjR7wkW5Du9Q3pLYAjSwcmArOVqQnumNAPfTsIldn9WsBalwGSm/uwawxAPg==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.15.4.tgz",
+      "integrity": "sha512-Zr428o+uUTqywrdKyjluJVnDPVAJEqZ1chQLKIrHggUah1cgs5aQ7rZ+0Rv5euYMlC2idZnP7IL6TDaIib80oA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -867,9 +866,9 @@
       }
     },
     "node_modules/@cspell/cspell-service-bus": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.15.3.tgz",
-      "integrity": "sha512-BLAaAc9fWn/sdNo/Z7bPwHtQ+z7snUnjXoLHYY9Vg8N0K2nMYkuJqAm7xbeKDy64sLykpu+pubdMR3DqEQJo/g==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.15.4.tgz",
+      "integrity": "sha512-pXYofnV/V9Y3LZdfFGbmhdxPX/ABjiD3wFjGHt5YhIU9hjVVuvjFlgY7pH2AvRjs4F8xKXv1ReWl44BJOL9gLA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -877,9 +876,9 @@
       }
     },
     "node_modules/@cspell/cspell-types": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.15.3.tgz",
-      "integrity": "sha512-05xy2eeIQIHk2X6hUfBPBNbCnWcuSjE6D/F0XFTxLBl4ecUurSthJqvR3PrMjluETeZ71/cRIZMBnW+v7+yBgw==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.15.4.tgz",
+      "integrity": "sha512-1hDtgYDQVW11zgtrr12EmGW45Deoi7IjZOhzPFLb+3WkhZ46ggWdbrRalWwBolQPDDo6+B2Q6WXz5hdND+Tpwg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1006,9 +1005,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-filetypes": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.7.tgz",
-      "integrity": "sha512-/DN0Ujp9/EXvpTcgih9JmBaE8n+G0wtsspyNdvHT5luRfpfol1xm/CIQb6xloCXCiLkWX+EMPeLSiVIZq+24dA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.8.tgz",
+      "integrity": "sha512-D3N8sm/iptzfVwsib/jvpX+K/++rM8SRpLDFUaM4jxm8EyGmSIYRbKZvdIv5BkAWmMlTWoRqlLn7Yb1b11jKJg==",
       "dev": true,
       "license": "MIT"
     },
@@ -1076,9 +1075,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-html": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.9.tgz",
-      "integrity": "sha512-BNp7w3m910K4qIVyOBOZxHuFNbVojUY6ES8Y8r7YjYgJkm2lCuQoVwwhPjurnomJ7BPmZTb+3LLJ58XIkgF7JQ==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.10.tgz",
+      "integrity": "sha512-I9uRAcdtHbh0wEtYZlgF0TTcgH0xaw1B54G2CW+tx4vHUwlde/+JBOfIzird4+WcMv4smZOfw+qHf7puFUbI5g==",
       "dev": true,
       "license": "MIT"
     },
@@ -1254,9 +1253,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-typescript": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.10.tgz",
-      "integrity": "sha512-7Zek3w4Rh3ZYyhihJ34FdnUBwP3OmRldnEq3hZ+FgQ0PyYZjXv5ztEViRBBxXjiFx1nHozr6pLi74TxToD8xsg==",
+      "version": "3.1.11",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.11.tgz",
+      "integrity": "sha512-FwvK5sKbwrVpdw0e9+1lVTl8FPoHYvfHRuQRQz2Ql5XkC0gwPPkpoyD1zYImjIyZRoYXk3yp9j8ss4iz7A7zoQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -1268,9 +1267,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dynamic-import": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.15.3.tgz",
-      "integrity": "sha512-RG35KnoLSFRj9BwmDW3AmkEbh6NxkZrhRxCQ8s4ZfMl5QEkoYKdVpWYSPUBMlPqkq0U+SVggMvNbdMSqyITxxQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.15.4.tgz",
+      "integrity": "sha512-tr0F6EYN6qtniNvt1Uib+PgYQHeo4dQHXE2Optap+hYTOoQ2VoQ+SwBVjZ+Q2bmSAB0fmOyf0AvgsUtnWIpavw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1281,9 +1280,9 @@
       }
     },
     "node_modules/@cspell/filetypes": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-8.15.3.tgz",
-      "integrity": "sha512-2B22/c2/pVqS2p3latOj3zCHk7vUWsxwkhCKhOKMA2tKt2cc7MHKUKMfsX4XpfY/571S/TTy1YYeGXlAxUtF3g==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-8.15.4.tgz",
+      "integrity": "sha512-sNl6jr3ym/4151EY76qlI/00HHsiLZBqW7Vb1tqCzsgSg3EpL30ddjr74So6Sg2PN26Yf09hvxGTJzXn1R4aYw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1291,9 +1290,9 @@
       }
     },
     "node_modules/@cspell/strong-weak-map": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.15.3.tgz",
-      "integrity": "sha512-IhH+Reh2P+QXj8i5qGYsFI3Z01IWYMqUuN6CLnFXx5W0R8tWtxvmwWyT7j8lchV5foHSs8+mWaijKzwS6FSFVQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.15.4.tgz",
+      "integrity": "sha512-m5DeQksbhJFqcSYF8Q0Af/WXmXCMAJocCUShkzOXK+uZNXnvhBZN7VyQ9hL+GRzX8JTPEPdVcz2lFyVE5p+LzQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1301,9 +1300,9 @@
       }
     },
     "node_modules/@cspell/url": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/@cspell/url/-/url-8.15.3.tgz",
-      "integrity": "sha512-JuQdGHj+W5anXpc+2pYggoUd+LsbNac4Rc7PdUUTnzMxV1EvlQZs28jEK4y27i4RI5pNQmsUWGZTHeMuwdlgSQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/@cspell/url/-/url-8.15.4.tgz",
+      "integrity": "sha512-K2oZu/oLQPs5suRpLS8uu04O3YMUioSlEU1D66fRoOxzI5NzLt7i7yMg3HQHjChGa09N5bzqmrVdhmQrRZXwGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2024,9 +2023,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.6.0.tgz",
-      "integrity": "sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz",
+      "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -2071,9 +2070,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.12.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.12.0.tgz",
-      "integrity": "sha512-eohesHH8WFRUprDNyEREgqP6beG6htMeUYeCpkEgBCieCMme5r9zFWjzAJp//9S+Kub4rqE+jXe9Cp1a7IYIIA==",
+      "version": "9.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz",
+      "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3918,9 +3917,9 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz",
+      "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==",
       "license": "MIT"
     },
     "node_modules/@types/lodash.merge": {
@@ -3933,9 +3932,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
-      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw==",
+      "version": "22.7.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.9.tgz",
+      "integrity": "sha512-jrTfRC7FM6nChvU7X2KqcrgquofrWLFDeYC1hKfwNWomVvrn7JIksqf344WN2X/y8xrgqBd2dJATZV4GbatBfg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3950,9 +3949,9 @@
       "license": "MIT"
     },
     "node_modules/@types/papaparse": {
-      "version": "5.3.14",
-      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.14.tgz",
-      "integrity": "sha512-LxJ4iEFcpqc6METwp9f6BV6VVc43m6MfH0VqFosHvrUgfXiFe6ww7R3itkOQ+TCK6Y+Iv/+RnnvtRZnkc5Kc9g==",
+      "version": "5.3.15",
+      "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.15.tgz",
+      "integrity": "sha512-JHe6vF6x/8Z85nCX4yFdDslN11d+1pr12E526X8WAfhadOeaOTx5AuIkvDKIBopfvlzpzkdMx4YyvSKCM9oqtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3972,9 +3971,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "18.3.11",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
-      "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
+      "version": "18.3.12",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
+      "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
       "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
@@ -4986,19 +4985,32 @@
       }
     },
     "node_modules/brukerconverter": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-7.0.3.tgz",
-      "integrity": "sha512-zxZWk6BO74hFRak9TUIQhRcZjkTdvn9EuCQgbbLT6uB3lxDMxy/wTVasubIOphwioKY8N075YdqHudVaq5XN2g==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/brukerconverter/-/brukerconverter-7.0.4.tgz",
+      "integrity": "sha512-G8Jx2f+hV02Zvkw+nXB1MpTFJaJhsuinrt+XQv/SFjA88rWYCrxw3WIMmHx06Bp19Zw03BYMdHy0YDMpyjplbw==",
       "license": "MIT",
       "dependencies": {
         "cheminfo-types": "^1.7.3",
         "filelist-utils": "^1.11.0",
         "iobuffer": "^5.3.2",
         "is-any-array": "^2.0.1",
-        "jcampconverter": "^9.6.4",
+        "jcampconverter": "^10.0.1",
         "ml-spectra-processing": "^14.5.0"
       }
     },
+    "node_modules/brukerconverter/node_modules/jcampconverter": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-10.0.1.tgz",
+      "integrity": "sha512-1yQ9Q35K2A64Q5NQ7AN/w6KbooviQAQ33Yo6p4vMFAyntR09n/OzR65CubbCogp3bVCm+pdQ3RCkfrcKqTabRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "cheminfo-types": "^1.8.0",
+        "dynamic-typing": "^1.0.1",
+        "ensure-string": "^1.2.0",
+        "gyromagnetic-ratio": "^1.2.0",
+        "ml-array-median": "^1.1.6"
+      }
+    },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
@@ -5576,25 +5588,25 @@
       }
     },
     "node_modules/cspell": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell/-/cspell-8.15.3.tgz",
-      "integrity": "sha512-diJiVBMunG3m7dYJpelSTsO4biLxVZ3glzLJF9jVs8n86dph04A9NXf29DKeAR0py62CFBKOrB1R4VGhxDxStg==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell/-/cspell-8.15.4.tgz",
+      "integrity": "sha512-hUOxcwmNWuHzVeGHyN5v/T9MkyCE5gi0mvatxsM794B2wOuR1ZORgjZH62P2HY1uBkXe/x5C6ITWrSyh0WgAcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-json-reporter": "8.15.3",
-        "@cspell/cspell-pipe": "8.15.3",
-        "@cspell/cspell-types": "8.15.3",
-        "@cspell/dynamic-import": "8.15.3",
-        "@cspell/url": "8.15.3",
+        "@cspell/cspell-json-reporter": "8.15.4",
+        "@cspell/cspell-pipe": "8.15.4",
+        "@cspell/cspell-types": "8.15.4",
+        "@cspell/dynamic-import": "8.15.4",
+        "@cspell/url": "8.15.4",
         "chalk": "^5.3.0",
         "chalk-template": "^1.1.0",
         "commander": "^12.1.0",
-        "cspell-dictionary": "8.15.3",
-        "cspell-gitignore": "8.15.3",
-        "cspell-glob": "8.15.3",
-        "cspell-io": "8.15.3",
-        "cspell-lib": "8.15.3",
+        "cspell-dictionary": "8.15.4",
+        "cspell-gitignore": "8.15.4",
+        "cspell-glob": "8.15.4",
+        "cspell-io": "8.15.4",
+        "cspell-lib": "8.15.4",
         "fast-json-stable-stringify": "^2.1.0",
         "file-entry-cache": "^9.1.0",
         "get-stdin": "^9.0.0",
@@ -5613,13 +5625,13 @@
       }
     },
     "node_modules/cspell-config-lib": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.15.3.tgz",
-      "integrity": "sha512-IMIvZ/2fzl628obiFhcgNsorcS4pimAgDi9M0k9GDA/zbLeweWZqjmSEN9tgUPvkRznQvJd0TZXJ0B5RkM5+2Q==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.15.4.tgz",
+      "integrity": "sha512-vUgikQTRkRMTdkZqSs7F2cTdPpX61cTjr/9L/VCkXkbW38ObCr4650ioiF1Wq3zDF3Gy2bc4ECTpD2PZUXX5SA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-types": "8.15.3",
+        "@cspell/cspell-types": "8.15.4",
         "comment-json": "^4.2.5",
         "yaml": "^2.6.0"
       },
@@ -5641,15 +5653,15 @@
       }
     },
     "node_modules/cspell-dictionary": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.15.3.tgz",
-      "integrity": "sha512-FwYpDou0oyHmfjz70juVvIskZo1/+Xzq4s6eX2ZjUNQSp/jaykWNOiqIw5eVx0Z3sq3cWzCJ9zUuHcXxvFi7EQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.15.4.tgz",
+      "integrity": "sha512-8+p/l9Saac7qyCbqtELneDoT7CwHu9gYmnI8uXMu34/lPGjhVhy10ZeI0+t1djaO2YyASK400YFKq5uP/5KulA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-pipe": "8.15.3",
-        "@cspell/cspell-types": "8.15.3",
-        "cspell-trie-lib": "8.15.3",
+        "@cspell/cspell-pipe": "8.15.4",
+        "@cspell/cspell-types": "8.15.4",
+        "cspell-trie-lib": "8.15.4",
         "fast-equals": "^5.0.1"
       },
       "engines": {
@@ -5657,15 +5669,15 @@
       }
     },
     "node_modules/cspell-gitignore": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.15.3.tgz",
-      "integrity": "sha512-h1O9y3F81e8RyDE87Bv7m6Faz4FjkUhr72QqakbGuhRsjembST5YEw1B5Okc4BSUQhRER+dEh4xLp90EmNzZuw==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.15.4.tgz",
+      "integrity": "sha512-9n5PpQ8gEf8YcvEtoZGZ2Ma6wnqSFkD2GrmyjISy39DfIX/jNLN7GX2wJm6OD2P4FjXer95ypmIb/JWTlfmbTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/url": "8.15.3",
-        "cspell-glob": "8.15.3",
-        "cspell-io": "8.15.3",
+        "@cspell/url": "8.15.4",
+        "cspell-glob": "8.15.4",
+        "cspell-io": "8.15.4",
         "find-up-simple": "^1.0.0"
       },
       "bin": {
@@ -5676,13 +5688,13 @@
       }
     },
     "node_modules/cspell-glob": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.15.3.tgz",
-      "integrity": "sha512-nsxe1PCFZyOHxVeo3Bqi2MyVy2JASF9p1xSCZAFjiVjeRmeqDrS098UcoucXRDFScJ2RP8A62niC6P3m6qg5IA==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.15.4.tgz",
+      "integrity": "sha512-TTfRRHRAN+PN9drIz4MAEgKKYnPThBOlPMdFddyuisvU33Do1sPAnqkkOjTEFdi3jAA5KwnSva68SVH6IzzMBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/url": "8.15.3",
+        "@cspell/url": "8.15.4",
         "micromatch": "^4.0.8"
       },
       "engines": {
@@ -5690,14 +5702,14 @@
       }
     },
     "node_modules/cspell-grammar": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.15.3.tgz",
-      "integrity": "sha512-HCtGzym6JsdrYjwGySxKFsLjvASAgftv7nEOTBFp/u3Y2zVPmoQaFmmlSWBbJRsNQa9elL0DyQOSC7WC6GbGSQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.15.4.tgz",
+      "integrity": "sha512-MKiKyYi05mRtXOxPoTv3Ksi0GwYLiK84Uq0C+5PaMrnIjXeed0bsddSFXCT+7ywFJc7PdjhTtz0M/9WWK3UgbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-pipe": "8.15.3",
-        "@cspell/cspell-types": "8.15.3"
+        "@cspell/cspell-pipe": "8.15.4",
+        "@cspell/cspell-types": "8.15.4"
       },
       "bin": {
         "cspell-grammar": "bin.mjs"
@@ -5707,42 +5719,42 @@
       }
     },
     "node_modules/cspell-io": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-8.15.3.tgz",
-      "integrity": "sha512-ycKrfTSurfleQNR5x7QRmQ/qtMJ6JkBiqaq5qtCHNYUlOjrmQBNVXFpbmPJ3+qG+ObW+eQKEvZH5xr17F2BMjw==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-8.15.4.tgz",
+      "integrity": "sha512-rXIEREPTFV9dwwg4EKfvzqlCNOvT6910AYED5YrSt8Y68usRJ9lbqdx0BrDndVCd33bp1o+9JBfHuRiFIQC81g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-service-bus": "8.15.3",
-        "@cspell/url": "8.15.3"
+        "@cspell/cspell-service-bus": "8.15.4",
+        "@cspell/url": "8.15.4"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/cspell-lib": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.15.3.tgz",
-      "integrity": "sha512-LJIEZ3E8ZCOAqcMwkonXH3NEa6ITTlp3nZ9nhmxHE0GbMUYP5/CmTCWSnJUjrINmhjl5dMj6Z7xzDTgEAu0K9Q==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.15.4.tgz",
+      "integrity": "sha512-iLp/625fvCyFFxSyZYLMgqHIKcrhN4hT7Hw5+ySa38Bp/OfA81ANqWHpsDQ0bGsALTRn/DHBpQYj4xCW/aN9tw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-bundled-dicts": "8.15.3",
-        "@cspell/cspell-pipe": "8.15.3",
-        "@cspell/cspell-resolver": "8.15.3",
-        "@cspell/cspell-types": "8.15.3",
-        "@cspell/dynamic-import": "8.15.3",
-        "@cspell/filetypes": "8.15.3",
-        "@cspell/strong-weak-map": "8.15.3",
-        "@cspell/url": "8.15.3",
+        "@cspell/cspell-bundled-dicts": "8.15.4",
+        "@cspell/cspell-pipe": "8.15.4",
+        "@cspell/cspell-resolver": "8.15.4",
+        "@cspell/cspell-types": "8.15.4",
+        "@cspell/dynamic-import": "8.15.4",
+        "@cspell/filetypes": "8.15.4",
+        "@cspell/strong-weak-map": "8.15.4",
+        "@cspell/url": "8.15.4",
         "clear-module": "^4.1.2",
         "comment-json": "^4.2.5",
-        "cspell-config-lib": "8.15.3",
-        "cspell-dictionary": "8.15.3",
-        "cspell-glob": "8.15.3",
-        "cspell-grammar": "8.15.3",
-        "cspell-io": "8.15.3",
-        "cspell-trie-lib": "8.15.3",
+        "cspell-config-lib": "8.15.4",
+        "cspell-dictionary": "8.15.4",
+        "cspell-glob": "8.15.4",
+        "cspell-grammar": "8.15.4",
+        "cspell-io": "8.15.4",
+        "cspell-trie-lib": "8.15.4",
         "env-paths": "^3.0.0",
         "fast-equals": "^5.0.1",
         "gensequence": "^7.0.0",
@@ -5757,14 +5769,14 @@
       }
     },
     "node_modules/cspell-trie-lib": {
-      "version": "8.15.3",
-      "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.15.3.tgz",
-      "integrity": "sha512-sJwGFE3ymkL6UsnZbMOGcD+iDOdYo7gyVafMDUJvb4rnKqAhLJumiCPT4bPLQ7oWAti7swHBQrOJ/Wp3phQ+LQ==",
+      "version": "8.15.4",
+      "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.15.4.tgz",
+      "integrity": "sha512-sg9klsNHyrfos0Boiio+qy5d6fI9cCNjBqFYrNxvpKpwZ4gEzDzjgEKdZY1C76RD2KoBQ8I1NF5YcGc0+hhhCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-pipe": "8.15.3",
-        "@cspell/cspell-types": "8.15.3",
+        "@cspell/cspell-pipe": "8.15.4",
+        "@cspell/cspell-types": "8.15.4",
         "gensequence": "^7.0.0"
       },
       "engines": {
@@ -6757,18 +6769,18 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.12.0.tgz",
-      "integrity": "sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==",
+      "version": "9.13.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz",
+      "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",
         "@eslint/config-array": "^0.18.0",
-        "@eslint/core": "^0.6.0",
+        "@eslint/core": "^0.7.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.12.0",
+        "@eslint/js": "9.13.0",
         "@eslint/plugin-kit": "^0.2.0",
         "@humanfs/node": "^0.16.5",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -10065,9 +10077,9 @@
       }
     },
     "node_modules/nmr-load-save": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-1.2.0.tgz",
-      "integrity": "sha512-CjfxjqV9U6DyAm/IlJ5ehaWaD9QJ3xjl2U0UZ2swlddjy/FDDz4Ym7IGDWNKpmqUhXGUck17KRSjAZRmq/ED1A==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-1.2.2.tgz",
+      "integrity": "sha512-YU3835DsFleIw0tvlFrPLRyYC5XG4ppywPPJhGBehADd3vF9K8cBmU5bxr7CSa/ZljxMNHTcdUSRR7EiuvWM/w==",
       "license": "MIT",
       "dependencies": {
         "@lukeed/uuid": "^2.0.1",
@@ -10078,7 +10090,7 @@
         "filelist-utils": "^1.11.2",
         "gyromagnetic-ratio": "^1.2.0",
         "is-any-array": "^2.0.1",
-        "jcampconverter": "^9.6.4",
+        "jcampconverter": "^10.0.1",
         "jeolconverter": "^1.0.3",
         "lodash.merge": "^4.6.2",
         "ml-spectra-processing": "^14.6.0",
@@ -10106,10 +10118,23 @@
         "d3-color": "1 - 2"
       }
     },
+    "node_modules/nmr-load-save/node_modules/jcampconverter": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/jcampconverter/-/jcampconverter-10.0.1.tgz",
+      "integrity": "sha512-1yQ9Q35K2A64Q5NQ7AN/w6KbooviQAQ33Yo6p4vMFAyntR09n/OzR65CubbCogp3bVCm+pdQ3RCkfrcKqTabRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "cheminfo-types": "^1.8.0",
+        "dynamic-typing": "^1.0.1",
+        "ensure-string": "^1.2.0",
+        "gyromagnetic-ratio": "^1.2.0",
+        "ml-array-median": "^1.1.6"
+      }
+    },
     "node_modules/nmr-load-save/node_modules/nmr-processing": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-13.0.1.tgz",
-      "integrity": "sha512-U1r4PjZzAqbrBqgBkn27jF87GoRrxRGT9zlXXVcmbf4dgcmKOCo3FGd+ZXR9VLgZVsL64BGkpM+H1EDjfglBqg==",
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-13.0.2.tgz",
+      "integrity": "sha512-hLaObBnrIwV78nykfKdnDBw3sWU95dTbTFir7kwKFPWDTAEAoMC6LL22So0zDqAdU+8z9XzTyOWqi8qZjZZAfQ==",
       "license": "MIT",
       "dependencies": {
         "@lukeed/uuid": "^2.0.1",
@@ -10135,21 +10160,21 @@
         "ml-regression-exponential": "^3.0.1",
         "ml-regression-polynomial": "^3.0.1",
         "ml-savitzky-golay-generalized": "^4.2.0",
-        "ml-signal-processing": "^1.0.4",
+        "ml-signal-processing": "^1.1.1",
         "ml-simple-clustering": "^0.1.0",
         "ml-sparse-matrix": "^2.1.0",
-        "ml-spectra-processing": "^14.5.1",
+        "ml-spectra-processing": "^14.6.0",
         "ml-tree-set": "^0.1.1",
         "nmr-correlation": "^2.3.3",
         "numeral": "^2.0.6",
-        "openchemlib-utils": "^6.1.0",
+        "openchemlib-utils": "^6.4.1",
         "spectrum-generator": "^8.0.11"
       }
     },
     "node_modules/nmr-processing": {
-      "version": "12.12.3",
-      "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-12.12.3.tgz",
-      "integrity": "sha512-WNJFkPYeyRhQHOFPpgcp0ZT7Os7PATGduOYHphmzUjiVePLK1KdukBRajc89FEaeoSN5af18v/BugBiIsvzqEw==",
+      "version": "13.0.3-pre.1730842757",
+      "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-13.0.3-pre.1730842757.tgz",
+      "integrity": "sha512-YA7LcVZrZY1H38Q70qOAM5hZPma2PgDSDFDOfb8zV40whETNWZYlDBaxVkPrLWX1WQ42WhQ1mw7ZPkjBKNfzzQ==",
       "license": "MIT",
       "dependencies": {
         "@lukeed/uuid": "^2.0.1",
@@ -10164,25 +10189,25 @@
         "lodash.omit": "^4.5.0",
         "ml-airpls": "^2.0.0",
         "ml-direct": "^1.0.0",
-        "ml-gsd": "^12.1.6",
+        "ml-gsd": "^12.1.8",
         "ml-hclust": "^3.1.0",
         "ml-levenberg-marquardt": "^4.1.3",
         "ml-matrix": "^6.11.1",
         "ml-matrix-convolution": "^1.0.0",
         "ml-matrix-peaks-finder": "^1.0.0",
-        "ml-peak-shape-generator": "^4.1.2",
+        "ml-peak-shape-generator": "^4.1.4",
         "ml-regression-base": "^4.0.0",
         "ml-regression-exponential": "^3.0.1",
         "ml-regression-polynomial": "^3.0.1",
         "ml-savitzky-golay-generalized": "^4.2.0",
-        "ml-signal-processing": "^1.0.4",
+        "ml-signal-processing": "^1.1.1",
         "ml-simple-clustering": "^0.1.0",
         "ml-sparse-matrix": "^2.1.0",
-        "ml-spectra-processing": "^14.5.1",
+        "ml-spectra-processing": "^14.6.0",
         "ml-tree-set": "^0.1.1",
         "nmr-correlation": "^2.3.3",
         "numeral": "^2.0.6",
-        "openchemlib-utils": "^6.1.0",
+        "openchemlib-utils": "^6.4.1",
         "spectrum-generator": "^8.0.11"
       }
     },
@@ -11197,16 +11222,13 @@
       }
     },
     "node_modules/react-error-boundary": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.1.1.tgz",
-      "integrity": "sha512-EOAEsbVm2EQD8zPS4m24SiaR/506RPC3CjMcjJ5JWKECsctyLsDTKxB26Hvl7jcz7KweSOkBYAcY/hmMpMn2jA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.1.2.tgz",
+      "integrity": "sha512-GQDxZ5Jd+Aq/qUxbCm1UtzmL/s++V7zKgE8yMktJiCQXCCFZnMZh9ng+6/Ne6PjNSXH0L9CjeOEREfRnq6Duag==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5"
       },
-      "engines": {
-        "pnpm": "=9"
-      },
       "peerDependencies": {
         "react": ">=16.13.1"
       }
@@ -11218,9 +11240,9 @@
       "license": "MIT"
     },
     "node_modules/react-hook-form": {
-      "version": "7.53.0",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.0.tgz",
-      "integrity": "sha512-M1n3HhqCww6S2hxLxciEXy2oISPnAzxY7gvwVPrtlczTM/1dDadXgUxDpHMrMTblDOcm/AXtXxHwZ3jpg1mqKQ==",
+      "version": "7.53.1",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.1.tgz",
+      "integrity": "sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -13421,15 +13443,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -13856,9 +13869,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.4.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
-      "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
+      "version": "5.4.10",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz",
+      "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index c37104d8b..5a452dbda 100644
--- a/package.json
+++ b/package.json
@@ -88,8 +88,8 @@
     "ml-tree-similarity": "^2.2.0",
     "multiplet-analysis": "^2.1.2",
     "nmr-correlation": "^2.3.3",
-    "nmr-load-save": "^1.2.0",
-    "nmr-processing": "^12.12.3",
+    "nmr-load-save": "^1.2.2",
+    "nmr-processing": "13.0.3-pre.1730842757",
     "nmredata": "^0.9.11",
     "numeral": "^2.0.6",
     "openchemlib": "^8.16.0",
@@ -98,8 +98,8 @@
     "re-resizable": "6.10.0",
     "react-d3-utils": "^2.0.0",
     "react-dropzone": "14.2.3",
-    "react-error-boundary": "^4.1.1",
-    "react-hook-form": "^7.53.0",
+    "react-error-boundary": "^4.1.2",
+    "react-hook-form": "^7.53.1",
     "react-icons": "^5.3.0",
     "react-inspector": "^6.0.2",
     "react-mf": "^2.0.3",
@@ -115,23 +115,23 @@
     "yup": "^1.4.0"
   },
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.25.7",
-    "@babel/preset-react": "^7.25.7",
-    "@babel/preset-typescript": "^7.25.7",
+    "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+    "@babel/preset-react": "^7.25.9",
+    "@babel/preset-typescript": "^7.25.9",
     "@playwright/test": "^1.48.1",
     "@simbathesailor/use-what-changed": "^2.0.0",
     "@types/d3": "^7.4.3",
-    "@types/lodash": "^4.17.10",
-    "@types/node": "^22.7.6",
-    "@types/papaparse": "^5.3.14",
-    "@types/react": "^18.3.11",
+    "@types/lodash": "^4.17.12",
+    "@types/node": "^22.7.9",
+    "@types/papaparse": "^5.3.15",
+    "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@types/react-table": "^7.7.20",
     "@vitejs/plugin-react-swc": "^3.7.1",
     "@vitest/coverage-v8": "^2.1.3",
     "cross-env": "^7.0.3",
-    "cspell": "^8.15.3",
-    "eslint": "^9.12.0",
+    "cspell": "^8.15.4",
+    "eslint": "^9.13.0",
     "eslint-config-cheminfo-react": "^14.0.0",
     "eslint-config-cheminfo-typescript": "^16.0.0",
     "modern-normalize": "^3.0.1",
@@ -147,7 +147,7 @@
     "stylelint": "^16.10.0",
     "stylelint-config-standard": "^36.0.1",
     "typescript": "^5.6.3",
-    "vite": "^5.4.9",
+    "vite": "^5.4.10",
     "vitest": "^2.1.3"
   }
 }
diff --git a/src/component/1d/ApodizationLine.tsx b/src/component/1d/ApodizationLine.tsx
index 2cc9f306c..2c20b85e1 100644
--- a/src/component/1d/ApodizationLine.tsx
+++ b/src/component/1d/ApodizationLine.tsx
@@ -1,5 +1,5 @@
 import type { Spectrum1D } from 'nmr-load-save';
-import { apodization, Filters } from 'nmr-processing';
+import { Filters1D, createApodizationWindowData } from 'nmr-processing';
 
 import { defaultApodizationOptions } from '../../data/constants/DefaultApodizationOptions.js';
 import { useChartData } from '../context/ChartContext.js';
@@ -39,44 +39,39 @@ function ApodizationLine() {
   const xyReduce = useXYReduce(XYReducerDomainAxis.XAxis);
   const scaleY = useWindowYScale();
 
-  if (!activeSpectrum?.id || selectedTool !== Filters.apodization.id) {
+  if (!activeSpectrum?.id || selectedTool !== Filters1D.apodization.id) {
     return null;
   }
 
   const paths = () => {
     const pathBuilder = new PathBuilder();
-    const { re, im = [], x } = spectrum.data;
+    const { re, x } = spectrum.data;
 
-    const { lineBroadening, gaussBroadening, lineBroadeningCenter } =
-      apodizationOptions || defaultApodizationOptions;
+    const { lineBroadening, gaussBroadening, lineBroadeningCenter } = {
+      ...apodizationOptions.lorentzToGauss?.shape.options,
+      ...defaultApodizationOptions.lorentzToGauss.shape.options,
+    };
 
     const length = re.length;
     const dw = (x[length - 1] - x[0]) / (length - 1);
-    const { windowData: y } = apodization(
-      { re, im },
-      {
-        apply: false,
-        compose: {
-          length,
-          shapes: [
-            {
-              start: 0,
-              shape: {
-                kind: 'lorentzToGauss',
-                options: {
-                  length,
-                  dw,
-                  exponentialHz:
-                    gaussBroadening > 0 ? lineBroadening : -lineBroadening,
-                  gaussianHz: gaussBroadening,
-                  center: lineBroadeningCenter,
-                },
-              },
+    const y = createApodizationWindowData({
+      length,
+      shapes: {
+        lorentzToGauss: {
+          shape: {
+            kind: 'lorentzToGauss',
+            options: {
+              length,
+              dw,
+              lineBroadening:
+                gaussBroadening > 0 ? lineBroadening : -lineBroadening,
+              gaussBroadening,
+              lineBroadeningCenter,
             },
-          ],
+          },
         },
       },
-    );
+    });
 
     if (x && y) {
       const pathPoints = xyReduce({ x, y });
diff --git a/src/component/1d/ExclusionZoneAnnotation.tsx b/src/component/1d/ExclusionZoneAnnotation.tsx
index fccbb1f33..5cc41a234 100644
--- a/src/component/1d/ExclusionZoneAnnotation.tsx
+++ b/src/component/1d/ExclusionZoneAnnotation.tsx
@@ -1,6 +1,6 @@
 /** @jsxImportSource @emotion/react */
 import { css } from '@emotion/react';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 import { memo } from 'react';
 
 import type { ExclusionZone } from '../../data/types/data1d/ExclusionZone.js';
@@ -31,7 +31,7 @@ function ExclusionZoneAnnotation({
 }: ExclusionZoneProps) {
   const { scaleX, scaleY } = useScaleChecked();
   const type =
-    filterId === Filters.signalProcessing.id
+    filterId === Filters1D.signalProcessing.id
       ? HighlightEventSource.MATRIX_GENERATION_EXCLUSION_ZONE
       : HighlightEventSource.EXCLUSION_ZONE;
   const highlight = useHighlight([], {
@@ -50,7 +50,7 @@ function ExclusionZoneAnnotation({
         width={`${scaleX()(zone.from) - scaleX()(zone.to)}`}
         height="10px"
         style={{
-          fill: filterId === Filters.signalProcessing.id ? 'gray' : color,
+          fill: filterId === Filters1D.signalProcessing.id ? 'gray' : color,
           opacity,
         }}
         {...highlight.onHover}
diff --git a/src/component/1d/ExclusionZonesAnnotations.tsx b/src/component/1d/ExclusionZonesAnnotations.tsx
index 43e0ae445..50c7e58c2 100644
--- a/src/component/1d/ExclusionZonesAnnotations.tsx
+++ b/src/component/1d/ExclusionZonesAnnotations.tsx
@@ -1,5 +1,5 @@
 import type { Spectrum1D } from 'nmr-load-save';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 import { memo } from 'react';
 
 import type { ExclusionZone } from '../../data/types/data1d/ExclusionZone.js';
@@ -76,11 +76,11 @@ function getExclusionZones(
 ): Array<{ id: string; zones: ExclusionZone[] }> {
   const zones: Array<{ id: string; zones: ExclusionZone[] }> = [];
   for (const filter of data.filters) {
-    if (filter.name === Filters.exclusionZones.id && filter.flag) {
-      zones.push({ id: Filters.exclusionZones.id, zones: filter.value });
-    } else if (filter.name === Filters.signalProcessing.id && filter.flag) {
+    if (filter.name === Filters1D.exclusionZones.id && filter.flag) {
+      zones.push({ id: Filters1D.exclusionZones.id, zones: filter.value });
+    } else if (filter.name === Filters1D.signalProcessing.id && filter.flag) {
       zones.push({
-        id: Filters.signalProcessing.id,
+        id: Filters1D.signalProcessing.id,
         zones: filter.value.exclusionsZones,
       });
     }
diff --git a/src/component/1d/matrix/useMatrix.ts b/src/component/1d/matrix/useMatrix.ts
index a6e5bb6cf..be8ab826b 100644
--- a/src/component/1d/matrix/useMatrix.ts
+++ b/src/component/1d/matrix/useMatrix.ts
@@ -1,13 +1,13 @@
 import type { NumberArray } from 'cheminfo-types';
 import type { Spectrum } from 'nmr-load-save';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 import { useMemo } from 'react';
 
 import { isSpectrum1D } from '../../../data/data1d/Spectrum1D/index.js';
 import { useChartData } from '../../context/ChartContext.js';
 import useSpectraByActiveNucleus from '../../hooks/useSpectraPerNucleus.js';
 
-const { signalProcessing } = Filters;
+const { signalProcessing } = Filters1D;
 
 /**
  * This method will slice the array from the fromIndex to the toIndex and add the first and last element of the original array
diff --git a/src/component/1d/ranges/Range.tsx b/src/component/1d/ranges/Range.tsx
index 1a4b697bf..ae5fc0c5b 100644
--- a/src/component/1d/ranges/Range.tsx
+++ b/src/component/1d/ranges/Range.tsx
@@ -192,6 +192,7 @@ function Range({ range, selectedTool, relativeFormat }: RangeProps) {
         targetTagName="g"
         {...(assignmentRange.isActive && { isOpen: true })}
         buttons={actionsButtons}
+        space={2}
       >
         <ResizerWithScale
           from={from}
diff --git a/src/component/2d/1d-tracer/phase-correction-traces/SpectrumPhaseTrace.tsx b/src/component/2d/1d-tracer/phase-correction-traces/SpectrumPhaseTrace.tsx
index c4cfb9435..32c85dba0 100644
--- a/src/component/2d/1d-tracer/phase-correction-traces/SpectrumPhaseTrace.tsx
+++ b/src/component/2d/1d-tracer/phase-correction-traces/SpectrumPhaseTrace.tsx
@@ -1,5 +1,5 @@
 import type { Spectrum1D, Spectrum2D } from 'nmr-load-save';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 import type { ReactNode } from 'react';
 
 import { getSlice } from '../../../../data/data2d/Spectrum2D/index.js';
@@ -143,7 +143,7 @@ function InnerSpectrumPhaseTrace(props: InnerSpectrumPhaseTraceProps) {
     info: { isComplex: true, isFid: false },
   };
 
-  Filters.phaseCorrection.apply(spectrum as unknown as Spectrum1D, {
+  Filters1D.phaseCorrection.apply(spectrum as unknown as Spectrum1D, {
     ph0,
     ph1,
   });
diff --git a/src/component/elements/ActionsButtonsPopover.tsx b/src/component/elements/ActionsButtonsPopover.tsx
index 0497920af..7b0e9ccd6 100644
--- a/src/component/elements/ActionsButtonsPopover.tsx
+++ b/src/component/elements/ActionsButtonsPopover.tsx
@@ -4,7 +4,6 @@ import { Popover } from '@blueprintjs/core';
 import type { Interpolation, Theme } from '@emotion/react';
 import { css } from '@emotion/react';
 import type { CSSProperties } from 'react';
-import { Fragment } from 'react';
 import type { ButtonProps } from 'react-science/ui';
 import { Button } from 'react-science/ui';
 
@@ -44,7 +43,12 @@ export function ActionsButtonsPopover(props: ActionsButtonsPopoverProps) {
       enforceFocus={false}
       content={
         <div
-          style={{ display: 'flex', flexDirection: direction, ...contentStyle }}
+          style={{
+            display: 'flex',
+            flexDirection: direction,
+            gap: space,
+            ...contentStyle,
+          }}
           css={css`
             button,
             a[role='button'] {
@@ -58,22 +62,12 @@ export function ActionsButtonsPopover(props: ActionsButtonsPopoverProps) {
         >
           {buttons
             .filter((button) => button?.visible !== false)
-            .map(({ title, visible, ...otherProps }, index, array) => (
-              <Fragment key={title || index}>
-                <Button
-                  tooltipProps={{ content: title || '', compact: true }}
-                  {...otherProps}
-                />
-                {index < array.length - 1 && (
-                  <div
-                    key={`spacer-${index}`}
-                    style={{
-                      margin:
-                        direction === 'row' ? `0 ${space}px` : `${space}px 0`,
-                    }}
-                  />
-                )}
-              </Fragment>
+            .map(({ title, visible, ...otherProps }, index) => (
+              <Button
+                key={title || index}
+                tooltipProps={{ content: title || '', compact: true }}
+                {...otherProps}
+              />
             ))}
         </div>
       }
diff --git a/src/component/elements/EditableColumn.tsx b/src/component/elements/EditableColumn.tsx
index bf4e13eb2..f16ef1ab2 100644
--- a/src/component/elements/EditableColumn.tsx
+++ b/src/component/elements/EditableColumn.tsx
@@ -1,4 +1,6 @@
-import type { CSSProperties, ChangeEvent, KeyboardEvent } from 'react';
+import { Button } from '@blueprintjs/core';
+import styled from '@emotion/styled';
+import type { CSSProperties, KeyboardEvent } from 'react';
 import {
   forwardRef,
   useCallback,
@@ -7,8 +9,41 @@ import {
   useState,
 } from 'react';
 
-import type { InputProps } from './Input.js';
-import Input from './Input.js';
+import { Input2 } from './Input2.js';
+import { NumberInput2 } from './NumberInput2.js';
+
+interface OverflowProps {
+  textOverflowEllipses: boolean;
+}
+
+const Text = styled.span<OverflowProps>`
+  display: table-cell;
+  vertical-align: middle;
+  width: 100%;
+  height: 100%;
+  ${({ textOverflowEllipses }) =>
+    textOverflowEllipses &&
+    `
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    `}
+`;
+const Container = styled.span<OverflowProps>`
+  display: table;
+  width: 100%;
+  min-height: 22px;
+  height: 100%;
+  ${({ textOverflowEllipses }) =>
+    textOverflowEllipses &&
+    `
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+      display: inline-flex;
+      align-items:end;
+    `}
+`;
 
 function extractNumber(val: string | number, type: string) {
   if (type === 'number' && typeof val !== 'number') {
@@ -18,37 +53,45 @@ function extractNumber(val: string | number, type: string) {
   return val;
 }
 
-interface EditableColumnProps
-  extends Omit<InputProps, 'style' | 'value' | 'type'> {
+function handleMousedown(event) {
+  event.stopPropagation();
+}
+
+const style: CSSProperties = { minWidth: 60 };
+const className = 'editable-column';
+
+interface BaseEditableColumnProps {
+  type: 'number' | 'text';
+  value: number | string;
+  validate?: (value?: string | number) => boolean;
+}
+
+interface EditableColumnProps extends BaseEditableColumnProps {
   onSave?: (element: KeyboardEvent<HTMLInputElement>) => void;
   onEditStart?: (element: boolean) => void;
-  type?: 'number' | 'text';
   editStatus?: boolean;
-  value: string | number;
   style?: CSSProperties;
-  validate?: (value?: string | number) => boolean;
-  textOverFlowEllipses?: boolean;
+  textOverflowEllipses?: boolean;
+  clickType?: 'single' | 'double';
 }
 
-const EditableColumn = forwardRef(function EditableColumn(
+export const EditableColumn = forwardRef(function EditableColumn(
   props: EditableColumnProps,
   ref: any,
 ) {
   const {
-    onSave = () => null,
+    onSave,
     value,
-    type = 'text',
+    type,
     style,
-    onEditStart = () => null,
+    onEditStart,
     editStatus = false,
-    validate = () => true,
-    textOverFlowEllipses = false,
-    ...InputProps
+    validate,
+    textOverflowEllipses = false,
+    clickType = 'single',
   } = props;
 
   const [enabled, enableEdit] = useState<boolean | undefined>();
-  const [isValid, setValid] = useState<boolean>(true);
-  const [val, setVal] = useState(extractNumber(value, type));
   useEffect(() => {
     enableEdit(editStatus);
   }, [editStatus]);
@@ -71,85 +114,131 @@ const EditableColumn = forwardRef(function EditableColumn(
 
   function startEditHandler() {
     globalThis.addEventListener('mousedown', mouseClickCallback);
-    onEditStart(true);
+    onEditStart?.(true);
     enableEdit(true);
   }
 
-  function saveHandler(event: KeyboardEvent<HTMLInputElement>) {
-    const valid = validate(val);
-    setValid(valid);
-    // when press Enter or Tab
-    if (valid && ['Enter', 'Tab'].includes(event.key)) {
-      onSave(event);
-      enableEdit(false);
-      globalThis.removeEventListener('mousedown', mouseClickCallback);
-    }
-    // close edit mode if press Enter, Tab or Escape
-    if (['Escape'].includes(event.key)) {
-      enableEdit(false);
-      globalThis.removeEventListener('mousedown', mouseClickCallback);
-    }
+  function onConfirm(event: KeyboardEvent<HTMLInputElement>) {
+    onSave?.(event);
+    enableEdit(false);
+    globalThis.removeEventListener('mousedown', mouseClickCallback);
+  }
+
+  function onCancel() {
+    enableEdit(false);
+    globalThis.removeEventListener('mousedown', mouseClickCallback);
   }
 
-  function handleChange(e: ChangeEvent<HTMLInputElement>) {
-    setVal(e.target.value);
+  let clickHandler = {};
+
+  if (clickType === 'single' && !enabled) {
+    clickHandler = { onClick: startEditHandler };
+  }
+
+  if (clickType === 'double' && !enabled) {
+    clickHandler = { onDoubleClick: startEditHandler };
   }
 
   return (
-    <div
-      style={{
-        display: 'table',
-        width: '100%',
-        height: '100%',
-        ...(textOverFlowEllipses
-          ? { whiteSpace: 'nowrap', overflow: 'hidden', display: 'inline-flex' }
-          : {}),
-        ...style,
-      }}
+    <Container
+      style={style}
+      textOverflowEllipses={textOverflowEllipses}
       className="editable-column-input"
-      onDoubleClick={startEditHandler}
+      {...clickHandler}
     >
       {!enabled && (
-        <span
-          style={{
-            display: 'table-cell',
-            verticalAlign: 'middle',
-            width: '100%',
-            ...(textOverFlowEllipses
-              ? { textOverflow: 'ellipsis', overflow: 'hidden' }
-              : {}),
-          }}
-        >
-          {value} &nbsp;
-        </span>
+        <Text textOverflowEllipses={textOverflowEllipses}>
+          {value ?? '&nbsp;'}
+        </Text>
       )}
       {enabled && (
         <div style={{ display: 'table-cell', verticalAlign: 'middle' }}>
-          <Input
-            style={{
-              inputWrapper: {
-                ...(!isValid && { borderColor: 'red' }),
-                width: '100%',
-              },
-              input: {
-                padding: '5px',
-                width: '100%',
-                minWidth: '60px',
-              },
-            }}
-            autoSelect
-            className="editable-column"
-            value={val}
+          <EditFiled
+            value={value}
             type={type}
-            onChange={handleChange}
-            onKeyDown={saveHandler}
-            onMouseDown={(e) => e.stopPropagation()}
-            {...InputProps}
+            onConfirm={onConfirm}
+            onCancel={onCancel}
+            validate={validate}
           />
         </div>
       )}
-    </div>
+    </Container>
   );
 });
 
-export default EditableColumn;
+interface EditFiledProps extends BaseEditableColumnProps {
+  onConfirm: (event: KeyboardEvent<HTMLInputElement>) => void;
+  onCancel: (event?: KeyboardEvent<HTMLInputElement>) => void;
+}
+
+function EditFiled(props: EditFiledProps) {
+  const { value: externalValue, type, onConfirm, onCancel, validate } = props;
+
+  const [isValid, setValid] = useState<boolean>(true);
+  const [value, setVal] = useState(extractNumber(externalValue, type));
+
+  function handleKeydown(event: KeyboardEvent<HTMLInputElement>) {
+    const valid = typeof validate === 'function' ? validate(value) : true;
+    setValid(valid);
+    // when press Enter or Tab
+    if (valid && ['Enter', 'Tab'].includes(event.key)) {
+      onConfirm(event);
+    }
+    // close edit mode if press Enter, Tab or Escape
+    if (['Escape'].includes(event.key)) {
+      onCancel(event);
+    }
+  }
+
+  function handleChange(value: string | number) {
+    setVal(value);
+  }
+
+  const intent = !isValid ? 'danger' : 'none';
+
+  const rightElement = (
+    <Button
+      minimal
+      icon="cross"
+      onMouseDown={handleMousedown}
+      onClick={() => onCancel()}
+    />
+  );
+
+  if (type === 'number') {
+    return (
+      <NumberInput2
+        intent={intent}
+        style={style}
+        autoSelect
+        className={className}
+        value={value}
+        onValueChange={(valueAsNumber, valueString) =>
+          handleChange(valueString ?? Number(valueString))
+        }
+        onKeyDown={handleKeydown}
+        onMouseDown={handleMousedown}
+        small
+        fill
+        buttonPosition="none"
+        stepSize={1}
+        rightElement={rightElement}
+      />
+    );
+  }
+
+  return (
+    <Input2
+      intent={intent}
+      style={style}
+      autoSelect
+      className={className}
+      value={value as string}
+      onChange={(value) => handleChange(value)}
+      onKeyDown={handleKeydown}
+      onMouseDown={handleMousedown}
+      small
+      rightElement={rightElement}
+    />
+  );
+}
diff --git a/src/component/elements/NumberInput2.tsx b/src/component/elements/NumberInput2.tsx
index a1a9a39ee..29d14cd64 100644
--- a/src/component/elements/NumberInput2.tsx
+++ b/src/component/elements/NumberInput2.tsx
@@ -8,20 +8,26 @@ import {
   useState,
   isValidElement,
   forwardRef,
+  useRef,
 } from 'react';
+import type { ForwardedRef } from 'react';
+
+import useCombinedRefs from '../hooks/useCombinedRefs.js';
 
 interface ValueProps
   extends Pick<React.InputHTMLAttributes<HTMLInputElement>, 'name' | 'style'>,
     Pick<NumericInputProps, 'onValueChange' | 'value'> {
   checkValue?: (element?: number) => boolean;
   debounceTime?: number;
+  autoSelect?: boolean;
+}
+interface UseInputProps extends Omit<ValueProps, 'name'> {
+  ref: ForwardedRef<HTMLInputElement>;
 }
-type UseInputProps = Omit<ValueProps, 'name'>;
 export interface NumberInput2Props
   extends Omit<HTMLInputProps & NumericInputProps, 'value' | 'onValueChange'>,
     ValueProps {
   format?: () => (element: string) => number | string;
-  autoSelect?: boolean;
 }
 
 function useNumberInput(props: UseInputProps) {
@@ -29,9 +35,13 @@ function useNumberInput(props: UseInputProps) {
     value: externalValue,
     debounceTime,
     onValueChange,
+    ref,
+    autoSelect,
     checkValue,
   } = props;
   const [internalValue, setValue] = useState<number | string>();
+  const localRef = useRef<HTMLInputElement>();
+  const innerRef = useCombinedRefs([ref, localRef]);
   const value = debounceTime ? internalValue : externalValue;
   const [isDebounced, setDebouncedStatus] = useState<boolean>(false);
 
@@ -57,6 +67,12 @@ function useNumberInput(props: UseInputProps) {
     }
   }, [debounceTime, externalValue]);
 
+  useEffect(() => {
+    if (autoSelect) {
+      innerRef?.current?.select();
+    }
+  }, [autoSelect, innerRef]);
+
   function handleValueChange(
     valueAsNumber: number,
     valueAsString: string,
@@ -79,6 +95,7 @@ function useNumberInput(props: UseInputProps) {
     debounceOnValueChange,
     isDebounced,
     value,
+    innerRef,
   };
 }
 
@@ -110,9 +127,11 @@ function InnerNumberInput(props: NumberInput2Props, ref) {
     ...otherInputProps
   } = props;
 
-  const { handleValueChange, isDebounced, value } = useNumberInput({
+  const { handleValueChange, isDebounced, value, innerRef } = useNumberInput({
     value: externalValue,
     debounceTime,
+    autoSelect,
+    ref,
     onValueChange,
     checkValue,
   });
@@ -124,7 +143,7 @@ function InnerNumberInput(props: NumberInput2Props, ref) {
     <NumericInput
       leftIcon={icon}
       inputClassName={classes}
-      inputRef={ref}
+      inputRef={innerRef}
       onValueChange={handleValueChange}
       value={value}
       selectAllOnFocus={autoSelect}
diff --git a/src/component/header/SimpleApodizationOptionsPanel.tsx b/src/component/header/SimpleApodizationOptionsPanel.tsx
index 7a94bc22f..4391cf501 100644
--- a/src/component/header/SimpleApodizationOptionsPanel.tsx
+++ b/src/component/header/SimpleApodizationOptionsPanel.tsx
@@ -1,6 +1,5 @@
 import { Checkbox } from '@blueprintjs/core';
-import type { Filter } from 'nmr-processing';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 import { memo } from 'react';
 
 import ActionButtons from '../elements/ActionButtons.js';
@@ -12,8 +11,9 @@ import { useSharedApodization } from '../panels/filtersPanel/Filters/hooks/useSh
 import { headerLabelStyle } from './Header.js';
 import { HeaderWrapper } from './HeaderWrapper.js';
 
+import type { Filter1D } from 'nmr-processing';
 interface ApodizationOptionsInnerPanelProps {
-  filter: Filter | null;
+  filter: Extract<Filter1D, { name: 'apodization' }> | null;
 }
 
 function ApodizationOptionsInnerPanel(
@@ -70,6 +70,9 @@ function ApodizationOptionsInnerPanel(
 const MemoizedApodizationPanel = memo(ApodizationOptionsInnerPanel);
 
 export function SimpleApodizationOptionsPanel() {
-  const filter = useFilter(Filters.apodization.id);
+  const filter = useFilter(Filters1D.apodization.id) as Extract<
+    Filter1D,
+    { name: 'apodization' }
+  >;
   return <MemoizedApodizationPanel filter={filter} />;
 }
diff --git a/src/component/header/SimpleBaseLineCorrectionOptionsPanel.tsx b/src/component/header/SimpleBaseLineCorrectionOptionsPanel.tsx
index fdd74034b..8ef05dd3c 100644
--- a/src/component/header/SimpleBaseLineCorrectionOptionsPanel.tsx
+++ b/src/component/header/SimpleBaseLineCorrectionOptionsPanel.tsx
@@ -1,7 +1,6 @@
 import { Checkbox } from '@blueprintjs/core';
 import { Select } from '@blueprintjs/select';
-import type { Filter } from 'nmr-processing';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 import { memo } from 'react';
 import { Button } from 'react-science/ui';
 
@@ -18,8 +17,10 @@ import {
 import { headerLabelStyle } from './Header.js';
 import { HeaderWrapper } from './HeaderWrapper.js';
 
+import type { Filter1D } from 'nmr-processing';
+
 interface BaseLineCorrectionInnerPanelProps {
-  filter: Filter | null;
+  filter: Extract<Filter1D, { name: 'baselineCorrection' }>;
 }
 function BaseLineCorrectionInnerPanel(
   props: BaseLineCorrectionInnerPanelProps,
@@ -138,6 +139,10 @@ function BaseLineCorrectionInnerPanel(
 const MemoizedBaseLineCorrectionPanel = memo(BaseLineCorrectionInnerPanel);
 
 export function SimpleBaseLineCorrectionOptionsPanel() {
-  const filter = useFilter(Filters.baselineCorrection.id);
+  const filter = useFilter(Filters1D.baselineCorrection.id) as Extract<
+    Filter1D,
+    { name: 'baselineCorrection' }
+  >;
+
   return <MemoizedBaseLineCorrectionPanel filter={filter} />;
 }
diff --git a/src/component/header/SimplePhaseCorrectionOptionsPanel.tsx b/src/component/header/SimplePhaseCorrectionOptionsPanel.tsx
index c1619b4db..098e50713 100644
--- a/src/component/header/SimplePhaseCorrectionOptionsPanel.tsx
+++ b/src/component/header/SimplePhaseCorrectionOptionsPanel.tsx
@@ -1,5 +1,6 @@
 import { Select } from '@blueprintjs/select';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
+import type { Filter1DOptions } from 'nmr-processing';
 import { Button } from 'react-science/ui';
 
 import ActionButtons from '../elements/ActionButtons.js';
@@ -14,7 +15,7 @@ import {
 import { HeaderWrapper } from './HeaderWrapper.js';
 
 export function SimplePhaseCorrectionOptionsPanel() {
-  const filter = useFilter(Filters.phaseCorrection.id);
+  const filter = useFilter(Filters1D.phaseCorrection.id);
 
   const {
     handleApplyFilter,
@@ -24,7 +25,9 @@ export function SimplePhaseCorrectionOptionsPanel() {
     phaseCorrectionTypeItem,
     ph0Ref,
     ph1Ref,
-  } = usePhaseCorrection(filter);
+  } = usePhaseCorrection(
+    filter as Extract<Filter1DOptions, { name: 'phaseCorrection' }> | null,
+  );
 
   return (
     <HeaderWrapper>
diff --git a/src/component/header/SimplePhaseCorrectionTwoDimensionsPanel.tsx b/src/component/header/SimplePhaseCorrectionTwoDimensionsPanel.tsx
index 5463c6dde..cdd67188b 100644
--- a/src/component/header/SimplePhaseCorrectionTwoDimensionsPanel.tsx
+++ b/src/component/header/SimplePhaseCorrectionTwoDimensionsPanel.tsx
@@ -1,6 +1,7 @@
 /** @jsxImportSource @emotion/react */
 import { Select } from '@blueprintjs/select';
-import { Filters } from 'nmr-processing';
+import { Filters2D } from 'nmr-processing';
+import type { Filter2D } from 'nmr-processing';
 import { FaRulerHorizontal, FaRulerVertical } from 'react-icons/fa';
 import { MdLooksTwo } from 'react-icons/md';
 import { Button, Toolbar } from 'react-science/ui';
@@ -19,7 +20,7 @@ import { headerLabelStyle } from './Header.js';
 import { HeaderWrapper } from './HeaderWrapper.js';
 
 export function SimplePhaseCorrectionTwoDimensionsPanel() {
-  const filter = useFilter(Filters.phaseCorrectionTwoDimensions.id);
+  const filter = useFilter(Filters2D.phaseCorrectionTwoDimensions.id);
   const {
     ph0Ref,
     ph1Ref,
@@ -32,7 +33,9 @@ export function SimplePhaseCorrectionTwoDimensionsPanel() {
     handleCancelFilter,
     handleToggleAddTraceToBothDirections,
     onChangeHandler,
-  } = usePhaseCorrectionTwoDimensions(filter);
+  } = usePhaseCorrectionTwoDimensions(
+    filter as Extract<Filter2D, { name: 'phaseCorrectionTwoDimensions' }>,
+  );
 
   return (
     <HeaderWrapper style={{ padding: '0 5px' }}>
diff --git a/src/component/header/SimpleZeroFillingOptionsPanel.tsx b/src/component/header/SimpleZeroFillingOptionsPanel.tsx
index 704cb2cdf..915a3ca5f 100644
--- a/src/component/header/SimpleZeroFillingOptionsPanel.tsx
+++ b/src/component/header/SimpleZeroFillingOptionsPanel.tsx
@@ -1,5 +1,6 @@
 import { Checkbox } from '@blueprintjs/core';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
+import type { Filter1DOptions } from 'nmr-processing';
 
 import ActionButtons from '../elements/ActionButtons.js';
 import Label from '../elements/Label.js';
@@ -14,9 +15,12 @@ import { headerLabelStyle } from './Header.js';
 import { HeaderWrapper } from './HeaderWrapper.js';
 
 export function SimpleZeroFillingOptionsPanel() {
-  const filter = useFilter(Filters.zeroFilling.id);
+  const filter = useFilter(Filters1D.zeroFilling.id);
   const { control, submitHandler, register, handleCancelFilter } =
-    useZeroFilling(filter, { applyFilterOnload: true });
+    useZeroFilling(
+      filter as Extract<Filter1DOptions, { name: 'zeroFilling' }>,
+      { applyFilterOnload: true },
+    );
 
   const { onChange: onLivePreviewChange, ...otherLivePreviewRegisterOptions } =
     register('livePreview');
diff --git a/src/component/hooks/useFilter.ts b/src/component/hooks/useFilter.ts
index de9839f5f..d5d075c37 100644
--- a/src/component/hooks/useFilter.ts
+++ b/src/component/hooks/useFilter.ts
@@ -1,13 +1,13 @@
-import type { Spectrum1D } from 'nmr-load-save';
-import type { Filter } from 'nmr-processing';
+import type { Spectrum1D, Spectrum2D } from 'nmr-load-save';
+import type { Filter1D, Filter2D } from 'nmr-processing';
 import { useMemo } from 'react';
 
 import useSpectrum from './useSpectrum.js';
 
 const emptyData = { filters: {} };
 
-export function useFilter(filterID: string): Filter | null {
-  const { filters } = useSpectrum(emptyData) as Spectrum1D;
+export function useFilter(filterID: Filter1D['name'] | Filter2D['name']) {
+  const { filters } = useSpectrum(emptyData) as Spectrum1D | Spectrum2D;
 
   return useMemo(
     () => filters.find((filter) => filter.name === filterID) || null,
diff --git a/src/component/modal/EditPeakShapeModal.tsx b/src/component/modal/EditPeakShapeModal.tsx
index b0a53d78e..9e54472d9 100644
--- a/src/component/modal/EditPeakShapeModal.tsx
+++ b/src/component/modal/EditPeakShapeModal.tsx
@@ -25,7 +25,9 @@ function getKindDefaultValues(kind: Kind) {
   return {
     kind,
     fwhm: 500,
-    ...(kind === 'pseudoVoigt' && { mu: 0.5 }),
+    ...(kind === 'pseudoVoigt'
+      ? { mu: 0.5 }
+      : kind === 'generalizedLorentzian' && { gamma: 0.5 }),
   };
 }
 function getValues(peak: Peak1D, kind: Kind): Shape {
@@ -61,6 +63,10 @@ const KINDS: Array<{ label: string; value: Kind }> = [
     value: 'pseudoVoigt',
     label: 'PseudoVoigt',
   },
+  {
+    value: 'generalizedLorentzian',
+    label: 'Generalized Lorentzian',
+  },
 ];
 
 const labelStyle: LabelStyle = {
@@ -148,6 +154,16 @@ function InnerEditPeakShapeModal(props: Required<EditPeakShapeModalProps>) {
               <NumberInput2Controller min={0} control={control} name="mu" />
             </Label>
           )}
+          {kind === 'generalizedLorentzian' && (
+            <Label title="Gamma:" style={labelStyle}>
+              <NumberInput2Controller
+                min={-1}
+                max={2}
+                control={control}
+                name="gamma"
+              />
+            </Label>
+          )}
         </>
       </DialogBody>
       <DialogFooter>
diff --git a/src/component/modal/setting/settings-tabs/OnLoadProcessingTabContent.tsx b/src/component/modal/setting/settings-tabs/OnLoadProcessingTabContent.tsx
index f23ddd71f..37804e3e8 100644
--- a/src/component/modal/setting/settings-tabs/OnLoadProcessingTabContent.tsx
+++ b/src/component/modal/setting/settings-tabs/OnLoadProcessingTabContent.tsx
@@ -1,6 +1,6 @@
 import { Checkbox, Tab, Tabs } from '@blueprintjs/core';
 import type { WorkspacePreferences } from 'nmr-load-save';
-import type { BaseFilter } from 'nmr-processing';
+import type { Filter1D, Filter2D } from 'nmr-processing';
 import { useFormContext, useWatch } from 'react-hook-form';
 
 import IsotopesViewer from '../../../elements/IsotopesViewer.js';
@@ -63,7 +63,7 @@ function AutoProcessingFilters() {
 function FiltersTable({ data, nucleus }) {
   const { register } = useFormContext();
 
-  const COLUMNS: Array<CustomColumn<BaseFilter>> = [
+  const COLUMNS: Array<CustomColumn<Filter1D | Filter2D>> = [
     {
       index: 1,
       Header: '#',
diff --git a/src/component/panels/IntegralsPanel/IntegralTable.tsx b/src/component/panels/IntegralsPanel/IntegralTable.tsx
index 1264bf498..d0812b8a2 100644
--- a/src/component/panels/IntegralsPanel/IntegralTable.tsx
+++ b/src/component/panels/IntegralsPanel/IntegralTable.tsx
@@ -6,7 +6,7 @@ import { FaRegTrashAlt } from 'react-icons/fa';
 import { SIGNAL_KINDS } from '../../../data/constants/signalsKinds.js';
 import { checkIntegralKind } from '../../../data/data1d/Spectrum1D/index.js';
 import { useDispatch } from '../../context/DispatchContext.js';
-import EditableColumn from '../../elements/EditableColumn.js';
+import { EditableColumn } from '../../elements/EditableColumn.js';
 import ReactTable from '../../elements/ReactTable/ReactTable.js';
 import type { CustomColumn } from '../../elements/ReactTable/utility/addCustomColumn.js';
 import addCustomColumn, {
diff --git a/src/component/panels/MatrixGenerationPanel/MatrixGenerationPanel.tsx b/src/component/panels/MatrixGenerationPanel/MatrixGenerationPanel.tsx
index 6a5b8ea69..2afc29310 100644
--- a/src/component/panels/MatrixGenerationPanel/MatrixGenerationPanel.tsx
+++ b/src/component/panels/MatrixGenerationPanel/MatrixGenerationPanel.tsx
@@ -2,7 +2,7 @@
 import styled from '@emotion/styled';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { SvgNmrMultipleAnalysis } from 'cheminfo-font';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 import { useCallback, useEffect, useRef } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { Button, Toolbar } from 'react-science/ui';
@@ -31,7 +31,7 @@ import { ExclusionsZonesTable } from './ExclusionsZonesTable.js';
 import { FiltersOptions } from './FiltersOptions.js';
 import { MatrixGenerationPanelHeader } from './MatrixGenerationPanelHeader.js';
 
-const { signalProcessing } = Filters;
+const { signalProcessing } = Filters1D;
 
 const StickyFooter = styled.div({
   position: 'sticky',
diff --git a/src/component/panels/MoleculesPanel/MoleculeHeader.tsx b/src/component/panels/MoleculesPanel/MoleculeHeader.tsx
index 0f1315325..0eb5acaf6 100644
--- a/src/component/panels/MoleculesPanel/MoleculeHeader.tsx
+++ b/src/component/panels/MoleculesPanel/MoleculeHeader.tsx
@@ -8,7 +8,7 @@ import {
   extractNumber,
 } from '../../../data/molecules/MoleculeManager.js';
 import { useDispatch } from '../../context/DispatchContext.js';
-import EditableColumn from '../../elements/EditableColumn.js';
+import { EditableColumn } from '../../elements/EditableColumn.js';
 import Label from '../../elements/Label.js';
 
 interface MoleculeHeaderProps {
@@ -61,7 +61,8 @@ export default function MoleculeHeader(props: MoleculeHeaderProps) {
           style={styles.labelInput}
           validate={validateLabel}
           onSave={(event) => saveLabelHandler(currentMolecule.id, event)}
-          textOverFlowEllipses
+          textOverflowEllipses
+          type="text"
         />
       </Label>
       <span>
diff --git a/src/component/panels/PeaksPanel/PeaksPreferences.tsx b/src/component/panels/PeaksPanel/PeaksPreferences.tsx
index 08b07e65e..57b9a0fa1 100644
--- a/src/component/panels/PeaksPanel/PeaksPreferences.tsx
+++ b/src/component/panels/PeaksPanel/PeaksPreferences.tsx
@@ -58,6 +58,12 @@ const formatFields: NucleusPreferenceField[] = [
     checkFieldName: 'mu.show',
     formatFieldName: 'mu.format',
   },
+  {
+    id: 11,
+    label: 'gamma :',
+    checkFieldName: 'gamma.show',
+    formatFieldName: 'gamma.format',
+  },
   {
     id: 9,
     label: 'Delete action :',
diff --git a/src/component/panels/PeaksPanel/PeaksTable.tsx b/src/component/panels/PeaksPanel/PeaksTable.tsx
index 1b7baaf42..4d0eb26e7 100644
--- a/src/component/panels/PeaksPanel/PeaksTable.tsx
+++ b/src/component/panels/PeaksPanel/PeaksTable.tsx
@@ -4,7 +4,7 @@ import { memo, useCallback, useMemo, useState } from 'react';
 import { FaEdit, FaRegTrashAlt } from 'react-icons/fa';
 
 import { useDispatch } from '../../context/DispatchContext.js';
-import EditableColumn from '../../elements/EditableColumn.js';
+import { EditableColumn } from '../../elements/EditableColumn.js';
 import ReactTable from '../../elements/ReactTable/ReactTable.js';
 import type { ControlCustomColumn } from '../../elements/ReactTable/utility/addCustomColumn.js';
 import addCustomColumn, {
@@ -141,6 +141,23 @@ function PeaksTable({ activeTab, data, info }: PeaksTableProps) {
           return '';
         },
       },
+      {
+        showWhen: 'gamma.show',
+        index: 9,
+        Header: 'gamma',
+        accessor: (row) =>
+          (row?.shape?.kind === 'generalizedLorentzian' && row?.shape?.gamma) ||
+          '',
+        Cell: ({ row }) => {
+          const gamma =
+            row.original?.shape?.kind === 'generalizedLorentzian' &&
+            row.original?.shape?.gamma;
+          if (gamma) {
+            return formatNumber(gamma, peaksPreferences.gamma.format);
+          }
+          return '';
+        },
+      },
       {
         showWhen: 'showEditPeakShapeAction',
         ...createActionColumn<PeakRecord>({
diff --git a/src/component/panels/RangesPanel/TableColumns/RangeAssignmentColumn.tsx b/src/component/panels/RangesPanel/TableColumns/RangeAssignmentColumn.tsx
index f46613b48..3500c751c 100644
--- a/src/component/panels/RangesPanel/TableColumns/RangeAssignmentColumn.tsx
+++ b/src/component/panels/RangesPanel/TableColumns/RangeAssignmentColumn.tsx
@@ -1,5 +1,5 @@
 import { useDispatch } from '../../../context/DispatchContext.js';
-import EditableColumn from '../../../elements/EditableColumn.js';
+import { EditableColumn } from '../../../elements/EditableColumn.js';
 import type { OnHoverEvent, RowSpanTags } from '../RangesTableRow.js';
 import type { RangeData } from '../hooks/useMapRanges.js';
 
@@ -29,6 +29,7 @@ export function RangeAssignmentColumn({
         value={row?.assignment || ''}
         onSave={saveHandler}
         style={{ padding: '0.1rem 0.4rem' }}
+        type="text"
       />
     </td>
   );
diff --git a/src/component/panels/RangesPanel/TableColumns/RelativeColumn.tsx b/src/component/panels/RangesPanel/TableColumns/RelativeColumn.tsx
index 6832f8f6d..276a7474d 100644
--- a/src/component/panels/RangesPanel/TableColumns/RelativeColumn.tsx
+++ b/src/component/panels/RangesPanel/TableColumns/RelativeColumn.tsx
@@ -1,6 +1,6 @@
 import { checkRangeKind } from '../../../../data/utilities/RangeUtilities.js';
 import { useDispatch } from '../../../context/DispatchContext.js';
-import EditableColumn from '../../../elements/EditableColumn.js';
+import { EditableColumn } from '../../../elements/EditableColumn.js';
 import { formatNumber } from '../../../utility/formatNumber.js';
 import type { RangeColumnProps } from '../RangesTableRow.js';
 
diff --git a/src/component/panels/RangesPanel/TableColumns/SignalDeltaColumn.tsx b/src/component/panels/RangesPanel/TableColumns/SignalDeltaColumn.tsx
index 2ad8d52b9..394a9b356 100644
--- a/src/component/panels/RangesPanel/TableColumns/SignalDeltaColumn.tsx
+++ b/src/component/panels/RangesPanel/TableColumns/SignalDeltaColumn.tsx
@@ -1,7 +1,7 @@
 import { checkMultiplicity } from 'nmr-processing';
 
 import { useDispatch } from '../../../context/DispatchContext.js';
-import EditableColumn from '../../../elements/EditableColumn.js';
+import { EditableColumn } from '../../../elements/EditableColumn.js';
 import { formatNumber } from '../../../utility/formatNumber.js';
 import type { RangeColumnProps } from '../RangesTableRow.js';
 
diff --git a/src/component/panels/SummaryPanel/CorrelationTable/CorrelationTableRow.tsx b/src/component/panels/SummaryPanel/CorrelationTable/CorrelationTableRow.tsx
index 53581b21f..84315adc8 100644
--- a/src/component/panels/SummaryPanel/CorrelationTable/CorrelationTableRow.tsx
+++ b/src/component/panels/SummaryPanel/CorrelationTable/CorrelationTableRow.tsx
@@ -13,7 +13,7 @@ import { useAlert } from '../../../elements/Alert.js';
 import type { ContextMenuItem } from '../../../elements/ContextMenuBluePrint.js';
 import { ContextMenu } from '../../../elements/ContextMenuBluePrint.js';
 import { useDialog } from '../../../elements/DialogManager.js';
-import EditableColumn from '../../../elements/EditableColumn.js';
+import { EditableColumn } from '../../../elements/EditableColumn.js';
 import { useHighlight } from '../../../highlight/index.js';
 import { convertValuesString } from '../utilities/Utilities.js';
 import useInView from '../utilities/useInView.js';
diff --git a/src/component/panels/ZonesPanel/TableColumns/SignalDeltaColumn.tsx b/src/component/panels/ZonesPanel/TableColumns/SignalDeltaColumn.tsx
index 92f34887d..130fa70ce 100644
--- a/src/component/panels/ZonesPanel/TableColumns/SignalDeltaColumn.tsx
+++ b/src/component/panels/ZonesPanel/TableColumns/SignalDeltaColumn.tsx
@@ -1,7 +1,7 @@
 import lodashGet from 'lodash/get.js';
 
 import { useDispatch } from '../../../context/DispatchContext.js';
-import EditableColumn from '../../../elements/EditableColumn.js';
+import { EditableColumn } from '../../../elements/EditableColumn.js';
 import { usePanelPreferences } from '../../../hooks/usePanelPreferences.js';
 import { formatNumber } from '../../../utility/formatNumber.js';
 import type { ZoneData } from '../hooks/useMapZones.js';
diff --git a/src/component/panels/ZonesPanel/TableColumns/ZoneAssignmentLabelColumn.tsx b/src/component/panels/ZonesPanel/TableColumns/ZoneAssignmentLabelColumn.tsx
index 4ec1fe798..8b9f7b1a2 100644
--- a/src/component/panels/ZonesPanel/TableColumns/ZoneAssignmentLabelColumn.tsx
+++ b/src/component/panels/ZonesPanel/TableColumns/ZoneAssignmentLabelColumn.tsx
@@ -1,5 +1,5 @@
 import { useDispatch } from '../../../context/DispatchContext.js';
-import EditableColumn from '../../../elements/EditableColumn.js';
+import { EditableColumn } from '../../../elements/EditableColumn.js';
 import type { ZoneData } from '../hooks/useMapZones.js';
 
 interface ZoneAssignmentLabelColumnProps {
@@ -27,6 +27,7 @@ export function ZoneAssignmentLabelColumn({
         value={rowData?.assignment || ''}
         onSave={saveHandler}
         style={{ padding: '0.1rem 0.4rem' }}
+        type="text"
       />
     </td>
   );
diff --git a/src/component/panels/filtersPanel/Filters/ApodizationOptionsPanel.tsx b/src/component/panels/filtersPanel/Filters/ApodizationOptionsPanel.tsx
index e9f1727b6..a561fea13 100644
--- a/src/component/panels/filtersPanel/Filters/ApodizationOptionsPanel.tsx
+++ b/src/component/panels/filtersPanel/Filters/ApodizationOptionsPanel.tsx
@@ -12,6 +12,7 @@ import { useSharedApodization } from './hooks/useSharedApodization.js';
 
 import type { BaseFilterOptionsPanelProps } from './index.js';
 import { formLabelStyle } from './index.js';
+import type { Filter1DOptions } from 'nmr-processing';
 
 const advanceValidationSchema = Yup.object().shape({
   lineBroadening: Yup.number().required(),
@@ -21,7 +22,9 @@ const advanceValidationSchema = Yup.object().shape({
 });
 
 export default function ApodizationOptionsPanel(
-  props: BaseFilterOptionsPanelProps,
+  props: BaseFilterOptionsPanelProps<
+    Extract<Filter1DOptions, { name: 'apodization' }>
+  >,
 ) {
   const { filter, enableEdit = true, onCancel, onConfirm } = props;
   const {
diff --git a/src/component/panels/filtersPanel/Filters/BaseLineCorrectionOptionsPanel.tsx b/src/component/panels/filtersPanel/Filters/BaseLineCorrectionOptionsPanel.tsx
index 5fd968541..2c7ca0093 100644
--- a/src/component/panels/filtersPanel/Filters/BaseLineCorrectionOptionsPanel.tsx
+++ b/src/component/panels/filtersPanel/Filters/BaseLineCorrectionOptionsPanel.tsx
@@ -16,9 +16,12 @@ import {
 
 import type { BaseFilterOptionsPanelProps } from './index.js';
 import { formLabelStyle } from './index.js';
+import type { Filter1DOptions } from 'nmr-processing';
 
 export default function BaseLineCorrectionOptionsPanel(
-  props: BaseFilterOptionsPanelProps,
+  props: BaseFilterOptionsPanelProps<
+    Extract<Filter1DOptions, { name: 'baselineCorrection' }>
+  >,
 ) {
   const { filter, enableEdit = true, onCancel, onConfirm } = props;
 
diff --git a/src/component/panels/filtersPanel/Filters/FiltersSectionsPanel.tsx b/src/component/panels/filtersPanel/Filters/FiltersSectionsPanel.tsx
index abad2c552..2fbe4a799 100644
--- a/src/component/panels/filtersPanel/Filters/FiltersSectionsPanel.tsx
+++ b/src/component/panels/filtersPanel/Filters/FiltersSectionsPanel.tsx
@@ -1,8 +1,12 @@
 import { Switch } from '@blueprintjs/core';
 import styled from '@emotion/styled';
 import { v4 } from '@lukeed/uuid';
-import type { Filter } from 'nmr-processing';
-import { Filters } from 'nmr-processing';
+import {
+  Filters1D,
+  Filters2D,
+  type Filter1D,
+  type Filter2D,
+} from 'nmr-processing';
 import { memo, useEffect, useRef, useState } from 'react';
 import { FaRegEyeSlash, FaRegTrashAlt } from 'react-icons/fa';
 import { ObjectInspector } from 'react-inspector';
@@ -24,12 +28,14 @@ const IconButton = styled(Button)`
   font-size: 16px;
 `;
 
-interface FiltersProps extends Filter {
-  error?: any;
-}
+type FiltersProps = Filter1D | Filter2D;
 
+const Filters = {
+  ...Filters1D,
+  ...Filters2D,
+};
 interface FilterElementsProps {
-  filter: Filter;
+  filter: Filter1D | Filter2D;
   spectraCounter: number;
   onEnableChange: () => void;
   onFilterRestore: () => void;
@@ -157,7 +163,7 @@ function FiltersInner(props: FiltersInnerProps) {
   const {
     toolOptions: { selectedTool },
   } = useChartData();
-  const [newFilter, setNewFilter] = useState<Filter | null>();
+  const [newFilter, setNewFilter] = useState<Filter1D | Filter2D | null>();
 
   const [selectedSection, openSection] = useState('');
   const dispatch = useDispatch();
@@ -212,7 +218,7 @@ function FiltersInner(props: FiltersInnerProps) {
         id: v4(),
         name,
         label,
-        value: null,
+        value: {},
         isDeleteAllow: true,
       });
     } else {
diff --git a/src/component/panels/filtersPanel/Filters/PhaseCorrectionOptionsPanel.tsx b/src/component/panels/filtersPanel/Filters/PhaseCorrectionOptionsPanel.tsx
index facdf81cf..c9ea20db0 100644
--- a/src/component/panels/filtersPanel/Filters/PhaseCorrectionOptionsPanel.tsx
+++ b/src/component/panels/filtersPanel/Filters/PhaseCorrectionOptionsPanel.tsx
@@ -15,6 +15,7 @@ import type { AlgorithmItem } from './hooks/usePhaseCorrection.js';
 import { algorithms, usePhaseCorrection } from './hooks/usePhaseCorrection.js';
 
 import type { BaseFilterOptionsPanelProps } from './index.js';
+import type { Filter1DOptions } from 'nmr-processing';
 
 const inputRangeStyle: CSSProperties = {
   padding: '5px 10px',
@@ -34,7 +35,9 @@ const formLabelStyle: LabelStyle = {
 };
 
 export default function PhaseCorrectionOptionsPanel(
-  props: BaseFilterOptionsPanelProps,
+  props: BaseFilterOptionsPanelProps<
+    Extract<Filter1DOptions, { name: 'phaseCorrection' }>
+  >,
 ) {
   const { filter, enableEdit = true, onCancel, onConfirm } = props;
   const {
diff --git a/src/component/panels/filtersPanel/Filters/PhaseCorrectionTwoDimensionsOptionsPanel.tsx b/src/component/panels/filtersPanel/Filters/PhaseCorrectionTwoDimensionsOptionsPanel.tsx
index 4fc960392..686742b60 100644
--- a/src/component/panels/filtersPanel/Filters/PhaseCorrectionTwoDimensionsOptionsPanel.tsx
+++ b/src/component/panels/filtersPanel/Filters/PhaseCorrectionTwoDimensionsOptionsPanel.tsx
@@ -1,6 +1,7 @@
 /** @jsxImportSource @emotion/react */
 import { Select } from '@blueprintjs/select';
-import { Filters } from 'nmr-processing';
+import { Filters2D } from 'nmr-processing';
+import type { Filter1DOptions } from 'nmr-processing';
 import type { CSSProperties } from 'react';
 import { FaRulerHorizontal, FaRulerVertical } from 'react-icons/fa';
 import { MdLooksTwo } from 'react-icons/md';
@@ -46,7 +47,10 @@ export default function PhaseCorrectionTwoDimensionsOptionsPanel(
 ) {
   const { enableEdit = true, onCancel, onConfirm } = props;
 
-  const filter = useFilter(Filters.phaseCorrectionTwoDimensions.id);
+  const filter = useFilter(
+    Filters2D.phaseCorrectionTwoDimensions.id,
+  ) as Extract<Filter1DOptions, { name: 'phaseCorrectionTwoDimensions' }>;
+
   const {
     ph0Ref,
     ph1Ref,
diff --git a/src/component/panels/filtersPanel/Filters/ShiftOptionsPanel.tsx b/src/component/panels/filtersPanel/Filters/ShiftOptionsPanel.tsx
index 47ed02f4c..5f98d3ece 100644
--- a/src/component/panels/filtersPanel/Filters/ShiftOptionsPanel.tsx
+++ b/src/component/panels/filtersPanel/Filters/ShiftOptionsPanel.tsx
@@ -1,4 +1,5 @@
-import { Filters } from 'nmr-processing';
+import { Filters1D, Filters2D } from 'nmr-processing';
+import type { Filter1DOptions, Filter2DOptions } from 'nmr-processing';
 import { useForm } from 'react-hook-form';
 
 import { useDispatch } from '../../../context/DispatchContext.js';
@@ -13,9 +14,17 @@ import { HeaderContainer, StickyHeader } from './InnerFilterHeader.js';
 import type { BaseFilterOptionsPanelProps } from './index.js';
 import { formLabelStyle } from './index.js';
 
-const { shiftX, shift2DX, shift2DY } = Filters;
+const { shiftX } = Filters1D;
+const { shift2DX, shift2DY } = Filters2D;
 
-export default function ShiftOptionsPanel(props: BaseFilterOptionsPanelProps) {
+type ShiftFilterPanelOptions =
+  | Extract<Filter1DOptions, { name: 'shiftX' }>
+  | Extract<Filter2DOptions, { name: 'shift2DX' }>
+  | Extract<Filter2DOptions, { name: 'shift2DY' }>;
+
+export default function ShiftOptionsPanel(
+  props: BaseFilterOptionsPanelProps<ShiftFilterPanelOptions>,
+) {
   const { filter, enableEdit = true, onCancel, onConfirm } = props;
 
   const dispatch = useDispatch();
diff --git a/src/component/panels/filtersPanel/Filters/ZeroFillingOptionsPanel.tsx b/src/component/panels/filtersPanel/Filters/ZeroFillingOptionsPanel.tsx
index 9038eb9c1..0479ec520 100644
--- a/src/component/panels/filtersPanel/Filters/ZeroFillingOptionsPanel.tsx
+++ b/src/component/panels/filtersPanel/Filters/ZeroFillingOptionsPanel.tsx
@@ -10,9 +10,12 @@ import { HeaderContainer, StickyHeader } from './InnerFilterHeader.js';
 import { useZeroFilling, zeroFillingSizes } from './hooks/useZeroFilling.js';
 
 import type { BaseFilterOptionsPanelProps } from './index.js';
+import type { Filter1DOptions } from 'nmr-processing';
 
 export default function ZeroFillingOptionsPanel(
-  props: BaseFilterOptionsPanelProps,
+  props: BaseFilterOptionsPanelProps<
+    Extract<Filter1DOptions, { name: 'zeroFilling' }>
+  >,
 ) {
   const { filter, enableEdit = true, onCancel, onConfirm } = props;
   const {
diff --git a/src/component/panels/filtersPanel/Filters/hooks/useBaselineCorrection.tsx b/src/component/panels/filtersPanel/Filters/hooks/useBaselineCorrection.tsx
index 3be518fe8..b367bbd6c 100644
--- a/src/component/panels/filtersPanel/Filters/hooks/useBaselineCorrection.tsx
+++ b/src/component/panels/filtersPanel/Filters/hooks/useBaselineCorrection.tsx
@@ -1,5 +1,8 @@
 import { yupResolver } from '@hookform/resolvers/yup';
-import type { Filter, BaselineCorrectionOptions } from 'nmr-processing';
+import type {
+  BaselineCorrectionOptions,
+  Filter1DOptions,
+} from 'nmr-processing';
 import { useCallback, useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';
 import { useSelect } from 'react-science/ui';
@@ -37,7 +40,7 @@ export function getBaselineData(
   algorithm,
   filterValues: BaselineCorrectionOptions,
 ) {
-  const { zones, algorithm: baseAlgorithm, ...other } = filterValues;
+  const { algorithm: baseAlgorithm, ...other } = filterValues;
   switch (algorithm) {
     case 'airpls': {
       const validation = Yup.object().shape({
@@ -87,7 +90,9 @@ export function getBaselineData(
   }
 }
 
-export function useBaselineCorrection(filter: Filter | null) {
+export function useBaselineCorrection(
+  filter: Extract<Filter1DOptions, { name: 'baselineCorrection' }>,
+) {
   const dispatch = useDispatch();
   const previousPreviewRef = useRef<boolean>(true);
   const { algorithm: baseAlgorithm = 'polynomial' } = filter?.value || {};
@@ -100,10 +105,7 @@ export function useBaselineCorrection(filter: Filter | null) {
     itemTextKey: 'label',
   });
 
-  const { resolver, values } = getBaselineData(
-    algorithm?.value,
-    filter?.value || {},
-  );
+  const { resolver, values } = getBaselineData(algorithm?.value, filter?.value);
 
   const { handleSubmit, reset, ...otherFormOptions } = useForm<
     AirplsOptions | PolynomialOptions
diff --git a/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrection.tsx b/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrection.tsx
index 69a98ba97..65a0c6258 100644
--- a/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrection.tsx
+++ b/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrection.tsx
@@ -1,5 +1,5 @@
 import type { Spectrum1D } from 'nmr-load-save';
-import type { Filter } from 'nmr-processing';
+import type { Filter1DOptions } from 'nmr-processing';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useSelect } from 'react-science/ui';
 
@@ -33,7 +33,9 @@ export const algorithms: AlgorithmItem[] = [
 ];
 const emptyData = { datum: {}, filter: null };
 
-export function usePhaseCorrection(filter: Filter | null) {
+export function usePhaseCorrection(
+  filter: Extract<Filter1DOptions, { name: 'phaseCorrection' }> | null,
+) {
   const {
     toolOptions: {
       data: { pivot },
diff --git a/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrectionTwoDimensions.tsx b/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrectionTwoDimensions.tsx
index 04d53b61b..c40c7a31b 100644
--- a/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrectionTwoDimensions.tsx
+++ b/src/component/panels/filtersPanel/Filters/hooks/usePhaseCorrectionTwoDimensions.tsx
@@ -1,7 +1,7 @@
 import type { NmrData2DFt } from 'cheminfo-types';
 import debounce from 'lodash/debounce.js';
 import type { Spectrum2D } from 'nmr-load-save';
-import type { Filter } from 'nmr-processing';
+import type { Filter2D } from 'nmr-processing';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useSelect } from 'react-science/ui';
 
@@ -38,7 +38,9 @@ const defaultPhaseOptions: PhaseOptions = {
   vertical: { ph0: 0, ph1: 0 },
 };
 
-export function usePhaseCorrectionTwoDimensions(filter: Filter | null) {
+export function usePhaseCorrectionTwoDimensions(
+  filter: Extract<Filter2D, { name: 'phaseCorrectionTwoDimensions' }> | null,
+) {
   const { activeTraceDirection, pivot, addTracesToBothDirections } =
     useActivePhaseTraces();
 
diff --git a/src/component/panels/filtersPanel/Filters/hooks/useSharedApodization.tsx b/src/component/panels/filtersPanel/Filters/hooks/useSharedApodization.tsx
index 1dc7ff82c..5b3aad693 100644
--- a/src/component/panels/filtersPanel/Filters/hooks/useSharedApodization.tsx
+++ b/src/component/panels/filtersPanel/Filters/hooks/useSharedApodization.tsx
@@ -1,7 +1,7 @@
 import { yupResolver } from '@hookform/resolvers/yup';
 import type {
-  ApodizationOptions as BaseApodizationOptions,
-  Filter,
+  Filter1DOptions,
+  Apodization1DOptions as BaseApodizationOptions,
 } from 'nmr-processing';
 import { useCallback, useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';
@@ -16,12 +16,13 @@ const simpleValidationSchema = Yup.object().shape({
   livePreview: Yup.boolean().required(),
 });
 
-export type ApodizationOptions = BaseApodizationOptions & {
+export interface ApodizationOptions {
   livePreview: boolean;
-};
+  options: BaseApodizationOptions;
+}
 
 const initialValues: ApodizationOptions = {
-  ...defaultApodizationOptions,
+  options: defaultApodizationOptions as BaseApodizationOptions,
   livePreview: true,
 };
 
@@ -31,7 +32,7 @@ interface UseSharedApodizationOptions {
 }
 
 export const useSharedApodization = (
-  filter: Filter | null,
+  filter: Extract<Filter1DOptions, { name: 'apodization' }> | null,
   options: UseSharedApodizationOptions,
 ) => {
   const {
@@ -63,7 +64,7 @@ export const useSharedApodization = (
 
   const onChange = useCallback(
     (values: ApodizationOptions) => {
-      const { livePreview, ...options } = values;
+      const { livePreview, options } = values;
 
       if (livePreview || previousPreviewRef.current !== livePreview) {
         dispatch({
@@ -80,7 +81,7 @@ export const useSharedApodization = (
       values: ApodizationOptions,
       triggerSource: 'apply' | 'onChange' = 'apply',
     ) => {
-      const { livePreview, ...options } = values;
+      const { livePreview, options } = values;
       switch (triggerSource) {
         case 'onChange': {
           onChange(values);
diff --git a/src/component/panels/filtersPanel/Filters/hooks/useZeroFilling.tsx b/src/component/panels/filtersPanel/Filters/hooks/useZeroFilling.tsx
index b03303ebe..eed9b2c63 100644
--- a/src/component/panels/filtersPanel/Filters/hooks/useZeroFilling.tsx
+++ b/src/component/panels/filtersPanel/Filters/hooks/useZeroFilling.tsx
@@ -1,7 +1,7 @@
 import type { NmrData1D } from 'cheminfo-types';
 import type {
-  Filter,
   ZeroFillingOptions as BaseZeroFillingOptions,
+  Filter1DOptions,
 } from 'nmr-processing';
 import { useCallback, useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';
@@ -30,7 +30,7 @@ function useZeroFillingDefaultSize() {
 }
 
 export const useZeroFilling = (
-  filter: Filter | null,
+  filter: Extract<Filter1DOptions, { name: 'zeroFilling' }> | null,
   options: UseZeroFillingOptions = {},
 ) => {
   const { applyFilterOnload = false } = options;
@@ -42,9 +42,7 @@ export const useZeroFilling = (
   const { handleSubmit, register, reset, control, getValues, formState } =
     useForm({
       defaultValues: {
-        nbPoints:
-          (filter?.value as BaseZeroFillingOptions)?.nbPoints ||
-          defaultNbPoints,
+        nbPoints: filter?.value?.nbPoints || defaultNbPoints,
         livePreview: true,
       },
     });
diff --git a/src/component/panels/filtersPanel/Filters/index.tsx b/src/component/panels/filtersPanel/Filters/index.tsx
index 8f3906e75..8d699e8ab 100644
--- a/src/component/panels/filtersPanel/Filters/index.tsx
+++ b/src/component/panels/filtersPanel/Filters/index.tsx
@@ -1,6 +1,7 @@
-import type { ButtonProps } from '@blueprintjs/core';
-import type { Filter } from 'nmr-processing';
-import { Filters } from 'nmr-processing';
+import { ButtonProps } from '@blueprintjs/core';
+
+import type { Filter1DOptions, Filter2DOptions } from 'nmr-processing';
+import { Filters1D, Filters2D } from 'nmr-processing';
 
 import type { LabelStyle } from '../../../elements/Label.js';
 
@@ -15,14 +16,14 @@ import ZeroFillingOptionsPanel from './ZeroFillingOptionsPanel.js';
 const {
   apodization,
   phaseCorrection,
-  phaseCorrectionTwoDimensions,
   zeroFilling,
   baselineCorrection,
   shiftX,
-  shift2DX,
-  shift2DY,
   exclusionZones,
-} = Filters;
+} = Filters1D;
+
+const { shift2DX, shift2DY, phaseCorrectionTwoDimensions } = Filters2D;
+
 export const filterOptionPanels = {
   [apodization.id]: ApodizationOptionsPanel,
   [phaseCorrection.id]: PhaseCorrectionOptionsPanel,
@@ -35,8 +36,10 @@ export const filterOptionPanels = {
   [exclusionZones.id]: ExclusionZonesOptionsPanel,
 };
 
-export interface BaseFilterOptionsPanelProps {
-  filter: Filter;
+export interface BaseFilterOptionsPanelProps<
+  T = Filter1DOptions | Filter2DOptions,
+> {
+  filter: T;
   enableEdit: boolean;
   onConfirm: ButtonProps['onClick'];
   onCancel: ButtonProps['onClick'];
diff --git a/src/component/reducer/Reducer.ts b/src/component/reducer/Reducer.ts
index fca24dff0..5c5c7b40f 100644
--- a/src/component/reducer/Reducer.ts
+++ b/src/component/reducer/Reducer.ts
@@ -5,12 +5,10 @@ import { produce, original } from 'immer';
 import type { CorrelationData } from 'nmr-correlation';
 import { buildCorrelationData } from 'nmr-correlation';
 import type { Spectrum, ViewState } from 'nmr-load-save';
-import type {
-  ApodizationOptions,
-  BaselineCorrectionZone,
-} from 'nmr-processing';
+import type { BaselineCorrectionZone } from 'nmr-processing';
 import type { Reducer } from 'react';
 
+import type { Apodization1DOptions } from 'nmr-processing';
 import type { StateMoleculeExtended } from '../../data/molecules/Molecule.js';
 import type { UsedColors } from '../../types/UsedColors.js';
 import type { Action } from '../context/DispatchContext.js';
@@ -169,7 +167,7 @@ export const getInitialState = (): State => ({
         zones: [],
         livePreview: true,
       },
-      apodizationOptions: {} as ApodizationOptions,
+      apodizationOptions: {} as Apodization1DOptions,
       twoDimensionPhaseCorrection: {
         activeTraceDirection: 'horizontal',
         addTracesToBothDirections: true,
@@ -347,7 +345,7 @@ export interface State {
         options: any;
         livePreview: boolean;
       };
-      apodizationOptions: ApodizationOptions;
+      apodizationOptions: Apodization1DOptions;
       /**
        * pivot point for manual phase correction
        * @default {value:0,index:0}
diff --git a/src/component/reducer/actions/FiltersActions.ts b/src/component/reducer/actions/FiltersActions.ts
index a75ac01ec..464c00130 100644
--- a/src/component/reducer/actions/FiltersActions.ts
+++ b/src/component/reducer/actions/FiltersActions.ts
@@ -9,14 +9,17 @@ import type {
   Spectrum1D,
   Spectrum2D,
 } from 'nmr-load-save';
-import type {
-  ApodizationOptions,
-  BaselineCorrectionOptions,
-} from 'nmr-processing';
 import {
-  Filters,
-  FiltersManager,
   getBaselineZonesByDietrich,
+  Filters1DManager,
+  Filters2DManager,
+  Filters1D,
+  Filters2D,
+} from 'nmr-processing';
+import type {
+  BaselineCorrectionOptions,
+  Filter1D,
+  Apodization1DOptions,
 } from 'nmr-processing';
 
 import { defaultApodizationOptions } from '../../../data/constants/DefaultApodizationOptions.js';
@@ -55,22 +58,25 @@ import { activateTool, resetSelectedTool } from './ToolsActions.js';
 
 const {
   fft,
-  fftDimension1,
-  fftDimension2,
   apodization,
   baselineCorrection,
   phaseCorrection,
-  phaseCorrectionTwoDimensions,
   zeroFilling,
   shiftX,
-  shift2DX,
-  shift2DY,
+
   exclusionZones,
   signalProcessing,
   digitalFilter,
-  digitalFilter2D,
-} = Filters;
+} = Filters1D;
 
+const {
+  fftDimension1,
+  fftDimension2,
+  phaseCorrectionTwoDimensions,
+  shift2DX,
+  shift2DY,
+  digitalFilter2D,
+} = Filters2D;
 interface ShiftOneDimension {
   shift: number;
 }
@@ -84,11 +90,11 @@ type ShiftSpectrumOptions = ShiftOneDimension | ShiftTwoDimensions;
 type ShiftSpectrumAction = ActionType<'SHIFT_SPECTRUM', ShiftSpectrumOptions>;
 type ApodizationFilterAction = ActionType<
   'APPLY_APODIZATION_FILTER',
-  { options: ApodizationOptions }
+  { options: Apodization1DOptions }
 >;
 type ApodizationFilterLiveAction = ActionType<
   'CALCULATE_APODIZATION_FILTER',
-  { options: ApodizationOptions; livePreview: boolean }
+  { options: Apodization1DOptions; livePreview: boolean }
 >;
 type ZeroFillingFilterAction = ActionType<
   'APPLY_ZERO_FILLING_FILTER',
@@ -209,10 +215,10 @@ export type FiltersActions =
 
 function getFilterUpdateDomainRules(
   filterName: string,
-  defaultRule?: FiltersManager.FilterDomainUpdateRules,
+  defaultRule?: Filters1DManager.FilterDomainUpdateRules,
 ) {
   return (
-    Filters[filterName]?.DOMAIN_UPDATE_RULES ||
+    Filters1D[filterName]?.DOMAIN_UPDATE_RULES ||
     defaultRule || {
       updateXDomain: false,
       updateYDomain: false,
@@ -234,7 +240,7 @@ function getFilterDomain(
   options: { startIndex: number; lastIndex: number },
 ) {
   const { startIndex, lastIndex } = options;
-  const updateDomainOptions: FiltersManager.FilterDomainUpdateRules = {
+  const updateDomainOptions: Filters1DManager.FilterDomainUpdateRules = {
     updateXDomain: false,
     updateYDomain: false,
   };
@@ -269,7 +275,7 @@ function rollbackSpectrumByFilter(
   } = options || {};
 
   const currentActiveSpectrum = activeSpectrum || getActiveSpectrum(draft);
-  let updateDomainOptions: Partial<FiltersManager.FilterDomainUpdateRules> = {
+  let updateDomainOptions: Partial<Filters1DManager.FilterDomainUpdateRules> = {
     updateXDomain: false,
     updateYDomain: false,
   };
@@ -298,13 +304,21 @@ function rollbackSpectrumByFilter(
         lastIndex: Math.max(activeFilterIndex, filterIndex),
       });
 
-      FiltersManager.reapplyFilters(datum, filters);
+      if (datum.info.dimension === 1) {
+        Filters1DManager.reapplyFilters(datum as Spectrum1D, filters);
+      } else {
+        Filters2DManager.reapplyFilters(datum as Spectrum2D, filters);
+      }
 
       draft.tempData = current(draft).data;
       // apply the current Filters
       if (applyFilter) {
         const { name, value } = datum.filters[filterIndex];
-        Filters[name].apply(datum, value);
+        if (datum.info.dimension === 1) {
+          Filters1D[name].apply(datum, value);
+        } else {
+          Filters2D[name].apply(datum, value);
+        }
       }
 
       currentIsFid = datum.info.isFid;
@@ -321,7 +335,11 @@ function rollbackSpectrumByFilter(
 
     if (filterIndex === -1 || reset) {
       if (draft.tempData) {
-        FiltersManager.reapplyFilters(datum);
+        if (datum.info.dimension === 1) {
+          Filters1DManager.reapplyFilters(datum as Spectrum1D);
+        } else {
+          Filters2DManager.reapplyFilters(datum as Spectrum2D);
+        }
       }
       //if the filter is not exists, create a clone of the current data
       draft.tempData = current(draft).data;
@@ -380,7 +398,7 @@ function rollbackSpectrum(
         signalProcessing.id,
         digitalFilter.id,
         digitalFilter2D.id,
-      ].includes(filterKey);
+      ].includes(filterKey as any);
 
   beforeRollback(draft, filterKey);
 
@@ -423,28 +441,28 @@ function beforeRollback(draft: Draft<State>, filterKey) {
       if (activeSpectrum) {
         const spectrum = current(draft).data[activeSpectrum.index];
 
-        const phaseCorrectionFilter = spectrum.filters.find(
-          (filter) => filter.name === Tools.phaseCorrectionTwoDimensions.id,
-        );
+        // const phaseCorrectionFilter = spectrum.filters.find(
+        //   (filter) => filter.name === Filters2D.phaseCorrectionTwoDimensions.id,
+        // );
 
         if (isSpectrum1D(spectrum)) {
-          const { value: filterOptions } = phaseCorrectionFilter || {};
+          // const { value: filterOptions } = phaseCorrectionFilter || {};
           let pivotObj = {
             value: 0,
             index: 0,
           };
-          if (typeof filterOptions?.pivot === 'number') {
-            const { pivot } = filterOptions;
-            const index = xFindClosestIndex(spectrum.data.re, pivot);
-            pivotObj = { value: pivot, index };
-          } else {
-            // look for the strongest peak to set it as a pivot
-            const peak = findStrongestPeak(spectrum.data);
-            if (peak) {
-              const { xValue, index } = peak;
-              pivotObj = { value: xValue, index };
-            }
+          // if (typeof filterOptions?.pivot === 'number') {
+          //   const { pivot } = filterOptions;
+          //   const index = xFindClosestIndex(spectrum.data.re, pivot);
+          //   pivotObj = { value: pivot, index };
+          // } else {
+          // look for the strongest peak to set it as a pivot
+          const peak = findStrongestPeak(spectrum.data);
+          if (peak) {
+            const { xValue, index } = peak;
+            pivotObj = { value: xValue, index };
           }
+          // }
 
           draft.toolOptions.data.pivot = pivotObj;
         }
@@ -508,7 +526,7 @@ function beforeRollback(draft: Draft<State>, filterKey) {
       if (activeSpectrum) {
         const datum = current(draft).data[activeSpectrum.index];
         const baselineCorrectionFilter = datum.filters.find(
-          (filter) => filter.name === Tools.baselineCorrection.id,
+          (filter) => filter.name === Filters1D.baselineCorrection.id,
         );
         if (
           !baselineCorrectionFilter ||
@@ -534,7 +552,8 @@ function afterRollback(draft: Draft<State>, filterKey) {
 
   switch (filterKey) {
     case apodization.id: {
-      draft.toolOptions.data.apodizationOptions = defaultApodizationOptions;
+      draft.toolOptions.data.apodizationOptions =
+        defaultApodizationOptions as Apodization1DOptions;
       break;
     }
     default:
@@ -557,7 +576,7 @@ function getActiveFilterIndex(draft: Draft<State>) {
 
 function updateView(
   draft: Draft<State>,
-  filterUpdateDomainRules: Readonly<FiltersManager.FilterDomainUpdateRules>,
+  filterUpdateDomainRules: Readonly<Filters1DManager.FilterDomainUpdateRules>,
 ) {
   draft.tempData = null;
   const { updateXDomain, updateYDomain } = filterUpdateDomainRules;
@@ -584,7 +603,8 @@ function disableLivePreview(draft: Draft<State>, id: string) {
   // reset default options
   switch (id) {
     case apodization.id: {
-      draft.toolOptions.data.apodizationOptions = defaultApodizationOptions;
+      draft.toolOptions.data.apodizationOptions =
+        defaultApodizationOptions as Apodization1DOptions;
       break;
     }
     default:
@@ -617,7 +637,7 @@ function handleShiftSpectrumAlongXAxis(
   if (isOneDimensionShift(options)) {
     const { shift } = options;
 
-    FiltersManager.applyFilter(draft.data[index], [
+    Filters1DManager.applyFilters(draft.data[index] as Spectrum1D, [
       { name: shiftX.id, value: { shift } },
     ]);
 
@@ -626,14 +646,14 @@ function handleShiftSpectrumAlongXAxis(
     const { shiftX, shiftY } = options;
 
     if (shiftX) {
-      FiltersManager.applyFilter(draft.data[index], [
+      Filters2DManager.applyFilters(draft.data[index] as Spectrum2D, [
         { name: shift2DX.id, value: { shift: shiftX } },
       ]);
       updateView(draft, shift2DX.DOMAIN_UPDATE_RULES);
     }
 
     if (shiftY) {
-      FiltersManager.applyFilter(draft.data[index], [
+      Filters2DManager.applyFilters(draft.data[index] as Spectrum2D, [
         { name: shift2DY.id, value: { shift: shiftY } },
       ]);
 
@@ -660,7 +680,7 @@ function handleApplyZeroFillingFilter(
       value: action.payload.options,
     },
   ];
-  FiltersManager.applyFilter(draft.tempData[index], filters);
+  Filters1DManager.applyFilters(draft.tempData[index], filters);
   draft.data[index] = draft.tempData[index];
 
   updateView(draft, zeroFilling.DOMAIN_UPDATE_RULES);
@@ -743,7 +763,7 @@ function handleApplyApodizationFilter(
 
   const index = activeSpectrum.index;
 
-  FiltersManager.applyFilter(draft.tempData[index], [
+  Filters1DManager.applyFilters(draft.tempData[index], [
     {
       name: apodization.id,
       value: action.payload.options,
@@ -766,7 +786,7 @@ function handleApplyFFTFilter(draft: Draft<State>) {
   const activeFilterIndex = getActiveFilterIndex(draft);
 
   //apply filter into the spectrum
-  FiltersManager.applyFilter(
+  Filters1DManager.applyFilters(
     activeFilterIndex !== -1 ? draft.tempData[index] : draft.data[index],
     [{ name: fft.id, value: {} }],
   );
@@ -795,7 +815,7 @@ function handleApplyFFtDimension1Filter(draft: Draft<State>) {
   const activeFilterIndex = getActiveFilterIndex(draft);
 
   //apply filter into the spectrum
-  FiltersManager.applyFilter(
+  Filters2DManager.applyFilters(
     activeFilterIndex !== -1 ? draft.tempData[index] : draft.data[index],
     [{ name: fftDimension1.id, value: {} }],
   );
@@ -824,7 +844,7 @@ function handleApplyFFtDimension2Filter(draft: Draft<State>) {
   const activeFilterIndex = getActiveFilterIndex(draft);
 
   //apply filter into the spectrum
-  FiltersManager.applyFilter(
+  Filters2DManager.applyFilters(
     activeFilterIndex !== -1 ? draft.tempData[index] : draft.data[index],
     [{ name: fftDimension2.id, value: {} }],
   );
@@ -857,7 +877,7 @@ function handleApplyManualPhaseCorrectionFilter(
   const { ph0, ph1 } = action.payload;
   draft.data = draft.tempData;
 
-  FiltersManager.applyFilter(draft.tempData[index], [
+  Filters1DManager.applyFilters(draft.tempData[index], [
     {
       name: phaseCorrection.id,
       value: { ph0, ph1 },
@@ -996,7 +1016,7 @@ function handleApplyAbsoluteFilter(draft: Draft<State>) {
 
   const { index } = activeSpectrum;
 
-  FiltersManager.applyFilter(draft.tempData[index], [
+  Filters1DManager.applyFilters(draft.tempData[index], [
     {
       name: phaseCorrection.id,
       value: { absolute: true },
@@ -1017,7 +1037,7 @@ function handleApplyAutoPhaseCorrectionFilter(draft: Draft<State>) {
 
   const { index } = activeSpectrum;
 
-  FiltersManager.applyFilter(draft.tempData[index], [
+  Filters1DManager.applyFilters(draft.tempData[index], [
     {
       name: phaseCorrection.id,
       value: {},
@@ -1043,14 +1063,14 @@ function handleBaseLineCorrectionFilter(
   const { index } = activeSpectrum;
   const { zones } = draft.toolOptions.data.baselineCorrection;
   const { options } = action.payload;
-  FiltersManager.applyFilter(draft.tempData[index], [
+  Filters1DManager.applyFilters(draft.tempData[index], [
     {
       name: baselineCorrection.id,
       value: {
         ...options,
         zones,
       },
-    },
+    } as Extract<Filter1D, { name: 'baseLineCorrection' }>,
   ]);
   draft.data[index] = draft.tempData[index];
 
@@ -1112,11 +1132,19 @@ function handleEnableFilter(draft: Draft<State>, action: EnableFilterAction) {
   const { id: filterID, enabled } = action.payload;
 
   //apply filter into the spectrum
-  FiltersManager.enableFilter(
-    draft.data[activeSpectrum.index],
-    filterID,
-    enabled,
-  );
+  if (draft.data[activeSpectrum.index].info.dimension === 1) {
+    Filters1DManager.enableFilter(
+      draft.data[activeSpectrum.index] as Spectrum1D,
+      filterID,
+      enabled,
+    );
+  } else {
+    Filters2DManager.enableFilter(
+      draft.data[activeSpectrum.index] as Spectrum2D,
+      filterID,
+      enabled,
+    );
+  }
 
   resetSelectedTool(draft);
   setDomain(draft);
@@ -1145,7 +1173,17 @@ function handleDeleteFilter(draft: Draft<State>, action: DeleteFilterAction) {
   const filterID = action?.payload?.id;
 
   //apply filter into the spectrum
-  FiltersManager.deleteFilter(draft.data[activeSpectrum.index], filterID);
+  if (draft.data[activeSpectrum.index].info.dimension === 1) {
+    Filters1DManager.deleteFilter(
+      draft.data[activeSpectrum.index] as Spectrum1D,
+      filterID,
+    );
+  } else {
+    Filters2DManager.deleteFilter(
+      draft.data[activeSpectrum.index] as Spectrum2D,
+      filterID,
+    );
+  }
   draft.toolOptions.data.activeFilterID = null;
   resetSelectedTool(draft);
   setDomain(draft);
@@ -1168,7 +1206,11 @@ function handleDeleteSpectraFilter(
           datum.filters?.filter((filter) => filter.name === filterName) || [];
 
         for (const filter of filtersResult) {
-          FiltersManager.deleteFilter(datum, filter.id);
+          if (datum.info.dimension === 1) {
+            Filters1DManager.deleteFilter(datum as Spectrum1D, filter.id);
+          } else {
+            Filters2DManager.deleteFilter(datum as Spectrum2D, filter.id);
+          }
         }
       }
     }
@@ -1208,7 +1250,7 @@ function handleSignalProcessingFilter(
 
   const spectra = getSpectraByNucleus(nucleus, data) as Spectrum1D[];
   for (const spectrum of spectra) {
-    FiltersManager.applyFilter(
+    Filters1DManager.applyFilters(
       spectrum,
       [
         {
@@ -1237,12 +1279,15 @@ function handleApplyExclusionZone(
     return;
   }
 
-  FiltersManager.applyFilter(draft.data[activeSpectrum.index], [
-    {
-      name: exclusionZones.id,
-      value: zones,
-    },
-  ]);
+  Filters1DManager.applyFilters(
+    draft.data[activeSpectrum.index] as Spectrum1D,
+    [
+      {
+        name: exclusionZones.id,
+        value: zones,
+      },
+    ],
+  );
 
   const { updateXDomain, updateYDomain } = exclusionZones.DOMAIN_UPDATE_RULES;
 
@@ -1270,7 +1315,7 @@ function handleAddExclusionZone(
   }
 
   for (const spectrum of spectra) {
-    FiltersManager.applyFilter(spectrum, [
+    Filters1DManager.applyFilters(spectrum, [
       {
         name: exclusionZones.id,
         value: [
@@ -1306,10 +1351,15 @@ function handleDeleteExclusionZone(
     );
     if (filter) {
       if (filter.value.length === 1) {
-        FiltersManager.deleteFilter(draft.data[spectrumIndex], filter.id);
+        Filters1DManager.deleteFilter(
+          draft.data[spectrumIndex] as Spectrum1D,
+          filter.id,
+        );
       } else {
         filter.value = filter.value.filter((_zone) => _zone.id !== zone?.id);
-        FiltersManager.reapplyFilters(draft.data[spectrumIndex]);
+        Filters1DManager.reapplyFilters(
+          draft.data[spectrumIndex] as Spectrum1D,
+        );
       }
     }
   } else {
@@ -1321,7 +1371,7 @@ function handleDeleteExclusionZone(
           filter.value = filter.value.filter(
             (_zone) => zone.from !== _zone.from && zone.to !== _zone.to,
           );
-          FiltersManager.reapplyFilters(datum);
+          Filters1DManager.reapplyFilters(datum as Spectrum1D);
         }
       }
     }
@@ -1417,10 +1467,10 @@ function handleCalculateManualTwoDimensionPhaseCorrection(
 
   const filterOptions = getTwoDimensionsPhaseCorrectionOptions(draft);
 
-  const { data, info } = spectrum;
-  const _data = { data, info };
-  phaseCorrectionTwoDimensions.apply(_data, filterOptions);
-  draft.data[index].data = _data.data;
+  phaseCorrectionTwoDimensions.apply(
+    draft.data[index] as Spectrum2D,
+    filterOptions,
+  );
 }
 
 function getTwoDimensionsPhaseCorrectionOptions(draft: Draft<State>) {
@@ -1459,7 +1509,7 @@ function handleApplyManualTowDimensionsPhaseCorrectionFilter(
   draft.data = draft.tempData;
   const filterOptions = getTwoDimensionsPhaseCorrectionOptions(draft);
 
-  FiltersManager.applyFilter(draft.tempData[index], [
+  Filters2DManager.applyFilters(draft.tempData[index], [
     {
       name: phaseCorrectionTwoDimensions.id,
       value: filterOptions,
@@ -1482,7 +1532,7 @@ function handleApplyAutoPhaseCorrectionTwoDimensionsFilter(
 
   const { index } = activeSpectrum;
 
-  FiltersManager.applyFilter(draft.tempData[index], [
+  Filters2DManager.applyFilters(draft.tempData[index], [
     {
       name: phaseCorrectionTwoDimensions.id,
       value: {},
diff --git a/src/component/reducer/actions/PeaksActions.ts b/src/component/reducer/actions/PeaksActions.ts
index 0361845c2..88c97e1f7 100644
--- a/src/component/reducer/actions/PeaksActions.ts
+++ b/src/component/reducer/actions/PeaksActions.ts
@@ -9,6 +9,7 @@ import type {
   RangesViewState,
 } from 'nmr-load-save';
 import type { Peak1D, OptionsXYAutoPeaksPicking } from 'nmr-processing';
+import { mapPeaks } from 'nmr-processing';
 
 import {
   getShiftX,
@@ -87,9 +88,16 @@ function handleAddPeak(draft: Draft<State>, action: AddPeakAction) {
         originalX: candidatePeak.x - shiftX,
         x: candidatePeak.x,
         y: candidatePeak.y,
-        width: 0,
+        width: 1,
+        shape: {
+          kind: 'generalizedLorentzian',
+          fwhm: 1,
+          gamma: 0.5,
+        },
       };
-      (draft.data[index] as Spectrum1D).peaks.values.push(peak);
+      (draft.data[index] as Spectrum1D).peaks.values.push(
+        ...mapPeaks([peak], draft.data[index] as Spectrum1D),
+      );
     }
   }
 }
@@ -111,14 +119,18 @@ function handleAddPeaks(draft: Draft<State>, action: AddPeaksAction) {
       const peak = getClosePeak(datumOriginal, { from, to });
 
       const shiftX = getShiftX(draft.data[index] as Spectrum1D);
-
       if (peak && !datumOriginal.peaks.values.some((p) => p.x === peak.x)) {
         const newPeak: Peak1D = {
           id: v4(),
           originalX: peak.x - shiftX,
           x: peak.x,
           y: peak.y,
-          width: 0,
+          width: 1,
+          shape: {
+            kind: 'generalizedLorentzian',
+            fwhm: 1,
+            gamma: 0.5,
+          },
         };
         (draft.data[index] as Spectrum1D).peaks.values.push(newPeak);
       }
@@ -194,7 +206,6 @@ function handleAutoPeakPicking(
       windowFromIndex,
       windowToIndex,
     });
-
     datum.peaks.values = datum.peaks.values.concat(peaks);
   }
 }
diff --git a/src/component/reducer/actions/RangesActions.ts b/src/component/reducer/actions/RangesActions.ts
index 53a38b759..40879182f 100644
--- a/src/component/reducer/actions/RangesActions.ts
+++ b/src/component/reducer/actions/RangesActions.ts
@@ -5,7 +5,7 @@ import cloneDeep from 'lodash/cloneDeep.js';
 import { xFindClosestIndex } from 'ml-spectra-processing';
 import type { RangesViewState, Spectrum, Spectrum1D } from 'nmr-load-save';
 import type { Signal1D, Range } from 'nmr-processing';
-import { Filters, FiltersManager } from 'nmr-processing';
+import { Filters1DManager, Filters1D } from 'nmr-processing';
 
 import {
   DATUM_KIND,
@@ -551,8 +551,8 @@ function handleChangeRangeSignalValue(
       signalID,
       newSignalValue: value,
     });
-    FiltersManager.applyFilter(draft.data[index], [
-      { name: Filters.shiftX.id, value: { shift } },
+    Filters1DManager.applyFilters(draft.data[index], [
+      { name: Filters1D.shiftX.id, value: { shift } },
     ]);
 
     handleUpdateCorrelations(draft);
diff --git a/src/component/reducer/actions/SpectraActions.ts b/src/component/reducer/actions/SpectraActions.ts
index 53440441a..30ba765c5 100644
--- a/src/component/reducer/actions/SpectraActions.ts
+++ b/src/component/reducer/actions/SpectraActions.ts
@@ -12,7 +12,7 @@ import type {
   Spectrum2D,
 } from 'nmr-load-save';
 import type { NMRRange } from 'nmr-processing';
-import { Filters, FiltersManager } from 'nmr-processing';
+import { Filters1D, Filters1DManager } from 'nmr-processing';
 
 import {
   get1DColor,
@@ -169,7 +169,6 @@ export type SpectrumActions =
   | SimulateSpectrumAction
   | UpdateSpectrumMetaAction;
 
-const { applyFilter } = FiltersManager;
 function checkIsVisible2D(datum: Spectrum2D): boolean {
   if (!datum.display.isPositiveVisible && !datum.display.isNegativeVisible) {
     return false;
@@ -548,9 +547,9 @@ function handleAlignSpectraHandler(
         !datum.info?.isFid
       ) {
         const shift = getReferenceShift(datum, { ...action.payload });
-        applyFilter(datum, [
+        Filters1DManager.applyFilters(datum as Spectrum1D, [
           {
-            name: Filters.shiftX.id,
+            name: Filters1D.shiftX.id,
             value: { shift },
           },
         ]);
diff --git a/src/component/reducer/actions/ZonesActions.ts b/src/component/reducer/actions/ZonesActions.ts
index 50466f9f4..d7400c9f0 100644
--- a/src/component/reducer/actions/ZonesActions.ts
+++ b/src/component/reducer/actions/ZonesActions.ts
@@ -5,7 +5,7 @@ import lodashCloneDeep from 'lodash/cloneDeep.js';
 import { setPathLength } from 'nmr-correlation';
 import type { Spectrum, Spectrum2D, ZonesViewState } from 'nmr-load-save';
 import type { Signal2D, Zone } from 'nmr-processing';
-import { Filters, FiltersManager } from 'nmr-processing';
+import { Filters2D, Filters2DManager } from 'nmr-processing';
 
 import {
   DATUM_KIND,
@@ -236,13 +236,13 @@ function handleChangeZoneSignalDelta(
     );
     const filters: any = [];
     if (xShift !== 0) {
-      filters.push({ name: Filters.shift2DX.id, value: { shift: xShift } });
+      filters.push({ name: Filters2D.shift2DX.id, value: { shift: xShift } });
     }
     if (yShift !== 0) {
-      filters.push({ name: Filters.shift2DY.id, value: { shift: yShift } });
+      filters.push({ name: Filters2D.shift2DY.id, value: { shift: yShift } });
     }
 
-    FiltersManager.applyFilter(draft.data[index], filters);
+    Filters2DManager.applyFilters(draft.data[index] as Spectrum2D, filters);
 
     setDomain(draft);
     handleUpdateCorrelations(draft);
diff --git a/src/component/toolbar/ToolTypes.ts b/src/component/toolbar/ToolTypes.ts
index a5886bb1f..226c5db62 100644
--- a/src/component/toolbar/ToolTypes.ts
+++ b/src/component/toolbar/ToolTypes.ts
@@ -1,6 +1,6 @@
 import type { NMRiumToolBarPreferences } from 'nmr-load-save';
 import type { Info1D, Info2D } from 'nmr-processing';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 
 import type { DisplayerMode } from '../reducer/Reducer.js';
 
@@ -140,8 +140,8 @@ export const options: RecordOptions = {
     isToggle: true,
   },
   apodization: {
-    id: Filters.apodization.id,
-    label: Filters.apodization.name,
+    id: Filters1D.apodization.id,
+    label: Filters1D.apodization.name,
     hasOptionPanel: true,
     isFilter: true,
     mode: '1D',
@@ -157,8 +157,8 @@ export const options: RecordOptions = {
     isToggle: true,
   },
   zeroFilling: {
-    id: Filters.zeroFilling.id,
-    label: Filters.zeroFilling.name,
+    id: Filters1D.zeroFilling.id,
+    label: Filters1D.zeroFilling.name,
     hasOptionPanel: true,
     isFilter: true,
     mode: '1D',
@@ -174,8 +174,8 @@ export const options: RecordOptions = {
     isToggle: true,
   },
   phaseCorrection: {
-    id: Filters.phaseCorrection.id,
-    label: Filters.phaseCorrection.name,
+    id: Filters1D.phaseCorrection.id,
+    label: Filters1D.phaseCorrection.name,
     hasOptionPanel: true,
     isFilter: true,
     mode: '1D',
@@ -191,8 +191,8 @@ export const options: RecordOptions = {
     isToggle: true,
   },
   baselineCorrection: {
-    id: Filters.baselineCorrection.id,
-    label: Filters.baselineCorrection.name,
+    id: Filters1D.baselineCorrection.id,
+    label: Filters1D.baselineCorrection.name,
     hasOptionPanel: true,
     isFilter: true,
     mode: '1D',
diff --git a/src/component/workspaces/workspaceDefaultProperties.ts b/src/component/workspaces/workspaceDefaultProperties.ts
index 48936bdab..5408f13cf 100644
--- a/src/component/workspaces/workspaceDefaultProperties.ts
+++ b/src/component/workspaces/workspaceDefaultProperties.ts
@@ -1,5 +1,5 @@
 import type { WorkspacePreferences } from 'nmr-load-save';
-import { Filters } from 'nmr-processing';
+import { Filters1D } from 'nmr-processing';
 
 import { color2D } from '../../data/data2d/Spectrum2D/get2DColor.js';
 
@@ -129,34 +129,34 @@ export const workspaceDefaultProperties: Required<WorkspacePreferences> = {
     filters: {
       '1H': [
         {
-          name: Filters.digitalFilter.id,
-          label: Filters.digitalFilter.name,
+          name: Filters1D.digitalFilter.id,
+          label: Filters1D.digitalFilter.name,
           value: {},
           flag: true,
         },
         {
-          name: Filters.apodization.id,
-          label: Filters.apodization.name,
+          name: Filters1D.apodization.id,
+          label: Filters1D.apodization.name,
           value: {},
           flag: false,
         },
         {
-          name: Filters.zeroFilling.id,
-          label: Filters.zeroFilling.name,
+          name: Filters1D.zeroFilling.id,
+          label: Filters1D.zeroFilling.name,
 
           value: {},
           flag: true,
         },
         {
-          name: Filters.fft.id,
-          label: Filters.fft.name,
+          name: Filters1D.fft.id,
+          label: Filters1D.fft.name,
 
           value: {},
           flag: true,
         },
         {
-          name: Filters.phaseCorrection.id,
-          label: Filters.phaseCorrection.name,
+          name: Filters1D.phaseCorrection.id,
+          label: Filters1D.phaseCorrection.name,
 
           value: {},
           flag: true,
@@ -164,35 +164,35 @@ export const workspaceDefaultProperties: Required<WorkspacePreferences> = {
       ],
       '13C': [
         {
-          name: Filters.digitalFilter.id,
-          label: Filters.digitalFilter.name,
+          name: Filters1D.digitalFilter.id,
+          label: Filters1D.digitalFilter.name,
 
           value: {},
           flag: true,
         },
         {
-          name: Filters.apodization.id,
-          label: Filters.apodization.name,
+          name: Filters1D.apodization.id,
+          label: Filters1D.apodization.name,
           value: {},
           flag: true,
         },
         {
-          name: Filters.zeroFilling.id,
-          label: Filters.zeroFilling.name,
+          name: Filters1D.zeroFilling.id,
+          label: Filters1D.zeroFilling.name,
 
           value: {},
           flag: true,
         },
         {
-          name: Filters.fft.id,
-          label: Filters.fft.name,
+          name: Filters1D.fft.id,
+          label: Filters1D.fft.name,
 
           value: {},
           flag: true,
         },
         {
-          name: Filters.phaseCorrection.id,
-          label: Filters.phaseCorrection.name,
+          name: Filters1D.phaseCorrection.id,
+          label: Filters1D.phaseCorrection.name,
 
           value: {},
           flag: true,
diff --git a/src/data/constants/DefaultApodizationOptions.ts b/src/data/constants/DefaultApodizationOptions.ts
index 2092e6097..c6559043a 100644
--- a/src/data/constants/DefaultApodizationOptions.ts
+++ b/src/data/constants/DefaultApodizationOptions.ts
@@ -1,7 +1,13 @@
-import type { ApodizationOptions } from 'nmr-processing';
-
-export const defaultApodizationOptions: ApodizationOptions = {
-  lineBroadening: 1,
-  gaussBroadening: 0,
-  lineBroadeningCenter: 0,
+export const defaultApodizationOptions = {
+  lorentzToGauss: {
+    apply: true,
+    shape: {
+      kind: 'lorentzToGauss',
+      options: {
+        lineBroadening: 1,
+        gaussBroadening: 0,
+        lineBroadeningCenter: 0,
+      },
+    },
+  },
 };
diff --git a/src/data/data1d/Spectrum1D/initiateDatum1D.ts b/src/data/data1d/Spectrum1D/initiateDatum1D.ts
index 8fd02836c..3c8cbfb39 100644
--- a/src/data/data1d/Spectrum1D/initiateDatum1D.ts
+++ b/src/data/data1d/Spectrum1D/initiateDatum1D.ts
@@ -1,6 +1,6 @@
 import { v4 } from '@lukeed/uuid';
 import type { Spectrum1D, SpectrumOneDimensionColor } from 'nmr-load-save';
-import { FiltersManager } from 'nmr-processing';
+import { Filters1DManager } from 'nmr-processing';
 
 import type { UsedColors } from '../../../types/UsedColors.js';
 import { initiateFilters } from '../../initiateFilters.js';
@@ -80,7 +80,7 @@ export function initiateDatum1D(
   spectrumObj.ranges = initiateRanges(spectrum, spectrumObj, rangesOptions);
 
   //reapply filters after load the original data
-  FiltersManager.reapplyFilters(spectrumObj);
+  Filters1DManager.reapplyFilters(spectrumObj);
 
   return spectrumObj;
 }
diff --git a/src/data/data2d/Spectrum2D/getShift.ts b/src/data/data2d/Spectrum2D/getShift.ts
index b3bfe1fb1..c116b2d36 100644
--- a/src/data/data2d/Spectrum2D/getShift.ts
+++ b/src/data/data2d/Spectrum2D/getShift.ts
@@ -1,5 +1,5 @@
 import type { Spectrum2D } from 'nmr-load-save';
-import { Filters } from 'nmr-processing';
+import { Filters2D } from 'nmr-processing';
 
 export interface Shift2D {
   x: number;
@@ -10,10 +10,10 @@ export function getShift(spectrum: Spectrum2D): Shift2D {
   const shift = { x: 0, y: 0 };
   if (spectrum?.filters) {
     for (const filter of spectrum.filters) {
-      if (filter.name === Filters.shift2DX.id) {
+      if (filter.name === Filters2D.shift2DX.id) {
         shift.x = filter?.flag ? filter.value.shift : 0;
       }
-      if (filter.name === Filters.shift2DY.id) {
+      if (filter.name === Filters2D.shift2DY.id) {
         shift.y = filter?.flag ? filter.value.shift : 0;
       }
     }
diff --git a/src/data/data2d/Spectrum2D/initiateDatum2D.ts b/src/data/data2d/Spectrum2D/initiateDatum2D.ts
index 47bd9dc20..ad70d49fe 100644
--- a/src/data/data2d/Spectrum2D/initiateDatum2D.ts
+++ b/src/data/data2d/Spectrum2D/initiateDatum2D.ts
@@ -1,6 +1,6 @@
 import { v4 } from '@lukeed/uuid';
 import type { Spectrum2D, SpectrumTwoDimensionsColor } from 'nmr-load-save';
-import { FiltersManager } from 'nmr-processing';
+import { Filters2DManager } from 'nmr-processing';
 
 import type { UsedColors } from '../../../types/UsedColors.js';
 import { initiateFilters } from '../../initiateFilters.js';
@@ -63,7 +63,7 @@ export function initiateDatum2D(
   datum.zones = initiateZones(spectrum, datum as Spectrum2D);
 
   //reapply filters after load the original data
-  FiltersManager.reapplyFilters(datum);
+  Filters2DManager.reapplyFilters(datum);
 
   return datum;
 }
diff --git a/src/data/initiateFilters.ts b/src/data/initiateFilters.ts
index 13ef0484c..ab761390a 100644
--- a/src/data/initiateFilters.ts
+++ b/src/data/initiateFilters.ts
@@ -1,7 +1,9 @@
 import { v4 } from '@lukeed/uuid';
-import type { Filter } from 'nmr-processing';
+import type { Filter1D, Filter2D } from 'nmr-processing';
 
-export function initiateFilters(inputFilters: Filter[] | undefined) {
+export function initiateFilters(
+  inputFilters: Filter1D[] | Filter2D[] | undefined,
+) {
   if (!inputFilters || !Array.isArray(inputFilters)) return [];
 
   return inputFilters.map((filter) => ({ ...filter, id: filter?.id || v4() }));
diff --git a/test-e2e/panels/ranges.test.ts b/test-e2e/panels/ranges.test.ts
index 0db726142..811eefff4 100644
--- a/test-e2e/panels/ranges.test.ts
+++ b/test-e2e/panels/ranges.test.ts
@@ -288,7 +288,7 @@ test('Range state', async ({ page }) => {
   await test.step('Check that first spectrum range state saved', async () => {
     // Change spectra
     await nmrium.page.click(
-      '_react=SpectraTable >> _react=ReactTableRow>> nth=0',
+      '_react=SpectraTable >> _react=ReactTableRow >> nth=0',
     );
     // Change spectra
     await nmrium.page.click(
@@ -458,7 +458,7 @@ test('2D spectra reference change', async ({ page }) => {
       .locator(
         '_react=ZonesPanel >> _react=ZonesTableRow >> nth=0 >> td >> nth=1',
       )
-      .dblclick();
+      .click();
 
     await nmrium.page.keyboard.type(x.toString());
     await nmrium.page.keyboard.press('Enter');
@@ -467,7 +467,7 @@ test('2D spectra reference change', async ({ page }) => {
       .locator(
         '_react=ZonesPanel >> _react=ZonesTableRow >> nth=0 >> td >> nth=2',
       )
-      .dblclick();
+      .click();
 
     await nmrium.page.keyboard.type(y.toString());
     await nmrium.page.keyboard.press('Enter');